3 @@ -847,6 +847,30 @@ ac_help="$ac_help
5 --with-zlib-dir=<DIR> Define the location of zlib install directory"
7 + --enable-apc Enable APC support"
9 + --enable-apc-debug Enable APC debugging"
11 + --enable-apc-filehits Enable per request file info about files used from the APC cache (ie: apc_cache_info('filehits')) "
14 + Disable mmap support and use IPC shm instead"
17 + Enable semaphore locks instead of fcntl"
19 + --disable-apc-pthreadmutex
20 + Disable pthread mutex locking "
22 + --enable-apc-spinlocks
23 + Enable spin locks EXPERIMENTAL "
25 + --enable-apc-memprotect
26 + Enable mmap/shm memory protection"
28 + --disable-valgrind-checks
29 + Disable valgrind based memory checks"
31 --enable-bcmath Enable bc style precision math functions"
33 --with-bz2[=DIR] Include BZip2 support"
34 @@ -884,6 +908,8 @@ ac_help="$ac_help
36 --disable-flatfile DBA: FlatFile support (bundled)"
38 + --enable-dio Enable direct I/O support"
40 --disable-dom Disable DOM support"
42 --with-libxml-dir[=DIR] DOM: libxml2 install prefix"
43 @@ -951,6 +977,8 @@ ac_help="$ac_help
45 --with-ldap-sasl[=DIR] LDAP: Include Cyrus SASL support"
47 + --with-libevent Include libevent support"
49 --enable-mbstring Enable multibyte string support"
51 --disable-mbregex MBSTRING: Disable multibyte regex support"
52 @@ -1167,6 +1195,24 @@ ac_help="$ac_help
54 --with-pcre-dir ZIP: pcre install prefix"
56 + --enable-http Enable extended HTTP support"
58 + --with-http-shared-deps
59 + HTTP: disable to not depend on extensions like hash,
60 + iconv and session (when built shared)"
62 + --with-http-curl-requests[=LIBCURLDIR]
63 + HTTP: with cURL request support"
65 + --with-http-curl-libevent[=LIBEVENTDIR]
66 + HTTP: libevent install directory"
68 + --with-http-zlib-compression[=LIBZDIR]
69 + HTTP: with zlib encodings support"
71 + --with-http-magic-mime[=LIBMAGICDIR]
72 + HTTP: with magic mime response content type guessing"
74 --disable-mysqlnd-compression-support
75 Disable support for the MySQL compressed protocol in mysqlnd"
77 @@ -1890,12 +1936,12 @@ fi
80 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
81 -echo "configure:1894: checking for Cygwin environment" >&5
82 +echo "configure:1940: 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
86 cat > conftest.$ac_ext <<EOF
87 -#line 1899 "configure"
88 +#line 1945 "configure"
92 @@ -1906,7 +1952,7 @@ int main() {
96 -if { (eval echo configure:1910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
97 +if { (eval echo configure:1956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
101 @@ -1923,19 +1969,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
103 test "$ac_cv_cygwin" = yes && CYGWIN=yes
104 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
105 -echo "configure:1927: checking for mingw32 environment" >&5
106 +echo "configure:1973: 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
110 cat > conftest.$ac_ext <<EOF
111 -#line 1932 "configure"
112 +#line 1978 "configure"
113 #include "confdefs.h"
119 -if { (eval echo configure:1939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
120 +if { (eval echo configure:1985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
124 @@ -1954,7 +2000,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y
127 echo $ac_n "checking for egrep""... $ac_c" 1>&6
128 -echo "configure:1958: checking for egrep" >&5
129 +echo "configure:2004: 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
133 @@ -1969,7 +2015,7 @@ echo "$ac_t""$ac_cv_prog_egrep" 1>&6
136 echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
137 -echo "configure:1973: checking for a sed that does not truncate output" >&5
138 +echo "configure:2019: 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
142 @@ -2119,7 +2165,7 @@ else { echo "configure: error: can not r
145 echo $ac_n "checking host system type""... $ac_c" 1>&6
146 -echo "configure:2123: checking host system type" >&5
147 +echo "configure:2169: checking host system type" >&5
150 case "$host_alias" in
151 @@ -2140,7 +2186,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
152 echo "$ac_t""$host" 1>&6
154 echo $ac_n "checking target system type""... $ac_c" 1>&6
155 -echo "configure:2144: checking target system type" >&5
156 +echo "configure:2190: checking target system type" >&5
159 case "$target_alias" in
160 @@ -2252,7 +2298,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:2256: checking for $ac_word" >&5
165 +echo "configure:2302: 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
169 @@ -2282,7 +2328,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:2286: checking for $ac_word" >&5
174 +echo "configure:2332: 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
178 @@ -2333,7 +2379,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:2337: checking for $ac_word" >&5
183 +echo "configure:2383: 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
187 @@ -2365,7 +2411,7 @@ fi
190 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
191 -echo "configure:2369: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
192 +echo "configure:2415: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
195 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
196 @@ -2376,12 +2422,12 @@ cross_compiling=$ac_cv_prog_cc_cross
198 cat > conftest.$ac_ext << EOF
200 -#line 2380 "configure"
201 +#line 2426 "configure"
202 #include "confdefs.h"
206 -if { (eval echo configure:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
207 +if { (eval echo configure:2431: \"$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 @@ -2407,12 +2453,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; }
214 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
215 -echo "configure:2411: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
216 +echo "configure:2457: 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
220 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
221 -echo "configure:2416: checking whether we are using GNU C" >&5
222 +echo "configure:2462: 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
226 @@ -2421,7 +2467,7 @@ else
230 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2425: \"$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:2471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
235 @@ -2440,7 +2486,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
236 ac_save_CFLAGS="$CFLAGS"
238 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
239 -echo "configure:2444: checking whether ${CC-cc} accepts -g" >&5
240 +echo "configure:2490: 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
244 @@ -2472,7 +2518,7 @@ else
247 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
248 -echo "configure:2476: checking how to run the C preprocessor" >&5
249 +echo "configure:2522: 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
253 @@ -2487,13 +2533,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 2491 "configure"
258 +#line 2537 "configure"
259 #include "confdefs.h"
263 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
264 -{ (eval echo configure:2497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
265 +{ (eval echo configure:2543: \"$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
269 @@ -2504,13 +2550,13 @@ else
271 CPP="${CC-cc} -E -traditional-cpp"
272 cat > conftest.$ac_ext <<EOF
273 -#line 2508 "configure"
274 +#line 2554 "configure"
275 #include "confdefs.h"
279 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
280 -{ (eval echo configure:2514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
281 +{ (eval echo configure:2560: \"$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
285 @@ -2521,13 +2567,13 @@ else
287 CPP="${CC-cc} -nologo -E"
288 cat > conftest.$ac_ext <<EOF
289 -#line 2525 "configure"
290 +#line 2571 "configure"
291 #include "confdefs.h"
295 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
296 -{ (eval echo configure:2531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
297 +{ (eval echo configure:2577: \"$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
301 @@ -2554,9 +2600,9 @@ echo "$ac_t""$CPP" 1>&6
304 echo $ac_n "checking for icc""... $ac_c" 1>&6
305 -echo "configure:2558: checking for icc" >&5
306 +echo "configure:2604: checking for icc" >&5
307 cat > conftest.$ac_ext <<EOF
308 -#line 2560 "configure"
309 +#line 2606 "configure"
310 #include "confdefs.h"
313 @@ -2578,9 +2624,9 @@ rm -f conftest*
316 echo $ac_n "checking for suncc""... $ac_c" 1>&6
317 -echo "configure:2582: checking for suncc" >&5
318 +echo "configure:2628: checking for suncc" >&5
319 cat > conftest.$ac_ext <<EOF
320 -#line 2584 "configure"
321 +#line 2630 "configure"
322 #include "confdefs.h"
325 @@ -2603,10 +2649,10 @@ rm -f conftest*
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:2607: checking whether $CC and cc understand -c and -o together" >&5
330 +echo "configure:2653: checking whether $CC and cc understand -c and -o together" >&5
332 echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
333 -echo "configure:2610: checking whether cc understands -c and -o together" >&5
334 +echo "configure:2656: checking whether cc understands -c and -o together" >&5
336 set dummy $CC; ac_cc="`echo $2 |
337 sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
338 @@ -2618,16 +2664,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:2622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
343 - test -f conftest.o && { (eval echo configure:2623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
344 +if { (eval echo configure:2668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
345 + test -f conftest.o && { (eval echo configure:2669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
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:2628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
351 + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2674: \"$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:2630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
354 - test -f conftest.o && { (eval echo configure:2631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
355 + if { (eval echo configure:2676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
356 + test -f conftest.o && { (eval echo configure:2677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
360 @@ -2654,7 +2700,7 @@ EOF
363 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
364 -echo "configure:2658: checking how to run the C preprocessor" >&5
365 +echo "configure:2704: 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
369 @@ -2669,13 +2715,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 2673 "configure"
374 +#line 2719 "configure"
375 #include "confdefs.h"
379 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
380 -{ (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
381 +{ (eval echo configure:2725: \"$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
385 @@ -2686,13 +2732,13 @@ else
387 CPP="${CC-cc} -E -traditional-cpp"
388 cat > conftest.$ac_ext <<EOF
389 -#line 2690 "configure"
390 +#line 2736 "configure"
391 #include "confdefs.h"
395 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
396 -{ (eval echo configure:2696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
397 +{ (eval echo configure:2742: \"$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
401 @@ -2703,13 +2749,13 @@ else
403 CPP="${CC-cc} -nologo -E"
404 cat > conftest.$ac_ext <<EOF
405 -#line 2707 "configure"
406 +#line 2753 "configure"
407 #include "confdefs.h"
411 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
412 -{ (eval echo configure:2713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
413 +{ (eval echo configure:2759: \"$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
417 @@ -2734,9 +2780,9 @@ fi
418 echo "$ac_t""$CPP" 1>&6
420 echo $ac_n "checking for AIX""... $ac_c" 1>&6
421 -echo "configure:2738: checking for AIX" >&5
422 +echo "configure:2784: checking for AIX" >&5
423 cat > conftest.$ac_ext <<EOF
424 -#line 2740 "configure"
425 +#line 2786 "configure"
426 #include "confdefs.h"
429 @@ -2758,7 +2804,7 @@ rm -f conftest*
432 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
433 -echo "configure:2762: checking whether ln -s works" >&5
434 +echo "configure:2808: 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
438 @@ -2783,7 +2829,7 @@ fi
441 echo $ac_n "checking for system library directory""... $ac_c" 1>&6
442 -echo "configure:2787: checking for system library directory" >&5
443 +echo "configure:2833: 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 @@ -2806,7 +2852,7 @@ echo "$ac_t""$ext_output" 1>&6
450 echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6
451 -echo "configure:2810: checking whether to enable runpaths" >&5
452 +echo "configure:2856: 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 @@ -2827,7 +2873,7 @@ echo "$ac_t""$ext_output" 1>&6
459 echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6
460 -echo "configure:2831: checking if compiler supports -R" >&5
461 +echo "configure:2877: 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
465 @@ -2835,14 +2881,14 @@ else
467 LIBS="-R /usr/$PHP_LIBDIR $LIBS"
468 cat > conftest.$ac_ext <<EOF
469 -#line 2839 "configure"
470 +#line 2885 "configure"
471 #include "confdefs.h"
477 -if { (eval echo configure:2846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
478 +if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
482 @@ -2860,7 +2906,7 @@ if test $php_cv_cc_dashr = "yes"; then
485 echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6
486 -echo "configure:2864: checking if compiler supports -Wl,-rpath," >&5
487 +echo "configure:2910: 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
491 @@ -2868,14 +2914,14 @@ else
493 LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
494 cat > conftest.$ac_ext <<EOF
495 -#line 2872 "configure"
496 +#line 2918 "configure"
497 #include "confdefs.h"
503 -if { (eval echo configure:2879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
504 +if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
508 @@ -2906,7 +2952,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:2910: checking for $ac_word" >&5
513 +echo "configure:2956: 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
517 @@ -2947,7 +2993,7 @@ test -n "$AWK" || AWK="bork"
520 echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6
521 -echo "configure:2951: checking if $AWK is broken" >&5
522 +echo "configure:2997: 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 @@ -2966,7 +3012,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:2970: checking for $ac_word" >&5
531 +echo "configure:3016: 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
535 @@ -3006,7 +3052,7 @@ test -n "$YACC" || YACC="yacc"
537 if test "$YACC"; then
538 echo $ac_n "checking for bison version""... $ac_c" 1>&6
539 -echo "configure:3010: checking for bison version" >&5
540 +echo "configure:3056: 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
544 @@ -3044,7 +3090,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:3048: checking for $ac_word" >&5
549 +echo "configure:3094: 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
553 @@ -3072,7 +3118,7 @@ fi
555 if test -n "$RE2C"; then
556 echo $ac_n "checking for re2c version""... $ac_c" 1>&6
557 -echo "configure:3076: checking for re2c version" >&5
558 +echo "configure:3122: 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
562 @@ -3111,7 +3157,7 @@ esac
563 php_enable_re2c_cgoto=no
565 echo $ac_n "checking whether to enable computed goto gcc extension with re2c""... $ac_c" 1>&6
566 -echo "configure:3115: checking whether to enable computed goto gcc extension with re2c" >&5
567 +echo "configure:3161: 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 @@ -3134,9 +3180,9 @@ if test "$PHP_RE2C_CGOTO" = "no"; then
574 echo $ac_n "checking whether re2c -g works""... $ac_c" 1>&6
575 -echo "configure:3138: checking whether re2c -g works" >&5
576 +echo "configure:3184: checking whether re2c -g works" >&5
577 cat > conftest.$ac_ext <<EOF
578 -#line 3140 "configure"
579 +#line 3186 "configure"
580 #include "confdefs.h"
583 @@ -3154,7 +3200,7 @@ label2:
587 -if { (eval echo configure:3158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
588 +if { (eval echo configure:3204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
592 @@ -3220,7 +3266,7 @@ case $host_alias in
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:3224: checking whether $CC supports -no-cpp-precomp" >&5
597 +echo "configure:3270: 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
601 @@ -3421,7 +3467,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:3425: checking whether to force non-PIC code in shared modules" >&5
606 +echo "configure:3471: checking whether to force non-PIC code in shared modules" >&5
608 i?86-*-linux*|i?86-*-freebsd*)
609 if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then
610 @@ -3451,7 +3497,7 @@ esac
613 echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6
614 -echo "configure:3455: checking whether /dev/urandom exists" >&5
615 +echo "configure:3501: 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 @@ -3512,7 +3558,7 @@ if test "$cross_compiling" = yes; then
622 cat > conftest.$ac_ext <<EOF
623 -#line 3516 "configure"
624 +#line 3562 "configure"
625 #include "confdefs.h"
628 @@ -3530,7 +3576,7 @@ int main() {
629 return pthread_create(&thd, NULL, thread_routine, &data);
632 -if { (eval echo configure:3534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
633 +if { (eval echo configure:3580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
637 @@ -3550,7 +3596,7 @@ fi
640 echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
641 -echo "configure:3554: checking for pthreads_cflags" >&5
642 +echo "configure:3600: 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
646 @@ -3572,7 +3618,7 @@ if test "$cross_compiling" = yes; then
649 cat > conftest.$ac_ext <<EOF
650 -#line 3576 "configure"
651 +#line 3622 "configure"
652 #include "confdefs.h"
655 @@ -3590,7 +3636,7 @@ int main() {
656 return pthread_create(&thd, NULL, thread_routine, &data);
659 -if { (eval echo configure:3594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
660 +if { (eval echo configure:3640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
664 @@ -3620,7 +3666,7 @@ fi
665 echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
667 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
668 -echo "configure:3624: checking for pthreads_lib" >&5
669 +echo "configure:3670: 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
673 @@ -3642,7 +3688,7 @@ if test "$cross_compiling" = yes; then
676 cat > conftest.$ac_ext <<EOF
677 -#line 3646 "configure"
678 +#line 3692 "configure"
679 #include "confdefs.h"
682 @@ -3660,7 +3706,7 @@ int main() {
683 return pthread_create(&thd, NULL, thread_routine, &data);
686 -if { (eval echo configure:3664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
687 +if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
691 @@ -3791,7 +3837,7 @@ ext_output=$PHP_AOLSERVER
694 echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6
695 -echo "configure:3795: checking for AOLserver support" >&5
696 +echo "configure:3841: checking for AOLserver support" >&5
698 if test "$PHP_AOLSERVER" != "no"; then
699 if test -d "$PHP_AOLSERVER/include"; then
700 @@ -4056,7 +4102,7 @@ ext_output=$PHP_APXS
703 echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6
704 -echo "configure:4060: checking for Apache 1.x module support via DSO through APXS" >&5
705 +echo "configure:4106: checking for Apache 1.x module support via DSO through APXS" >&5
707 if test "$PHP_APXS" != "no"; then
708 if test "$PHP_APXS" = "yes"; then
709 @@ -4387,7 +4433,7 @@ ext_output=$PHP_APACHE
712 echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6
713 -echo "configure:4391: checking for Apache 1.x module support" >&5
714 +echo "configure:4437: checking for Apache 1.x module support" >&5
716 if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
718 @@ -5264,7 +5310,7 @@ fi
719 php_enable_mod_charset=no
721 echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
722 -echo "configure:5268: checking whether to enable Apache charset compatibility option" >&5
723 +echo "configure:5314: 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 @@ -5296,7 +5342,7 @@ if test "$APACHE_MODULE" = "yes"; then
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:5300: checking whether $CC supports -rdynamic" >&5
732 +echo "configure:5346: 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
736 @@ -5339,7 +5385,7 @@ if test -n "$APACHE_INSTALL"; then
739 echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
740 -echo "configure:5343: checking for member fd in BUFF *" >&5
741 +echo "configure:5389: 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
745 @@ -5351,14 +5397,14 @@ else
746 CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
748 cat > conftest.$ac_ext <<EOF
749 -#line 5355 "configure"
750 +#line 5401 "configure"
751 #include "confdefs.h"
754 conn_rec *c; int fd = c->client->fd;
757 -if { (eval echo configure:5362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
758 +if { (eval echo configure:5408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
761 ac_cv_php_fd_in_buff=yes
762 @@ -5431,7 +5477,7 @@ ext_output=$PHP_APXS2FILTER
765 echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6
766 -echo "configure:5435: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
767 +echo "configure:5481: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
769 if test "$PHP_APXS2FILTER" != "no"; then
770 if test "$PHP_APXS2FILTER" = "yes"; then
771 @@ -6320,7 +6366,7 @@ ext_output=$PHP_APXS2
774 echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6
775 -echo "configure:6324: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
776 +echo "configure:6370: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
778 if test "$PHP_APXS2" != "no"; then
779 if test "$PHP_APXS2" = "yes"; then
780 @@ -7210,7 +7256,7 @@ ext_output=$PHP_APACHE_HOOKS
783 echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6
784 -echo "configure:7214: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
785 +echo "configure:7260: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
787 if test "$PHP_APACHE_HOOKS" != "no"; then
788 if test "$PHP_APACHE_HOOKS" = "yes"; then
789 @@ -7541,7 +7587,7 @@ ext_output=$PHP_APACHE_HOOKS_STATIC
792 echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6
793 -echo "configure:7545: checking for Apache 1.x (hooks) module support" >&5
794 +echo "configure:7591: checking for Apache 1.x (hooks) module support" >&5
796 if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS_STATIC" != "no"; then
798 @@ -8418,7 +8464,7 @@ fi
799 php_enable_mod_charset=no
801 echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
802 -echo "configure:8422: checking whether to enable Apache charset compatibility option" >&5
803 +echo "configure:8468: 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 @@ -8450,7 +8496,7 @@ if test "$APACHE_HOOKS_MODULE" = "yes";
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:8454: checking whether $CC supports -rdynamic" >&5
812 +echo "configure:8500: 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
816 @@ -8493,7 +8539,7 @@ if test -n "$APACHE_HOOKS_INSTALL"; then
819 echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
820 -echo "configure:8497: checking for member fd in BUFF *" >&5
821 +echo "configure:8543: 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
825 @@ -8505,14 +8551,14 @@ else
826 CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
828 cat > conftest.$ac_ext <<EOF
829 -#line 8509 "configure"
830 +#line 8555 "configure"
831 #include "confdefs.h"
834 conn_rec *c; int fd = c->client->fd;
837 -if { (eval echo configure:8516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
838 +if { (eval echo configure:8562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
841 ac_cv_php_fd_in_buff=yes
842 @@ -8586,7 +8632,7 @@ ext_output=$PHP_CAUDIUM
845 echo $ac_n "checking for Caudium support""... $ac_c" 1>&6
846 -echo "configure:8590: checking for Caudium support" >&5
847 +echo "configure:8636: checking for Caudium support" >&5
849 if test "$PHP_CAUDIUM" != "no"; then
850 if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi
851 @@ -8656,7 +8702,7 @@ if test "$PHP_CAUDIUM" != "no"; then
852 PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE`
854 echo $ac_n "checking for C includes in $PIKE_C_INCLUDE""... $ac_c" 1>&6
855 -echo "configure:8660: checking for C includes in $PIKE_C_INCLUDE" >&5
856 +echo "configure:8706: 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 @@ -8945,7 +8991,7 @@ ext_output=$PHP_CLI
863 echo $ac_n "checking for CLI build""... $ac_c" 1>&6
864 -echo "configure:8949: checking for CLI build" >&5
865 +echo "configure:8995: checking for CLI build" >&5
866 if test "$PHP_CLI" != "no"; then
868 src=$abs_srcdir/sapi/cli/Makefile.frag
869 @@ -8995,7 +9041,7 @@ echo "$ac_t""$PHP_CLI" 1>&6
870 php_with_continuity=no
872 echo $ac_n "checking for Continuity support""... $ac_c" 1>&6
873 -echo "configure:8999: checking for Continuity support" >&5
874 +echo "configure:9045: 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 @@ -9019,7 +9065,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; }
881 echo $ac_n "checking for Continuity include files""... $ac_c" 1>&6
882 -echo "configure:9023: checking for Continuity include files" >&5
883 +echo "configure:9069: 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 @@ -9277,7 +9323,7 @@ ext_output=$PHP_EMBED
890 echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6
891 -echo "configure:9281: checking for embedded SAPI library support" >&5
892 +echo "configure:9327: checking for embedded SAPI library support" >&5
894 if test "$PHP_EMBED" != "no"; then
896 @@ -9541,7 +9587,7 @@ ext_output=$PHP_FPM
899 echo $ac_n "checking for FPM build""... $ac_c" 1>&6
900 -echo "configure:9545: checking for FPM build" >&5
901 +echo "configure:9591: checking for FPM build" >&5
902 if test "$PHP_FPM" != "no"; then
903 echo "$ac_t""$PHP_FPM" 1>&6
905 @@ -9549,12 +9595,12 @@ if test "$PHP_FPM" != "no"; then
906 for ac_func in setenv clearenv setproctitle
908 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
909 -echo "configure:9553: checking for $ac_func" >&5
910 +echo "configure:9599: 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
914 cat > conftest.$ac_ext <<EOF
915 -#line 9558 "configure"
916 +#line 9604 "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 @@ -9577,7 +9623,7 @@ $ac_func();
924 -if { (eval echo configure:9581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
925 +if { (eval echo configure:9627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
927 eval "ac_cv_func_$ac_func=yes"
929 @@ -9604,14 +9650,14 @@ done
932 echo $ac_n "checking for library containing socket""... $ac_c" 1>&6
933 -echo "configure:9608: checking for library containing socket" >&5
934 +echo "configure:9654: 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
938 ac_func_search_save_LIBS="$LIBS"
939 ac_cv_search_socket="no"
940 cat > conftest.$ac_ext <<EOF
941 -#line 9615 "configure"
942 +#line 9661 "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 @@ -9622,7 +9668,7 @@ int main() {
950 -if { (eval echo configure:9626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
951 +if { (eval echo configure:9672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
953 ac_cv_search_socket="none required"
955 @@ -9633,7 +9679,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 9637 "configure"
960 +#line 9683 "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 @@ -9644,7 +9690,7 @@ int main() {
968 -if { (eval echo configure:9648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
969 +if { (eval echo configure:9694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
971 ac_cv_search_socket="-l$i"
973 @@ -9666,14 +9712,14 @@ else :
976 echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6
977 -echo "configure:9670: checking for library containing inet_addr" >&5
978 +echo "configure:9716: 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
982 ac_func_search_save_LIBS="$LIBS"
983 ac_cv_search_inet_addr="no"
984 cat > conftest.$ac_ext <<EOF
985 -#line 9677 "configure"
986 +#line 9723 "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 @@ -9684,7 +9730,7 @@ int main() {
994 -if { (eval echo configure:9688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
995 +if { (eval echo configure:9734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
997 ac_cv_search_inet_addr="none required"
999 @@ -9695,7 +9741,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 9699 "configure"
1004 +#line 9745 "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 @@ -9706,7 +9752,7 @@ int main() {
1012 -if { (eval echo configure:9710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1013 +if { (eval echo configure:9756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1015 ac_cv_search_inet_addr="-l$i"
1017 @@ -9731,17 +9777,17 @@ fi
1019 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1020 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1021 -echo "configure:9735: checking for $ac_hdr" >&5
1022 +echo "configure:9781: 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
1026 cat > conftest.$ac_ext <<EOF
1027 -#line 9740 "configure"
1028 +#line 9786 "configure"
1029 #include "confdefs.h"
1032 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1033 -{ (eval echo configure:9745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1034 +{ (eval echo configure:9791: \"$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
1038 @@ -9771,17 +9817,17 @@ done
1040 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1041 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1042 -echo "configure:9775: checking for $ac_hdr" >&5
1043 +echo "configure:9821: 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
1047 cat > conftest.$ac_ext <<EOF
1048 -#line 9780 "configure"
1049 +#line 9826 "configure"
1050 #include "confdefs.h"
1053 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1054 -{ (eval echo configure:9785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1055 +{ (eval echo configure:9831: \"$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
1059 @@ -9811,17 +9857,17 @@ done
1061 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1062 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1063 -echo "configure:9815: checking for $ac_hdr" >&5
1064 +echo "configure:9861: 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
1068 cat > conftest.$ac_ext <<EOF
1069 -#line 9820 "configure"
1070 +#line 9866 "configure"
1071 #include "confdefs.h"
1074 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1075 -{ (eval echo configure:9825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1076 +{ (eval echo configure:9871: \"$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
1080 @@ -9850,17 +9896,17 @@ done
1083 echo $ac_n "checking for prctl""... $ac_c" 1>&6
1084 -echo "configure:9854: checking for prctl" >&5
1085 +echo "configure:9900: checking for prctl" >&5
1087 cat > conftest.$ac_ext <<EOF
1088 -#line 9857 "configure"
1089 +#line 9903 "configure"
1090 #include "confdefs.h"
1091 #include <sys/prctl.h>
1093 prctl(0, 0, 0, 0, 0);
1096 -if { (eval echo configure:9864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1097 +if { (eval echo configure:9910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1100 cat >> confdefs.h <<\EOF
1101 @@ -9883,17 +9929,17 @@ rm -f conftest*
1102 have_clock_gettime=no
1104 echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6
1105 -echo "configure:9887: checking for clock_gettime" >&5
1106 +echo "configure:9933: checking for clock_gettime" >&5
1108 cat > conftest.$ac_ext <<EOF
1109 -#line 9890 "configure"
1110 +#line 9936 "configure"
1111 #include "confdefs.h"
1114 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
1117 -if { (eval echo configure:9897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1118 +if { (eval echo configure:9943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1121 have_clock_gettime=yes
1122 @@ -9911,20 +9957,20 @@ rm -f conftest*
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:9915: checking for clock_gettime in -lrt" >&5
1127 +echo "configure:9961: checking for clock_gettime in -lrt" >&5
1132 cat > conftest.$ac_ext <<EOF
1133 -#line 9921 "configure"
1134 +#line 9967 "configure"
1135 #include "confdefs.h"
1138 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
1141 -if { (eval echo configure:9928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1142 +if { (eval echo configure:9974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1145 have_clock_gettime=yes
1146 @@ -9953,13 +9999,13 @@ EOF
1148 if test "$have_clock_gettime" = "no"; then
1149 echo $ac_n "checking for clock_get_time""... $ac_c" 1>&6
1150 -echo "configure:9957: checking for clock_get_time" >&5
1151 +echo "configure:10003: checking for clock_get_time" >&5
1153 if test "$cross_compiling" = yes; then
1154 { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1156 cat > conftest.$ac_ext <<EOF
1157 -#line 9963 "configure"
1158 +#line 10009 "configure"
1159 #include "confdefs.h"
1160 #include <mach/mach.h>
1161 #include <mach/clock.h>
1162 @@ -9983,7 +10029,7 @@ else
1166 -if { (eval echo configure:9987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1167 +if { (eval echo configure:10033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1170 have_clock_get_time=yes
1171 @@ -10014,10 +10060,10 @@ EOF
1172 have_broken_ptrace=no
1174 echo $ac_n "checking for ptrace""... $ac_c" 1>&6
1175 -echo "configure:10018: checking for ptrace" >&5
1176 +echo "configure:10064: checking for ptrace" >&5
1178 cat > conftest.$ac_ext <<EOF
1179 -#line 10021 "configure"
1180 +#line 10067 "configure"
1181 #include "confdefs.h"
1183 #include <sys/types.h>
1184 @@ -10026,7 +10072,7 @@ int main() {
1185 ptrace(0, 0, (void *) 0, 0);
1188 -if { (eval echo configure:10030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1189 +if { (eval echo configure:10076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1193 @@ -10044,13 +10090,13 @@ rm -f conftest*
1195 if test "$have_ptrace" = "yes"; then
1196 echo $ac_n "checking whether ptrace works""... $ac_c" 1>&6
1197 -echo "configure:10048: checking whether ptrace works" >&5
1198 +echo "configure:10094: checking whether ptrace works" >&5
1200 if test "$cross_compiling" = yes; then
1201 { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1203 cat > conftest.$ac_ext <<EOF
1204 -#line 10054 "configure"
1205 +#line 10100 "configure"
1206 #include "confdefs.h"
1209 @@ -10121,7 +10167,7 @@ else
1213 -if { (eval echo configure:10125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1214 +if { (eval echo configure:10171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1217 echo "$ac_t""yes" 1>&6
1218 @@ -10152,10 +10198,10 @@ EOF
1220 if test "$have_broken_ptrace" = "yes"; then
1221 echo $ac_n "checking for mach_vm_read""... $ac_c" 1>&6
1222 -echo "configure:10156: checking for mach_vm_read" >&5
1223 +echo "configure:10202: checking for mach_vm_read" >&5
1225 cat > conftest.$ac_ext <<EOF
1226 -#line 10159 "configure"
1227 +#line 10205 "configure"
1228 #include "confdefs.h"
1229 #include <mach/mach.h>
1230 #include <mach/mach_vm.h>
1231 @@ -10166,7 +10212,7 @@ int main() {
1235 -if { (eval echo configure:10170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1236 +if { (eval echo configure:10216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1239 have_mach_vm_read=yes
1240 @@ -10202,13 +10248,13 @@ EOF
1242 if test -n "$proc_mem_file" ; then
1243 echo $ac_n "checking for proc mem file""... $ac_c" 1>&6
1244 -echo "configure:10206: checking for proc mem file" >&5
1245 +echo "configure:10252: checking for proc mem file" >&5
1247 if test "$cross_compiling" = yes; then
1248 { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
1250 cat > conftest.$ac_ext <<EOF
1251 -#line 10212 "configure"
1252 +#line 10258 "configure"
1253 #include "confdefs.h"
1256 @@ -10238,7 +10284,7 @@ else
1260 -if { (eval echo configure:10242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1261 +if { (eval echo configure:10288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1264 echo "$ac_t""$proc_mem_file" 1>&6
1265 @@ -10282,9 +10328,9 @@ EOF
1268 echo $ac_n "checking if gcc supports __sync_bool_compare_and_swap""... $ac_c" 1>&6
1269 -echo "configure:10286: checking if gcc supports __sync_bool_compare_and_swap" >&5
1270 +echo "configure:10332: checking if gcc supports __sync_bool_compare_and_swap" >&5
1271 cat > conftest.$ac_ext <<EOF
1272 -#line 10288 "configure"
1273 +#line 10334 "configure"
1274 #include "confdefs.h"
1277 @@ -10295,7 +10341,7 @@ int main() {
1281 -if { (eval echo configure:10299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1282 +if { (eval echo configure:10345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1285 echo "$ac_t""yes" 1>&6
1286 @@ -10318,17 +10364,17 @@ rm -f conftest*
1289 echo $ac_n "checking for TCP_INFO""... $ac_c" 1>&6
1290 -echo "configure:10322: checking for TCP_INFO" >&5
1291 +echo "configure:10368: checking for TCP_INFO" >&5
1293 cat > conftest.$ac_ext <<EOF
1294 -#line 10325 "configure"
1295 +#line 10371 "configure"
1296 #include "confdefs.h"
1297 #include <netinet/tcp.h>
1299 struct tcp_info ti; int x = TCP_INFO;
1302 -if { (eval echo configure:10332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1303 +if { (eval echo configure:10378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1307 @@ -10353,17 +10399,17 @@ EOF
1309 if test "$have_lq" = "no" ; then
1310 echo $ac_n "checking for SO_LISTENQLEN""... $ac_c" 1>&6
1311 -echo "configure:10357: checking for SO_LISTENQLEN" >&5
1312 +echo "configure:10403: checking for SO_LISTENQLEN" >&5
1314 cat > conftest.$ac_ext <<EOF
1315 -#line 10360 "configure"
1316 +#line 10406 "configure"
1317 #include "confdefs.h"
1318 #include <sys/socket.h>
1320 int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN;
1323 -if { (eval echo configure:10367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1324 +if { (eval echo configure:10413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1328 @@ -10389,17 +10435,17 @@ EOF
1331 echo $ac_n "checking for sysconf""... $ac_c" 1>&6
1332 -echo "configure:10393: checking for sysconf" >&5
1333 +echo "configure:10439: checking for sysconf" >&5
1335 cat > conftest.$ac_ext <<EOF
1336 -#line 10396 "configure"
1337 +#line 10442 "configure"
1338 #include "confdefs.h"
1341 sysconf(_SC_CLK_TCK);
1344 -if { (eval echo configure:10403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1345 +if { (eval echo configure:10449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1348 cat >> confdefs.h <<\EOF
1349 @@ -10420,17 +10466,17 @@ rm -f conftest*
1352 echo $ac_n "checking for times""... $ac_c" 1>&6
1353 -echo "configure:10424: checking for times" >&5
1354 +echo "configure:10470: checking for times" >&5
1356 cat > conftest.$ac_ext <<EOF
1357 -#line 10427 "configure"
1358 +#line 10473 "configure"
1359 #include "confdefs.h"
1360 #include <sys/times.h>
1362 struct tms t; times(&t);
1365 -if { (eval echo configure:10434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1366 +if { (eval echo configure:10480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1369 cat >> confdefs.h <<\EOF
1370 @@ -10802,7 +10848,7 @@ fi
1373 echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6
1374 -echo "configure:10806: checking for Zeus ISAPI support" >&5
1375 +echo "configure:10852: checking for Zeus ISAPI support" >&5
1376 # Check whether --with-isapi or --without-isapi was given.
1377 if test "${with_isapi+set}" = set; then
1378 withval="$with_isapi"
1379 @@ -11056,7 +11102,7 @@ fi
1382 echo $ac_n "checking for LiteSpeed support""... $ac_c" 1>&6
1383 -echo "configure:11060: checking for LiteSpeed support" >&5
1384 +echo "configure:11106: checking for LiteSpeed support" >&5
1387 php_with_litespeed=no
1388 @@ -11319,7 +11365,7 @@ echo "$ac_t""$PHP_LITESPEED" 1>&6
1391 echo $ac_n "checking for Milter support""... $ac_c" 1>&6
1392 -echo "configure:11323: checking for Milter support" >&5
1393 +echo "configure:11369: checking for Milter support" >&5
1394 # Check whether --with-milter or --without-milter was given.
1395 if test "${with_milter+set}" = set; then
1396 withval="$with_milter"
1397 @@ -11611,7 +11657,7 @@ fi
1400 echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6
1401 -echo "configure:11615: checking for NSAPI support" >&5
1402 +echo "configure:11661: checking for NSAPI support" >&5
1403 # Check whether --with-nsapi or --without-nsapi was given.
1404 if test "${with_nsapi+set}" = set; then
1405 withval="$with_nsapi"
1406 @@ -11635,7 +11681,7 @@ if test "$PHP_NSAPI" != "no"; then
1407 { echo "configure: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" 1>&2; exit 1; }
1409 echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6
1410 -echo "configure:11639: checking for NSAPI include files" >&5
1411 +echo "configure:11685: checking for NSAPI include files" >&5
1412 if test -d $PHP_NSAPI/include ; then
1413 NSAPI_INC_DIR="$PHP_NSAPI/include"
1414 echo "$ac_t""Netscape 3.x / Sun 7.x style" 1>&6
1415 @@ -11643,17 +11689,17 @@ echo "configure:11639: checking for NSAP
1417 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1418 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1419 -echo "configure:11647: checking for $ac_hdr" >&5
1420 +echo "configure:11693: checking for $ac_hdr" >&5
1421 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1422 echo $ac_n "(cached) $ac_c" 1>&6
1424 cat > conftest.$ac_ext <<EOF
1425 -#line 11652 "configure"
1426 +#line 11698 "configure"
1427 #include "confdefs.h"
1430 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1431 -{ (eval echo configure:11657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1432 +{ (eval echo configure:11703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1433 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1434 if test -z "$ac_err"; then
1436 @@ -11688,17 +11734,17 @@ done
1438 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1439 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1440 -echo "configure:11692: checking for $ac_hdr" >&5
1441 +echo "configure:11738: checking for $ac_hdr" >&5
1442 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1443 echo $ac_n "(cached) $ac_c" 1>&6
1445 cat > conftest.$ac_ext <<EOF
1446 -#line 11697 "configure"
1447 +#line 11743 "configure"
1448 #include "confdefs.h"
1451 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1452 -{ (eval echo configure:11702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1453 +{ (eval echo configure:11748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1454 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1455 if test -z "$ac_err"; then
1457 @@ -11971,7 +12017,7 @@ fi
1460 echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6
1461 -echo "configure:11975: checking for PHTTPD support" >&5
1462 +echo "configure:12021: checking for PHTTPD support" >&5
1463 # Check whether --with-phttpd or --without-phttpd was given.
1464 if test "${with_phttpd+set}" = set; then
1465 withval="$with_phttpd"
1466 @@ -12225,7 +12271,7 @@ fi
1469 echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6
1470 -echo "configure:12229: checking for Pi3Web support" >&5
1471 +echo "configure:12275: checking for Pi3Web support" >&5
1472 # Check whether --with-pi3web or --without-pi3web was given.
1473 if test "${with_pi3web+set}" = set; then
1474 withval="$with_pi3web"
1475 @@ -12597,7 +12643,7 @@ ext_output=$PHP_ROXEN
1476 php_enable_roxen_zts=no
1478 echo $ac_n "checking whether Roxen module is build using ZTS""... $ac_c" 1>&6
1479 -echo "configure:12601: checking whether Roxen module is build using ZTS" >&5
1480 +echo "configure:12647: checking whether Roxen module is build using ZTS" >&5
1481 # Check whether --enable-roxen-zts or --disable-roxen-zts was given.
1482 if test "${enable_roxen_zts+set}" = set; then
1483 enableval="$enable_roxen_zts"
1484 @@ -12618,7 +12664,7 @@ echo "$ac_t""$ext_output" 1>&6
1487 echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6
1488 -echo "configure:12622: checking for Roxen/Pike support" >&5
1489 +echo "configure:12668: checking for Roxen/Pike support" >&5
1490 if test "$PHP_ROXEN" != "no"; then
1491 if test ! -d $PHP_ROXEN ; then
1492 { echo "configure: error: You did not specify a directory" 1>&2; exit 1; }
1493 @@ -12904,7 +12950,7 @@ ext_output=$PHP_THTTPD
1496 echo $ac_n "checking for thttpd""... $ac_c" 1>&6
1497 -echo "configure:12908: checking for thttpd" >&5
1498 +echo "configure:12954: checking for thttpd" >&5
1500 if test "$PHP_THTTPD" != "no"; then
1501 if test ! -d $PHP_THTTPD; then
1502 @@ -12937,7 +12983,7 @@ if test "$PHP_THTTPD" != "no"; then
1504 gcc_arg_name=ac_cv_gcc_arg_rdynamic
1505 echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
1506 -echo "configure:12941: checking whether $CC supports -rdynamic" >&5
1507 +echo "configure:12987: checking whether $CC supports -rdynamic" >&5
1508 if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
1509 echo $ac_n "(cached) $ac_c" 1>&6
1511 @@ -13173,24 +13219,24 @@ ext_output=$PHP_TUX
1514 echo $ac_n "checking for TUX""... $ac_c" 1>&6
1515 -echo "configure:13177: checking for TUX" >&5
1516 +echo "configure:13223: checking for TUX" >&5
1517 if test "$PHP_TUX" != "no"; then
1518 INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so"
1519 for ac_hdr in tuxmodule.h
1521 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1522 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1523 -echo "configure:13184: checking for $ac_hdr" >&5
1524 +echo "configure:13230: checking for $ac_hdr" >&5
1525 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1526 echo $ac_n "(cached) $ac_c" 1>&6
1528 cat > conftest.$ac_ext <<EOF
1529 -#line 13189 "configure"
1530 +#line 13235 "configure"
1531 #include "confdefs.h"
1534 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1535 -{ (eval echo configure:13194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1536 +{ (eval echo configure:13240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1537 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1538 if test -z "$ac_err"; then
1540 @@ -13427,7 +13473,7 @@ ext_output=$PHP_WEBJAMES
1543 echo $ac_n "checking for webjames""... $ac_c" 1>&6
1544 -echo "configure:13431: checking for webjames" >&5
1545 +echo "configure:13477: checking for webjames" >&5
1547 if test "$PHP_WEBJAMES" != "no"; then
1549 @@ -13687,14 +13733,14 @@ ext_output=$PHP_CGI
1551 if test "$PHP_SAPI" = "default"; then
1552 echo $ac_n "checking whether to build CGI binary""... $ac_c" 1>&6
1553 -echo "configure:13691: checking whether to build CGI binary" >&5
1554 +echo "configure:13737: checking whether to build CGI binary" >&5
1555 if test "$PHP_CGI" != "no"; then
1556 echo "$ac_t""yes" 1>&6
1558 echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
1559 -echo "configure:13696: checking for socklen_t in sys/socket.h" >&5
1560 +echo "configure:13742: checking for socklen_t in sys/socket.h" >&5
1561 cat > conftest.$ac_ext <<EOF
1562 -#line 13698 "configure"
1563 +#line 13744 "configure"
1564 #include "confdefs.h"
1565 #include <sys/socket.h>
1567 @@ -13714,9 +13760,9 @@ rm -f conftest*
1570 echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6
1571 -echo "configure:13718: checking for sun_len in sys/un.h" >&5
1572 +echo "configure:13764: checking for sun_len in sys/un.h" >&5
1573 cat > conftest.$ac_ext <<EOF
1574 -#line 13720 "configure"
1575 +#line 13766 "configure"
1576 #include "confdefs.h"
1579 @@ -13736,7 +13782,7 @@ rm -f conftest*
1582 echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6
1583 -echo "configure:13740: checking whether cross-process locking is required by accept()" >&5
1584 +echo "configure:13786: checking whether cross-process locking is required by accept()" >&5
1585 case "`uname -sr`" in
1586 IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)
1587 echo "$ac_t""yes" 1>&6
1588 @@ -13980,7 +14026,7 @@ fi
1591 echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6
1592 -echo "configure:13984: checking for chosen SAPI module" >&5
1593 +echo "configure:14030: checking for chosen SAPI module" >&5
1594 echo "$ac_t""$PHP_SAPI" 1>&6
1596 if test "$enable_maintainer_zts" = "yes"; then
1597 @@ -14037,7 +14083,7 @@ fi
1598 # Extract the first word of "sendmail", so it can be a program name with args.
1599 set dummy sendmail; ac_word=$2
1600 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1601 -echo "configure:14041: checking for $ac_word" >&5
1602 +echo "configure:14087: checking for $ac_word" >&5
1603 if eval "test \"`echo '$''{'ac_cv_path_PROG_SENDMAIL'+set}'`\" = set"; then
1604 echo $ac_n "(cached) $ac_c" 1>&6
1606 @@ -14076,7 +14122,7 @@ fi
1609 echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6
1610 -echo "configure:14080: checking whether system uses EBCDIC" >&5
1611 +echo "configure:14126: checking whether system uses EBCDIC" >&5
1612 if eval "test \"`echo '$''{'ac_cv_ebcdic'+set}'`\" = set"; then
1613 echo $ac_n "(cached) $ac_c" 1>&6
1615 @@ -14087,7 +14133,7 @@ else
1618 cat > conftest.$ac_ext <<EOF
1619 -#line 14091 "configure"
1620 +#line 14137 "configure"
1621 #include "confdefs.h"
1624 @@ -14095,7 +14141,7 @@ int main(void) {
1628 -if { (eval echo configure:14099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1629 +if { (eval echo configure:14145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1633 @@ -14123,7 +14169,7 @@ EOF
1636 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
1637 -echo "configure:14127: checking whether byte ordering is bigendian" >&5
1638 +echo "configure:14173: checking whether byte ordering is bigendian" >&5
1639 if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
1640 echo $ac_n "(cached) $ac_c" 1>&6
1642 @@ -14133,7 +14179,7 @@ else
1643 ac_cv_c_bigendian_php=unknown
1645 cat > conftest.$ac_ext <<EOF
1646 -#line 14137 "configure"
1647 +#line 14183 "configure"
1648 #include "confdefs.h"
1651 @@ -14149,7 +14195,7 @@ int main(void)
1655 -if { (eval echo configure:14153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1656 +if { (eval echo configure:14199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1658 ac_cv_c_bigendian_php=yes
1660 @@ -14175,7 +14221,7 @@ EOF
1663 echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6
1664 -echo "configure:14179: checking whether writing to stdout works" >&5
1665 +echo "configure:14225: checking whether writing to stdout works" >&5
1666 if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then
1667 echo $ac_n "(cached) $ac_c" 1>&6
1669 @@ -14186,7 +14232,7 @@ else
1672 cat > conftest.$ac_ext <<EOF
1673 -#line 14190 "configure"
1674 +#line 14236 "configure"
1675 #include "confdefs.h"
1677 #ifdef HAVE_UNISTD_H
1678 @@ -14204,7 +14250,7 @@ main()
1682 -if { (eval echo configure:14208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1683 +if { (eval echo configure:14254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1686 ac_cv_write_stdout=yes
1687 @@ -14279,12 +14325,12 @@ test -d /usr/ucblib &&
1690 echo $ac_n "checking for socket""... $ac_c" 1>&6
1691 -echo "configure:14283: checking for socket" >&5
1692 +echo "configure:14329: checking for socket" >&5
1693 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
1694 echo $ac_n "(cached) $ac_c" 1>&6
1696 cat > conftest.$ac_ext <<EOF
1697 -#line 14288 "configure"
1698 +#line 14334 "configure"
1699 #include "confdefs.h"
1700 /* System header to define __stub macros and hopefully few prototypes,
1701 which can conflict with char socket(); below. */
1702 @@ -14307,7 +14353,7 @@ socket();
1706 -if { (eval echo configure:14311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1707 +if { (eval echo configure:14357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1709 eval "ac_cv_func_socket=yes"
1711 @@ -14325,12 +14371,12 @@ if eval "test \"`echo '$ac_cv_func_'sock
1713 echo "$ac_t""no" 1>&6
1714 echo $ac_n "checking for __socket""... $ac_c" 1>&6
1715 -echo "configure:14329: checking for __socket" >&5
1716 +echo "configure:14375: checking for __socket" >&5
1717 if eval "test \"`echo '$''{'ac_cv_func___socket'+set}'`\" = set"; then
1718 echo $ac_n "(cached) $ac_c" 1>&6
1720 cat > conftest.$ac_ext <<EOF
1721 -#line 14334 "configure"
1722 +#line 14380 "configure"
1723 #include "confdefs.h"
1724 /* System header to define __stub macros and hopefully few prototypes,
1725 which can conflict with char __socket(); below. */
1726 @@ -14353,7 +14399,7 @@ __socket();
1730 -if { (eval echo configure:14357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1731 +if { (eval echo configure:14403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1733 eval "ac_cv_func___socket=yes"
1735 @@ -14391,7 +14437,7 @@ EOF
1736 unset ac_cv_lib_socket___socket
1738 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
1739 -echo "configure:14395: checking for socket in -lsocket" >&5
1740 +echo "configure:14441: checking for socket in -lsocket" >&5
1741 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
1742 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1743 echo $ac_n "(cached) $ac_c" 1>&6
1744 @@ -14399,7 +14445,7 @@ else
1745 ac_save_LIBS="$LIBS"
1746 LIBS="-lsocket $LIBS"
1747 cat > conftest.$ac_ext <<EOF
1748 -#line 14403 "configure"
1749 +#line 14449 "configure"
1750 #include "confdefs.h"
1751 /* Override any gcc2 internal prototype to avoid an error. */
1752 /* We use char because int might match the return type of a gcc2
1753 @@ -14410,7 +14456,7 @@ int main() {
1757 -if { (eval echo configure:14414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1758 +if { (eval echo configure:14460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1760 eval "ac_cv_lib_$ac_lib_var=yes"
1762 @@ -14430,7 +14476,7 @@ else
1763 echo "$ac_t""no" 1>&6
1765 echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6
1766 -echo "configure:14434: checking for __socket in -lsocket" >&5
1767 +echo "configure:14480: checking for __socket in -lsocket" >&5
1768 ac_lib_var=`echo socket'_'__socket | sed 'y%./+-%__p_%'`
1769 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1770 echo $ac_n "(cached) $ac_c" 1>&6
1771 @@ -14438,7 +14484,7 @@ else
1772 ac_save_LIBS="$LIBS"
1773 LIBS="-lsocket $LIBS"
1774 cat > conftest.$ac_ext <<EOF
1775 -#line 14442 "configure"
1776 +#line 14488 "configure"
1777 #include "confdefs.h"
1778 /* Override any gcc2 internal prototype to avoid an error. */
1779 /* We use char because int might match the return type of a gcc2
1780 @@ -14449,7 +14495,7 @@ int main() {
1784 -if { (eval echo configure:14453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1785 +if { (eval echo configure:14499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1787 eval "ac_cv_lib_$ac_lib_var=yes"
1789 @@ -14481,11 +14527,11 @@ fi
1792 cat > conftest.$ac_ext <<EOF
1793 -#line 14485 "configure"
1794 +#line 14531 "configure"
1795 #include "confdefs.h"
1796 main() { return (0); }
1798 -if { (eval echo configure:14489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1799 +if { (eval echo configure:14535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1803 @@ -14536,12 +14582,12 @@ EOF
1806 echo $ac_n "checking for socketpair""... $ac_c" 1>&6
1807 -echo "configure:14540: checking for socketpair" >&5
1808 +echo "configure:14586: checking for socketpair" >&5
1809 if eval "test \"`echo '$''{'ac_cv_func_socketpair'+set}'`\" = set"; then
1810 echo $ac_n "(cached) $ac_c" 1>&6
1812 cat > conftest.$ac_ext <<EOF
1813 -#line 14545 "configure"
1814 +#line 14591 "configure"
1815 #include "confdefs.h"
1816 /* System header to define __stub macros and hopefully few prototypes,
1817 which can conflict with char socketpair(); below. */
1818 @@ -14564,7 +14610,7 @@ socketpair();
1822 -if { (eval echo configure:14568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1823 +if { (eval echo configure:14614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1825 eval "ac_cv_func_socketpair=yes"
1827 @@ -14582,12 +14628,12 @@ if eval "test \"`echo '$ac_cv_func_'sock
1829 echo "$ac_t""no" 1>&6
1830 echo $ac_n "checking for __socketpair""... $ac_c" 1>&6
1831 -echo "configure:14586: checking for __socketpair" >&5
1832 +echo "configure:14632: checking for __socketpair" >&5
1833 if eval "test \"`echo '$''{'ac_cv_func___socketpair'+set}'`\" = set"; then
1834 echo $ac_n "(cached) $ac_c" 1>&6
1836 cat > conftest.$ac_ext <<EOF
1837 -#line 14591 "configure"
1838 +#line 14637 "configure"
1839 #include "confdefs.h"
1840 /* System header to define __stub macros and hopefully few prototypes,
1841 which can conflict with char __socketpair(); below. */
1842 @@ -14610,7 +14656,7 @@ __socketpair();
1846 -if { (eval echo configure:14614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1847 +if { (eval echo configure:14660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1849 eval "ac_cv_func___socketpair=yes"
1851 @@ -14648,7 +14694,7 @@ EOF
1852 unset ac_cv_lib_socket___socketpair
1854 echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6
1855 -echo "configure:14652: checking for socketpair in -lsocket" >&5
1856 +echo "configure:14698: checking for socketpair in -lsocket" >&5
1857 ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'`
1858 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1859 echo $ac_n "(cached) $ac_c" 1>&6
1860 @@ -14656,7 +14702,7 @@ else
1861 ac_save_LIBS="$LIBS"
1862 LIBS="-lsocket $LIBS"
1863 cat > conftest.$ac_ext <<EOF
1864 -#line 14660 "configure"
1865 +#line 14706 "configure"
1866 #include "confdefs.h"
1867 /* Override any gcc2 internal prototype to avoid an error. */
1868 /* We use char because int might match the return type of a gcc2
1869 @@ -14667,7 +14713,7 @@ int main() {
1873 -if { (eval echo configure:14671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1874 +if { (eval echo configure:14717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1876 eval "ac_cv_lib_$ac_lib_var=yes"
1878 @@ -14687,7 +14733,7 @@ else
1879 echo "$ac_t""no" 1>&6
1881 echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6
1882 -echo "configure:14691: checking for __socketpair in -lsocket" >&5
1883 +echo "configure:14737: checking for __socketpair in -lsocket" >&5
1884 ac_lib_var=`echo socket'_'__socketpair | sed 'y%./+-%__p_%'`
1885 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1886 echo $ac_n "(cached) $ac_c" 1>&6
1887 @@ -14695,7 +14741,7 @@ else
1888 ac_save_LIBS="$LIBS"
1889 LIBS="-lsocket $LIBS"
1890 cat > conftest.$ac_ext <<EOF
1891 -#line 14699 "configure"
1892 +#line 14745 "configure"
1893 #include "confdefs.h"
1894 /* Override any gcc2 internal prototype to avoid an error. */
1895 /* We use char because int might match the return type of a gcc2
1896 @@ -14706,7 +14752,7 @@ int main() {
1900 -if { (eval echo configure:14710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1901 +if { (eval echo configure:14756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1903 eval "ac_cv_lib_$ac_lib_var=yes"
1905 @@ -14738,11 +14784,11 @@ fi
1908 cat > conftest.$ac_ext <<EOF
1909 -#line 14742 "configure"
1910 +#line 14788 "configure"
1911 #include "confdefs.h"
1912 main() { return (0); }
1914 -if { (eval echo configure:14746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1915 +if { (eval echo configure:14792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1919 @@ -14793,12 +14839,12 @@ EOF
1922 echo $ac_n "checking for htonl""... $ac_c" 1>&6
1923 -echo "configure:14797: checking for htonl" >&5
1924 +echo "configure:14843: checking for htonl" >&5
1925 if eval "test \"`echo '$''{'ac_cv_func_htonl'+set}'`\" = set"; then
1926 echo $ac_n "(cached) $ac_c" 1>&6
1928 cat > conftest.$ac_ext <<EOF
1929 -#line 14802 "configure"
1930 +#line 14848 "configure"
1931 #include "confdefs.h"
1932 /* System header to define __stub macros and hopefully few prototypes,
1933 which can conflict with char htonl(); below. */
1934 @@ -14821,7 +14867,7 @@ htonl();
1938 -if { (eval echo configure:14825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1939 +if { (eval echo configure:14871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1941 eval "ac_cv_func_htonl=yes"
1943 @@ -14839,12 +14885,12 @@ if eval "test \"`echo '$ac_cv_func_'hton
1945 echo "$ac_t""no" 1>&6
1946 echo $ac_n "checking for __htonl""... $ac_c" 1>&6
1947 -echo "configure:14843: checking for __htonl" >&5
1948 +echo "configure:14889: checking for __htonl" >&5
1949 if eval "test \"`echo '$''{'ac_cv_func___htonl'+set}'`\" = set"; then
1950 echo $ac_n "(cached) $ac_c" 1>&6
1952 cat > conftest.$ac_ext <<EOF
1953 -#line 14848 "configure"
1954 +#line 14894 "configure"
1955 #include "confdefs.h"
1956 /* System header to define __stub macros and hopefully few prototypes,
1957 which can conflict with char __htonl(); below. */
1958 @@ -14867,7 +14913,7 @@ __htonl();
1962 -if { (eval echo configure:14871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1963 +if { (eval echo configure:14917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1965 eval "ac_cv_func___htonl=yes"
1967 @@ -14905,7 +14951,7 @@ EOF
1968 unset ac_cv_lib_socket___htonl
1970 echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6
1971 -echo "configure:14909: checking for htonl in -lsocket" >&5
1972 +echo "configure:14955: checking for htonl in -lsocket" >&5
1973 ac_lib_var=`echo socket'_'htonl | sed 'y%./+-%__p_%'`
1974 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
1975 echo $ac_n "(cached) $ac_c" 1>&6
1976 @@ -14913,7 +14959,7 @@ else
1977 ac_save_LIBS="$LIBS"
1978 LIBS="-lsocket $LIBS"
1979 cat > conftest.$ac_ext <<EOF
1980 -#line 14917 "configure"
1981 +#line 14963 "configure"
1982 #include "confdefs.h"
1983 /* Override any gcc2 internal prototype to avoid an error. */
1984 /* We use char because int might match the return type of a gcc2
1985 @@ -14924,7 +14970,7 @@ int main() {
1989 -if { (eval echo configure:14928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1990 +if { (eval echo configure:14974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1992 eval "ac_cv_lib_$ac_lib_var=yes"
1994 @@ -14944,7 +14990,7 @@ else
1995 echo "$ac_t""no" 1>&6
1997 echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6
1998 -echo "configure:14948: checking for __htonl in -lsocket" >&5
1999 +echo "configure:14994: checking for __htonl in -lsocket" >&5
2000 ac_lib_var=`echo socket'_'__htonl | sed 'y%./+-%__p_%'`
2001 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2002 echo $ac_n "(cached) $ac_c" 1>&6
2003 @@ -14952,7 +14998,7 @@ else
2004 ac_save_LIBS="$LIBS"
2005 LIBS="-lsocket $LIBS"
2006 cat > conftest.$ac_ext <<EOF
2007 -#line 14956 "configure"
2008 +#line 15002 "configure"
2009 #include "confdefs.h"
2010 /* Override any gcc2 internal prototype to avoid an error. */
2011 /* We use char because int might match the return type of a gcc2
2012 @@ -14963,7 +15009,7 @@ int main() {
2016 -if { (eval echo configure:14967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2017 +if { (eval echo configure:15013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2019 eval "ac_cv_lib_$ac_lib_var=yes"
2021 @@ -14995,11 +15041,11 @@ fi
2024 cat > conftest.$ac_ext <<EOF
2025 -#line 14999 "configure"
2026 +#line 15045 "configure"
2027 #include "confdefs.h"
2028 main() { return (0); }
2030 -if { (eval echo configure:15003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2031 +if { (eval echo configure:15049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2035 @@ -15050,12 +15096,12 @@ EOF
2038 echo $ac_n "checking for gethostname""... $ac_c" 1>&6
2039 -echo "configure:15054: checking for gethostname" >&5
2040 +echo "configure:15100: checking for gethostname" >&5
2041 if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
2042 echo $ac_n "(cached) $ac_c" 1>&6
2044 cat > conftest.$ac_ext <<EOF
2045 -#line 15059 "configure"
2046 +#line 15105 "configure"
2047 #include "confdefs.h"
2048 /* System header to define __stub macros and hopefully few prototypes,
2049 which can conflict with char gethostname(); below. */
2050 @@ -15078,7 +15124,7 @@ gethostname();
2054 -if { (eval echo configure:15082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2055 +if { (eval echo configure:15128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2057 eval "ac_cv_func_gethostname=yes"
2059 @@ -15096,12 +15142,12 @@ if eval "test \"`echo '$ac_cv_func_'geth
2061 echo "$ac_t""no" 1>&6
2062 echo $ac_n "checking for __gethostname""... $ac_c" 1>&6
2063 -echo "configure:15100: checking for __gethostname" >&5
2064 +echo "configure:15146: checking for __gethostname" >&5
2065 if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then
2066 echo $ac_n "(cached) $ac_c" 1>&6
2068 cat > conftest.$ac_ext <<EOF
2069 -#line 15105 "configure"
2070 +#line 15151 "configure"
2071 #include "confdefs.h"
2072 /* System header to define __stub macros and hopefully few prototypes,
2073 which can conflict with char __gethostname(); below. */
2074 @@ -15124,7 +15170,7 @@ __gethostname();
2078 -if { (eval echo configure:15128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2079 +if { (eval echo configure:15174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2081 eval "ac_cv_func___gethostname=yes"
2083 @@ -15162,7 +15208,7 @@ EOF
2084 unset ac_cv_lib_nsl___gethostname
2086 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
2087 -echo "configure:15166: checking for gethostname in -lnsl" >&5
2088 +echo "configure:15212: checking for gethostname in -lnsl" >&5
2089 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
2090 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2091 echo $ac_n "(cached) $ac_c" 1>&6
2092 @@ -15170,7 +15216,7 @@ else
2093 ac_save_LIBS="$LIBS"
2095 cat > conftest.$ac_ext <<EOF
2096 -#line 15174 "configure"
2097 +#line 15220 "configure"
2098 #include "confdefs.h"
2099 /* Override any gcc2 internal prototype to avoid an error. */
2100 /* We use char because int might match the return type of a gcc2
2101 @@ -15181,7 +15227,7 @@ int main() {
2105 -if { (eval echo configure:15185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2106 +if { (eval echo configure:15231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2108 eval "ac_cv_lib_$ac_lib_var=yes"
2110 @@ -15201,7 +15247,7 @@ else
2111 echo "$ac_t""no" 1>&6
2113 echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6
2114 -echo "configure:15205: checking for __gethostname in -lnsl" >&5
2115 +echo "configure:15251: checking for __gethostname in -lnsl" >&5
2116 ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'`
2117 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2118 echo $ac_n "(cached) $ac_c" 1>&6
2119 @@ -15209,7 +15255,7 @@ else
2120 ac_save_LIBS="$LIBS"
2122 cat > conftest.$ac_ext <<EOF
2123 -#line 15213 "configure"
2124 +#line 15259 "configure"
2125 #include "confdefs.h"
2126 /* Override any gcc2 internal prototype to avoid an error. */
2127 /* We use char because int might match the return type of a gcc2
2128 @@ -15220,7 +15266,7 @@ int main() {
2132 -if { (eval echo configure:15224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2133 +if { (eval echo configure:15270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2135 eval "ac_cv_lib_$ac_lib_var=yes"
2137 @@ -15252,11 +15298,11 @@ fi
2140 cat > conftest.$ac_ext <<EOF
2141 -#line 15256 "configure"
2142 +#line 15302 "configure"
2143 #include "confdefs.h"
2144 main() { return (0); }
2146 -if { (eval echo configure:15260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2147 +if { (eval echo configure:15306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2151 @@ -15307,12 +15353,12 @@ EOF
2154 echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6
2155 -echo "configure:15311: checking for gethostbyaddr" >&5
2156 +echo "configure:15357: checking for gethostbyaddr" >&5
2157 if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then
2158 echo $ac_n "(cached) $ac_c" 1>&6
2160 cat > conftest.$ac_ext <<EOF
2161 -#line 15316 "configure"
2162 +#line 15362 "configure"
2163 #include "confdefs.h"
2164 /* System header to define __stub macros and hopefully few prototypes,
2165 which can conflict with char gethostbyaddr(); below. */
2166 @@ -15335,7 +15381,7 @@ gethostbyaddr();
2170 -if { (eval echo configure:15339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2171 +if { (eval echo configure:15385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2173 eval "ac_cv_func_gethostbyaddr=yes"
2175 @@ -15353,12 +15399,12 @@ if eval "test \"`echo '$ac_cv_func_'geth
2177 echo "$ac_t""no" 1>&6
2178 echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6
2179 -echo "configure:15357: checking for __gethostbyaddr" >&5
2180 +echo "configure:15403: checking for __gethostbyaddr" >&5
2181 if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+set}'`\" = set"; then
2182 echo $ac_n "(cached) $ac_c" 1>&6
2184 cat > conftest.$ac_ext <<EOF
2185 -#line 15362 "configure"
2186 +#line 15408 "configure"
2187 #include "confdefs.h"
2188 /* System header to define __stub macros and hopefully few prototypes,
2189 which can conflict with char __gethostbyaddr(); below. */
2190 @@ -15381,7 +15427,7 @@ __gethostbyaddr();
2194 -if { (eval echo configure:15385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2195 +if { (eval echo configure:15431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2197 eval "ac_cv_func___gethostbyaddr=yes"
2199 @@ -15419,7 +15465,7 @@ EOF
2200 unset ac_cv_lib_nsl___gethostbyaddr
2202 echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
2203 -echo "configure:15423: checking for gethostbyaddr in -lnsl" >&5
2204 +echo "configure:15469: checking for gethostbyaddr in -lnsl" >&5
2205 ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
2206 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2207 echo $ac_n "(cached) $ac_c" 1>&6
2208 @@ -15427,7 +15473,7 @@ else
2209 ac_save_LIBS="$LIBS"
2211 cat > conftest.$ac_ext <<EOF
2212 -#line 15431 "configure"
2213 +#line 15477 "configure"
2214 #include "confdefs.h"
2215 /* Override any gcc2 internal prototype to avoid an error. */
2216 /* We use char because int might match the return type of a gcc2
2217 @@ -15438,7 +15484,7 @@ int main() {
2221 -if { (eval echo configure:15442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2222 +if { (eval echo configure:15488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2224 eval "ac_cv_lib_$ac_lib_var=yes"
2226 @@ -15458,7 +15504,7 @@ else
2227 echo "$ac_t""no" 1>&6
2229 echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6
2230 -echo "configure:15462: checking for __gethostbyaddr in -lnsl" >&5
2231 +echo "configure:15508: checking for __gethostbyaddr in -lnsl" >&5
2232 ac_lib_var=`echo nsl'_'__gethostbyaddr | sed 'y%./+-%__p_%'`
2233 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2234 echo $ac_n "(cached) $ac_c" 1>&6
2235 @@ -15466,7 +15512,7 @@ else
2236 ac_save_LIBS="$LIBS"
2238 cat > conftest.$ac_ext <<EOF
2239 -#line 15470 "configure"
2240 +#line 15516 "configure"
2241 #include "confdefs.h"
2242 /* Override any gcc2 internal prototype to avoid an error. */
2243 /* We use char because int might match the return type of a gcc2
2244 @@ -15477,7 +15523,7 @@ int main() {
2248 -if { (eval echo configure:15481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2249 +if { (eval echo configure:15527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2251 eval "ac_cv_lib_$ac_lib_var=yes"
2253 @@ -15509,11 +15555,11 @@ fi
2256 cat > conftest.$ac_ext <<EOF
2257 -#line 15513 "configure"
2258 +#line 15559 "configure"
2259 #include "confdefs.h"
2260 main() { return (0); }
2262 -if { (eval echo configure:15517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2263 +if { (eval echo configure:15563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2267 @@ -15564,12 +15610,12 @@ EOF
2270 echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6
2271 -echo "configure:15568: checking for yp_get_default_domain" >&5
2272 +echo "configure:15614: checking for yp_get_default_domain" >&5
2273 if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then
2274 echo $ac_n "(cached) $ac_c" 1>&6
2276 cat > conftest.$ac_ext <<EOF
2277 -#line 15573 "configure"
2278 +#line 15619 "configure"
2279 #include "confdefs.h"
2280 /* System header to define __stub macros and hopefully few prototypes,
2281 which can conflict with char yp_get_default_domain(); below. */
2282 @@ -15592,7 +15638,7 @@ yp_get_default_domain();
2286 -if { (eval echo configure:15596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2287 +if { (eval echo configure:15642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2289 eval "ac_cv_func_yp_get_default_domain=yes"
2291 @@ -15610,12 +15656,12 @@ if eval "test \"`echo '$ac_cv_func_'yp_g
2293 echo "$ac_t""no" 1>&6
2294 echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6
2295 -echo "configure:15614: checking for __yp_get_default_domain" >&5
2296 +echo "configure:15660: checking for __yp_get_default_domain" >&5
2297 if eval "test \"`echo '$''{'ac_cv_func___yp_get_default_domain'+set}'`\" = set"; then
2298 echo $ac_n "(cached) $ac_c" 1>&6
2300 cat > conftest.$ac_ext <<EOF
2301 -#line 15619 "configure"
2302 +#line 15665 "configure"
2303 #include "confdefs.h"
2304 /* System header to define __stub macros and hopefully few prototypes,
2305 which can conflict with char __yp_get_default_domain(); below. */
2306 @@ -15638,7 +15684,7 @@ __yp_get_default_domain();
2310 -if { (eval echo configure:15642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2311 +if { (eval echo configure:15688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2313 eval "ac_cv_func___yp_get_default_domain=yes"
2315 @@ -15676,7 +15722,7 @@ EOF
2316 unset ac_cv_lib_nsl___yp_get_default_domain
2318 echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6
2319 -echo "configure:15680: checking for yp_get_default_domain in -lnsl" >&5
2320 +echo "configure:15726: checking for yp_get_default_domain in -lnsl" >&5
2321 ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'`
2322 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2323 echo $ac_n "(cached) $ac_c" 1>&6
2324 @@ -15684,7 +15730,7 @@ else
2325 ac_save_LIBS="$LIBS"
2327 cat > conftest.$ac_ext <<EOF
2328 -#line 15688 "configure"
2329 +#line 15734 "configure"
2330 #include "confdefs.h"
2331 /* Override any gcc2 internal prototype to avoid an error. */
2332 /* We use char because int might match the return type of a gcc2
2333 @@ -15695,7 +15741,7 @@ int main() {
2334 yp_get_default_domain()
2337 -if { (eval echo configure:15699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2338 +if { (eval echo configure:15745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2340 eval "ac_cv_lib_$ac_lib_var=yes"
2342 @@ -15715,7 +15761,7 @@ else
2343 echo "$ac_t""no" 1>&6
2345 echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6
2346 -echo "configure:15719: checking for __yp_get_default_domain in -lnsl" >&5
2347 +echo "configure:15765: checking for __yp_get_default_domain in -lnsl" >&5
2348 ac_lib_var=`echo nsl'_'__yp_get_default_domain | sed 'y%./+-%__p_%'`
2349 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2350 echo $ac_n "(cached) $ac_c" 1>&6
2351 @@ -15723,7 +15769,7 @@ else
2352 ac_save_LIBS="$LIBS"
2354 cat > conftest.$ac_ext <<EOF
2355 -#line 15727 "configure"
2356 +#line 15773 "configure"
2357 #include "confdefs.h"
2358 /* Override any gcc2 internal prototype to avoid an error. */
2359 /* We use char because int might match the return type of a gcc2
2360 @@ -15734,7 +15780,7 @@ int main() {
2361 __yp_get_default_domain()
2364 -if { (eval echo configure:15738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2365 +if { (eval echo configure:15784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2367 eval "ac_cv_lib_$ac_lib_var=yes"
2369 @@ -15766,11 +15812,11 @@ fi
2372 cat > conftest.$ac_ext <<EOF
2373 -#line 15770 "configure"
2374 +#line 15816 "configure"
2375 #include "confdefs.h"
2376 main() { return (0); }
2378 -if { (eval echo configure:15774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2379 +if { (eval echo configure:15820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2383 @@ -15822,12 +15868,12 @@ EOF
2386 echo $ac_n "checking for dlopen""... $ac_c" 1>&6
2387 -echo "configure:15826: checking for dlopen" >&5
2388 +echo "configure:15872: checking for dlopen" >&5
2389 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
2390 echo $ac_n "(cached) $ac_c" 1>&6
2392 cat > conftest.$ac_ext <<EOF
2393 -#line 15831 "configure"
2394 +#line 15877 "configure"
2395 #include "confdefs.h"
2396 /* System header to define __stub macros and hopefully few prototypes,
2397 which can conflict with char dlopen(); below. */
2398 @@ -15850,7 +15896,7 @@ dlopen();
2402 -if { (eval echo configure:15854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2403 +if { (eval echo configure:15900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2405 eval "ac_cv_func_dlopen=yes"
2407 @@ -15868,12 +15914,12 @@ if eval "test \"`echo '$ac_cv_func_'dlop
2409 echo "$ac_t""no" 1>&6
2410 echo $ac_n "checking for __dlopen""... $ac_c" 1>&6
2411 -echo "configure:15872: checking for __dlopen" >&5
2412 +echo "configure:15918: checking for __dlopen" >&5
2413 if eval "test \"`echo '$''{'ac_cv_func___dlopen'+set}'`\" = set"; then
2414 echo $ac_n "(cached) $ac_c" 1>&6
2416 cat > conftest.$ac_ext <<EOF
2417 -#line 15877 "configure"
2418 +#line 15923 "configure"
2419 #include "confdefs.h"
2420 /* System header to define __stub macros and hopefully few prototypes,
2421 which can conflict with char __dlopen(); below. */
2422 @@ -15896,7 +15942,7 @@ __dlopen();
2426 -if { (eval echo configure:15900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2427 +if { (eval echo configure:15946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2429 eval "ac_cv_func___dlopen=yes"
2431 @@ -15934,7 +15980,7 @@ EOF
2432 unset ac_cv_lib_dl___dlopen
2434 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
2435 -echo "configure:15938: checking for dlopen in -ldl" >&5
2436 +echo "configure:15984: checking for dlopen in -ldl" >&5
2437 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
2438 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2439 echo $ac_n "(cached) $ac_c" 1>&6
2440 @@ -15942,7 +15988,7 @@ else
2441 ac_save_LIBS="$LIBS"
2443 cat > conftest.$ac_ext <<EOF
2444 -#line 15946 "configure"
2445 +#line 15992 "configure"
2446 #include "confdefs.h"
2447 /* Override any gcc2 internal prototype to avoid an error. */
2448 /* We use char because int might match the return type of a gcc2
2449 @@ -15953,7 +15999,7 @@ int main() {
2453 -if { (eval echo configure:15957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2454 +if { (eval echo configure:16003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2456 eval "ac_cv_lib_$ac_lib_var=yes"
2458 @@ -15973,7 +16019,7 @@ else
2459 echo "$ac_t""no" 1>&6
2461 echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6
2462 -echo "configure:15977: checking for __dlopen in -ldl" >&5
2463 +echo "configure:16023: checking for __dlopen in -ldl" >&5
2464 ac_lib_var=`echo dl'_'__dlopen | sed 'y%./+-%__p_%'`
2465 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2466 echo $ac_n "(cached) $ac_c" 1>&6
2467 @@ -15981,7 +16027,7 @@ else
2468 ac_save_LIBS="$LIBS"
2470 cat > conftest.$ac_ext <<EOF
2471 -#line 15985 "configure"
2472 +#line 16031 "configure"
2473 #include "confdefs.h"
2474 /* Override any gcc2 internal prototype to avoid an error. */
2475 /* We use char because int might match the return type of a gcc2
2476 @@ -15992,7 +16038,7 @@ int main() {
2480 -if { (eval echo configure:15996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2481 +if { (eval echo configure:16042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2483 eval "ac_cv_lib_$ac_lib_var=yes"
2485 @@ -16024,11 +16070,11 @@ fi
2488 cat > conftest.$ac_ext <<EOF
2489 -#line 16028 "configure"
2490 +#line 16074 "configure"
2491 #include "confdefs.h"
2492 main() { return (0); }
2494 -if { (eval echo configure:16032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2495 +if { (eval echo configure:16078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2499 @@ -16080,7 +16126,7 @@ EOF
2502 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
2503 -echo "configure:16084: checking for sin in -lm" >&5
2504 +echo "configure:16130: checking for sin in -lm" >&5
2505 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
2506 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2507 echo $ac_n "(cached) $ac_c" 1>&6
2508 @@ -16088,7 +16134,7 @@ else
2509 ac_save_LIBS="$LIBS"
2511 cat > conftest.$ac_ext <<EOF
2512 -#line 16092 "configure"
2513 +#line 16138 "configure"
2514 #include "confdefs.h"
2515 /* Override any gcc2 internal prototype to avoid an error. */
2516 /* We use char because int might match the return type of a gcc2
2517 @@ -16099,7 +16145,7 @@ int main() {
2521 -if { (eval echo configure:16103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2522 +if { (eval echo configure:16149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2524 eval "ac_cv_lib_$ac_lib_var=yes"
2526 @@ -16133,12 +16179,12 @@ fi
2529 echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
2530 -echo "configure:16137: checking for inet_aton" >&5
2531 +echo "configure:16183: checking for inet_aton" >&5
2532 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
2533 echo $ac_n "(cached) $ac_c" 1>&6
2535 cat > conftest.$ac_ext <<EOF
2536 -#line 16142 "configure"
2537 +#line 16188 "configure"
2538 #include "confdefs.h"
2539 /* System header to define __stub macros and hopefully few prototypes,
2540 which can conflict with char inet_aton(); below. */
2541 @@ -16161,7 +16207,7 @@ inet_aton();
2545 -if { (eval echo configure:16165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2546 +if { (eval echo configure:16211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2548 eval "ac_cv_func_inet_aton=yes"
2550 @@ -16179,12 +16225,12 @@ if eval "test \"`echo '$ac_cv_func_'inet
2552 echo "$ac_t""no" 1>&6
2553 echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6
2554 -echo "configure:16183: checking for __inet_aton" >&5
2555 +echo "configure:16229: checking for __inet_aton" >&5
2556 if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+set}'`\" = set"; then
2557 echo $ac_n "(cached) $ac_c" 1>&6
2559 cat > conftest.$ac_ext <<EOF
2560 -#line 16188 "configure"
2561 +#line 16234 "configure"
2562 #include "confdefs.h"
2563 /* System header to define __stub macros and hopefully few prototypes,
2564 which can conflict with char __inet_aton(); below. */
2565 @@ -16207,7 +16253,7 @@ __inet_aton();
2569 -if { (eval echo configure:16211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2570 +if { (eval echo configure:16257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2572 eval "ac_cv_func___inet_aton=yes"
2574 @@ -16245,7 +16291,7 @@ EOF
2575 unset ac_cv_lib_resolv___inet_aton
2577 echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
2578 -echo "configure:16249: checking for inet_aton in -lresolv" >&5
2579 +echo "configure:16295: checking for inet_aton in -lresolv" >&5
2580 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
2581 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2582 echo $ac_n "(cached) $ac_c" 1>&6
2583 @@ -16253,7 +16299,7 @@ else
2584 ac_save_LIBS="$LIBS"
2585 LIBS="-lresolv $LIBS"
2586 cat > conftest.$ac_ext <<EOF
2587 -#line 16257 "configure"
2588 +#line 16303 "configure"
2589 #include "confdefs.h"
2590 /* Override any gcc2 internal prototype to avoid an error. */
2591 /* We use char because int might match the return type of a gcc2
2592 @@ -16264,7 +16310,7 @@ int main() {
2596 -if { (eval echo configure:16268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2597 +if { (eval echo configure:16314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2599 eval "ac_cv_lib_$ac_lib_var=yes"
2601 @@ -16284,7 +16330,7 @@ else
2602 echo "$ac_t""no" 1>&6
2604 echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6
2605 -echo "configure:16288: checking for __inet_aton in -lresolv" >&5
2606 +echo "configure:16334: checking for __inet_aton in -lresolv" >&5
2607 ac_lib_var=`echo resolv'_'__inet_aton | sed 'y%./+-%__p_%'`
2608 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2609 echo $ac_n "(cached) $ac_c" 1>&6
2610 @@ -16292,7 +16338,7 @@ else
2611 ac_save_LIBS="$LIBS"
2612 LIBS="-lresolv $LIBS"
2613 cat > conftest.$ac_ext <<EOF
2614 -#line 16296 "configure"
2615 +#line 16342 "configure"
2616 #include "confdefs.h"
2617 /* Override any gcc2 internal prototype to avoid an error. */
2618 /* We use char because int might match the return type of a gcc2
2619 @@ -16303,7 +16349,7 @@ int main() {
2623 -if { (eval echo configure:16307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2624 +if { (eval echo configure:16353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2626 eval "ac_cv_lib_$ac_lib_var=yes"
2628 @@ -16335,11 +16381,11 @@ fi
2631 cat > conftest.$ac_ext <<EOF
2632 -#line 16339 "configure"
2633 +#line 16385 "configure"
2634 #include "confdefs.h"
2635 main() { return (0); }
2637 -if { (eval echo configure:16343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2638 +if { (eval echo configure:16389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2642 @@ -16381,7 +16427,7 @@ EOF
2643 unset ac_cv_lib_bind___inet_aton
2645 echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6
2646 -echo "configure:16385: checking for inet_aton in -lbind" >&5
2647 +echo "configure:16431: checking for inet_aton in -lbind" >&5
2648 ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'`
2649 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2650 echo $ac_n "(cached) $ac_c" 1>&6
2651 @@ -16389,7 +16435,7 @@ else
2652 ac_save_LIBS="$LIBS"
2654 cat > conftest.$ac_ext <<EOF
2655 -#line 16393 "configure"
2656 +#line 16439 "configure"
2657 #include "confdefs.h"
2658 /* Override any gcc2 internal prototype to avoid an error. */
2659 /* We use char because int might match the return type of a gcc2
2660 @@ -16400,7 +16446,7 @@ int main() {
2664 -if { (eval echo configure:16404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2665 +if { (eval echo configure:16450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2667 eval "ac_cv_lib_$ac_lib_var=yes"
2669 @@ -16420,7 +16466,7 @@ else
2670 echo "$ac_t""no" 1>&6
2672 echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6
2673 -echo "configure:16424: checking for __inet_aton in -lbind" >&5
2674 +echo "configure:16470: checking for __inet_aton in -lbind" >&5
2675 ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'`
2676 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2677 echo $ac_n "(cached) $ac_c" 1>&6
2678 @@ -16428,7 +16474,7 @@ else
2679 ac_save_LIBS="$LIBS"
2681 cat > conftest.$ac_ext <<EOF
2682 -#line 16432 "configure"
2683 +#line 16478 "configure"
2684 #include "confdefs.h"
2685 /* Override any gcc2 internal prototype to avoid an error. */
2686 /* We use char because int might match the return type of a gcc2
2687 @@ -16439,7 +16485,7 @@ int main() {
2691 -if { (eval echo configure:16443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2692 +if { (eval echo configure:16489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2694 eval "ac_cv_lib_$ac_lib_var=yes"
2696 @@ -16471,11 +16517,11 @@ fi
2699 cat > conftest.$ac_ext <<EOF
2700 -#line 16475 "configure"
2701 +#line 16521 "configure"
2702 #include "confdefs.h"
2703 main() { return (0); }
2705 -if { (eval echo configure:16479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2706 +if { (eval echo configure:16525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2710 @@ -16526,12 +16572,12 @@ EOF
2713 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
2714 -echo "configure:16530: checking for ANSI C header files" >&5
2715 +echo "configure:16576: checking for ANSI C header files" >&5
2716 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
2717 echo $ac_n "(cached) $ac_c" 1>&6
2719 cat > conftest.$ac_ext <<EOF
2720 -#line 16535 "configure"
2721 +#line 16581 "configure"
2722 #include "confdefs.h"
2725 @@ -16539,7 +16585,7 @@ else
2728 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2729 -{ (eval echo configure:16543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2730 +{ (eval echo configure:16589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2731 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2732 if test -z "$ac_err"; then
2734 @@ -16556,7 +16602,7 @@ rm -f conftest*
2735 if test $ac_cv_header_stdc = yes; then
2736 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
2737 cat > conftest.$ac_ext <<EOF
2738 -#line 16560 "configure"
2739 +#line 16606 "configure"
2740 #include "confdefs.h"
2743 @@ -16574,7 +16620,7 @@ fi
2744 if test $ac_cv_header_stdc = yes; then
2745 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
2746 cat > conftest.$ac_ext <<EOF
2747 -#line 16578 "configure"
2748 +#line 16624 "configure"
2749 #include "confdefs.h"
2752 @@ -16595,7 +16641,7 @@ if test "$cross_compiling" = yes; then
2755 cat > conftest.$ac_ext <<EOF
2756 -#line 16599 "configure"
2757 +#line 16645 "configure"
2758 #include "confdefs.h"
2760 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
2761 @@ -16606,7 +16652,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
2765 -if { (eval echo configure:16610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2766 +if { (eval echo configure:16656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2770 @@ -16634,12 +16680,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di
2772 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2773 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
2774 -echo "configure:16638: checking for $ac_hdr that defines DIR" >&5
2775 +echo "configure:16684: checking for $ac_hdr that defines DIR" >&5
2776 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
2777 echo $ac_n "(cached) $ac_c" 1>&6
2779 cat > conftest.$ac_ext <<EOF
2780 -#line 16643 "configure"
2781 +#line 16689 "configure"
2782 #include "confdefs.h"
2783 #include <sys/types.h>
2785 @@ -16647,7 +16693,7 @@ int main() {
2789 -if { (eval echo configure:16651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2790 +if { (eval echo configure:16697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2792 eval "ac_cv_header_dirent_$ac_safe=yes"
2794 @@ -16672,7 +16718,7 @@ done
2795 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
2796 if test $ac_header_dirent = dirent.h; then
2797 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
2798 -echo "configure:16676: checking for opendir in -ldir" >&5
2799 +echo "configure:16722: checking for opendir in -ldir" >&5
2800 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
2801 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2802 echo $ac_n "(cached) $ac_c" 1>&6
2803 @@ -16680,7 +16726,7 @@ else
2804 ac_save_LIBS="$LIBS"
2806 cat > conftest.$ac_ext <<EOF
2807 -#line 16684 "configure"
2808 +#line 16730 "configure"
2809 #include "confdefs.h"
2810 /* Override any gcc2 internal prototype to avoid an error. */
2811 /* We use char because int might match the return type of a gcc2
2812 @@ -16691,7 +16737,7 @@ int main() {
2816 -if { (eval echo configure:16695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2817 +if { (eval echo configure:16741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2819 eval "ac_cv_lib_$ac_lib_var=yes"
2821 @@ -16713,7 +16759,7 @@ fi
2824 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
2825 -echo "configure:16717: checking for opendir in -lx" >&5
2826 +echo "configure:16763: checking for opendir in -lx" >&5
2827 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
2828 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2829 echo $ac_n "(cached) $ac_c" 1>&6
2830 @@ -16721,7 +16767,7 @@ else
2831 ac_save_LIBS="$LIBS"
2833 cat > conftest.$ac_ext <<EOF
2834 -#line 16725 "configure"
2835 +#line 16771 "configure"
2836 #include "confdefs.h"
2837 /* Override any gcc2 internal prototype to avoid an error. */
2838 /* We use char because int might match the return type of a gcc2
2839 @@ -16732,7 +16778,7 @@ int main() {
2843 -if { (eval echo configure:16736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2844 +if { (eval echo configure:16782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2846 eval "ac_cv_lib_$ac_lib_var=yes"
2848 @@ -16814,17 +16860,17 @@ assert.h
2850 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
2851 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
2852 -echo "configure:16818: checking for $ac_hdr" >&5
2853 +echo "configure:16864: checking for $ac_hdr" >&5
2854 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
2855 echo $ac_n "(cached) $ac_c" 1>&6
2857 cat > conftest.$ac_ext <<EOF
2858 -#line 16823 "configure"
2859 +#line 16869 "configure"
2860 #include "confdefs.h"
2863 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2864 -{ (eval echo configure:16828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2865 +{ (eval echo configure:16874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2866 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
2867 if test -z "$ac_err"; then
2869 @@ -16853,12 +16899,12 @@ done
2872 echo $ac_n "checking for fopencookie""... $ac_c" 1>&6
2873 -echo "configure:16857: checking for fopencookie" >&5
2874 +echo "configure:16903: checking for fopencookie" >&5
2875 if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then
2876 echo $ac_n "(cached) $ac_c" 1>&6
2878 cat > conftest.$ac_ext <<EOF
2879 -#line 16862 "configure"
2880 +#line 16908 "configure"
2881 #include "confdefs.h"
2882 /* System header to define __stub macros and hopefully few prototypes,
2883 which can conflict with char fopencookie(); below. */
2884 @@ -16881,7 +16927,7 @@ fopencookie();
2888 -if { (eval echo configure:16885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2889 +if { (eval echo configure:16931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2891 eval "ac_cv_func_fopencookie=yes"
2893 @@ -16903,7 +16949,7 @@ fi
2895 if test "$have_glibc_fopencookie" = "yes"; then
2896 cat > conftest.$ac_ext <<EOF
2897 -#line 16907 "configure"
2898 +#line 16953 "configure"
2899 #include "confdefs.h"
2902 @@ -16913,7 +16959,7 @@ int main() {
2903 cookie_io_functions_t cookie;
2906 -if { (eval echo configure:16917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2907 +if { (eval echo configure:16963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2909 have_cookie_io_functions_t=yes
2911 @@ -16932,7 +16978,7 @@ if test "$cross_compiling" = yes; then
2914 cat > conftest.$ac_ext <<EOF
2915 -#line 16936 "configure"
2916 +#line 16982 "configure"
2917 #include "confdefs.h"
2920 @@ -16964,7 +17010,7 @@ main() {
2924 -if { (eval echo configure:16968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2925 +if { (eval echo configure:17014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2928 cookie_io_functions_use_off64_t=yes
2929 @@ -16984,7 +17030,7 @@ fi
2932 cat > conftest.$ac_ext <<EOF
2933 -#line 16988 "configure"
2934 +#line 17034 "configure"
2935 #include "confdefs.h"
2938 @@ -16994,7 +17040,7 @@ int main() {
2939 _IO_cookie_io_functions_t cookie;
2942 -if { (eval echo configure:16998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2943 +if { (eval echo configure:17044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2945 have_IO_cookie_io_functions_t=yes
2947 @@ -17028,7 +17074,7 @@ EOF
2950 echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6
2951 -echo "configure:17032: checking for broken getcwd" >&5
2952 +echo "configure:17078: checking for broken getcwd" >&5
2953 os=`uname -sr 2>/dev/null`
2956 @@ -17043,14 +17089,14 @@ EOF
2959 echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6
2960 -echo "configure:17047: checking for broken libc stdio" >&5
2961 +echo "configure:17093: checking for broken libc stdio" >&5
2962 if eval "test \"`echo '$''{'_cv_have_broken_glibc_fopen_append'+set}'`\" = set"; then
2963 echo $ac_n "(cached) $ac_c" 1>&6
2966 if test "$cross_compiling" = yes; then
2967 cat > conftest.$ac_ext <<EOF
2968 -#line 17054 "configure"
2969 +#line 17100 "configure"
2970 #include "confdefs.h"
2972 #include <features.h>
2973 @@ -17063,7 +17109,7 @@ choke me
2977 -if { (eval echo configure:17067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2978 +if { (eval echo configure:17113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
2980 _cv_have_broken_glibc_fopen_append=yes
2982 @@ -17076,7 +17122,7 @@ rm -f conftest*
2985 cat > conftest.$ac_ext <<EOF
2986 -#line 17080 "configure"
2987 +#line 17126 "configure"
2988 #include "confdefs.h"
2991 @@ -17104,7 +17150,7 @@ int main(int argc, char *argv[])
2995 -if { (eval echo configure:17108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2996 +if { (eval echo configure:17154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2998 _cv_have_broken_glibc_fopen_append=no
3000 @@ -17132,12 +17178,12 @@ EOF
3003 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
3004 -echo "configure:17136: checking whether struct tm is in sys/time.h or time.h" >&5
3005 +echo "configure:17182: checking whether struct tm is in sys/time.h or time.h" >&5
3006 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
3007 echo $ac_n "(cached) $ac_c" 1>&6
3009 cat > conftest.$ac_ext <<EOF
3010 -#line 17141 "configure"
3011 +#line 17187 "configure"
3012 #include "confdefs.h"
3013 #include <sys/types.h>
3015 @@ -17145,7 +17191,7 @@ int main() {
3016 struct tm *tp; tp->tm_sec;
3019 -if { (eval echo configure:17149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3020 +if { (eval echo configure:17195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3022 ac_cv_struct_tm=time.h
3024 @@ -17166,12 +17212,12 @@ EOF
3027 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
3028 -echo "configure:17170: checking for tm_zone in struct tm" >&5
3029 +echo "configure:17216: checking for tm_zone in struct tm" >&5
3030 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
3031 echo $ac_n "(cached) $ac_c" 1>&6
3033 cat > conftest.$ac_ext <<EOF
3034 -#line 17175 "configure"
3035 +#line 17221 "configure"
3036 #include "confdefs.h"
3037 #include <sys/types.h>
3038 #include <$ac_cv_struct_tm>
3039 @@ -17179,7 +17225,7 @@ int main() {
3040 struct tm tm; tm.tm_zone;
3043 -if { (eval echo configure:17183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3044 +if { (eval echo configure:17229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3046 ac_cv_struct_tm_zone=yes
3048 @@ -17199,12 +17245,12 @@ EOF
3051 echo $ac_n "checking for tzname""... $ac_c" 1>&6
3052 -echo "configure:17203: checking for tzname" >&5
3053 +echo "configure:17249: checking for tzname" >&5
3054 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
3055 echo $ac_n "(cached) $ac_c" 1>&6
3057 cat > conftest.$ac_ext <<EOF
3058 -#line 17208 "configure"
3059 +#line 17254 "configure"
3060 #include "confdefs.h"
3062 #ifndef tzname /* For SGI. */
3063 @@ -17214,7 +17260,7 @@ int main() {
3067 -if { (eval echo configure:17218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3068 +if { (eval echo configure:17264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3070 ac_cv_var_tzname=yes
3072 @@ -17238,16 +17284,16 @@ fi
3075 echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6
3076 -echo "configure:17242: checking for missing declarations of reentrant functions" >&5
3077 +echo "configure:17288: checking for missing declarations of reentrant functions" >&5
3078 cat > conftest.$ac_ext <<EOF
3079 -#line 17244 "configure"
3080 +#line 17290 "configure"
3081 #include "confdefs.h"
3084 struct tm *(*func)() = localtime_r
3087 -if { (eval echo configure:17251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3088 +if { (eval echo configure:17297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3092 @@ -17265,14 +17311,14 @@ EOF
3095 cat > conftest.$ac_ext <<EOF
3096 -#line 17269 "configure"
3097 +#line 17315 "configure"
3098 #include "confdefs.h"
3101 struct tm *(*func)() = gmtime_r
3104 -if { (eval echo configure:17276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3105 +if { (eval echo configure:17322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3109 @@ -17290,14 +17336,14 @@ EOF
3112 cat > conftest.$ac_ext <<EOF
3113 -#line 17294 "configure"
3114 +#line 17340 "configure"
3115 #include "confdefs.h"
3118 char *(*func)() = asctime_r
3121 -if { (eval echo configure:17301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3122 +if { (eval echo configure:17347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3126 @@ -17315,14 +17361,14 @@ EOF
3129 cat > conftest.$ac_ext <<EOF
3130 -#line 17319 "configure"
3131 +#line 17365 "configure"
3132 #include "confdefs.h"
3135 char *(*func)() = ctime_r
3138 -if { (eval echo configure:17326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3139 +if { (eval echo configure:17372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3143 @@ -17340,14 +17386,14 @@ EOF
3146 cat > conftest.$ac_ext <<EOF
3147 -#line 17344 "configure"
3148 +#line 17390 "configure"
3149 #include "confdefs.h"
3152 char *(*func)() = strtok_r
3155 -if { (eval echo configure:17351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3156 +if { (eval echo configure:17397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3160 @@ -17368,16 +17414,16 @@ rm -f conftest*
3163 echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6
3164 -echo "configure:17372: checking for fclose declaration" >&5
3165 +echo "configure:17418: checking for fclose declaration" >&5
3166 cat > conftest.$ac_ext <<EOF
3167 -#line 17374 "configure"
3168 +#line 17420 "configure"
3169 #include "confdefs.h"
3172 int (*func)() = fclose
3175 -if { (eval echo configure:17381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3176 +if { (eval echo configure:17427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3179 cat >> confdefs.h <<\EOF
3180 @@ -17403,12 +17449,12 @@ rm -f conftest*
3183 echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
3184 -echo "configure:17407: checking for tm_gmtoff in struct tm" >&5
3185 +echo "configure:17453: checking for tm_gmtoff in struct tm" >&5
3186 if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then
3187 echo $ac_n "(cached) $ac_c" 1>&6
3189 cat > conftest.$ac_ext <<EOF
3190 -#line 17412 "configure"
3191 +#line 17458 "configure"
3192 #include "confdefs.h"
3193 #include <sys/types.h>
3194 #include <$ac_cv_struct_tm>
3195 @@ -17416,7 +17462,7 @@ int main() {
3196 struct tm tm; tm.tm_gmtoff;
3199 -if { (eval echo configure:17420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3200 +if { (eval echo configure:17466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3202 ac_cv_struct_tm_gmtoff=yes
3204 @@ -17439,12 +17485,12 @@ fi
3207 echo $ac_n "checking for struct flock""... $ac_c" 1>&6
3208 -echo "configure:17443: checking for struct flock" >&5
3209 +echo "configure:17489: checking for struct flock" >&5
3210 if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then
3211 echo $ac_n "(cached) $ac_c" 1>&6
3213 cat > conftest.$ac_ext <<EOF
3214 -#line 17448 "configure"
3215 +#line 17494 "configure"
3216 #include "confdefs.h"
3219 @@ -17454,7 +17500,7 @@ int main() {
3223 -if { (eval echo configure:17458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3224 +if { (eval echo configure:17504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3227 ac_cv_struct_flock=yes
3228 @@ -17481,12 +17527,12 @@ fi
3231 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
3232 -echo "configure:17485: checking for socklen_t" >&5
3233 +echo "configure:17531: checking for socklen_t" >&5
3234 if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then
3235 echo $ac_n "(cached) $ac_c" 1>&6
3237 cat > conftest.$ac_ext <<EOF
3238 -#line 17490 "configure"
3239 +#line 17536 "configure"
3240 #include "confdefs.h"
3242 #include <sys/types.h>
3243 @@ -17498,7 +17544,7 @@ socklen_t x;
3247 -if { (eval echo configure:17502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3248 +if { (eval echo configure:17548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3252 @@ -17524,7 +17570,7 @@ fi
3255 echo $ac_n "checking size of size_t""... $ac_c" 1>&6
3256 -echo "configure:17528: checking size of size_t" >&5
3257 +echo "configure:17574: checking size of size_t" >&5
3258 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then
3259 echo $ac_n "(cached) $ac_c" 1>&6
3261 @@ -17532,7 +17578,7 @@ else
3262 ac_cv_sizeof_size_t=8
3264 cat > conftest.$ac_ext <<EOF
3265 -#line 17536 "configure"
3266 +#line 17582 "configure"
3267 #include "confdefs.h"
3269 #include <sys/types.h>
3270 @@ -17544,7 +17590,7 @@ main()
3274 -if { (eval echo configure:17548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3275 +if { (eval echo configure:17594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3277 ac_cv_sizeof_size_t=`cat conftestval`
3279 @@ -17564,7 +17610,7 @@ EOF
3282 echo $ac_n "checking size of long long""... $ac_c" 1>&6
3283 -echo "configure:17568: checking size of long long" >&5
3284 +echo "configure:17614: checking size of long long" >&5
3285 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
3286 echo $ac_n "(cached) $ac_c" 1>&6
3288 @@ -17572,7 +17618,7 @@ else
3289 ac_cv_sizeof_long_long=8
3291 cat > conftest.$ac_ext <<EOF
3292 -#line 17576 "configure"
3293 +#line 17622 "configure"
3294 #include "confdefs.h"
3296 #include <sys/types.h>
3297 @@ -17584,7 +17630,7 @@ main()
3301 -if { (eval echo configure:17588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3302 +if { (eval echo configure:17634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3304 ac_cv_sizeof_long_long=`cat conftestval`
3306 @@ -17604,7 +17650,7 @@ EOF
3309 echo $ac_n "checking size of long long int""... $ac_c" 1>&6
3310 -echo "configure:17608: checking size of long long int" >&5
3311 +echo "configure:17654: checking size of long long int" >&5
3312 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then
3313 echo $ac_n "(cached) $ac_c" 1>&6
3315 @@ -17612,7 +17658,7 @@ else
3316 ac_cv_sizeof_long_long_int=8
3318 cat > conftest.$ac_ext <<EOF
3319 -#line 17616 "configure"
3320 +#line 17662 "configure"
3321 #include "confdefs.h"
3323 #include <sys/types.h>
3324 @@ -17624,7 +17670,7 @@ main()
3328 -if { (eval echo configure:17628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3329 +if { (eval echo configure:17674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3331 ac_cv_sizeof_long_long_int=`cat conftestval`
3333 @@ -17644,7 +17690,7 @@ EOF
3336 echo $ac_n "checking size of long""... $ac_c" 1>&6
3337 -echo "configure:17648: checking size of long" >&5
3338 +echo "configure:17694: checking size of long" >&5
3339 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
3340 echo $ac_n "(cached) $ac_c" 1>&6
3342 @@ -17652,7 +17698,7 @@ else
3345 cat > conftest.$ac_ext <<EOF
3346 -#line 17656 "configure"
3347 +#line 17702 "configure"
3348 #include "confdefs.h"
3350 #include <sys/types.h>
3351 @@ -17664,7 +17710,7 @@ main()
3355 -if { (eval echo configure:17668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3356 +if { (eval echo configure:17714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3358 ac_cv_sizeof_long=`cat conftestval`
3360 @@ -17684,7 +17730,7 @@ EOF
3363 echo $ac_n "checking size of int""... $ac_c" 1>&6
3364 -echo "configure:17688: checking size of int" >&5
3365 +echo "configure:17734: checking size of int" >&5
3366 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
3367 echo $ac_n "(cached) $ac_c" 1>&6
3369 @@ -17692,7 +17738,7 @@ else
3372 cat > conftest.$ac_ext <<EOF
3373 -#line 17696 "configure"
3374 +#line 17742 "configure"
3375 #include "confdefs.h"
3377 #include <sys/types.h>
3378 @@ -17704,7 +17750,7 @@ main()
3382 -if { (eval echo configure:17708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3383 +if { (eval echo configure:17754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3385 ac_cv_sizeof_int=`cat conftestval`
3387 @@ -17726,7 +17772,7 @@ EOF
3390 echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6
3391 -echo "configure:17730: checking size of intmax_t" >&5
3392 +echo "configure:17776: checking size of intmax_t" >&5
3394 php_cache_value=php_cv_sizeof_intmax_t
3395 if eval "test \"`echo '$''{'php_cv_sizeof_intmax_t'+set}'`\" = set"; then
3396 @@ -17743,7 +17789,7 @@ else
3399 cat > conftest.$ac_ext <<EOF
3400 -#line 17747 "configure"
3401 +#line 17793 "configure"
3402 #include "confdefs.h"
3405 @@ -17767,7 +17813,7 @@ int main()
3409 -if { (eval echo configure:17771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3410 +if { (eval echo configure:17817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3413 eval $php_cache_value=`cat conftestval`
3414 @@ -17806,7 +17852,7 @@ EOF
3417 echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6
3418 -echo "configure:17810: checking size of ssize_t" >&5
3419 +echo "configure:17856: checking size of ssize_t" >&5
3421 php_cache_value=php_cv_sizeof_ssize_t
3422 if eval "test \"`echo '$''{'php_cv_sizeof_ssize_t'+set}'`\" = set"; then
3423 @@ -17823,7 +17869,7 @@ else
3426 cat > conftest.$ac_ext <<EOF
3427 -#line 17827 "configure"
3428 +#line 17873 "configure"
3429 #include "confdefs.h"
3432 @@ -17847,7 +17893,7 @@ int main()
3436 -if { (eval echo configure:17851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3437 +if { (eval echo configure:17897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3440 eval $php_cache_value=`cat conftestval`
3441 @@ -17886,7 +17932,7 @@ EOF
3444 echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6
3445 -echo "configure:17890: checking size of ptrdiff_t" >&5
3446 +echo "configure:17936: checking size of ptrdiff_t" >&5
3448 php_cache_value=php_cv_sizeof_ptrdiff_t
3449 if eval "test \"`echo '$''{'php_cv_sizeof_ptrdiff_t'+set}'`\" = set"; then
3450 @@ -17903,7 +17949,7 @@ else
3453 cat > conftest.$ac_ext <<EOF
3454 -#line 17907 "configure"
3455 +#line 17953 "configure"
3456 #include "confdefs.h"
3459 @@ -17927,7 +17973,7 @@ int main()
3463 -if { (eval echo configure:17931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3464 +if { (eval echo configure:17977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3467 eval $php_cache_value=`cat conftestval`
3468 @@ -17966,12 +18012,12 @@ EOF
3471 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
3472 -echo "configure:17970: checking for st_blksize in struct stat" >&5
3473 +echo "configure:18016: checking for st_blksize in struct stat" >&5
3474 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
3475 echo $ac_n "(cached) $ac_c" 1>&6
3477 cat > conftest.$ac_ext <<EOF
3478 -#line 17975 "configure"
3479 +#line 18021 "configure"
3480 #include "confdefs.h"
3481 #include <sys/types.h>
3482 #include <sys/stat.h>
3483 @@ -17979,7 +18025,7 @@ int main() {
3484 struct stat s; s.st_blksize;
3487 -if { (eval echo configure:17983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3488 +if { (eval echo configure:18029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3490 ac_cv_struct_st_blksize=yes
3492 @@ -18001,12 +18047,12 @@ fi
3494 if test "`uname -s 2>/dev/null`" != "QNX"; then
3495 echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
3496 -echo "configure:18005: checking for st_blocks in struct stat" >&5
3497 +echo "configure:18051: checking for st_blocks in struct stat" >&5
3498 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
3499 echo $ac_n "(cached) $ac_c" 1>&6
3501 cat > conftest.$ac_ext <<EOF
3502 -#line 18010 "configure"
3503 +#line 18056 "configure"
3504 #include "confdefs.h"
3505 #include <sys/types.h>
3506 #include <sys/stat.h>
3507 @@ -18014,7 +18060,7 @@ int main() {
3508 struct stat s; s.st_blocks;
3511 -if { (eval echo configure:18018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3512 +if { (eval echo configure:18064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3514 ac_cv_struct_st_blocks=yes
3516 @@ -18041,12 +18087,12 @@ else
3519 echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
3520 -echo "configure:18045: checking for st_rdev in struct stat" >&5
3521 +echo "configure:18091: checking for st_rdev in struct stat" >&5
3522 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
3523 echo $ac_n "(cached) $ac_c" 1>&6
3525 cat > conftest.$ac_ext <<EOF
3526 -#line 18050 "configure"
3527 +#line 18096 "configure"
3528 #include "confdefs.h"
3529 #include <sys/types.h>
3530 #include <sys/stat.h>
3531 @@ -18054,7 +18100,7 @@ int main() {
3532 struct stat s; s.st_rdev;
3535 -if { (eval echo configure:18058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3536 +if { (eval echo configure:18104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3538 ac_cv_struct_st_rdev=yes
3540 @@ -18076,12 +18122,12 @@ fi
3543 echo $ac_n "checking for size_t""... $ac_c" 1>&6
3544 -echo "configure:18080: checking for size_t" >&5
3545 +echo "configure:18126: checking for size_t" >&5
3546 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
3547 echo $ac_n "(cached) $ac_c" 1>&6
3549 cat > conftest.$ac_ext <<EOF
3550 -#line 18085 "configure"
3551 +#line 18131 "configure"
3552 #include "confdefs.h"
3553 #include <sys/types.h>
3555 @@ -18109,12 +18155,12 @@ EOF
3558 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
3559 -echo "configure:18113: checking for uid_t in sys/types.h" >&5
3560 +echo "configure:18159: checking for uid_t in sys/types.h" >&5
3561 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
3562 echo $ac_n "(cached) $ac_c" 1>&6
3564 cat > conftest.$ac_ext <<EOF
3565 -#line 18118 "configure"
3566 +#line 18164 "configure"
3567 #include "confdefs.h"
3568 #include <sys/types.h>
3570 @@ -18145,12 +18191,12 @@ fi
3573 echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6
3574 -echo "configure:18149: checking for struct sockaddr_storage" >&5
3575 +echo "configure:18195: checking for struct sockaddr_storage" >&5
3576 if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then
3577 echo $ac_n "(cached) $ac_c" 1>&6
3579 cat > conftest.$ac_ext <<EOF
3580 -#line 18154 "configure"
3581 +#line 18200 "configure"
3582 #include "confdefs.h"
3583 #include <sys/types.h>
3584 #include <sys/socket.h>
3585 @@ -18158,7 +18204,7 @@ int main() {
3586 struct sockaddr_storage s; s
3589 -if { (eval echo configure:18162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3590 +if { (eval echo configure:18208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3592 ac_cv_sockaddr_storage=yes
3594 @@ -18179,13 +18225,13 @@ EOF
3597 echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6
3598 -echo "configure:18183: checking for field sa_len in struct sockaddr" >&5
3599 +echo "configure:18229: checking for field sa_len in struct sockaddr" >&5
3600 if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then
3601 echo $ac_n "(cached) $ac_c" 1>&6
3604 cat > conftest.$ac_ext <<EOF
3605 -#line 18189 "configure"
3606 +#line 18235 "configure"
3607 #include "confdefs.h"
3608 #include <sys/types.h>
3609 #include <sys/socket.h>
3610 @@ -18193,7 +18239,7 @@ int main() {
3611 static struct sockaddr sa; int n = (int) sa.sa_len; return n;
3614 -if { (eval echo configure:18197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3615 +if { (eval echo configure:18243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3617 ac_cv_sockaddr_sa_len=yes
3619 @@ -18216,12 +18262,12 @@ EOF
3622 echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6
3623 -echo "configure:18220: checking for IPv6 support" >&5
3624 +echo "configure:18266: checking for IPv6 support" >&5
3625 if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then
3626 echo $ac_n "(cached) $ac_c" 1>&6
3628 cat > conftest.$ac_ext <<EOF
3629 -#line 18225 "configure"
3630 +#line 18271 "configure"
3631 #include "confdefs.h"
3632 #include <sys/types.h>
3633 #include <sys/socket.h>
3634 @@ -18230,7 +18276,7 @@ int main() {
3635 struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;
3638 -if { (eval echo configure:18234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3639 +if { (eval echo configure:18280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3641 ac_cv_ipv6_support=yes
3643 @@ -18246,12 +18292,12 @@ echo "$ac_t""$ac_cv_ipv6_support" 1>&6
3646 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
3647 -echo "configure:18250: checking for vprintf" >&5
3648 +echo "configure:18296: checking for vprintf" >&5
3649 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
3650 echo $ac_n "(cached) $ac_c" 1>&6
3652 cat > conftest.$ac_ext <<EOF
3653 -#line 18255 "configure"
3654 +#line 18301 "configure"
3655 #include "confdefs.h"
3656 /* System header to define __stub macros and hopefully few prototypes,
3657 which can conflict with char vprintf(); below. */
3658 @@ -18274,7 +18320,7 @@ vprintf();
3662 -if { (eval echo configure:18278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3663 +if { (eval echo configure:18324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3665 eval "ac_cv_func_vprintf=yes"
3667 @@ -18298,12 +18344,12 @@ fi
3669 if test "$ac_cv_func_vprintf" != yes; then
3670 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
3671 -echo "configure:18302: checking for _doprnt" >&5
3672 +echo "configure:18348: checking for _doprnt" >&5
3673 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
3674 echo $ac_n "(cached) $ac_c" 1>&6
3676 cat > conftest.$ac_ext <<EOF
3677 -#line 18307 "configure"
3678 +#line 18353 "configure"
3679 #include "confdefs.h"
3680 /* System header to define __stub macros and hopefully few prototypes,
3681 which can conflict with char _doprnt(); below. */
3682 @@ -18326,7 +18372,7 @@ _doprnt();
3686 -if { (eval echo configure:18330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3687 +if { (eval echo configure:18376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3689 eval "ac_cv_func__doprnt=yes"
3691 @@ -18434,12 +18480,12 @@ asprintf \
3694 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3695 -echo "configure:18438: checking for $ac_func" >&5
3696 +echo "configure:18484: checking for $ac_func" >&5
3697 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3698 echo $ac_n "(cached) $ac_c" 1>&6
3700 cat > conftest.$ac_ext <<EOF
3701 -#line 18443 "configure"
3702 +#line 18489 "configure"
3703 #include "confdefs.h"
3704 /* System header to define __stub macros and hopefully few prototypes,
3705 which can conflict with char $ac_func(); below. */
3706 @@ -18462,7 +18508,7 @@ $ac_func();
3710 -if { (eval echo configure:18466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3711 +if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3713 eval "ac_cv_func_$ac_func=yes"
3715 @@ -18493,7 +18539,7 @@ done
3716 unset ac_cv_lib_rt___nanosleep
3718 echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6
3719 -echo "configure:18497: checking for nanosleep in -lrt" >&5
3720 +echo "configure:18543: checking for nanosleep in -lrt" >&5
3721 ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'`
3722 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3723 echo $ac_n "(cached) $ac_c" 1>&6
3724 @@ -18501,7 +18547,7 @@ else
3725 ac_save_LIBS="$LIBS"
3727 cat > conftest.$ac_ext <<EOF
3728 -#line 18505 "configure"
3729 +#line 18551 "configure"
3730 #include "confdefs.h"
3731 /* Override any gcc2 internal prototype to avoid an error. */
3732 /* We use char because int might match the return type of a gcc2
3733 @@ -18512,7 +18558,7 @@ int main() {
3737 -if { (eval echo configure:18516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3738 +if { (eval echo configure:18562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3740 eval "ac_cv_lib_$ac_lib_var=yes"
3742 @@ -18532,7 +18578,7 @@ else
3743 echo "$ac_t""no" 1>&6
3745 echo $ac_n "checking for __nanosleep in -lrt""... $ac_c" 1>&6
3746 -echo "configure:18536: checking for __nanosleep in -lrt" >&5
3747 +echo "configure:18582: checking for __nanosleep in -lrt" >&5
3748 ac_lib_var=`echo rt'_'__nanosleep | sed 'y%./+-%__p_%'`
3749 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3750 echo $ac_n "(cached) $ac_c" 1>&6
3751 @@ -18540,7 +18586,7 @@ else
3752 ac_save_LIBS="$LIBS"
3754 cat > conftest.$ac_ext <<EOF
3755 -#line 18544 "configure"
3756 +#line 18590 "configure"
3757 #include "confdefs.h"
3758 /* Override any gcc2 internal prototype to avoid an error. */
3759 /* We use char because int might match the return type of a gcc2
3760 @@ -18551,7 +18597,7 @@ int main() {
3764 -if { (eval echo configure:18555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3765 +if { (eval echo configure:18601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3767 eval "ac_cv_lib_$ac_lib_var=yes"
3769 @@ -18583,11 +18629,11 @@ fi
3772 cat > conftest.$ac_ext <<EOF
3773 -#line 18587 "configure"
3774 +#line 18633 "configure"
3775 #include "confdefs.h"
3776 main() { return (0); }
3778 -if { (eval echo configure:18591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3779 +if { (eval echo configure:18637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3783 @@ -18631,25 +18677,25 @@ EOF
3786 echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
3787 -echo "configure:18635: checking for getaddrinfo" >&5
3788 +echo "configure:18681: checking for getaddrinfo" >&5
3789 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
3790 echo $ac_n "(cached) $ac_c" 1>&6
3792 cat > conftest.$ac_ext <<EOF
3793 -#line 18640 "configure"
3794 +#line 18686 "configure"
3795 #include "confdefs.h"
3798 struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);
3801 -if { (eval echo configure:18647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3802 +if { (eval echo configure:18693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3804 if test "$cross_compiling" = yes; then
3805 ac_cv_func_getaddrinfo=no
3807 cat > conftest.$ac_ext <<EOF
3808 -#line 18653 "configure"
3809 +#line 18699 "configure"
3810 #include "confdefs.h"
3813 @@ -18689,7 +18735,7 @@ int main(void) {
3817 -if { (eval echo configure:18693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3818 +if { (eval echo configure:18739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3820 ac_cv_func_getaddrinfo=yes
3822 @@ -18721,12 +18767,12 @@ fi
3823 for ac_func in strlcat strlcpy getopt
3825 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3826 -echo "configure:18725: checking for $ac_func" >&5
3827 +echo "configure:18771: checking for $ac_func" >&5
3828 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3829 echo $ac_n "(cached) $ac_c" 1>&6
3831 cat > conftest.$ac_ext <<EOF
3832 -#line 18730 "configure"
3833 +#line 18776 "configure"
3834 #include "confdefs.h"
3835 /* System header to define __stub macros and hopefully few prototypes,
3836 which can conflict with char $ac_func(); below. */
3837 @@ -18749,7 +18795,7 @@ $ac_func();
3841 -if { (eval echo configure:18753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3842 +if { (eval echo configure:18799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3844 eval "ac_cv_func_$ac_func=yes"
3846 @@ -18776,7 +18822,7 @@ done
3849 echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
3850 -echo "configure:18780: checking whether utime accepts a null argument" >&5
3851 +echo "configure:18826: checking whether utime accepts a null argument" >&5
3852 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then
3853 echo $ac_n "(cached) $ac_c" 1>&6
3855 @@ -18786,7 +18832,7 @@ if test "$cross_compiling" = yes; then
3856 ac_cv_func_utime_null=no
3858 cat > conftest.$ac_ext <<EOF
3859 -#line 18790 "configure"
3860 +#line 18836 "configure"
3861 #include "confdefs.h"
3862 #include <sys/types.h>
3863 #include <sys/stat.h>
3864 @@ -18797,7 +18843,7 @@ exit(!(stat ("conftestdata", &s) == 0 &&
3865 && t.st_mtime - s.st_mtime < 120));
3868 -if { (eval echo configure:18801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3869 +if { (eval echo configure:18847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3871 ac_cv_func_utime_null=yes
3873 @@ -18823,19 +18869,19 @@ fi
3874 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
3875 # for constant arguments. Useless!
3876 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
3877 -echo "configure:18827: checking for working alloca.h" >&5
3878 +echo "configure:18873: checking for working alloca.h" >&5
3879 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
3880 echo $ac_n "(cached) $ac_c" 1>&6
3882 cat > conftest.$ac_ext <<EOF
3883 -#line 18832 "configure"
3884 +#line 18878 "configure"
3885 #include "confdefs.h"
3888 char *p = alloca(2 * sizeof(int));
3891 -if { (eval echo configure:18839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3892 +if { (eval echo configure:18885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3894 ac_cv_header_alloca_h=yes
3896 @@ -18856,12 +18902,12 @@ EOF
3899 echo $ac_n "checking for alloca""... $ac_c" 1>&6
3900 -echo "configure:18860: checking for alloca" >&5
3901 +echo "configure:18906: checking for alloca" >&5
3902 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
3903 echo $ac_n "(cached) $ac_c" 1>&6
3905 cat > conftest.$ac_ext <<EOF
3906 -#line 18865 "configure"
3907 +#line 18911 "configure"
3908 #include "confdefs.h"
3911 @@ -18889,7 +18935,7 @@ int main() {
3912 char *p = (char *) alloca(1);
3915 -if { (eval echo configure:18893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3916 +if { (eval echo configure:18939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3918 ac_cv_func_alloca_works=yes
3920 @@ -18921,12 +18967,12 @@ EOF
3923 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
3924 -echo "configure:18925: checking whether alloca needs Cray hooks" >&5
3925 +echo "configure:18971: checking whether alloca needs Cray hooks" >&5
3926 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
3927 echo $ac_n "(cached) $ac_c" 1>&6
3929 cat > conftest.$ac_ext <<EOF
3930 -#line 18930 "configure"
3931 +#line 18976 "configure"
3932 #include "confdefs.h"
3933 #if defined(CRAY) && ! defined(CRAY2)
3935 @@ -18951,12 +18997,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
3936 if test $ac_cv_os_cray = yes; then
3937 for ac_func in _getb67 GETB67 getb67; do
3938 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
3939 -echo "configure:18955: checking for $ac_func" >&5
3940 +echo "configure:19001: checking for $ac_func" >&5
3941 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
3942 echo $ac_n "(cached) $ac_c" 1>&6
3944 cat > conftest.$ac_ext <<EOF
3945 -#line 18960 "configure"
3946 +#line 19006 "configure"
3947 #include "confdefs.h"
3948 /* System header to define __stub macros and hopefully few prototypes,
3949 which can conflict with char $ac_func(); below. */
3950 @@ -18979,7 +19025,7 @@ $ac_func();
3954 -if { (eval echo configure:18983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3955 +if { (eval echo configure:19029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3957 eval "ac_cv_func_$ac_func=yes"
3959 @@ -19006,7 +19052,7 @@ done
3962 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
3963 -echo "configure:19010: checking stack direction for C alloca" >&5
3964 +echo "configure:19056: checking stack direction for C alloca" >&5
3965 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
3966 echo $ac_n "(cached) $ac_c" 1>&6
3968 @@ -19014,7 +19060,7 @@ else
3969 ac_cv_c_stack_direction=0
3971 cat > conftest.$ac_ext <<EOF
3972 -#line 19018 "configure"
3973 +#line 19064 "configure"
3974 #include "confdefs.h"
3975 find_stack_direction ()
3977 @@ -19033,7 +19079,7 @@ main ()
3978 exit (find_stack_direction() < 0);
3981 -if { (eval echo configure:19037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3982 +if { (eval echo configure:19083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
3984 ac_cv_c_stack_direction=1
3986 @@ -19056,13 +19102,13 @@ fi
3989 echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
3990 -echo "configure:19060: checking for declared timezone" >&5
3991 +echo "configure:19106: checking for declared timezone" >&5
3992 if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then
3993 echo $ac_n "(cached) $ac_c" 1>&6
3996 cat > conftest.$ac_ext <<EOF
3997 -#line 19066 "configure"
3998 +#line 19112 "configure"
3999 #include "confdefs.h"
4001 #include <sys/types.h>
4002 @@ -19077,7 +19123,7 @@ int main() {
4006 -if { (eval echo configure:19081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4007 +if { (eval echo configure:19127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4010 ac_cv_declared_timezone=yes
4011 @@ -19103,7 +19149,7 @@ EOF
4014 echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6
4015 -echo "configure:19107: checking for type of reentrant time-related functions" >&5
4016 +echo "configure:19153: checking for type of reentrant time-related functions" >&5
4017 if eval "test \"`echo '$''{'ac_cv_time_r_type'+set}'`\" = set"; then
4018 echo $ac_n "(cached) $ac_c" 1>&6
4020 @@ -19114,7 +19160,7 @@ if test "$cross_compiling" = yes; then
4023 cat > conftest.$ac_ext <<EOF
4024 -#line 19118 "configure"
4025 +#line 19164 "configure"
4026 #include "confdefs.h"
4029 @@ -19132,7 +19178,7 @@ return (1);
4033 -if { (eval echo configure:19136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4034 +if { (eval echo configure:19182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4037 ac_cv_time_r_type=hpux
4038 @@ -19148,7 +19194,7 @@ else
4041 cat > conftest.$ac_ext <<EOF
4042 -#line 19152 "configure"
4043 +#line 19198 "configure"
4044 #include "confdefs.h"
4047 @@ -19164,7 +19210,7 @@ main() {
4051 -if { (eval echo configure:19168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4052 +if { (eval echo configure:19214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4055 ac_cv_time_r_type=irix
4056 @@ -19202,12 +19248,12 @@ EOF
4059 echo $ac_n "checking for readdir_r""... $ac_c" 1>&6
4060 -echo "configure:19206: checking for readdir_r" >&5
4061 +echo "configure:19252: checking for readdir_r" >&5
4062 if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then
4063 echo $ac_n "(cached) $ac_c" 1>&6
4065 cat > conftest.$ac_ext <<EOF
4066 -#line 19211 "configure"
4067 +#line 19257 "configure"
4068 #include "confdefs.h"
4069 /* System header to define __stub macros and hopefully few prototypes,
4070 which can conflict with char readdir_r(); below. */
4071 @@ -19230,7 +19276,7 @@ readdir_r();
4075 -if { (eval echo configure:19234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4076 +if { (eval echo configure:19280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4078 eval "ac_cv_func_readdir_r=yes"
4080 @@ -19252,7 +19298,7 @@ fi
4082 if test "$ac_cv_func_readdir_r" = "yes"; then
4083 echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6
4084 -echo "configure:19256: checking for type of readdir_r" >&5
4085 +echo "configure:19302: checking for type of readdir_r" >&5
4086 if eval "test \"`echo '$''{'ac_cv_what_readdir_r'+set}'`\" = set"; then
4087 echo $ac_n "(cached) $ac_c" 1>&6
4089 @@ -19263,7 +19309,7 @@ else
4092 cat > conftest.$ac_ext <<EOF
4093 -#line 19267 "configure"
4094 +#line 19313 "configure"
4095 #include "confdefs.h"
4098 @@ -19288,7 +19334,7 @@ main() {
4102 -if { (eval echo configure:19292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4103 +if { (eval echo configure:19338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4106 ac_cv_what_readdir_r=POSIX
4107 @@ -19299,7 +19345,7 @@ else
4110 cat > conftest.$ac_ext <<EOF
4111 -#line 19303 "configure"
4112 +#line 19349 "configure"
4113 #include "confdefs.h"
4116 @@ -19309,7 +19355,7 @@ int readdir_r(DIR *, struct dirent *);
4119 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4120 -{ (eval echo configure:19313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4121 +{ (eval echo configure:19359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4122 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4123 if test -z "$ac_err"; then
4125 @@ -19351,12 +19397,12 @@ EOF
4128 echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
4129 -echo "configure:19355: checking for in_addr_t" >&5
4130 +echo "configure:19401: checking for in_addr_t" >&5
4131 if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then
4132 echo $ac_n "(cached) $ac_c" 1>&6
4134 cat > conftest.$ac_ext <<EOF
4135 -#line 19360 "configure"
4136 +#line 19406 "configure"
4137 #include "confdefs.h"
4138 #include <sys/types.h>
4140 @@ -19390,12 +19436,12 @@ fi
4141 for ac_func in crypt_r
4143 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
4144 -echo "configure:19394: checking for $ac_func" >&5
4145 +echo "configure:19440: checking for $ac_func" >&5
4146 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
4147 echo $ac_n "(cached) $ac_c" 1>&6
4149 cat > conftest.$ac_ext <<EOF
4150 -#line 19399 "configure"
4151 +#line 19445 "configure"
4152 #include "confdefs.h"
4153 /* System header to define __stub macros and hopefully few prototypes,
4154 which can conflict with char $ac_func(); below. */
4155 @@ -19418,7 +19464,7 @@ $ac_func();
4159 -if { (eval echo configure:19422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4160 +if { (eval echo configure:19468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4162 eval "ac_cv_func_$ac_func=yes"
4164 @@ -19446,14 +19492,14 @@ done
4165 if test "x$php_crypt_r" = "x1"; then
4167 echo $ac_n "checking which data struct is used by crypt_r""... $ac_c" 1>&6
4168 -echo "configure:19450: checking which data struct is used by crypt_r" >&5
4169 +echo "configure:19496: checking which data struct is used by crypt_r" >&5
4170 if eval "test \"`echo '$''{'php_cv_crypt_r_style'+set}'`\" = set"; then
4171 echo $ac_n "(cached) $ac_c" 1>&6
4174 php_cv_crypt_r_style=none
4175 cat > conftest.$ac_ext <<EOF
4176 -#line 19457 "configure"
4177 +#line 19503 "configure"
4178 #include "confdefs.h"
4180 #define _REENTRANT 1
4181 @@ -19466,7 +19512,7 @@ crypt_r("passwd", "hash", &buffer);
4185 -if { (eval echo configure:19470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4186 +if { (eval echo configure:19516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4188 php_cv_crypt_r_style=cryptd
4190 @@ -19477,7 +19523,7 @@ rm -f conftest*
4192 if test "$php_cv_crypt_r_style" = "none"; then
4193 cat > conftest.$ac_ext <<EOF
4194 -#line 19481 "configure"
4195 +#line 19527 "configure"
4196 #include "confdefs.h"
4198 #define _REENTRANT 1
4199 @@ -19490,7 +19536,7 @@ crypt_r("passwd", "hash", &buffer);
4203 -if { (eval echo configure:19494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4204 +if { (eval echo configure:19540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4206 php_cv_crypt_r_style=struct_crypt_data
4208 @@ -19502,7 +19548,7 @@ rm -f conftest*
4210 if test "$php_cv_crypt_r_style" = "none"; then
4211 cat > conftest.$ac_ext <<EOF
4212 -#line 19506 "configure"
4213 +#line 19552 "configure"
4214 #include "confdefs.h"
4216 #define _REENTRANT 1
4217 @@ -19516,7 +19562,7 @@ crypt_r("passwd", "hash", &buffer);
4221 -if { (eval echo configure:19520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4222 +if { (eval echo configure:19566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4224 php_cv_crypt_r_style=struct_crypt_data_gnu_source
4226 @@ -19575,7 +19621,7 @@ fi
4229 echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6
4230 -echo "configure:19579: checking whether to include gcov symbols" >&5
4231 +echo "configure:19625: checking whether to include gcov symbols" >&5
4232 # Check whether --enable-gcov or --disable-gcov was given.
4233 if test "${enable_gcov+set}" = set; then
4234 enableval="$enable_gcov"
4235 @@ -19614,7 +19660,7 @@ if test "$PHP_GCOV" = "yes"; then
4236 # Extract the first word of "lcov", so it can be a program name with args.
4237 set dummy lcov; ac_word=$2
4238 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4239 -echo "configure:19618: checking for $ac_word" >&5
4240 +echo "configure:19664: checking for $ac_word" >&5
4241 if eval "test \"`echo '$''{'ac_cv_prog_LTP'+set}'`\" = set"; then
4242 echo $ac_n "(cached) $ac_c" 1>&6
4244 @@ -19643,7 +19689,7 @@ fi
4245 # Extract the first word of "genhtml", so it can be a program name with args.
4246 set dummy genhtml; ac_word=$2
4247 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4248 -echo "configure:19647: checking for $ac_word" >&5
4249 +echo "configure:19693: checking for $ac_word" >&5
4250 if eval "test \"`echo '$''{'ac_cv_prog_LTP_GENHTML'+set}'`\" = set"; then
4251 echo $ac_n "(cached) $ac_c" 1>&6
4253 @@ -19678,7 +19724,7 @@ fi
4255 if test "$LTP"; then
4256 echo $ac_n "checking for ltp version""... $ac_c" 1>&6
4257 -echo "configure:19682: checking for ltp version" >&5
4258 +echo "configure:19728: checking for ltp version" >&5
4259 if eval "test \"`echo '$''{'php_cv_ltp_version'+set}'`\" = set"; then
4260 echo $ac_n "(cached) $ac_c" 1>&6
4262 @@ -19735,7 +19781,7 @@ fi
4265 echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6
4266 -echo "configure:19739: checking whether to include debugging symbols" >&5
4267 +echo "configure:19785: checking whether to include debugging symbols" >&5
4268 # Check whether --enable-debug or --disable-debug was given.
4269 if test "${enable_debug+set}" = set; then
4270 enableval="$enable_debug"
4271 @@ -19783,7 +19829,7 @@ fi
4274 echo $ac_n "checking layout of installed files""... $ac_c" 1>&6
4275 -echo "configure:19787: checking layout of installed files" >&5
4276 +echo "configure:19833: checking layout of installed files" >&5
4277 # Check whether --with-layout or --without-layout was given.
4278 if test "${with_layout+set}" = set; then
4279 withval="$with_layout"
4280 @@ -19815,7 +19861,7 @@ esac
4281 php_with_config_file_path=DEFAULT
4283 echo $ac_n "checking path to configuration file""... $ac_c" 1>&6
4284 -echo "configure:19819: checking path to configuration file" >&5
4285 +echo "configure:19865: checking path to configuration file" >&5
4286 # Check whether --with-config-file-path or --without-config-file-path was given.
4287 if test "${with_config_file_path+set}" = set; then
4288 withval="$with_config_file_path"
4289 @@ -19846,7 +19892,7 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAU
4292 echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6
4293 -echo "configure:19850: checking where to scan for configuration files" >&5
4294 +echo "configure:19896: checking where to scan for configuration files" >&5
4296 php_with_config_file_scan_dir=DEFAULT
4298 @@ -19879,7 +19925,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLA
4299 php_enable_safe_mode=no
4301 echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6
4302 -echo "configure:19883: checking whether to enable safe mode by default" >&5
4303 +echo "configure:19929: checking whether to enable safe mode by default" >&5
4304 # Check whether --enable-safe-mode or --disable-safe-mode was given.
4305 if test "${enable_safe_mode+set}" = set; then
4306 enableval="$enable_safe_mode"
4307 @@ -19911,7 +19957,7 @@ EOF
4310 echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6
4311 -echo "configure:19915: checking for safe mode exec dir" >&5
4312 +echo "configure:19961: checking for safe mode exec dir" >&5
4314 php_with_exec_dir=no
4316 @@ -19952,7 +19998,7 @@ fi
4317 php_enable_sigchild=no
4319 echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6
4320 -echo "configure:19956: checking whether to enable PHP's own SIGCHLD handler" >&5
4321 +echo "configure:20002: checking whether to enable PHP's own SIGCHLD handler" >&5
4322 # Check whether --enable-sigchild or --disable-sigchild was given.
4323 if test "${enable_sigchild+set}" = set; then
4324 enableval="$enable_sigchild"
4325 @@ -19987,7 +20033,7 @@ fi
4326 php_enable_magic_quotes=no
4328 echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6
4329 -echo "configure:19991: checking whether to enable magic quotes by default" >&5
4330 +echo "configure:20037: checking whether to enable magic quotes by default" >&5
4331 # Check whether --enable-magic-quotes or --disable-magic-quotes was given.
4332 if test "${enable_magic_quotes+set}" = set; then
4333 enableval="$enable_magic_quotes"
4334 @@ -20022,7 +20068,7 @@ fi
4335 php_enable_libgcc=no
4337 echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6
4338 -echo "configure:20026: checking whether to explicitly link against libgcc" >&5
4339 +echo "configure:20072: checking whether to explicitly link against libgcc" >&5
4340 # Check whether --enable-libgcc or --disable-libgcc was given.
4341 if test "${enable_libgcc+set}" = set; then
4342 enableval="$enable_libgcc"
4343 @@ -20099,7 +20145,7 @@ fi
4344 php_enable_short_tags=yes
4346 echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6
4347 -echo "configure:20103: checking whether to enable short tags by default" >&5
4348 +echo "configure:20149: checking whether to enable short tags by default" >&5
4349 # Check whether --enable-short-tags or --disable-short-tags was given.
4350 if test "${enable_short_tags+set}" = set; then
4351 enableval="$enable_short_tags"
4352 @@ -20134,7 +20180,7 @@ fi
4353 php_enable_dmalloc=no
4355 echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6
4356 -echo "configure:20138: checking whether to enable dmalloc" >&5
4357 +echo "configure:20184: checking whether to enable dmalloc" >&5
4358 # Check whether --enable-dmalloc or --disable-dmalloc was given.
4359 if test "${enable_dmalloc+set}" = set; then
4360 enableval="$enable_dmalloc"
4361 @@ -20155,7 +20201,7 @@ echo "$ac_t""$ext_output" 1>&6
4363 if test "$PHP_DMALLOC" = "yes"; then
4364 echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6
4365 -echo "configure:20159: checking for dmalloc_error in -ldmalloc" >&5
4366 +echo "configure:20205: checking for dmalloc_error in -ldmalloc" >&5
4367 ac_lib_var=`echo dmalloc'_'dmalloc_error | sed 'y%./+-%__p_%'`
4368 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4369 echo $ac_n "(cached) $ac_c" 1>&6
4370 @@ -20163,7 +20209,7 @@ else
4371 ac_save_LIBS="$LIBS"
4372 LIBS="-ldmalloc $LIBS"
4373 cat > conftest.$ac_ext <<EOF
4374 -#line 20167 "configure"
4375 +#line 20213 "configure"
4376 #include "confdefs.h"
4377 /* Override any gcc2 internal prototype to avoid an error. */
4378 /* We use char because int might match the return type of a gcc2
4379 @@ -20174,7 +20220,7 @@ int main() {
4383 -if { (eval echo configure:20178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4384 +if { (eval echo configure:20224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4386 eval "ac_cv_lib_$ac_lib_var=yes"
4388 @@ -20219,7 +20265,7 @@ fi
4391 echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6
4392 -echo "configure:20223: checking whether to enable IPv6 support" >&5
4393 +echo "configure:20269: checking whether to enable IPv6 support" >&5
4394 # Check whether --enable-ipv6 or --disable-ipv6 was given.
4395 if test "${enable_ipv6+set}" = set; then
4396 enableval="$enable_ipv6"
4397 @@ -20246,7 +20292,7 @@ EOF
4400 echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6
4401 -echo "configure:20250: checking how big to make fd sets" >&5
4402 +echo "configure:20296: checking how big to make fd sets" >&5
4404 php_enable_fd_setsize=no
4406 @@ -20314,7 +20360,7 @@ fi
4409 echo $ac_n "checking size of long""... $ac_c" 1>&6
4410 -echo "configure:20318: checking size of long" >&5
4411 +echo "configure:20364: checking size of long" >&5
4412 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
4413 echo $ac_n "(cached) $ac_c" 1>&6
4415 @@ -20322,7 +20368,7 @@ else
4418 cat > conftest.$ac_ext <<EOF
4419 -#line 20326 "configure"
4420 +#line 20372 "configure"
4421 #include "confdefs.h"
4423 #include <sys/types.h>
4424 @@ -20334,7 +20380,7 @@ main()
4428 -if { (eval echo configure:20338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4429 +if { (eval echo configure:20384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4431 ac_cv_sizeof_long=`cat conftestval`
4433 @@ -20354,7 +20400,7 @@ EOF
4436 echo $ac_n "checking size of int""... $ac_c" 1>&6
4437 -echo "configure:20358: checking size of int" >&5
4438 +echo "configure:20404: 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
4442 @@ -20362,7 +20408,7 @@ else
4445 cat > conftest.$ac_ext <<EOF
4446 -#line 20366 "configure"
4447 +#line 20412 "configure"
4448 #include "confdefs.h"
4450 #include <sys/types.h>
4451 @@ -20374,7 +20420,7 @@ main()
4455 -if { (eval echo configure:20378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4456 +if { (eval echo configure:20424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4458 ac_cv_sizeof_int=`cat conftestval`
4460 @@ -20395,13 +20441,13 @@ EOF
4463 echo $ac_n "checking for int32_t""... $ac_c" 1>&6
4464 -echo "configure:20399: checking for int32_t" >&5
4465 +echo "configure:20445: checking for int32_t" >&5
4466 if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+set}'`\" = set"; then
4467 echo $ac_n "(cached) $ac_c" 1>&6
4470 cat > conftest.$ac_ext <<EOF
4471 -#line 20405 "configure"
4472 +#line 20451 "configure"
4473 #include "confdefs.h"
4475 #if HAVE_SYS_TYPES_H
4476 @@ -20420,7 +20466,7 @@ if (sizeof (int32_t))
4480 -if { (eval echo configure:20424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4481 +if { (eval echo configure:20470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4483 ac_cv_int_type_int32_t=yes
4485 @@ -20443,13 +20489,13 @@ fi
4488 echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
4489 -echo "configure:20447: checking for uint32_t" >&5
4490 +echo "configure:20493: checking for uint32_t" >&5
4491 if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+set}'`\" = set"; then
4492 echo $ac_n "(cached) $ac_c" 1>&6
4495 cat > conftest.$ac_ext <<EOF
4496 -#line 20453 "configure"
4497 +#line 20499 "configure"
4498 #include "confdefs.h"
4500 #if HAVE_SYS_TYPES_H
4501 @@ -20468,7 +20514,7 @@ if (sizeof (uint32_t))
4505 -if { (eval echo configure:20472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4506 +if { (eval echo configure:20518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4508 ac_cv_int_type_uint32_t=yes
4510 @@ -20500,17 +20546,17 @@ stdlib.h
4512 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
4513 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
4514 -echo "configure:20504: checking for $ac_hdr" >&5
4515 +echo "configure:20550: checking for $ac_hdr" >&5
4516 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
4517 echo $ac_n "(cached) $ac_c" 1>&6
4519 cat > conftest.$ac_ext <<EOF
4520 -#line 20509 "configure"
4521 +#line 20555 "configure"
4522 #include "confdefs.h"
4525 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
4526 -{ (eval echo configure:20514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4527 +{ (eval echo configure:20560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
4528 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
4529 if test -z "$ac_err"; then
4531 @@ -20540,12 +20586,12 @@ done
4532 for ac_func in strtoll atoll strftime
4534 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
4535 -echo "configure:20544: checking for $ac_func" >&5
4536 +echo "configure:20590: checking for $ac_func" >&5
4537 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
4538 echo $ac_n "(cached) $ac_c" 1>&6
4540 cat > conftest.$ac_ext <<EOF
4541 -#line 20549 "configure"
4542 +#line 20595 "configure"
4543 #include "confdefs.h"
4544 /* System header to define __stub macros and hopefully few prototypes,
4545 which can conflict with char $ac_func(); below. */
4546 @@ -20568,7 +20614,7 @@ $ac_func();
4550 -if { (eval echo configure:20572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4551 +if { (eval echo configure:20618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4553 eval "ac_cv_func_$ac_func=yes"
4555 @@ -21030,7 +21076,7 @@ case $PHP_REGEX in
4558 echo $ac_n "checking which regex library to use""... $ac_c" 1>&6
4559 -echo "configure:21034: checking which regex library to use" >&5
4560 +echo "configure:21080: checking which regex library to use" >&5
4561 echo "$ac_t""$REGEX_TYPE" 1>&6
4563 if test "$REGEX_TYPE" = "php"; then
4564 @@ -21407,13 +21453,13 @@ elif test "$REGEX_TYPE" = "system"; then
4567 echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6
4568 -echo "configure:21411: checking whether field re_magic exists in struct regex_t" >&5
4569 +echo "configure:21457: checking whether field re_magic exists in struct regex_t" >&5
4570 if eval "test \"`echo '$''{'ac_cv_regex_t_re_magic'+set}'`\" = set"; then
4571 echo $ac_n "(cached) $ac_c" 1>&6
4574 cat > conftest.$ac_ext <<EOF
4575 -#line 21417 "configure"
4576 +#line 21463 "configure"
4577 #include "confdefs.h"
4578 #include <sys/types.h>
4580 @@ -21421,7 +21467,7 @@ int main() {
4581 regex_t rt; rt.re_magic;
4584 -if { (eval echo configure:21425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4585 +if { (eval echo configure:21471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
4587 ac_cv_regex_t_re_magic=yes
4589 @@ -21447,7 +21493,7 @@ fi
4590 php_enable_libxml=yes
4592 echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6
4593 -echo "configure:21451: checking whether to enable LIBXML support" >&5
4594 +echo "configure:21497: checking whether to enable LIBXML support" >&5
4595 # Check whether --enable-libxml or --disable-libxml was given.
4596 if test "${enable_libxml+set}" = set; then
4597 enableval="$enable_libxml"
4598 @@ -21492,7 +21538,7 @@ if test -z "$PHP_LIBXML_DIR"; then
4599 php_with_libxml_dir=no
4601 echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
4602 -echo "configure:21496: checking libxml2 install dir" >&5
4603 +echo "configure:21542: checking libxml2 install dir" >&5
4604 # Check whether --with-libxml-dir or --without-libxml-dir was given.
4605 if test "${with_libxml_dir+set}" = set; then
4606 withval="$with_libxml_dir"
4607 @@ -21518,7 +21564,7 @@ if test "$PHP_LIBXML" != "no"; then
4610 echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
4611 -echo "configure:21522: checking for xml2-config path" >&5
4612 +echo "configure:21568: checking for xml2-config path" >&5
4613 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
4614 echo $ac_n "(cached) $ac_c" 1>&6
4616 @@ -21676,7 +21722,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
4619 echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
4620 -echo "configure:21680: checking whether libxml build works" >&5
4621 +echo "configure:21726: checking whether libxml build works" >&5
4622 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
4623 echo $ac_n "(cached) $ac_c" 1>&6
4625 @@ -21692,7 +21738,7 @@ else
4628 cat > conftest.$ac_ext <<EOF
4629 -#line 21696 "configure"
4630 +#line 21742 "configure"
4631 #include "confdefs.h"
4634 @@ -21703,7 +21749,7 @@ else
4638 -if { (eval echo configure:21707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4639 +if { (eval echo configure:21753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4643 @@ -22068,7 +22114,7 @@ fi
4646 echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6
4647 -echo "configure:22072: checking for OpenSSL support" >&5
4648 +echo "configure:22118: checking for OpenSSL support" >&5
4649 # Check whether --with-openssl or --without-openssl was given.
4650 if test "${with_openssl+set}" = set; then
4651 withval="$with_openssl"
4652 @@ -22112,7 +22158,7 @@ echo "$ac_t""$ext_output" 1>&6
4653 php_with_kerberos=no
4655 echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6
4656 -echo "configure:22116: checking for Kerberos support" >&5
4657 +echo "configure:22162: checking for Kerberos support" >&5
4658 # Check whether --with-kerberos or --without-kerberos was given.
4659 if test "${with_kerberos+set}" = set; then
4660 withval="$with_kerberos"
4661 @@ -22438,7 +22484,7 @@ EOF
4662 # Extract the first word of "krb5-config", so it can be a program name with args.
4663 set dummy krb5-config; ac_word=$2
4664 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4665 -echo "configure:22442: checking for $ac_word" >&5
4666 +echo "configure:22488: checking for $ac_word" >&5
4667 if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
4668 echo $ac_n "(cached) $ac_c" 1>&6
4670 @@ -22798,7 +22844,7 @@ fi
4673 echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6
4674 -echo "configure:22802: checking for DSA_get_default_method in -lssl" >&5
4675 +echo "configure:22848: checking for DSA_get_default_method in -lssl" >&5
4676 ac_lib_var=`echo ssl'_'DSA_get_default_method | sed 'y%./+-%__p_%'`
4677 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4678 echo $ac_n "(cached) $ac_c" 1>&6
4679 @@ -22806,7 +22852,7 @@ else
4680 ac_save_LIBS="$LIBS"
4682 cat > conftest.$ac_ext <<EOF
4683 -#line 22810 "configure"
4684 +#line 22856 "configure"
4685 #include "confdefs.h"
4686 /* Override any gcc2 internal prototype to avoid an error. */
4687 /* We use char because int might match the return type of a gcc2
4688 @@ -22817,7 +22863,7 @@ int main() {
4689 DSA_get_default_method()
4692 -if { (eval echo configure:22821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4693 +if { (eval echo configure:22867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4695 eval "ac_cv_lib_$ac_lib_var=yes"
4697 @@ -22841,7 +22887,7 @@ else
4700 echo $ac_n "checking for X509_free in -lcrypto""... $ac_c" 1>&6
4701 -echo "configure:22845: checking for X509_free in -lcrypto" >&5
4702 +echo "configure:22891: checking for X509_free in -lcrypto" >&5
4703 ac_lib_var=`echo crypto'_'X509_free | sed 'y%./+-%__p_%'`
4704 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4705 echo $ac_n "(cached) $ac_c" 1>&6
4706 @@ -22849,7 +22895,7 @@ else
4707 ac_save_LIBS="$LIBS"
4708 LIBS="-lcrypto $LIBS"
4709 cat > conftest.$ac_ext <<EOF
4710 -#line 22853 "configure"
4711 +#line 22899 "configure"
4712 #include "confdefs.h"
4713 /* Override any gcc2 internal prototype to avoid an error. */
4714 /* We use char because int might match the return type of a gcc2
4715 @@ -22860,7 +22906,7 @@ int main() {
4719 -if { (eval echo configure:22864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4720 +if { (eval echo configure:22910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4722 eval "ac_cv_lib_$ac_lib_var=yes"
4724 @@ -22902,7 +22948,7 @@ fi
4725 # Extract the first word of "pkg-config", so it can be a program name with args.
4726 set dummy pkg-config; ac_word=$2
4727 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4728 -echo "configure:22906: checking for $ac_word" >&5
4729 +echo "configure:22952: checking for $ac_word" >&5
4730 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4731 echo $ac_n "(cached) $ac_c" 1>&6
4733 @@ -23107,9 +23153,9 @@ fi
4734 old_CPPFLAGS=$CPPFLAGS
4735 CPPFLAGS=-I$OPENSSL_INCDIR
4736 echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
4737 -echo "configure:23111: checking for OpenSSL version" >&5
4738 +echo "configure:23157: checking for OpenSSL version" >&5
4739 cat > conftest.$ac_ext <<EOF
4740 -#line 23113 "configure"
4741 +#line 23159 "configure"
4742 #include "confdefs.h"
4744 #include <openssl/opensslv.h>
4745 @@ -23264,7 +23310,7 @@ rm -f conftest*
4748 echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
4749 -echo "configure:23268: checking for CRYPTO_free in -lcrypto" >&5
4750 +echo "configure:23314: checking for CRYPTO_free in -lcrypto" >&5
4751 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
4752 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4753 echo $ac_n "(cached) $ac_c" 1>&6
4754 @@ -23272,7 +23318,7 @@ else
4755 ac_save_LIBS="$LIBS"
4756 LIBS="-lcrypto $LIBS"
4757 cat > conftest.$ac_ext <<EOF
4758 -#line 23276 "configure"
4759 +#line 23322 "configure"
4760 #include "confdefs.h"
4761 /* Override any gcc2 internal prototype to avoid an error. */
4762 /* We use char because int might match the return type of a gcc2
4763 @@ -23283,7 +23329,7 @@ int main() {
4767 -if { (eval echo configure:23287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4768 +if { (eval echo configure:23333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4770 eval "ac_cv_lib_$ac_lib_var=yes"
4772 @@ -23440,7 +23486,7 @@ fi
4775 echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
4776 -echo "configure:23444: checking for SSL_CTX_set_ssl_version in -lssl" >&5
4777 +echo "configure:23490: checking for SSL_CTX_set_ssl_version in -lssl" >&5
4778 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
4779 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4780 echo $ac_n "(cached) $ac_c" 1>&6
4781 @@ -23448,7 +23494,7 @@ else
4782 ac_save_LIBS="$LIBS"
4784 cat > conftest.$ac_ext <<EOF
4785 -#line 23452 "configure"
4786 +#line 23498 "configure"
4787 #include "confdefs.h"
4788 /* Override any gcc2 internal prototype to avoid an error. */
4789 /* We use char because int might match the return type of a gcc2
4790 @@ -23459,7 +23505,7 @@ int main() {
4791 SSL_CTX_set_ssl_version()
4794 -if { (eval echo configure:23463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4795 +if { (eval echo configure:23509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4797 eval "ac_cv_lib_$ac_lib_var=yes"
4799 @@ -23624,7 +23670,7 @@ ext_output=$PHP_PCRE_REGEX
4801 if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
4802 echo $ac_n "checking for PCRE headers location""... $ac_c" 1>&6
4803 -echo "configure:23628: checking for PCRE headers location" >&5
4804 +echo "configure:23674: checking for PCRE headers location" >&5
4805 for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do
4806 test -f $i/pcre.h && PCRE_INCDIR=$i
4808 @@ -23635,7 +23681,7 @@ echo "configure:23628: checking for PCRE
4809 echo "$ac_t""$PCRE_INCDIR" 1>&6
4811 echo $ac_n "checking for PCRE library location""... $ac_c" 1>&6
4812 -echo "configure:23639: checking for PCRE library location" >&5
4813 +echo "configure:23685: checking for PCRE library location" >&5
4814 for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
4815 test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
4817 @@ -24057,7 +24103,7 @@ EOF
4820 echo $ac_n "checking for PCRE library to use""... $ac_c" 1>&6
4821 -echo "configure:24061: checking for PCRE library to use" >&5
4822 +echo "configure:24107: checking for PCRE library to use" >&5
4823 echo "$ac_t""bundled" 1>&6
4824 pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.c \
4825 pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \
4826 @@ -24394,7 +24440,7 @@ EOF
4827 php_with_sqlite3=yes
4829 echo $ac_n "checking whether to enable the SQLite3 extension""... $ac_c" 1>&6
4830 -echo "configure:24398: checking whether to enable the SQLite3 extension" >&5
4831 +echo "configure:24444: checking whether to enable the SQLite3 extension" >&5
4832 # Check whether --with-sqlite3 or --without-sqlite3 was given.
4833 if test "${with_sqlite3+set}" = set; then
4834 withval="$with_sqlite3"
4835 @@ -24449,7 +24495,7 @@ if test $PHP_SQLITE3 != "no"; then
4837 if test $PHP_SQLITE3 != "yes"; then
4838 echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
4839 -echo "configure:24453: checking for sqlite3 files in default path" >&5
4840 +echo "configure:24499: checking for sqlite3 files in default path" >&5
4841 for i in $PHP_SQLITE3 /usr/local /usr; do
4842 if test -r $i/include/sqlite3.h; then
4844 @@ -24464,7 +24510,7 @@ echo "configure:24453: checking for sqli
4847 echo $ac_n "checking for SQLite 3.3.9+""... $ac_c" 1>&6
4848 -echo "configure:24468: checking for SQLite 3.3.9+" >&5
4849 +echo "configure:24514: checking for SQLite 3.3.9+" >&5
4851 save_old_LDFLAGS=$LDFLAGS
4853 @@ -24563,7 +24609,7 @@ echo "configure:24468: checking for SQLi
4856 echo $ac_n "checking for sqlite3_prepare_v2 in -lsqlite3""... $ac_c" 1>&6
4857 -echo "configure:24567: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
4858 +echo "configure:24613: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
4859 ac_lib_var=`echo sqlite3'_'sqlite3_prepare_v2 | sed 'y%./+-%__p_%'`
4860 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4861 echo $ac_n "(cached) $ac_c" 1>&6
4862 @@ -24571,7 +24617,7 @@ else
4863 ac_save_LIBS="$LIBS"
4864 LIBS="-lsqlite3 $LIBS"
4865 cat > conftest.$ac_ext <<EOF
4866 -#line 24575 "configure"
4867 +#line 24621 "configure"
4868 #include "confdefs.h"
4869 /* Override any gcc2 internal prototype to avoid an error. */
4870 /* We use char because int might match the return type of a gcc2
4871 @@ -24582,7 +24628,7 @@ int main() {
4872 sqlite3_prepare_v2()
4875 -if { (eval echo configure:24586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4876 +if { (eval echo configure:24632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4878 eval "ac_cv_lib_$ac_lib_var=yes"
4880 @@ -24842,7 +24888,7 @@ fi
4883 echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
4884 -echo "configure:24846: checking for sqlite3_key in -lsqlite3" >&5
4885 +echo "configure:24892: checking for sqlite3_key in -lsqlite3" >&5
4886 ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
4887 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4888 echo $ac_n "(cached) $ac_c" 1>&6
4889 @@ -24850,7 +24896,7 @@ else
4890 ac_save_LIBS="$LIBS"
4891 LIBS="-lsqlite3 $LIBS"
4892 cat > conftest.$ac_ext <<EOF
4893 -#line 24854 "configure"
4894 +#line 24900 "configure"
4895 #include "confdefs.h"
4896 /* Override any gcc2 internal prototype to avoid an error. */
4897 /* We use char because int might match the return type of a gcc2
4898 @@ -24861,7 +24907,7 @@ int main() {
4902 -if { (eval echo configure:24865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4903 +if { (eval echo configure:24911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4905 eval "ac_cv_lib_$ac_lib_var=yes"
4907 @@ -24993,7 +25039,7 @@ fi
4910 echo $ac_n "checking for sqlite3_load_extension in -lsqlite3""... $ac_c" 1>&6
4911 -echo "configure:24997: checking for sqlite3_load_extension in -lsqlite3" >&5
4912 +echo "configure:25043: checking for sqlite3_load_extension in -lsqlite3" >&5
4913 ac_lib_var=`echo sqlite3'_'sqlite3_load_extension | sed 'y%./+-%__p_%'`
4914 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4915 echo $ac_n "(cached) $ac_c" 1>&6
4916 @@ -25001,7 +25047,7 @@ else
4917 ac_save_LIBS="$LIBS"
4918 LIBS="-lsqlite3 $LIBS"
4919 cat > conftest.$ac_ext <<EOF
4920 -#line 25005 "configure"
4921 +#line 25051 "configure"
4922 #include "confdefs.h"
4923 /* Override any gcc2 internal prototype to avoid an error. */
4924 /* We use char because int might match the return type of a gcc2
4925 @@ -25012,7 +25058,7 @@ int main() {
4926 sqlite3_load_extension()
4929 -if { (eval echo configure:25016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4930 +if { (eval echo configure:25062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4932 eval "ac_cv_lib_$ac_lib_var=yes"
4934 @@ -25049,7 +25095,7 @@ fi
4937 echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6
4938 -echo "configure:25053: checking bundled sqlite3 library" >&5
4939 +echo "configure:25099: checking bundled sqlite3 library" >&5
4940 echo "$ac_t""yes" 1>&6
4942 sqlite3_extra_sources="libsqlite/sqlite3.c"
4943 @@ -25405,7 +25451,7 @@ fi
4946 echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6
4947 -echo "configure:25409: checking for ZLIB support" >&5
4948 +echo "configure:25455: checking for ZLIB support" >&5
4949 # Check whether --with-zlib or --without-zlib was given.
4950 if test "${with_zlib+set}" = set; then
4951 withval="$with_zlib"
4952 @@ -25449,7 +25495,7 @@ echo "$ac_t""$ext_output" 1>&6
4953 php_with_zlib_dir=no
4955 echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6
4956 -echo "configure:25453: checking if the location of ZLIB install directory is defined" >&5
4957 +echo "configure:25499: checking if the location of ZLIB install directory is defined" >&5
4958 # Check whether --with-zlib-dir or --without-zlib-dir was given.
4959 if test "${with_zlib_dir+set}" = set; then
4960 withval="$with_zlib_dir"
4961 @@ -25892,7 +25938,7 @@ EOF
4964 echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6
4965 -echo "configure:25896: checking for gzgets in -lz" >&5
4966 +echo "configure:25942: checking for gzgets in -lz" >&5
4967 ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'`
4968 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
4969 echo $ac_n "(cached) $ac_c" 1>&6
4970 @@ -25900,7 +25946,7 @@ else
4971 ac_save_LIBS="$LIBS"
4973 cat > conftest.$ac_ext <<EOF
4974 -#line 25904 "configure"
4975 +#line 25950 "configure"
4976 #include "confdefs.h"
4977 /* Override any gcc2 internal prototype to avoid an error. */
4978 /* We use char because int might match the return type of a gcc2
4979 @@ -25911,7 +25957,7 @@ int main() {
4983 -if { (eval echo configure:25915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4984 +if { (eval echo configure:25961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4986 eval "ac_cv_lib_$ac_lib_var=yes"
4988 @@ -26048,18 +26094,18 @@ fi
4992 -php_enable_bcmath=no
4995 -echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
4996 -echo "configure:26055: checking whether to enable bc style precision math functions" >&5
4997 -# Check whether --enable-bcmath or --disable-bcmath was given.
4998 -if test "${enable_bcmath+set}" = set; then
4999 - enableval="$enable_bcmath"
5000 - PHP_BCMATH=$enableval
5001 +echo $ac_n "checking whether to enable APC support""... $ac_c" 1>&6
5002 +echo "configure:26101: checking whether to enable APC support" >&5
5003 +# Check whether --enable-apc or --disable-apc was given.
5004 +if test "${enable_apc+set}" = set; then
5005 + enableval="$enable_apc"
5006 + PHP_APC=$enableval
5010 - test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL
5012 + test "$PHP_ENABLE_ALL" && PHP_APC=$PHP_ENABLE_ALL
5016 @@ -26067,12 +26113,12 @@ fi
5018 ext_output="yes, shared"
5020 -case $PHP_BCMATH in
5023 - PHP_BCMATH=`echo "$PHP_BCMATH"|$SED 's/^shared,//'`
5024 + PHP_APC=`echo "$PHP_APC"|$SED 's/^shared,//'`
5032 @@ -26091,396 +26137,481 @@ echo "$ac_t""$ext_output" 1>&6
5036 -if test "$PHP_BCMATH" != "no"; then
5037 +# Check whether --enable-apc-debug or --disable-apc-debug was given.
5038 +if test "${enable_apc_debug+set}" = set; then
5039 + enableval="$enable_apc_debug"
5041 - ext_builddir=ext/bcmath
5042 - ext_srcdir=$abs_srcdir/ext/bcmath
5044 - ac_extra=`echo "-I@ext_srcdir@/libbcmath/src"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
5047 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
5048 - PHP_BCMATH_SHARED=no
5052 - case ext/bcmath in
5053 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
5054 - /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
5055 - *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
5062 +echo $ac_n "checking whether we should enable cache request file info""... $ac_c" 1>&6
5063 +echo "configure:26155: checking whether we should enable cache request file info" >&5
5064 +# Check whether --enable-apc-filehits or --disable-apc-filehits was given.
5065 +if test "${enable_apc_filehits+set}" = set; then
5066 + enableval="$enable_apc_filehits"
5068 + PHP_APC_FILEHITS=$enableval
5069 + echo "$ac_t""$enableval" 1>&6
5073 + PHP_APC_FILEHITS=no
5074 + echo "$ac_t""no" 1>&6
5076 - b_c_pre=$php_c_pre
5077 - b_cxx_pre=$php_cxx_pre
5078 - b_c_meta=$php_c_meta
5079 - b_cxx_meta=$php_cxx_meta
5080 - b_c_post=$php_c_post
5081 - b_cxx_post=$php_cxx_post
5087 - for ac_src in bcmath.c \
5088 -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 \
5089 -libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
5090 -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 \
5091 -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
5092 +echo $ac_n "checking whether we should use mmap""... $ac_c" 1>&6
5093 +echo "configure:26172: checking whether we should use mmap" >&5
5094 +# Check whether --enable-apc-mmap or --disable-apc-mmap was given.
5095 +if test "${enable_apc_mmap+set}" = set; then
5096 + enableval="$enable_apc_mmap"
5103 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
5104 + PHP_APC_MMAP=$enableval
5105 + echo "$ac_t""$enableval" 1>&6
5108 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5109 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5110 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5111 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
5116 + echo "$ac_t""yes" 1>&6
5118 - cat >>Makefile.objects<<EOF
5119 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
5126 - EXT_STATIC="$EXT_STATIC bcmath"
5127 - if test "$ext_shared" != "nocli"; then
5128 - EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
5131 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
5132 - PHP_BCMATH_SHARED=yes
5134 - case ext/bcmath in
5135 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
5136 - /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
5137 - *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
5139 +echo $ac_n "checking whether we should use semaphore locking instead of fcntl""... $ac_c" 1>&6
5140 +echo "configure:26189: checking whether we should use semaphore locking instead of fcntl" >&5
5141 +# Check whether --enable-apc-sem or --disable-apc-sem was given.
5142 +if test "${enable_apc_sem+set}" = set; then
5143 + enableval="$enable_apc_sem"
5145 + PHP_APC_SEM=$enableval
5146 + echo "$ac_t""$enableval" 1>&6
5151 + echo "$ac_t""no" 1>&6
5153 - b_c_pre=$shared_c_pre
5154 - b_cxx_pre=$shared_cxx_pre
5155 - b_c_meta=$shared_c_meta
5156 - b_cxx_meta=$shared_cxx_meta
5157 - b_c_post=$shared_c_post
5158 - b_cxx_post=$shared_cxx_post
5164 - for ac_src in bcmath.c \
5165 -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 \
5166 -libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
5167 -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 \
5168 -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
5169 +echo $ac_n "checking whether we should use pthread mutex locking""... $ac_c" 1>&6
5170 +echo "configure:26206: checking whether we should use pthread mutex locking" >&5
5171 +# Check whether --enable-apc-pthreadmutex or --disable-apc-pthreadmutex was given.
5172 +if test "${enable_apc_pthreadmutex+set}" = set; then
5173 + enableval="$enable_apc_pthreadmutex"
5180 - shared_objects_bcmath="$shared_objects_bcmath $ac_bdir$ac_obj.lo"
5181 + PHP_APC_PTHREADMUTEX=$enableval
5182 + echo "$ac_t""$enableval" 1>&6
5185 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5186 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5187 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5188 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
5192 + PHP_APC_PTHREADMUTEX=yes
5193 + echo "$ac_t""yes" 1>&6
5195 - cat >>Makefile.objects<<EOF
5196 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
5202 - case $host_alias in
5205 - install_modules="install-modules"
5207 - case $host_alias in
5210 - 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'
5214 - link_cmd='$(LIBTOOL) --mode=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)'
5218 - link_cmd='$(LIBTOOL) --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)'
5220 +if test "$PHP_APC_PTHREADMUTEX" != "no"; then
5222 + LIBS="$LIBS -lpthread"
5223 + if test "$cross_compiling" = yes; then
5228 + c|c_r|pthread*) ;;
5230 + LIBS="-lpthread $LIBS"
5234 - if test "x" = "xyes"; then
5235 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbcmath.$suffix"
5237 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix"
5243 + cat > conftest.$ac_ext <<EOF
5244 +#line 26241 "configure"
5245 +#include "confdefs.h"
5247 + #include <sys/types.h>
5248 + #include <pthread.h>
5250 + pthread_mutex_t mutex;
5251 + pthread_mutexattr_t attr;
5253 + if(pthread_mutexattr_init(&attr)) {
5254 + puts("Unable to initialize pthread attributes (pthread_mutexattr_init).");
5257 + if(pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) {
5258 + puts("Unable to set PTHREAD_PROCESS_SHARED (pthread_mutexattr_setpshared), your system may not support shared mutex's.");
5261 + if(pthread_mutex_init(&mutex, &attr)) {
5262 + puts("Unable to initialize the mutex (pthread_mutex_init).");
5265 + if(pthread_mutexattr_destroy(&attr)) {
5266 + puts("Unable to destroy mutex attributes (pthread_mutexattr_destroy).");
5269 + if(pthread_mutex_destroy(&mutex)) {
5270 + puts("Unable to destroy mutex (pthread_mutex_destroy).");
5274 + puts("pthread mutex's are supported!");
5279 +if { (eval echo configure:26276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5283 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
5285 + c|c_r|pthread*) ;;
5287 + LIBS="-lpthread $LIBS"
5291 - cat >>Makefile.objects<<EOF
5292 -\$(phplibdir)/phpbcmath.$suffix: $ext_builddir/phpbcmath.$suffix
5293 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpbcmath.$suffix \$(phplibdir)
5295 -$ext_builddir/phpbcmath.$suffix: \$(shared_objects_bcmath) \$(PHPBCMATH_SHARED_DEPENDENCIES)
5299 + echo "configure: failed program was:" >&5
5300 + cat conftest.$ac_ext >&5
5302 + echo "configure: warning: It doesn't appear that pthread mutex's are supported on your system" 1>&2
5303 + PHP_APC_PTHREADMUTEX=no
5316 - install_modules="install-modules"
5317 +echo $ac_n "checking whether we should use spin locks""... $ac_c" 1>&6
5318 +echo "configure:26304: checking whether we should use spin locks" >&5
5319 +# Check whether --enable-apc-spinlocks or --disable-apc-spinlocks was given.
5320 +if test "${enable_apc_spinlocks+set}" = set; then
5321 + enableval="$enable_apc_spinlocks"
5323 + PHP_APC_SPINLOCKS=$enableval
5324 + echo "$ac_t""$enableval" 1>&6
5326 - case $host_alias in
5329 - 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'
5333 - link_cmd='$(LIBTOOL) --mode=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)'
5337 - link_cmd='$(LIBTOOL) --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)'
5342 + PHP_APC_SPINLOCKS=no
5343 + echo "$ac_t""no" 1>&6
5345 - if test "x" = "xyes"; then
5346 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bcmath.$suffix"
5348 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix"
5353 +echo $ac_n "checking whether we should enable memory protection""... $ac_c" 1>&6
5354 +echo "configure:26321: checking whether we should enable memory protection" >&5
5355 +# Check whether --enable-apc-memprotect or --disable-apc-memprotect was given.
5356 +if test "${enable_apc_memprotect+set}" = set; then
5357 + enableval="$enable_apc_memprotect"
5359 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
5360 + PHP_APC_MEMPROTECT=$enableval
5361 + echo "$ac_t""$enableval" 1>&6
5363 - cat >>Makefile.objects<<EOF
5364 -\$(phplibdir)/bcmath.$suffix: $ext_builddir/bcmath.$suffix
5365 - \$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir)
5368 + PHP_APC_MEMPROTECT=no
5369 + echo "$ac_t""no" 1>&6
5371 -$ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES)
5376 +if test "$PHP_APC" != "no"; then
5377 + test "$PHP_APC_MMAP" != "no" && cat >> confdefs.h <<\EOF
5383 - cat >> confdefs.h <<EOF
5384 -#define COMPILE_DL_BCMATH 1
5385 + test "$PHP_APC_FILEHITS" != "no" && cat >> confdefs.h <<\EOF
5386 +#define APC_FILEHITS 1
5392 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
5393 - PHP_BCMATH_SHARED=no
5394 - case "$PHP_SAPI" in
5398 - case ext/bcmath in
5399 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
5400 - /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
5401 - *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
5405 + if test "$PHP_APC_DEBUG" != "no"; then
5406 + cat >> confdefs.h <<\EOF
5407 +#define __DEBUG_APC__ 1
5410 - b_c_pre=$php_c_pre
5411 - b_cxx_pre=$php_cxx_pre
5412 - b_c_meta=$php_c_meta
5413 - b_cxx_meta=$php_cxx_meta
5414 - b_c_post=$php_c_post
5415 - b_cxx_post=$php_cxx_post
5419 + if test "$PHP_APC_SEM" != "no"; then
5420 + cat >> confdefs.h <<\EOF
5421 +#define APC_SEM_LOCKS 1
5425 - for ac_src in bcmath.c \
5426 -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 \
5427 -libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
5428 -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 \
5429 -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
5436 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
5437 + elif test "$PHP_APC_SPINLOCKS" != "no"; then
5438 + cat >> confdefs.h <<\EOF
5439 +#define APC_SPIN_LOCKS 1
5442 + elif test "$PHP_APC_PTHREADMUTEX" != "no"; then
5443 + cat >> confdefs.h <<\EOF
5444 +#define APC_PTHREADMUTEX_LOCKS 1
5448 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5449 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5450 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5451 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
5454 + cat >> confdefs.h <<\EOF
5455 +#define APC_FCNTL_LOCKS 1
5458 - cat >>Makefile.objects<<EOF
5459 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
5463 + if test "$PHP_APC_MEMPROTECT" != "no"; then
5464 + cat >> confdefs.h <<\EOF
5465 +#define APC_MEMPROTECT 1
5471 - EXT_STATIC="$EXT_STATIC bcmath"
5475 + echo $ac_n "checking for zend_set_lookup_function_hook""... $ac_c" 1>&6
5476 +echo "configure:26384: checking for zend_set_lookup_function_hook" >&5
5477 +if eval "test \"`echo '$''{'php_cv_zend_set_lookup_function_hook'+set}'`\" = set"; then
5478 + echo $ac_n "(cached) $ac_c" 1>&6
5481 - case ext/bcmath in
5482 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
5483 - /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
5484 - *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
5486 + orig_cflags=$CFLAGS
5487 + CFLAGS="$INCLUDES $EXTRA_INCLUDES"
5488 + cat > conftest.$ac_ext <<EOF
5489 +#line 26392 "configure"
5490 +#include "confdefs.h"
5492 +#include "main/php.h"
5493 +#include "Zend/zend_API.h"
5496 +#ifndef zend_set_lookup_function_hook
5497 + (void) zend_set_lookup_function_hook;
5501 +if { (eval echo configure:26404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5504 + php_cv_zend_set_lookup_function_hook=yes
5507 + echo "configure: failed program was:" >&5
5508 + cat conftest.$ac_ext >&5
5511 + php_cv_zend_set_lookup_function_hook=no
5515 + CFLAGS=$orig_cflags
5519 - b_c_pre=$php_c_pre
5520 - b_cxx_pre=$php_cxx_pre
5521 - b_c_meta=$php_c_meta
5522 - b_cxx_meta=$php_cxx_meta
5523 - b_c_post=$php_c_post
5524 - b_cxx_post=$php_cxx_post
5526 +echo "$ac_t""$php_cv_zend_set_lookup_function_hook" 1>&6
5527 + if test "$php_cv_zend_set_lookup_function_hook" = "yes"; then
5528 + cat >> confdefs.h <<\EOF
5529 +#define APC_HAVE_LOOKUP_HOOKS 1
5533 + cat >> confdefs.h <<\EOF
5534 +#define APC_HAVE_LOOKUP_HOOKS 0
5538 - for ac_src in bcmath.c \
5539 -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 \
5540 -libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
5541 -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 \
5542 -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
5549 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
5553 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5554 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5555 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
5556 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
5558 + for ac_func in sigaction
5560 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
5561 +echo "configure:26438: checking for $ac_func" >&5
5562 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
5563 + echo $ac_n "(cached) $ac_c" 1>&6
5565 + cat > conftest.$ac_ext <<EOF
5566 +#line 26443 "configure"
5567 +#include "confdefs.h"
5568 +/* System header to define __stub macros and hopefully few prototypes,
5569 + which can conflict with char $ac_func(); below. */
5570 +#include <assert.h>
5571 +/* Override any gcc2 internal prototype to avoid an error. */
5572 +/* We use char because int might match the return type of a gcc2
5573 + builtin and then its argument prototype would still apply. */
5576 - cat >>Makefile.objects<<EOF
5577 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
5581 +/* The GNU C library defines this for functions which it implements
5582 + to always fail with ENOSYS. Some functions are actually named
5583 + something starting with __ and the normal name is an alias. */
5584 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
5593 +if { (eval echo configure:26466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5595 + eval "ac_cv_func_$ac_func=yes"
5597 + echo "configure: failed program was:" >&5
5598 + cat conftest.$ac_ext >&5
5600 + eval "ac_cv_func_$ac_func=no"
5605 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
5606 + echo "$ac_t""yes" 1>&6
5607 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
5608 + cat >> confdefs.h <<EOF
5609 +#define $ac_tr_func 1
5613 + echo "$ac_t""no" 1>&6
5619 - EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
5621 + echo $ac_n "checking for union semun""... $ac_c" 1>&6
5622 +echo "configure:26491: checking for union semun" >&5
5623 +if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
5624 + echo $ac_n "(cached) $ac_c" 1>&6
5627 + cat > conftest.$ac_ext <<EOF
5628 +#line 26497 "configure"
5629 +#include "confdefs.h"
5631 +#include <sys/types.h>
5632 +#include <sys/ipc.h>
5633 +#include <sys/sem.h>
5636 +union semun x; x.val=1
5639 +if { (eval echo configure:26508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5642 - BUILD_DIR="$BUILD_DIR $ext_builddir"
5646 + echo "configure: failed program was:" >&5
5647 + cat conftest.$ac_ext >&5
5657 +echo "$ac_t""$php_cv_semun" 1>&6
5658 + if test "$php_cv_semun" = "yes"; then
5659 + cat >> confdefs.h <<\EOF
5660 +#define HAVE_SEMUN 1
5663 - if test "$ext_builddir" = "."; then
5664 - PHP_PECL_EXTENSION=bcmath
5666 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
5668 + cat >> confdefs.h <<\EOF
5669 +#define HAVE_SEMUN 0
5674 + echo $ac_n "checking whether we should enable valgrind support""... $ac_c" 1>&6
5675 +echo "configure:26539: checking whether we should enable valgrind support" >&5
5676 + # Check whether --enable-valgrind-checks or --disable-valgrind-checks was given.
5677 +if test "${enable_valgrind_checks+set}" = set; then
5678 + enableval="$enable_valgrind_checks"
5680 + PHP_APC_VALGRIND=$enableval
5681 + echo "$ac_t""$enableval" 1>&6
5683 - BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src"
5687 + PHP_APC_VALGRIND=yes
5688 + echo "$ac_t""yes" 1>&6
5689 + ac_safe=`echo "valgrind/memcheck.h" | sed 'y%./+-%__p_%'`
5690 +echo $ac_n "checking for valgrind/memcheck.h""... $ac_c" 1>&6
5691 +echo "configure:26553: checking for valgrind/memcheck.h" >&5
5692 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5693 + echo $ac_n "(cached) $ac_c" 1>&6
5695 + cat > conftest.$ac_ext <<EOF
5696 +#line 26558 "configure"
5697 +#include "confdefs.h"
5698 +#include <valgrind/memcheck.h>
5700 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5701 +{ (eval echo configure:26563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5702 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
5703 +if test -z "$ac_err"; then
5705 + eval "ac_cv_header_$ac_safe=yes"
5707 + echo "$ac_err" >&5
5708 + echo "configure: failed program was:" >&5
5709 + cat conftest.$ac_ext >&5
5711 + eval "ac_cv_header_$ac_safe=no"
5715 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
5716 + echo "$ac_t""yes" 1>&6
5717 cat >> confdefs.h <<\EOF
5718 -#define HAVE_BCMATH 1
5719 +#define HAVE_VALGRIND_MEMCHECK_H 1
5723 + echo "$ac_t""no" 1>&6
5730 -echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
5731 -echo "configure:26420: checking for BZip2 support" >&5
5732 -# Check whether --with-bz2 or --without-bz2 was given.
5733 -if test "${with_bz2+set}" = set; then
5734 - withval="$with_bz2"
5739 - test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL
5745 -ext_output="yes, shared"
5749 - PHP_BZ2=`echo "$PHP_BZ2"|$SED 's/^shared,//'`
5766 -echo "$ac_t""$ext_output" 1>&6
5771 -if test "$PHP_BZ2" != "no"; then
5772 - if test -r $PHP_BZ2/include/bzlib.h; then
5775 - echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6
5776 -echo "configure:26465: checking for BZip2 in default path" >&5
5777 - for i in /usr/local /usr; do
5778 - if test -r $i/include/bzlib.h; then
5780 - echo "$ac_t""found in $i" 1>&6
5786 - if test -z "$BZIP_DIR"; then
5787 - echo "$ac_t""not found" 1>&6
5788 - { echo "configure: error: Please reinstall the BZip2 distribution" 1>&2; exit 1; }
5790 + apc_sources="apc.c php_apc.c \
5799 + apc_pthreadmutex.c \
5813 save_old_LDFLAGS=$LDFLAGS
5815 - -L$BZIP_DIR/$PHP_LIBDIR
5819 save_ext_shared=$ext_shared
5821 @@ -26573,27 +26704,27 @@ echo "configure:26465: checking for BZip
5825 - echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6
5826 -echo "configure:26578: checking for BZ2_bzerror in -lbz2" >&5
5827 -ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'`
5828 + echo $ac_n "checking for shm_open in -lrt""... $ac_c" 1>&6
5829 +echo "configure:26709: checking for shm_open in -lrt" >&5
5830 +ac_lib_var=`echo rt'_'shm_open | sed 'y%./+-%__p_%'`
5831 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5832 echo $ac_n "(cached) $ac_c" 1>&6
5834 ac_save_LIBS="$LIBS"
5837 cat > conftest.$ac_ext <<EOF
5838 -#line 26586 "configure"
5839 +#line 26717 "configure"
5840 #include "confdefs.h"
5841 /* Override any gcc2 internal prototype to avoid an error. */
5842 /* We use char because int might match the return type of a gcc2
5843 builtin and then its argument prototype would still apply. */
5844 -char BZ2_bzerror();
5852 -if { (eval echo configure:26597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5853 +if { (eval echo configure:26728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5855 eval "ac_cv_lib_$ac_lib_var=yes"
5857 @@ -26612,167 +26743,53 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
5858 LDFLAGS=$save_old_LDFLAGS
5859 ext_shared=$save_ext_shared
5862 - if test "$BZIP_DIR/include" != "/usr/include"; then
5864 - if test -z "$BZIP_DIR/include" || echo "$BZIP_DIR/include" | grep '^/' >/dev/null ; then
5865 - ai_p=$BZIP_DIR/include
5868 - ep_dir="`echo $BZIP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
5870 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
5871 - ai_p="$ep_realdir/`basename \"$BZIP_DIR/include\"`"
5876 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
5878 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
5879 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
5880 - eval "INCLUDEPATH$unique=set"
5883 - INCLUDES="-I$ai_p $INCLUDES"
5885 - INCLUDES="$INCLUDES -I$ai_p"
5894 - if test "$ext_shared" = "yes"; then
5895 - BZ2_SHARED_LIBADD="-lbz2 $BZ2_SHARED_LIBADD"
5896 - if test -n "$BZIP_DIR/$PHP_LIBDIR"; then
5898 - if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
5900 - if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
5901 - ai_p=$BZIP_DIR/$PHP_LIBDIR
5904 - ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
5906 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
5907 - ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
5911 - if test "$ext_shared" = "yes"; then
5912 - BZ2_SHARED_LIBADD="-L$ai_p $BZ2_SHARED_LIBADD"
5913 - test -n "$ld_runpath_switch" && BZ2_SHARED_LIBADD="$ld_runpath_switch$ai_p $BZ2_SHARED_LIBADD"
5918 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
5920 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
5921 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
5922 - eval "LIBPATH$unique=set"
5924 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
5925 - LDFLAGS="$LDFLAGS -L$ai_p"
5926 - PHP_RPATHS="$PHP_RPATHS $ai_p"
5939 - if test -n "$BZIP_DIR/$PHP_LIBDIR"; then
5941 - if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
5943 - if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
5944 - ai_p=$BZIP_DIR/$PHP_LIBDIR
5947 - ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
5949 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
5950 - ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
5955 + c|c_r|pthread*) ;;
5957 + if test "$ext_shared" = "yes"; then
5958 + APC_SHARED_LIBADD="-lrt $APC_SHARED_LIBADD"
5963 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
5965 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
5966 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
5967 - eval "LIBPATH$unique=set"
5969 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
5970 - LDFLAGS="$LDFLAGS -L$ai_p"
5971 - PHP_RPATHS="$PHP_RPATHS $ai_p"
5986 - LIBS="-lbz2 $LIBS"
6000 - cat >> confdefs.h <<\EOF
6007 echo "$ac_t""no" 1>&6
6009 LDFLAGS=$save_old_LDFLAGS
6010 ext_shared=$save_ext_shared
6011 - unset ac_cv_lib_bz2_BZ2_bzerror
6012 + unset ac_cv_lib_rt_shm_open
6014 - { echo "configure: error: bz2 module requires libbz2 >= 1.0.0" 1>&2; exit 1; }
6021 - ext_builddir=ext/bz2
6022 - ext_srcdir=$abs_srcdir/ext/bz2
6023 + ext_builddir=ext/apc
6024 + ext_srcdir=$abs_srcdir/ext/apc
6027 + ac_extra=`echo "\\$(APC_CFLAGS)"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
6029 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
6036 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6037 - /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6038 - *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6039 + /*) ac_srcdir=`echo "ext/apc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6040 + *) ac_srcdir="$abs_srcdir/ext/apc/"; ac_bdir="ext/apc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6044 @@ -26787,7 +26804,7 @@ fi
6048 - for ac_src in bz2.c bz2_filter.c; do
6049 + for ac_src in $apc_sources; do
6053 @@ -26810,18 +26827,18 @@ EOF
6057 - EXT_STATIC="$EXT_STATIC bz2"
6058 + EXT_STATIC="$EXT_STATIC apc"
6059 if test "$ext_shared" != "nocli"; then
6060 - EXT_CLI_STATIC="$EXT_CLI_STATIC bz2"
6061 + EXT_CLI_STATIC="$EXT_CLI_STATIC apc"
6064 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
6065 - PHP_BZ2_SHARED=yes
6066 + PHP_APC_SHARED=yes
6070 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6071 - /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6072 - *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6073 + /*) ac_srcdir=`echo "ext/apc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6074 + *) ac_srcdir="$abs_srcdir/ext/apc/"; ac_bdir="ext/apc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6078 @@ -26836,14 +26853,14 @@ EOF
6082 - for ac_src in bz2.c bz2_filter.c; do
6083 + for ac_src in $apc_sources; do
6090 - shared_objects_bz2="$shared_objects_bz2 $ac_bdir$ac_obj.lo"
6091 + shared_objects_apc="$shared_objects_apc $ac_bdir$ac_obj.lo"
6094 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
6095 @@ -26866,31 +26883,31 @@ EOF
6099 - 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'
6100 + 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'
6104 - link_cmd='$(LIBTOOL) --mode=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)'
6105 + link_cmd='$(LIBTOOL) --mode=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)'
6109 - link_cmd='$(LIBTOOL) --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)'
6110 + link_cmd='$(LIBTOOL) --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)'
6114 if test "x" = "xyes"; then
6115 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbz2.$suffix"
6116 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpapc.$suffix"
6118 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbz2.$suffix"
6119 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpapc.$suffix"
6122 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2"
6123 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_apc"
6125 cat >>Makefile.objects<<EOF
6126 -\$(phplibdir)/phpbz2.$suffix: $ext_builddir/phpbz2.$suffix
6127 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpbz2.$suffix \$(phplibdir)
6128 +\$(phplibdir)/phpapc.$suffix: $ext_builddir/phpapc.$suffix
6129 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpapc.$suffix \$(phplibdir)
6131 -$ext_builddir/phpbz2.$suffix: \$(shared_objects_bz2) \$(PHPBZ2_SHARED_DEPENDENCIES)
6132 +$ext_builddir/phpapc.$suffix: \$(shared_objects_apc) \$(PHPAPC_SHARED_DEPENDENCIES)
6136 @@ -26903,31 +26920,31 @@ EOF
6140 - 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'
6141 + 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'
6145 - link_cmd='$(LIBTOOL) --mode=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)'
6146 + link_cmd='$(LIBTOOL) --mode=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)'
6150 - link_cmd='$(LIBTOOL) --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)'
6151 + link_cmd='$(LIBTOOL) --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)'
6155 if test "x" = "xyes"; then
6156 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bz2.$suffix"
6157 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/apc.$suffix"
6159 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/bz2.$suffix"
6160 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/apc.$suffix"
6163 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2"
6164 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_apc"
6166 cat >>Makefile.objects<<EOF
6167 -\$(phplibdir)/bz2.$suffix: $ext_builddir/bz2.$suffix
6168 - \$(LIBTOOL) --mode=install cp $ext_builddir/bz2.$suffix \$(phplibdir)
6169 +\$(phplibdir)/apc.$suffix: $ext_builddir/apc.$suffix
6170 + \$(LIBTOOL) --mode=install cp $ext_builddir/apc.$suffix \$(phplibdir)
6172 -$ext_builddir/bz2.$suffix: \$(shared_objects_bz2) \$(BZ2_SHARED_DEPENDENCIES)
6173 +$ext_builddir/apc.$suffix: \$(shared_objects_apc) \$(APC_SHARED_DEPENDENCIES)
6177 @@ -26935,22 +26952,22 @@ EOF
6180 cat >> confdefs.h <<EOF
6181 -#define COMPILE_DL_BZ2 1
6182 +#define COMPILE_DL_APC 1
6188 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
6197 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6198 - /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6199 - *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6200 + /*) ac_srcdir=`echo "ext/apc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6201 + *) ac_srcdir="$abs_srcdir/ext/apc/"; ac_bdir="ext/apc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6205 @@ -26965,7 +26982,7 @@ EOF
6209 - for ac_src in bz2.c bz2_filter.c; do
6210 + for ac_src in $apc_sources; do
6214 @@ -26988,15 +27005,15 @@ EOF
6218 - EXT_STATIC="$EXT_STATIC bz2"
6219 + EXT_STATIC="$EXT_STATIC apc"
6226 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6227 - /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6228 - *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6229 + /*) ac_srcdir=`echo "ext/apc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6230 + *) ac_srcdir="$abs_srcdir/ext/apc/"; ac_bdir="ext/apc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6234 @@ -27011,7 +27028,7 @@ EOF
6238 - for ac_src in bz2.c bz2_filter.c; do
6239 + for ac_src in $apc_sources; do
6243 @@ -27036,7 +27053,7 @@ EOF
6247 - EXT_CLI_STATIC="$EXT_CLI_STATIC bz2"
6248 + EXT_CLI_STATIC="$EXT_CLI_STATIC apc"
6252 @@ -27045,31 +27062,39 @@ EOF
6255 if test "$ext_builddir" = "."; then
6256 - PHP_PECL_EXTENSION=bz2
6257 + PHP_PECL_EXTENSION=apc
6259 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
6264 - PHP_VAR_SUBST="$PHP_VAR_SUBST BZ2_SHARED_LIBADD"
6265 + PHP_VAR_SUBST="$PHP_VAR_SUBST APC_SHARED_LIBADD"
6268 + PHP_VAR_SUBST="$PHP_VAR_SUBST APC_CFLAGS"
6270 + cat >> confdefs.h <<\EOF
6278 -php_enable_calendar=no
6280 -echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6
6281 -echo "configure:27065: checking whether to enable calendar conversion support" >&5
6282 -# Check whether --enable-calendar or --disable-calendar was given.
6283 -if test "${enable_calendar+set}" = set; then
6284 - enableval="$enable_calendar"
6285 - PHP_CALENDAR=$enableval
6286 +php_enable_bcmath=no
6288 +echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
6289 +echo "configure:27090: checking whether to enable bc style precision math functions" >&5
6290 +# Check whether --enable-bcmath or --disable-bcmath was given.
6291 +if test "${enable_bcmath+set}" = set; then
6292 + enableval="$enable_bcmath"
6293 + PHP_BCMATH=$enableval
6297 - test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL
6299 + test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL
6303 @@ -27077,12 +27102,12 @@ fi
6305 ext_output="yes, shared"
6307 -case $PHP_CALENDAR in
6308 +case $PHP_BCMATH in
6310 - PHP_CALENDAR=`echo "$PHP_CALENDAR"|$SED 's/^shared,//'`
6311 + PHP_BCMATH=`echo "$PHP_BCMATH"|$SED 's/^shared,//'`
6319 @@ -27101,25 +27126,21 @@ echo "$ac_t""$ext_output" 1>&6
6323 -if test "$PHP_CALENDAR" = "yes"; then
6324 - cat >> confdefs.h <<\EOF
6325 -#define HAVE_CALENDAR 1
6328 +if test "$PHP_BCMATH" != "no"; then
6330 - ext_builddir=ext/calendar
6331 - ext_srcdir=$abs_srcdir/ext/calendar
6332 + ext_builddir=ext/bcmath
6333 + ext_srcdir=$abs_srcdir/ext/bcmath
6336 + ac_extra=`echo "-I@ext_srcdir@/libbcmath/src"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
6338 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
6339 - PHP_CALENDAR_SHARED=no
6340 + PHP_BCMATH_SHARED=no
6343 - case ext/calendar in
6344 + case ext/bcmath in
6345 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6346 - /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6347 - *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6348 + /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6349 + *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6353 @@ -27134,7 +27155,11 @@ EOF
6357 - for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
6358 + for ac_src in bcmath.c \
6359 +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 \
6360 +libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
6361 +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 \
6362 +libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
6366 @@ -27157,18 +27182,18 @@ EOF
6370 - EXT_STATIC="$EXT_STATIC calendar"
6371 + EXT_STATIC="$EXT_STATIC bcmath"
6372 if test "$ext_shared" != "nocli"; then
6373 - EXT_CLI_STATIC="$EXT_CLI_STATIC calendar"
6374 + EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
6377 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
6378 - PHP_CALENDAR_SHARED=yes
6379 + PHP_BCMATH_SHARED=yes
6381 - case ext/calendar in
6382 + case ext/bcmath in
6383 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6384 - /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6385 - *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6386 + /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6387 + *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6391 @@ -27183,14 +27208,18 @@ EOF
6395 - for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
6396 + for ac_src in bcmath.c \
6397 +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 \
6398 +libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
6399 +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 \
6400 +libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
6407 - shared_objects_calendar="$shared_objects_calendar $ac_bdir$ac_obj.lo"
6408 + shared_objects_bcmath="$shared_objects_bcmath $ac_bdir$ac_obj.lo"
6411 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
6412 @@ -27213,31 +27242,31 @@ EOF
6416 - 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'
6417 + 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'
6421 - link_cmd='$(LIBTOOL) --mode=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)'
6422 + link_cmd='$(LIBTOOL) --mode=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)'
6426 - link_cmd='$(LIBTOOL) --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)'
6427 + link_cmd='$(LIBTOOL) --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)'
6431 if test "x" = "xyes"; then
6432 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpcalendar.$suffix"
6433 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbcmath.$suffix"
6435 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpcalendar.$suffix"
6436 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix"
6439 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar"
6440 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
6442 cat >>Makefile.objects<<EOF
6443 -\$(phplibdir)/phpcalendar.$suffix: $ext_builddir/phpcalendar.$suffix
6444 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpcalendar.$suffix \$(phplibdir)
6445 +\$(phplibdir)/phpbcmath.$suffix: $ext_builddir/phpbcmath.$suffix
6446 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpbcmath.$suffix \$(phplibdir)
6448 -$ext_builddir/phpcalendar.$suffix: \$(shared_objects_calendar) \$(PHPCALENDAR_SHARED_DEPENDENCIES)
6449 +$ext_builddir/phpbcmath.$suffix: \$(shared_objects_bcmath) \$(PHPBCMATH_SHARED_DEPENDENCIES)
6453 @@ -27250,31 +27279,31 @@ EOF
6457 - 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'
6458 + 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'
6462 - link_cmd='$(LIBTOOL) --mode=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)'
6463 + link_cmd='$(LIBTOOL) --mode=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)'
6467 - link_cmd='$(LIBTOOL) --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)'
6468 + link_cmd='$(LIBTOOL) --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)'
6472 if test "x" = "xyes"; then
6473 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/calendar.$suffix"
6474 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bcmath.$suffix"
6476 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/calendar.$suffix"
6477 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix"
6480 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar"
6481 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
6483 cat >>Makefile.objects<<EOF
6484 -\$(phplibdir)/calendar.$suffix: $ext_builddir/calendar.$suffix
6485 - \$(LIBTOOL) --mode=install cp $ext_builddir/calendar.$suffix \$(phplibdir)
6486 +\$(phplibdir)/bcmath.$suffix: $ext_builddir/bcmath.$suffix
6487 + \$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir)
6489 -$ext_builddir/calendar.$suffix: \$(shared_objects_calendar) \$(CALENDAR_SHARED_DEPENDENCIES)
6490 +$ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES)
6494 @@ -27282,22 +27311,22 @@ EOF
6497 cat >> confdefs.h <<EOF
6498 -#define COMPILE_DL_CALENDAR 1
6499 +#define COMPILE_DL_BCMATH 1
6505 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
6506 - PHP_CALENDAR_SHARED=no
6507 + PHP_BCMATH_SHARED=no
6512 - case ext/calendar in
6513 + case ext/bcmath in
6514 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6515 - /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6516 - *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6517 + /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6518 + *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6522 @@ -27312,7 +27341,11 @@ EOF
6526 - for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
6527 + for ac_src in bcmath.c \
6528 +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 \
6529 +libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
6530 +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 \
6531 +libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
6535 @@ -27335,15 +27368,15 @@ EOF
6539 - EXT_STATIC="$EXT_STATIC calendar"
6540 + EXT_STATIC="$EXT_STATIC bcmath"
6545 - case ext/calendar in
6546 + case ext/bcmath in
6547 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6548 - /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6549 - *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6550 + /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6551 + *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6555 @@ -27358,7 +27391,11 @@ EOF
6559 - for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
6560 + for ac_src in bcmath.c \
6561 +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 \
6562 +libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
6563 +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 \
6564 +libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
6568 @@ -27383,7 +27420,7 @@ EOF
6572 - EXT_CLI_STATIC="$EXT_CLI_STATIC calendar"
6573 + EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
6577 @@ -27392,28 +27429,37 @@ EOF
6580 if test "$ext_builddir" = "."; then
6581 - PHP_PECL_EXTENSION=calendar
6582 + PHP_PECL_EXTENSION=bcmath
6584 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
6590 + BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src"
6593 + cat >> confdefs.h <<\EOF
6594 +#define HAVE_BCMATH 1
6601 -php_enable_ctype=yes
6604 -echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6
6605 -echo "configure:27409: checking whether to enable ctype functions" >&5
6606 -# Check whether --enable-ctype or --disable-ctype was given.
6607 -if test "${enable_ctype+set}" = set; then
6608 - enableval="$enable_ctype"
6609 - PHP_CTYPE=$enableval
6610 +echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
6611 +echo "configure:27455: checking for BZip2 support" >&5
6612 +# Check whether --with-bz2 or --without-bz2 was given.
6613 +if test "${with_bz2+set}" = set; then
6614 + withval="$with_bz2"
6619 - test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL
6621 + test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL
6625 @@ -27421,12 +27467,12 @@ fi
6627 ext_output="yes, shared"
6632 - PHP_CTYPE=`echo "$PHP_CTYPE"|$SED 's/^shared,//'`
6633 + PHP_BZ2=`echo "$PHP_BZ2"|$SED 's/^shared,//'`
6641 @@ -27445,48 +27491,346 @@ echo "$ac_t""$ext_output" 1>&6
6645 -if test "$PHP_CTYPE" != "no"; then
6646 - cat >> confdefs.h <<\EOF
6647 -#define HAVE_CTYPE 1
6651 - ext_builddir=ext/ctype
6652 - ext_srcdir=$abs_srcdir/ext/ctype
6653 +if test "$PHP_BZ2" != "no"; then
6654 + if test -r $PHP_BZ2/include/bzlib.h; then
6657 + echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6
6658 +echo "configure:27500: checking for BZip2 in default path" >&5
6659 + for i in /usr/local /usr; do
6660 + if test -r $i/include/bzlib.h; then
6662 + echo "$ac_t""found in $i" 1>&6
6669 + if test -z "$BZIP_DIR"; then
6670 + echo "$ac_t""not found" 1>&6
6671 + { echo "configure: error: Please reinstall the BZip2 distribution" 1>&2; exit 1; }
6674 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
6675 - PHP_CTYPE_SHARED=no
6679 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6680 - /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6681 - *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
6683 + save_old_LDFLAGS=$LDFLAGS
6685 + -L$BZIP_DIR/$PHP_LIBDIR
6688 + save_ext_shared=$ext_shared
6691 + for ac_i in $ac_stuff; do
6694 + if test "$ext_shared" = "yes"; then
6695 + LDFLAGS="$LDFLAGS -pthread"
6699 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
6701 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
6702 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
6703 + eval "EXTRA_LDFLAGS$unique=set"
6704 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
6707 - b_c_pre=$php_c_pre
6708 - b_cxx_pre=$php_cxx_pre
6709 - b_c_meta=$php_c_meta
6710 - b_cxx_meta=$php_cxx_meta
6711 - b_c_post=$php_c_post
6712 - b_cxx_post=$php_cxx_post
6717 - for ac_src in ctype.c; do
6721 + ac_ii=`echo $ac_i|cut -c 3-`
6729 + c|c_r|pthread*) ;;
6731 + if test "$ext_shared" = "yes"; then
6732 + LDFLAGS="$LDFLAGS -l$ac_ii"
6735 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
6739 + c|c_r|pthread*) ;;
6741 + LIBS="$LIBS -l$ac_ii"
6753 + ac_ii=`echo $ac_i|cut -c 3-`
6755 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
6757 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
6761 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
6763 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
6764 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
6768 + if test "$ext_shared" = "yes"; then
6769 + LDFLAGS="-L$ai_p $LDFLAGS"
6770 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
6775 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
6777 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
6778 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
6779 + eval "LIBPATH$unique=set"
6781 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
6782 + LDFLAGS="$LDFLAGS -L$ai_p"
6783 + PHP_RPATHS="$PHP_RPATHS $ai_p"
6796 + echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6
6797 +echo "configure:27613: checking for BZ2_bzerror in -lbz2" >&5
6798 +ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'`
6799 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6800 + echo $ac_n "(cached) $ac_c" 1>&6
6802 + ac_save_LIBS="$LIBS"
6804 +cat > conftest.$ac_ext <<EOF
6805 +#line 27621 "configure"
6806 +#include "confdefs.h"
6807 +/* Override any gcc2 internal prototype to avoid an error. */
6808 +/* We use char because int might match the return type of a gcc2
6809 + builtin and then its argument prototype would still apply. */
6810 +char BZ2_bzerror();
6816 +if { (eval echo configure:27632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6818 + eval "ac_cv_lib_$ac_lib_var=yes"
6820 + echo "configure: failed program was:" >&5
6821 + cat conftest.$ac_ext >&5
6823 + eval "ac_cv_lib_$ac_lib_var=no"
6826 +LIBS="$ac_save_LIBS"
6829 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
6830 + echo "$ac_t""yes" 1>&6
6832 + LDFLAGS=$save_old_LDFLAGS
6833 + ext_shared=$save_ext_shared
6836 + if test "$BZIP_DIR/include" != "/usr/include"; then
6838 + if test -z "$BZIP_DIR/include" || echo "$BZIP_DIR/include" | grep '^/' >/dev/null ; then
6839 + ai_p=$BZIP_DIR/include
6842 + ep_dir="`echo $BZIP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
6844 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
6845 + ai_p="$ep_realdir/`basename \"$BZIP_DIR/include\"`"
6850 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
6852 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
6853 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
6854 + eval "INCLUDEPATH$unique=set"
6857 + INCLUDES="-I$ai_p $INCLUDES"
6859 + INCLUDES="$INCLUDES -I$ai_p"
6868 + if test "$ext_shared" = "yes"; then
6869 + BZ2_SHARED_LIBADD="-lbz2 $BZ2_SHARED_LIBADD"
6870 + if test -n "$BZIP_DIR/$PHP_LIBDIR"; then
6872 + if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
6874 + if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
6875 + ai_p=$BZIP_DIR/$PHP_LIBDIR
6878 + ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
6880 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
6881 + ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
6885 + if test "$ext_shared" = "yes"; then
6886 + BZ2_SHARED_LIBADD="-L$ai_p $BZ2_SHARED_LIBADD"
6887 + test -n "$ld_runpath_switch" && BZ2_SHARED_LIBADD="$ld_runpath_switch$ai_p $BZ2_SHARED_LIBADD"
6892 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
6894 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
6895 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
6896 + eval "LIBPATH$unique=set"
6898 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
6899 + LDFLAGS="$LDFLAGS -L$ai_p"
6900 + PHP_RPATHS="$PHP_RPATHS $ai_p"
6913 + if test -n "$BZIP_DIR/$PHP_LIBDIR"; then
6915 + if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then
6917 + if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
6918 + ai_p=$BZIP_DIR/$PHP_LIBDIR
6921 + ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
6923 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
6924 + ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
6931 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
6933 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
6934 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
6935 + eval "LIBPATH$unique=set"
6937 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
6938 + LDFLAGS="$LDFLAGS -L$ai_p"
6939 + PHP_RPATHS="$PHP_RPATHS $ai_p"
6951 + c|c_r|pthread*) ;;
6953 + LIBS="-lbz2 $LIBS"
6963 + cat >> confdefs.h <<\EOF
6970 + echo "$ac_t""no" 1>&6
6972 + LDFLAGS=$save_old_LDFLAGS
6973 + ext_shared=$save_ext_shared
6974 + unset ac_cv_lib_bz2_BZ2_bzerror
6976 + { echo "configure: error: bz2 module requires libbz2 >= 1.0.0" 1>&2; exit 1; }
6983 + ext_builddir=ext/bz2
6984 + ext_srcdir=$abs_srcdir/ext/bz2
6988 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
6993 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
6994 + /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
6995 + *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7000 + b_c_pre=$php_c_pre
7001 + b_cxx_pre=$php_cxx_pre
7002 + b_c_meta=$php_c_meta
7003 + b_cxx_meta=$php_cxx_meta
7004 + b_c_post=$php_c_post
7005 + b_cxx_post=$php_cxx_post
7010 + for ac_src in bz2.c bz2_filter.c; do
7017 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
7020 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7021 *.s) ac_comp="$b_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 @@ -27501,18 +27845,18 @@ EOF
7026 - EXT_STATIC="$EXT_STATIC ctype"
7027 + EXT_STATIC="$EXT_STATIC bz2"
7028 if test "$ext_shared" != "nocli"; then
7029 - EXT_CLI_STATIC="$EXT_CLI_STATIC ctype"
7030 + EXT_CLI_STATIC="$EXT_CLI_STATIC bz2"
7033 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
7034 - PHP_CTYPE_SHARED=yes
7035 + PHP_BZ2_SHARED=yes
7039 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7040 - /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7041 - *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7042 + /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7043 + *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7047 @@ -27527,14 +27871,14 @@ EOF
7051 - for ac_src in ctype.c; do
7052 + for ac_src in bz2.c bz2_filter.c; do
7059 - shared_objects_ctype="$shared_objects_ctype $ac_bdir$ac_obj.lo"
7060 + shared_objects_bz2="$shared_objects_bz2 $ac_bdir$ac_obj.lo"
7063 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7064 @@ -27557,31 +27901,31 @@ EOF
7068 - 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'
7069 + 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'
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_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCTYPE, 3)_SHARED_LIBADD)'
7074 + link_cmd='$(LIBTOOL) --mode=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)'
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_ctype) $(PHPCTYPE_SHARED_LIBADD)'
7079 + link_cmd='$(LIBTOOL) --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)'
7083 if test "x" = "xyes"; then
7084 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpctype.$suffix"
7085 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbz2.$suffix"
7087 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpctype.$suffix"
7088 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbz2.$suffix"
7091 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype"
7092 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2"
7094 cat >>Makefile.objects<<EOF
7095 -\$(phplibdir)/phpctype.$suffix: $ext_builddir/phpctype.$suffix
7096 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpctype.$suffix \$(phplibdir)
7097 +\$(phplibdir)/phpbz2.$suffix: $ext_builddir/phpbz2.$suffix
7098 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpbz2.$suffix \$(phplibdir)
7100 -$ext_builddir/phpctype.$suffix: \$(shared_objects_ctype) \$(PHPCTYPE_SHARED_DEPENDENCIES)
7101 +$ext_builddir/phpbz2.$suffix: \$(shared_objects_bz2) \$(PHPBZ2_SHARED_DEPENDENCIES)
7105 @@ -27594,31 +27938,31 @@ EOF
7109 - 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'
7110 + 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'
7114 - link_cmd='$(LIBTOOL) --mode=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)'
7115 + link_cmd='$(LIBTOOL) --mode=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)'
7119 - link_cmd='$(LIBTOOL) --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)'
7120 + link_cmd='$(LIBTOOL) --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)'
7124 if test "x" = "xyes"; then
7125 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/ctype.$suffix"
7126 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bz2.$suffix"
7128 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/ctype.$suffix"
7129 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/bz2.$suffix"
7132 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype"
7133 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2"
7135 cat >>Makefile.objects<<EOF
7136 -\$(phplibdir)/ctype.$suffix: $ext_builddir/ctype.$suffix
7137 - \$(LIBTOOL) --mode=install cp $ext_builddir/ctype.$suffix \$(phplibdir)
7138 +\$(phplibdir)/bz2.$suffix: $ext_builddir/bz2.$suffix
7139 + \$(LIBTOOL) --mode=install cp $ext_builddir/bz2.$suffix \$(phplibdir)
7141 -$ext_builddir/ctype.$suffix: \$(shared_objects_ctype) \$(CTYPE_SHARED_DEPENDENCIES)
7142 +$ext_builddir/bz2.$suffix: \$(shared_objects_bz2) \$(BZ2_SHARED_DEPENDENCIES)
7146 @@ -27626,22 +27970,22 @@ EOF
7149 cat >> confdefs.h <<EOF
7150 -#define COMPILE_DL_CTYPE 1
7151 +#define COMPILE_DL_BZ2 1
7157 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
7158 - PHP_CTYPE_SHARED=no
7166 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7167 - /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7168 - *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7169 + /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7170 + *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7174 @@ -27656,7 +28000,7 @@ EOF
7178 - for ac_src in ctype.c; do
7179 + for ac_src in bz2.c bz2_filter.c; do
7183 @@ -27679,15 +28023,15 @@ EOF
7187 - EXT_STATIC="$EXT_STATIC ctype"
7188 + EXT_STATIC="$EXT_STATIC bz2"
7195 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7196 - /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7197 - *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7198 + /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7199 + *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7203 @@ -27702,7 +28046,7 @@ EOF
7207 - for ac_src in ctype.c; do
7208 + for ac_src in bz2.c bz2_filter.c; do
7212 @@ -27727,7 +28071,7 @@ EOF
7216 - EXT_CLI_STATIC="$EXT_CLI_STATIC ctype"
7217 + EXT_CLI_STATIC="$EXT_CLI_STATIC bz2"
7221 @@ -27736,28 +28080,31 @@ EOF
7224 if test "$ext_builddir" = "."; then
7225 - PHP_PECL_EXTENSION=ctype
7226 + PHP_PECL_EXTENSION=bz2
7228 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
7233 + PHP_VAR_SUBST="$PHP_VAR_SUBST BZ2_SHARED_LIBADD"
7240 +php_enable_calendar=no
7242 -echo $ac_n "checking for cURL support""... $ac_c" 1>&6
7243 -echo "configure:27753: checking for cURL support" >&5
7244 -# Check whether --with-curl or --without-curl was given.
7245 -if test "${with_curl+set}" = set; then
7246 - withval="$with_curl"
7248 +echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6
7249 +echo "configure:28100: checking whether to enable calendar conversion support" >&5
7250 +# Check whether --enable-calendar or --disable-calendar was given.
7251 +if test "${enable_calendar+set}" = set; then
7252 + enableval="$enable_calendar"
7253 + PHP_CALENDAR=$enableval
7257 - test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL
7259 + test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL
7263 @@ -27765,12 +28112,12 @@ fi
7265 ext_output="yes, shared"
7268 +case $PHP_CALENDAR in
7270 - PHP_CURL=`echo "$PHP_CURL"|$SED 's/^shared,//'`
7271 + PHP_CALENDAR=`echo "$PHP_CALENDAR"|$SED 's/^shared,//'`
7279 @@ -27789,572 +28136,796 @@ echo "$ac_t""$ext_output" 1>&6
7283 +if test "$PHP_CALENDAR" = "yes"; then
7284 + cat >> confdefs.h <<\EOF
7285 +#define HAVE_CALENDAR 1
7289 + ext_builddir=ext/calendar
7290 + ext_srcdir=$abs_srcdir/ext/calendar
7292 -php_with_curlwrappers=no
7295 -echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6
7296 -echo "configure:27797: checking if we should use cURL for url streams" >&5
7297 -# Check whether --with-curlwrappers or --without-curlwrappers was given.
7298 -if test "${with_curlwrappers+set}" = set; then
7299 - withval="$with_curlwrappers"
7300 - PHP_CURLWRAPPERS=$withval
7302 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
7303 + PHP_CALENDAR_SHARED=no
7306 + case ext/calendar in
7307 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7308 + /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7309 + *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7312 - PHP_CURLWRAPPERS=no
7316 + b_c_pre=$php_c_pre
7317 + b_cxx_pre=$php_cxx_pre
7318 + b_c_meta=$php_c_meta
7319 + b_cxx_meta=$php_cxx_meta
7320 + b_c_post=$php_c_post
7321 + b_cxx_post=$php_cxx_post
7325 -ext_output=$PHP_CURLWRAPPERS
7326 -echo "$ac_t""$ext_output" 1>&6
7328 + for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
7335 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
7338 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7339 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7340 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7341 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
7344 + cat >>Makefile.objects<<EOF
7345 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
7351 -if test "$PHP_CURL" != "no"; then
7352 - if test -r $PHP_CURL/include/curl/easy.h; then
7353 - CURL_DIR=$PHP_CURL
7354 + EXT_STATIC="$EXT_STATIC calendar"
7355 + if test "$ext_shared" != "nocli"; then
7356 + EXT_CLI_STATIC="$EXT_CLI_STATIC calendar"
7359 - echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6
7360 -echo "configure:27821: checking for cURL in default path" >&5
7361 - for i in /usr/local /usr; do
7362 - if test -r $i/include/curl/easy.h; then
7364 - echo "$ac_t""found in $i" 1>&6
7369 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
7370 + PHP_CALENDAR_SHARED=yes
7372 + case ext/calendar in
7373 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7374 + /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7375 + *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7380 - if test -z "$CURL_DIR"; then
7381 - echo "$ac_t""not found" 1>&6
7382 - { echo "configure: error: Please reinstall the libcurl distribution -
7383 - easy.h should be in <curl-dir>/include/curl/" 1>&2; exit 1; }
7385 + b_c_pre=$shared_c_pre
7386 + b_cxx_pre=$shared_cxx_pre
7387 + b_c_meta=$shared_c_meta
7388 + b_cxx_meta=$shared_cxx_meta
7389 + b_c_post=$shared_c_post
7390 + b_cxx_post=$shared_cxx_post
7393 - CURL_CONFIG="curl-config"
7394 - echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6
7395 -echo "configure:27839: checking for cURL 7.10.5 or greater" >&5
7397 - if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then
7398 - CURL_CONFIG=${CURL_DIR}/bin/curl-config
7400 - if ${CURL_DIR}/curl-config --libs > /dev/null 2>&1; then
7401 - CURL_CONFIG=${CURL_DIR}/curl-config
7405 + for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
7412 + shared_objects_calendar="$shared_objects_calendar $ac_bdir$ac_obj.lo"
7414 - curl_version_full=`$CURL_CONFIG --version`
7415 - curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
7416 - if test "$curl_version" -ge 7010005; then
7417 - echo "$ac_t""$curl_version_full" 1>&6
7418 - CURL_LIBS=`$CURL_CONFIG --libs`
7420 - { echo "configure: error: cURL version 7.10.5 or later is required to compile php with cURL support" 1>&2; exit 1; }
7423 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7424 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7425 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7426 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
7430 - if test "$CURL_DIR/include" != "/usr/include"; then
7432 - if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then
7433 - ai_p=$CURL_DIR/include
7434 + cat >>Makefile.objects<<EOF
7435 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
7440 + case $host_alias in
7443 + install_modules="install-modules"
7445 + case $host_alias in
7448 + 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'
7452 + link_cmd='$(LIBTOOL) --mode=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)'
7456 + link_cmd='$(LIBTOOL) --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)'
7460 + if test "x" = "xyes"; then
7461 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpcalendar.$suffix"
7464 - ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
7466 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
7467 - ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`"
7468 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpcalendar.$suffix"
7473 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
7475 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
7476 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
7477 - eval "INCLUDEPATH$unique=set"
7480 - INCLUDES="-I$ai_p $INCLUDES"
7482 - INCLUDES="$INCLUDES -I$ai_p"
7486 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar"
7489 + cat >>Makefile.objects<<EOF
7490 +\$(phplibdir)/phpcalendar.$suffix: $ext_builddir/phpcalendar.$suffix
7491 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpcalendar.$suffix \$(phplibdir)
7494 - for ac_i in $CURL_LIBS; do
7497 - if test "$ext_shared" = "yes"; then
7498 - CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -pthread"
7502 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
7504 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
7505 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
7506 - eval "EXTRA_LDFLAGS$unique=set"
7507 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
7509 +$ext_builddir/phpcalendar.$suffix: \$(shared_objects_calendar) \$(PHPCALENDAR_SHARED_DEPENDENCIES)
7515 - ac_ii=`echo $ac_i|cut -c 3-`
7519 - c|c_r|pthread*) ;;
7521 - if test "$ext_shared" = "yes"; then
7522 - CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -l$ac_ii"
7527 - c|c_r|pthread*) ;;
7529 - LIBS="$LIBS -l$ac_ii"
7537 + install_modules="install-modules"
7541 + case $host_alias in
7544 + 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'
7548 + link_cmd='$(LIBTOOL) --mode=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)'
7552 + link_cmd='$(LIBTOOL) --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)'
7559 - ac_ii=`echo $ac_i|cut -c 3-`
7561 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
7563 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
7565 + if test "x" = "xyes"; then
7566 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/calendar.$suffix"
7569 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
7571 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
7572 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
7573 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/calendar.$suffix"
7576 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar"
7579 - if test "$ext_shared" = "yes"; then
7580 - CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD"
7581 - test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD"
7583 + cat >>Makefile.objects<<EOF
7584 +\$(phplibdir)/calendar.$suffix: $ext_builddir/calendar.$suffix
7585 + \$(LIBTOOL) --mode=install cp $ext_builddir/calendar.$suffix \$(phplibdir)
7587 +$ext_builddir/calendar.$suffix: \$(shared_objects_calendar) \$(CALENDAR_SHARED_DEPENDENCIES)
7594 + cat >> confdefs.h <<EOF
7595 +#define COMPILE_DL_CALENDAR 1
7601 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
7602 + PHP_CALENDAR_SHARED=no
7603 + case "$PHP_SAPI" in
7607 + case ext/calendar in
7608 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7609 + /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7610 + *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7613 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
7615 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
7616 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
7617 - eval "LIBPATH$unique=set"
7619 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
7620 - LDFLAGS="$LDFLAGS -L$ai_p"
7621 - PHP_RPATHS="$PHP_RPATHS $ai_p"
7625 + b_c_pre=$php_c_pre
7626 + b_cxx_pre=$php_cxx_pre
7627 + b_c_meta=$php_c_meta
7628 + b_cxx_meta=$php_cxx_meta
7629 + b_c_post=$php_c_post
7630 + b_cxx_post=$php_cxx_post
7642 + for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
7645 - if test "$ext_shared" = "yes"; then
7646 - CURL_SHARED_LIBADD="-lcurl $CURL_SHARED_LIBADD"
7647 - if test -n "$CURL_DIR/$PHP_LIBDIR"; then
7653 - if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
7655 - if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
7656 - ai_p=$CURL_DIR/$PHP_LIBDIR
7659 - ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
7661 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
7662 - ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
7664 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
7667 - if test "$ext_shared" = "yes"; then
7668 - CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD"
7669 - test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD"
7672 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7673 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7674 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7675 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
7678 + cat >>Makefile.objects<<EOF
7679 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
7685 + EXT_STATIC="$EXT_STATIC calendar"
7690 + case ext/calendar in
7691 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
7692 + /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
7693 + *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
7696 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
7698 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
7699 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
7700 - eval "LIBPATH$unique=set"
7702 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
7703 - LDFLAGS="$LDFLAGS -L$ai_p"
7704 - PHP_RPATHS="$PHP_RPATHS $ai_p"
7706 + b_c_pre=$php_c_pre
7707 + b_cxx_pre=$php_cxx_pre
7708 + b_c_meta=$php_c_meta
7709 + b_cxx_meta=$php_cxx_meta
7710 + b_c_post=$php_c_post
7711 + b_cxx_post=$php_cxx_post
7716 + for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do
7724 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
7727 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7728 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7729 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
7730 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
7736 + cat >>Makefile.objects<<EOF
7737 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
7746 - if test -n "$CURL_DIR/$PHP_LIBDIR"; then
7748 - if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
7750 - if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
7751 - ai_p=$CURL_DIR/$PHP_LIBDIR
7754 - ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
7756 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
7757 - ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
7760 + EXT_CLI_STATIC="$EXT_CLI_STATIC calendar"
7767 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
7769 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
7770 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
7771 - eval "LIBPATH$unique=set"
7773 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
7774 - LDFLAGS="$LDFLAGS -L$ai_p"
7775 - PHP_RPATHS="$PHP_RPATHS $ai_p"
7776 + BUILD_DIR="$BUILD_DIR $ext_builddir"
7781 + if test "$ext_builddir" = "."; then
7782 + PHP_PECL_EXTENSION=calendar
7785 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
7791 - c|c_r|pthread*) ;;
7793 - LIBS="-lcurl $LIBS"
7803 +php_enable_ctype=yes
7805 +echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6
7806 +echo "configure:28444: checking whether to enable ctype functions" >&5
7807 +# Check whether --enable-ctype or --disable-ctype was given.
7808 +if test "${enable_ctype+set}" = set; then
7809 + enableval="$enable_ctype"
7810 + PHP_CTYPE=$enableval
7813 - echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
7814 -echo "configure:28077: checking for SSL support in libcurl" >&5
7815 - CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
7816 - if test "$CURL_SSL" = "SSL"; then
7817 - echo "$ac_t""yes" 1>&6
7818 - cat >> confdefs.h <<\EOF
7819 -#define HAVE_CURL_SSL 1
7822 + test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL
7825 - save_CFLAGS="$CFLAGS"
7826 - CFLAGS="`$CURL_CONFIG --cflags`"
7828 - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
7829 -echo "configure:28090: checking how to run the C preprocessor" >&5
7830 -# On Suns, sometimes $CPP names a directory.
7831 -if test -n "$CPP" && test -d "$CPP"; then
7834 -if test -z "$CPP"; then
7835 -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
7836 - echo $ac_n "(cached) $ac_c" 1>&6
7838 - # This must be in double quotes, not single quotes, because CPP may get
7839 - # substituted into the Makefile and "${CC-cc}" will confuse make.
7841 - # On the NeXT, cc -E runs the code through the compiler's parser,
7842 - # not just through cpp.
7843 - cat > conftest.$ac_ext <<EOF
7844 -#line 28105 "configure"
7845 -#include "confdefs.h"
7846 -#include <assert.h>
7849 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7850 -{ (eval echo configure:28111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7851 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7852 -if test -z "$ac_err"; then
7855 - echo "$ac_err" >&5
7856 - echo "configure: failed program was:" >&5
7857 - cat conftest.$ac_ext >&5
7859 - CPP="${CC-cc} -E -traditional-cpp"
7860 - cat > conftest.$ac_ext <<EOF
7861 -#line 28122 "configure"
7862 -#include "confdefs.h"
7863 -#include <assert.h>
7866 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7867 -{ (eval echo configure:28128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7868 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7869 -if test -z "$ac_err"; then
7872 - echo "$ac_err" >&5
7873 - echo "configure: failed program was:" >&5
7874 - cat conftest.$ac_ext >&5
7876 - CPP="${CC-cc} -nologo -E"
7877 - cat > conftest.$ac_ext <<EOF
7878 -#line 28139 "configure"
7879 -#include "confdefs.h"
7880 -#include <assert.h>
7883 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7884 -{ (eval echo configure:28145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7885 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7886 -if test -z "$ac_err"; then
7889 - echo "$ac_err" >&5
7890 - echo "configure: failed program was:" >&5
7891 - cat conftest.$ac_ext >&5
7900 - ac_cv_prog_CPP="$CPP"
7902 - CPP="$ac_cv_prog_CPP"
7904 - ac_cv_prog_CPP="$CPP"
7906 -echo "$ac_t""$CPP" 1>&6
7908 - echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
7909 -echo "configure:28170: checking for openssl support in libcurl" >&5
7910 - if test "$cross_compiling" = yes; then
7912 - echo "$ac_t""no" 1>&6
7915 - cat > conftest.$ac_ext <<EOF
7916 -#line 28177 "configure"
7917 -#include "confdefs.h"
7919 -#include <curl/curl.h>
7921 -int main(int argc, char *argv[])
7923 - curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
7924 +ext_output="yes, shared"
7928 + PHP_CTYPE=`echo "$PHP_CTYPE"|$SED 's/^shared,//'`
7943 - if (data && data->ssl_version && *data->ssl_version) {
7944 - const char *ptr = data->ssl_version;
7946 - while(*ptr == ' ') ++ptr;
7947 - return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
7953 +echo "$ac_t""$ext_output" 1>&6
7958 +if test "$PHP_CTYPE" != "no"; then
7959 + cat >> confdefs.h <<\EOF
7960 +#define HAVE_CTYPE 1
7962 -if { (eval echo configure:28196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7966 - echo "$ac_t""yes" 1>&6
7967 - for ac_hdr in openssl/crypto.h
7969 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
7970 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
7971 -echo "configure:28204: checking for $ac_hdr" >&5
7972 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
7973 - echo $ac_n "(cached) $ac_c" 1>&6
7975 - cat > conftest.$ac_ext <<EOF
7976 -#line 28209 "configure"
7977 -#include "confdefs.h"
7980 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7981 -{ (eval echo configure:28214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7982 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7983 -if test -z "$ac_err"; then
7985 - eval "ac_cv_header_$ac_safe=yes"
7987 - echo "$ac_err" >&5
7988 - echo "configure: failed program was:" >&5
7989 - cat conftest.$ac_ext >&5
7991 - eval "ac_cv_header_$ac_safe=no"
7995 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
7996 - echo "$ac_t""yes" 1>&6
7997 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
7998 - cat >> confdefs.h <<EOF
7999 -#define $ac_tr_hdr 1
8002 - cat >> confdefs.h <<\EOF
8003 -#define HAVE_CURL_OPENSSL 1
8005 + ext_builddir=ext/ctype
8006 + ext_srcdir=$abs_srcdir/ext/ctype
8010 - echo "$ac_t""no" 1>&6
8015 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
8016 + PHP_CTYPE_SHARED=no
8019 - echo "configure: failed program was:" >&5
8020 - cat conftest.$ac_ext >&5
8023 - echo "$ac_t""no" 1>&6
8029 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
8030 + /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
8031 + *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
8037 - echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
8038 -echo "configure:28259: checking for gnutls support in libcurl" >&5
8039 - if test "$cross_compiling" = yes; then
8040 + b_c_pre=$php_c_pre
8041 + b_cxx_pre=$php_cxx_pre
8042 + b_c_meta=$php_c_meta
8043 + b_cxx_meta=$php_cxx_meta
8044 + b_c_post=$php_c_post
8045 + b_cxx_post=$php_cxx_post
8050 + for ac_src in ctype.c; do
8052 - echo "$ac_t""no" 1>&6
8055 - cat > conftest.$ac_ext <<EOF
8056 -#line 28266 "configure"
8057 -#include "confdefs.h"
8063 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
8065 -#include <curl/curl.h>
8067 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8068 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8069 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8070 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
8073 -int main(int argc, char *argv[])
8075 - curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
8076 + cat >>Makefile.objects<<EOF
8077 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
8083 + EXT_STATIC="$EXT_STATIC ctype"
8084 + if test "$ext_shared" != "nocli"; then
8085 + EXT_CLI_STATIC="$EXT_CLI_STATIC ctype"
8088 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
8089 + PHP_CTYPE_SHARED=yes
8092 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
8093 + /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
8094 + *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
8098 - if (data && data->ssl_version && *data->ssl_version) {
8099 - const char *ptr = data->ssl_version;
8101 - while(*ptr == ' ') ++ptr;
8102 - return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
8106 + b_c_pre=$shared_c_pre
8107 + b_cxx_pre=$shared_cxx_pre
8108 + b_c_meta=$shared_c_meta
8109 + b_cxx_meta=$shared_cxx_meta
8110 + b_c_post=$shared_c_post
8111 + b_cxx_post=$shared_cxx_post
8116 + for ac_src in ctype.c; do
8123 + shared_objects_ctype="$shared_objects_ctype $ac_bdir$ac_obj.lo"
8126 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8127 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8128 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8129 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
8132 + cat >>Makefile.objects<<EOF
8133 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
8136 -if { (eval echo configure:28285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8140 + case $host_alias in
8143 + install_modules="install-modules"
8145 + case $host_alias in
8148 + 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'
8152 + link_cmd='$(LIBTOOL) --mode=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)'
8156 + link_cmd='$(LIBTOOL) --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)'
8160 + if test "x" = "xyes"; then
8161 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpctype.$suffix"
8163 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpctype.$suffix"
8166 - echo "$ac_t""yes" 1>&6
8167 - ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'`
8168 -echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6
8169 -echo "configure:28291: checking for gcrypt.h" >&5
8170 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
8171 - echo $ac_n "(cached) $ac_c" 1>&6
8173 - cat > conftest.$ac_ext <<EOF
8174 -#line 28296 "configure"
8175 -#include "confdefs.h"
8176 -#include <gcrypt.h>
8177 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype"
8179 + cat >>Makefile.objects<<EOF
8180 +\$(phplibdir)/phpctype.$suffix: $ext_builddir/phpctype.$suffix
8181 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpctype.$suffix \$(phplibdir)
8183 +$ext_builddir/phpctype.$suffix: \$(shared_objects_ctype) \$(PHPCTYPE_SHARED_DEPENDENCIES)
8187 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8188 -{ (eval echo configure:28301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8189 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8190 -if test -z "$ac_err"; then
8192 - eval "ac_cv_header_$ac_safe=yes"
8194 - echo "$ac_err" >&5
8195 - echo "configure: failed program was:" >&5
8196 - cat conftest.$ac_ext >&5
8198 - eval "ac_cv_header_$ac_safe=no"
8202 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
8203 - echo "$ac_t""yes" 1>&6
8208 + install_modules="install-modules"
8210 + case $host_alias in
8213 + 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'
8217 + link_cmd='$(LIBTOOL) --mode=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)'
8221 + link_cmd='$(LIBTOOL) --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)'
8225 + if test "x" = "xyes"; then
8226 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/ctype.$suffix"
8228 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/ctype.$suffix"
8231 - cat >> confdefs.h <<\EOF
8232 -#define HAVE_CURL_GNUTLS 1
8233 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype"
8235 + cat >>Makefile.objects<<EOF
8236 +\$(phplibdir)/ctype.$suffix: $ext_builddir/ctype.$suffix
8237 + \$(LIBTOOL) --mode=install cp $ext_builddir/ctype.$suffix \$(phplibdir)
8239 +$ext_builddir/ctype.$suffix: \$(shared_objects_ctype) \$(CTYPE_SHARED_DEPENDENCIES)
8246 + cat >> confdefs.h <<EOF
8247 +#define COMPILE_DL_CTYPE 1
8253 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
8254 + PHP_CTYPE_SHARED=no
8255 + case "$PHP_SAPI" in
8260 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
8261 + /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
8262 + *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
8267 + b_c_pre=$php_c_pre
8268 + b_cxx_pre=$php_cxx_pre
8269 + b_c_meta=$php_c_meta
8270 + b_cxx_meta=$php_cxx_meta
8271 + b_c_post=$php_c_post
8272 + b_cxx_post=$php_cxx_post
8277 + for ac_src in ctype.c; do
8285 - echo "$ac_t""no" 1>&6
8287 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
8290 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8291 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8292 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8293 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
8296 + cat >>Makefile.objects<<EOF
8297 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
8303 + EXT_STATIC="$EXT_STATIC ctype"
8309 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
8310 + /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
8311 + *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
8316 + b_c_pre=$php_c_pre
8317 + b_cxx_pre=$php_cxx_pre
8318 + b_c_meta=$php_c_meta
8319 + b_cxx_meta=$php_cxx_meta
8320 + b_c_post=$php_c_post
8321 + b_cxx_post=$php_cxx_post
8326 + for ac_src in ctype.c; do
8333 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
8336 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8337 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8338 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
8339 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
8342 + cat >>Makefile.objects<<EOF
8343 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
8351 + EXT_CLI_STATIC="$EXT_CLI_STATIC ctype"
8355 + BUILD_DIR="$BUILD_DIR $ext_builddir"
8359 + if test "$ext_builddir" = "."; then
8360 + PHP_PECL_EXTENSION=ctype
8362 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
8372 +echo $ac_n "checking for cURL support""... $ac_c" 1>&6
8373 +echo "configure:28788: checking for cURL support" >&5
8374 +# Check whether --with-curl or --without-curl was given.
8375 +if test "${with_curl+set}" = set; then
8376 + withval="$with_curl"
8379 - echo "configure: failed program was:" >&5
8380 - cat conftest.$ac_ext >&5
8383 - echo "$ac_t""no" 1>&6
8386 + test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL
8393 +ext_output="yes, shared"
8397 + PHP_CURL=`echo "$PHP_CURL"|$SED 's/^shared,//'`
8414 +echo "$ac_t""$ext_output" 1>&6
8420 +php_with_curlwrappers=no
8422 +echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6
8423 +echo "configure:28832: checking if we should use cURL for url streams" >&5
8424 +# Check whether --with-curlwrappers or --without-curlwrappers was given.
8425 +if test "${with_curlwrappers+set}" = set; then
8426 + withval="$with_curlwrappers"
8427 + PHP_CURLWRAPPERS=$withval
8430 + PHP_CURLWRAPPERS=no
8436 - CFLAGS="$save_CFLAGS"
8438 +ext_output=$PHP_CURLWRAPPERS
8439 +echo "$ac_t""$ext_output" 1>&6
8444 +if test "$PHP_CURL" != "no"; then
8445 + if test -r $PHP_CURL/include/curl/easy.h; then
8446 + CURL_DIR=$PHP_CURL
8448 - echo "$ac_t""no" 1>&6
8449 + echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6
8450 +echo "configure:28856: checking for cURL in default path" >&5
8451 + for i in /usr/local /usr; do
8452 + if test -r $i/include/curl/easy.h; then
8454 + echo "$ac_t""found in $i" 1>&6
8460 + if test -z "$CURL_DIR"; then
8461 + echo "$ac_t""not found" 1>&6
8462 + { echo "configure: error: Please reinstall the libcurl distribution -
8463 + easy.h should be in <curl-dir>/include/curl/" 1>&2; exit 1; }
8466 + CURL_CONFIG="curl-config"
8467 + echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6
8468 +echo "configure:28874: checking for cURL 7.10.5 or greater" >&5
8470 + if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then
8471 + CURL_CONFIG=${CURL_DIR}/bin/curl-config
8473 + if ${CURL_DIR}/curl-config --libs > /dev/null 2>&1; then
8474 + CURL_CONFIG=${CURL_DIR}/curl-config
8478 + curl_version_full=`$CURL_CONFIG --version`
8479 + curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
8480 + if test "$curl_version" -ge 7010005; then
8481 + echo "$ac_t""$curl_version_full" 1>&6
8482 + CURL_LIBS=`$CURL_CONFIG --libs`
8484 + { echo "configure: error: cURL version 7.10.5 or later is required to compile php with cURL support" 1>&2; exit 1; }
8488 - save_old_LDFLAGS=$LDFLAGS
8490 - $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
8492 + if test "$CURL_DIR/include" != "/usr/include"; then
8494 + if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then
8495 + ai_p=$CURL_DIR/include
8498 + ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
8500 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
8501 + ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`"
8506 - save_ext_shared=$ext_shared
8508 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
8510 - for ac_i in $ac_stuff; do
8511 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
8512 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
8513 + eval "INCLUDEPATH$unique=set"
8516 + INCLUDES="-I$ai_p $INCLUDES"
8518 + INCLUDES="$INCLUDES -I$ai_p"
8526 + for ac_i in $CURL_LIBS; do
8529 if test "$ext_shared" = "yes"; then
8530 - LDFLAGS="$LDFLAGS -pthread"
8531 + CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -pthread"
8535 @@ -28376,7 +28947,7 @@ fi
8538 if test "$ext_shared" = "yes"; then
8539 - LDFLAGS="$LDFLAGS -l$ac_ii"
8540 + CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -l$ac_ii"
8544 @@ -28411,8 +28982,8 @@ fi
8547 if test "$ext_shared" = "yes"; then
8548 - LDFLAGS="-L$ai_p $LDFLAGS"
8549 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
8550 + CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD"
8551 + test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD"
8555 @@ -28438,44 +29009,508 @@ fi
8559 - echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
8560 -echo "configure:28443: checking for curl_easy_perform in -lcurl" >&5
8561 -ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'`
8562 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
8563 - echo $ac_n "(cached) $ac_c" 1>&6
8565 - ac_save_LIBS="$LIBS"
8566 -LIBS="-lcurl $LIBS"
8567 -cat > conftest.$ac_ext <<EOF
8568 -#line 28451 "configure"
8569 -#include "confdefs.h"
8570 -/* Override any gcc2 internal prototype to avoid an error. */
8571 -/* We use char because int might match the return type of a gcc2
8572 - builtin and then its argument prototype would still apply. */
8573 -char curl_easy_perform();
8576 -curl_easy_perform()
8579 -if { (eval echo configure:28462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8581 - eval "ac_cv_lib_$ac_lib_var=yes"
8583 - echo "configure: failed program was:" >&5
8584 - cat conftest.$ac_ext >&5
8586 - eval "ac_cv_lib_$ac_lib_var=no"
8589 -LIBS="$ac_save_LIBS"
8592 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
8593 - echo "$ac_t""yes" 1>&6
8595 - LDFLAGS=$save_old_LDFLAGS
8596 - ext_shared=$save_ext_shared
8598 + if test "$ext_shared" = "yes"; then
8599 + CURL_SHARED_LIBADD="-lcurl $CURL_SHARED_LIBADD"
8600 + if test -n "$CURL_DIR/$PHP_LIBDIR"; then
8602 + if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
8604 + if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
8605 + ai_p=$CURL_DIR/$PHP_LIBDIR
8608 + ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
8610 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
8611 + ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
8615 + if test "$ext_shared" = "yes"; then
8616 + CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD"
8617 + test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD"
8622 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
8624 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
8625 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
8626 + eval "LIBPATH$unique=set"
8628 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
8629 + LDFLAGS="$LDFLAGS -L$ai_p"
8630 + PHP_RPATHS="$PHP_RPATHS $ai_p"
8643 + if test -n "$CURL_DIR/$PHP_LIBDIR"; then
8645 + if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
8647 + if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
8648 + ai_p=$CURL_DIR/$PHP_LIBDIR
8651 + ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
8653 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
8654 + ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
8661 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
8663 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
8664 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
8665 + eval "LIBPATH$unique=set"
8667 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
8668 + LDFLAGS="$LDFLAGS -L$ai_p"
8669 + PHP_RPATHS="$PHP_RPATHS $ai_p"
8681 + c|c_r|pthread*) ;;
8683 + LIBS="-lcurl $LIBS"
8694 + echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
8695 +echo "configure:29112: checking for SSL support in libcurl" >&5
8696 + CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
8697 + if test "$CURL_SSL" = "SSL"; then
8698 + echo "$ac_t""yes" 1>&6
8699 + cat >> confdefs.h <<\EOF
8700 +#define HAVE_CURL_SSL 1
8704 + save_CFLAGS="$CFLAGS"
8705 + CFLAGS="`$CURL_CONFIG --cflags`"
8707 + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
8708 +echo "configure:29125: checking how to run the C preprocessor" >&5
8709 +# On Suns, sometimes $CPP names a directory.
8710 +if test -n "$CPP" && test -d "$CPP"; then
8713 +if test -z "$CPP"; then
8714 +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
8715 + echo $ac_n "(cached) $ac_c" 1>&6
8717 + # This must be in double quotes, not single quotes, because CPP may get
8718 + # substituted into the Makefile and "${CC-cc}" will confuse make.
8720 + # On the NeXT, cc -E runs the code through the compiler's parser,
8721 + # not just through cpp.
8722 + cat > conftest.$ac_ext <<EOF
8723 +#line 29140 "configure"
8724 +#include "confdefs.h"
8725 +#include <assert.h>
8728 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8729 +{ (eval echo configure:29146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8730 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8731 +if test -z "$ac_err"; then
8734 + echo "$ac_err" >&5
8735 + echo "configure: failed program was:" >&5
8736 + cat conftest.$ac_ext >&5
8738 + CPP="${CC-cc} -E -traditional-cpp"
8739 + cat > conftest.$ac_ext <<EOF
8740 +#line 29157 "configure"
8741 +#include "confdefs.h"
8742 +#include <assert.h>
8745 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8746 +{ (eval echo configure:29163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8747 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8748 +if test -z "$ac_err"; then
8751 + echo "$ac_err" >&5
8752 + echo "configure: failed program was:" >&5
8753 + cat conftest.$ac_ext >&5
8755 + CPP="${CC-cc} -nologo -E"
8756 + cat > conftest.$ac_ext <<EOF
8757 +#line 29174 "configure"
8758 +#include "confdefs.h"
8759 +#include <assert.h>
8762 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8763 +{ (eval echo configure:29180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8764 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8765 +if test -z "$ac_err"; then
8768 + echo "$ac_err" >&5
8769 + echo "configure: failed program was:" >&5
8770 + cat conftest.$ac_ext >&5
8779 + ac_cv_prog_CPP="$CPP"
8781 + CPP="$ac_cv_prog_CPP"
8783 + ac_cv_prog_CPP="$CPP"
8785 +echo "$ac_t""$CPP" 1>&6
8787 + echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
8788 +echo "configure:29205: checking for openssl support in libcurl" >&5
8789 + if test "$cross_compiling" = yes; then
8791 + echo "$ac_t""no" 1>&6
8794 + cat > conftest.$ac_ext <<EOF
8795 +#line 29212 "configure"
8796 +#include "confdefs.h"
8798 +#include <curl/curl.h>
8800 +int main(int argc, char *argv[])
8802 + curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
8804 + if (data && data->ssl_version && *data->ssl_version) {
8805 + const char *ptr = data->ssl_version;
8807 + while(*ptr == ' ') ++ptr;
8808 + return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
8814 +if { (eval echo configure:29231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8817 + echo "$ac_t""yes" 1>&6
8818 + for ac_hdr in openssl/crypto.h
8820 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
8821 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
8822 +echo "configure:29239: checking for $ac_hdr" >&5
8823 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
8824 + echo $ac_n "(cached) $ac_c" 1>&6
8826 + cat > conftest.$ac_ext <<EOF
8827 +#line 29244 "configure"
8828 +#include "confdefs.h"
8831 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8832 +{ (eval echo configure:29249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8833 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8834 +if test -z "$ac_err"; then
8836 + eval "ac_cv_header_$ac_safe=yes"
8838 + echo "$ac_err" >&5
8839 + echo "configure: failed program was:" >&5
8840 + cat conftest.$ac_ext >&5
8842 + eval "ac_cv_header_$ac_safe=no"
8846 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
8847 + echo "$ac_t""yes" 1>&6
8848 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
8849 + cat >> confdefs.h <<EOF
8850 +#define $ac_tr_hdr 1
8853 + cat >> confdefs.h <<\EOF
8854 +#define HAVE_CURL_OPENSSL 1
8859 + echo "$ac_t""no" 1>&6
8865 + echo "configure: failed program was:" >&5
8866 + cat conftest.$ac_ext >&5
8869 + echo "$ac_t""no" 1>&6
8876 + echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
8877 +echo "configure:29294: checking for gnutls support in libcurl" >&5
8878 + if test "$cross_compiling" = yes; then
8880 + echo "$ac_t""no" 1>&6
8883 + cat > conftest.$ac_ext <<EOF
8884 +#line 29301 "configure"
8885 +#include "confdefs.h"
8887 +#include <curl/curl.h>
8889 +int main(int argc, char *argv[])
8891 + curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
8893 + if (data && data->ssl_version && *data->ssl_version) {
8894 + const char *ptr = data->ssl_version;
8896 + while(*ptr == ' ') ++ptr;
8897 + return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
8903 +if { (eval echo configure:29320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8906 + echo "$ac_t""yes" 1>&6
8907 + ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'`
8908 +echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6
8909 +echo "configure:29326: checking for gcrypt.h" >&5
8910 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
8911 + echo $ac_n "(cached) $ac_c" 1>&6
8913 + cat > conftest.$ac_ext <<EOF
8914 +#line 29331 "configure"
8915 +#include "confdefs.h"
8916 +#include <gcrypt.h>
8918 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8919 +{ (eval echo configure:29336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8920 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
8921 +if test -z "$ac_err"; then
8923 + eval "ac_cv_header_$ac_safe=yes"
8925 + echo "$ac_err" >&5
8926 + echo "configure: failed program was:" >&5
8927 + cat conftest.$ac_ext >&5
8929 + eval "ac_cv_header_$ac_safe=no"
8933 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
8934 + echo "$ac_t""yes" 1>&6
8936 + cat >> confdefs.h <<\EOF
8937 +#define HAVE_CURL_GNUTLS 1
8942 + echo "$ac_t""no" 1>&6
8947 + echo "configure: failed program was:" >&5
8948 + cat conftest.$ac_ext >&5
8951 + echo "$ac_t""no" 1>&6
8958 + CFLAGS="$save_CFLAGS"
8960 + echo "$ac_t""no" 1>&6
8964 + save_old_LDFLAGS=$LDFLAGS
8966 + $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
8969 + save_ext_shared=$ext_shared
8972 + for ac_i in $ac_stuff; do
8975 + if test "$ext_shared" = "yes"; then
8976 + LDFLAGS="$LDFLAGS -pthread"
8980 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
8982 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
8983 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
8984 + eval "EXTRA_LDFLAGS$unique=set"
8985 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
8991 + ac_ii=`echo $ac_i|cut -c 3-`
8995 + c|c_r|pthread*) ;;
8997 + if test "$ext_shared" = "yes"; then
8998 + LDFLAGS="$LDFLAGS -l$ac_ii"
9003 + c|c_r|pthread*) ;;
9005 + LIBS="$LIBS -l$ac_ii"
9017 + ac_ii=`echo $ac_i|cut -c 3-`
9019 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
9021 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
9025 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
9027 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
9028 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
9032 + if test "$ext_shared" = "yes"; then
9033 + LDFLAGS="-L$ai_p $LDFLAGS"
9034 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
9039 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
9041 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
9042 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
9043 + eval "LIBPATH$unique=set"
9045 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
9046 + LDFLAGS="$LDFLAGS -L$ai_p"
9047 + PHP_RPATHS="$PHP_RPATHS $ai_p"
9060 + echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
9061 +echo "configure:29478: checking for curl_easy_perform in -lcurl" >&5
9062 +ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'`
9063 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9064 + echo $ac_n "(cached) $ac_c" 1>&6
9066 + ac_save_LIBS="$LIBS"
9067 +LIBS="-lcurl $LIBS"
9068 +cat > conftest.$ac_ext <<EOF
9069 +#line 29486 "configure"
9070 +#include "confdefs.h"
9071 +/* Override any gcc2 internal prototype to avoid an error. */
9072 +/* We use char because int might match the return type of a gcc2
9073 + builtin and then its argument prototype would still apply. */
9074 +char curl_easy_perform();
9077 +curl_easy_perform()
9080 +if { (eval echo configure:29497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9082 + eval "ac_cv_lib_$ac_lib_var=yes"
9084 + echo "configure: failed program was:" >&5
9085 + cat conftest.$ac_ext >&5
9087 + eval "ac_cv_lib_$ac_lib_var=no"
9090 +LIBS="$ac_save_LIBS"
9093 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
9094 + echo "$ac_t""yes" 1>&6
9096 + LDFLAGS=$save_old_LDFLAGS
9097 + ext_shared=$save_ext_shared
9099 cat >> confdefs.h <<\EOF
9101 @@ -28594,7 +29629,7 @@ fi
9104 echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6
9105 -echo "configure:28598: checking for curl_version_info in -lcurl" >&5
9106 +echo "configure:29633: checking for curl_version_info in -lcurl" >&5
9107 ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'`
9108 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9109 echo $ac_n "(cached) $ac_c" 1>&6
9110 @@ -28602,7 +29637,7 @@ else
9111 ac_save_LIBS="$LIBS"
9113 cat > conftest.$ac_ext <<EOF
9114 -#line 28606 "configure"
9115 +#line 29641 "configure"
9116 #include "confdefs.h"
9117 /* Override any gcc2 internal prototype to avoid an error. */
9118 /* We use char because int might match the return type of a gcc2
9119 @@ -28613,7 +29648,7 @@ int main() {
9123 -if { (eval echo configure:28617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9124 +if { (eval echo configure:29652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9126 eval "ac_cv_lib_$ac_lib_var=yes"
9128 @@ -28747,7 +29782,7 @@ fi
9131 echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6
9132 -echo "configure:28751: checking for curl_easy_strerror in -lcurl" >&5
9133 +echo "configure:29786: checking for curl_easy_strerror in -lcurl" >&5
9134 ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'`
9135 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9136 echo $ac_n "(cached) $ac_c" 1>&6
9137 @@ -28755,7 +29790,7 @@ else
9138 ac_save_LIBS="$LIBS"
9140 cat > conftest.$ac_ext <<EOF
9141 -#line 28759 "configure"
9142 +#line 29794 "configure"
9143 #include "confdefs.h"
9144 /* Override any gcc2 internal prototype to avoid an error. */
9145 /* We use char because int might match the return type of a gcc2
9146 @@ -28766,7 +29801,7 @@ int main() {
9147 curl_easy_strerror()
9150 -if { (eval echo configure:28770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9151 +if { (eval echo configure:29805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9153 eval "ac_cv_lib_$ac_lib_var=yes"
9155 @@ -28900,7 +29935,7 @@ fi
9158 echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6
9159 -echo "configure:28904: checking for curl_multi_strerror in -lcurl" >&5
9160 +echo "configure:29939: checking for curl_multi_strerror in -lcurl" >&5
9161 ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'`
9162 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9163 echo $ac_n "(cached) $ac_c" 1>&6
9164 @@ -28908,7 +29943,7 @@ else
9165 ac_save_LIBS="$LIBS"
9167 cat > conftest.$ac_ext <<EOF
9168 -#line 28912 "configure"
9169 +#line 29947 "configure"
9170 #include "confdefs.h"
9171 /* Override any gcc2 internal prototype to avoid an error. */
9172 /* We use char because int might match the return type of a gcc2
9173 @@ -28919,7 +29954,7 @@ int main() {
9174 curl_multi_strerror()
9177 -if { (eval echo configure:28923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9178 +if { (eval echo configure:29958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9180 eval "ac_cv_lib_$ac_lib_var=yes"
9182 @@ -29605,7 +30640,7 @@ if test "$PHP_QDBM" != "no"; then
9185 echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6
9186 -echo "configure:29609: checking for dpopen in -l$LIB" >&5
9187 +echo "configure:30644: checking for dpopen in -l$LIB" >&5
9188 ac_lib_var=`echo $LIB'_'dpopen | sed 'y%./+-%__p_%'`
9189 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9190 echo $ac_n "(cached) $ac_c" 1>&6
9191 @@ -29613,7 +30648,7 @@ else
9192 ac_save_LIBS="$LIBS"
9194 cat > conftest.$ac_ext <<EOF
9195 -#line 29617 "configure"
9196 +#line 30652 "configure"
9197 #include "confdefs.h"
9198 /* Override any gcc2 internal prototype to avoid an error. */
9199 /* We use char because int might match the return type of a gcc2
9200 @@ -29624,7 +30659,7 @@ int main() {
9204 -if { (eval echo configure:29628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9205 +if { (eval echo configure:30663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9207 eval "ac_cv_lib_$ac_lib_var=yes"
9209 @@ -29793,7 +30828,7 @@ fi
9210 THIS_FULL_NAME="$THIS_NAME"
9212 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9213 -echo "configure:29797: checking for $THIS_FULL_NAME support" >&5
9214 +echo "configure:30832: checking for $THIS_FULL_NAME support" >&5
9216 { echo "configure: error: " 1>&2; exit 1; }
9218 @@ -29821,7 +30856,7 @@ if test "$PHP_GDBM" != "no"; then
9219 THIS_FULL_NAME="$THIS_NAME"
9221 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9222 -echo "configure:29825: checking for $THIS_FULL_NAME support" >&5
9223 +echo "configure:30860: checking for $THIS_FULL_NAME support" >&5
9224 if test -n "You cannot combine --with-gdbm with --with-qdbm"; then
9225 { echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; }
9227 @@ -29940,7 +30975,7 @@ echo "configure:29825: checking for $THI
9230 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
9231 -echo "configure:29944: checking for gdbm_open in -lgdbm" >&5
9232 +echo "configure:30979: checking for gdbm_open in -lgdbm" >&5
9233 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
9234 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9235 echo $ac_n "(cached) $ac_c" 1>&6
9236 @@ -29948,7 +30983,7 @@ else
9237 ac_save_LIBS="$LIBS"
9239 cat > conftest.$ac_ext <<EOF
9240 -#line 29952 "configure"
9241 +#line 30987 "configure"
9242 #include "confdefs.h"
9243 /* Override any gcc2 internal prototype to avoid an error. */
9244 /* We use char because int might match the return type of a gcc2
9245 @@ -29959,7 +30994,7 @@ int main() {
9249 -if { (eval echo configure:29963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9250 +if { (eval echo configure:30998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9252 eval "ac_cv_lib_$ac_lib_var=yes"
9254 @@ -30124,7 +31159,7 @@ fi
9255 THIS_FULL_NAME="$THIS_NAME"
9257 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9258 -echo "configure:30128: checking for $THIS_FULL_NAME support" >&5
9259 +echo "configure:31163: checking for $THIS_FULL_NAME support" >&5
9261 { echo "configure: error: " 1>&2; exit 1; }
9263 @@ -30253,7 +31288,7 @@ if test "$PHP_NDBM" != "no"; then
9266 echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6
9267 -echo "configure:30257: checking for dbm_open in -l$LIB" >&5
9268 +echo "configure:31292: checking for dbm_open in -l$LIB" >&5
9269 ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'`
9270 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9271 echo $ac_n "(cached) $ac_c" 1>&6
9272 @@ -30261,7 +31296,7 @@ else
9273 ac_save_LIBS="$LIBS"
9275 cat > conftest.$ac_ext <<EOF
9276 -#line 30265 "configure"
9277 +#line 31300 "configure"
9278 #include "confdefs.h"
9279 /* Override any gcc2 internal prototype to avoid an error. */
9280 /* We use char because int might match the return type of a gcc2
9281 @@ -30272,7 +31307,7 @@ int main() {
9285 -if { (eval echo configure:30276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9286 +if { (eval echo configure:31311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9288 eval "ac_cv_lib_$ac_lib_var=yes"
9290 @@ -30441,7 +31476,7 @@ fi
9291 THIS_FULL_NAME="$THIS_NAME"
9293 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9294 -echo "configure:30445: checking for $THIS_FULL_NAME support" >&5
9295 +echo "configure:31480: checking for $THIS_FULL_NAME support" >&5
9297 { echo "configure: error: " 1>&2; exit 1; }
9299 @@ -30529,7 +31564,7 @@ if test "$PHP_DB4" != "no"; then
9302 cat > conftest.$ac_ext <<EOF
9303 -#line 30533 "configure"
9304 +#line 31568 "configure"
9305 #include "confdefs.h"
9307 #include "$THIS_INCLUDE"
9308 @@ -30540,11 +31575,11 @@ int main() {
9312 -if { (eval echo configure:30544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9313 +if { (eval echo configure:31579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9316 cat > conftest.$ac_ext <<EOF
9317 -#line 30548 "configure"
9318 +#line 31583 "configure"
9319 #include "confdefs.h"
9321 #include "$THIS_INCLUDE"
9322 @@ -30581,14 +31616,14 @@ rm -f conftest*
9324 if test -z "$THIS_LIBS"; then
9325 echo $ac_n "checking for DB4 major version""... $ac_c" 1>&6
9326 -echo "configure:30585: checking for DB4 major version" >&5
9327 +echo "configure:31620: checking for DB4 major version" >&5
9328 { echo "configure: error: Header contains different version" 1>&2; exit 1; }
9330 if test "4" = "4"; then
9331 echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
9332 -echo "configure:30590: checking for DB4 minor version and patch level" >&5
9333 +echo "configure:31625: checking for DB4 minor version and patch level" >&5
9334 cat > conftest.$ac_ext <<EOF
9335 -#line 30592 "configure"
9336 +#line 31627 "configure"
9337 #include "confdefs.h"
9339 #include "$THIS_INCLUDE"
9340 @@ -30614,9 +31649,9 @@ rm -f conftest*
9342 if test "$ext_shared" = "yes"; then
9343 echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
9344 -echo "configure:30618: checking if dba can be used as shared extension" >&5
9345 +echo "configure:31653: checking if dba can be used as shared extension" >&5
9346 cat > conftest.$ac_ext <<EOF
9347 -#line 30620 "configure"
9348 +#line 31655 "configure"
9349 #include "confdefs.h"
9351 #include "$THIS_INCLUDE"
9352 @@ -30773,7 +31808,7 @@ fi
9353 THIS_FULL_NAME="$THIS_NAME"
9355 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9356 -echo "configure:30777: checking for $THIS_FULL_NAME support" >&5
9357 +echo "configure:31812: checking for $THIS_FULL_NAME support" >&5
9359 { echo "configure: error: " 1>&2; exit 1; }
9361 @@ -30801,7 +31836,7 @@ if test "$PHP_DB3" != "no"; then
9362 THIS_FULL_NAME="$THIS_NAME"
9364 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9365 -echo "configure:30805: checking for $THIS_FULL_NAME support" >&5
9366 +echo "configure:31840: checking for $THIS_FULL_NAME support" >&5
9367 if test -n "You cannot combine --with-db3 with --with-db4"; then
9368 { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; }
9370 @@ -30852,7 +31887,7 @@ echo "configure:30805: checking for $THI
9373 cat > conftest.$ac_ext <<EOF
9374 -#line 30856 "configure"
9375 +#line 31891 "configure"
9376 #include "confdefs.h"
9378 #include "$THIS_INCLUDE"
9379 @@ -30863,11 +31898,11 @@ int main() {
9383 -if { (eval echo configure:30867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9384 +if { (eval echo configure:31902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9387 cat > conftest.$ac_ext <<EOF
9388 -#line 30871 "configure"
9389 +#line 31906 "configure"
9390 #include "confdefs.h"
9392 #include "$THIS_INCLUDE"
9393 @@ -30904,14 +31939,14 @@ rm -f conftest*
9395 if test -z "$THIS_LIBS"; then
9396 echo $ac_n "checking for DB3 major version""... $ac_c" 1>&6
9397 -echo "configure:30908: checking for DB3 major version" >&5
9398 +echo "configure:31943: checking for DB3 major version" >&5
9399 { echo "configure: error: Header contains different version" 1>&2; exit 1; }
9401 if test "3" = "4"; then
9402 echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
9403 -echo "configure:30913: checking for DB4 minor version and patch level" >&5
9404 +echo "configure:31948: checking for DB4 minor version and patch level" >&5
9405 cat > conftest.$ac_ext <<EOF
9406 -#line 30915 "configure"
9407 +#line 31950 "configure"
9408 #include "confdefs.h"
9410 #include "$THIS_INCLUDE"
9411 @@ -30937,9 +31972,9 @@ rm -f conftest*
9413 if test "$ext_shared" = "yes"; then
9414 echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
9415 -echo "configure:30941: checking if dba can be used as shared extension" >&5
9416 +echo "configure:31976: checking if dba can be used as shared extension" >&5
9417 cat > conftest.$ac_ext <<EOF
9418 -#line 30943 "configure"
9419 +#line 31978 "configure"
9420 #include "confdefs.h"
9422 #include "$THIS_INCLUDE"
9423 @@ -31096,7 +32131,7 @@ fi
9424 THIS_FULL_NAME="$THIS_NAME"
9426 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9427 -echo "configure:31100: checking for $THIS_FULL_NAME support" >&5
9428 +echo "configure:32135: checking for $THIS_FULL_NAME support" >&5
9430 { echo "configure: error: " 1>&2; exit 1; }
9432 @@ -31124,7 +32159,7 @@ if test "$PHP_DB2" != "no"; then
9433 THIS_FULL_NAME="$THIS_NAME"
9435 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9436 -echo "configure:31128: checking for $THIS_FULL_NAME support" >&5
9437 +echo "configure:32163: checking for $THIS_FULL_NAME support" >&5
9438 if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then
9439 { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; }
9441 @@ -31175,7 +32210,7 @@ echo "configure:31128: checking for $THI
9444 cat > conftest.$ac_ext <<EOF
9445 -#line 31179 "configure"
9446 +#line 32214 "configure"
9447 #include "confdefs.h"
9449 #include "$THIS_INCLUDE"
9450 @@ -31186,11 +32221,11 @@ int main() {
9454 -if { (eval echo configure:31190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9455 +if { (eval echo configure:32225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9458 cat > conftest.$ac_ext <<EOF
9459 -#line 31194 "configure"
9460 +#line 32229 "configure"
9461 #include "confdefs.h"
9463 #include "$THIS_INCLUDE"
9464 @@ -31227,14 +32262,14 @@ rm -f conftest*
9466 if test -z "$THIS_LIBS"; then
9467 echo $ac_n "checking for DB2 major version""... $ac_c" 1>&6
9468 -echo "configure:31231: checking for DB2 major version" >&5
9469 +echo "configure:32266: checking for DB2 major version" >&5
9470 { echo "configure: error: Header contains different version" 1>&2; exit 1; }
9472 if test "2" = "4"; then
9473 echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
9474 -echo "configure:31236: checking for DB4 minor version and patch level" >&5
9475 +echo "configure:32271: checking for DB4 minor version and patch level" >&5
9476 cat > conftest.$ac_ext <<EOF
9477 -#line 31238 "configure"
9478 +#line 32273 "configure"
9479 #include "confdefs.h"
9481 #include "$THIS_INCLUDE"
9482 @@ -31260,9 +32295,9 @@ rm -f conftest*
9484 if test "$ext_shared" = "yes"; then
9485 echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
9486 -echo "configure:31264: checking if dba can be used as shared extension" >&5
9487 +echo "configure:32299: checking if dba can be used as shared extension" >&5
9488 cat > conftest.$ac_ext <<EOF
9489 -#line 31266 "configure"
9490 +#line 32301 "configure"
9491 #include "confdefs.h"
9493 #include "$THIS_INCLUDE"
9494 @@ -31419,7 +32454,7 @@ fi
9495 THIS_FULL_NAME="$THIS_NAME"
9497 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9498 -echo "configure:31423: checking for $THIS_FULL_NAME support" >&5
9499 +echo "configure:32458: checking for $THIS_FULL_NAME support" >&5
9501 { echo "configure: error: " 1>&2; exit 1; }
9503 @@ -31439,7 +32474,7 @@ if test "$PHP_DB1" != "no"; then
9504 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
9506 echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6
9507 -echo "configure:31443: checking for DB1 in library" >&5
9508 +echo "configure:32478: checking for DB1 in library" >&5
9509 if test "$HAVE_DB4" = "1"; then
9512 @@ -31487,7 +32522,7 @@ EOF
9514 echo "$ac_t""$THIS_LIBS" 1>&6
9515 echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6
9516 -echo "configure:31491: checking for DB1 in header" >&5
9517 +echo "configure:32526: checking for DB1 in header" >&5
9518 echo "$ac_t""$THIS_INCLUDE" 1>&6
9519 if test -n "$THIS_INCLUDE"; then
9521 @@ -31497,7 +32532,7 @@ echo "configure:31491: checking for DB1
9522 LIBS="-l$THIS_LIBS $LIBS"
9524 cat > conftest.$ac_ext <<EOF
9525 -#line 31501 "configure"
9526 +#line 32536 "configure"
9527 #include "confdefs.h"
9529 #include "$THIS_INCLUDE"
9530 @@ -31508,7 +32543,7 @@ int main() {
9534 -if { (eval echo configure:31512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9535 +if { (eval echo configure:32547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9538 cat >> confdefs.h <<EOF
9539 @@ -31658,7 +32693,7 @@ fi
9540 THIS_FULL_NAME="$THIS_NAME"
9542 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9543 -echo "configure:31662: checking for $THIS_FULL_NAME support" >&5
9544 +echo "configure:32697: checking for $THIS_FULL_NAME support" >&5
9546 { echo "configure: error: " 1>&2; exit 1; }
9548 @@ -31686,7 +32721,7 @@ if test "$PHP_DBM" != "no"; then
9549 THIS_FULL_NAME="$THIS_NAME"
9551 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9552 -echo "configure:31690: checking for $THIS_FULL_NAME support" >&5
9553 +echo "configure:32725: checking for $THIS_FULL_NAME support" >&5
9554 if test -n "You cannot combine --with-dbm with --with-qdbm"; then
9555 { echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; }
9557 @@ -31810,7 +32845,7 @@ echo "configure:31690: checking for $THI
9560 echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6
9561 -echo "configure:31814: checking for dbminit in -l$LIB" >&5
9562 +echo "configure:32849: checking for dbminit in -l$LIB" >&5
9563 ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'`
9564 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9565 echo $ac_n "(cached) $ac_c" 1>&6
9566 @@ -31818,7 +32853,7 @@ else
9567 ac_save_LIBS="$LIBS"
9569 cat > conftest.$ac_ext <<EOF
9570 -#line 31822 "configure"
9571 +#line 32857 "configure"
9572 #include "confdefs.h"
9573 /* Override any gcc2 internal prototype to avoid an error. */
9574 /* We use char because int might match the return type of a gcc2
9575 @@ -31829,7 +32864,7 @@ int main() {
9579 -if { (eval echo configure:31833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9580 +if { (eval echo configure:32868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9582 eval "ac_cv_lib_$ac_lib_var=yes"
9584 @@ -31849,7 +32884,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
9585 ext_shared=$save_ext_shared
9587 echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6
9588 -echo "configure:31853: checking for DBM using GDBM" >&5
9589 +echo "configure:32888: checking for DBM using GDBM" >&5
9590 cat >> confdefs.h <<EOF
9591 #define DBM_INCLUDE_FILE "$THIS_INCLUDE"
9593 @@ -32013,7 +33048,7 @@ fi
9594 THIS_FULL_NAME="$THIS_NAME"
9596 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9597 -echo "configure:32017: checking for $THIS_FULL_NAME support" >&5
9598 +echo "configure:33052: checking for $THIS_FULL_NAME support" >&5
9600 { echo "configure: error: " 1>&2; exit 1; }
9602 @@ -32225,7 +33260,7 @@ elif test "$PHP_CDB" != "no"; then
9605 echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6
9606 -echo "configure:32229: checking for cdb_read in -l$LIB" >&5
9607 +echo "configure:33264: checking for cdb_read in -l$LIB" >&5
9608 ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'`
9609 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9610 echo $ac_n "(cached) $ac_c" 1>&6
9611 @@ -32233,7 +33268,7 @@ else
9612 ac_save_LIBS="$LIBS"
9614 cat > conftest.$ac_ext <<EOF
9615 -#line 32237 "configure"
9616 +#line 33272 "configure"
9617 #include "confdefs.h"
9618 /* Override any gcc2 internal prototype to avoid an error. */
9619 /* We use char because int might match the return type of a gcc2
9620 @@ -32244,7 +33279,7 @@ int main() {
9624 -if { (eval echo configure:32248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9625 +if { (eval echo configure:33283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9627 eval "ac_cv_lib_$ac_lib_var=yes"
9629 @@ -32413,7 +33448,7 @@ fi
9630 THIS_FULL_NAME="$THIS_NAME"
9632 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9633 -echo "configure:32417: checking for $THIS_FULL_NAME support" >&5
9634 +echo "configure:33452: checking for $THIS_FULL_NAME support" >&5
9636 { echo "configure: error: " 1>&2; exit 1; }
9638 @@ -32444,7 +33479,7 @@ fi
9639 THIS_FULL_NAME="$THIS_NAME"
9641 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9642 -echo "configure:32448: checking for $THIS_FULL_NAME support" >&5
9643 +echo "configure:33483: checking for $THIS_FULL_NAME support" >&5
9645 { echo "configure: error: " 1>&2; exit 1; }
9647 @@ -32475,7 +33510,7 @@ fi
9648 THIS_FULL_NAME="$THIS_NAME"
9650 echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
9651 -echo "configure:32479: checking for $THIS_FULL_NAME support" >&5
9652 +echo "configure:33514: checking for $THIS_FULL_NAME support" >&5
9654 { echo "configure: error: " 1>&2; exit 1; }
9656 @@ -32490,7 +33525,7 @@ echo "configure:32479: checking for $THI
9659 echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
9660 -echo "configure:32494: checking whether to enable DBA interface" >&5
9661 +echo "configure:33529: checking whether to enable DBA interface" >&5
9662 if test "$HAVE_DBA" = "1"; then
9663 if test "$ext_shared" = "yes"; then
9664 echo "$ac_t""yes, shared" 1>&6
9665 @@ -32817,18 +33852,18 @@ fi
9672 -echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6
9673 -echo "configure:32824: checking whether to enable DOM support" >&5
9674 -# Check whether --enable-dom or --disable-dom was given.
9675 -if test "${enable_dom+set}" = set; then
9676 - enableval="$enable_dom"
9677 - PHP_DOM=$enableval
9678 +echo $ac_n "checking whether to enable direct I/O support""... $ac_c" 1>&6
9679 +echo "configure:33859: checking whether to enable direct I/O support" >&5
9680 +# Check whether --enable-dio or --disable-dio was given.
9681 +if test "${enable_dio+set}" = set; then
9682 + enableval="$enable_dio"
9683 + PHP_DIO=$enableval
9687 - test "$PHP_ENABLE_ALL" && PHP_DOM=$PHP_ENABLE_ALL
9689 + test "$PHP_ENABLE_ALL" && PHP_DIO=$PHP_ENABLE_ALL
9693 @@ -32836,12 +33871,12 @@ fi
9695 ext_output="yes, shared"
9700 - PHP_DOM=`echo "$PHP_DOM"|$SED 's/^shared,//'`
9701 + PHP_DIO=`echo "$PHP_DIO"|$SED 's/^shared,//'`
9709 @@ -32860,28 +33895,368 @@ echo "$ac_t""$ext_output" 1>&6
9713 -if test -z "$PHP_LIBXML_DIR"; then
9714 +if test "$PHP_DIO" != "no"; then
9716 -php_with_libxml_dir=no
9717 + ext_builddir=ext/dio
9718 + ext_srcdir=$abs_srcdir/ext/dio
9720 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
9721 -echo "configure:32869: checking libxml2 install dir" >&5
9722 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
9723 -if test "${with_libxml_dir+set}" = set; then
9724 - withval="$with_libxml_dir"
9725 - PHP_LIBXML_DIR=$withval
9729 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
9734 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
9735 + /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
9736 + *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
9745 -ext_output=$PHP_LIBXML_DIR
9746 -echo "$ac_t""$ext_output" 1>&6
9749 + b_c_pre=$php_c_pre
9750 + b_cxx_pre=$php_cxx_pre
9751 + b_c_meta=$php_c_meta
9752 + b_cxx_meta=$php_cxx_meta
9753 + b_c_post=$php_c_post
9754 + b_cxx_post=$php_cxx_post
9759 + for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
9766 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
9769 + *.c) ac_comp="$b_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 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9772 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
9775 + cat >>Makefile.objects<<EOF
9776 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
9782 + EXT_STATIC="$EXT_STATIC dio"
9783 + if test "$ext_shared" != "nocli"; then
9784 + EXT_CLI_STATIC="$EXT_CLI_STATIC dio"
9787 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
9788 + PHP_DIO_SHARED=yes
9791 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
9792 + /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
9793 + *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
9798 + b_c_pre=$shared_c_pre
9799 + b_cxx_pre=$shared_cxx_pre
9800 + b_c_meta=$shared_c_meta
9801 + b_cxx_meta=$shared_cxx_meta
9802 + b_c_post=$shared_c_post
9803 + b_cxx_post=$shared_cxx_post
9808 + for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
9815 + shared_objects_dio="$shared_objects_dio $ac_bdir$ac_obj.lo"
9818 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9819 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9820 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9821 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
9824 + cat >>Makefile.objects<<EOF
9825 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
9830 + case $host_alias in
9833 + install_modules="install-modules"
9835 + case $host_alias in
9838 + 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'
9842 + link_cmd='$(LIBTOOL) --mode=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)'
9846 + link_cmd='$(LIBTOOL) --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)'
9850 + if test "x" = "xyes"; then
9851 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpdio.$suffix"
9853 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdio.$suffix"
9856 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dio"
9858 + cat >>Makefile.objects<<EOF
9859 +\$(phplibdir)/phpdio.$suffix: $ext_builddir/phpdio.$suffix
9860 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpdio.$suffix \$(phplibdir)
9862 +$ext_builddir/phpdio.$suffix: \$(shared_objects_dio) \$(PHPDIO_SHARED_DEPENDENCIES)
9870 + install_modules="install-modules"
9872 + case $host_alias in
9875 + 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'
9879 + link_cmd='$(LIBTOOL) --mode=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)'
9883 + link_cmd='$(LIBTOOL) --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)'
9887 + if test "x" = "xyes"; then
9888 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/dio.$suffix"
9890 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/dio.$suffix"
9893 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dio"
9895 + cat >>Makefile.objects<<EOF
9896 +\$(phplibdir)/dio.$suffix: $ext_builddir/dio.$suffix
9897 + \$(LIBTOOL) --mode=install cp $ext_builddir/dio.$suffix \$(phplibdir)
9899 +$ext_builddir/dio.$suffix: \$(shared_objects_dio) \$(DIO_SHARED_DEPENDENCIES)
9906 + cat >> confdefs.h <<EOF
9907 +#define COMPILE_DL_DIO 1
9913 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
9915 + case "$PHP_SAPI" in
9920 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
9921 + /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
9922 + *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
9927 + b_c_pre=$php_c_pre
9928 + b_cxx_pre=$php_cxx_pre
9929 + b_c_meta=$php_c_meta
9930 + b_cxx_meta=$php_cxx_meta
9931 + b_c_post=$php_c_post
9932 + b_cxx_post=$php_cxx_post
9937 + for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
9944 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
9947 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9948 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9949 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9950 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
9953 + cat >>Makefile.objects<<EOF
9954 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
9960 + EXT_STATIC="$EXT_STATIC dio"
9966 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
9967 + /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
9968 + *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
9973 + b_c_pre=$php_c_pre
9974 + b_cxx_pre=$php_cxx_pre
9975 + b_c_meta=$php_c_meta
9976 + b_cxx_meta=$php_cxx_meta
9977 + b_c_post=$php_c_post
9978 + b_cxx_post=$php_cxx_post
9983 + for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
9990 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
9993 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9994 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9995 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
9996 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
9999 + cat >>Makefile.objects<<EOF
10000 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
10008 + EXT_CLI_STATIC="$EXT_CLI_STATIC dio"
10012 + BUILD_DIR="$BUILD_DIR $ext_builddir"
10016 + if test "$ext_builddir" = "."; then
10017 + PHP_PECL_EXTENSION=dio
10019 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
10027 +php_enable_dom=yes
10029 +echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6
10030 +echo "configure:34199: checking whether to enable DOM support" >&5
10031 +# Check whether --enable-dom or --disable-dom was given.
10032 +if test "${enable_dom+set}" = set; then
10033 + enableval="$enable_dom"
10034 + PHP_DOM=$enableval
10038 + test "$PHP_ENABLE_ALL" && PHP_DOM=$PHP_ENABLE_ALL
10044 +ext_output="yes, shared"
10048 + PHP_DOM=`echo "$PHP_DOM"|$SED 's/^shared,//'`
10065 +echo "$ac_t""$ext_output" 1>&6
10070 +if test -z "$PHP_LIBXML_DIR"; then
10072 +php_with_libxml_dir=no
10074 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
10075 +echo "configure:34244: checking libxml2 install dir" >&5
10076 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
10077 +if test "${with_libxml_dir+set}" = set; then
10078 + withval="$with_libxml_dir"
10079 + PHP_LIBXML_DIR=$withval
10082 + PHP_LIBXML_DIR=no
10088 +ext_output=$PHP_LIBXML_DIR
10089 +echo "$ac_t""$ext_output" 1>&6
10095 @@ -32893,7 +34268,7 @@ if test "$PHP_DOM" != "no"; then
10098 echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
10099 -echo "configure:32897: checking for xml2-config path" >&5
10100 +echo "configure:34272: checking for xml2-config path" >&5
10101 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
10102 echo $ac_n "(cached) $ac_c" 1>&6
10104 @@ -33051,7 +34426,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
10107 echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
10108 -echo "configure:33055: checking whether libxml build works" >&5
10109 +echo "configure:34430: checking whether libxml build works" >&5
10110 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
10111 echo $ac_n "(cached) $ac_c" 1>&6
10113 @@ -33067,7 +34442,7 @@ else
10116 cat > conftest.$ac_ext <<EOF
10117 -#line 33071 "configure"
10118 +#line 34446 "configure"
10119 #include "confdefs.h"
10122 @@ -33078,7 +34453,7 @@ else
10126 -if { (eval echo configure:33082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10127 +if { (eval echo configure:34457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
10131 @@ -33501,7 +34876,7 @@ fi
10132 php_with_enchant=no
10134 echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6
10135 -echo "configure:33505: checking for ENCHANT support" >&5
10136 +echo "configure:34880: checking for ENCHANT support" >&5
10137 # Check whether --with-enchant or --without-enchant was given.
10138 if test "${with_enchant+set}" = set; then
10139 withval="$with_enchant"
10140 @@ -34086,7 +35461,7 @@ EOF
10143 echo $ac_n "checking for enchant_broker_set_param in -lenchant""... $ac_c" 1>&6
10144 -echo "configure:34090: checking for enchant_broker_set_param in -lenchant" >&5
10145 +echo "configure:35465: checking for enchant_broker_set_param in -lenchant" >&5
10146 ac_lib_var=`echo enchant'_'enchant_broker_set_param | sed 'y%./+-%__p_%'`
10147 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10148 echo $ac_n "(cached) $ac_c" 1>&6
10149 @@ -34094,7 +35469,7 @@ else
10150 ac_save_LIBS="$LIBS"
10151 LIBS="-lenchant $LIBS"
10152 cat > conftest.$ac_ext <<EOF
10153 -#line 34098 "configure"
10154 +#line 35473 "configure"
10155 #include "confdefs.h"
10156 /* Override any gcc2 internal prototype to avoid an error. */
10157 /* We use char because int might match the return type of a gcc2
10158 @@ -34105,7 +35480,7 @@ int main() {
10159 enchant_broker_set_param()
10162 -if { (eval echo configure:34109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10163 +if { (eval echo configure:35484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10165 eval "ac_cv_lib_$ac_lib_var=yes"
10167 @@ -34152,7 +35527,7 @@ fi
10170 echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6
10171 -echo "configure:34156: checking whether to enable EXIF (metadata from images) support" >&5
10172 +echo "configure:35531: checking whether to enable EXIF (metadata from images) support" >&5
10173 # Check whether --enable-exif or --disable-exif was given.
10174 if test "${enable_exif+set}" = set; then
10175 enableval="$enable_exif"
10176 @@ -34496,7 +35871,7 @@ fi
10177 php_enable_fileinfo=yes
10179 echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6
10180 -echo "configure:34500: checking for fileinfo support" >&5
10181 +echo "configure:35875: checking for fileinfo support" >&5
10182 # Check whether --enable-fileinfo or --disable-fileinfo was given.
10183 if test "${enable_fileinfo+set}" = set; then
10184 enableval="$enable_fileinfo"
10185 @@ -34846,12 +36221,12 @@ EOF
10186 for ac_func in utimes strndup
10188 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
10189 -echo "configure:34850: checking for $ac_func" >&5
10190 +echo "configure:36225: checking for $ac_func" >&5
10191 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
10192 echo $ac_n "(cached) $ac_c" 1>&6
10194 cat > conftest.$ac_ext <<EOF
10195 -#line 34855 "configure"
10196 +#line 36230 "configure"
10197 #include "confdefs.h"
10198 /* System header to define __stub macros and hopefully few prototypes,
10199 which can conflict with char $ac_func(); below. */
10200 @@ -34874,7 +36249,7 @@ $ac_func();
10204 -if { (eval echo configure:34878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10205 +if { (eval echo configure:36253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10207 eval "ac_cv_func_$ac_func=yes"
10209 @@ -34912,7 +36287,7 @@ fi
10210 php_enable_filter=yes
10212 echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6
10213 -echo "configure:34916: checking whether to enable input filter support" >&5
10214 +echo "configure:36291: checking whether to enable input filter support" >&5
10215 # Check whether --enable-filter or --disable-filter was given.
10216 if test "${enable_filter+set}" = set; then
10217 enableval="$enable_filter"
10218 @@ -34956,7 +36331,7 @@ echo "$ac_t""$ext_output" 1>&6
10219 php_with_pcre_dir=no
10221 echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
10222 -echo "configure:34960: checking pcre install prefix" >&5
10223 +echo "configure:36335: checking pcre install prefix" >&5
10224 # Check whether --with-pcre-dir or --without-pcre-dir was given.
10225 if test "${with_pcre_dir+set}" = set; then
10226 withval="$with_pcre_dir"
10227 @@ -34983,7 +36358,7 @@ if test "$PHP_FILTER" != "no"; then
10228 old_CPPFLAGS=$CPPFLAGS
10230 cat > conftest.$ac_ext <<EOF
10231 -#line 34987 "configure"
10232 +#line 36362 "configure"
10233 #include "confdefs.h"
10235 #include <main/php_config.h>
10236 @@ -35002,7 +36377,7 @@ else
10239 cat > conftest.$ac_ext <<EOF
10240 -#line 35006 "configure"
10241 +#line 36381 "configure"
10242 #include "confdefs.h"
10244 #include <main/php_config.h>
10245 @@ -35372,7 +36747,7 @@ fi
10248 echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6
10249 -echo "configure:35376: checking whether to enable FTP support" >&5
10250 +echo "configure:36751: checking whether to enable FTP support" >&5
10251 # Check whether --enable-ftp or --disable-ftp was given.
10252 if test "${enable_ftp+set}" = set; then
10253 enableval="$enable_ftp"
10254 @@ -35416,7 +36791,7 @@ echo "$ac_t""$ext_output" 1>&6
10255 php_with_openssl_dir=no
10257 echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6
10258 -echo "configure:35420: checking OpenSSL dir for FTP" >&5
10259 +echo "configure:36795: checking OpenSSL dir for FTP" >&5
10260 # Check whether --with-openssl-dir or --without-openssl-dir was given.
10261 if test "${with_openssl_dir+set}" = set; then
10262 withval="$with_openssl_dir"
10263 @@ -35754,7 +37129,7 @@ EOF
10264 # Extract the first word of "pkg-config", so it can be a program name with args.
10265 set dummy pkg-config; ac_word=$2
10266 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
10267 -echo "configure:35758: checking for $ac_word" >&5
10268 +echo "configure:37133: checking for $ac_word" >&5
10269 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
10270 echo $ac_n "(cached) $ac_c" 1>&6
10272 @@ -35959,9 +37334,9 @@ fi
10273 old_CPPFLAGS=$CPPFLAGS
10274 CPPFLAGS=-I$OPENSSL_INCDIR
10275 echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
10276 -echo "configure:35963: checking for OpenSSL version" >&5
10277 +echo "configure:37338: checking for OpenSSL version" >&5
10278 cat > conftest.$ac_ext <<EOF
10279 -#line 35965 "configure"
10280 +#line 37340 "configure"
10281 #include "confdefs.h"
10283 #include <openssl/opensslv.h>
10284 @@ -36116,7 +37491,7 @@ rm -f conftest*
10287 echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
10288 -echo "configure:36120: checking for CRYPTO_free in -lcrypto" >&5
10289 +echo "configure:37495: checking for CRYPTO_free in -lcrypto" >&5
10290 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
10291 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10292 echo $ac_n "(cached) $ac_c" 1>&6
10293 @@ -36124,7 +37499,7 @@ else
10294 ac_save_LIBS="$LIBS"
10295 LIBS="-lcrypto $LIBS"
10296 cat > conftest.$ac_ext <<EOF
10297 -#line 36128 "configure"
10298 +#line 37503 "configure"
10299 #include "confdefs.h"
10300 /* Override any gcc2 internal prototype to avoid an error. */
10301 /* We use char because int might match the return type of a gcc2
10302 @@ -36135,7 +37510,7 @@ int main() {
10306 -if { (eval echo configure:36139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10307 +if { (eval echo configure:37514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10309 eval "ac_cv_lib_$ac_lib_var=yes"
10311 @@ -36292,7 +37667,7 @@ fi
10314 echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
10315 -echo "configure:36296: checking for SSL_CTX_set_ssl_version in -lssl" >&5
10316 +echo "configure:37671: checking for SSL_CTX_set_ssl_version in -lssl" >&5
10317 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
10318 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10319 echo $ac_n "(cached) $ac_c" 1>&6
10320 @@ -36300,7 +37675,7 @@ else
10321 ac_save_LIBS="$LIBS"
10323 cat > conftest.$ac_ext <<EOF
10324 -#line 36304 "configure"
10325 +#line 37679 "configure"
10326 #include "confdefs.h"
10327 /* Override any gcc2 internal prototype to avoid an error. */
10328 /* We use char because int might match the return type of a gcc2
10329 @@ -36311,7 +37686,7 @@ int main() {
10330 SSL_CTX_set_ssl_version()
10333 -if { (eval echo configure:36315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10334 +if { (eval echo configure:37690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10336 eval "ac_cv_lib_$ac_lib_var=yes"
10338 @@ -36453,7 +37828,7 @@ fi
10341 echo $ac_n "checking for GD support""... $ac_c" 1>&6
10342 -echo "configure:36457: checking for GD support" >&5
10343 +echo "configure:37832: checking for GD support" >&5
10344 # Check whether --with-gd or --without-gd was given.
10345 if test "${with_gd+set}" = set; then
10347 @@ -36498,7 +37873,7 @@ if test -z "$PHP_JPEG_DIR"; then
10348 php_with_jpeg_dir=no
10350 echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6
10351 -echo "configure:36502: checking for the location of libjpeg" >&5
10352 +echo "configure:37877: checking for the location of libjpeg" >&5
10353 # Check whether --with-jpeg-dir or --without-jpeg-dir was given.
10354 if test "${with_jpeg_dir+set}" = set; then
10355 withval="$with_jpeg_dir"
10356 @@ -36523,7 +37898,7 @@ if test -z "$PHP_PNG_DIR"; then
10357 php_with_png_dir=no
10359 echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
10360 -echo "configure:36527: checking for the location of libpng" >&5
10361 +echo "configure:37902: checking for the location of libpng" >&5
10362 # Check whether --with-png-dir or --without-png-dir was given.
10363 if test "${with_png_dir+set}" = set; then
10364 withval="$with_png_dir"
10365 @@ -36548,7 +37923,7 @@ if test -z "$PHP_ZLIB_DIR"; then
10366 php_with_zlib_dir=no
10368 echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
10369 -echo "configure:36552: checking for the location of libz" >&5
10370 +echo "configure:37927: checking for the location of libz" >&5
10371 # Check whether --with-zlib-dir or --without-zlib-dir was given.
10372 if test "${with_zlib_dir+set}" = set; then
10373 withval="$with_zlib_dir"
10374 @@ -36572,7 +37947,7 @@ fi
10375 php_with_xpm_dir=no
10377 echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6
10378 -echo "configure:36576: checking for the location of libXpm" >&5
10379 +echo "configure:37951: checking for the location of libXpm" >&5
10380 # Check whether --with-xpm-dir or --without-xpm-dir was given.
10381 if test "${with_xpm_dir+set}" = set; then
10382 withval="$with_xpm_dir"
10383 @@ -36595,7 +37970,7 @@ echo "$ac_t""$ext_output" 1>&6
10384 php_with_freetype_dir=no
10386 echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6
10387 -echo "configure:36599: checking for FreeType 2" >&5
10388 +echo "configure:37974: checking for FreeType 2" >&5
10389 # Check whether --with-freetype-dir or --without-freetype-dir was given.
10390 if test "${with_freetype_dir+set}" = set; then
10391 withval="$with_freetype_dir"
10392 @@ -36618,7 +37993,7 @@ echo "$ac_t""$ext_output" 1>&6
10395 echo $ac_n "checking for T1lib support""... $ac_c" 1>&6
10396 -echo "configure:36622: checking for T1lib support" >&5
10397 +echo "configure:37997: checking for T1lib support" >&5
10398 # Check whether --with-t1lib or --without-t1lib was given.
10399 if test "${with_t1lib+set}" = set; then
10400 withval="$with_t1lib"
10401 @@ -36641,7 +38016,7 @@ echo "$ac_t""$ext_output" 1>&6
10402 php_enable_gd_native_ttf=no
10404 echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6
10405 -echo "configure:36645: checking whether to enable truetype string function in GD" >&5
10406 +echo "configure:38020: checking whether to enable truetype string function in GD" >&5
10407 # Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given.
10408 if test "${enable_gd_native_ttf+set}" = set; then
10409 enableval="$enable_gd_native_ttf"
10410 @@ -36664,7 +38039,7 @@ echo "$ac_t""$ext_output" 1>&6
10411 php_enable_gd_jis_conv=no
10413 echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6
10414 -echo "configure:36668: checking whether to enable JIS-mapped Japanese font support in GD" >&5
10415 +echo "configure:38043: checking whether to enable JIS-mapped Japanese font support in GD" >&5
10416 # Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given.
10417 if test "${enable_gd_jis_conv+set}" = set; then
10418 enableval="$enable_gd_jis_conv"
10419 @@ -36716,12 +38091,12 @@ if test "$PHP_GD" = "yes"; then
10420 for ac_func in fabsf floorf
10422 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
10423 -echo "configure:36720: checking for $ac_func" >&5
10424 +echo "configure:38095: checking for $ac_func" >&5
10425 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
10426 echo $ac_n "(cached) $ac_c" 1>&6
10428 cat > conftest.$ac_ext <<EOF
10429 -#line 36725 "configure"
10430 +#line 38100 "configure"
10431 #include "confdefs.h"
10432 /* System header to define __stub macros and hopefully few prototypes,
10433 which can conflict with char $ac_func(); below. */
10434 @@ -36744,7 +38119,7 @@ $ac_func();
10438 -if { (eval echo configure:36748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10439 +if { (eval echo configure:38123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10441 eval "ac_cv_func_$ac_func=yes"
10443 @@ -36916,7 +38291,7 @@ EOF
10446 echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
10447 -echo "configure:36920: checking for jpeg_read_header in -ljpeg" >&5
10448 +echo "configure:38295: checking for jpeg_read_header in -ljpeg" >&5
10449 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
10450 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10451 echo $ac_n "(cached) $ac_c" 1>&6
10452 @@ -36924,7 +38299,7 @@ else
10453 ac_save_LIBS="$LIBS"
10454 LIBS="-ljpeg $LIBS"
10455 cat > conftest.$ac_ext <<EOF
10456 -#line 36928 "configure"
10457 +#line 38303 "configure"
10458 #include "confdefs.h"
10459 /* Override any gcc2 internal prototype to avoid an error. */
10460 /* We use char because int might match the return type of a gcc2
10461 @@ -36935,7 +38310,7 @@ int main() {
10465 -if { (eval echo configure:36939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10466 +if { (eval echo configure:38314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10468 eval "ac_cv_lib_$ac_lib_var=yes"
10470 @@ -37213,7 +38588,7 @@ fi
10473 echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
10474 -echo "configure:37217: checking for png_write_image in -lpng" >&5
10475 +echo "configure:38592: checking for png_write_image in -lpng" >&5
10476 ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
10477 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10478 echo $ac_n "(cached) $ac_c" 1>&6
10479 @@ -37221,7 +38596,7 @@ else
10480 ac_save_LIBS="$LIBS"
10482 cat > conftest.$ac_ext <<EOF
10483 -#line 37225 "configure"
10484 +#line 38600 "configure"
10485 #include "confdefs.h"
10486 /* Override any gcc2 internal prototype to avoid an error. */
10487 /* We use char because int might match the return type of a gcc2
10488 @@ -37232,7 +38607,7 @@ int main() {
10492 -if { (eval echo configure:37236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10493 +if { (eval echo configure:38611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10495 eval "ac_cv_lib_$ac_lib_var=yes"
10497 @@ -37612,7 +38987,7 @@ fi
10500 echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
10501 -echo "configure:37616: checking for XpmFreeXpmImage in -lXpm" >&5
10502 +echo "configure:38991: checking for XpmFreeXpmImage in -lXpm" >&5
10503 ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
10504 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10505 echo $ac_n "(cached) $ac_c" 1>&6
10506 @@ -37620,7 +38995,7 @@ else
10507 ac_save_LIBS="$LIBS"
10509 cat > conftest.$ac_ext <<EOF
10510 -#line 37624 "configure"
10511 +#line 38999 "configure"
10512 #include "confdefs.h"
10513 /* Override any gcc2 internal prototype to avoid an error. */
10514 /* We use char because int might match the return type of a gcc2
10515 @@ -37631,7 +39006,7 @@ int main() {
10519 -if { (eval echo configure:37635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10520 +if { (eval echo configure:39010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10522 eval "ac_cv_lib_$ac_lib_var=yes"
10524 @@ -38006,7 +39381,7 @@ fi
10527 echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
10528 -echo "configure:38010: checking for FT_New_Face in -lfreetype" >&5
10529 +echo "configure:39385: checking for FT_New_Face in -lfreetype" >&5
10530 ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'`
10531 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10532 echo $ac_n "(cached) $ac_c" 1>&6
10533 @@ -38014,7 +39389,7 @@ else
10534 ac_save_LIBS="$LIBS"
10535 LIBS="-lfreetype $LIBS"
10536 cat > conftest.$ac_ext <<EOF
10537 -#line 38018 "configure"
10538 +#line 39393 "configure"
10539 #include "confdefs.h"
10540 /* Override any gcc2 internal prototype to avoid an error. */
10541 /* We use char because int might match the return type of a gcc2
10542 @@ -38025,7 +39400,7 @@ int main() {
10546 -if { (eval echo configure:38029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10547 +if { (eval echo configure:39404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10549 eval "ac_cv_lib_$ac_lib_var=yes"
10551 @@ -38342,7 +39717,7 @@ fi
10554 echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
10555 -echo "configure:38346: checking for T1_StrError in -lt1" >&5
10556 +echo "configure:39721: checking for T1_StrError in -lt1" >&5
10557 ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'`
10558 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10559 echo $ac_n "(cached) $ac_c" 1>&6
10560 @@ -38350,7 +39725,7 @@ else
10561 ac_save_LIBS="$LIBS"
10563 cat > conftest.$ac_ext <<EOF
10564 -#line 38354 "configure"
10565 +#line 39729 "configure"
10566 #include "confdefs.h"
10567 /* Override any gcc2 internal prototype to avoid an error. */
10568 /* We use char because int might match the return type of a gcc2
10569 @@ -38361,7 +39736,7 @@ int main() {
10573 -if { (eval echo configure:38365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10574 +if { (eval echo configure:39740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10576 eval "ac_cv_lib_$ac_lib_var=yes"
10578 @@ -38804,7 +40179,7 @@ EOF
10581 echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
10582 -echo "configure:38808: checking for jpeg_read_header in -ljpeg" >&5
10583 +echo "configure:40183: checking for jpeg_read_header in -ljpeg" >&5
10584 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
10585 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10586 echo $ac_n "(cached) $ac_c" 1>&6
10587 @@ -38812,7 +40187,7 @@ else
10588 ac_save_LIBS="$LIBS"
10589 LIBS="-ljpeg $LIBS"
10590 cat > conftest.$ac_ext <<EOF
10591 -#line 38816 "configure"
10592 +#line 40191 "configure"
10593 #include "confdefs.h"
10594 /* Override any gcc2 internal prototype to avoid an error. */
10595 /* We use char because int might match the return type of a gcc2
10596 @@ -38823,7 +40198,7 @@ int main() {
10600 -if { (eval echo configure:38827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10601 +if { (eval echo configure:40202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10603 eval "ac_cv_lib_$ac_lib_var=yes"
10605 @@ -39101,7 +40476,7 @@ fi
10608 echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
10609 -echo "configure:39105: checking for png_write_image in -lpng" >&5
10610 +echo "configure:40480: checking for png_write_image in -lpng" >&5
10611 ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
10612 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10613 echo $ac_n "(cached) $ac_c" 1>&6
10614 @@ -39109,7 +40484,7 @@ else
10615 ac_save_LIBS="$LIBS"
10617 cat > conftest.$ac_ext <<EOF
10618 -#line 39113 "configure"
10619 +#line 40488 "configure"
10620 #include "confdefs.h"
10621 /* Override any gcc2 internal prototype to avoid an error. */
10622 /* We use char because int might match the return type of a gcc2
10623 @@ -39120,7 +40495,7 @@ int main() {
10627 -if { (eval echo configure:39124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10628 +if { (eval echo configure:40499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10630 eval "ac_cv_lib_$ac_lib_var=yes"
10632 @@ -39500,7 +40875,7 @@ fi
10635 echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
10636 -echo "configure:39504: checking for XpmFreeXpmImage in -lXpm" >&5
10637 +echo "configure:40879: checking for XpmFreeXpmImage in -lXpm" >&5
10638 ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
10639 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10640 echo $ac_n "(cached) $ac_c" 1>&6
10641 @@ -39508,7 +40883,7 @@ else
10642 ac_save_LIBS="$LIBS"
10644 cat > conftest.$ac_ext <<EOF
10645 -#line 39512 "configure"
10646 +#line 40887 "configure"
10647 #include "confdefs.h"
10648 /* Override any gcc2 internal prototype to avoid an error. */
10649 /* We use char because int might match the return type of a gcc2
10650 @@ -39519,7 +40894,7 @@ int main() {
10654 -if { (eval echo configure:39523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10655 +if { (eval echo configure:40898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10657 eval "ac_cv_lib_$ac_lib_var=yes"
10659 @@ -39894,7 +41269,7 @@ fi
10662 echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
10663 -echo "configure:39898: checking for FT_New_Face in -lfreetype" >&5
10664 +echo "configure:41273: checking for FT_New_Face in -lfreetype" >&5
10665 ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'`
10666 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10667 echo $ac_n "(cached) $ac_c" 1>&6
10668 @@ -39902,7 +41277,7 @@ else
10669 ac_save_LIBS="$LIBS"
10670 LIBS="-lfreetype $LIBS"
10671 cat > conftest.$ac_ext <<EOF
10672 -#line 39906 "configure"
10673 +#line 41281 "configure"
10674 #include "confdefs.h"
10675 /* Override any gcc2 internal prototype to avoid an error. */
10676 /* We use char because int might match the return type of a gcc2
10677 @@ -39913,7 +41288,7 @@ int main() {
10681 -if { (eval echo configure:39917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10682 +if { (eval echo configure:41292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10684 eval "ac_cv_lib_$ac_lib_var=yes"
10686 @@ -40230,7 +41605,7 @@ fi
10689 echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
10690 -echo "configure:40234: checking for T1_StrError in -lt1" >&5
10691 +echo "configure:41609: checking for T1_StrError in -lt1" >&5
10692 ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'`
10693 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10694 echo $ac_n "(cached) $ac_c" 1>&6
10695 @@ -40238,7 +41613,7 @@ else
10696 ac_save_LIBS="$LIBS"
10698 cat > conftest.$ac_ext <<EOF
10699 -#line 40242 "configure"
10700 +#line 41617 "configure"
10701 #include "confdefs.h"
10702 /* Override any gcc2 internal prototype to avoid an error. */
10703 /* We use char because int might match the return type of a gcc2
10704 @@ -40249,7 +41624,7 @@ int main() {
10708 -if { (eval echo configure:40253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10709 +if { (eval echo configure:41628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10711 eval "ac_cv_lib_$ac_lib_var=yes"
10713 @@ -40624,7 +41999,7 @@ EOF
10716 echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
10717 -echo "configure:40628: checking for gdImageString16 in -lgd" >&5
10718 +echo "configure:42003: checking for gdImageString16 in -lgd" >&5
10719 ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'`
10720 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10721 echo $ac_n "(cached) $ac_c" 1>&6
10722 @@ -40632,7 +42007,7 @@ else
10723 ac_save_LIBS="$LIBS"
10725 cat > conftest.$ac_ext <<EOF
10726 -#line 40636 "configure"
10727 +#line 42011 "configure"
10728 #include "confdefs.h"
10729 /* Override any gcc2 internal prototype to avoid an error. */
10730 /* We use char because int might match the return type of a gcc2
10731 @@ -40643,7 +42018,7 @@ int main() {
10735 -if { (eval echo configure:40647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10736 +if { (eval echo configure:42022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10738 eval "ac_cv_lib_$ac_lib_var=yes"
10740 @@ -40772,7 +42147,7 @@ fi
10743 echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6
10744 -echo "configure:40776: checking for gdImagePaletteCopy in -lgd" >&5
10745 +echo "configure:42151: checking for gdImagePaletteCopy in -lgd" >&5
10746 ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'`
10747 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10748 echo $ac_n "(cached) $ac_c" 1>&6
10749 @@ -40780,7 +42155,7 @@ else
10750 ac_save_LIBS="$LIBS"
10752 cat > conftest.$ac_ext <<EOF
10753 -#line 40784 "configure"
10754 +#line 42159 "configure"
10755 #include "confdefs.h"
10756 /* Override any gcc2 internal prototype to avoid an error. */
10757 /* We use char because int might match the return type of a gcc2
10758 @@ -40791,7 +42166,7 @@ int main() {
10759 gdImagePaletteCopy()
10762 -if { (eval echo configure:40795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10763 +if { (eval echo configure:42170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10765 eval "ac_cv_lib_$ac_lib_var=yes"
10767 @@ -40920,7 +42295,7 @@ fi
10770 echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
10771 -echo "configure:40924: checking for gdImageCreateFromPng in -lgd" >&5
10772 +echo "configure:42299: checking for gdImageCreateFromPng in -lgd" >&5
10773 ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'`
10774 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10775 echo $ac_n "(cached) $ac_c" 1>&6
10776 @@ -40928,7 +42303,7 @@ else
10777 ac_save_LIBS="$LIBS"
10779 cat > conftest.$ac_ext <<EOF
10780 -#line 40932 "configure"
10781 +#line 42307 "configure"
10782 #include "confdefs.h"
10783 /* Override any gcc2 internal prototype to avoid an error. */
10784 /* We use char because int might match the return type of a gcc2
10785 @@ -40939,7 +42314,7 @@ int main() {
10786 gdImageCreateFromPng()
10789 -if { (eval echo configure:40943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10790 +if { (eval echo configure:42318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10792 eval "ac_cv_lib_$ac_lib_var=yes"
10794 @@ -41068,7 +42443,7 @@ fi
10797 echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
10798 -echo "configure:41072: checking for gdImageCreateFromGif in -lgd" >&5
10799 +echo "configure:42447: checking for gdImageCreateFromGif in -lgd" >&5
10800 ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'`
10801 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10802 echo $ac_n "(cached) $ac_c" 1>&6
10803 @@ -41076,7 +42451,7 @@ else
10804 ac_save_LIBS="$LIBS"
10806 cat > conftest.$ac_ext <<EOF
10807 -#line 41080 "configure"
10808 +#line 42455 "configure"
10809 #include "confdefs.h"
10810 /* Override any gcc2 internal prototype to avoid an error. */
10811 /* We use char because int might match the return type of a gcc2
10812 @@ -41087,7 +42462,7 @@ int main() {
10813 gdImageCreateFromGif()
10816 -if { (eval echo configure:41091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10817 +if { (eval echo configure:42466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10819 eval "ac_cv_lib_$ac_lib_var=yes"
10821 @@ -41216,7 +42591,7 @@ fi
10824 echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6
10825 -echo "configure:41220: checking for gdImageGif in -lgd" >&5
10826 +echo "configure:42595: checking for gdImageGif in -lgd" >&5
10827 ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'`
10828 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10829 echo $ac_n "(cached) $ac_c" 1>&6
10830 @@ -41224,7 +42599,7 @@ else
10831 ac_save_LIBS="$LIBS"
10833 cat > conftest.$ac_ext <<EOF
10834 -#line 41228 "configure"
10835 +#line 42603 "configure"
10836 #include "confdefs.h"
10837 /* Override any gcc2 internal prototype to avoid an error. */
10838 /* We use char because int might match the return type of a gcc2
10839 @@ -41235,7 +42610,7 @@ int main() {
10843 -if { (eval echo configure:41239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10844 +if { (eval echo configure:42614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10846 eval "ac_cv_lib_$ac_lib_var=yes"
10848 @@ -41364,7 +42739,7 @@ fi
10851 echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6
10852 -echo "configure:41368: checking for gdImageWBMP in -lgd" >&5
10853 +echo "configure:42743: checking for gdImageWBMP in -lgd" >&5
10854 ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'`
10855 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10856 echo $ac_n "(cached) $ac_c" 1>&6
10857 @@ -41372,7 +42747,7 @@ else
10858 ac_save_LIBS="$LIBS"
10860 cat > conftest.$ac_ext <<EOF
10861 -#line 41376 "configure"
10862 +#line 42751 "configure"
10863 #include "confdefs.h"
10864 /* Override any gcc2 internal prototype to avoid an error. */
10865 /* We use char because int might match the return type of a gcc2
10866 @@ -41383,7 +42758,7 @@ int main() {
10870 -if { (eval echo configure:41387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10871 +if { (eval echo configure:42762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10873 eval "ac_cv_lib_$ac_lib_var=yes"
10875 @@ -41512,7 +42887,7 @@ fi
10878 echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
10879 -echo "configure:41516: checking for gdImageCreateFromJpeg in -lgd" >&5
10880 +echo "configure:42891: checking for gdImageCreateFromJpeg in -lgd" >&5
10881 ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'`
10882 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10883 echo $ac_n "(cached) $ac_c" 1>&6
10884 @@ -41520,7 +42895,7 @@ else
10885 ac_save_LIBS="$LIBS"
10887 cat > conftest.$ac_ext <<EOF
10888 -#line 41524 "configure"
10889 +#line 42899 "configure"
10890 #include "confdefs.h"
10891 /* Override any gcc2 internal prototype to avoid an error. */
10892 /* We use char because int might match the return type of a gcc2
10893 @@ -41531,7 +42906,7 @@ int main() {
10894 gdImageCreateFromJpeg()
10897 -if { (eval echo configure:41535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10898 +if { (eval echo configure:42910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10900 eval "ac_cv_lib_$ac_lib_var=yes"
10902 @@ -41660,7 +43035,7 @@ fi
10905 echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6
10906 -echo "configure:41664: checking for gdImageCreateFromXpm in -lgd" >&5
10907 +echo "configure:43039: checking for gdImageCreateFromXpm in -lgd" >&5
10908 ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'`
10909 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10910 echo $ac_n "(cached) $ac_c" 1>&6
10911 @@ -41668,7 +43043,7 @@ else
10912 ac_save_LIBS="$LIBS"
10914 cat > conftest.$ac_ext <<EOF
10915 -#line 41672 "configure"
10916 +#line 43047 "configure"
10917 #include "confdefs.h"
10918 /* Override any gcc2 internal prototype to avoid an error. */
10919 /* We use char because int might match the return type of a gcc2
10920 @@ -41679,7 +43054,7 @@ int main() {
10921 gdImageCreateFromXpm()
10924 -if { (eval echo configure:41683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10925 +if { (eval echo configure:43058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10927 eval "ac_cv_lib_$ac_lib_var=yes"
10929 @@ -41808,7 +43183,7 @@ fi
10932 echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6
10933 -echo "configure:41812: checking for gdImageCreateFromGd2 in -lgd" >&5
10934 +echo "configure:43187: checking for gdImageCreateFromGd2 in -lgd" >&5
10935 ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'`
10936 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10937 echo $ac_n "(cached) $ac_c" 1>&6
10938 @@ -41816,7 +43191,7 @@ else
10939 ac_save_LIBS="$LIBS"
10941 cat > conftest.$ac_ext <<EOF
10942 -#line 41820 "configure"
10943 +#line 43195 "configure"
10944 #include "confdefs.h"
10945 /* Override any gcc2 internal prototype to avoid an error. */
10946 /* We use char because int might match the return type of a gcc2
10947 @@ -41827,7 +43202,7 @@ int main() {
10948 gdImageCreateFromGd2()
10951 -if { (eval echo configure:41831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10952 +if { (eval echo configure:43206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10954 eval "ac_cv_lib_$ac_lib_var=yes"
10956 @@ -41956,7 +43331,7 @@ fi
10959 echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6
10960 -echo "configure:41960: checking for gdImageCreateTrueColor in -lgd" >&5
10961 +echo "configure:43335: checking for gdImageCreateTrueColor in -lgd" >&5
10962 ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'`
10963 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10964 echo $ac_n "(cached) $ac_c" 1>&6
10965 @@ -41964,7 +43339,7 @@ else
10966 ac_save_LIBS="$LIBS"
10968 cat > conftest.$ac_ext <<EOF
10969 -#line 41968 "configure"
10970 +#line 43343 "configure"
10971 #include "confdefs.h"
10972 /* Override any gcc2 internal prototype to avoid an error. */
10973 /* We use char because int might match the return type of a gcc2
10974 @@ -41975,7 +43350,7 @@ int main() {
10975 gdImageCreateTrueColor()
10978 -if { (eval echo configure:41979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10979 +if { (eval echo configure:43354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10981 eval "ac_cv_lib_$ac_lib_var=yes"
10983 @@ -42104,7 +43479,7 @@ fi
10986 echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6
10987 -echo "configure:42108: checking for gdImageSetTile in -lgd" >&5
10988 +echo "configure:43483: checking for gdImageSetTile in -lgd" >&5
10989 ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'`
10990 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10991 echo $ac_n "(cached) $ac_c" 1>&6
10992 @@ -42112,7 +43487,7 @@ else
10993 ac_save_LIBS="$LIBS"
10995 cat > conftest.$ac_ext <<EOF
10996 -#line 42116 "configure"
10997 +#line 43491 "configure"
10998 #include "confdefs.h"
10999 /* Override any gcc2 internal prototype to avoid an error. */
11000 /* We use char because int might match the return type of a gcc2
11001 @@ -42123,7 +43498,7 @@ int main() {
11005 -if { (eval echo configure:42127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11006 +if { (eval echo configure:43502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11008 eval "ac_cv_lib_$ac_lib_var=yes"
11010 @@ -42252,7 +43627,7 @@ fi
11013 echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6
11014 -echo "configure:42256: checking for gdImageEllipse in -lgd" >&5
11015 +echo "configure:43631: checking for gdImageEllipse in -lgd" >&5
11016 ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'`
11017 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11018 echo $ac_n "(cached) $ac_c" 1>&6
11019 @@ -42260,7 +43635,7 @@ else
11020 ac_save_LIBS="$LIBS"
11022 cat > conftest.$ac_ext <<EOF
11023 -#line 42264 "configure"
11024 +#line 43639 "configure"
11025 #include "confdefs.h"
11026 /* Override any gcc2 internal prototype to avoid an error. */
11027 /* We use char because int might match the return type of a gcc2
11028 @@ -42271,7 +43646,7 @@ int main() {
11032 -if { (eval echo configure:42275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11033 +if { (eval echo configure:43650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11035 eval "ac_cv_lib_$ac_lib_var=yes"
11037 @@ -42400,7 +43775,7 @@ fi
11040 echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6
11041 -echo "configure:42404: checking for gdImageSetBrush in -lgd" >&5
11042 +echo "configure:43779: checking for gdImageSetBrush in -lgd" >&5
11043 ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'`
11044 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11045 echo $ac_n "(cached) $ac_c" 1>&6
11046 @@ -42408,7 +43783,7 @@ else
11047 ac_save_LIBS="$LIBS"
11049 cat > conftest.$ac_ext <<EOF
11050 -#line 42412 "configure"
11051 +#line 43787 "configure"
11052 #include "confdefs.h"
11053 /* Override any gcc2 internal prototype to avoid an error. */
11054 /* We use char because int might match the return type of a gcc2
11055 @@ -42419,7 +43794,7 @@ int main() {
11059 -if { (eval echo configure:42423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11060 +if { (eval echo configure:43798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11062 eval "ac_cv_lib_$ac_lib_var=yes"
11064 @@ -42548,7 +43923,7 @@ fi
11067 echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6
11068 -echo "configure:42552: checking for gdImageStringTTF in -lgd" >&5
11069 +echo "configure:43927: checking for gdImageStringTTF in -lgd" >&5
11070 ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'`
11071 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11072 echo $ac_n "(cached) $ac_c" 1>&6
11073 @@ -42556,7 +43931,7 @@ else
11074 ac_save_LIBS="$LIBS"
11076 cat > conftest.$ac_ext <<EOF
11077 -#line 42560 "configure"
11078 +#line 43935 "configure"
11079 #include "confdefs.h"
11080 /* Override any gcc2 internal prototype to avoid an error. */
11081 /* We use char because int might match the return type of a gcc2
11082 @@ -42567,7 +43942,7 @@ int main() {
11086 -if { (eval echo configure:42571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11087 +if { (eval echo configure:43946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11089 eval "ac_cv_lib_$ac_lib_var=yes"
11091 @@ -42696,7 +44071,7 @@ fi
11094 echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6
11095 -echo "configure:42700: checking for gdImageStringFT in -lgd" >&5
11096 +echo "configure:44075: checking for gdImageStringFT in -lgd" >&5
11097 ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'`
11098 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11099 echo $ac_n "(cached) $ac_c" 1>&6
11100 @@ -42704,7 +44079,7 @@ else
11101 ac_save_LIBS="$LIBS"
11103 cat > conftest.$ac_ext <<EOF
11104 -#line 42708 "configure"
11105 +#line 44083 "configure"
11106 #include "confdefs.h"
11107 /* Override any gcc2 internal prototype to avoid an error. */
11108 /* We use char because int might match the return type of a gcc2
11109 @@ -42715,7 +44090,7 @@ int main() {
11113 -if { (eval echo configure:42719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11114 +if { (eval echo configure:44094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11116 eval "ac_cv_lib_$ac_lib_var=yes"
11118 @@ -42844,7 +44219,7 @@ fi
11121 echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6
11122 -echo "configure:42848: checking for gdImageStringFTEx in -lgd" >&5
11123 +echo "configure:44223: checking for gdImageStringFTEx in -lgd" >&5
11124 ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'`
11125 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11126 echo $ac_n "(cached) $ac_c" 1>&6
11127 @@ -42852,7 +44227,7 @@ else
11128 ac_save_LIBS="$LIBS"
11130 cat > conftest.$ac_ext <<EOF
11131 -#line 42856 "configure"
11132 +#line 44231 "configure"
11133 #include "confdefs.h"
11134 /* Override any gcc2 internal prototype to avoid an error. */
11135 /* We use char because int might match the return type of a gcc2
11136 @@ -42863,7 +44238,7 @@ int main() {
11137 gdImageStringFTEx()
11140 -if { (eval echo configure:42867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11141 +if { (eval echo configure:44242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11143 eval "ac_cv_lib_$ac_lib_var=yes"
11145 @@ -42992,7 +44367,7 @@ fi
11148 echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6
11149 -echo "configure:42996: checking for gdImageColorClosestHWB in -lgd" >&5
11150 +echo "configure:44371: checking for gdImageColorClosestHWB in -lgd" >&5
11151 ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'`
11152 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11153 echo $ac_n "(cached) $ac_c" 1>&6
11154 @@ -43000,7 +44375,7 @@ else
11155 ac_save_LIBS="$LIBS"
11157 cat > conftest.$ac_ext <<EOF
11158 -#line 43004 "configure"
11159 +#line 44379 "configure"
11160 #include "confdefs.h"
11161 /* Override any gcc2 internal prototype to avoid an error. */
11162 /* We use char because int might match the return type of a gcc2
11163 @@ -43011,7 +44386,7 @@ int main() {
11164 gdImageColorClosestHWB()
11167 -if { (eval echo configure:43015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11168 +if { (eval echo configure:44390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11170 eval "ac_cv_lib_$ac_lib_var=yes"
11172 @@ -43140,7 +44515,7 @@ fi
11175 echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
11176 -echo "configure:43144: checking for gdImageColorResolve in -lgd" >&5
11177 +echo "configure:44519: checking for gdImageColorResolve in -lgd" >&5
11178 ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'`
11179 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11180 echo $ac_n "(cached) $ac_c" 1>&6
11181 @@ -43148,7 +44523,7 @@ else
11182 ac_save_LIBS="$LIBS"
11184 cat > conftest.$ac_ext <<EOF
11185 -#line 43152 "configure"
11186 +#line 44527 "configure"
11187 #include "confdefs.h"
11188 /* Override any gcc2 internal prototype to avoid an error. */
11189 /* We use char because int might match the return type of a gcc2
11190 @@ -43159,7 +44534,7 @@ int main() {
11191 gdImageColorResolve()
11194 -if { (eval echo configure:43163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11195 +if { (eval echo configure:44538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11197 eval "ac_cv_lib_$ac_lib_var=yes"
11199 @@ -43288,7 +44663,7 @@ fi
11202 echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6
11203 -echo "configure:43292: checking for gdImageGifCtx in -lgd" >&5
11204 +echo "configure:44667: checking for gdImageGifCtx in -lgd" >&5
11205 ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'`
11206 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11207 echo $ac_n "(cached) $ac_c" 1>&6
11208 @@ -43296,7 +44671,7 @@ else
11209 ac_save_LIBS="$LIBS"
11211 cat > conftest.$ac_ext <<EOF
11212 -#line 43300 "configure"
11213 +#line 44675 "configure"
11214 #include "confdefs.h"
11215 /* Override any gcc2 internal prototype to avoid an error. */
11216 /* We use char because int might match the return type of a gcc2
11217 @@ -43307,7 +44682,7 @@ int main() {
11221 -if { (eval echo configure:43311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11222 +if { (eval echo configure:44686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11224 eval "ac_cv_lib_$ac_lib_var=yes"
11226 @@ -43436,7 +44811,7 @@ fi
11229 echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
11230 -echo "configure:43440: checking for gdCacheCreate in -lgd" >&5
11231 +echo "configure:44815: checking for gdCacheCreate in -lgd" >&5
11232 ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
11233 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11234 echo $ac_n "(cached) $ac_c" 1>&6
11235 @@ -43444,7 +44819,7 @@ else
11236 ac_save_LIBS="$LIBS"
11238 cat > conftest.$ac_ext <<EOF
11239 -#line 43448 "configure"
11240 +#line 44823 "configure"
11241 #include "confdefs.h"
11242 /* Override any gcc2 internal prototype to avoid an error. */
11243 /* We use char because int might match the return type of a gcc2
11244 @@ -43455,7 +44830,7 @@ int main() {
11248 -if { (eval echo configure:43459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11249 +if { (eval echo configure:44834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11251 eval "ac_cv_lib_$ac_lib_var=yes"
11253 @@ -43584,7 +44959,7 @@ fi
11256 echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6
11257 -echo "configure:43588: checking for gdFontCacheShutdown in -lgd" >&5
11258 +echo "configure:44963: checking for gdFontCacheShutdown in -lgd" >&5
11259 ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'`
11260 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11261 echo $ac_n "(cached) $ac_c" 1>&6
11262 @@ -43592,7 +44967,7 @@ else
11263 ac_save_LIBS="$LIBS"
11265 cat > conftest.$ac_ext <<EOF
11266 -#line 43596 "configure"
11267 +#line 44971 "configure"
11268 #include "confdefs.h"
11269 /* Override any gcc2 internal prototype to avoid an error. */
11270 /* We use char because int might match the return type of a gcc2
11271 @@ -43603,7 +44978,7 @@ int main() {
11272 gdFontCacheShutdown()
11275 -if { (eval echo configure:43607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11276 +if { (eval echo configure:44982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11278 eval "ac_cv_lib_$ac_lib_var=yes"
11280 @@ -43732,7 +45107,7 @@ fi
11283 echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6
11284 -echo "configure:43736: checking for gdFreeFontCache in -lgd" >&5
11285 +echo "configure:45111: checking for gdFreeFontCache in -lgd" >&5
11286 ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'`
11287 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11288 echo $ac_n "(cached) $ac_c" 1>&6
11289 @@ -43740,7 +45115,7 @@ else
11290 ac_save_LIBS="$LIBS"
11292 cat > conftest.$ac_ext <<EOF
11293 -#line 43744 "configure"
11294 +#line 45119 "configure"
11295 #include "confdefs.h"
11296 /* Override any gcc2 internal prototype to avoid an error. */
11297 /* We use char because int might match the return type of a gcc2
11298 @@ -43751,7 +45126,7 @@ int main() {
11302 -if { (eval echo configure:43755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11303 +if { (eval echo configure:45130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11305 eval "ac_cv_lib_$ac_lib_var=yes"
11307 @@ -43880,7 +45255,7 @@ fi
11310 echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6
11311 -echo "configure:43884: checking for gdFontCacheMutexSetup in -lgd" >&5
11312 +echo "configure:45259: checking for gdFontCacheMutexSetup in -lgd" >&5
11313 ac_lib_var=`echo gd'_'gdFontCacheMutexSetup | sed 'y%./+-%__p_%'`
11314 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11315 echo $ac_n "(cached) $ac_c" 1>&6
11316 @@ -43888,7 +45263,7 @@ else
11317 ac_save_LIBS="$LIBS"
11319 cat > conftest.$ac_ext <<EOF
11320 -#line 43892 "configure"
11321 +#line 45267 "configure"
11322 #include "confdefs.h"
11323 /* Override any gcc2 internal prototype to avoid an error. */
11324 /* We use char because int might match the return type of a gcc2
11325 @@ -43899,7 +45274,7 @@ int main() {
11326 gdFontCacheMutexSetup()
11329 -if { (eval echo configure:43903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11330 +if { (eval echo configure:45278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11332 eval "ac_cv_lib_$ac_lib_var=yes"
11334 @@ -44028,7 +45403,7 @@ fi
11337 echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6
11338 -echo "configure:44032: checking for gdNewDynamicCtxEx in -lgd" >&5
11339 +echo "configure:45407: checking for gdNewDynamicCtxEx in -lgd" >&5
11340 ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'`
11341 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11342 echo $ac_n "(cached) $ac_c" 1>&6
11343 @@ -44036,7 +45411,7 @@ else
11344 ac_save_LIBS="$LIBS"
11346 cat > conftest.$ac_ext <<EOF
11347 -#line 44040 "configure"
11348 +#line 45415 "configure"
11349 #include "confdefs.h"
11350 /* Override any gcc2 internal prototype to avoid an error. */
11351 /* We use char because int might match the return type of a gcc2
11352 @@ -44047,7 +45422,7 @@ int main() {
11353 gdNewDynamicCtxEx()
11356 -if { (eval echo configure:44051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11357 +if { (eval echo configure:45426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11359 eval "ac_cv_lib_$ac_lib_var=yes"
11361 @@ -44102,7 +45477,7 @@ fi
11362 old_CPPFLAGS=$CPPFLAGS
11363 CPPFLAGS=-I$GD_INCLUDE
11364 cat > conftest.$ac_ext <<EOF
11365 -#line 44106 "configure"
11366 +#line 45481 "configure"
11367 #include "confdefs.h"
11370 @@ -44116,7 +45491,7 @@ ctx->gd_free = 1;
11374 -if { (eval echo configure:44120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
11375 +if { (eval echo configure:45495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
11378 cat >> confdefs.h <<\EOF
11379 @@ -44447,7 +45822,7 @@ EOF
11382 cat > conftest.$ac_ext <<EOF
11383 -#line 44451 "configure"
11384 +#line 45826 "configure"
11385 #include "confdefs.h"
11388 @@ -44458,7 +45833,7 @@ else
11392 -if { (eval echo configure:44462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11393 +if { (eval echo configure:45837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11397 @@ -44609,7 +45984,7 @@ fi
11400 echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
11401 -echo "configure:44613: checking for gdImageCreate in -lgd" >&5
11402 +echo "configure:45988: checking for gdImageCreate in -lgd" >&5
11403 ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'`
11404 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11405 echo $ac_n "(cached) $ac_c" 1>&6
11406 @@ -44617,7 +45992,7 @@ else
11407 ac_save_LIBS="$LIBS"
11409 cat > conftest.$ac_ext <<EOF
11410 -#line 44621 "configure"
11411 +#line 45996 "configure"
11412 #include "confdefs.h"
11413 /* Override any gcc2 internal prototype to avoid an error. */
11414 /* We use char because int might match the return type of a gcc2
11415 @@ -44628,7 +46003,7 @@ int main() {
11419 -if { (eval echo configure:44632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11420 +if { (eval echo configure:46007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11422 eval "ac_cv_lib_$ac_lib_var=yes"
11424 @@ -44693,7 +46068,7 @@ fi
11425 php_with_gettext=no
11427 echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6
11428 -echo "configure:44697: checking for GNU gettext support" >&5
11429 +echo "configure:46072: checking for GNU gettext support" >&5
11430 # Check whether --with-gettext or --without-gettext was given.
11431 if test "${with_gettext+set}" = set; then
11432 withval="$with_gettext"
11433 @@ -44748,7 +46123,7 @@ if test "$PHP_GETTEXT" != "no"; then
11435 LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
11436 echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
11437 -echo "configure:44752: checking for bindtextdomain in -lintl" >&5
11438 +echo "configure:46127: checking for bindtextdomain in -lintl" >&5
11439 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
11440 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11441 echo $ac_n "(cached) $ac_c" 1>&6
11442 @@ -44756,7 +46131,7 @@ else
11443 ac_save_LIBS="$LIBS"
11444 LIBS="-lintl $LIBS"
11445 cat > conftest.$ac_ext <<EOF
11446 -#line 44760 "configure"
11447 +#line 46135 "configure"
11448 #include "confdefs.h"
11449 /* Override any gcc2 internal prototype to avoid an error. */
11450 /* We use char because int might match the return type of a gcc2
11451 @@ -44767,7 +46142,7 @@ int main() {
11455 -if { (eval echo configure:44771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11456 +if { (eval echo configure:46146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11458 eval "ac_cv_lib_$ac_lib_var=yes"
11460 @@ -44789,7 +46164,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
11462 echo "$ac_t""no" 1>&6
11463 echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6
11464 -echo "configure:44793: checking for bindtextdomain in -lc" >&5
11465 +echo "configure:46168: checking for bindtextdomain in -lc" >&5
11466 ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'`
11467 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11468 echo $ac_n "(cached) $ac_c" 1>&6
11469 @@ -44797,7 +46172,7 @@ else
11470 ac_save_LIBS="$LIBS"
11472 cat > conftest.$ac_ext <<EOF
11473 -#line 44801 "configure"
11474 +#line 46176 "configure"
11475 #include "confdefs.h"
11476 /* Override any gcc2 internal prototype to avoid an error. */
11477 /* We use char because int might match the return type of a gcc2
11478 @@ -44808,7 +46183,7 @@ int main() {
11482 -if { (eval echo configure:44812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11483 +if { (eval echo configure:46187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11485 eval "ac_cv_lib_$ac_lib_var=yes"
11487 @@ -45272,7 +46647,7 @@ EOF
11490 echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
11491 -echo "configure:45276: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11492 +echo "configure:46651: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11493 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'`
11494 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11495 echo $ac_n "(cached) $ac_c" 1>&6
11496 @@ -45280,7 +46655,7 @@ else
11497 ac_save_LIBS="$LIBS"
11498 LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
11499 cat > conftest.$ac_ext <<EOF
11500 -#line 45284 "configure"
11501 +#line 46659 "configure"
11502 #include "confdefs.h"
11503 /* Override any gcc2 internal prototype to avoid an error. */
11504 /* We use char because int might match the return type of a gcc2
11505 @@ -45291,7 +46666,7 @@ int main() {
11509 -if { (eval echo configure:45295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11510 +if { (eval echo configure:46670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11512 eval "ac_cv_lib_$ac_lib_var=yes"
11514 @@ -45315,7 +46690,7 @@ else
11517 echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
11518 -echo "configure:45319: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11519 +echo "configure:46694: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11520 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'`
11521 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11522 echo $ac_n "(cached) $ac_c" 1>&6
11523 @@ -45323,7 +46698,7 @@ else
11524 ac_save_LIBS="$LIBS"
11525 LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
11526 cat > conftest.$ac_ext <<EOF
11527 -#line 45327 "configure"
11528 +#line 46702 "configure"
11529 #include "confdefs.h"
11530 /* Override any gcc2 internal prototype to avoid an error. */
11531 /* We use char because int might match the return type of a gcc2
11532 @@ -45334,7 +46709,7 @@ int main() {
11536 -if { (eval echo configure:45338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11537 +if { (eval echo configure:46713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11539 eval "ac_cv_lib_$ac_lib_var=yes"
11541 @@ -45358,7 +46733,7 @@ else
11544 echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
11545 -echo "configure:45362: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11546 +echo "configure:46737: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
11547 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'`
11548 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11549 echo $ac_n "(cached) $ac_c" 1>&6
11550 @@ -45366,7 +46741,7 @@ else
11551 ac_save_LIBS="$LIBS"
11552 LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
11553 cat > conftest.$ac_ext <<EOF
11554 -#line 45370 "configure"
11555 +#line 46745 "configure"
11556 #include "confdefs.h"
11557 /* Override any gcc2 internal prototype to avoid an error. */
11558 /* We use char because int might match the return type of a gcc2
11559 @@ -45377,7 +46752,7 @@ int main() {
11563 -if { (eval echo configure:45381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11564 +if { (eval echo configure:46756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11566 eval "ac_cv_lib_$ac_lib_var=yes"
11568 @@ -45401,7 +46776,7 @@ else
11571 echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
11572 -echo "configure:45405: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
11573 +echo "configure:46780: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
11574 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'`
11575 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11576 echo $ac_n "(cached) $ac_c" 1>&6
11577 @@ -45409,7 +46784,7 @@ else
11578 ac_save_LIBS="$LIBS"
11579 LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
11580 cat > conftest.$ac_ext <<EOF
11581 -#line 45413 "configure"
11582 +#line 46788 "configure"
11583 #include "confdefs.h"
11584 /* Override any gcc2 internal prototype to avoid an error. */
11585 /* We use char because int might match the return type of a gcc2
11586 @@ -45420,7 +46795,7 @@ int main() {
11587 bind_textdomain_codeset()
11590 -if { (eval echo configure:45424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11591 +if { (eval echo configure:46799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11593 eval "ac_cv_lib_$ac_lib_var=yes"
11595 @@ -45451,7 +46826,7 @@ fi
11598 echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6
11599 -echo "configure:45455: checking for GNU MP support" >&5
11600 +echo "configure:46830: checking for GNU MP support" >&5
11601 # Check whether --with-gmp or --without-gmp was given.
11602 if test "${with_gmp+set}" = set; then
11603 withval="$with_gmp"
11604 @@ -45599,7 +46974,7 @@ if test "$PHP_GMP" != "no"; then
11607 echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
11608 -echo "configure:45603: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
11609 +echo "configure:46978: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
11610 ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
11611 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11612 echo $ac_n "(cached) $ac_c" 1>&6
11613 @@ -45607,7 +46982,7 @@ else
11614 ac_save_LIBS="$LIBS"
11616 cat > conftest.$ac_ext <<EOF
11617 -#line 45611 "configure"
11618 +#line 46986 "configure"
11619 #include "confdefs.h"
11620 /* Override any gcc2 internal prototype to avoid an error. */
11621 /* We use char because int might match the return type of a gcc2
11622 @@ -45618,7 +46993,7 @@ int main() {
11623 __gmp_randinit_lc_2exp_size()
11626 -if { (eval echo configure:45622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11627 +if { (eval echo configure:46997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11629 eval "ac_cv_lib_$ac_lib_var=yes"
11631 @@ -45743,7 +47118,7 @@ else
11634 echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
11635 -echo "configure:45747: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
11636 +echo "configure:47122: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
11637 ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
11638 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11639 echo $ac_n "(cached) $ac_c" 1>&6
11640 @@ -45751,7 +47126,7 @@ else
11641 ac_save_LIBS="$LIBS"
11643 cat > conftest.$ac_ext <<EOF
11644 -#line 45755 "configure"
11645 +#line 47130 "configure"
11646 #include "confdefs.h"
11647 /* Override any gcc2 internal prototype to avoid an error. */
11648 /* We use char because int might match the return type of a gcc2
11649 @@ -45762,7 +47137,7 @@ int main() {
11650 gmp_randinit_lc_2exp_size()
11653 -if { (eval echo configure:45766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11654 +if { (eval echo configure:47141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11656 eval "ac_cv_lib_$ac_lib_var=yes"
11658 @@ -46234,7 +47609,7 @@ fi
11661 echo $ac_n "checking for mhash support""... $ac_c" 1>&6
11662 -echo "configure:46238: checking for mhash support" >&5
11663 +echo "configure:47613: checking for mhash support" >&5
11664 # Check whether --with-mhash or --without-mhash was given.
11665 if test "${with_mhash+set}" = set; then
11666 withval="$with_mhash"
11667 @@ -46278,7 +47653,7 @@ echo "$ac_t""$ext_output" 1>&6
11668 php_enable_hash=yes
11670 echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6
11671 -echo "configure:46282: checking whether to enable hash support" >&5
11672 +echo "configure:47657: checking whether to enable hash support" >&5
11673 # Check whether --enable-hash or --disable-hash was given.
11674 if test "${enable_hash+set}" = set; then
11675 enableval="$enable_hash"
11676 @@ -46336,7 +47711,7 @@ EOF
11679 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
11680 -echo "configure:46340: checking whether byte ordering is bigendian" >&5
11681 +echo "configure:47715: checking whether byte ordering is bigendian" >&5
11682 if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
11683 echo $ac_n "(cached) $ac_c" 1>&6
11685 @@ -46346,7 +47721,7 @@ else
11686 ac_cv_c_bigendian_php=unknown
11688 cat > conftest.$ac_ext <<EOF
11689 -#line 46350 "configure"
11690 +#line 47725 "configure"
11691 #include "confdefs.h"
11694 @@ -46362,7 +47737,7 @@ int main(void)
11698 -if { (eval echo configure:46366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11699 +if { (eval echo configure:47741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11701 ac_cv_c_bigendian_php=yes
11703 @@ -46387,7 +47762,7 @@ EOF
11706 echo $ac_n "checking size of short""... $ac_c" 1>&6
11707 -echo "configure:46391: checking size of short" >&5
11708 +echo "configure:47766: checking size of short" >&5
11709 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
11710 echo $ac_n "(cached) $ac_c" 1>&6
11712 @@ -46395,7 +47770,7 @@ else
11713 ac_cv_sizeof_short=2
11715 cat > conftest.$ac_ext <<EOF
11716 -#line 46399 "configure"
11717 +#line 47774 "configure"
11718 #include "confdefs.h"
11720 #include <sys/types.h>
11721 @@ -46407,7 +47782,7 @@ main()
11725 -if { (eval echo configure:46411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11726 +if { (eval echo configure:47786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11728 ac_cv_sizeof_short=`cat conftestval`
11730 @@ -46427,7 +47802,7 @@ EOF
11733 echo $ac_n "checking size of int""... $ac_c" 1>&6
11734 -echo "configure:46431: checking size of int" >&5
11735 +echo "configure:47806: checking size of int" >&5
11736 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
11737 echo $ac_n "(cached) $ac_c" 1>&6
11739 @@ -46435,7 +47810,7 @@ else
11742 cat > conftest.$ac_ext <<EOF
11743 -#line 46439 "configure"
11744 +#line 47814 "configure"
11745 #include "confdefs.h"
11747 #include <sys/types.h>
11748 @@ -46447,7 +47822,7 @@ main()
11752 -if { (eval echo configure:46451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11753 +if { (eval echo configure:47826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11755 ac_cv_sizeof_int=`cat conftestval`
11757 @@ -46467,7 +47842,7 @@ EOF
11760 echo $ac_n "checking size of long""... $ac_c" 1>&6
11761 -echo "configure:46471: checking size of long" >&5
11762 +echo "configure:47846: checking size of long" >&5
11763 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
11764 echo $ac_n "(cached) $ac_c" 1>&6
11766 @@ -46475,7 +47850,7 @@ else
11767 ac_cv_sizeof_long=4
11769 cat > conftest.$ac_ext <<EOF
11770 -#line 46479 "configure"
11771 +#line 47854 "configure"
11772 #include "confdefs.h"
11774 #include <sys/types.h>
11775 @@ -46487,7 +47862,7 @@ main()
11779 -if { (eval echo configure:46491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11780 +if { (eval echo configure:47866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11782 ac_cv_sizeof_long=`cat conftestval`
11784 @@ -46507,7 +47882,7 @@ EOF
11787 echo $ac_n "checking size of long long""... $ac_c" 1>&6
11788 -echo "configure:46511: checking size of long long" >&5
11789 +echo "configure:47886: checking size of long long" >&5
11790 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
11791 echo $ac_n "(cached) $ac_c" 1>&6
11793 @@ -46515,7 +47890,7 @@ else
11794 ac_cv_sizeof_long_long=8
11796 cat > conftest.$ac_ext <<EOF
11797 -#line 46519 "configure"
11798 +#line 47894 "configure"
11799 #include "confdefs.h"
11801 #include <sys/types.h>
11802 @@ -46527,7 +47902,7 @@ main()
11806 -if { (eval echo configure:46531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11807 +if { (eval echo configure:47906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11809 ac_cv_sizeof_long_long=`cat conftestval`
11811 @@ -46873,10 +48248,13 @@ fi
11820 echo $ac_n "checking for iconv support""... $ac_c" 1>&6
11821 -echo "configure:46880: checking for iconv support" >&5
11822 +echo "configure:48258: checking for iconv support" >&5
11823 # Check whether --with-iconv or --without-iconv was given.
11824 if test "${with_iconv+set}" = set; then
11825 withval="$with_iconv"
11826 @@ -46937,12 +48315,12 @@ if test "$PHP_ICONV" != "no"; then
11828 if test "$PHP_ICONV" = "yes"; then
11829 echo $ac_n "checking for iconv""... $ac_c" 1>&6
11830 -echo "configure:46941: checking for iconv" >&5
11831 +echo "configure:48319: checking for iconv" >&5
11832 if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
11833 echo $ac_n "(cached) $ac_c" 1>&6
11835 cat > conftest.$ac_ext <<EOF
11836 -#line 46946 "configure"
11837 +#line 48324 "configure"
11838 #include "confdefs.h"
11839 /* System header to define __stub macros and hopefully few prototypes,
11840 which can conflict with char iconv(); below. */
11841 @@ -46965,7 +48343,7 @@ iconv();
11845 -if { (eval echo configure:46969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11846 +if { (eval echo configure:48347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11848 eval "ac_cv_func_iconv=yes"
11850 @@ -46986,12 +48364,12 @@ else
11851 echo "$ac_t""no" 1>&6
11853 echo $ac_n "checking for libiconv""... $ac_c" 1>&6
11854 -echo "configure:46990: checking for libiconv" >&5
11855 +echo "configure:48368: checking for libiconv" >&5
11856 if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
11857 echo $ac_n "(cached) $ac_c" 1>&6
11859 cat > conftest.$ac_ext <<EOF
11860 -#line 46995 "configure"
11861 +#line 48373 "configure"
11862 #include "confdefs.h"
11863 /* System header to define __stub macros and hopefully few prototypes,
11864 which can conflict with char libiconv(); below. */
11865 @@ -47014,7 +48392,7 @@ libiconv();
11869 -if { (eval echo configure:47018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11870 +if { (eval echo configure:48396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11872 eval "ac_cv_func_libiconv=yes"
11874 @@ -47170,7 +48548,7 @@ EOF
11877 echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
11878 -echo "configure:47174: checking for libiconv in -l$iconv_lib_name" >&5
11879 +echo "configure:48552: checking for libiconv in -l$iconv_lib_name" >&5
11880 ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
11881 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11882 echo $ac_n "(cached) $ac_c" 1>&6
11883 @@ -47178,7 +48556,7 @@ else
11884 ac_save_LIBS="$LIBS"
11885 LIBS="-l$iconv_lib_name $LIBS"
11886 cat > conftest.$ac_ext <<EOF
11887 -#line 47182 "configure"
11888 +#line 48560 "configure"
11889 #include "confdefs.h"
11890 /* Override any gcc2 internal prototype to avoid an error. */
11891 /* We use char because int might match the return type of a gcc2
11892 @@ -47189,7 +48567,7 @@ int main() {
11896 -if { (eval echo configure:47193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11897 +if { (eval echo configure:48571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11899 eval "ac_cv_lib_$ac_lib_var=yes"
11901 @@ -47330,7 +48708,7 @@ else
11904 echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
11905 -echo "configure:47334: checking for iconv in -l$iconv_lib_name" >&5
11906 +echo "configure:48712: checking for iconv in -l$iconv_lib_name" >&5
11907 ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
11908 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11909 echo $ac_n "(cached) $ac_c" 1>&6
11910 @@ -47338,7 +48716,7 @@ else
11911 ac_save_LIBS="$LIBS"
11912 LIBS="-l$iconv_lib_name $LIBS"
11913 cat > conftest.$ac_ext <<EOF
11914 -#line 47342 "configure"
11915 +#line 48720 "configure"
11916 #include "confdefs.h"
11917 /* Override any gcc2 internal prototype to avoid an error. */
11918 /* We use char because int might match the return type of a gcc2
11919 @@ -47349,7 +48727,7 @@ int main() {
11923 -if { (eval echo configure:47353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11924 +if { (eval echo configure:48731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11926 eval "ac_cv_lib_$ac_lib_var=yes"
11928 @@ -47560,16 +48938,16 @@ else
11931 echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6
11932 -echo "configure:47564: checking if iconv is glibc's" >&5
11933 +echo "configure:48942: checking if iconv is glibc's" >&5
11934 cat > conftest.$ac_ext <<EOF
11935 -#line 47566 "configure"
11936 +#line 48944 "configure"
11937 #include "confdefs.h"
11938 #include <gnu/libc-version.h>
11940 gnu_get_libc_version();
11943 -if { (eval echo configure:47573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11944 +if { (eval echo configure:48951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11947 echo "$ac_t""yes" 1>&6
11948 @@ -47587,7 +48965,7 @@ rm -f conftest*
11950 if test -z "$iconv_impl_name"; then
11951 echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6
11952 -echo "configure:47591: checking if using GNU libiconv" >&5
11953 +echo "configure:48969: checking if using GNU libiconv" >&5
11954 php_iconv_old_ld="$LDFLAGS"
11955 LDFLAGS="-liconv $LDFLAGS"
11956 if test "$cross_compiling" = yes; then
11957 @@ -47597,7 +48975,7 @@ echo "configure:47591: checking if using
11960 cat > conftest.$ac_ext <<EOF
11961 -#line 47601 "configure"
11962 +#line 48979 "configure"
11963 #include "confdefs.h"
11965 #include <$PHP_ICONV_H_PATH>
11966 @@ -47607,7 +48985,7 @@ int main() {
11970 -if { (eval echo configure:47611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11971 +if { (eval echo configure:48989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
11974 echo "$ac_t""yes" 1>&6
11975 @@ -47629,16 +49007,16 @@ fi
11977 if test -z "$iconv_impl_name"; then
11978 echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6
11979 -echo "configure:47633: checking if iconv is Konstantin Chuguev's" >&5
11980 +echo "configure:49011: checking if iconv is Konstantin Chuguev's" >&5
11981 cat > conftest.$ac_ext <<EOF
11982 -#line 47635 "configure"
11983 +#line 49013 "configure"
11984 #include "confdefs.h"
11987 iconv_ccs_init(NULL, NULL);
11990 -if { (eval echo configure:47642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11991 +if { (eval echo configure:49020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11994 echo "$ac_t""yes" 1>&6
11995 @@ -47657,18 +49035,18 @@ rm -f conftest*
11997 if test -z "$iconv_impl_name"; then
11998 echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6
11999 -echo "configure:47661: checking if using IBM iconv" >&5
12000 +echo "configure:49039: checking if using IBM iconv" >&5
12001 php_iconv_old_ld="$LDFLAGS"
12002 LDFLAGS="-liconv $LDFLAGS"
12003 cat > conftest.$ac_ext <<EOF
12004 -#line 47665 "configure"
12005 +#line 49043 "configure"
12006 #include "confdefs.h"
12012 -if { (eval echo configure:47672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12013 +if { (eval echo configure:49050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12016 echo "$ac_t""yes" 1>&6
12017 @@ -47854,7 +49232,7 @@ EOF
12020 echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
12021 -echo "configure:47858: checking if iconv supports errno" >&5
12022 +echo "configure:49236: checking if iconv supports errno" >&5
12023 if test "$cross_compiling" = yes; then
12025 echo "$ac_t""no" 1>&6
12026 @@ -47868,7 +49246,7 @@ EOF
12029 cat > conftest.$ac_ext <<EOF
12030 -#line 47872 "configure"
12031 +#line 49250 "configure"
12032 #include "confdefs.h"
12034 #include <$PHP_ICONV_H_PATH>
12035 @@ -47889,7 +49267,7 @@ int main() {
12039 -if { (eval echo configure:47893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12040 +if { (eval echo configure:49271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12043 echo "$ac_t""yes" 1>&6
12044 @@ -47921,9 +49299,9 @@ fi
12047 echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6
12048 -echo "configure:47925: checking if your cpp allows macro usage in include lines" >&5
12049 +echo "configure:49303: checking if your cpp allows macro usage in include lines" >&5
12050 cat > conftest.$ac_ext <<EOF
12051 -#line 47927 "configure"
12052 +#line 49305 "configure"
12053 #include "confdefs.h"
12055 #define FOO <$PHP_ICONV_H_PATH>
12056 @@ -47933,7 +49311,7 @@ int main() {
12060 -if { (eval echo configure:47937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12061 +if { (eval echo configure:49315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12064 echo "$ac_t""yes" 1>&6
12065 @@ -48289,7 +49667,7 @@ fi
12068 echo $ac_n "checking for IMAP support""... $ac_c" 1>&6
12069 -echo "configure:48293: checking for IMAP support" >&5
12070 +echo "configure:49671: checking for IMAP support" >&5
12071 # Check whether --with-imap or --without-imap was given.
12072 if test "${with_imap+set}" = set; then
12073 withval="$with_imap"
12074 @@ -48333,7 +49711,7 @@ echo "$ac_t""$ext_output" 1>&6
12075 php_with_kerberos=no
12077 echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6
12078 -echo "configure:48337: checking for IMAP Kerberos support" >&5
12079 +echo "configure:49715: checking for IMAP Kerberos support" >&5
12080 # Check whether --with-kerberos or --without-kerberos was given.
12081 if test "${with_kerberos+set}" = set; then
12082 withval="$with_kerberos"
12083 @@ -48356,7 +49734,7 @@ echo "$ac_t""$ext_output" 1>&6
12084 php_with_imap_ssl=no
12086 echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6
12087 -echo "configure:48360: checking for IMAP SSL support" >&5
12088 +echo "configure:49738: checking for IMAP SSL support" >&5
12089 # Check whether --with-imap-ssl or --without-imap-ssl was given.
12090 if test "${with_imap_ssl+set}" = set; then
12091 withval="$with_imap_ssl"
12092 @@ -48760,7 +50138,7 @@ EOF
12095 cat > conftest.$ac_ext <<EOF
12096 -#line 48764 "configure"
12097 +#line 50142 "configure"
12098 #include "confdefs.h"
12099 #include <$IMAP_INC_DIR/mail.h>
12101 @@ -48780,12 +50158,12 @@ rm -f conftest*
12103 CFLAGS="-I$IMAP_INC_DIR"
12104 echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6
12105 -echo "configure:48784: checking for utf8_mime2text signature" >&5
12106 +echo "configure:50162: checking for utf8_mime2text signature" >&5
12107 if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then
12108 echo $ac_n "(cached) $ac_c" 1>&6
12110 cat > conftest.$ac_ext <<EOF
12111 -#line 48789 "configure"
12112 +#line 50167 "configure"
12113 #include "confdefs.h"
12116 @@ -48798,7 +50176,7 @@ int main() {
12120 -if { (eval echo configure:48802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12121 +if { (eval echo configure:50180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12124 ac_cv_utf8_mime2text=old
12125 @@ -48827,12 +50205,12 @@ EOF
12127 CFLAGS="-I$IMAP_INC_DIR"
12128 echo $ac_n "checking for U8T_DECOMPOSE""... $ac_c" 1>&6
12129 -echo "configure:48831: checking for U8T_DECOMPOSE" >&5
12130 +echo "configure:50209: checking for U8T_DECOMPOSE" >&5
12131 if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then
12132 echo $ac_n "(cached) $ac_c" 1>&6
12134 cat > conftest.$ac_ext <<EOF
12135 -#line 48836 "configure"
12136 +#line 50214 "configure"
12137 #include "confdefs.h"
12139 #include <c-client.h>
12140 @@ -48843,7 +50221,7 @@ int main() {
12144 -if { (eval echo configure:48847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12145 +if { (eval echo configure:50225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12148 ac_cv_u8t_decompose=yes
12149 @@ -48873,7 +50251,7 @@ echo "$ac_t""$ac_cv_u8t_canonical" 1>&6
12150 old_CPPFLAGS=$CPPFLAGS
12151 CPPFLAGS=-I$IMAP_INC_DIR
12152 cat > conftest.$ac_ext <<EOF
12153 -#line 48877 "configure"
12154 +#line 50255 "configure"
12155 #include "confdefs.h"
12157 #include "imap4r1.h"
12158 @@ -48992,7 +50370,7 @@ rm -f conftest*
12161 echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
12162 -echo "configure:48996: checking for pam_start in -lpam" >&5
12163 +echo "configure:50374: checking for pam_start in -lpam" >&5
12164 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
12165 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12166 echo $ac_n "(cached) $ac_c" 1>&6
12167 @@ -49000,7 +50378,7 @@ else
12168 ac_save_LIBS="$LIBS"
12170 cat > conftest.$ac_ext <<EOF
12171 -#line 49004 "configure"
12172 +#line 50382 "configure"
12173 #include "confdefs.h"
12174 /* Override any gcc2 internal prototype to avoid an error. */
12175 /* We use char because int might match the return type of a gcc2
12176 @@ -49011,7 +50389,7 @@ int main() {
12180 -if { (eval echo configure:49015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12181 +if { (eval echo configure:50393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12183 eval "ac_cv_lib_$ac_lib_var=yes"
12185 @@ -49166,7 +50544,7 @@ fi
12188 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
12189 -echo "configure:49170: checking for crypt in -lcrypt" >&5
12190 +echo "configure:50548: checking for crypt in -lcrypt" >&5
12191 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
12192 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12193 echo $ac_n "(cached) $ac_c" 1>&6
12194 @@ -49174,7 +50552,7 @@ else
12195 ac_save_LIBS="$LIBS"
12196 LIBS="-lcrypt $LIBS"
12197 cat > conftest.$ac_ext <<EOF
12198 -#line 49178 "configure"
12199 +#line 50556 "configure"
12200 #include "confdefs.h"
12201 /* Override any gcc2 internal prototype to avoid an error. */
12202 /* We use char because int might match the return type of a gcc2
12203 @@ -49185,7 +50563,7 @@ int main() {
12207 -if { (eval echo configure:49189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12208 +if { (eval echo configure:50567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12210 eval "ac_cv_lib_$ac_lib_var=yes"
12212 @@ -49389,7 +50767,7 @@ fi
12213 # Extract the first word of "krb5-config", so it can be a program name with args.
12214 set dummy krb5-config; ac_word=$2
12215 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
12216 -echo "configure:49393: checking for $ac_word" >&5
12217 +echo "configure:50771: checking for $ac_word" >&5
12218 if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
12219 echo $ac_n "(cached) $ac_c" 1>&6
12221 @@ -49758,7 +51136,7 @@ else
12224 cat > conftest.$ac_ext <<EOF
12225 -#line 49762 "configure"
12226 +#line 51140 "configure"
12227 #include "confdefs.h"
12228 #include <$IMAP_INC_DIR/linkage.h>
12230 @@ -49799,7 +51177,7 @@ rm -f conftest*
12231 # Extract the first word of "pkg-config", so it can be a program name with args.
12232 set dummy pkg-config; ac_word=$2
12233 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
12234 -echo "configure:49803: checking for $ac_word" >&5
12235 +echo "configure:51181: checking for $ac_word" >&5
12236 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
12237 echo $ac_n "(cached) $ac_c" 1>&6
12239 @@ -50004,9 +51382,9 @@ fi
12240 old_CPPFLAGS=$CPPFLAGS
12241 CPPFLAGS=-I$OPENSSL_INCDIR
12242 echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
12243 -echo "configure:50008: checking for OpenSSL version" >&5
12244 +echo "configure:51386: checking for OpenSSL version" >&5
12245 cat > conftest.$ac_ext <<EOF
12246 -#line 50010 "configure"
12247 +#line 51388 "configure"
12248 #include "confdefs.h"
12250 #include <openssl/opensslv.h>
12251 @@ -50161,7 +51539,7 @@ rm -f conftest*
12254 echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
12255 -echo "configure:50165: checking for CRYPTO_free in -lcrypto" >&5
12256 +echo "configure:51543: checking for CRYPTO_free in -lcrypto" >&5
12257 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
12258 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12259 echo $ac_n "(cached) $ac_c" 1>&6
12260 @@ -50169,7 +51547,7 @@ else
12261 ac_save_LIBS="$LIBS"
12262 LIBS="-lcrypto $LIBS"
12263 cat > conftest.$ac_ext <<EOF
12264 -#line 50173 "configure"
12265 +#line 51551 "configure"
12266 #include "confdefs.h"
12267 /* Override any gcc2 internal prototype to avoid an error. */
12268 /* We use char because int might match the return type of a gcc2
12269 @@ -50180,7 +51558,7 @@ int main() {
12273 -if { (eval echo configure:50184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12274 +if { (eval echo configure:51562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12276 eval "ac_cv_lib_$ac_lib_var=yes"
12278 @@ -50337,7 +51715,7 @@ fi
12281 echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
12282 -echo "configure:50341: checking for SSL_CTX_set_ssl_version in -lssl" >&5
12283 +echo "configure:51719: checking for SSL_CTX_set_ssl_version in -lssl" >&5
12284 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
12285 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12286 echo $ac_n "(cached) $ac_c" 1>&6
12287 @@ -50345,7 +51723,7 @@ else
12288 ac_save_LIBS="$LIBS"
12290 cat > conftest.$ac_ext <<EOF
12291 -#line 50349 "configure"
12292 +#line 51727 "configure"
12293 #include "confdefs.h"
12294 /* Override any gcc2 internal prototype to avoid an error. */
12295 /* We use char because int might match the return type of a gcc2
12296 @@ -50356,7 +51734,7 @@ int main() {
12297 SSL_CTX_set_ssl_version()
12300 -if { (eval echo configure:50360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12301 +if { (eval echo configure:51738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12303 eval "ac_cv_lib_$ac_lib_var=yes"
12305 @@ -50498,7 +51876,7 @@ else
12307 elif test -f "$IMAP_INC_DIR/linkage.c"; then
12308 cat > conftest.$ac_ext <<EOF
12309 -#line 50502 "configure"
12310 +#line 51880 "configure"
12311 #include "confdefs.h"
12312 #include <$IMAP_INC_DIR/linkage.c>
12314 @@ -50529,7 +51907,7 @@ rm -f conftest*
12317 cat > conftest.$ac_ext <<EOF
12318 -#line 50533 "configure"
12319 +#line 51911 "configure"
12320 #include "confdefs.h"
12323 @@ -50562,7 +51940,7 @@ else
12327 -if { (eval echo configure:50566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12328 +if { (eval echo configure:51944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12332 @@ -50598,7 +51976,7 @@ fi
12335 cat > conftest.$ac_ext <<EOF
12336 -#line 50602 "configure"
12337 +#line 51980 "configure"
12338 #include "confdefs.h"
12341 @@ -50631,7 +52009,7 @@ else
12345 -if { (eval echo configure:50635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12346 +if { (eval echo configure:52013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12350 @@ -50658,7 +52036,7 @@ fi
12353 echo $ac_n "checking whether rfc822_output_address_list function present""... $ac_c" 1>&6
12354 -echo "configure:50662: checking whether rfc822_output_address_list function present" >&5
12355 +echo "configure:52040: checking whether rfc822_output_address_list function present" >&5
12359 @@ -50670,7 +52048,7 @@ echo "configure:50662: checking whether
12362 cat > conftest.$ac_ext <<EOF
12363 -#line 50674 "configure"
12364 +#line 52052 "configure"
12365 #include "confdefs.h"
12368 @@ -50706,7 +52084,7 @@ else
12372 -if { (eval echo configure:50710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12373 +if { (eval echo configure:52088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12377 @@ -50735,7 +52113,7 @@ fi
12380 echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6
12381 -echo "configure:50739: checking whether build with IMAP works" >&5
12382 +echo "configure:52117: checking whether build with IMAP works" >&5
12386 @@ -50746,7 +52124,7 @@ echo "configure:50739: checking whether
12389 cat > conftest.$ac_ext <<EOF
12390 -#line 50750 "configure"
12391 +#line 52128 "configure"
12392 #include "confdefs.h"
12395 @@ -50779,7 +52157,7 @@ else
12399 -if { (eval echo configure:50783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12400 +if { (eval echo configure:52161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12404 @@ -50811,7 +52189,7 @@ fi
12405 php_with_interbase=no
12407 echo $ac_n "checking for InterBase support""... $ac_c" 1>&6
12408 -echo "configure:50815: checking for InterBase support" >&5
12409 +echo "configure:52193: checking for InterBase support" >&5
12410 # Check whether --with-interbase or --without-interbase was given.
12411 if test "${with_interbase+set}" = set; then
12412 withval="$with_interbase"
12413 @@ -50958,7 +52336,7 @@ if test "$PHP_INTERBASE" != "no"; then
12416 echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
12417 -echo "configure:50962: checking for isc_detach_database in -lfbclient" >&5
12418 +echo "configure:52340: checking for isc_detach_database in -lfbclient" >&5
12419 ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
12420 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12421 echo $ac_n "(cached) $ac_c" 1>&6
12422 @@ -50966,7 +52344,7 @@ else
12423 ac_save_LIBS="$LIBS"
12424 LIBS="-lfbclient $LIBS"
12425 cat > conftest.$ac_ext <<EOF
12426 -#line 50970 "configure"
12427 +#line 52348 "configure"
12428 #include "confdefs.h"
12429 /* Override any gcc2 internal prototype to avoid an error. */
12430 /* We use char because int might match the return type of a gcc2
12431 @@ -50977,7 +52355,7 @@ int main() {
12432 isc_detach_database()
12435 -if { (eval echo configure:50981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12436 +if { (eval echo configure:52359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12438 eval "ac_cv_lib_$ac_lib_var=yes"
12440 @@ -51104,7 +52482,7 @@ else
12443 echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
12444 -echo "configure:51108: checking for isc_detach_database in -lgds" >&5
12445 +echo "configure:52486: checking for isc_detach_database in -lgds" >&5
12446 ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
12447 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12448 echo $ac_n "(cached) $ac_c" 1>&6
12449 @@ -51112,7 +52490,7 @@ else
12450 ac_save_LIBS="$LIBS"
12452 cat > conftest.$ac_ext <<EOF
12453 -#line 51116 "configure"
12454 +#line 52494 "configure"
12455 #include "confdefs.h"
12456 /* Override any gcc2 internal prototype to avoid an error. */
12457 /* We use char because int might match the return type of a gcc2
12458 @@ -51123,7 +52501,7 @@ int main() {
12459 isc_detach_database()
12462 -if { (eval echo configure:51127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12463 +if { (eval echo configure:52505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12465 eval "ac_cv_lib_$ac_lib_var=yes"
12467 @@ -51250,7 +52628,7 @@ else
12470 echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
12471 -echo "configure:51254: checking for isc_detach_database in -lib_util" >&5
12472 +echo "configure:52632: checking for isc_detach_database in -lib_util" >&5
12473 ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
12474 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12475 echo $ac_n "(cached) $ac_c" 1>&6
12476 @@ -51258,7 +52636,7 @@ else
12477 ac_save_LIBS="$LIBS"
12478 LIBS="-lib_util $LIBS"
12479 cat > conftest.$ac_ext <<EOF
12480 -#line 51262 "configure"
12481 +#line 52640 "configure"
12482 #include "confdefs.h"
12483 /* Override any gcc2 internal prototype to avoid an error. */
12484 /* We use char because int might match the return type of a gcc2
12485 @@ -51269,7 +52647,7 @@ int main() {
12486 isc_detach_database()
12489 -if { (eval echo configure:51273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12490 +if { (eval echo configure:52651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12492 eval "ac_cv_lib_$ac_lib_var=yes"
12494 @@ -51746,7 +53124,7 @@ fi
12497 echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6
12498 -echo "configure:51750: checking whether to enable internationalization support" >&5
12499 +echo "configure:53128: checking whether to enable internationalization support" >&5
12500 # Check whether --enable-intl or --disable-intl was given.
12501 if test "${enable_intl+set}" = set; then
12502 enableval="$enable_intl"
12503 @@ -51818,7 +53196,7 @@ ext_output=$PHP_ICU_DIR
12504 # Extract the first word of "icu-config", so it can be a program name with args.
12505 set dummy icu-config; ac_word=$2
12506 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
12507 -echo "configure:51822: checking for $ac_word" >&5
12508 +echo "configure:53200: checking for $ac_word" >&5
12509 if eval "test \"`echo '$''{'ac_cv_path_ICU_CONFIG'+set}'`\" = set"; then
12510 echo $ac_n "(cached) $ac_c" 1>&6
12512 @@ -51856,7 +53234,7 @@ fi
12515 echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6
12516 -echo "configure:51860: checking for location of ICU headers and libraries" >&5
12517 +echo "configure:53238: checking for location of ICU headers and libraries" >&5
12519 icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
12520 if test "$?" != "0" || test -z "$icu_install_prefix"; then
12521 @@ -51866,7 +53244,7 @@ echo "configure:51860: checking for loca
12522 echo "$ac_t""$icu_install_prefix" 1>&6
12524 echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6
12525 -echo "configure:51870: checking for ICU 3.4 or greater" >&5
12526 +echo "configure:53248: checking for ICU 3.4 or greater" >&5
12527 icu_version_full=`$ICU_CONFIG --version`
12530 @@ -52023,7 +53401,7 @@ do
12531 # Extract the first word of "$ac_prog", so it can be a program name with args.
12532 set dummy $ac_prog; ac_word=$2
12533 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
12534 -echo "configure:52027: checking for $ac_word" >&5
12535 +echo "configure:53405: checking for $ac_word" >&5
12536 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
12537 echo $ac_n "(cached) $ac_c" 1>&6
12539 @@ -52055,7 +53433,7 @@ test -n "$CXX" || CXX="gcc"
12542 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
12543 -echo "configure:52059: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
12544 +echo "configure:53437: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
12547 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
12548 @@ -52066,12 +53444,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
12550 cat > conftest.$ac_ext << EOF
12552 -#line 52070 "configure"
12553 +#line 53448 "configure"
12554 #include "confdefs.h"
12556 int main(){return(0);}
12558 -if { (eval echo configure:52075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12559 +if { (eval echo configure:53453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12560 ac_cv_prog_cxx_works=yes
12561 # If we can't run a trivial program, we are probably using a cross compiler.
12562 if (./conftest; exit) 2>/dev/null; then
12563 @@ -52097,12 +53475,12 @@ if test $ac_cv_prog_cxx_works = no; then
12564 { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
12566 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
12567 -echo "configure:52101: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
12568 +echo "configure:53479: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
12569 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
12570 cross_compiling=$ac_cv_prog_cxx_cross
12572 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
12573 -echo "configure:52106: checking whether we are using GNU C++" >&5
12574 +echo "configure:53484: checking whether we are using GNU C++" >&5
12575 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
12576 echo $ac_n "(cached) $ac_c" 1>&6
12578 @@ -52111,7 +53489,7 @@ else
12582 -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:52115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
12583 +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:53493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
12587 @@ -52130,7 +53508,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
12588 ac_save_CXXFLAGS="$CXXFLAGS"
12590 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
12591 -echo "configure:52134: checking whether ${CXX-g++} accepts -g" >&5
12592 +echo "configure:53512: checking whether ${CXX-g++} accepts -g" >&5
12593 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
12594 echo $ac_n "(cached) $ac_c" 1>&6
12596 @@ -52162,7 +53540,7 @@ else
12599 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
12600 -echo "configure:52166: checking how to run the C++ preprocessor" >&5
12601 +echo "configure:53544: checking how to run the C++ preprocessor" >&5
12602 if test -z "$CXXCPP"; then
12603 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
12604 echo $ac_n "(cached) $ac_c" 1>&6
12605 @@ -52175,12 +53553,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee
12606 cross_compiling=$ac_cv_prog_cxx_cross
12607 CXXCPP="${CXX-g++} -E"
12608 cat > conftest.$ac_ext <<EOF
12609 -#line 52179 "configure"
12610 +#line 53557 "configure"
12611 #include "confdefs.h"
12612 #include <stdlib.h>
12614 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
12615 -{ (eval echo configure:52184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12616 +{ (eval echo configure:53562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12617 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
12618 if test -z "$ac_err"; then
12620 @@ -52738,7 +54116,7 @@ fi
12621 php_enable_json=yes
12623 echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6
12624 -echo "configure:52742: checking whether to enable JavaScript Object Serialization support" >&5
12625 +echo "configure:54120: checking whether to enable JavaScript Object Serialization support" >&5
12626 # Check whether --enable-json or --disable-json was given.
12627 if test "${enable_json+set}" = set; then
12628 enableval="$enable_json"
12629 @@ -52784,12 +54162,12 @@ if test "$PHP_JSON" != "no"; then
12632 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
12633 -echo "configure:52788: checking for ANSI C header files" >&5
12634 +echo "configure:54166: checking for ANSI C header files" >&5
12635 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
12636 echo $ac_n "(cached) $ac_c" 1>&6
12638 cat > conftest.$ac_ext <<EOF
12639 -#line 52793 "configure"
12640 +#line 54171 "configure"
12641 #include "confdefs.h"
12642 #include <stdlib.h>
12643 #include <stdarg.h>
12644 @@ -52797,7 +54175,7 @@ else
12647 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
12648 -{ (eval echo configure:52801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12649 +{ (eval echo configure:54179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
12650 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
12651 if test -z "$ac_err"; then
12653 @@ -52814,7 +54192,7 @@ rm -f conftest*
12654 if test $ac_cv_header_stdc = yes; then
12655 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
12656 cat > conftest.$ac_ext <<EOF
12657 -#line 52818 "configure"
12658 +#line 54196 "configure"
12659 #include "confdefs.h"
12660 #include <string.h>
12662 @@ -52832,7 +54210,7 @@ fi
12663 if test $ac_cv_header_stdc = yes; then
12664 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
12665 cat > conftest.$ac_ext <<EOF
12666 -#line 52836 "configure"
12667 +#line 54214 "configure"
12668 #include "confdefs.h"
12669 #include <stdlib.h>
12671 @@ -52853,7 +54231,7 @@ if test "$cross_compiling" = yes; then
12674 cat > conftest.$ac_ext <<EOF
12675 -#line 52857 "configure"
12676 +#line 54235 "configure"
12677 #include "confdefs.h"
12679 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
12680 @@ -52864,7 +54242,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
12684 -if { (eval echo configure:52868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12685 +if { (eval echo configure:54246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
12689 @@ -53214,7 +54592,7 @@ fi
12692 echo $ac_n "checking for LDAP support""... $ac_c" 1>&6
12693 -echo "configure:53218: checking for LDAP support" >&5
12694 +echo "configure:54596: checking for LDAP support" >&5
12695 # Check whether --with-ldap or --without-ldap was given.
12696 if test "${with_ldap+set}" = set; then
12697 withval="$with_ldap"
12698 @@ -53258,7 +54636,7 @@ echo "$ac_t""$ext_output" 1>&6
12699 php_with_ldap_sasl=no
12701 echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6
12702 -echo "configure:53262: checking for LDAP Cyrus SASL support" >&5
12703 +echo "configure:54640: checking for LDAP Cyrus SASL support" >&5
12704 # Check whether --with-ldap-sasl or --without-ldap-sasl was given.
12705 if test "${with_ldap_sasl+set}" = set; then
12706 withval="$with_ldap_sasl"
12707 @@ -55600,19 +56978,19 @@ EOF
12708 LIBS="$LIBS $LDAP_SHARED_LIBADD"
12710 echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6
12711 -echo "configure:55604: checking for 3 arg ldap_set_rebind_proc" >&5
12712 +echo "configure:56982: checking for 3 arg ldap_set_rebind_proc" >&5
12713 if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then
12714 echo $ac_n "(cached) $ac_c" 1>&6
12716 cat > conftest.$ac_ext <<EOF
12717 -#line 55609 "configure"
12718 +#line 56987 "configure"
12719 #include "confdefs.h"
12722 ldap_set_rebind_proc(0,0,0)
12725 -if { (eval echo configure:55616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12726 +if { (eval echo configure:56994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
12728 ac_cv_3arg_setrebindproc=yes
12730 @@ -55635,12 +57013,12 @@ EOF
12731 for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s
12733 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
12734 -echo "configure:55639: checking for $ac_func" >&5
12735 +echo "configure:57017: checking for $ac_func" >&5
12736 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
12737 echo $ac_n "(cached) $ac_c" 1>&6
12739 cat > conftest.$ac_ext <<EOF
12740 -#line 55644 "configure"
12741 +#line 57022 "configure"
12742 #include "confdefs.h"
12743 /* System header to define __stub macros and hopefully few prototypes,
12744 which can conflict with char $ac_func(); below. */
12745 @@ -55663,7 +57041,7 @@ $ac_func();
12749 -if { (eval echo configure:55667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12750 +if { (eval echo configure:57045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12752 eval "ac_cv_func_$ac_func=yes"
12754 @@ -55825,7 +57203,7 @@ EOF
12757 echo $ac_n "checking for sasl_version in -lsasl2""... $ac_c" 1>&6
12758 -echo "configure:55829: checking for sasl_version in -lsasl2" >&5
12759 +echo "configure:57207: checking for sasl_version in -lsasl2" >&5
12760 ac_lib_var=`echo sasl2'_'sasl_version | sed 'y%./+-%__p_%'`
12761 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
12762 echo $ac_n "(cached) $ac_c" 1>&6
12763 @@ -55833,7 +57211,7 @@ else
12764 ac_save_LIBS="$LIBS"
12765 LIBS="-lsasl2 $LIBS"
12766 cat > conftest.$ac_ext <<EOF
12767 -#line 55837 "configure"
12768 +#line 57215 "configure"
12769 #include "confdefs.h"
12770 /* Override any gcc2 internal prototype to avoid an error. */
12771 /* We use char because int might match the return type of a gcc2
12772 @@ -55844,7 +57222,7 @@ int main() {
12776 -if { (eval echo configure:55848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12777 +if { (eval echo configure:57226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12779 eval "ac_cv_lib_$ac_lib_var=yes"
12781 @@ -56013,12 +57391,12 @@ fi
12784 echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6
12785 -echo "configure:56017: checking for ldap_bind_s" >&5
12786 +echo "configure:57395: checking for ldap_bind_s" >&5
12787 if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+set}'`\" = set"; then
12788 echo $ac_n "(cached) $ac_c" 1>&6
12790 cat > conftest.$ac_ext <<EOF
12791 -#line 56022 "configure"
12792 +#line 57400 "configure"
12793 #include "confdefs.h"
12794 /* System header to define __stub macros and hopefully few prototypes,
12795 which can conflict with char ldap_bind_s(); below. */
12796 @@ -56041,7 +57419,7 @@ ldap_bind_s();
12800 -if { (eval echo configure:56045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12801 +if { (eval echo configure:57423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
12803 eval "ac_cv_func_ldap_bind_s=yes"
12805 @@ -56070,39 +57448,18 @@ fi
12809 +php_with_libevent=no
12831 -php_enable_mbstring=no
12833 -echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6
12834 -echo "configure:56098: checking whether to enable multibyte string support" >&5
12835 -# Check whether --enable-mbstring or --disable-mbstring was given.
12836 -if test "${enable_mbstring+set}" = set; then
12837 - enableval="$enable_mbstring"
12838 - PHP_MBSTRING=$enableval
12839 +echo $ac_n "checking for libevent support""... $ac_c" 1>&6
12840 +echo "configure:57455: checking for libevent support" >&5
12841 +# Check whether --with-libevent or --without-libevent was given.
12842 +if test "${with_libevent+set}" = set; then
12843 + withval="$with_libevent"
12844 + PHP_LIBEVENT=$withval
12848 - test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL
12850 + test "$PHP_ENABLE_ALL" && PHP_LIBEVENT=$PHP_ENABLE_ALL
12854 @@ -56110,12 +57467,12 @@ fi
12856 ext_output="yes, shared"
12858 -case $PHP_MBSTRING in
12859 +case $PHP_LIBEVENT in
12861 - PHP_MBSTRING=`echo "$PHP_MBSTRING"|$SED 's/^shared,//'`
12862 + PHP_LIBEVENT=`echo "$PHP_LIBEVENT"|$SED 's/^shared,//'`
12870 @@ -56134,723 +57491,881 @@ echo "$ac_t""$ext_output" 1>&6
12874 +if test "$PHP_LIBEVENT" != "no"; then
12875 + SEARCH_PATH="/usr /usr/local"
12876 + SEARCH_FOR="/include/event.h"
12878 + if test "$PHP_LIBEVENT" = "yes"; then
12879 + echo $ac_n "checking for libevent headers in default path""... $ac_c" 1>&6
12880 +echo "configure:57501: checking for libevent headers in default path" >&5
12881 + for i in $SEARCH_PATH ; do
12882 + if test -r $i/$SEARCH_FOR; then
12884 + echo "$ac_t""found in $i" 1>&6
12888 + echo $ac_n "checking for libevent headers in $PHP_LIBEVENT""... $ac_c" 1>&6
12889 +echo "configure:57510: checking for libevent headers in $PHP_LIBEVENT" >&5
12890 + if test -r $PHP_LIBEVENT/$SEARCH_FOR; then
12891 + LIBEVENT_DIR=$PHP_LIBEVENT
12892 + echo "$ac_t""found" 1>&6
12896 -php_enable_mbregex=yes
12897 + if test -z "$LIBEVENT_DIR"; then
12898 + echo "$ac_t""not found" 1>&6
12899 + { echo "configure: error: Cannot find libevent headers" 1>&2; exit 1; }
12902 -echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6
12903 -echo "configure:56142: checking whether to enable multibyte regex support" >&5
12904 -# Check whether --enable-mbregex or --disable-mbregex was given.
12905 -if test "${enable_mbregex+set}" = set; then
12906 - enableval="$enable_mbregex"
12907 - PHP_MBREGEX=$enableval
12916 -ext_output=$PHP_MBREGEX
12917 -echo "$ac_t""$ext_output" 1>&6
12923 -php_enable_mbregex_backtrack=yes
12924 + if test "$LIBEVENT_DIR/include" != "/usr/include"; then
12926 + if test -z "$LIBEVENT_DIR/include" || echo "$LIBEVENT_DIR/include" | grep '^/' >/dev/null ; then
12927 + ai_p=$LIBEVENT_DIR/include
12930 + ep_dir="`echo $LIBEVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
12932 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
12933 + ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/include\"`"
12936 -echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6
12937 -echo "configure:56165: checking whether to check multibyte regex backtrack" >&5
12938 -# Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given.
12939 -if test "${enable_mbregex_backtrack+set}" = set; then
12940 - enableval="$enable_mbregex_backtrack"
12941 - PHP_MBREGEX_BACKTRACK=$enableval
12945 - PHP_MBREGEX_BACKTRACK=yes
12946 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
12948 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
12949 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
12950 + eval "INCLUDEPATH$unique=set"
12953 + INCLUDES="-I$ai_p $INCLUDES"
12955 + INCLUDES="$INCLUDES -I$ai_p"
12963 -ext_output=$PHP_MBREGEX_BACKTRACK
12964 -echo "$ac_t""$ext_output" 1>&6
12971 + LIBSYMBOL=event_base_new
12973 -php_with_libmbfl=no
12974 + if test "x$PHP_LIBDIR" = "x"; then
12978 -echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6
12979 -echo "configure:56188: checking for external libmbfl" >&5
12980 -# Check whether --with-libmbfl or --without-libmbfl was given.
12981 -if test "${with_libmbfl+set}" = set; then
12982 - withval="$with_libmbfl"
12983 - PHP_LIBMBFL=$withval
12987 + save_old_LDFLAGS=$LDFLAGS
12989 + -L$LIBEVENT_DIR/$PHP_LIBDIR
12992 + save_ext_shared=$ext_shared
12995 + for ac_i in $ac_stuff; do
12998 + if test "$ext_shared" = "yes"; then
12999 + LDFLAGS="$LDFLAGS -pthread"
13003 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
13005 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
13006 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
13007 + eval "EXTRA_LDFLAGS$unique=set"
13008 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
13014 -ext_output=$PHP_LIBMBFL
13015 -echo "$ac_t""$ext_output" 1>&6
13020 + ac_ii=`echo $ac_i|cut -c 3-`
13024 + c|c_r|pthread*) ;;
13026 + if test "$ext_shared" = "yes"; then
13027 + LDFLAGS="$LDFLAGS -l$ac_ii"
13032 + c|c_r|pthread*) ;;
13034 + LIBS="$LIBS -l$ac_ii"
13047 + ac_ii=`echo $ac_i|cut -c 3-`
13049 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
13051 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
13055 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
13057 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
13058 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
13061 -echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6
13062 -echo "configure:56211: checking for external oniguruma" >&5
13063 -# Check whether --with-onig or --without-onig was given.
13064 -if test "${with_onig+set}" = set; then
13065 - withval="$with_onig"
13066 - PHP_ONIG=$withval
13069 + if test "$ext_shared" = "yes"; then
13070 + LDFLAGS="-L$ai_p $LDFLAGS"
13071 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
13081 -ext_output=$PHP_ONIG
13082 -echo "$ac_t""$ext_output" 1>&6
13083 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
13085 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
13086 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
13087 + eval "LIBPATH$unique=set"
13089 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
13090 + LDFLAGS="$LDFLAGS -L$ai_p"
13091 + PHP_RPATHS="$PHP_RPATHS $ai_p"
13104 -if test "$PHP_MBSTRING" != "no"; then
13105 - cat >> confdefs.h <<\EOF
13106 -#define HAVE_MBSTRING 1
13111 - PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c"
13114 - if test "$PHP_MBREGEX" != "no"; then
13116 - if test "$PHP_MBREGEX" = "yes"; then
13117 - if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then
13118 - if test "$PHP_MBREGEX_BACKTRACK" != "no"; then
13119 - cat >> confdefs.h <<\EOF
13120 -#define USE_COMBINATION_EXPLOSION_CHECK 1
13125 - echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
13126 -echo "configure:56252: checking for variable length prototypes and stdarg.h" >&5
13127 -if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then
13128 + echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
13129 +echo "configure:57659: checking for $LIBSYMBOL in -l$LIBNAME" >&5
13130 +ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'`
13131 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
13132 echo $ac_n "(cached) $ac_c" 1>&6
13135 - if test "$cross_compiling" = yes; then
13137 - case $host_alias in
13139 - php_cv_mbstring_stdarg=yes
13142 - php_cv_mbstring_stdarg=no
13147 - cat > conftest.$ac_ext <<EOF
13148 -#line 56270 "configure"
13149 + ac_save_LIBS="$LIBS"
13150 +LIBS="-l$LIBNAME $LIBS"
13151 +cat > conftest.$ac_ext <<EOF
13152 +#line 57667 "configure"
13153 #include "confdefs.h"
13154 +/* Override any gcc2 internal prototype to avoid an error. */
13155 +/* We use char because int might match the return type of a gcc2
13156 + builtin and then its argument prototype would still apply. */
13157 +char $LIBSYMBOL();
13159 -#include <stdarg.h>
13160 -int foo(int x, ...) {
13164 - va_arg(va, char *);
13165 - va_arg(va, double);
13168 -int main() { return foo(10, "", 3.14); }
13171 -if { (eval echo configure:56285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13173 - php_cv_mbstring_stdarg=yes
13175 - echo "configure: failed program was:" >&5
13176 - cat conftest.$ac_ext >&5
13178 - php_cv_mbstring_stdarg=no
13186 -echo "$ac_t""$php_cv_mbstring_stdarg" 1>&6
13188 - for ac_hdr in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h
13190 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
13191 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
13192 -echo "configure:56306: checking for $ac_hdr" >&5
13193 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
13194 - echo $ac_n "(cached) $ac_c" 1>&6
13196 - cat > conftest.$ac_ext <<EOF
13197 -#line 56311 "configure"
13198 -#include "confdefs.h"
13199 -#include <$ac_hdr>
13204 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
13205 -{ (eval echo configure:56316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
13206 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
13207 -if test -z "$ac_err"; then
13208 +if { (eval echo configure:57678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13210 - eval "ac_cv_header_$ac_safe=yes"
13211 + eval "ac_cv_lib_$ac_lib_var=yes"
13213 - echo "$ac_err" >&5
13214 echo "configure: failed program was:" >&5
13215 cat conftest.$ac_ext >&5
13217 - eval "ac_cv_header_$ac_safe=no"
13218 + eval "ac_cv_lib_$ac_lib_var=no"
13222 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
13223 - echo "$ac_t""yes" 1>&6
13224 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
13225 - cat >> confdefs.h <<EOF
13226 -#define $ac_tr_hdr 1
13230 - echo "$ac_t""no" 1>&6
13233 +LIBS="$ac_save_LIBS"
13235 - echo $ac_n "checking size of int""... $ac_c" 1>&6
13236 -echo "configure:56343: checking size of int" >&5
13237 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
13238 - echo $ac_n "(cached) $ac_c" 1>&6
13240 - if test "$cross_compiling" = yes; then
13241 - ac_cv_sizeof_int=4
13243 - cat > conftest.$ac_ext <<EOF
13244 -#line 56351 "configure"
13245 -#include "confdefs.h"
13246 -#include <stdio.h>
13247 -#include <sys/types.h>
13250 - FILE *f=fopen("conftestval", "w");
13252 - fprintf(f, "%d\n", sizeof(int));
13256 -if { (eval echo configure:56363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13258 - ac_cv_sizeof_int=`cat conftestval`
13260 - echo "configure: failed program was:" >&5
13261 - cat conftest.$ac_ext >&5
13263 - ac_cv_sizeof_int=0
13267 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
13268 + echo "$ac_t""yes" 1>&6
13270 + LDFLAGS=$save_old_LDFLAGS
13271 + ext_shared=$save_ext_shared
13276 -echo "$ac_t""$ac_cv_sizeof_int" 1>&6
13277 -cat >> confdefs.h <<EOF
13278 -#define SIZEOF_INT $ac_cv_sizeof_int
13280 + if test "$ext_shared" = "yes"; then
13281 + LIBEVENT_SHARED_LIBADD="-l$LIBNAME $LIBEVENT_SHARED_LIBADD"
13282 + if test -n "$LIBEVENT_DIR/$PHP_LIBDIR"; then
13284 + if test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
13286 + if test -z "$LIBEVENT_DIR/$PHP_LIBDIR" || echo "$LIBEVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
13287 + ai_p=$LIBEVENT_DIR/$PHP_LIBDIR
13290 + ep_dir="`echo $LIBEVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
13292 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
13293 + ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/$PHP_LIBDIR\"`"
13297 + if test "$ext_shared" = "yes"; then
13298 + LIBEVENT_SHARED_LIBADD="-L$ai_p $LIBEVENT_SHARED_LIBADD"
13299 + test -n "$ld_runpath_switch" && LIBEVENT_SHARED_LIBADD="$ld_runpath_switch$ai_p $LIBEVENT_SHARED_LIBADD"
13304 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
13306 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
13307 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
13308 + eval "LIBPATH$unique=set"
13310 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
13311 + LDFLAGS="$LDFLAGS -L$ai_p"
13312 + PHP_RPATHS="$PHP_RPATHS $ai_p"
13316 - echo $ac_n "checking size of short""... $ac_c" 1>&6
13317 -echo "configure:56383: checking size of short" >&5
13318 -if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
13319 - echo $ac_n "(cached) $ac_c" 1>&6
13321 - if test "$cross_compiling" = yes; then
13322 - ac_cv_sizeof_short=2
13324 - cat > conftest.$ac_ext <<EOF
13325 -#line 56391 "configure"
13326 -#include "confdefs.h"
13327 -#include <stdio.h>
13328 -#include <sys/types.h>
13331 - FILE *f=fopen("conftestval", "w");
13333 - fprintf(f, "%d\n", sizeof(short));
13337 -if { (eval echo configure:56403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13339 - ac_cv_sizeof_short=`cat conftestval`
13341 - echo "configure: failed program was:" >&5
13342 - cat conftest.$ac_ext >&5
13344 - ac_cv_sizeof_short=0
13350 -echo "$ac_t""$ac_cv_sizeof_short" 1>&6
13351 -cat >> confdefs.h <<EOF
13352 -#define SIZEOF_SHORT $ac_cv_sizeof_short
13362 - echo $ac_n "checking size of long""... $ac_c" 1>&6
13363 -echo "configure:56423: checking size of long" >&5
13364 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
13365 - echo $ac_n "(cached) $ac_c" 1>&6
13367 - if test "$cross_compiling" = yes; then
13368 - ac_cv_sizeof_long=4
13370 - cat > conftest.$ac_ext <<EOF
13371 -#line 56431 "configure"
13372 -#include "confdefs.h"
13373 -#include <stdio.h>
13374 -#include <sys/types.h>
13377 - FILE *f=fopen("conftestval", "w");
13379 - fprintf(f, "%d\n", sizeof(long));
13383 -if { (eval echo configure:56443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
13385 - ac_cv_sizeof_long=`cat conftestval`
13387 - echo "configure: failed program was:" >&5
13388 - cat conftest.$ac_ext >&5
13390 - ac_cv_sizeof_long=0
13394 + if test -n "$LIBEVENT_DIR/$PHP_LIBDIR"; then
13396 + if test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
13398 + if test -z "$LIBEVENT_DIR/$PHP_LIBDIR" || echo "$LIBEVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
13399 + ai_p=$LIBEVENT_DIR/$PHP_LIBDIR
13402 + ep_dir="`echo $LIBEVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
13404 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
13405 + ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/$PHP_LIBDIR\"`"
13409 -echo "$ac_t""$ac_cv_sizeof_long" 1>&6
13410 -cat >> confdefs.h <<EOF
13411 -#define SIZEOF_LONG $ac_cv_sizeof_long
13417 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
13419 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
13420 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
13421 + eval "LIBPATH$unique=set"
13423 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
13424 + LDFLAGS="$LDFLAGS -L$ai_p"
13425 + PHP_RPATHS="$PHP_RPATHS $ai_p"
13430 - echo $ac_n "checking for working const""... $ac_c" 1>&6
13431 -echo "configure:56463: checking for working const" >&5
13432 -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
13433 - echo $ac_n "(cached) $ac_c" 1>&6
13435 - cat > conftest.$ac_ext <<EOF
13436 -#line 56468 "configure"
13437 -#include "confdefs.h"
13446 + c|c_r|pthread*) ;;
13448 + LIBS="-l$LIBNAME $LIBS"
13452 -/* Ultrix mips cc rejects this. */
13453 -typedef int charset[2]; const charset x;
13454 -/* SunOS 4.1.1 cc rejects this. */
13455 -char const *const *ccp;
13457 -/* NEC SVR4.0.2 mips cc rejects this. */
13458 -struct point {int x, y;};
13459 -static struct point const zero = {0,0};
13460 -/* AIX XL C 1.02.0.0 rejects this.
13461 - It does not let you subtract one const X* pointer from another in an arm
13462 - of an if-expression whose if-part is not a constant expression */
13463 -const char *g = "string";
13464 -ccp = &g + (g ? g-g : 0);
13465 -/* HPUX 7.0 cc rejects these. */
13468 -ccp = (char const *const *) p;
13469 -{ /* SCO 3.2v4 cc rejects this. */
13471 - char const *s = 0 ? (char *) 0 : (char const *) 0;
13475 -{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
13476 - int x[] = {25, 17};
13477 - const int *foo = &x[0];
13480 -{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
13481 - typedef const int *iptr;
13485 -{ /* AIX XL C 1.02.0.0 rejects this saying
13486 - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
13487 - struct s { int j; const int *ap[3]; };
13488 - struct s *b; b->j = 5;
13490 -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
13491 - const int foo = 10;
13496 -if { (eval echo configure:56517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13498 - ac_cv_c_const=yes
13500 - echo "configure: failed program was:" >&5
13501 - cat conftest.$ac_ext >&5
13508 -echo "$ac_t""$ac_cv_c_const" 1>&6
13509 -if test $ac_cv_c_const = no; then
13510 - cat >> confdefs.h <<\EOF
13517 - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
13518 -echo "configure:56538: checking whether time.h and sys/time.h may both be included" >&5
13519 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
13520 - echo $ac_n "(cached) $ac_c" 1>&6
13522 - cat > conftest.$ac_ext <<EOF
13523 -#line 56543 "configure"
13524 -#include "confdefs.h"
13525 -#include <sys/types.h>
13526 -#include <sys/time.h>
13532 -if { (eval echo configure:56552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
13534 - ac_cv_header_time=yes
13538 - echo "configure: failed program was:" >&5
13539 - cat conftest.$ac_ext >&5
13541 - ac_cv_header_time=no
13546 -echo "$ac_t""$ac_cv_header_time" 1>&6
13547 -if test $ac_cv_header_time = yes; then
13548 - cat >> confdefs.h <<\EOF
13549 -#define TIME_WITH_SYS_TIME 1
13551 + echo "$ac_t""no" 1>&6
13555 - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
13556 -# for constant arguments. Useless!
13557 -echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
13558 -echo "configure:56575: checking for working alloca.h" >&5
13559 -if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
13560 - echo $ac_n "(cached) $ac_c" 1>&6
13562 - cat > conftest.$ac_ext <<EOF
13563 -#line 56580 "configure"
13564 -#include "confdefs.h"
13565 -#include <alloca.h>
13567 -char *p = alloca(2 * sizeof(int));
13570 -if { (eval echo configure:56587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13572 - ac_cv_header_alloca_h=yes
13574 - echo "configure: failed program was:" >&5
13575 - cat conftest.$ac_ext >&5
13577 - ac_cv_header_alloca_h=no
13580 + LDFLAGS=$save_old_LDFLAGS
13581 + ext_shared=$save_ext_shared
13582 + unset ac_cv_lib_$LIBNAME_$LIBSYMBOL
13584 + { echo "configure: error: wrong libevent version {1.4.+ is required} or lib not found" 1>&2; exit 1; }
13589 -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
13590 -if test $ac_cv_header_alloca_h = yes; then
13591 - cat >> confdefs.h <<\EOF
13592 -#define HAVE_ALLOCA_H 1
13597 + am_i_shared=$PHP_LIBEVENT_SHARED
13598 + is_it_shared=$PHP_SOCKETS_SHARED
13599 + is_it_enabled=$PHP_SOCKETS
13600 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
13601 + { echo "configure: error:
13602 +You've configured extension libevent to build statically, but it
13603 +depends on extension sockets, which you've configured to build shared.
13604 +You either need to build libevent shared or build sockets statically for the
13605 +build to be successful.
13608 + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
13609 + { echo "configure: error:
13610 +You've configured extension libevent, which depends on extension sockets,
13611 +but you've either not enabled sockets, or have disabled it.
13616 + PHP_VAR_SUBST="$PHP_VAR_SUBST LIBEVENT_SHARED_LIBADD"
13618 -echo $ac_n "checking for alloca""... $ac_c" 1>&6
13619 -echo "configure:56608: checking for alloca" >&5
13620 -if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
13621 - echo $ac_n "(cached) $ac_c" 1>&6
13623 - cat > conftest.$ac_ext <<EOF
13624 -#line 56613 "configure"
13625 -#include "confdefs.h"
13627 + ext_builddir=ext/libevent
13628 + ext_srcdir=$abs_srcdir/ext/libevent
13631 -# define alloca __builtin_alloca
13634 -# include <malloc.h>
13635 -# define alloca _alloca
13637 -# if HAVE_ALLOCA_H
13638 -# include <alloca.h>
13643 -# ifndef alloca /* predefined by HP cc +Olibcalls */
13653 -char *p = (char *) alloca(1);
13656 -if { (eval echo configure:56641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13658 - ac_cv_func_alloca_works=yes
13660 - echo "configure: failed program was:" >&5
13661 - cat conftest.$ac_ext >&5
13663 - ac_cv_func_alloca_works=no
13667 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
13668 + PHP_LIBEVENT_SHARED=no
13671 + case ext/libevent in
13672 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
13673 + /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
13674 + *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
13679 -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
13680 -if test $ac_cv_func_alloca_works = yes; then
13681 - cat >> confdefs.h <<\EOF
13682 -#define HAVE_ALLOCA 1
13684 + b_c_pre=$php_c_pre
13685 + b_cxx_pre=$php_cxx_pre
13686 + b_c_meta=$php_c_meta
13687 + b_cxx_meta=$php_cxx_meta
13688 + b_c_post=$php_c_post
13689 + b_cxx_post=$php_cxx_post
13694 -if test $ac_cv_func_alloca_works = no; then
13695 - # The SVR3 libPW and SVR4 libucb both contain incompatible functions
13696 - # that cause trouble. Some versions do not even contain alloca or
13697 - # contain a buggy version. If you still want to use their alloca,
13698 - # use ar to extract alloca.o from them instead of compiling alloca.c.
13699 - ALLOCA=alloca.${ac_objext}
13700 - cat >> confdefs.h <<\EOF
13701 -#define C_ALLOCA 1
13704 + for ac_src in libevent.c; do
13711 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
13714 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13715 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13716 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13717 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
13720 -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
13721 -echo "configure:56673: checking whether alloca needs Cray hooks" >&5
13722 -if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
13723 - echo $ac_n "(cached) $ac_c" 1>&6
13725 - cat > conftest.$ac_ext <<EOF
13726 -#line 56678 "configure"
13727 -#include "confdefs.h"
13728 -#if defined(CRAY) && ! defined(CRAY2)
13733 + cat >>Makefile.objects<<EOF
13734 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
13740 + EXT_STATIC="$EXT_STATIC libevent"
13741 + if test "$ext_shared" != "nocli"; then
13742 + EXT_CLI_STATIC="$EXT_CLI_STATIC libevent"
13745 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
13746 + PHP_LIBEVENT_SHARED=yes
13748 + case ext/libevent in
13749 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
13750 + /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
13751 + *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
13756 + b_c_pre=$shared_c_pre
13757 + b_cxx_pre=$shared_cxx_pre
13758 + b_c_meta=$shared_c_meta
13759 + b_cxx_meta=$shared_cxx_meta
13760 + b_c_post=$shared_c_post
13761 + b_cxx_post=$shared_cxx_post
13766 + for ac_src in libevent.c; do
13773 + shared_objects_libevent="$shared_objects_libevent $ac_bdir$ac_obj.lo"
13776 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13777 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13778 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13779 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
13782 + cat >>Makefile.objects<<EOF
13783 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
13786 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
13787 - egrep "webecray" >/dev/null 2>&1; then
13789 - ac_cv_os_cray=yes
13798 + case $host_alias in
13801 + install_modules="install-modules"
13803 -echo "$ac_t""$ac_cv_os_cray" 1>&6
13804 -if test $ac_cv_os_cray = yes; then
13805 -for ac_func in _getb67 GETB67 getb67; do
13806 - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
13807 -echo "configure:56703: checking for $ac_func" >&5
13808 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
13809 - echo $ac_n "(cached) $ac_c" 1>&6
13811 - cat > conftest.$ac_ext <<EOF
13812 -#line 56708 "configure"
13813 -#include "confdefs.h"
13814 -/* System header to define __stub macros and hopefully few prototypes,
13815 - which can conflict with char $ac_func(); below. */
13816 -#include <assert.h>
13817 -/* Override any gcc2 internal prototype to avoid an error. */
13818 -/* We use char because int might match the return type of a gcc2
13819 - builtin and then its argument prototype would still apply. */
13821 + case $host_alias in
13824 + 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'
13828 + link_cmd='$(LIBTOOL) --mode=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)'
13832 + link_cmd='$(LIBTOOL) --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)'
13837 + if test "x" = "xyes"; then
13838 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phplibevent.$suffix"
13840 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phplibevent.$suffix"
13843 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libevent"
13845 -/* The GNU C library defines this for functions which it implements
13846 - to always fail with ENOSYS. Some functions are actually named
13847 - something starting with __ and the normal name is an alias. */
13848 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
13853 + cat >>Makefile.objects<<EOF
13854 +\$(phplibdir)/phplibevent.$suffix: $ext_builddir/phplibevent.$suffix
13855 + \$(LIBTOOL) --mode=install cp $ext_builddir/phplibevent.$suffix \$(phplibdir)
13857 +$ext_builddir/phplibevent.$suffix: \$(shared_objects_libevent) \$(PHPLIBEVENT_SHARED_DEPENDENCIES)
13862 -if { (eval echo configure:56731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
13864 - eval "ac_cv_func_$ac_func=yes"
13866 - echo "configure: failed program was:" >&5
13867 - cat conftest.$ac_ext >&5
13869 - eval "ac_cv_func_$ac_func=no"
13874 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
13875 - echo "$ac_t""yes" 1>&6
13876 - cat >> confdefs.h <<EOF
13877 -#define CRAY_STACKSEG_END $ac_func
13881 + install_modules="install-modules"
13883 + case $host_alias in
13886 + 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'
13890 + link_cmd='$(LIBTOOL) --mode=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)'
13894 + link_cmd='$(LIBTOOL) --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)'
13898 + if test "x" = "xyes"; then
13899 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/libevent.$suffix"
13901 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/libevent.$suffix"
13904 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libevent"
13906 + cat >>Makefile.objects<<EOF
13907 +\$(phplibdir)/libevent.$suffix: $ext_builddir/libevent.$suffix
13908 + \$(LIBTOOL) --mode=install cp $ext_builddir/libevent.$suffix \$(phplibdir)
13910 +$ext_builddir/libevent.$suffix: \$(shared_objects_libevent) \$(LIBEVENT_SHARED_DEPENDENCIES)
13917 - echo "$ac_t""no" 1>&6
13921 + cat >> confdefs.h <<EOF
13922 +#define COMPILE_DL_LIBEVENT 1
13928 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
13929 + PHP_LIBEVENT_SHARED=no
13930 + case "$PHP_SAPI" in
13934 + case ext/libevent in
13935 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
13936 + /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
13937 + *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
13942 + b_c_pre=$php_c_pre
13943 + b_cxx_pre=$php_cxx_pre
13944 + b_c_meta=$php_c_meta
13945 + b_cxx_meta=$php_cxx_meta
13946 + b_c_post=$php_c_post
13947 + b_cxx_post=$php_cxx_post
13952 + for ac_src in libevent.c; do
13959 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
13962 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13963 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13964 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
13965 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
13968 + cat >>Makefile.objects<<EOF
13969 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
13975 + EXT_STATIC="$EXT_STATIC libevent"
13980 + case ext/libevent in
13981 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
13982 + /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
13983 + *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
13988 + b_c_pre=$php_c_pre
13989 + b_cxx_pre=$php_cxx_pre
13990 + b_c_meta=$php_c_meta
13991 + b_cxx_meta=$php_cxx_meta
13992 + b_c_post=$php_c_post
13993 + b_cxx_post=$php_cxx_post
13998 + for ac_src in libevent.c; do
14005 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
14008 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
14009 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
14010 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
14011 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
14014 + cat >>Makefile.objects<<EOF
14015 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
14023 + EXT_CLI_STATIC="$EXT_CLI_STATIC libevent"
14027 + BUILD_DIR="$BUILD_DIR $ext_builddir"
14031 + if test "$ext_builddir" = "."; then
14032 + PHP_PECL_EXTENSION=libevent
14034 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
14041 -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
14042 -echo "configure:56758: checking stack direction for C alloca" >&5
14043 -if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
14044 - echo $ac_n "(cached) $ac_c" 1>&6
14068 +php_enable_mbstring=no
14070 +echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6
14071 +echo "configure:58151: checking whether to enable multibyte string support" >&5
14072 +# Check whether --enable-mbstring or --disable-mbstring was given.
14073 +if test "${enable_mbstring+set}" = set; then
14074 + enableval="$enable_mbstring"
14075 + PHP_MBSTRING=$enableval
14077 - if test "$cross_compiling" = yes; then
14078 - ac_cv_c_stack_direction=0
14081 + test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL
14087 +ext_output="yes, shared"
14089 +case $PHP_MBSTRING in
14091 + PHP_MBSTRING=`echo "$PHP_MBSTRING"|$SED 's/^shared,//'`
14108 +echo "$ac_t""$ext_output" 1>&6
14114 +php_enable_mbregex=yes
14116 +echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6
14117 +echo "configure:58195: checking whether to enable multibyte regex support" >&5
14118 +# Check whether --enable-mbregex or --disable-mbregex was given.
14119 +if test "${enable_mbregex+set}" = set; then
14120 + enableval="$enable_mbregex"
14121 + PHP_MBREGEX=$enableval
14123 - cat > conftest.$ac_ext <<EOF
14124 -#line 56766 "configure"
14125 -#include "confdefs.h"
14126 -find_stack_direction ()
14128 - static char *addr = 0;
14133 - return find_stack_direction ();
14136 - return (&dummy > addr) ? 1 : -1;
14140 - exit (find_stack_direction() < 0);
14143 -if { (eval echo configure:56785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14145 - ac_cv_c_stack_direction=1
14153 +ext_output=$PHP_MBREGEX
14154 +echo "$ac_t""$ext_output" 1>&6
14160 +php_enable_mbregex_backtrack=yes
14162 +echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6
14163 +echo "configure:58218: checking whether to check multibyte regex backtrack" >&5
14164 +# Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given.
14165 +if test "${enable_mbregex_backtrack+set}" = set; then
14166 + enableval="$enable_mbregex_backtrack"
14167 + PHP_MBREGEX_BACKTRACK=$enableval
14169 - echo "configure: failed program was:" >&5
14170 - cat conftest.$ac_ext >&5
14172 - ac_cv_c_stack_direction=-1
14174 + PHP_MBREGEX_BACKTRACK=yes
14181 +ext_output=$PHP_MBREGEX_BACKTRACK
14182 +echo "$ac_t""$ext_output" 1>&6
14188 +php_with_libmbfl=no
14190 +echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6
14191 +echo "configure:58241: checking for external libmbfl" >&5
14192 +# Check whether --with-libmbfl or --without-libmbfl was given.
14193 +if test "${with_libmbfl+set}" = set; then
14194 + withval="$with_libmbfl"
14195 + PHP_LIBMBFL=$withval
14204 +ext_output=$PHP_LIBMBFL
14205 +echo "$ac_t""$ext_output" 1>&6
14213 +echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6
14214 +echo "configure:58264: checking for external oniguruma" >&5
14215 +# Check whether --with-onig or --without-onig was given.
14216 +if test "${with_onig+set}" = set; then
14217 + withval="$with_onig"
14218 + PHP_ONIG=$withval
14226 -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
14227 -cat >> confdefs.h <<EOF
14228 -#define STACK_DIRECTION $ac_cv_c_stack_direction
14230 +ext_output=$PHP_ONIG
14231 +echo "$ac_t""$ext_output" 1>&6
14236 +if test "$PHP_MBSTRING" != "no"; then
14237 + cat >> confdefs.h <<\EOF
14238 +#define HAVE_MBSTRING 1
14243 - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
14244 -echo "configure:56807: checking for 8-bit clean memcmp" >&5
14245 -if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
14247 + PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c"
14250 + if test "$PHP_MBREGEX" != "no"; then
14252 + if test "$PHP_MBREGEX" = "yes"; then
14253 + if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then
14254 + if test "$PHP_MBREGEX_BACKTRACK" != "no"; then
14255 + cat >> confdefs.h <<\EOF
14256 +#define USE_COMBINATION_EXPLOSION_CHECK 1
14261 + echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
14262 +echo "configure:58305: checking for variable length prototypes and stdarg.h" >&5
14263 +if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then
14264 echo $ac_n "(cached) $ac_c" 1>&6
14266 - if test "$cross_compiling" = yes; then
14267 - ac_cv_func_memcmp_clean=no
14269 + if test "$cross_compiling" = yes; then
14271 + case $host_alias in
14273 + php_cv_mbstring_stdarg=yes
14276 + php_cv_mbstring_stdarg=no
14281 cat > conftest.$ac_ext <<EOF
14282 -#line 56815 "configure"
14283 +#line 58323 "configure"
14284 #include "confdefs.h"
14288 - char c0 = 0x40, c1 = 0x80, c2 = 0x81;
14289 - exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
14290 +#include <stdarg.h>
14291 +int foo(int x, ...) {
14295 + va_arg(va, char *);
14296 + va_arg(va, double);
14300 +int main() { return foo(10, "", 3.14); }
14303 -if { (eval echo configure:56825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14304 +if { (eval echo configure:58338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14306 - ac_cv_func_memcmp_clean=yes
14307 + php_cv_mbstring_stdarg=yes
14309 echo "configure: failed program was:" >&5
14310 cat conftest.$ac_ext >&5
14312 - ac_cv_func_memcmp_clean=no
14313 + php_cv_mbstring_stdarg=no
14321 -echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
14322 -test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
14323 +echo "$ac_t""$php_cv_mbstring_stdarg" 1>&6
14325 - ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'`
14326 -echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6
14327 -echo "configure:56844: checking for stdarg.h" >&5
14328 + for ac_hdr in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h
14330 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
14331 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
14332 +echo "configure:58359: checking for $ac_hdr" >&5
14333 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14334 echo $ac_n "(cached) $ac_c" 1>&6
14336 cat > conftest.$ac_ext <<EOF
14337 -#line 56849 "configure"
14338 +#line 58364 "configure"
14339 #include "confdefs.h"
14340 -#include <stdarg.h>
14341 +#include <$ac_hdr>
14343 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14344 -{ (eval echo configure:56854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14345 +{ (eval echo configure:58369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14346 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
14347 if test -z "$ac_err"; then
14349 @@ -56866,9 +58381,547 @@ rm -f conftest*
14351 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
14352 echo "$ac_t""yes" 1>&6
14354 - cat >> confdefs.h <<\EOF
14355 -#define HAVE_STDARG_PROTOTYPES 1
14356 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
14357 + cat >> confdefs.h <<EOF
14358 +#define $ac_tr_hdr 1
14362 + echo "$ac_t""no" 1>&6
14366 + echo $ac_n "checking size of int""... $ac_c" 1>&6
14367 +echo "configure:58396: checking size of int" >&5
14368 +if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
14369 + echo $ac_n "(cached) $ac_c" 1>&6
14371 + if test "$cross_compiling" = yes; then
14372 + ac_cv_sizeof_int=4
14374 + cat > conftest.$ac_ext <<EOF
14375 +#line 58404 "configure"
14376 +#include "confdefs.h"
14377 +#include <stdio.h>
14378 +#include <sys/types.h>
14381 + FILE *f=fopen("conftestval", "w");
14383 + fprintf(f, "%d\n", sizeof(int));
14387 +if { (eval echo configure:58416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14389 + ac_cv_sizeof_int=`cat conftestval`
14391 + echo "configure: failed program was:" >&5
14392 + cat conftest.$ac_ext >&5
14394 + ac_cv_sizeof_int=0
14400 +echo "$ac_t""$ac_cv_sizeof_int" 1>&6
14401 +cat >> confdefs.h <<EOF
14402 +#define SIZEOF_INT $ac_cv_sizeof_int
14406 + echo $ac_n "checking size of short""... $ac_c" 1>&6
14407 +echo "configure:58436: checking size of short" >&5
14408 +if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
14409 + echo $ac_n "(cached) $ac_c" 1>&6
14411 + if test "$cross_compiling" = yes; then
14412 + ac_cv_sizeof_short=2
14414 + cat > conftest.$ac_ext <<EOF
14415 +#line 58444 "configure"
14416 +#include "confdefs.h"
14417 +#include <stdio.h>
14418 +#include <sys/types.h>
14421 + FILE *f=fopen("conftestval", "w");
14423 + fprintf(f, "%d\n", sizeof(short));
14427 +if { (eval echo configure:58456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14429 + ac_cv_sizeof_short=`cat conftestval`
14431 + echo "configure: failed program was:" >&5
14432 + cat conftest.$ac_ext >&5
14434 + ac_cv_sizeof_short=0
14440 +echo "$ac_t""$ac_cv_sizeof_short" 1>&6
14441 +cat >> confdefs.h <<EOF
14442 +#define SIZEOF_SHORT $ac_cv_sizeof_short
14446 + echo $ac_n "checking size of long""... $ac_c" 1>&6
14447 +echo "configure:58476: checking size of long" >&5
14448 +if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
14449 + echo $ac_n "(cached) $ac_c" 1>&6
14451 + if test "$cross_compiling" = yes; then
14452 + ac_cv_sizeof_long=4
14454 + cat > conftest.$ac_ext <<EOF
14455 +#line 58484 "configure"
14456 +#include "confdefs.h"
14457 +#include <stdio.h>
14458 +#include <sys/types.h>
14461 + FILE *f=fopen("conftestval", "w");
14463 + fprintf(f, "%d\n", sizeof(long));
14467 +if { (eval echo configure:58496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14469 + ac_cv_sizeof_long=`cat conftestval`
14471 + echo "configure: failed program was:" >&5
14472 + cat conftest.$ac_ext >&5
14474 + ac_cv_sizeof_long=0
14480 +echo "$ac_t""$ac_cv_sizeof_long" 1>&6
14481 +cat >> confdefs.h <<EOF
14482 +#define SIZEOF_LONG $ac_cv_sizeof_long
14486 + echo $ac_n "checking for working const""... $ac_c" 1>&6
14487 +echo "configure:58516: checking for working const" >&5
14488 +if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
14489 + echo $ac_n "(cached) $ac_c" 1>&6
14491 + cat > conftest.$ac_ext <<EOF
14492 +#line 58521 "configure"
14493 +#include "confdefs.h"
14497 +/* Ultrix mips cc rejects this. */
14498 +typedef int charset[2]; const charset x;
14499 +/* SunOS 4.1.1 cc rejects this. */
14500 +char const *const *ccp;
14502 +/* NEC SVR4.0.2 mips cc rejects this. */
14503 +struct point {int x, y;};
14504 +static struct point const zero = {0,0};
14505 +/* AIX XL C 1.02.0.0 rejects this.
14506 + It does not let you subtract one const X* pointer from another in an arm
14507 + of an if-expression whose if-part is not a constant expression */
14508 +const char *g = "string";
14509 +ccp = &g + (g ? g-g : 0);
14510 +/* HPUX 7.0 cc rejects these. */
14513 +ccp = (char const *const *) p;
14514 +{ /* SCO 3.2v4 cc rejects this. */
14516 + char const *s = 0 ? (char *) 0 : (char const *) 0;
14520 +{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
14521 + int x[] = {25, 17};
14522 + const int *foo = &x[0];
14525 +{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
14526 + typedef const int *iptr;
14530 +{ /* AIX XL C 1.02.0.0 rejects this saying
14531 + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
14532 + struct s { int j; const int *ap[3]; };
14533 + struct s *b; b->j = 5;
14535 +{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
14536 + const int foo = 10;
14541 +if { (eval echo configure:58570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14543 + ac_cv_c_const=yes
14545 + echo "configure: failed program was:" >&5
14546 + cat conftest.$ac_ext >&5
14553 +echo "$ac_t""$ac_cv_c_const" 1>&6
14554 +if test $ac_cv_c_const = no; then
14555 + cat >> confdefs.h <<\EOF
14561 + echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
14562 +echo "configure:58591: checking whether time.h and sys/time.h may both be included" >&5
14563 +if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
14564 + echo $ac_n "(cached) $ac_c" 1>&6
14566 + cat > conftest.$ac_ext <<EOF
14567 +#line 58596 "configure"
14568 +#include "confdefs.h"
14569 +#include <sys/types.h>
14570 +#include <sys/time.h>
14576 +if { (eval echo configure:58605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
14578 + ac_cv_header_time=yes
14580 + echo "configure: failed program was:" >&5
14581 + cat conftest.$ac_ext >&5
14583 + ac_cv_header_time=no
14588 +echo "$ac_t""$ac_cv_header_time" 1>&6
14589 +if test $ac_cv_header_time = yes; then
14590 + cat >> confdefs.h <<\EOF
14591 +#define TIME_WITH_SYS_TIME 1
14596 + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
14597 +# for constant arguments. Useless!
14598 +echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
14599 +echo "configure:58628: checking for working alloca.h" >&5
14600 +if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
14601 + echo $ac_n "(cached) $ac_c" 1>&6
14603 + cat > conftest.$ac_ext <<EOF
14604 +#line 58633 "configure"
14605 +#include "confdefs.h"
14606 +#include <alloca.h>
14608 +char *p = alloca(2 * sizeof(int));
14611 +if { (eval echo configure:58640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14613 + ac_cv_header_alloca_h=yes
14615 + echo "configure: failed program was:" >&5
14616 + cat conftest.$ac_ext >&5
14618 + ac_cv_header_alloca_h=no
14623 +echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
14624 +if test $ac_cv_header_alloca_h = yes; then
14625 + cat >> confdefs.h <<\EOF
14626 +#define HAVE_ALLOCA_H 1
14631 +echo $ac_n "checking for alloca""... $ac_c" 1>&6
14632 +echo "configure:58661: checking for alloca" >&5
14633 +if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
14634 + echo $ac_n "(cached) $ac_c" 1>&6
14636 + cat > conftest.$ac_ext <<EOF
14637 +#line 58666 "configure"
14638 +#include "confdefs.h"
14641 +# define alloca __builtin_alloca
14644 +# include <malloc.h>
14645 +# define alloca _alloca
14647 +# if HAVE_ALLOCA_H
14648 +# include <alloca.h>
14653 +# ifndef alloca /* predefined by HP cc +Olibcalls */
14662 +char *p = (char *) alloca(1);
14665 +if { (eval echo configure:58694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14667 + ac_cv_func_alloca_works=yes
14669 + echo "configure: failed program was:" >&5
14670 + cat conftest.$ac_ext >&5
14672 + ac_cv_func_alloca_works=no
14677 +echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
14678 +if test $ac_cv_func_alloca_works = yes; then
14679 + cat >> confdefs.h <<\EOF
14680 +#define HAVE_ALLOCA 1
14685 +if test $ac_cv_func_alloca_works = no; then
14686 + # The SVR3 libPW and SVR4 libucb both contain incompatible functions
14687 + # that cause trouble. Some versions do not even contain alloca or
14688 + # contain a buggy version. If you still want to use their alloca,
14689 + # use ar to extract alloca.o from them instead of compiling alloca.c.
14690 + ALLOCA=alloca.${ac_objext}
14691 + cat >> confdefs.h <<\EOF
14692 +#define C_ALLOCA 1
14696 +echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
14697 +echo "configure:58726: checking whether alloca needs Cray hooks" >&5
14698 +if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
14699 + echo $ac_n "(cached) $ac_c" 1>&6
14701 + cat > conftest.$ac_ext <<EOF
14702 +#line 58731 "configure"
14703 +#include "confdefs.h"
14704 +#if defined(CRAY) && ! defined(CRAY2)
14711 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
14712 + egrep "webecray" >/dev/null 2>&1; then
14714 + ac_cv_os_cray=yes
14723 +echo "$ac_t""$ac_cv_os_cray" 1>&6
14724 +if test $ac_cv_os_cray = yes; then
14725 +for ac_func in _getb67 GETB67 getb67; do
14726 + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
14727 +echo "configure:58756: checking for $ac_func" >&5
14728 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
14729 + echo $ac_n "(cached) $ac_c" 1>&6
14731 + cat > conftest.$ac_ext <<EOF
14732 +#line 58761 "configure"
14733 +#include "confdefs.h"
14734 +/* System header to define __stub macros and hopefully few prototypes,
14735 + which can conflict with char $ac_func(); below. */
14736 +#include <assert.h>
14737 +/* Override any gcc2 internal prototype to avoid an error. */
14738 +/* We use char because int might match the return type of a gcc2
14739 + builtin and then its argument prototype would still apply. */
14744 +/* The GNU C library defines this for functions which it implements
14745 + to always fail with ENOSYS. Some functions are actually named
14746 + something starting with __ and the normal name is an alias. */
14747 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
14755 +if { (eval echo configure:58784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14757 + eval "ac_cv_func_$ac_func=yes"
14759 + echo "configure: failed program was:" >&5
14760 + cat conftest.$ac_ext >&5
14762 + eval "ac_cv_func_$ac_func=no"
14767 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
14768 + echo "$ac_t""yes" 1>&6
14769 + cat >> confdefs.h <<EOF
14770 +#define CRAY_STACKSEG_END $ac_func
14775 + echo "$ac_t""no" 1>&6
14781 +echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
14782 +echo "configure:58811: checking stack direction for C alloca" >&5
14783 +if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
14784 + echo $ac_n "(cached) $ac_c" 1>&6
14786 + if test "$cross_compiling" = yes; then
14787 + ac_cv_c_stack_direction=0
14789 + cat > conftest.$ac_ext <<EOF
14790 +#line 58819 "configure"
14791 +#include "confdefs.h"
14792 +find_stack_direction ()
14794 + static char *addr = 0;
14799 + return find_stack_direction ();
14802 + return (&dummy > addr) ? 1 : -1;
14806 + exit (find_stack_direction() < 0);
14809 +if { (eval echo configure:58838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14811 + ac_cv_c_stack_direction=1
14813 + echo "configure: failed program was:" >&5
14814 + cat conftest.$ac_ext >&5
14816 + ac_cv_c_stack_direction=-1
14823 +echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
14824 +cat >> confdefs.h <<EOF
14825 +#define STACK_DIRECTION $ac_cv_c_stack_direction
14830 + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
14831 +echo "configure:58860: checking for 8-bit clean memcmp" >&5
14832 +if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
14833 + echo $ac_n "(cached) $ac_c" 1>&6
14835 + if test "$cross_compiling" = yes; then
14836 + ac_cv_func_memcmp_clean=no
14838 + cat > conftest.$ac_ext <<EOF
14839 +#line 58868 "configure"
14840 +#include "confdefs.h"
14844 + char c0 = 0x40, c1 = 0x80, c2 = 0x81;
14845 + exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
14849 +if { (eval echo configure:58878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
14851 + ac_cv_func_memcmp_clean=yes
14853 + echo "configure: failed program was:" >&5
14854 + cat conftest.$ac_ext >&5
14856 + ac_cv_func_memcmp_clean=no
14863 +echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
14864 +test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
14866 + ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'`
14867 +echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6
14868 +echo "configure:58897: checking for stdarg.h" >&5
14869 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
14870 + echo $ac_n "(cached) $ac_c" 1>&6
14872 + cat > conftest.$ac_ext <<EOF
14873 +#line 58902 "configure"
14874 +#include "confdefs.h"
14875 +#include <stdarg.h>
14877 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
14878 +{ (eval echo configure:58907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
14879 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
14880 +if test -z "$ac_err"; then
14882 + eval "ac_cv_header_$ac_safe=yes"
14884 + echo "$ac_err" >&5
14885 + echo "configure: failed program was:" >&5
14886 + cat conftest.$ac_ext >&5
14888 + eval "ac_cv_header_$ac_safe=no"
14892 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
14893 + echo "$ac_t""yes" 1>&6
14895 + cat >> confdefs.h <<\EOF
14896 +#define HAVE_STDARG_PROTOTYPES 1
14900 @@ -57080,7 +59133,7 @@ EOF
14903 echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6
14904 -echo "configure:57084: checking for onig_init in -lonig" >&5
14905 +echo "configure:59137: checking for onig_init in -lonig" >&5
14906 ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'`
14907 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
14908 echo $ac_n "(cached) $ac_c" 1>&6
14909 @@ -57088,7 +59141,7 @@ else
14910 ac_save_LIBS="$LIBS"
14911 LIBS="-lonig $LIBS"
14912 cat > conftest.$ac_ext <<EOF
14913 -#line 57092 "configure"
14914 +#line 59145 "configure"
14915 #include "confdefs.h"
14916 /* Override any gcc2 internal prototype to avoid an error. */
14917 /* We use char because int might match the return type of a gcc2
14918 @@ -57099,7 +59152,7 @@ int main() {
14922 -if { (eval echo configure:57103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14923 +if { (eval echo configure:59156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14925 eval "ac_cv_lib_$ac_lib_var=yes"
14927 @@ -57325,9 +59378,9 @@ fi
14930 echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6
14931 -echo "configure:57329: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
14932 +echo "configure:59382: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
14933 cat > conftest.$ac_ext <<EOF
14934 -#line 57331 "configure"
14935 +#line 59384 "configure"
14936 #include "confdefs.h"
14938 #include <oniguruma.h>
14939 @@ -57338,7 +59391,7 @@ return (int)(ONIG_ENCODING_KOI8 + 1);
14943 -if { (eval echo configure:57342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14944 +if { (eval echo configure:59395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14947 echo "$ac_t""no" 1>&6
14948 @@ -57636,7 +59689,7 @@ EOF
14951 echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6
14952 -echo "configure:57640: checking for mbfl_buffer_converter_new in -lmbfl" >&5
14953 +echo "configure:59693: checking for mbfl_buffer_converter_new in -lmbfl" >&5
14954 ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'`
14955 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
14956 echo $ac_n "(cached) $ac_c" 1>&6
14957 @@ -57644,7 +59697,7 @@ else
14958 ac_save_LIBS="$LIBS"
14959 LIBS="-lmbfl $LIBS"
14960 cat > conftest.$ac_ext <<EOF
14961 -#line 57648 "configure"
14962 +#line 59701 "configure"
14963 #include "confdefs.h"
14964 /* Override any gcc2 internal prototype to avoid an error. */
14965 /* We use char because int might match the return type of a gcc2
14966 @@ -57655,7 +59708,7 @@ int main() {
14967 mbfl_buffer_converter_new()
14970 -if { (eval echo configure:57659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14971 +if { (eval echo configure:59712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
14973 eval "ac_cv_lib_$ac_lib_var=yes"
14975 @@ -58292,7 +60345,7 @@ fi
14978 echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6
14979 -echo "configure:58296: checking for mcrypt support" >&5
14980 +echo "configure:60349: checking for mcrypt support" >&5
14981 # Check whether --with-mcrypt or --without-mcrypt was given.
14982 if test "${with_mcrypt+set}" = set; then
14983 withval="$with_mcrypt"
14984 @@ -58345,9 +60398,9 @@ if test "$PHP_MCRYPT" != "no"; then
14985 old_CPPFLAGS=$CPPFLAGS
14986 CPPFLAGS=-I$MCRYPT_DIR/include
14987 echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6
14988 -echo "configure:58349: checking for libmcrypt version" >&5
14989 +echo "configure:60402: checking for libmcrypt version" >&5
14990 cat > conftest.$ac_ext <<EOF
14991 -#line 58351 "configure"
14992 +#line 60404 "configure"
14993 #include "confdefs.h"
14995 #include <mcrypt.h>
14996 @@ -58471,7 +60524,7 @@ rm -f conftest*
14999 echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
15000 -echo "configure:58475: checking for mcrypt_module_open in -lmcrypt" >&5
15001 +echo "configure:60528: checking for mcrypt_module_open in -lmcrypt" >&5
15002 ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
15003 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15004 echo $ac_n "(cached) $ac_c" 1>&6
15005 @@ -58479,7 +60532,7 @@ else
15006 ac_save_LIBS="$LIBS"
15007 LIBS="-lmcrypt $LIBS"
15008 cat > conftest.$ac_ext <<EOF
15009 -#line 58483 "configure"
15010 +#line 60536 "configure"
15011 #include "confdefs.h"
15012 /* Override any gcc2 internal prototype to avoid an error. */
15013 /* We use char because int might match the return type of a gcc2
15014 @@ -58490,7 +60543,7 @@ int main() {
15015 mcrypt_module_open()
15018 -if { (eval echo configure:58494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15019 +if { (eval echo configure:60547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15021 eval "ac_cv_lib_$ac_lib_var=yes"
15023 @@ -58643,7 +60696,7 @@ else
15026 echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
15027 -echo "configure:58647: checking for mcrypt_module_open in -lmcrypt" >&5
15028 +echo "configure:60700: checking for mcrypt_module_open in -lmcrypt" >&5
15029 ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
15030 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15031 echo $ac_n "(cached) $ac_c" 1>&6
15032 @@ -58651,7 +60704,7 @@ else
15033 ac_save_LIBS="$LIBS"
15034 LIBS="-lmcrypt $LIBS"
15035 cat > conftest.$ac_ext <<EOF
15036 -#line 58655 "configure"
15037 +#line 60708 "configure"
15038 #include "confdefs.h"
15039 /* Override any gcc2 internal prototype to avoid an error. */
15040 /* We use char because int might match the return type of a gcc2
15041 @@ -58662,7 +60715,7 @@ int main() {
15042 mcrypt_module_open()
15045 -if { (eval echo configure:58666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15046 +if { (eval echo configure:60719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15048 eval "ac_cv_lib_$ac_lib_var=yes"
15050 @@ -59135,7 +61188,7 @@ fi
15053 echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6
15054 -echo "configure:59139: checking for MSSQL support via FreeTDS" >&5
15055 +echo "configure:61192: checking for MSSQL support via FreeTDS" >&5
15056 # Check whether --with-mssql or --without-mssql was given.
15057 if test "${with_mssql+set}" = set; then
15058 withval="$with_mssql"
15059 @@ -59633,7 +61686,7 @@ EOF
15062 echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
15063 -echo "configure:59637: checking for dnet_addr in -ldnet_stub" >&5
15064 +echo "configure:61690: checking for dnet_addr in -ldnet_stub" >&5
15065 ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
15066 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15067 echo $ac_n "(cached) $ac_c" 1>&6
15068 @@ -59641,7 +61694,7 @@ else
15069 ac_save_LIBS="$LIBS"
15070 LIBS="-ldnet_stub $LIBS"
15071 cat > conftest.$ac_ext <<EOF
15072 -#line 59645 "configure"
15073 +#line 61698 "configure"
15074 #include "confdefs.h"
15075 /* Override any gcc2 internal prototype to avoid an error. */
15076 /* We use char because int might match the return type of a gcc2
15077 @@ -59652,7 +61705,7 @@ int main() {
15081 -if { (eval echo configure:59656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15082 +if { (eval echo configure:61709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15084 eval "ac_cv_lib_$ac_lib_var=yes"
15086 @@ -59796,7 +61849,7 @@ fi
15089 echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
15090 -echo "configure:59800: checking for MySQL support" >&5
15091 +echo "configure:61853: checking for MySQL support" >&5
15092 # Check whether --with-mysql or --without-mysql was given.
15093 if test "${with_mysql+set}" = set; then
15094 withval="$with_mysql"
15095 @@ -59840,7 +61893,7 @@ echo "$ac_t""$ext_output" 1>&6
15096 php_with_mysql_sock=no
15098 echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6
15099 -echo "configure:59844: checking for specified location of the MySQL UNIX socket" >&5
15100 +echo "configure:61897: checking for specified location of the MySQL UNIX socket" >&5
15101 # Check whether --with-mysql-sock or --without-mysql-sock was given.
15102 if test "${with_mysql_sock+set}" = set; then
15103 withval="$with_mysql_sock"
15104 @@ -59864,7 +61917,7 @@ if test -z "$PHP_ZLIB_DIR"; then
15105 php_with_zlib_dir=no
15107 echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
15108 -echo "configure:59868: checking for the location of libz" >&5
15109 +echo "configure:61921: checking for the location of libz" >&5
15110 # Check whether --with-zlib-dir or --without-zlib-dir was given.
15111 if test "${with_zlib_dir+set}" = set; then
15112 withval="$with_zlib_dir"
15113 @@ -60038,7 +62091,7 @@ Note that the MySQL client library is no
15116 echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
15117 -echo "configure:60042: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
15118 +echo "configure:62095: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
15119 ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'`
15120 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15121 echo $ac_n "(cached) $ac_c" 1>&6
15122 @@ -60046,7 +62099,7 @@ else
15123 ac_save_LIBS="$LIBS"
15124 LIBS="-l$MYSQL_LIBNAME $LIBS"
15125 cat > conftest.$ac_ext <<EOF
15126 -#line 60050 "configure"
15127 +#line 62103 "configure"
15128 #include "confdefs.h"
15129 /* Override any gcc2 internal prototype to avoid an error. */
15130 /* We use char because int might match the return type of a gcc2
15131 @@ -60057,7 +62110,7 @@ int main() {
15135 -if { (eval echo configure:60061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15136 +if { (eval echo configure:62114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15138 eval "ac_cv_lib_$ac_lib_var=yes"
15140 @@ -60280,7 +62333,7 @@ else
15143 echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
15144 -echo "configure:60284: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
15145 +echo "configure:62337: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
15146 ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'`
15147 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15148 echo $ac_n "(cached) $ac_c" 1>&6
15149 @@ -60288,7 +62341,7 @@ else
15150 ac_save_LIBS="$LIBS"
15151 LIBS="-l$MYSQL_LIBNAME $LIBS"
15152 cat > conftest.$ac_ext <<EOF
15153 -#line 60292 "configure"
15154 +#line 62345 "configure"
15155 #include "confdefs.h"
15156 /* Override any gcc2 internal prototype to avoid an error. */
15157 /* We use char because int might match the return type of a gcc2
15158 @@ -60299,7 +62352,7 @@ int main() {
15162 -if { (eval echo configure:60303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15163 +if { (eval echo configure:62356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15165 eval "ac_cv_lib_$ac_lib_var=yes"
15167 @@ -60454,7 +62507,7 @@ fi
15170 echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
15171 -echo "configure:60458: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
15172 +echo "configure:62511: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
15173 ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'`
15174 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15175 echo $ac_n "(cached) $ac_c" 1>&6
15176 @@ -60462,7 +62515,7 @@ else
15177 ac_save_LIBS="$LIBS"
15178 LIBS="-l$MYSQL_LIBNAME $LIBS"
15179 cat > conftest.$ac_ext <<EOF
15180 -#line 60466 "configure"
15181 +#line 62519 "configure"
15182 #include "confdefs.h"
15183 /* Override any gcc2 internal prototype to avoid an error. */
15184 /* We use char because int might match the return type of a gcc2
15185 @@ -60473,7 +62526,7 @@ int main() {
15189 -if { (eval echo configure:60477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15190 +if { (eval echo configure:62530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15192 eval "ac_cv_lib_$ac_lib_var=yes"
15194 @@ -60667,7 +62720,7 @@ fi
15196 if test "$PHP_MYSQL" != "no"; then
15197 echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6
15198 -echo "configure:60671: checking for MySQL UNIX socket location" >&5
15199 +echo "configure:62724: checking for MySQL UNIX socket location" >&5
15200 if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
15201 MYSQL_SOCK=$PHP_MYSQL_SOCK
15202 cat >> confdefs.h <<EOF
15203 @@ -61040,7 +63093,7 @@ fi
15206 echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6
15207 -echo "configure:61044: checking for MySQLi support" >&5
15208 +echo "configure:63097: checking for MySQLi support" >&5
15209 # Check whether --with-mysqli or --without-mysqli was given.
15210 if test "${with_mysqli+set}" = set; then
15211 withval="$with_mysqli"
15212 @@ -61084,7 +63137,7 @@ echo "$ac_t""$ext_output" 1>&6
15213 php_enable_embedded_mysqli=no
15215 echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6
15216 -echo "configure:61088: checking whether to enable embedded MySQLi support" >&5
15217 +echo "configure:63141: checking whether to enable embedded MySQLi support" >&5
15218 # Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given.
15219 if test "${enable_embedded_mysqli+set}" = set; then
15220 enableval="$enable_embedded_mysqli"
15221 @@ -61235,7 +63288,7 @@ EOF
15224 echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
15225 -echo "configure:61239: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
15226 +echo "configure:63292: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
15227 ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'`
15228 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15229 echo $ac_n "(cached) $ac_c" 1>&6
15230 @@ -61243,7 +63296,7 @@ else
15231 ac_save_LIBS="$LIBS"
15232 LIBS="-l$MYSQL_LIB_NAME $LIBS"
15233 cat > conftest.$ac_ext <<EOF
15234 -#line 61247 "configure"
15235 +#line 63300 "configure"
15236 #include "confdefs.h"
15237 /* Override any gcc2 internal prototype to avoid an error. */
15238 /* We use char because int might match the return type of a gcc2
15239 @@ -61254,7 +63307,7 @@ int main() {
15240 mysql_set_server_option()
15243 -if { (eval echo configure:61258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15244 +if { (eval echo configure:63311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15246 eval "ac_cv_lib_$ac_lib_var=yes"
15248 @@ -61502,7 +63555,7 @@ EOF
15251 echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
15252 -echo "configure:61506: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
15253 +echo "configure:63559: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
15254 ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_set | sed 'y%./+-%__p_%'`
15255 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15256 echo $ac_n "(cached) $ac_c" 1>&6
15257 @@ -61510,7 +63563,7 @@ else
15258 ac_save_LIBS="$LIBS"
15259 LIBS="-l$MYSQL_LIB_NAME $LIBS"
15260 cat > conftest.$ac_ext <<EOF
15261 -#line 61514 "configure"
15262 +#line 63567 "configure"
15263 #include "confdefs.h"
15264 /* Override any gcc2 internal prototype to avoid an error. */
15265 /* We use char because int might match the return type of a gcc2
15266 @@ -61521,7 +63574,7 @@ int main() {
15267 mysql_set_character_set()
15270 -if { (eval echo configure:61525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15271 +if { (eval echo configure:63578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15273 eval "ac_cv_lib_$ac_lib_var=yes"
15275 @@ -61665,7 +63718,7 @@ fi
15278 echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
15279 -echo "configure:61669: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
15280 +echo "configure:63722: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
15281 ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'`
15282 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15283 echo $ac_n "(cached) $ac_c" 1>&6
15284 @@ -61673,7 +63726,7 @@ else
15285 ac_save_LIBS="$LIBS"
15286 LIBS="-l$MYSQL_LIB_NAME $LIBS"
15287 cat > conftest.$ac_ext <<EOF
15288 -#line 61677 "configure"
15289 +#line 63730 "configure"
15290 #include "confdefs.h"
15291 /* Override any gcc2 internal prototype to avoid an error. */
15292 /* We use char because int might match the return type of a gcc2
15293 @@ -61684,7 +63737,7 @@ int main() {
15294 mysql_stmt_next_result()
15297 -if { (eval echo configure:61688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15298 +if { (eval echo configure:63741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15300 eval "ac_cv_lib_$ac_lib_var=yes"
15302 @@ -62087,7 +64140,7 @@ fi
15305 echo $ac_n "checking for Oracle Database OCI8 support""... $ac_c" 1>&6
15306 -echo "configure:62091: checking for Oracle Database OCI8 support" >&5
15307 +echo "configure:64144: checking for Oracle Database OCI8 support" >&5
15308 # Check whether --with-oci8 or --without-oci8 was given.
15309 if test "${with_oci8+set}" = set; then
15310 withval="$with_oci8"
15311 @@ -62135,7 +64188,7 @@ if test "$PHP_OCI8" != "no"; then
15314 echo $ac_n "checking PHP version""... $ac_c" 1>&6
15315 -echo "configure:62139: checking PHP version" >&5
15316 +echo "configure:64192: checking PHP version" >&5
15318 tmp_version=$PHP_VERSION
15319 if test -z "$tmp_version"; then
15320 @@ -62167,7 +64220,7 @@ echo "configure:62139: checking PHP vers
15323 echo $ac_n "checking size of long int""... $ac_c" 1>&6
15324 -echo "configure:62171: checking size of long int" >&5
15325 +echo "configure:64224: checking size of long int" >&5
15326 if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
15327 echo $ac_n "(cached) $ac_c" 1>&6
15329 @@ -62175,7 +64228,7 @@ else
15330 ac_cv_sizeof_long_int=4
15332 cat > conftest.$ac_ext <<EOF
15333 -#line 62179 "configure"
15334 +#line 64232 "configure"
15335 #include "confdefs.h"
15337 #include <sys/types.h>
15338 @@ -62187,7 +64240,7 @@ main()
15342 -if { (eval echo configure:62191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
15343 +if { (eval echo configure:64244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
15345 ac_cv_sizeof_long_int=`cat conftestval`
15347 @@ -62207,7 +64260,7 @@ EOF
15350 echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
15351 -echo "configure:62211: checking checking if we're on a 64-bit platform" >&5
15352 +echo "configure:64264: checking checking if we're on a 64-bit platform" >&5
15353 if test "$ac_cv_sizeof_long_int" = "4"; then
15354 echo "$ac_t""no" 1>&6
15355 PHP_OCI8_OH_LIBDIR=lib32
15356 @@ -62251,7 +64304,7 @@ echo "configure:62211: checking checking
15357 if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
15359 echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6
15360 -echo "configure:62255: checking Oracle ORACLE_HOME install directory" >&5
15361 +echo "configure:64308: checking Oracle ORACLE_HOME install directory" >&5
15363 if test "$PHP_OCI8" = "yes"; then
15364 OCI8_DIR=$ORACLE_HOME
15365 @@ -62262,7 +64315,7 @@ echo "configure:62255: checking Oracle O
15368 echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6
15369 -echo "configure:62266: checking ORACLE_HOME library validity" >&5
15370 +echo "configure:64319: checking ORACLE_HOME library validity" >&5
15371 if test ! -d "$OCI8_DIR"; then
15372 { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; }
15374 @@ -62603,7 +64656,7 @@ echo "configure:62266: checking ORACLE_H
15377 echo $ac_n "checking Oracle library version compatibility""... $ac_c" 1>&6
15378 -echo "configure:62607: checking Oracle library version compatibility" >&5
15379 +echo "configure:64660: checking Oracle library version compatibility" >&5
15380 OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
15381 OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g etc
15382 if test -s "$OCI8_DIR/orainst/unix.rgs"; then
15383 @@ -62733,7 +64786,7 @@ echo "configure:62607: checking Oracle l
15386 echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
15387 -echo "configure:62737: checking for OCIEnvNlsCreate in -lclntsh" >&5
15388 +echo "configure:64790: checking for OCIEnvNlsCreate in -lclntsh" >&5
15389 ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
15390 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15391 echo $ac_n "(cached) $ac_c" 1>&6
15392 @@ -62741,7 +64794,7 @@ else
15393 ac_save_LIBS="$LIBS"
15394 LIBS="-lclntsh $LIBS"
15395 cat > conftest.$ac_ext <<EOF
15396 -#line 62745 "configure"
15397 +#line 64798 "configure"
15398 #include "confdefs.h"
15399 /* Override any gcc2 internal prototype to avoid an error. */
15400 /* We use char because int might match the return type of a gcc2
15401 @@ -62752,7 +64805,7 @@ int main() {
15405 -if { (eval echo configure:62756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15406 +if { (eval echo configure:64809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15408 eval "ac_cv_lib_$ac_lib_var=yes"
15410 @@ -63185,7 +65238,7 @@ EOF
15413 echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
15414 -echo "configure:63189: checking Oracle Instant Client directory" >&5
15415 +echo "configure:65242: checking Oracle Instant Client directory" >&5
15417 if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
15418 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[^/]*##'`
15419 @@ -63198,7 +65251,7 @@ echo "configure:63189: checking Oracle I
15420 OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
15422 echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
15423 -echo "configure:63202: checking Oracle Instant Client SDK header directory" >&5
15424 +echo "configure:65255: checking Oracle Instant Client SDK header directory" >&5
15426 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!'`
15428 @@ -63407,7 +65460,7 @@ echo "configure:63202: checking Oracle I
15431 echo $ac_n "checking Oracle Instant Client library version compatibility""... $ac_c" 1>&6
15432 -echo "configure:63411: checking Oracle Instant Client library version compatibility" >&5
15433 +echo "configure:65464: checking Oracle Instant Client library version compatibility" >&5
15434 OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME
15435 OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g etc
15436 OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | tail -1`
15437 @@ -63868,7 +65921,7 @@ esac
15439 if test "$PHP_ADABAS" != "no"; then
15440 echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
15441 -echo "configure:63872: checking for Adabas support" >&5
15442 +echo "configure:65925: checking for Adabas support" >&5
15443 if test "$PHP_ADABAS" = "yes"; then
15444 PHP_ADABAS=/usr/local
15446 @@ -64071,7 +66124,7 @@ esac
15448 if test "$PHP_SAPDB" != "no"; then
15449 echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
15450 -echo "configure:64075: checking for SAP DB support" >&5
15451 +echo "configure:66128: checking for SAP DB support" >&5
15452 if test "$PHP_SAPDB" = "yes"; then
15453 PHP_SAPDB=/usr/local
15455 @@ -64204,7 +66257,7 @@ esac
15457 if test "$PHP_SOLID" != "no"; then
15458 echo $ac_n "checking for Solid support""... $ac_c" 1>&6
15459 -echo "configure:64208: checking for Solid support" >&5
15460 +echo "configure:66261: checking for Solid support" >&5
15461 if test "$PHP_SOLID" = "yes"; then
15462 PHP_SOLID=/usr/local/solid
15464 @@ -64231,7 +66284,7 @@ EOF
15465 echo "$ac_t""$ext_output" 1>&6
15467 echo $ac_n "checking Solid library file""... $ac_c" 1>&6
15468 -echo "configure:64235: checking Solid library file" >&5
15469 +echo "configure:66288: checking Solid library file" >&5
15470 ac_solid_uname_r=`uname -r 2>/dev/null`
15471 ac_solid_uname_s=`uname -s 2>/dev/null`
15472 case $ac_solid_uname_s in
15473 @@ -64352,7 +66405,7 @@ esac
15475 if test "$PHP_IBM_DB2" != "no"; then
15476 echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
15477 -echo "configure:64356: checking for IBM DB2 support" >&5
15478 +echo "configure:66409: checking for IBM DB2 support" >&5
15479 if test "$PHP_IBM_DB2" = "yes"; then
15480 ODBC_INCDIR=/home/db2inst1/sqllib/include
15481 ODBC_LIBDIR=/home/db2inst1/sqllib/lib
15482 @@ -64383,7 +66436,7 @@ fi
15485 cat > conftest.$ac_ext <<EOF
15486 -#line 64387 "configure"
15487 +#line 66440 "configure"
15488 #include "confdefs.h"
15491 @@ -64394,7 +66447,7 @@ else
15495 -if { (eval echo configure:64398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
15496 +if { (eval echo configure:66451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
15500 @@ -64475,7 +66528,7 @@ esac
15502 if test "$PHP_ODBCROUTER" != "no"; then
15503 echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6
15504 -echo "configure:64479: checking for ODBCRouter.com support" >&5
15505 +echo "configure:66532: checking for ODBCRouter.com support" >&5
15506 if test "$PHP_ODBCROUTER" = "yes"; then
15507 PHP_ODBCROUTER=/usr
15509 @@ -64539,7 +66592,7 @@ esac
15511 if test "$PHP_EMPRESS" != "no"; then
15512 echo $ac_n "checking for Empress support""... $ac_c" 1>&6
15513 -echo "configure:64543: checking for Empress support" >&5
15514 +echo "configure:66596: checking for Empress support" >&5
15515 if test "$PHP_EMPRESS" = "yes"; then
15516 ODBC_INCDIR=$EMPRESSPATH/include/odbc
15517 ODBC_LIBDIR=$EMPRESSPATH/shlib
15518 @@ -64557,7 +66610,7 @@ EOF
15519 echo "$ac_t""$ext_output" 1>&6
15521 echo $ac_n "checking Empress library file""... $ac_c" 1>&6
15522 -echo "configure:64561: checking Empress library file" >&5
15523 +echo "configure:66614: checking Empress library file" >&5
15524 ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
15525 if test ! -f $ODBC_LIBS; then
15526 ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
15527 @@ -64613,7 +66666,7 @@ esac
15529 if test "$PHP_EMPRESS_BCS" != "no"; then
15530 echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
15531 -echo "configure:64617: checking for Empress local access support" >&5
15532 +echo "configure:66670: checking for Empress local access support" >&5
15533 if test "$PHP_EMPRESS_BCS" = "yes"; then
15534 ODBC_INCDIR=$EMPRESSPATH/include/odbc
15535 ODBC_LIBDIR=$EMPRESSPATH/shlib
15536 @@ -64647,7 +66700,7 @@ EOF
15537 echo "$ac_t""$ext_output" 1>&6
15539 echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
15540 -echo "configure:64651: checking Empress local access library file" >&5
15541 +echo "configure:66704: checking Empress local access library file" >&5
15542 ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
15543 if test ! -f $ODBCBCS_LIBS; then
15544 ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
15545 @@ -64703,7 +66756,7 @@ esac
15547 if test "$PHP_BIRDSTEP" != "no"; then
15548 echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
15549 -echo "configure:64707: checking for Birdstep support" >&5
15550 +echo "configure:66760: checking for Birdstep support" >&5
15551 if test "$PHP_BIRDSTEP" = "yes"; then
15552 ODBC_INCDIR=/usr/local/birdstep/include
15553 ODBC_LIBDIR=/usr/local/birdstep/lib
15554 @@ -64815,7 +66868,7 @@ esac
15556 if test "$PHP_CUSTOM_ODBC" != "no"; then
15557 echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
15558 -echo "configure:64819: checking for a custom ODBC support" >&5
15559 +echo "configure:66872: checking for a custom ODBC support" >&5
15560 if test "$PHP_CUSTOM_ODBC" = "yes"; then
15561 PHP_CUSTOM_ODBC=/usr/local
15563 @@ -64879,7 +66932,7 @@ esac
15565 if test "$PHP_IODBC" != "no"; then
15566 echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
15567 -echo "configure:64883: checking for iODBC support" >&5
15568 +echo "configure:66936: checking for iODBC support" >&5
15569 if test "$PHP_IODBC" = "yes"; then
15570 PHP_IODBC=/usr/local
15572 @@ -65025,7 +67078,7 @@ esac
15574 if test "$PHP_ESOOB" != "no"; then
15575 echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
15576 -echo "configure:65029: checking for Easysoft ODBC-ODBC Bridge support" >&5
15577 +echo "configure:67082: checking for Easysoft ODBC-ODBC Bridge support" >&5
15578 if test "$PHP_ESOOB" = "yes"; then
15579 PHP_ESOOB=/usr/local/easysoft/oob/client
15581 @@ -65089,7 +67142,7 @@ esac
15583 if test "$PHP_UNIXODBC" != "no"; then
15584 echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
15585 -echo "configure:65093: checking for unixODBC support" >&5
15586 +echo "configure:67146: checking for unixODBC support" >&5
15587 if test "$PHP_UNIXODBC" = "yes"; then
15588 PHP_UNIXODBC=/usr/local
15590 @@ -65158,7 +67211,7 @@ esac
15592 if test "$PHP_DBMAKER" != "no"; then
15593 echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
15594 -echo "configure:65162: checking for DBMaker support" >&5
15595 +echo "configure:67215: checking for DBMaker support" >&5
15596 if test "$PHP_DBMAKER" = "yes"; then
15597 # find dbmaker's home directory
15598 DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
15599 @@ -65720,7 +67773,7 @@ fi
15600 php_enable_pcntl=no
15602 echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
15603 -echo "configure:65724: checking whether to enable pcntl support" >&5
15604 +echo "configure:67777: checking whether to enable pcntl support" >&5
15605 # Check whether --enable-pcntl or --disable-pcntl was given.
15606 if test "${enable_pcntl+set}" = set; then
15607 enableval="$enable_pcntl"
15608 @@ -65764,12 +67817,12 @@ if test "$PHP_PCNTL" != "no"; then
15609 for ac_func in fork
15611 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
15612 -echo "configure:65768: checking for $ac_func" >&5
15613 +echo "configure:67821: checking for $ac_func" >&5
15614 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
15615 echo $ac_n "(cached) $ac_c" 1>&6
15617 cat > conftest.$ac_ext <<EOF
15618 -#line 65773 "configure"
15619 +#line 67826 "configure"
15620 #include "confdefs.h"
15621 /* System header to define __stub macros and hopefully few prototypes,
15622 which can conflict with char $ac_func(); below. */
15623 @@ -65792,7 +67845,7 @@ $ac_func();
15627 -if { (eval echo configure:65796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15628 +if { (eval echo configure:67849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15630 eval "ac_cv_func_$ac_func=yes"
15632 @@ -65823,12 +67876,12 @@ done
15633 for ac_func in waitpid
15635 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
15636 -echo "configure:65827: checking for $ac_func" >&5
15637 +echo "configure:67880: checking for $ac_func" >&5
15638 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
15639 echo $ac_n "(cached) $ac_c" 1>&6
15641 cat > conftest.$ac_ext <<EOF
15642 -#line 65832 "configure"
15643 +#line 67885 "configure"
15644 #include "confdefs.h"
15645 /* System header to define __stub macros and hopefully few prototypes,
15646 which can conflict with char $ac_func(); below. */
15647 @@ -65851,7 +67904,7 @@ $ac_func();
15651 -if { (eval echo configure:65855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15652 +if { (eval echo configure:67908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15654 eval "ac_cv_func_$ac_func=yes"
15656 @@ -65882,12 +67935,12 @@ done
15657 for ac_func in sigaction
15659 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
15660 -echo "configure:65886: checking for $ac_func" >&5
15661 +echo "configure:67939: checking for $ac_func" >&5
15662 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
15663 echo $ac_n "(cached) $ac_c" 1>&6
15665 cat > conftest.$ac_ext <<EOF
15666 -#line 65891 "configure"
15667 +#line 67944 "configure"
15668 #include "confdefs.h"
15669 /* System header to define __stub macros and hopefully few prototypes,
15670 which can conflict with char $ac_func(); below. */
15671 @@ -65910,7 +67963,7 @@ $ac_func();
15675 -if { (eval echo configure:65914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15676 +if { (eval echo configure:67967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15678 eval "ac_cv_func_$ac_func=yes"
15680 @@ -65941,12 +67994,12 @@ done
15681 for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
15683 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
15684 -echo "configure:65945: checking for $ac_func" >&5
15685 +echo "configure:67998: checking for $ac_func" >&5
15686 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
15687 echo $ac_n "(cached) $ac_c" 1>&6
15689 cat > conftest.$ac_ext <<EOF
15690 -#line 65950 "configure"
15691 +#line 68003 "configure"
15692 #include "confdefs.h"
15693 /* System header to define __stub macros and hopefully few prototypes,
15694 which can conflict with char $ac_func(); below. */
15695 @@ -65969,7 +68022,7 @@ $ac_func();
15699 -if { (eval echo configure:65973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15700 +if { (eval echo configure:68026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15702 eval "ac_cv_func_$ac_func=yes"
15704 @@ -66294,7 +68347,7 @@ fi
15707 echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6
15708 -echo "configure:66298: checking whether to enable PDO support" >&5
15709 +echo "configure:68351: checking whether to enable PDO support" >&5
15710 # Check whether --enable-pdo or --disable-pdo was given.
15711 if test "${enable_pdo+set}" = set; then
15712 enableval="$enable_pdo"
15713 @@ -66728,7 +68781,7 @@ fi
15714 php_with_pdo_dblib=no
15716 echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6
15717 -echo "configure:66732: checking for PDO_DBLIB support via FreeTDS" >&5
15718 +echo "configure:68785: checking for PDO_DBLIB support via FreeTDS" >&5
15719 # Check whether --with-pdo-dblib or --without-pdo-dblib was given.
15720 if test "${with_pdo_dblib+set}" = set; then
15721 withval="$with_pdo_dblib"
15722 @@ -66945,13 +68998,13 @@ if test "$PHP_PDO_DBLIB" != "no"; then
15725 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
15726 -echo "configure:66949: checking for PDO includes" >&5
15727 +echo "configure:69002: checking for PDO includes" >&5
15728 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
15729 echo $ac_n "(cached) $ac_c" 1>&6
15732 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
15733 -echo "configure:66955: checking for PDO includes" >&5
15734 +echo "configure:69008: checking for PDO includes" >&5
15735 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
15736 pdo_inc_path=$abs_srcdir/ext
15737 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
15738 @@ -67265,7 +69318,7 @@ EOF
15741 echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
15742 -echo "configure:67269: checking for dnet_addr in -ldnet_stub" >&5
15743 +echo "configure:69322: checking for dnet_addr in -ldnet_stub" >&5
15744 ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
15745 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15746 echo $ac_n "(cached) $ac_c" 1>&6
15747 @@ -67273,7 +69326,7 @@ else
15748 ac_save_LIBS="$LIBS"
15749 LIBS="-ldnet_stub $LIBS"
15750 cat > conftest.$ac_ext <<EOF
15751 -#line 67277 "configure"
15752 +#line 69330 "configure"
15753 #include "confdefs.h"
15754 /* Override any gcc2 internal prototype to avoid an error. */
15755 /* We use char because int might match the return type of a gcc2
15756 @@ -67284,7 +69337,7 @@ int main() {
15760 -if { (eval echo configure:67288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15761 +if { (eval echo configure:69341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15763 eval "ac_cv_lib_$ac_lib_var=yes"
15765 @@ -67445,7 +69498,7 @@ fi
15766 php_with_pdo_firebird=no
15768 echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6
15769 -echo "configure:67449: checking for Firebird support for PDO" >&5
15770 +echo "configure:69502: checking for Firebird support for PDO" >&5
15771 # Check whether --with-pdo-firebird or --without-pdo-firebird was given.
15772 if test "${with_pdo_firebird+set}" = set; then
15773 withval="$with_pdo_firebird"
15774 @@ -67599,7 +69652,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; the
15777 echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
15778 -echo "configure:67603: checking for isc_detach_database in -lfbclient" >&5
15779 +echo "configure:69656: checking for isc_detach_database in -lfbclient" >&5
15780 ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
15781 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15782 echo $ac_n "(cached) $ac_c" 1>&6
15783 @@ -67607,7 +69660,7 @@ else
15784 ac_save_LIBS="$LIBS"
15785 LIBS="-lfbclient $LIBS"
15786 cat > conftest.$ac_ext <<EOF
15787 -#line 67611 "configure"
15788 +#line 69664 "configure"
15789 #include "confdefs.h"
15790 /* Override any gcc2 internal prototype to avoid an error. */
15791 /* We use char because int might match the return type of a gcc2
15792 @@ -67618,7 +69671,7 @@ int main() {
15793 isc_detach_database()
15796 -if { (eval echo configure:67622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15797 +if { (eval echo configure:69675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15799 eval "ac_cv_lib_$ac_lib_var=yes"
15801 @@ -67745,7 +69798,7 @@ else
15804 echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
15805 -echo "configure:67749: checking for isc_detach_database in -lgds" >&5
15806 +echo "configure:69802: checking for isc_detach_database in -lgds" >&5
15807 ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
15808 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15809 echo $ac_n "(cached) $ac_c" 1>&6
15810 @@ -67753,7 +69806,7 @@ else
15811 ac_save_LIBS="$LIBS"
15813 cat > conftest.$ac_ext <<EOF
15814 -#line 67757 "configure"
15815 +#line 69810 "configure"
15816 #include "confdefs.h"
15817 /* Override any gcc2 internal prototype to avoid an error. */
15818 /* We use char because int might match the return type of a gcc2
15819 @@ -67764,7 +69817,7 @@ int main() {
15820 isc_detach_database()
15823 -if { (eval echo configure:67768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15824 +if { (eval echo configure:69821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15826 eval "ac_cv_lib_$ac_lib_var=yes"
15828 @@ -67891,7 +69944,7 @@ else
15831 echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
15832 -echo "configure:67895: checking for isc_detach_database in -lib_util" >&5
15833 +echo "configure:69948: checking for isc_detach_database in -lib_util" >&5
15834 ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
15835 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15836 echo $ac_n "(cached) $ac_c" 1>&6
15837 @@ -67899,7 +69952,7 @@ else
15838 ac_save_LIBS="$LIBS"
15839 LIBS="-lib_util $LIBS"
15840 cat > conftest.$ac_ext <<EOF
15841 -#line 67903 "configure"
15842 +#line 69956 "configure"
15843 #include "confdefs.h"
15844 /* Override any gcc2 internal prototype to avoid an error. */
15845 /* We use char because int might match the return type of a gcc2
15846 @@ -67910,7 +69963,7 @@ int main() {
15847 isc_detach_database()
15850 -if { (eval echo configure:67914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15851 +if { (eval echo configure:69967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15853 eval "ac_cv_lib_$ac_lib_var=yes"
15855 @@ -67955,13 +70008,13 @@ fi
15858 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
15859 -echo "configure:67959: checking for PDO includes" >&5
15860 +echo "configure:70012: checking for PDO includes" >&5
15861 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
15862 echo $ac_n "(cached) $ac_c" 1>&6
15865 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
15866 -echo "configure:67965: checking for PDO includes" >&5
15867 +echo "configure:70018: checking for PDO includes" >&5
15868 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
15869 pdo_inc_path=$abs_srcdir/ext
15870 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
15871 @@ -68433,7 +70486,7 @@ fi
15872 php_with_pdo_mysql=no
15874 echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6
15875 -echo "configure:68437: checking for MySQL support for PDO" >&5
15876 +echo "configure:70490: checking for MySQL support for PDO" >&5
15877 # Check whether --with-pdo-mysql or --without-pdo-mysql was given.
15878 if test "${with_pdo_mysql+set}" = set; then
15879 withval="$with_pdo_mysql"
15880 @@ -68478,7 +70531,7 @@ if test -z "$PHP_ZLIB_DIR"; then
15881 php_with_zlib_dir=no
15883 echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
15884 -echo "configure:68482: checking for the location of libz" >&5
15885 +echo "configure:70535: checking for the location of libz" >&5
15886 # Check whether --with-zlib-dir or --without-zlib-dir was given.
15887 if test "${with_zlib_dir+set}" = set; then
15888 withval="$with_zlib_dir"
15889 @@ -68542,14 +70595,14 @@ EOF
15892 echo $ac_n "checking for mysql_config""... $ac_c" 1>&6
15893 -echo "configure:68546: checking for mysql_config" >&5
15894 +echo "configure:70599: checking for mysql_config" >&5
15895 if test -n "$PDO_MYSQL_CONFIG"; then
15896 echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6
15897 if test "x$SED" = "x"; then
15898 # Extract the first word of "sed", so it can be a program name with args.
15899 set dummy sed; ac_word=$2
15900 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
15901 -echo "configure:68553: checking for $ac_word" >&5
15902 +echo "configure:70606: checking for $ac_word" >&5
15903 if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
15904 echo $ac_n "(cached) $ac_c" 1>&6
15906 @@ -68593,7 +70646,7 @@ fi
15907 elif test -n "$PDO_MYSQL_DIR"; then
15908 echo "$ac_t""not found" 1>&6
15909 echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6
15910 -echo "configure:68597: checking for mysql install under $PDO_MYSQL_DIR" >&5
15911 +echo "configure:70650: checking for mysql install under $PDO_MYSQL_DIR" >&5
15912 if test -r $PDO_MYSQL_DIR/include/mysql; then
15913 PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
15915 @@ -68747,7 +70800,7 @@ echo "configure:68597: checking for mysq
15918 echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
15919 -echo "configure:68751: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
15920 +echo "configure:70804: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
15921 ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
15922 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15923 echo $ac_n "(cached) $ac_c" 1>&6
15924 @@ -68755,7 +70808,7 @@ else
15925 ac_save_LIBS="$LIBS"
15926 LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
15927 cat > conftest.$ac_ext <<EOF
15928 -#line 68759 "configure"
15929 +#line 70812 "configure"
15930 #include "confdefs.h"
15931 /* Override any gcc2 internal prototype to avoid an error. */
15932 /* We use char because int might match the return type of a gcc2
15933 @@ -68766,7 +70819,7 @@ int main() {
15937 -if { (eval echo configure:68770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15938 +if { (eval echo configure:70823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15940 eval "ac_cv_lib_$ac_lib_var=yes"
15942 @@ -69119,7 +71172,7 @@ else
15945 echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
15946 -echo "configure:69123: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
15947 +echo "configure:71176: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
15948 ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
15949 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15950 echo $ac_n "(cached) $ac_c" 1>&6
15951 @@ -69127,7 +71180,7 @@ else
15952 ac_save_LIBS="$LIBS"
15953 LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
15954 cat > conftest.$ac_ext <<EOF
15955 -#line 69131 "configure"
15956 +#line 71184 "configure"
15957 #include "confdefs.h"
15958 /* Override any gcc2 internal prototype to avoid an error. */
15959 /* We use char because int might match the return type of a gcc2
15960 @@ -69138,7 +71191,7 @@ int main() {
15964 -if { (eval echo configure:69142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15965 +if { (eval echo configure:71195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15967 eval "ac_cv_lib_$ac_lib_var=yes"
15969 @@ -69293,7 +71346,7 @@ fi
15972 echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
15973 -echo "configure:69297: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
15974 +echo "configure:71350: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
15975 ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
15976 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
15977 echo $ac_n "(cached) $ac_c" 1>&6
15978 @@ -69301,7 +71354,7 @@ else
15979 ac_save_LIBS="$LIBS"
15980 LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
15981 cat > conftest.$ac_ext <<EOF
15982 -#line 69305 "configure"
15983 +#line 71358 "configure"
15984 #include "confdefs.h"
15985 /* Override any gcc2 internal prototype to avoid an error. */
15986 /* We use char because int might match the return type of a gcc2
15987 @@ -69312,7 +71365,7 @@ int main() {
15991 -if { (eval echo configure:69316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15992 +if { (eval echo configure:71369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
15994 eval "ac_cv_lib_$ac_lib_var=yes"
15996 @@ -69486,12 +71539,12 @@ fi
15997 for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate
15999 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
16000 -echo "configure:69490: checking for $ac_func" >&5
16001 +echo "configure:71543: checking for $ac_func" >&5
16002 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
16003 echo $ac_n "(cached) $ac_c" 1>&6
16005 cat > conftest.$ac_ext <<EOF
16006 -#line 69495 "configure"
16007 +#line 71548 "configure"
16008 #include "confdefs.h"
16009 /* System header to define __stub macros and hopefully few prototypes,
16010 which can conflict with char $ac_func(); below. */
16011 @@ -69514,7 +71567,7 @@ $ac_func();
16015 -if { (eval echo configure:69518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16016 +if { (eval echo configure:71571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16018 eval "ac_cv_func_$ac_func=yes"
16020 @@ -69544,13 +71597,13 @@ done
16023 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
16024 -echo "configure:69548: checking for PDO includes" >&5
16025 +echo "configure:71601: checking for PDO includes" >&5
16026 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
16027 echo $ac_n "(cached) $ac_c" 1>&6
16030 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
16031 -echo "configure:69554: checking for PDO includes" >&5
16032 +echo "configure:71607: checking for PDO includes" >&5
16033 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
16034 pdo_inc_path=$abs_srcdir/ext
16035 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
16036 @@ -69935,7 +71988,7 @@ SUPPORTED_LIB_VERS="9.0 10.1 11.1" # Th
16037 php_with_pdo_oci=no
16039 echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6
16040 -echo "configure:69939: checking Oracle OCI support for PDO" >&5
16041 +echo "configure:71992: checking Oracle OCI support for PDO" >&5
16042 # Check whether --with-pdo-oci or --without-pdo-oci was given.
16043 if test "${with_pdo_oci+set}" = set; then
16044 withval="$with_pdo_oci"
16045 @@ -69982,7 +72035,7 @@ if test "$PHP_PDO_OCI" != "no"; then
16048 echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
16049 -echo "configure:69986: checking Oracle Install-Dir" >&5
16050 +echo "configure:72039: checking Oracle Install-Dir" >&5
16051 if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
16052 PDO_OCI_DIR=$ORACLE_HOME
16054 @@ -69991,7 +72044,7 @@ echo "configure:69986: checking Oracle I
16055 echo "$ac_t""$PHP_PDO_OCI" 1>&6
16057 echo $ac_n "checking if that is sane""... $ac_c" 1>&6
16058 -echo "configure:69995: checking if that is sane" >&5
16059 +echo "configure:72048: checking if that is sane" >&5
16060 if test -z "$PDO_OCI_DIR"; then
16061 { echo "configure: error:
16062 You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
16063 @@ -70002,7 +72055,7 @@ You need to tell me where to find your O
16065 if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
16066 echo $ac_n "checking size of long int""... $ac_c" 1>&6
16067 -echo "configure:70006: checking size of long int" >&5
16068 +echo "configure:72059: checking size of long int" >&5
16069 if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
16070 echo $ac_n "(cached) $ac_c" 1>&6
16072 @@ -70010,7 +72063,7 @@ else
16073 ac_cv_sizeof_long_int=4
16075 cat > conftest.$ac_ext <<EOF
16076 -#line 70014 "configure"
16077 +#line 72067 "configure"
16078 #include "confdefs.h"
16080 #include <sys/types.h>
16081 @@ -70022,7 +72075,7 @@ main()
16085 -if { (eval echo configure:70026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
16086 +if { (eval echo configure:72079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
16088 ac_cv_sizeof_long_int=`cat conftestval`
16090 @@ -70056,7 +72109,7 @@ EOF
16093 echo $ac_n "checking for oci.h""... $ac_c" 1>&6
16094 -echo "configure:70060: checking for oci.h" >&5
16095 +echo "configure:72113: checking for oci.h" >&5
16096 if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/oci.h ; then
16098 if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" != "/usr/include"; then
16099 @@ -70205,7 +72258,7 @@ echo "configure:70060: checking for oci.
16102 echo $ac_n "checking size of long int""... $ac_c" 1>&6
16103 -echo "configure:70209: checking size of long int" >&5
16104 +echo "configure:72262: checking size of long int" >&5
16105 if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
16106 echo $ac_n "(cached) $ac_c" 1>&6
16108 @@ -70213,7 +72266,7 @@ else
16109 ac_cv_sizeof_long_int=4
16111 cat > conftest.$ac_ext <<EOF
16112 -#line 70217 "configure"
16113 +#line 72270 "configure"
16114 #include "confdefs.h"
16116 #include <sys/types.h>
16117 @@ -70225,7 +72278,7 @@ main()
16121 -if { (eval echo configure:70229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
16122 +if { (eval echo configure:72282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
16124 ac_cv_sizeof_long_int=`cat conftestval`
16126 @@ -70245,7 +72298,7 @@ EOF
16129 echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6
16130 -echo "configure:70249: checking if we're on a 64-bit platform" >&5
16131 +echo "configure:72302: checking if we're on a 64-bit platform" >&5
16132 if test "$ac_cv_sizeof_long_int" = "4" ; then
16133 echo "$ac_t""no" 1>&6
16134 TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
16135 @@ -70255,7 +72308,7 @@ echo "configure:70249: checking if we're
16138 echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
16139 -echo "configure:70259: checking OCI8 libraries dir" >&5
16140 +echo "configure:72312: checking OCI8 libraries dir" >&5
16141 if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then
16142 PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
16143 elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
16144 @@ -70622,7 +72675,7 @@ echo "configure:70259: checking OCI8 lib
16147 echo $ac_n "checking Oracle version""... $ac_c" 1>&6
16148 -echo "configure:70626: checking Oracle version" >&5
16149 +echo "configure:72679: checking Oracle version" >&5
16150 for OCI_VER in $SUPPORTED_LIB_VERS; do
16151 if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
16152 PDO_OCI_VERSION="$OCI_VER"
16153 @@ -70804,7 +72857,7 @@ echo "configure:70626: checking Oracle v
16156 echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
16157 -echo "configure:70808: checking for OCIEnvCreate in -lclntsh" >&5
16158 +echo "configure:72861: checking for OCIEnvCreate in -lclntsh" >&5
16159 ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'`
16160 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16161 echo $ac_n "(cached) $ac_c" 1>&6
16162 @@ -70812,7 +72865,7 @@ else
16163 ac_save_LIBS="$LIBS"
16164 LIBS="-lclntsh $LIBS"
16165 cat > conftest.$ac_ext <<EOF
16166 -#line 70816 "configure"
16167 +#line 72869 "configure"
16168 #include "confdefs.h"
16169 /* Override any gcc2 internal prototype to avoid an error. */
16170 /* We use char because int might match the return type of a gcc2
16171 @@ -70823,7 +72876,7 @@ int main() {
16175 -if { (eval echo configure:70827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16176 +if { (eval echo configure:72880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16178 eval "ac_cv_lib_$ac_lib_var=yes"
16180 @@ -70957,7 +73010,7 @@ fi
16183 echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
16184 -echo "configure:70961: checking for OCIEnvNlsCreate in -lclntsh" >&5
16185 +echo "configure:73014: checking for OCIEnvNlsCreate in -lclntsh" >&5
16186 ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
16187 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16188 echo $ac_n "(cached) $ac_c" 1>&6
16189 @@ -70965,7 +73018,7 @@ else
16190 ac_save_LIBS="$LIBS"
16191 LIBS="-lclntsh $LIBS"
16192 cat > conftest.$ac_ext <<EOF
16193 -#line 70969 "configure"
16194 +#line 73022 "configure"
16195 #include "confdefs.h"
16196 /* Override any gcc2 internal prototype to avoid an error. */
16197 /* We use char because int might match the return type of a gcc2
16198 @@ -70976,7 +73029,7 @@ int main() {
16202 -if { (eval echo configure:70980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16203 +if { (eval echo configure:73033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16205 eval "ac_cv_lib_$ac_lib_var=yes"
16207 @@ -71110,7 +73163,7 @@ fi
16210 echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
16211 -echo "configure:71114: checking for OCILobIsTemporary in -lclntsh" >&5
16212 +echo "configure:73167: checking for OCILobIsTemporary in -lclntsh" >&5
16213 ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
16214 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16215 echo $ac_n "(cached) $ac_c" 1>&6
16216 @@ -71118,7 +73171,7 @@ else
16217 ac_save_LIBS="$LIBS"
16218 LIBS="-lclntsh $LIBS"
16219 cat > conftest.$ac_ext <<EOF
16220 -#line 71122 "configure"
16221 +#line 73175 "configure"
16222 #include "confdefs.h"
16223 /* Override any gcc2 internal prototype to avoid an error. */
16224 /* We use char because int might match the return type of a gcc2
16225 @@ -71129,7 +73182,7 @@ int main() {
16226 OCILobIsTemporary()
16229 -if { (eval echo configure:71133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16230 +if { (eval echo configure:73186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16232 eval "ac_cv_lib_$ac_lib_var=yes"
16234 @@ -71259,7 +73312,7 @@ else
16237 echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
16238 -echo "configure:71263: checking for OCILobIsTemporary in -locijdbc8" >&5
16239 +echo "configure:73316: checking for OCILobIsTemporary in -locijdbc8" >&5
16240 ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
16241 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16242 echo $ac_n "(cached) $ac_c" 1>&6
16243 @@ -71267,7 +73320,7 @@ else
16244 ac_save_LIBS="$LIBS"
16245 LIBS="-locijdbc8 $LIBS"
16246 cat > conftest.$ac_ext <<EOF
16247 -#line 71271 "configure"
16248 +#line 73324 "configure"
16249 #include "confdefs.h"
16250 /* Override any gcc2 internal prototype to avoid an error. */
16251 /* We use char because int might match the return type of a gcc2
16252 @@ -71278,7 +73331,7 @@ int main() {
16253 OCILobIsTemporary()
16256 -if { (eval echo configure:71282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16257 +if { (eval echo configure:73335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16259 eval "ac_cv_lib_$ac_lib_var=yes"
16261 @@ -71439,7 +73492,7 @@ fi
16264 echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
16265 -echo "configure:71443: checking for OCICollAssign in -lclntsh" >&5
16266 +echo "configure:73496: checking for OCICollAssign in -lclntsh" >&5
16267 ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'`
16268 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16269 echo $ac_n "(cached) $ac_c" 1>&6
16270 @@ -71447,7 +73500,7 @@ else
16271 ac_save_LIBS="$LIBS"
16272 LIBS="-lclntsh $LIBS"
16273 cat > conftest.$ac_ext <<EOF
16274 -#line 71451 "configure"
16275 +#line 73504 "configure"
16276 #include "confdefs.h"
16277 /* Override any gcc2 internal prototype to avoid an error. */
16278 /* We use char because int might match the return type of a gcc2
16279 @@ -71458,7 +73511,7 @@ int main() {
16283 -if { (eval echo configure:71462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16284 +if { (eval echo configure:73515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16286 eval "ac_cv_lib_$ac_lib_var=yes"
16288 @@ -71592,7 +73645,7 @@ fi
16291 echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6
16292 -echo "configure:71596: checking for OCIStmtFetch2 in -lclntsh" >&5
16293 +echo "configure:73649: checking for OCIStmtFetch2 in -lclntsh" >&5
16294 ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'`
16295 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16296 echo $ac_n "(cached) $ac_c" 1>&6
16297 @@ -71600,7 +73653,7 @@ else
16298 ac_save_LIBS="$LIBS"
16299 LIBS="-lclntsh $LIBS"
16300 cat > conftest.$ac_ext <<EOF
16301 -#line 71604 "configure"
16302 +#line 73657 "configure"
16303 #include "confdefs.h"
16304 /* Override any gcc2 internal prototype to avoid an error. */
16305 /* We use char because int might match the return type of a gcc2
16306 @@ -71611,7 +73664,7 @@ int main() {
16310 -if { (eval echo configure:71615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16311 +if { (eval echo configure:73668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16313 eval "ac_cv_lib_$ac_lib_var=yes"
16315 @@ -71650,13 +73703,13 @@ fi
16318 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
16319 -echo "configure:71654: checking for PDO includes" >&5
16320 +echo "configure:73707: checking for PDO includes" >&5
16321 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
16322 echo $ac_n "(cached) $ac_c" 1>&6
16325 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
16326 -echo "configure:71660: checking for PDO includes" >&5
16327 +echo "configure:73713: checking for PDO includes" >&5
16328 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
16329 pdo_inc_path=$abs_srcdir/ext
16330 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
16331 @@ -72024,7 +74077,7 @@ fi
16332 php_with_pdo_odbc=no
16334 echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6
16335 -echo "configure:72028: checking for ODBC v3 support for PDO" >&5
16336 +echo "configure:74081: checking for ODBC v3 support for PDO" >&5
16337 # Check whether --with-pdo-odbc or --without-pdo-odbc was given.
16338 if test "${with_pdo_odbc+set}" = set; then
16339 withval="$with_pdo_odbc"
16340 @@ -72076,13 +74129,13 @@ if test "$PHP_PDO_ODBC" != "no"; then
16343 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
16344 -echo "configure:72080: checking for PDO includes" >&5
16345 +echo "configure:74133: checking for PDO includes" >&5
16346 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
16347 echo $ac_n "(cached) $ac_c" 1>&6
16350 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
16351 -echo "configure:72086: checking for PDO includes" >&5
16352 +echo "configure:74139: checking for PDO includes" >&5
16353 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
16354 pdo_inc_path=$abs_srcdir/ext
16355 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
16356 @@ -72103,7 +74156,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
16359 echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6
16360 -echo "configure:72107: checking for selected PDO ODBC flavour" >&5
16361 +echo "configure:74160: checking for selected PDO ODBC flavour" >&5
16363 pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`"
16364 pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`"
16365 @@ -72182,7 +74235,7 @@ echo "configure:72107: checking for sele
16368 echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16369 -echo "configure:72186: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
16370 +echo "configure:74239: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
16371 if test -f "$PDO_ODBC_INCDIR/odbc.h"; then
16372 php_pdo_have_header=yes
16373 cat >> confdefs.h <<\EOF
16374 @@ -72196,7 +74249,7 @@ EOF
16377 echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16378 -echo "configure:72200: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
16379 +echo "configure:74253: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
16380 if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then
16381 php_pdo_have_header=yes
16382 cat >> confdefs.h <<\EOF
16383 @@ -72210,7 +74263,7 @@ EOF
16386 echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16387 -echo "configure:72214: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
16388 +echo "configure:74267: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
16389 if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then
16390 php_pdo_have_header=yes
16391 cat >> confdefs.h <<\EOF
16392 @@ -72224,7 +74277,7 @@ EOF
16395 echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16396 -echo "configure:72228: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
16397 +echo "configure:74281: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
16398 if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then
16399 php_pdo_have_header=yes
16400 cat >> confdefs.h <<\EOF
16401 @@ -72238,7 +74291,7 @@ EOF
16404 echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16405 -echo "configure:72242: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
16406 +echo "configure:74295: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
16407 if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then
16408 php_pdo_have_header=yes
16409 cat >> confdefs.h <<\EOF
16410 @@ -72252,7 +74305,7 @@ EOF
16413 echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16414 -echo "configure:72256: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
16415 +echo "configure:74309: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
16416 if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then
16417 php_pdo_have_header=yes
16418 cat >> confdefs.h <<\EOF
16419 @@ -72266,7 +74319,7 @@ EOF
16422 echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16423 -echo "configure:72270: checking for sql.h in $PDO_ODBC_INCDIR" >&5
16424 +echo "configure:74323: checking for sql.h in $PDO_ODBC_INCDIR" >&5
16425 if test -f "$PDO_ODBC_INCDIR/sql.h"; then
16426 php_pdo_have_header=yes
16427 cat >> confdefs.h <<\EOF
16428 @@ -72280,7 +74333,7 @@ EOF
16431 echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16432 -echo "configure:72284: checking for isql.h in $PDO_ODBC_INCDIR" >&5
16433 +echo "configure:74337: checking for isql.h in $PDO_ODBC_INCDIR" >&5
16434 if test -f "$PDO_ODBC_INCDIR/isql.h"; then
16435 php_pdo_have_header=yes
16436 cat >> confdefs.h <<\EOF
16437 @@ -72294,7 +74347,7 @@ EOF
16440 echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16441 -echo "configure:72298: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
16442 +echo "configure:74351: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
16443 if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then
16444 php_pdo_have_header=yes
16445 cat >> confdefs.h <<\EOF
16446 @@ -72308,7 +74361,7 @@ EOF
16449 echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16450 -echo "configure:72312: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
16451 +echo "configure:74365: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
16452 if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then
16453 php_pdo_have_header=yes
16454 cat >> confdefs.h <<\EOF
16455 @@ -72322,7 +74375,7 @@ EOF
16458 echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16459 -echo "configure:72326: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
16460 +echo "configure:74379: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
16461 if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then
16462 php_pdo_have_header=yes
16463 cat >> confdefs.h <<\EOF
16464 @@ -72336,7 +74389,7 @@ EOF
16467 echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16468 -echo "configure:72340: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
16469 +echo "configure:74393: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
16470 if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then
16471 php_pdo_have_header=yes
16472 cat >> confdefs.h <<\EOF
16473 @@ -72350,7 +74403,7 @@ EOF
16476 echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16477 -echo "configure:72354: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
16478 +echo "configure:74407: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
16479 if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then
16480 php_pdo_have_header=yes
16481 cat >> confdefs.h <<\EOF
16482 @@ -72364,7 +74417,7 @@ EOF
16485 echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16486 -echo "configure:72368: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
16487 +echo "configure:74421: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
16488 if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then
16489 php_pdo_have_header=yes
16490 cat >> confdefs.h <<\EOF
16491 @@ -72378,7 +74431,7 @@ EOF
16494 echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16495 -echo "configure:72382: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
16496 +echo "configure:74435: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
16497 if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then
16498 php_pdo_have_header=yes
16499 cat >> confdefs.h <<\EOF
16500 @@ -72392,7 +74445,7 @@ EOF
16503 echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16504 -echo "configure:72396: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
16505 +echo "configure:74449: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
16506 if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then
16507 php_pdo_have_header=yes
16508 cat >> confdefs.h <<\EOF
16509 @@ -72406,7 +74459,7 @@ EOF
16512 echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16513 -echo "configure:72410: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
16514 +echo "configure:74463: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
16515 if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then
16516 php_pdo_have_header=yes
16517 cat >> confdefs.h <<\EOF
16518 @@ -72420,7 +74473,7 @@ EOF
16521 echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
16522 -echo "configure:72424: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
16523 +echo "configure:74477: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
16524 if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then
16525 php_pdo_have_header=yes
16526 cat >> confdefs.h <<\EOF
16527 @@ -72626,7 +74679,7 @@ EOF
16530 echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
16531 -echo "configure:72630: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
16532 +echo "configure:74683: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
16533 ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'`
16534 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16535 echo $ac_n "(cached) $ac_c" 1>&6
16536 @@ -72634,7 +74687,7 @@ else
16537 ac_save_LIBS="$LIBS"
16538 LIBS="-l$pdo_odbc_def_lib $LIBS"
16539 cat > conftest.$ac_ext <<EOF
16540 -#line 72638 "configure"
16541 +#line 74691 "configure"
16542 #include "confdefs.h"
16543 /* Override any gcc2 internal prototype to avoid an error. */
16544 /* We use char because int might match the return type of a gcc2
16545 @@ -72645,7 +74698,7 @@ int main() {
16549 -if { (eval echo configure:72649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16550 +if { (eval echo configure:74702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16552 eval "ac_cv_lib_$ac_lib_var=yes"
16554 @@ -72760,7 +74813,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
16557 echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
16558 -echo "configure:72764: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
16559 +echo "configure:74817: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
16560 ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'`
16561 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16562 echo $ac_n "(cached) $ac_c" 1>&6
16563 @@ -72768,7 +74821,7 @@ else
16564 ac_save_LIBS="$LIBS"
16565 LIBS="-l$pdo_odbc_def_lib $LIBS"
16566 cat > conftest.$ac_ext <<EOF
16567 -#line 72772 "configure"
16568 +#line 74825 "configure"
16569 #include "confdefs.h"
16570 /* Override any gcc2 internal prototype to avoid an error. */
16571 /* We use char because int might match the return type of a gcc2
16572 @@ -72779,7 +74832,7 @@ int main() {
16576 -if { (eval echo configure:72783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16577 +if { (eval echo configure:74836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16579 eval "ac_cv_lib_$ac_lib_var=yes"
16581 @@ -73153,7 +75206,7 @@ fi
16582 php_with_pdo_pgsql=no
16584 echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6
16585 -echo "configure:73157: checking for PostgreSQL support for PDO" >&5
16586 +echo "configure:75210: checking for PostgreSQL support for PDO" >&5
16587 # Check whether --with-pdo-pgsql or --without-pdo-pgsql was given.
16588 if test "${with_pdo_pgsql+set}" = set; then
16589 withval="$with_pdo_pgsql"
16590 @@ -73212,7 +75265,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
16593 echo $ac_n "checking for pg_config""... $ac_c" 1>&6
16594 -echo "configure:73216: checking for pg_config" >&5
16595 +echo "configure:75269: checking for pg_config" >&5
16596 for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
16597 if test -x $i/pg_config; then
16598 PG_CONFIG="$i/pg_config"
16599 @@ -73276,14 +75329,14 @@ EOF
16602 echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
16603 -echo "configure:73280: checking for openssl dependencies" >&5
16604 +echo "configure:75333: checking for openssl dependencies" >&5
16605 grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1
16606 if test $? -eq 0 ; then
16607 echo "$ac_t""yes" 1>&6
16608 # Extract the first word of "pkg-config", so it can be a program name with args.
16609 set dummy pkg-config; ac_word=$2
16610 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
16611 -echo "configure:73287: checking for $ac_word" >&5
16612 +echo "configure:75340: checking for $ac_word" >&5
16613 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
16614 echo $ac_n "(cached) $ac_c" 1>&6
16616 @@ -73327,7 +75380,7 @@ fi
16617 old_LDFLAGS=$LDFLAGS
16618 LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
16619 echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
16620 -echo "configure:73331: checking for PQparameterStatus in -lpq" >&5
16621 +echo "configure:75384: checking for PQparameterStatus in -lpq" >&5
16622 ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
16623 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16624 echo $ac_n "(cached) $ac_c" 1>&6
16625 @@ -73335,7 +75388,7 @@ else
16626 ac_save_LIBS="$LIBS"
16628 cat > conftest.$ac_ext <<EOF
16629 -#line 73339 "configure"
16630 +#line 75392 "configure"
16631 #include "confdefs.h"
16632 /* Override any gcc2 internal prototype to avoid an error. */
16633 /* We use char because int might match the return type of a gcc2
16634 @@ -73346,7 +75399,7 @@ int main() {
16635 PQparameterStatus()
16638 -if { (eval echo configure:73350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16639 +if { (eval echo configure:75403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16641 eval "ac_cv_lib_$ac_lib_var=yes"
16643 @@ -73375,7 +75428,7 @@ fi
16646 echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
16647 -echo "configure:73379: checking for PQprepare in -lpq" >&5
16648 +echo "configure:75432: checking for PQprepare in -lpq" >&5
16649 ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
16650 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16651 echo $ac_n "(cached) $ac_c" 1>&6
16652 @@ -73383,7 +75436,7 @@ else
16653 ac_save_LIBS="$LIBS"
16655 cat > conftest.$ac_ext <<EOF
16656 -#line 73387 "configure"
16657 +#line 75440 "configure"
16658 #include "confdefs.h"
16659 /* Override any gcc2 internal prototype to avoid an error. */
16660 /* We use char because int might match the return type of a gcc2
16661 @@ -73394,7 +75447,7 @@ int main() {
16665 -if { (eval echo configure:73398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16666 +if { (eval echo configure:75451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16668 eval "ac_cv_lib_$ac_lib_var=yes"
16670 @@ -73418,7 +75471,7 @@ else
16673 echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
16674 -echo "configure:73422: checking for PQescapeStringConn in -lpq" >&5
16675 +echo "configure:75475: checking for PQescapeStringConn in -lpq" >&5
16676 ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
16677 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16678 echo $ac_n "(cached) $ac_c" 1>&6
16679 @@ -73426,7 +75479,7 @@ else
16680 ac_save_LIBS="$LIBS"
16682 cat > conftest.$ac_ext <<EOF
16683 -#line 73430 "configure"
16684 +#line 75483 "configure"
16685 #include "confdefs.h"
16686 /* Override any gcc2 internal prototype to avoid an error. */
16687 /* We use char because int might match the return type of a gcc2
16688 @@ -73437,7 +75490,7 @@ int main() {
16689 PQescapeStringConn()
16692 -if { (eval echo configure:73441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16693 +if { (eval echo configure:75494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16695 eval "ac_cv_lib_$ac_lib_var=yes"
16697 @@ -73461,7 +75514,7 @@ else
16700 echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
16701 -echo "configure:73465: checking for PQescapeByteaConn in -lpq" >&5
16702 +echo "configure:75518: checking for PQescapeByteaConn in -lpq" >&5
16703 ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
16704 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16705 echo $ac_n "(cached) $ac_c" 1>&6
16706 @@ -73469,7 +75522,7 @@ else
16707 ac_save_LIBS="$LIBS"
16709 cat > conftest.$ac_ext <<EOF
16710 -#line 73473 "configure"
16711 +#line 75526 "configure"
16712 #include "confdefs.h"
16713 /* Override any gcc2 internal prototype to avoid an error. */
16714 /* We use char because int might match the return type of a gcc2
16715 @@ -73480,7 +75533,7 @@ int main() {
16716 PQescapeByteaConn()
16719 -if { (eval echo configure:73484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16720 +if { (eval echo configure:75537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16722 eval "ac_cv_lib_$ac_lib_var=yes"
16724 @@ -73505,7 +75558,7 @@ fi
16727 echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
16728 -echo "configure:73509: checking for pg_encoding_to_char in -lpq" >&5
16729 +echo "configure:75562: checking for pg_encoding_to_char in -lpq" >&5
16730 ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
16731 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16732 echo $ac_n "(cached) $ac_c" 1>&6
16733 @@ -73513,7 +75566,7 @@ else
16734 ac_save_LIBS="$LIBS"
16736 cat > conftest.$ac_ext <<EOF
16737 -#line 73517 "configure"
16738 +#line 75570 "configure"
16739 #include "confdefs.h"
16740 /* Override any gcc2 internal prototype to avoid an error. */
16741 /* We use char because int might match the return type of a gcc2
16742 @@ -73524,7 +75577,7 @@ int main() {
16743 pg_encoding_to_char()
16746 -if { (eval echo configure:73528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16747 +if { (eval echo configure:75581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16749 eval "ac_cv_lib_$ac_lib_var=yes"
16751 @@ -73688,13 +75741,13 @@ fi
16754 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
16755 -echo "configure:73692: checking for PDO includes" >&5
16756 +echo "configure:75745: checking for PDO includes" >&5
16757 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
16758 echo $ac_n "(cached) $ac_c" 1>&6
16761 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
16762 -echo "configure:73698: checking for PDO includes" >&5
16763 +echo "configure:75751: checking for PDO includes" >&5
16764 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
16765 pdo_inc_path=$abs_srcdir/ext
16766 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
16767 @@ -74034,7 +76087,7 @@ fi
16768 php_with_pdo_sqlite=$PHP_PDO
16770 echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6
16771 -echo "configure:74038: checking for sqlite 3 support for PDO" >&5
16772 +echo "configure:76091: checking for sqlite 3 support for PDO" >&5
16773 # Check whether --with-pdo-sqlite or --without-pdo-sqlite was given.
16774 if test "${with_pdo_sqlite+set}" = set; then
16775 withval="$with_pdo_sqlite"
16776 @@ -74083,13 +76136,13 @@ if test "$PHP_PDO_SQLITE" != "no"; then
16779 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
16780 -echo "configure:74087: checking for PDO includes" >&5
16781 +echo "configure:76140: checking for PDO includes" >&5
16782 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
16783 echo $ac_n "(cached) $ac_c" 1>&6
16786 echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
16787 -echo "configure:74093: checking for PDO includes" >&5
16788 +echo "configure:76146: checking for PDO includes" >&5
16789 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
16790 pdo_inc_path=$abs_srcdir/ext
16791 elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
16792 @@ -74118,7 +76171,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
16793 PDO_SQLITE_DIR=$PHP_PDO_SQLITE
16794 else # search default path list
16795 echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
16796 -echo "configure:74122: checking for sqlite3 files in default path" >&5
16797 +echo "configure:76175: checking for sqlite3 files in default path" >&5
16798 for i in $SEARCH_PATH ; do
16799 if test -r $i/$SEARCH_FOR; then
16801 @@ -74264,7 +76317,7 @@ echo "configure:74122: checking for sqli
16804 echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
16805 -echo "configure:74268: checking for $LIBSYMBOL in -l$LIBNAME" >&5
16806 +echo "configure:76321: checking for $LIBSYMBOL in -l$LIBNAME" >&5
16807 ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'`
16808 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16809 echo $ac_n "(cached) $ac_c" 1>&6
16810 @@ -74272,7 +76325,7 @@ else
16811 ac_save_LIBS="$LIBS"
16812 LIBS="-l$LIBNAME $LIBS"
16813 cat > conftest.$ac_ext <<EOF
16814 -#line 74276 "configure"
16815 +#line 76329 "configure"
16816 #include "confdefs.h"
16817 /* Override any gcc2 internal prototype to avoid an error. */
16818 /* We use char because int might match the return type of a gcc2
16819 @@ -74283,7 +76336,7 @@ int main() {
16823 -if { (eval echo configure:74287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16824 +if { (eval echo configure:76340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16826 eval "ac_cv_lib_$ac_lib_var=yes"
16828 @@ -74513,7 +76566,7 @@ fi
16831 echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
16832 -echo "configure:74517: checking for sqlite3_key in -lsqlite3" >&5
16833 +echo "configure:76570: checking for sqlite3_key in -lsqlite3" >&5
16834 ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
16835 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16836 echo $ac_n "(cached) $ac_c" 1>&6
16837 @@ -74521,7 +76574,7 @@ else
16838 ac_save_LIBS="$LIBS"
16839 LIBS="-lsqlite3 $LIBS"
16840 cat > conftest.$ac_ext <<EOF
16841 -#line 74525 "configure"
16842 +#line 76578 "configure"
16843 #include "confdefs.h"
16844 /* Override any gcc2 internal prototype to avoid an error. */
16845 /* We use char because int might match the return type of a gcc2
16846 @@ -74532,7 +76585,7 @@ int main() {
16850 -if { (eval echo configure:74536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16851 +if { (eval echo configure:76589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16853 eval "ac_cv_lib_$ac_lib_var=yes"
16855 @@ -75273,12 +77326,12 @@ but you've either not enabled sqlite3, o
16856 for ac_func in usleep nanosleep
16858 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
16859 -echo "configure:75277: checking for $ac_func" >&5
16860 +echo "configure:77330: checking for $ac_func" >&5
16861 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
16862 echo $ac_n "(cached) $ac_c" 1>&6
16864 cat > conftest.$ac_ext <<EOF
16865 -#line 75282 "configure"
16866 +#line 77335 "configure"
16867 #include "confdefs.h"
16868 /* System header to define __stub macros and hopefully few prototypes,
16869 which can conflict with char $ac_func(); below. */
16870 @@ -75301,7 +77354,7 @@ $ac_func();
16874 -if { (eval echo configure:75305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16875 +if { (eval echo configure:77358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16877 eval "ac_cv_func_$ac_func=yes"
16879 @@ -75329,17 +77382,17 @@ done
16881 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
16882 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
16883 -echo "configure:75333: checking for $ac_hdr" >&5
16884 +echo "configure:77386: checking for $ac_hdr" >&5
16885 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
16886 echo $ac_n "(cached) $ac_c" 1>&6
16888 cat > conftest.$ac_ext <<EOF
16889 -#line 75338 "configure"
16890 +#line 77391 "configure"
16891 #include "confdefs.h"
16894 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
16895 -{ (eval echo configure:75343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
16896 +{ (eval echo configure:77396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
16897 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
16898 if test -z "$ac_err"; then
16900 @@ -75463,7 +77516,7 @@ done
16903 echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6
16904 -echo "configure:75467: checking for fdatasync in -lrt" >&5
16905 +echo "configure:77520: checking for fdatasync in -lrt" >&5
16906 ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'`
16907 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16908 echo $ac_n "(cached) $ac_c" 1>&6
16909 @@ -75471,7 +77524,7 @@ else
16910 ac_save_LIBS="$LIBS"
16912 cat > conftest.$ac_ext <<EOF
16913 -#line 75475 "configure"
16914 +#line 77528 "configure"
16915 #include "confdefs.h"
16916 /* Override any gcc2 internal prototype to avoid an error. */
16917 /* We use char because int might match the return type of a gcc2
16918 @@ -75482,7 +77535,7 @@ int main() {
16922 -if { (eval echo configure:75486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16923 +if { (eval echo configure:77539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16925 eval "ac_cv_lib_$ac_lib_var=yes"
16927 @@ -75563,7 +77616,7 @@ fi
16930 echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
16931 -echo "configure:75567: checking for PostgreSQL support" >&5
16932 +echo "configure:77620: checking for PostgreSQL support" >&5
16933 # Check whether --with-pgsql or --without-pgsql was given.
16934 if test "${with_pgsql+set}" = set; then
16935 withval="$with_pgsql"
16936 @@ -75617,7 +77670,7 @@ if test "$PHP_PGSQL" != "no"; then
16939 echo $ac_n "checking for pg_config""... $ac_c" 1>&6
16940 -echo "configure:75621: checking for pg_config" >&5
16941 +echo "configure:77674: checking for pg_config" >&5
16942 for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
16943 if test -x $i/pg_config; then
16944 PG_CONFIG="$i/pg_config"
16945 @@ -75685,7 +77738,7 @@ EOF
16946 old_LDFLAGS=$LDFLAGS
16947 LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
16948 echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
16949 -echo "configure:75689: checking for PQescapeString in -lpq" >&5
16950 +echo "configure:77742: checking for PQescapeString in -lpq" >&5
16951 ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'`
16952 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16953 echo $ac_n "(cached) $ac_c" 1>&6
16954 @@ -75693,7 +77746,7 @@ else
16955 ac_save_LIBS="$LIBS"
16957 cat > conftest.$ac_ext <<EOF
16958 -#line 75697 "configure"
16959 +#line 77750 "configure"
16960 #include "confdefs.h"
16961 /* Override any gcc2 internal prototype to avoid an error. */
16962 /* We use char because int might match the return type of a gcc2
16963 @@ -75704,7 +77757,7 @@ int main() {
16967 -if { (eval echo configure:75708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16968 +if { (eval echo configure:77761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16970 eval "ac_cv_lib_$ac_lib_var=yes"
16972 @@ -75728,7 +77781,7 @@ else
16975 echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
16976 -echo "configure:75732: checking for PQunescapeBytea in -lpq" >&5
16977 +echo "configure:77785: checking for PQunescapeBytea in -lpq" >&5
16978 ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'`
16979 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
16980 echo $ac_n "(cached) $ac_c" 1>&6
16981 @@ -75736,7 +77789,7 @@ else
16982 ac_save_LIBS="$LIBS"
16984 cat > conftest.$ac_ext <<EOF
16985 -#line 75740 "configure"
16986 +#line 77793 "configure"
16987 #include "confdefs.h"
16988 /* Override any gcc2 internal prototype to avoid an error. */
16989 /* We use char because int might match the return type of a gcc2
16990 @@ -75747,7 +77800,7 @@ int main() {
16994 -if { (eval echo configure:75751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16995 +if { (eval echo configure:77804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
16997 eval "ac_cv_lib_$ac_lib_var=yes"
16999 @@ -75771,7 +77824,7 @@ else
17002 echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
17003 -echo "configure:75775: checking for PQsetnonblocking in -lpq" >&5
17004 +echo "configure:77828: checking for PQsetnonblocking in -lpq" >&5
17005 ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'`
17006 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17007 echo $ac_n "(cached) $ac_c" 1>&6
17008 @@ -75779,7 +77832,7 @@ else
17009 ac_save_LIBS="$LIBS"
17011 cat > conftest.$ac_ext <<EOF
17012 -#line 75783 "configure"
17013 +#line 77836 "configure"
17014 #include "confdefs.h"
17015 /* Override any gcc2 internal prototype to avoid an error. */
17016 /* We use char because int might match the return type of a gcc2
17017 @@ -75790,7 +77843,7 @@ int main() {
17021 -if { (eval echo configure:75794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17022 +if { (eval echo configure:77847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17024 eval "ac_cv_lib_$ac_lib_var=yes"
17026 @@ -75814,7 +77867,7 @@ else
17029 echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
17030 -echo "configure:75818: checking for PQcmdTuples in -lpq" >&5
17031 +echo "configure:77871: checking for PQcmdTuples in -lpq" >&5
17032 ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
17033 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17034 echo $ac_n "(cached) $ac_c" 1>&6
17035 @@ -75822,7 +77875,7 @@ else
17036 ac_save_LIBS="$LIBS"
17038 cat > conftest.$ac_ext <<EOF
17039 -#line 75826 "configure"
17040 +#line 77879 "configure"
17041 #include "confdefs.h"
17042 /* Override any gcc2 internal prototype to avoid an error. */
17043 /* We use char because int might match the return type of a gcc2
17044 @@ -75833,7 +77886,7 @@ int main() {
17048 -if { (eval echo configure:75837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17049 +if { (eval echo configure:77890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17051 eval "ac_cv_lib_$ac_lib_var=yes"
17053 @@ -75857,7 +77910,7 @@ else
17056 echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
17057 -echo "configure:75861: checking for PQoidValue in -lpq" >&5
17058 +echo "configure:77914: checking for PQoidValue in -lpq" >&5
17059 ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
17060 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17061 echo $ac_n "(cached) $ac_c" 1>&6
17062 @@ -75865,7 +77918,7 @@ else
17063 ac_save_LIBS="$LIBS"
17065 cat > conftest.$ac_ext <<EOF
17066 -#line 75869 "configure"
17067 +#line 77922 "configure"
17068 #include "confdefs.h"
17069 /* Override any gcc2 internal prototype to avoid an error. */
17070 /* We use char because int might match the return type of a gcc2
17071 @@ -75876,7 +77929,7 @@ int main() {
17075 -if { (eval echo configure:75880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17076 +if { (eval echo configure:77933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17078 eval "ac_cv_lib_$ac_lib_var=yes"
17080 @@ -75900,7 +77953,7 @@ else
17083 echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
17084 -echo "configure:75904: checking for PQclientEncoding in -lpq" >&5
17085 +echo "configure:77957: checking for PQclientEncoding in -lpq" >&5
17086 ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'`
17087 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17088 echo $ac_n "(cached) $ac_c" 1>&6
17089 @@ -75908,7 +77961,7 @@ else
17090 ac_save_LIBS="$LIBS"
17092 cat > conftest.$ac_ext <<EOF
17093 -#line 75912 "configure"
17094 +#line 77965 "configure"
17095 #include "confdefs.h"
17096 /* Override any gcc2 internal prototype to avoid an error. */
17097 /* We use char because int might match the return type of a gcc2
17098 @@ -75919,7 +77972,7 @@ int main() {
17102 -if { (eval echo configure:75923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17103 +if { (eval echo configure:77976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17105 eval "ac_cv_lib_$ac_lib_var=yes"
17107 @@ -75943,7 +77996,7 @@ else
17110 echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
17111 -echo "configure:75947: checking for PQparameterStatus in -lpq" >&5
17112 +echo "configure:78000: checking for PQparameterStatus in -lpq" >&5
17113 ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
17114 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17115 echo $ac_n "(cached) $ac_c" 1>&6
17116 @@ -75951,7 +78004,7 @@ else
17117 ac_save_LIBS="$LIBS"
17119 cat > conftest.$ac_ext <<EOF
17120 -#line 75955 "configure"
17121 +#line 78008 "configure"
17122 #include "confdefs.h"
17123 /* Override any gcc2 internal prototype to avoid an error. */
17124 /* We use char because int might match the return type of a gcc2
17125 @@ -75962,7 +78015,7 @@ int main() {
17126 PQparameterStatus()
17129 -if { (eval echo configure:75966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17130 +if { (eval echo configure:78019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17132 eval "ac_cv_lib_$ac_lib_var=yes"
17134 @@ -75986,7 +78039,7 @@ else
17137 echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
17138 -echo "configure:75990: checking for PQprotocolVersion in -lpq" >&5
17139 +echo "configure:78043: checking for PQprotocolVersion in -lpq" >&5
17140 ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'`
17141 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17142 echo $ac_n "(cached) $ac_c" 1>&6
17143 @@ -75994,7 +78047,7 @@ else
17144 ac_save_LIBS="$LIBS"
17146 cat > conftest.$ac_ext <<EOF
17147 -#line 75998 "configure"
17148 +#line 78051 "configure"
17149 #include "confdefs.h"
17150 /* Override any gcc2 internal prototype to avoid an error. */
17151 /* We use char because int might match the return type of a gcc2
17152 @@ -76005,7 +78058,7 @@ int main() {
17153 PQprotocolVersion()
17156 -if { (eval echo configure:76009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17157 +if { (eval echo configure:78062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17159 eval "ac_cv_lib_$ac_lib_var=yes"
17161 @@ -76029,7 +78082,7 @@ else
17164 echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
17165 -echo "configure:76033: checking for PQtransactionStatus in -lpq" >&5
17166 +echo "configure:78086: checking for PQtransactionStatus in -lpq" >&5
17167 ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'`
17168 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17169 echo $ac_n "(cached) $ac_c" 1>&6
17170 @@ -76037,7 +78090,7 @@ else
17171 ac_save_LIBS="$LIBS"
17173 cat > conftest.$ac_ext <<EOF
17174 -#line 76041 "configure"
17175 +#line 78094 "configure"
17176 #include "confdefs.h"
17177 /* Override any gcc2 internal prototype to avoid an error. */
17178 /* We use char because int might match the return type of a gcc2
17179 @@ -76048,7 +78101,7 @@ int main() {
17180 PQtransactionStatus()
17183 -if { (eval echo configure:76052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17184 +if { (eval echo configure:78105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17186 eval "ac_cv_lib_$ac_lib_var=yes"
17188 @@ -76072,7 +78125,7 @@ else
17191 echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6
17192 -echo "configure:76076: checking for PQexecParams in -lpq" >&5
17193 +echo "configure:78129: checking for PQexecParams in -lpq" >&5
17194 ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'`
17195 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17196 echo $ac_n "(cached) $ac_c" 1>&6
17197 @@ -76080,7 +78133,7 @@ else
17198 ac_save_LIBS="$LIBS"
17200 cat > conftest.$ac_ext <<EOF
17201 -#line 76084 "configure"
17202 +#line 78137 "configure"
17203 #include "confdefs.h"
17204 /* Override any gcc2 internal prototype to avoid an error. */
17205 /* We use char because int might match the return type of a gcc2
17206 @@ -76091,7 +78144,7 @@ int main() {
17210 -if { (eval echo configure:76095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17211 +if { (eval echo configure:78148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17213 eval "ac_cv_lib_$ac_lib_var=yes"
17215 @@ -76115,7 +78168,7 @@ else
17218 echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
17219 -echo "configure:76119: checking for PQprepare in -lpq" >&5
17220 +echo "configure:78172: checking for PQprepare in -lpq" >&5
17221 ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
17222 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17223 echo $ac_n "(cached) $ac_c" 1>&6
17224 @@ -76123,7 +78176,7 @@ else
17225 ac_save_LIBS="$LIBS"
17227 cat > conftest.$ac_ext <<EOF
17228 -#line 76127 "configure"
17229 +#line 78180 "configure"
17230 #include "confdefs.h"
17231 /* Override any gcc2 internal prototype to avoid an error. */
17232 /* We use char because int might match the return type of a gcc2
17233 @@ -76134,7 +78187,7 @@ int main() {
17237 -if { (eval echo configure:76138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17238 +if { (eval echo configure:78191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17240 eval "ac_cv_lib_$ac_lib_var=yes"
17242 @@ -76158,7 +78211,7 @@ else
17245 echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6
17246 -echo "configure:76162: checking for PQexecPrepared in -lpq" >&5
17247 +echo "configure:78215: checking for PQexecPrepared in -lpq" >&5
17248 ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'`
17249 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17250 echo $ac_n "(cached) $ac_c" 1>&6
17251 @@ -76166,7 +78219,7 @@ else
17252 ac_save_LIBS="$LIBS"
17254 cat > conftest.$ac_ext <<EOF
17255 -#line 76170 "configure"
17256 +#line 78223 "configure"
17257 #include "confdefs.h"
17258 /* Override any gcc2 internal prototype to avoid an error. */
17259 /* We use char because int might match the return type of a gcc2
17260 @@ -76177,7 +78230,7 @@ int main() {
17264 -if { (eval echo configure:76181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17265 +if { (eval echo configure:78234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17267 eval "ac_cv_lib_$ac_lib_var=yes"
17269 @@ -76201,7 +78254,7 @@ else
17272 echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6
17273 -echo "configure:76205: checking for PQresultErrorField in -lpq" >&5
17274 +echo "configure:78258: checking for PQresultErrorField in -lpq" >&5
17275 ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'`
17276 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17277 echo $ac_n "(cached) $ac_c" 1>&6
17278 @@ -76209,7 +78262,7 @@ else
17279 ac_save_LIBS="$LIBS"
17281 cat > conftest.$ac_ext <<EOF
17282 -#line 76213 "configure"
17283 +#line 78266 "configure"
17284 #include "confdefs.h"
17285 /* Override any gcc2 internal prototype to avoid an error. */
17286 /* We use char because int might match the return type of a gcc2
17287 @@ -76220,7 +78273,7 @@ int main() {
17288 PQresultErrorField()
17291 -if { (eval echo configure:76224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17292 +if { (eval echo configure:78277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17294 eval "ac_cv_lib_$ac_lib_var=yes"
17296 @@ -76244,7 +78297,7 @@ else
17299 echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6
17300 -echo "configure:76248: checking for PQsendQueryParams in -lpq" >&5
17301 +echo "configure:78301: checking for PQsendQueryParams in -lpq" >&5
17302 ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'`
17303 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17304 echo $ac_n "(cached) $ac_c" 1>&6
17305 @@ -76252,7 +78305,7 @@ else
17306 ac_save_LIBS="$LIBS"
17308 cat > conftest.$ac_ext <<EOF
17309 -#line 76256 "configure"
17310 +#line 78309 "configure"
17311 #include "confdefs.h"
17312 /* Override any gcc2 internal prototype to avoid an error. */
17313 /* We use char because int might match the return type of a gcc2
17314 @@ -76263,7 +78316,7 @@ int main() {
17315 PQsendQueryParams()
17318 -if { (eval echo configure:76267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17319 +if { (eval echo configure:78320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17321 eval "ac_cv_lib_$ac_lib_var=yes"
17323 @@ -76287,7 +78340,7 @@ else
17326 echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6
17327 -echo "configure:76291: checking for PQsendPrepare in -lpq" >&5
17328 +echo "configure:78344: checking for PQsendPrepare in -lpq" >&5
17329 ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'`
17330 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17331 echo $ac_n "(cached) $ac_c" 1>&6
17332 @@ -76295,7 +78348,7 @@ else
17333 ac_save_LIBS="$LIBS"
17335 cat > conftest.$ac_ext <<EOF
17336 -#line 76299 "configure"
17337 +#line 78352 "configure"
17338 #include "confdefs.h"
17339 /* Override any gcc2 internal prototype to avoid an error. */
17340 /* We use char because int might match the return type of a gcc2
17341 @@ -76306,7 +78359,7 @@ int main() {
17345 -if { (eval echo configure:76310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17346 +if { (eval echo configure:78363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17348 eval "ac_cv_lib_$ac_lib_var=yes"
17350 @@ -76330,7 +78383,7 @@ else
17353 echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6
17354 -echo "configure:76334: checking for PQsendQueryPrepared in -lpq" >&5
17355 +echo "configure:78387: checking for PQsendQueryPrepared in -lpq" >&5
17356 ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'`
17357 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17358 echo $ac_n "(cached) $ac_c" 1>&6
17359 @@ -76338,7 +78391,7 @@ else
17360 ac_save_LIBS="$LIBS"
17362 cat > conftest.$ac_ext <<EOF
17363 -#line 76342 "configure"
17364 +#line 78395 "configure"
17365 #include "confdefs.h"
17366 /* Override any gcc2 internal prototype to avoid an error. */
17367 /* We use char because int might match the return type of a gcc2
17368 @@ -76349,7 +78402,7 @@ int main() {
17369 PQsendQueryPrepared()
17372 -if { (eval echo configure:76353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17373 +if { (eval echo configure:78406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17375 eval "ac_cv_lib_$ac_lib_var=yes"
17377 @@ -76373,7 +78426,7 @@ else
17380 echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6
17381 -echo "configure:76377: checking for PQputCopyData in -lpq" >&5
17382 +echo "configure:78430: checking for PQputCopyData in -lpq" >&5
17383 ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'`
17384 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17385 echo $ac_n "(cached) $ac_c" 1>&6
17386 @@ -76381,7 +78434,7 @@ else
17387 ac_save_LIBS="$LIBS"
17389 cat > conftest.$ac_ext <<EOF
17390 -#line 76385 "configure"
17391 +#line 78438 "configure"
17392 #include "confdefs.h"
17393 /* Override any gcc2 internal prototype to avoid an error. */
17394 /* We use char because int might match the return type of a gcc2
17395 @@ -76392,7 +78445,7 @@ int main() {
17399 -if { (eval echo configure:76396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17400 +if { (eval echo configure:78449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17402 eval "ac_cv_lib_$ac_lib_var=yes"
17404 @@ -76416,7 +78469,7 @@ else
17407 echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6
17408 -echo "configure:76420: checking for PQputCopyEnd in -lpq" >&5
17409 +echo "configure:78473: checking for PQputCopyEnd in -lpq" >&5
17410 ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'`
17411 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17412 echo $ac_n "(cached) $ac_c" 1>&6
17413 @@ -76424,7 +78477,7 @@ else
17414 ac_save_LIBS="$LIBS"
17416 cat > conftest.$ac_ext <<EOF
17417 -#line 76428 "configure"
17418 +#line 78481 "configure"
17419 #include "confdefs.h"
17420 /* Override any gcc2 internal prototype to avoid an error. */
17421 /* We use char because int might match the return type of a gcc2
17422 @@ -76435,7 +78488,7 @@ int main() {
17426 -if { (eval echo configure:76439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17427 +if { (eval echo configure:78492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17429 eval "ac_cv_lib_$ac_lib_var=yes"
17431 @@ -76459,7 +78512,7 @@ else
17434 echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6
17435 -echo "configure:76463: checking for PQgetCopyData in -lpq" >&5
17436 +echo "configure:78516: checking for PQgetCopyData in -lpq" >&5
17437 ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'`
17438 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17439 echo $ac_n "(cached) $ac_c" 1>&6
17440 @@ -76467,7 +78520,7 @@ else
17441 ac_save_LIBS="$LIBS"
17443 cat > conftest.$ac_ext <<EOF
17444 -#line 76471 "configure"
17445 +#line 78524 "configure"
17446 #include "confdefs.h"
17447 /* Override any gcc2 internal prototype to avoid an error. */
17448 /* We use char because int might match the return type of a gcc2
17449 @@ -76478,7 +78531,7 @@ int main() {
17453 -if { (eval echo configure:76482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17454 +if { (eval echo configure:78535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17456 eval "ac_cv_lib_$ac_lib_var=yes"
17458 @@ -76502,7 +78555,7 @@ else
17461 echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6
17462 -echo "configure:76506: checking for PQfreemem in -lpq" >&5
17463 +echo "configure:78559: checking for PQfreemem in -lpq" >&5
17464 ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'`
17465 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17466 echo $ac_n "(cached) $ac_c" 1>&6
17467 @@ -76510,7 +78563,7 @@ else
17468 ac_save_LIBS="$LIBS"
17470 cat > conftest.$ac_ext <<EOF
17471 -#line 76514 "configure"
17472 +#line 78567 "configure"
17473 #include "confdefs.h"
17474 /* Override any gcc2 internal prototype to avoid an error. */
17475 /* We use char because int might match the return type of a gcc2
17476 @@ -76521,7 +78574,7 @@ int main() {
17480 -if { (eval echo configure:76525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17481 +if { (eval echo configure:78578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17483 eval "ac_cv_lib_$ac_lib_var=yes"
17485 @@ -76545,7 +78598,7 @@ else
17488 echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6
17489 -echo "configure:76549: checking for PQsetErrorVerbosity in -lpq" >&5
17490 +echo "configure:78602: checking for PQsetErrorVerbosity in -lpq" >&5
17491 ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'`
17492 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17493 echo $ac_n "(cached) $ac_c" 1>&6
17494 @@ -76553,7 +78606,7 @@ else
17495 ac_save_LIBS="$LIBS"
17497 cat > conftest.$ac_ext <<EOF
17498 -#line 76557 "configure"
17499 +#line 78610 "configure"
17500 #include "confdefs.h"
17501 /* Override any gcc2 internal prototype to avoid an error. */
17502 /* We use char because int might match the return type of a gcc2
17503 @@ -76564,7 +78617,7 @@ int main() {
17504 PQsetErrorVerbosity()
17507 -if { (eval echo configure:76568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17508 +if { (eval echo configure:78621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17510 eval "ac_cv_lib_$ac_lib_var=yes"
17512 @@ -76576,425 +78629,5435 @@ fi
17514 LIBS="$ac_save_LIBS"
17517 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
17518 - echo "$ac_t""yes" 1>&6
17519 - cat >> confdefs.h <<\EOF
17520 -#define HAVE_PQSETERRORVERBOSITY 1
17523 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
17524 + echo "$ac_t""yes" 1>&6
17525 + cat >> confdefs.h <<\EOF
17526 +#define HAVE_PQSETERRORVERBOSITY 1
17530 + echo "$ac_t""no" 1>&6
17533 + echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6
17534 +echo "configure:78645: checking for PQftable in -lpq" >&5
17535 +ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'`
17536 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17537 + echo $ac_n "(cached) $ac_c" 1>&6
17539 + ac_save_LIBS="$LIBS"
17541 +cat > conftest.$ac_ext <<EOF
17542 +#line 78653 "configure"
17543 +#include "confdefs.h"
17544 +/* Override any gcc2 internal prototype to avoid an error. */
17545 +/* We use char because int might match the return type of a gcc2
17546 + builtin and then its argument prototype would still apply. */
17553 +if { (eval echo configure:78664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17555 + eval "ac_cv_lib_$ac_lib_var=yes"
17557 + echo "configure: failed program was:" >&5
17558 + cat conftest.$ac_ext >&5
17560 + eval "ac_cv_lib_$ac_lib_var=no"
17563 +LIBS="$ac_save_LIBS"
17566 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
17567 + echo "$ac_t""yes" 1>&6
17568 + cat >> confdefs.h <<\EOF
17569 +#define HAVE_PQFTABLE 1
17573 + echo "$ac_t""no" 1>&6
17576 + echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
17577 +echo "configure:78688: checking for PQescapeStringConn in -lpq" >&5
17578 +ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
17579 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17580 + echo $ac_n "(cached) $ac_c" 1>&6
17582 + ac_save_LIBS="$LIBS"
17584 +cat > conftest.$ac_ext <<EOF
17585 +#line 78696 "configure"
17586 +#include "confdefs.h"
17587 +/* Override any gcc2 internal prototype to avoid an error. */
17588 +/* We use char because int might match the return type of a gcc2
17589 + builtin and then its argument prototype would still apply. */
17590 +char PQescapeStringConn();
17593 +PQescapeStringConn()
17596 +if { (eval echo configure:78707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17598 + eval "ac_cv_lib_$ac_lib_var=yes"
17600 + echo "configure: failed program was:" >&5
17601 + cat conftest.$ac_ext >&5
17603 + eval "ac_cv_lib_$ac_lib_var=no"
17606 +LIBS="$ac_save_LIBS"
17609 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
17610 + echo "$ac_t""yes" 1>&6
17611 + cat >> confdefs.h <<\EOF
17612 +#define HAVE_PQESCAPE_CONN 1
17616 + echo "$ac_t""no" 1>&6
17619 + echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
17620 +echo "configure:78731: checking for PQescapeByteaConn in -lpq" >&5
17621 +ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
17622 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17623 + echo $ac_n "(cached) $ac_c" 1>&6
17625 + ac_save_LIBS="$LIBS"
17627 +cat > conftest.$ac_ext <<EOF
17628 +#line 78739 "configure"
17629 +#include "confdefs.h"
17630 +/* Override any gcc2 internal prototype to avoid an error. */
17631 +/* We use char because int might match the return type of a gcc2
17632 + builtin and then its argument prototype would still apply. */
17633 +char PQescapeByteaConn();
17636 +PQescapeByteaConn()
17639 +if { (eval echo configure:78750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17641 + eval "ac_cv_lib_$ac_lib_var=yes"
17643 + echo "configure: failed program was:" >&5
17644 + cat conftest.$ac_ext >&5
17646 + eval "ac_cv_lib_$ac_lib_var=no"
17649 +LIBS="$ac_save_LIBS"
17652 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
17653 + echo "$ac_t""yes" 1>&6
17654 + cat >> confdefs.h <<\EOF
17655 +#define HAVE_PQESCAPE_BYTEA_CONN 1
17659 + echo "$ac_t""no" 1>&6
17662 + echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
17663 +echo "configure:78774: checking for pg_encoding_to_char in -lpq" >&5
17664 +ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
17665 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17666 + echo $ac_n "(cached) $ac_c" 1>&6
17668 + ac_save_LIBS="$LIBS"
17670 +cat > conftest.$ac_ext <<EOF
17671 +#line 78782 "configure"
17672 +#include "confdefs.h"
17673 +/* Override any gcc2 internal prototype to avoid an error. */
17674 +/* We use char because int might match the return type of a gcc2
17675 + builtin and then its argument prototype would still apply. */
17676 +char pg_encoding_to_char();
17679 +pg_encoding_to_char()
17682 +if { (eval echo configure:78793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17684 + eval "ac_cv_lib_$ac_lib_var=yes"
17686 + echo "configure: failed program was:" >&5
17687 + cat conftest.$ac_ext >&5
17689 + eval "ac_cv_lib_$ac_lib_var=no"
17692 +LIBS="$ac_save_LIBS"
17695 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
17696 + echo "$ac_t""yes" 1>&6
17697 + cat >> confdefs.h <<\EOF
17698 +#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1
17702 + echo "$ac_t""no" 1>&6
17705 + echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6
17706 +echo "configure:78817: checking for lo_create in -lpq" >&5
17707 +ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'`
17708 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17709 + echo $ac_n "(cached) $ac_c" 1>&6
17711 + ac_save_LIBS="$LIBS"
17713 +cat > conftest.$ac_ext <<EOF
17714 +#line 78825 "configure"
17715 +#include "confdefs.h"
17716 +/* Override any gcc2 internal prototype to avoid an error. */
17717 +/* We use char because int might match the return type of a gcc2
17718 + builtin and then its argument prototype would still apply. */
17725 +if { (eval echo configure:78836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17727 + eval "ac_cv_lib_$ac_lib_var=yes"
17729 + echo "configure: failed program was:" >&5
17730 + cat conftest.$ac_ext >&5
17732 + eval "ac_cv_lib_$ac_lib_var=no"
17735 +LIBS="$ac_save_LIBS"
17738 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
17739 + echo "$ac_t""yes" 1>&6
17740 + cat >> confdefs.h <<\EOF
17741 +#define HAVE_PG_LO_CREATE 1
17745 + echo "$ac_t""no" 1>&6
17748 + echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6
17749 +echo "configure:78860: checking for lo_import_with_oid in -lpq" >&5
17750 +ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'`
17751 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
17752 + echo $ac_n "(cached) $ac_c" 1>&6
17754 + ac_save_LIBS="$LIBS"
17756 +cat > conftest.$ac_ext <<EOF
17757 +#line 78868 "configure"
17758 +#include "confdefs.h"
17759 +/* Override any gcc2 internal prototype to avoid an error. */
17760 +/* We use char because int might match the return type of a gcc2
17761 + builtin and then its argument prototype would still apply. */
17762 +char lo_import_with_oid();
17765 +lo_import_with_oid()
17768 +if { (eval echo configure:78879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
17770 + eval "ac_cv_lib_$ac_lib_var=yes"
17772 + echo "configure: failed program was:" >&5
17773 + cat conftest.$ac_ext >&5
17775 + eval "ac_cv_lib_$ac_lib_var=no"
17778 +LIBS="$ac_save_LIBS"
17781 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
17782 + echo "$ac_t""yes" 1>&6
17783 + cat >> confdefs.h <<\EOF
17784 +#define HAVE_PG_LO_IMPORT_WITH_OID 1
17788 + echo "$ac_t""no" 1>&6
17792 + LDFLAGS=$old_LDFLAGS
17796 + if test "$ext_shared" = "yes"; then
17797 + PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD"
17798 + if test -n "$PGSQL_LIBDIR"; then
17800 + if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
17802 + if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
17803 + ai_p=$PGSQL_LIBDIR
17806 + ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
17808 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
17809 + ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
17813 + if test "$ext_shared" = "yes"; then
17814 + PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD"
17815 + test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_SHARED_LIBADD"
17820 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
17822 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
17823 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
17824 + eval "LIBPATH$unique=set"
17826 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
17827 + LDFLAGS="$LDFLAGS -L$ai_p"
17828 + PHP_RPATHS="$PHP_RPATHS $ai_p"
17841 + if test -n "$PGSQL_LIBDIR"; then
17843 + if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
17845 + if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
17846 + ai_p=$PGSQL_LIBDIR
17849 + ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
17851 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
17852 + ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
17859 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
17861 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
17862 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
17863 + eval "LIBPATH$unique=set"
17865 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
17866 + LDFLAGS="$LDFLAGS -L$ai_p"
17867 + PHP_RPATHS="$PHP_RPATHS $ai_p"
17879 + c|c_r|pthread*) ;;
17881 + LIBS="-lpq $LIBS"
17892 + PHP_VAR_SUBST="$PHP_VAR_SUBST PGSQL_SHARED_LIBADD"
17896 + if test "$PGSQL_INCLUDE" != "/usr/include"; then
17898 + if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
17899 + ai_p=$PGSQL_INCLUDE
17902 + ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
17904 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
17905 + ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
17910 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
17912 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
17913 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
17914 + eval "INCLUDEPATH$unique=set"
17917 + INCLUDES="-I$ai_p $INCLUDES"
17919 + INCLUDES="$INCLUDES -I$ai_p"
17928 + ext_builddir=ext/pgsql
17929 + ext_srcdir=$abs_srcdir/ext/pgsql
17933 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
17934 + PHP_PGSQL_SHARED=no
17937 + case ext/pgsql in
17938 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
17939 + /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17940 + *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17945 + b_c_pre=$php_c_pre
17946 + b_cxx_pre=$php_cxx_pre
17947 + b_c_meta=$php_c_meta
17948 + b_cxx_meta=$php_cxx_meta
17949 + b_c_post=$php_c_post
17950 + b_cxx_post=$php_cxx_post
17955 + for ac_src in pgsql.c; do
17962 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
17965 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17966 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17967 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
17968 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
17971 + cat >>Makefile.objects<<EOF
17972 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
17978 + EXT_STATIC="$EXT_STATIC pgsql"
17979 + if test "$ext_shared" != "nocli"; then
17980 + EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql"
17983 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
17984 + PHP_PGSQL_SHARED=yes
17986 + case ext/pgsql in
17987 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
17988 + /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
17989 + *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
17994 + b_c_pre=$shared_c_pre
17995 + b_cxx_pre=$shared_cxx_pre
17996 + b_c_meta=$shared_c_meta
17997 + b_cxx_meta=$shared_cxx_meta
17998 + b_c_post=$shared_c_post
17999 + b_cxx_post=$shared_cxx_post
18004 + for ac_src in pgsql.c; do
18011 + shared_objects_pgsql="$shared_objects_pgsql $ac_bdir$ac_obj.lo"
18014 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18015 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18016 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18017 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
18020 + cat >>Makefile.objects<<EOF
18021 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
18026 + case $host_alias in
18029 + install_modules="install-modules"
18031 + case $host_alias in
18034 + 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'
18038 + link_cmd='$(LIBTOOL) --mode=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)'
18042 + link_cmd='$(LIBTOOL) --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)'
18046 + if test "x" = "xyes"; then
18047 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppgsql.$suffix"
18049 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppgsql.$suffix"
18052 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql"
18054 + cat >>Makefile.objects<<EOF
18055 +\$(phplibdir)/phppgsql.$suffix: $ext_builddir/phppgsql.$suffix
18056 + \$(LIBTOOL) --mode=install cp $ext_builddir/phppgsql.$suffix \$(phplibdir)
18058 +$ext_builddir/phppgsql.$suffix: \$(shared_objects_pgsql) \$(PHPPGSQL_SHARED_DEPENDENCIES)
18066 + install_modules="install-modules"
18068 + case $host_alias in
18071 + 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'
18075 + link_cmd='$(LIBTOOL) --mode=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)'
18079 + link_cmd='$(LIBTOOL) --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)'
18083 + if test "x" = "xyes"; then
18084 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pgsql.$suffix"
18086 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/pgsql.$suffix"
18089 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql"
18091 + cat >>Makefile.objects<<EOF
18092 +\$(phplibdir)/pgsql.$suffix: $ext_builddir/pgsql.$suffix
18093 + \$(LIBTOOL) --mode=install cp $ext_builddir/pgsql.$suffix \$(phplibdir)
18095 +$ext_builddir/pgsql.$suffix: \$(shared_objects_pgsql) \$(PGSQL_SHARED_DEPENDENCIES)
18102 + cat >> confdefs.h <<EOF
18103 +#define COMPILE_DL_PGSQL 1
18109 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
18110 + PHP_PGSQL_SHARED=no
18111 + case "$PHP_SAPI" in
18115 + case ext/pgsql in
18116 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18117 + /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18118 + *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18123 + b_c_pre=$php_c_pre
18124 + b_cxx_pre=$php_cxx_pre
18125 + b_c_meta=$php_c_meta
18126 + b_cxx_meta=$php_cxx_meta
18127 + b_c_post=$php_c_post
18128 + b_cxx_post=$php_cxx_post
18133 + for ac_src in pgsql.c; do
18140 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
18143 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18144 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18145 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18146 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
18149 + cat >>Makefile.objects<<EOF
18150 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
18156 + EXT_STATIC="$EXT_STATIC pgsql"
18161 + case ext/pgsql in
18162 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18163 + /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18164 + *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18169 + b_c_pre=$php_c_pre
18170 + b_cxx_pre=$php_cxx_pre
18171 + b_c_meta=$php_c_meta
18172 + b_cxx_meta=$php_cxx_meta
18173 + b_c_post=$php_c_post
18174 + b_cxx_post=$php_cxx_post
18179 + for ac_src in pgsql.c; do
18186 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
18189 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18190 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18191 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18192 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
18195 + cat >>Makefile.objects<<EOF
18196 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
18204 + EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql"
18208 + BUILD_DIR="$BUILD_DIR $ext_builddir"
18212 + if test "$ext_builddir" = "."; then
18213 + PHP_PECL_EXTENSION=pgsql
18215 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
18225 +php_enable_phar=yes
18227 +echo $ac_n "checking for phar archive support""... $ac_c" 1>&6
18228 +echo "configure:79339: checking for phar archive support" >&5
18229 +# Check whether --enable-phar or --disable-phar was given.
18230 +if test "${enable_phar+set}" = set; then
18231 + enableval="$enable_phar"
18232 + PHP_PHAR=$enableval
18236 + test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL
18242 +ext_output="yes, shared"
18246 + PHP_PHAR=`echo "$PHP_PHAR"|$SED 's/^shared,//'`
18263 +echo "$ac_t""$ext_output" 1>&6
18268 +if test "$PHP_PHAR" != "no"; then
18270 + ext_builddir=ext/phar
18271 + ext_srcdir=$abs_srcdir/ext/phar
18275 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
18276 + PHP_PHAR_SHARED=no
18280 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18281 + /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18282 + *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18287 + b_c_pre=$php_c_pre
18288 + b_cxx_pre=$php_cxx_pre
18289 + b_c_meta=$php_c_meta
18290 + b_cxx_meta=$php_cxx_meta
18291 + b_c_post=$php_c_post
18292 + b_cxx_post=$php_cxx_post
18297 + 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
18304 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
18307 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18308 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18309 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18310 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
18313 + cat >>Makefile.objects<<EOF
18314 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
18320 + EXT_STATIC="$EXT_STATIC phar"
18321 + if test "$ext_shared" != "nocli"; then
18322 + EXT_CLI_STATIC="$EXT_CLI_STATIC phar"
18325 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
18326 + PHP_PHAR_SHARED=yes
18329 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18330 + /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18331 + *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18336 + b_c_pre=$shared_c_pre
18337 + b_cxx_pre=$shared_cxx_pre
18338 + b_c_meta=$shared_c_meta
18339 + b_cxx_meta=$shared_cxx_meta
18340 + b_c_post=$shared_c_post
18341 + b_cxx_post=$shared_cxx_post
18346 + 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
18353 + shared_objects_phar="$shared_objects_phar $ac_bdir$ac_obj.lo"
18356 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18357 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18358 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18359 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
18362 + cat >>Makefile.objects<<EOF
18363 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
18368 + case $host_alias in
18371 + install_modules="install-modules"
18373 + case $host_alias in
18376 + 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'
18380 + link_cmd='$(LIBTOOL) --mode=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)'
18384 + link_cmd='$(LIBTOOL) --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)'
18388 + if test "x" = "xyes"; then
18389 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpphar.$suffix"
18391 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpphar.$suffix"
18394 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar"
18396 + cat >>Makefile.objects<<EOF
18397 +\$(phplibdir)/phpphar.$suffix: $ext_builddir/phpphar.$suffix
18398 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpphar.$suffix \$(phplibdir)
18400 +$ext_builddir/phpphar.$suffix: \$(shared_objects_phar) \$(PHPPHAR_SHARED_DEPENDENCIES)
18408 + install_modules="install-modules"
18410 + case $host_alias in
18413 + 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'
18417 + link_cmd='$(LIBTOOL) --mode=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)'
18421 + link_cmd='$(LIBTOOL) --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)'
18425 + if test "x" = "xyes"; then
18426 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phar.$suffix"
18428 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phar.$suffix"
18431 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar"
18433 + cat >>Makefile.objects<<EOF
18434 +\$(phplibdir)/phar.$suffix: $ext_builddir/phar.$suffix
18435 + \$(LIBTOOL) --mode=install cp $ext_builddir/phar.$suffix \$(phplibdir)
18437 +$ext_builddir/phar.$suffix: \$(shared_objects_phar) \$(PHAR_SHARED_DEPENDENCIES)
18444 + cat >> confdefs.h <<EOF
18445 +#define COMPILE_DL_PHAR 1
18451 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
18452 + PHP_PHAR_SHARED=no
18453 + case "$PHP_SAPI" in
18458 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18459 + /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18460 + *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18465 + b_c_pre=$php_c_pre
18466 + b_cxx_pre=$php_cxx_pre
18467 + b_c_meta=$php_c_meta
18468 + b_cxx_meta=$php_cxx_meta
18469 + b_c_post=$php_c_post
18470 + b_cxx_post=$php_cxx_post
18475 + 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
18482 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
18485 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18486 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18487 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18488 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
18491 + cat >>Makefile.objects<<EOF
18492 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
18498 + EXT_STATIC="$EXT_STATIC phar"
18504 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18505 + /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18506 + *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18511 + b_c_pre=$php_c_pre
18512 + b_cxx_pre=$php_cxx_pre
18513 + b_c_meta=$php_c_meta
18514 + b_cxx_meta=$php_cxx_meta
18515 + b_c_post=$php_c_post
18516 + b_cxx_post=$php_cxx_post
18521 + 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
18528 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
18531 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18532 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18533 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18534 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
18537 + cat >>Makefile.objects<<EOF
18538 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
18546 + EXT_CLI_STATIC="$EXT_CLI_STATIC phar"
18550 + BUILD_DIR="$BUILD_DIR $ext_builddir"
18554 + if test "$ext_builddir" = "."; then
18555 + PHP_PECL_EXTENSION=phar
18557 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
18561 + echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6
18562 +echo "configure:79673: checking for phar openssl support" >&5
18563 + if test "$PHP_HASH_SHARED" != "yes"; then
18564 + if test "$PHP_HASH" != "no"; then
18565 + cat >> confdefs.h <<\EOF
18566 +#define PHAR_HASH_OK 1
18571 + echo "configure: warning: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" 1>&2
18573 + if test "$PHP_OPENSSL_SHARED" = "yes"; then
18574 + echo "$ac_t""no (shared openssl)" 1>&6
18576 + if test "$PHP_OPENSSL" = "yes"; then
18577 + echo "$ac_t""yes" 1>&6
18578 + cat >> confdefs.h <<\EOF
18579 +#define PHAR_HAVE_OPENSSL 1
18583 + echo "$ac_t""no" 1>&6
18587 + am_i_shared=$PHP_PHAR_SHARED
18588 + is_it_shared=$PHP_HASH_SHARED
18589 + is_it_enabled=$PHP_HASH
18590 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
18591 + { echo "configure: error:
18592 +You've configured extension phar to build statically, but it
18593 +depends on extension hash, which you've configured to build shared.
18594 +You either need to build phar shared or build hash statically for the
18595 +build to be successful.
18598 + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
18599 + { echo "configure: error:
18600 +You've configured extension phar, which depends on extension hash,
18601 +but you've either not enabled hash, or have disabled it.
18606 + am_i_shared=$PHP_PHAR_SHARED
18607 + is_it_shared=$PHP_SPL_SHARED
18608 + is_it_enabled=$PHP_SPL
18609 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
18610 + { echo "configure: error:
18611 +You've configured extension phar to build statically, but it
18612 +depends on extension spl, which you've configured to build shared.
18613 +You either need to build phar shared or build spl statically for the
18614 +build to be successful.
18617 + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
18618 + { echo "configure: error:
18619 +You've configured extension phar, which depends on extension spl,
18620 +but you've either not enabled spl, or have disabled it.
18625 + src=$ext_srcdir/Makefile.frag
18626 + ac_srcdir=$ext_srcdir
18627 + ac_builddir=$ext_builddir
18628 + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
18634 +php_enable_posix=yes
18636 +echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6
18637 +echo "configure:79748: checking whether to enable POSIX-like functions" >&5
18638 +# Check whether --enable-posix or --disable-posix was given.
18639 +if test "${enable_posix+set}" = set; then
18640 + enableval="$enable_posix"
18641 + PHP_POSIX=$enableval
18645 + test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL
18651 +ext_output="yes, shared"
18653 +case $PHP_POSIX in
18655 + PHP_POSIX=`echo "$PHP_POSIX"|$SED 's/^shared,//'`
18672 +echo "$ac_t""$ext_output" 1>&6
18677 +if test "$PHP_POSIX" = "yes"; then
18678 + cat >> confdefs.h <<\EOF
18679 +#define HAVE_POSIX 1
18683 + ext_builddir=ext/posix
18684 + ext_srcdir=$abs_srcdir/ext/posix
18688 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
18689 + PHP_POSIX_SHARED=no
18692 + case ext/posix in
18693 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18694 + /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18695 + *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18700 + b_c_pre=$php_c_pre
18701 + b_cxx_pre=$php_cxx_pre
18702 + b_c_meta=$php_c_meta
18703 + b_cxx_meta=$php_cxx_meta
18704 + b_c_post=$php_c_post
18705 + b_cxx_post=$php_cxx_post
18710 + for ac_src in posix.c; do
18717 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
18720 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18721 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18722 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18723 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
18726 + cat >>Makefile.objects<<EOF
18727 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
18733 + EXT_STATIC="$EXT_STATIC posix"
18734 + if test "$ext_shared" != "nocli"; then
18735 + EXT_CLI_STATIC="$EXT_CLI_STATIC posix"
18738 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
18739 + PHP_POSIX_SHARED=yes
18741 + case ext/posix in
18742 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18743 + /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18744 + *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18749 + b_c_pre=$shared_c_pre
18750 + b_cxx_pre=$shared_cxx_pre
18751 + b_c_meta=$shared_c_meta
18752 + b_cxx_meta=$shared_cxx_meta
18753 + b_c_post=$shared_c_post
18754 + b_cxx_post=$shared_cxx_post
18759 + for ac_src in posix.c; do
18766 + shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo"
18769 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18770 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18771 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18772 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
18775 + cat >>Makefile.objects<<EOF
18776 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
18781 + case $host_alias in
18784 + install_modules="install-modules"
18786 + case $host_alias in
18789 + 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'
18793 + link_cmd='$(LIBTOOL) --mode=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)'
18797 + link_cmd='$(LIBTOOL) --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)'
18801 + if test "x" = "xyes"; then
18802 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpposix.$suffix"
18804 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpposix.$suffix"
18807 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix"
18809 + cat >>Makefile.objects<<EOF
18810 +\$(phplibdir)/phpposix.$suffix: $ext_builddir/phpposix.$suffix
18811 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpposix.$suffix \$(phplibdir)
18813 +$ext_builddir/phpposix.$suffix: \$(shared_objects_posix) \$(PHPPOSIX_SHARED_DEPENDENCIES)
18821 + install_modules="install-modules"
18823 + case $host_alias in
18826 + 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'
18830 + link_cmd='$(LIBTOOL) --mode=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)'
18834 + link_cmd='$(LIBTOOL) --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)'
18838 + if test "x" = "xyes"; then
18839 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/posix.$suffix"
18841 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/posix.$suffix"
18844 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix"
18846 + cat >>Makefile.objects<<EOF
18847 +\$(phplibdir)/posix.$suffix: $ext_builddir/posix.$suffix
18848 + \$(LIBTOOL) --mode=install cp $ext_builddir/posix.$suffix \$(phplibdir)
18850 +$ext_builddir/posix.$suffix: \$(shared_objects_posix) \$(POSIX_SHARED_DEPENDENCIES)
18857 + cat >> confdefs.h <<EOF
18858 +#define COMPILE_DL_POSIX 1
18864 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
18865 + PHP_POSIX_SHARED=no
18866 + case "$PHP_SAPI" in
18870 + case ext/posix in
18871 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18872 + /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18873 + *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18878 + b_c_pre=$php_c_pre
18879 + b_cxx_pre=$php_cxx_pre
18880 + b_c_meta=$php_c_meta
18881 + b_cxx_meta=$php_cxx_meta
18882 + b_c_post=$php_c_post
18883 + b_cxx_post=$php_cxx_post
18888 + for ac_src in posix.c; do
18895 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
18898 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18899 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18900 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18901 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
18904 + cat >>Makefile.objects<<EOF
18905 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
18911 + EXT_STATIC="$EXT_STATIC posix"
18916 + case ext/posix in
18917 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
18918 + /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
18919 + *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
18924 + b_c_pre=$php_c_pre
18925 + b_cxx_pre=$php_cxx_pre
18926 + b_c_meta=$php_c_meta
18927 + b_cxx_meta=$php_cxx_meta
18928 + b_c_post=$php_c_post
18929 + b_cxx_post=$php_cxx_post
18934 + for ac_src in posix.c; do
18941 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
18944 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18945 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18946 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
18947 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
18950 + cat >>Makefile.objects<<EOF
18951 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
18959 + EXT_CLI_STATIC="$EXT_CLI_STATIC posix"
18963 + BUILD_DIR="$BUILD_DIR $ext_builddir"
18967 + if test "$ext_builddir" = "."; then
18968 + PHP_PECL_EXTENSION=posix
18970 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
18975 + for ac_hdr in sys/mkdev.h
18977 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
18978 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
18979 +echo "configure:80090: checking for $ac_hdr" >&5
18980 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
18981 + echo $ac_n "(cached) $ac_c" 1>&6
18983 + cat > conftest.$ac_ext <<EOF
18984 +#line 80095 "configure"
18985 +#include "confdefs.h"
18986 +#include <$ac_hdr>
18988 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
18989 +{ (eval echo configure:80100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
18990 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
18991 +if test -z "$ac_err"; then
18993 + eval "ac_cv_header_$ac_safe=yes"
18995 + echo "$ac_err" >&5
18996 + echo "configure: failed program was:" >&5
18997 + cat conftest.$ac_ext >&5
18999 + eval "ac_cv_header_$ac_safe=no"
19003 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
19004 + echo "$ac_t""yes" 1>&6
19005 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
19006 + cat >> confdefs.h <<EOF
19007 +#define $ac_tr_hdr 1
19011 + echo "$ac_t""no" 1>&6
19016 + for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r
19018 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
19019 +echo "configure:80130: checking for $ac_func" >&5
19020 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
19021 + echo $ac_n "(cached) $ac_c" 1>&6
19023 + cat > conftest.$ac_ext <<EOF
19024 +#line 80135 "configure"
19025 +#include "confdefs.h"
19026 +/* System header to define __stub macros and hopefully few prototypes,
19027 + which can conflict with char $ac_func(); below. */
19028 +#include <assert.h>
19029 +/* Override any gcc2 internal prototype to avoid an error. */
19030 +/* We use char because int might match the return type of a gcc2
19031 + builtin and then its argument prototype would still apply. */
19036 +/* The GNU C library defines this for functions which it implements
19037 + to always fail with ENOSYS. Some functions are actually named
19038 + something starting with __ and the normal name is an alias. */
19039 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
19047 +if { (eval echo configure:80158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
19049 + eval "ac_cv_func_$ac_func=yes"
19051 + echo "configure: failed program was:" >&5
19052 + cat conftest.$ac_ext >&5
19054 + eval "ac_cv_func_$ac_func=no"
19059 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
19060 + echo "$ac_t""yes" 1>&6
19061 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
19062 + cat >> confdefs.h <<EOF
19063 +#define $ac_tr_func 1
19067 + echo "$ac_t""no" 1>&6
19072 + echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6
19073 +echo "configure:80184: checking for working ttyname_r() implementation" >&5
19074 + if test "$cross_compiling" = yes; then
19076 + echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6
19079 + cat > conftest.$ac_ext <<EOF
19080 +#line 80191 "configure"
19081 +#include "confdefs.h"
19083 +#include <unistd.h>
19085 +int main(int argc, char *argv[])
19089 + return ttyname_r(0, buf, 64) ? 1 : 0;
19093 +if { (eval echo configure:80204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
19096 + echo "$ac_t""yes" 1>&6
19097 + cat >> confdefs.h <<\EOF
19098 +#define HAVE_TTYNAME_R 1
19103 + echo "configure: failed program was:" >&5
19104 + cat conftest.$ac_ext >&5
19107 + echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6
19114 + echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6
19115 +echo "configure:80226: checking for utsname.domainname" >&5
19116 +if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then
19117 + echo $ac_n "(cached) $ac_c" 1>&6
19120 + cat > conftest.$ac_ext <<EOF
19121 +#line 80232 "configure"
19122 +#include "confdefs.h"
19124 + #define _GNU_SOURCE
19125 + #include <sys/utsname.h>
19129 + return sizeof(((struct utsname *)0)->domainname);
19133 +if { (eval echo configure:80244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
19136 + ac_cv_have_utsname_domainname=yes
19139 + echo "configure: failed program was:" >&5
19140 + cat conftest.$ac_ext >&5
19143 + ac_cv_have_utsname_domainname=no
19150 +echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6
19151 + if test "$ac_cv_have_utsname_domainname" = yes; then
19152 + cat >> confdefs.h <<\EOF
19153 +#define HAVE_UTSNAME_DOMAINNAME 1
19161 +php_with_pspell=no
19163 +echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6
19164 +echo "configure:80275: checking for PSPELL support" >&5
19165 +# Check whether --with-pspell or --without-pspell was given.
19166 +if test "${with_pspell+set}" = set; then
19167 + withval="$with_pspell"
19168 + PHP_PSPELL=$withval
19172 + test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL
19178 +ext_output="yes, shared"
19180 +case $PHP_PSPELL in
19182 + PHP_PSPELL=`echo "$PHP_PSPELL"|$SED 's/^shared,//'`
19199 +echo "$ac_t""$ext_output" 1>&6
19204 +if test "$PHP_PSPELL" != "no"; then
19206 + ext_builddir=ext/pspell
19207 + ext_srcdir=$abs_srcdir/ext/pspell
19211 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
19212 + PHP_PSPELL_SHARED=no
19215 + case ext/pspell in
19216 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
19217 + /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19218 + *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19223 + b_c_pre=$php_c_pre
19224 + b_cxx_pre=$php_cxx_pre
19225 + b_c_meta=$php_c_meta
19226 + b_cxx_meta=$php_cxx_meta
19227 + b_c_post=$php_c_post
19228 + b_cxx_post=$php_cxx_post
19233 + for ac_src in pspell.c; do
19240 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
19243 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19244 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19245 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19246 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
19249 + cat >>Makefile.objects<<EOF
19250 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
19256 + EXT_STATIC="$EXT_STATIC pspell"
19257 + if test "$ext_shared" != "nocli"; then
19258 + EXT_CLI_STATIC="$EXT_CLI_STATIC pspell"
19261 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
19262 + PHP_PSPELL_SHARED=yes
19264 + case ext/pspell in
19265 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
19266 + /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19267 + *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19272 + b_c_pre=$shared_c_pre
19273 + b_cxx_pre=$shared_cxx_pre
19274 + b_c_meta=$shared_c_meta
19275 + b_cxx_meta=$shared_cxx_meta
19276 + b_c_post=$shared_c_post
19277 + b_cxx_post=$shared_cxx_post
19282 + for ac_src in pspell.c; do
19289 + shared_objects_pspell="$shared_objects_pspell $ac_bdir$ac_obj.lo"
19292 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19293 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19294 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19295 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
19298 + cat >>Makefile.objects<<EOF
19299 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
19304 + case $host_alias in
19307 + install_modules="install-modules"
19309 + case $host_alias in
19312 + 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'
19316 + link_cmd='$(LIBTOOL) --mode=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)'
19320 + link_cmd='$(LIBTOOL) --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)'
19324 + if test "x" = "xyes"; then
19325 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppspell.$suffix"
19327 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppspell.$suffix"
19330 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell"
19332 + cat >>Makefile.objects<<EOF
19333 +\$(phplibdir)/phppspell.$suffix: $ext_builddir/phppspell.$suffix
19334 + \$(LIBTOOL) --mode=install cp $ext_builddir/phppspell.$suffix \$(phplibdir)
19336 +$ext_builddir/phppspell.$suffix: \$(shared_objects_pspell) \$(PHPPSPELL_SHARED_DEPENDENCIES)
19344 + install_modules="install-modules"
19346 + case $host_alias in
19349 + 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'
19353 + link_cmd='$(LIBTOOL) --mode=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)'
19357 + link_cmd='$(LIBTOOL) --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)'
19361 + if test "x" = "xyes"; then
19362 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pspell.$suffix"
19364 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/pspell.$suffix"
19367 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell"
19369 + cat >>Makefile.objects<<EOF
19370 +\$(phplibdir)/pspell.$suffix: $ext_builddir/pspell.$suffix
19371 + \$(LIBTOOL) --mode=install cp $ext_builddir/pspell.$suffix \$(phplibdir)
19373 +$ext_builddir/pspell.$suffix: \$(shared_objects_pspell) \$(PSPELL_SHARED_DEPENDENCIES)
19380 + cat >> confdefs.h <<EOF
19381 +#define COMPILE_DL_PSPELL 1
19387 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
19388 + PHP_PSPELL_SHARED=no
19389 + case "$PHP_SAPI" in
19393 + case ext/pspell in
19394 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
19395 + /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19396 + *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19401 + b_c_pre=$php_c_pre
19402 + b_cxx_pre=$php_cxx_pre
19403 + b_c_meta=$php_c_meta
19404 + b_cxx_meta=$php_cxx_meta
19405 + b_c_post=$php_c_post
19406 + b_cxx_post=$php_cxx_post
19411 + for ac_src in pspell.c; do
19418 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
19421 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19422 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19423 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19424 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
19427 + cat >>Makefile.objects<<EOF
19428 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
19434 + EXT_STATIC="$EXT_STATIC pspell"
19439 + case ext/pspell in
19440 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
19441 + /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
19442 + *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
19447 + b_c_pre=$php_c_pre
19448 + b_cxx_pre=$php_cxx_pre
19449 + b_c_meta=$php_c_meta
19450 + b_cxx_meta=$php_cxx_meta
19451 + b_c_post=$php_c_post
19452 + b_cxx_post=$php_cxx_post
19457 + for ac_src in pspell.c; do
19464 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
19467 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19468 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19469 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
19470 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
19473 + cat >>Makefile.objects<<EOF
19474 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
19482 + EXT_CLI_STATIC="$EXT_CLI_STATIC pspell"
19486 + BUILD_DIR="$BUILD_DIR $ext_builddir"
19490 + if test "$ext_builddir" = "."; then
19491 + PHP_PECL_EXTENSION=pspell
19493 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
19497 + if test "$PHP_PSPELL" != "yes"; then
19498 + PSPELL_SEARCH_DIRS=$PHP_PSPELL
19500 + PSPELL_SEARCH_DIRS="/usr/local /usr"
19502 + for i in $PSPELL_SEARCH_DIRS; do
19503 + if test -f $i/include/pspell/pspell.h; then
19505 + PSPELL_INCDIR=$i/include/pspell
19506 + elif test -f $i/include/pspell.h; then
19508 + PSPELL_INCDIR=$i/include
19512 + if test -z "$PSPELL_DIR"; then
19513 + { echo "configure: error: Cannot find pspell" 1>&2; exit 1; }
19516 + PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR
19520 + if test "$ext_shared" = "yes"; then
19521 + PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD"
19522 + if test -n "$PSPELL_LIBDIR"; then
19524 + if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
19526 + if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
19527 + ai_p=$PSPELL_LIBDIR
19530 + ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
19532 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19533 + ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
19537 + if test "$ext_shared" = "yes"; then
19538 + PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD"
19539 + test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD"
19544 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
19546 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
19547 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
19548 + eval "LIBPATH$unique=set"
19550 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
19551 + LDFLAGS="$LDFLAGS -L$ai_p"
19552 + PHP_RPATHS="$PHP_RPATHS $ai_p"
19565 + if test -n "$PSPELL_LIBDIR"; then
19567 + if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
19569 + if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
19570 + ai_p=$PSPELL_LIBDIR
19573 + ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
19575 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19576 + ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
19583 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
19585 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
19586 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
19587 + eval "LIBPATH$unique=set"
19589 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
19590 + LDFLAGS="$LDFLAGS -L$ai_p"
19591 + PHP_RPATHS="$PHP_RPATHS $ai_p"
19603 + c|c_r|pthread*) ;;
19605 + LIBS="-lpspell $LIBS"
19617 + save_old_LDFLAGS=$LDFLAGS
19622 + save_ext_shared=$ext_shared
19625 + for ac_i in $ac_stuff; do
19628 + if test "$ext_shared" = "yes"; then
19629 + LDFLAGS="$LDFLAGS -pthread"
19633 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
19635 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
19636 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
19637 + eval "EXTRA_LDFLAGS$unique=set"
19638 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
19644 + ac_ii=`echo $ac_i|cut -c 3-`
19648 + c|c_r|pthread*) ;;
19650 + if test "$ext_shared" = "yes"; then
19651 + LDFLAGS="$LDFLAGS -l$ac_ii"
19656 + c|c_r|pthread*) ;;
19658 + LIBS="$LIBS -l$ac_ii"
19670 + ac_ii=`echo $ac_i|cut -c 3-`
19672 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
19674 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
19678 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
19680 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19681 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
19685 + if test "$ext_shared" = "yes"; then
19686 + LDFLAGS="-L$ai_p $LDFLAGS"
19687 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
19692 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
19694 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
19695 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
19696 + eval "LIBPATH$unique=set"
19698 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
19699 + LDFLAGS="$LDFLAGS -L$ai_p"
19700 + PHP_RPATHS="$PHP_RPATHS $ai_p"
19713 + echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6
19714 +echo "configure:80825: checking for new_aspell_config in -laspell" >&5
19715 +ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'`
19716 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
19717 + echo $ac_n "(cached) $ac_c" 1>&6
19719 + ac_save_LIBS="$LIBS"
19720 +LIBS="-laspell $LIBS"
19721 +cat > conftest.$ac_ext <<EOF
19722 +#line 80833 "configure"
19723 +#include "confdefs.h"
19724 +/* Override any gcc2 internal prototype to avoid an error. */
19725 +/* We use char because int might match the return type of a gcc2
19726 + builtin and then its argument prototype would still apply. */
19727 +char new_aspell_config();
19730 +new_aspell_config()
19733 +if { (eval echo configure:80844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
19735 + eval "ac_cv_lib_$ac_lib_var=yes"
19737 + echo "configure: failed program was:" >&5
19738 + cat conftest.$ac_ext >&5
19740 + eval "ac_cv_lib_$ac_lib_var=no"
19743 +LIBS="$ac_save_LIBS"
19746 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
19747 + echo "$ac_t""yes" 1>&6
19749 + LDFLAGS=$save_old_LDFLAGS
19750 + ext_shared=$save_ext_shared
19754 + if test "$ext_shared" = "yes"; then
19755 + PSPELL_SHARED_LIBADD="-laspell $PSPELL_SHARED_LIBADD"
19756 + if test -n "$PSPELL_LIBDIR"; then
19758 + if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
19760 + if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
19761 + ai_p=$PSPELL_LIBDIR
19764 + ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
19766 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19767 + ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
19771 + if test "$ext_shared" = "yes"; then
19772 + PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD"
19773 + test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD"
19778 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
19780 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
19781 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
19782 + eval "LIBPATH$unique=set"
19784 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
19785 + LDFLAGS="$LDFLAGS -L$ai_p"
19786 + PHP_RPATHS="$PHP_RPATHS $ai_p"
19799 + if test -n "$PSPELL_LIBDIR"; then
19801 + if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
19803 + if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
19804 + ai_p=$PSPELL_LIBDIR
19807 + ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
19809 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19810 + ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
19817 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
19819 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
19820 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
19821 + eval "LIBPATH$unique=set"
19823 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
19824 + LDFLAGS="$LDFLAGS -L$ai_p"
19825 + PHP_RPATHS="$PHP_RPATHS $ai_p"
19837 + c|c_r|pthread*) ;;
19839 + LIBS="-laspell $LIBS"
19852 + echo "$ac_t""no" 1>&6
19854 + LDFLAGS=$save_old_LDFLAGS
19855 + ext_shared=$save_ext_shared
19856 + unset ac_cv_lib_aspell_new_aspell_config
19863 + if test "$PSPELL_INCDIR" != "/usr/include"; then
19865 + if test -z "$PSPELL_INCDIR" || echo "$PSPELL_INCDIR" | grep '^/' >/dev/null ; then
19866 + ai_p=$PSPELL_INCDIR
19869 + ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
19871 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
19872 + ai_p="$ep_realdir/`basename \"$PSPELL_INCDIR\"`"
19877 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
19879 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
19880 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
19881 + eval "INCLUDEPATH$unique=set"
19884 + INCLUDES="-I$ai_p $INCLUDES"
19886 + INCLUDES="$INCLUDES -I$ai_p"
19894 + PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD"
19896 + cat >> confdefs.h <<\EOF
19897 +#define HAVE_PSPELL 1
19904 +php_with_libedit=no
19906 +echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6
19907 +echo "configure:81018: checking for libedit readline replacement" >&5
19908 +# Check whether --with-libedit or --without-libedit was given.
19909 +if test "${with_libedit+set}" = set; then
19910 + withval="$with_libedit"
19911 + PHP_LIBEDIT=$withval
19915 + test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL
19921 +ext_output="yes, shared"
19923 +case $PHP_LIBEDIT in
19925 + PHP_LIBEDIT=`echo "$PHP_LIBEDIT"|$SED 's/^shared,//'`
19942 +echo "$ac_t""$ext_output" 1>&6
19947 +if test "$PHP_LIBEDIT" = "no"; then
19949 +php_with_readline=no
19951 +echo $ac_n "checking for readline support""... $ac_c" 1>&6
19952 +echo "configure:81063: checking for readline support" >&5
19953 +# Check whether --with-readline or --without-readline was given.
19954 +if test "${with_readline+set}" = set; then
19955 + withval="$with_readline"
19956 + PHP_READLINE=$withval
19960 + test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL
19966 +ext_output="yes, shared"
19968 +case $PHP_READLINE in
19970 + PHP_READLINE=`echo "$PHP_READLINE"|$SED 's/^shared,//'`
19987 +echo "$ac_t""$ext_output" 1>&6
19992 + php_with_readline=no
19995 +if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
19996 + for i in $PHP_READLINE /usr/local /usr; do
19997 + test -f $i/include/readline/readline.h && READLINE_DIR=$i && break
20000 + if test -z "$READLINE_DIR"; then
20001 + { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; }
20005 + if test "$READLINE_DIR/include" != "/usr/include"; then
20007 + if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then
20008 + ai_p=$READLINE_DIR/include
20011 + ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
20013 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20014 + ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`"
20019 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20021 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
20022 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20023 + eval "INCLUDEPATH$unique=set"
20026 + INCLUDES="-I$ai_p $INCLUDES"
20028 + INCLUDES="$INCLUDES -I$ai_p"
20036 + PHP_READLINE_LIBS=""
20037 + echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
20038 +echo "configure:81149: checking for tgetent in -lncurses" >&5
20039 +ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
20040 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20041 + echo $ac_n "(cached) $ac_c" 1>&6
20043 + ac_save_LIBS="$LIBS"
20044 +LIBS="-lncurses $LIBS"
20045 +cat > conftest.$ac_ext <<EOF
20046 +#line 81157 "configure"
20047 +#include "confdefs.h"
20048 +/* Override any gcc2 internal prototype to avoid an error. */
20049 +/* We use char because int might match the return type of a gcc2
20050 + builtin and then its argument prototype would still apply. */
20057 +if { (eval echo configure:81168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20059 + eval "ac_cv_lib_$ac_lib_var=yes"
20061 + echo "configure: failed program was:" >&5
20062 + cat conftest.$ac_ext >&5
20064 + eval "ac_cv_lib_$ac_lib_var=no"
20067 +LIBS="$ac_save_LIBS"
20070 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20071 + echo "$ac_t""yes" 1>&6
20076 + c|c_r|pthread*) ;;
20078 + if test "$ext_shared" = "yes"; then
20079 + READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
20084 + c|c_r|pthread*) ;;
20086 + LIBS="-lncurses $LIBS"
20096 + PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses"
20099 + echo "$ac_t""no" 1>&6
20101 + echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
20102 +echo "configure:81213: checking for tgetent in -ltermcap" >&5
20103 +ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
20104 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20105 + echo $ac_n "(cached) $ac_c" 1>&6
20107 + ac_save_LIBS="$LIBS"
20108 +LIBS="-ltermcap $LIBS"
20109 +cat > conftest.$ac_ext <<EOF
20110 +#line 81221 "configure"
20111 +#include "confdefs.h"
20112 +/* Override any gcc2 internal prototype to avoid an error. */
20113 +/* We use char because int might match the return type of a gcc2
20114 + builtin and then its argument prototype would still apply. */
20121 +if { (eval echo configure:81232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20123 + eval "ac_cv_lib_$ac_lib_var=yes"
20125 + echo "configure: failed program was:" >&5
20126 + cat conftest.$ac_ext >&5
20128 + eval "ac_cv_lib_$ac_lib_var=no"
20131 +LIBS="$ac_save_LIBS"
20134 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20135 + echo "$ac_t""yes" 1>&6
20140 + c|c_r|pthread*) ;;
20142 + if test "$ext_shared" = "yes"; then
20143 + READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
20148 + c|c_r|pthread*) ;;
20150 + LIBS="-ltermcap $LIBS"
20160 + PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap"
20163 + echo "$ac_t""no" 1>&6
20171 + save_old_LDFLAGS=$LDFLAGS
20173 + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
20176 + save_ext_shared=$ext_shared
20179 + for ac_i in $ac_stuff; do
20182 + if test "$ext_shared" = "yes"; then
20183 + LDFLAGS="$LDFLAGS -pthread"
20187 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
20189 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
20190 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20191 + eval "EXTRA_LDFLAGS$unique=set"
20192 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
20198 + ac_ii=`echo $ac_i|cut -c 3-`
20202 + c|c_r|pthread*) ;;
20204 + if test "$ext_shared" = "yes"; then
20205 + LDFLAGS="$LDFLAGS -l$ac_ii"
20210 + c|c_r|pthread*) ;;
20212 + LIBS="$LIBS -l$ac_ii"
20224 + ac_ii=`echo $ac_i|cut -c 3-`
20226 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
20228 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
20232 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
20234 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20235 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
20239 + if test "$ext_shared" = "yes"; then
20240 + LDFLAGS="-L$ai_p $LDFLAGS"
20241 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
20246 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20248 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
20249 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20250 + eval "LIBPATH$unique=set"
20252 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
20253 + LDFLAGS="$LDFLAGS -L$ai_p"
20254 + PHP_RPATHS="$PHP_RPATHS $ai_p"
20267 + echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
20268 +echo "configure:81379: checking for readline in -lreadline" >&5
20269 +ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
20270 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20271 + echo $ac_n "(cached) $ac_c" 1>&6
20273 + ac_save_LIBS="$LIBS"
20274 +LIBS="-lreadline $LIBS"
20275 +cat > conftest.$ac_ext <<EOF
20276 +#line 81387 "configure"
20277 +#include "confdefs.h"
20278 +/* Override any gcc2 internal prototype to avoid an error. */
20279 +/* We use char because int might match the return type of a gcc2
20280 + builtin and then its argument prototype would still apply. */
20287 +if { (eval echo configure:81398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20289 + eval "ac_cv_lib_$ac_lib_var=yes"
20291 + echo "configure: failed program was:" >&5
20292 + cat conftest.$ac_ext >&5
20294 + eval "ac_cv_lib_$ac_lib_var=no"
20297 +LIBS="$ac_save_LIBS"
20300 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20301 + echo "$ac_t""yes" 1>&6
20303 + LDFLAGS=$save_old_LDFLAGS
20304 + ext_shared=$save_ext_shared
20308 + if test "$ext_shared" = "yes"; then
20309 + READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD"
20310 + if test -n "$READLINE_DIR/$PHP_LIBDIR"; then
20312 + if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
20314 + if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
20315 + ai_p=$READLINE_DIR/$PHP_LIBDIR
20318 + ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
20320 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20321 + ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
20325 + if test "$ext_shared" = "yes"; then
20326 + READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD"
20327 + test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD"
20332 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20334 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
20335 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20336 + eval "LIBPATH$unique=set"
20338 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
20339 + LDFLAGS="$LDFLAGS -L$ai_p"
20340 + PHP_RPATHS="$PHP_RPATHS $ai_p"
20353 + if test -n "$READLINE_DIR/$PHP_LIBDIR"; then
20355 + if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
20357 + if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
20358 + ai_p=$READLINE_DIR/$PHP_LIBDIR
20361 + ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
20363 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20364 + ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
20371 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20373 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
20374 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20375 + eval "LIBPATH$unique=set"
20377 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
20378 + LDFLAGS="$LDFLAGS -L$ai_p"
20379 + PHP_RPATHS="$PHP_RPATHS $ai_p"
20391 + c|c_r|pthread*) ;;
20393 + LIBS="-lreadline $LIBS"
20406 + echo "$ac_t""no" 1>&6
20408 + LDFLAGS=$save_old_LDFLAGS
20409 + ext_shared=$save_ext_shared
20410 + unset ac_cv_lib_readline_readline
20412 + { echo "configure: error: readline library not found" 1>&2; exit 1; }
20419 + save_old_LDFLAGS=$LDFLAGS
20421 + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
20424 + save_ext_shared=$ext_shared
20427 + for ac_i in $ac_stuff; do
20430 + if test "$ext_shared" = "yes"; then
20431 + LDFLAGS="$LDFLAGS -pthread"
20435 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
20437 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
20438 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20439 + eval "EXTRA_LDFLAGS$unique=set"
20440 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
20446 + ac_ii=`echo $ac_i|cut -c 3-`
20450 + c|c_r|pthread*) ;;
20452 + if test "$ext_shared" = "yes"; then
20453 + LDFLAGS="$LDFLAGS -l$ac_ii"
20458 + c|c_r|pthread*) ;;
20460 + LIBS="$LIBS -l$ac_ii"
20472 + ac_ii=`echo $ac_i|cut -c 3-`
20474 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
20476 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
20480 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
20482 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20483 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
20487 + if test "$ext_shared" = "yes"; then
20488 + LDFLAGS="-L$ai_p $LDFLAGS"
20489 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
20494 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20496 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
20497 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20498 + eval "LIBPATH$unique=set"
20500 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
20501 + LDFLAGS="$LDFLAGS -L$ai_p"
20502 + PHP_RPATHS="$PHP_RPATHS $ai_p"
20515 + echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6
20516 +echo "configure:81627: checking for rl_pending_input in -lreadline" >&5
20517 +ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'`
20518 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20519 + echo $ac_n "(cached) $ac_c" 1>&6
20521 + ac_save_LIBS="$LIBS"
20522 +LIBS="-lreadline $LIBS"
20523 +cat > conftest.$ac_ext <<EOF
20524 +#line 81635 "configure"
20525 +#include "confdefs.h"
20526 +/* Override any gcc2 internal prototype to avoid an error. */
20527 +/* We use char because int might match the return type of a gcc2
20528 + builtin and then its argument prototype would still apply. */
20529 +char rl_pending_input();
20532 +rl_pending_input()
20535 +if { (eval echo configure:81646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20537 + eval "ac_cv_lib_$ac_lib_var=yes"
20539 + echo "configure: failed program was:" >&5
20540 + cat conftest.$ac_ext >&5
20542 + eval "ac_cv_lib_$ac_lib_var=no"
20545 +LIBS="$ac_save_LIBS"
20548 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20549 + echo "$ac_t""yes" 1>&6
20551 + LDFLAGS=$save_old_LDFLAGS
20552 + ext_shared=$save_ext_shared
20556 + echo "$ac_t""no" 1>&6
20558 + LDFLAGS=$save_old_LDFLAGS
20559 + ext_shared=$save_ext_shared
20560 + unset ac_cv_lib_readline_rl_pending_input
20562 + { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; }
20569 + save_old_LDFLAGS=$LDFLAGS
20571 + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
20574 + save_ext_shared=$ext_shared
20577 + for ac_i in $ac_stuff; do
20580 + if test "$ext_shared" = "yes"; then
20581 + LDFLAGS="$LDFLAGS -pthread"
20585 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
20587 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
20588 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20589 + eval "EXTRA_LDFLAGS$unique=set"
20590 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
20596 + ac_ii=`echo $ac_i|cut -c 3-`
20600 + c|c_r|pthread*) ;;
20602 + if test "$ext_shared" = "yes"; then
20603 + LDFLAGS="$LDFLAGS -l$ac_ii"
20608 + c|c_r|pthread*) ;;
20610 + LIBS="$LIBS -l$ac_ii"
20622 + ac_ii=`echo $ac_i|cut -c 3-`
20624 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
20626 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
20630 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
20632 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20633 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
20637 + if test "$ext_shared" = "yes"; then
20638 + LDFLAGS="-L$ai_p $LDFLAGS"
20639 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
20644 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20646 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
20647 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20648 + eval "LIBPATH$unique=set"
20650 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
20651 + LDFLAGS="$LDFLAGS -L$ai_p"
20652 + PHP_RPATHS="$PHP_RPATHS $ai_p"
20665 + echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6
20666 +echo "configure:81777: checking for rl_callback_read_char in -lreadline" >&5
20667 +ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'`
20668 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20669 + echo $ac_n "(cached) $ac_c" 1>&6
20671 + ac_save_LIBS="$LIBS"
20672 +LIBS="-lreadline $LIBS"
20673 +cat > conftest.$ac_ext <<EOF
20674 +#line 81785 "configure"
20675 +#include "confdefs.h"
20676 +/* Override any gcc2 internal prototype to avoid an error. */
20677 +/* We use char because int might match the return type of a gcc2
20678 + builtin and then its argument prototype would still apply. */
20679 +char rl_callback_read_char();
20682 +rl_callback_read_char()
20685 +if { (eval echo configure:81796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20687 + eval "ac_cv_lib_$ac_lib_var=yes"
20689 + echo "configure: failed program was:" >&5
20690 + cat conftest.$ac_ext >&5
20692 + eval "ac_cv_lib_$ac_lib_var=no"
20695 +LIBS="$ac_save_LIBS"
20698 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20699 + echo "$ac_t""yes" 1>&6
20701 + LDFLAGS=$save_old_LDFLAGS
20702 + ext_shared=$save_ext_shared
20704 + cat >> confdefs.h <<\EOF
20705 +#define HAVE_RL_CALLBACK_READ_CHAR 1
20711 + echo "$ac_t""no" 1>&6
20713 + LDFLAGS=$save_old_LDFLAGS
20714 + ext_shared=$save_ext_shared
20715 + unset ac_cv_lib_readline_rl_callback_read_char
20721 + cat >> confdefs.h <<\EOF
20722 +#define HAVE_LIBREADLINE 1
20726 +elif test "$PHP_LIBEDIT" != "no"; then
20728 + for i in $PHP_LIBEDIT /usr/local /usr; do
20729 + test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
20732 + if test -z "$LIBEDIT_DIR"; then
20733 + { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; }
20737 + if test "$LIBEDIT_DIR/include" != "/usr/include"; then
20739 + if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then
20740 + ai_p=$LIBEDIT_DIR/include
20743 + ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
20745 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20746 + ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`"
20751 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20753 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
20754 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20755 + eval "INCLUDEPATH$unique=set"
20758 + INCLUDES="-I$ai_p $INCLUDES"
20760 + INCLUDES="$INCLUDES -I$ai_p"
20768 + echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
20769 +echo "configure:81880: checking for tgetent in -lncurses" >&5
20770 +ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
20771 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20772 + echo $ac_n "(cached) $ac_c" 1>&6
20774 + ac_save_LIBS="$LIBS"
20775 +LIBS="-lncurses $LIBS"
20776 +cat > conftest.$ac_ext <<EOF
20777 +#line 81888 "configure"
20778 +#include "confdefs.h"
20779 +/* Override any gcc2 internal prototype to avoid an error. */
20780 +/* We use char because int might match the return type of a gcc2
20781 + builtin and then its argument prototype would still apply. */
20788 +if { (eval echo configure:81899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20790 + eval "ac_cv_lib_$ac_lib_var=yes"
20792 + echo "configure: failed program was:" >&5
20793 + cat conftest.$ac_ext >&5
20795 + eval "ac_cv_lib_$ac_lib_var=no"
20798 +LIBS="$ac_save_LIBS"
20801 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20802 + echo "$ac_t""yes" 1>&6
20807 + c|c_r|pthread*) ;;
20809 + if test "$ext_shared" = "yes"; then
20810 + READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
20815 + c|c_r|pthread*) ;;
20817 + LIBS="-lncurses $LIBS"
20829 + echo "$ac_t""no" 1>&6
20831 + echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
20832 +echo "configure:81943: checking for tgetent in -ltermcap" >&5
20833 +ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
20834 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
20835 + echo $ac_n "(cached) $ac_c" 1>&6
20837 + ac_save_LIBS="$LIBS"
20838 +LIBS="-ltermcap $LIBS"
20839 +cat > conftest.$ac_ext <<EOF
20840 +#line 81951 "configure"
20841 +#include "confdefs.h"
20842 +/* Override any gcc2 internal prototype to avoid an error. */
20843 +/* We use char because int might match the return type of a gcc2
20844 + builtin and then its argument prototype would still apply. */
20851 +if { (eval echo configure:81962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
20853 + eval "ac_cv_lib_$ac_lib_var=yes"
20855 + echo "configure: failed program was:" >&5
20856 + cat conftest.$ac_ext >&5
20858 + eval "ac_cv_lib_$ac_lib_var=no"
20861 +LIBS="$ac_save_LIBS"
20864 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
20865 + echo "$ac_t""yes" 1>&6
20870 + c|c_r|pthread*) ;;
20872 + if test "$ext_shared" = "yes"; then
20873 + READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
20878 + c|c_r|pthread*) ;;
20880 + LIBS="-ltermcap $LIBS"
20892 + echo "$ac_t""no" 1>&6
20900 + save_old_LDFLAGS=$LDFLAGS
20902 + -L$READLINE_DIR/$PHP_LIBDIR
20905 + save_ext_shared=$ext_shared
20908 + for ac_i in $ac_stuff; do
20911 + if test "$ext_shared" = "yes"; then
20912 + LDFLAGS="$LDFLAGS -pthread"
20916 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
20918 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
20919 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20920 + eval "EXTRA_LDFLAGS$unique=set"
20921 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
20927 + ac_ii=`echo $ac_i|cut -c 3-`
20931 + c|c_r|pthread*) ;;
20933 + if test "$ext_shared" = "yes"; then
20934 + LDFLAGS="$LDFLAGS -l$ac_ii"
20939 + c|c_r|pthread*) ;;
20941 + LIBS="$LIBS -l$ac_ii"
20953 + ac_ii=`echo $ac_i|cut -c 3-`
20955 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
20957 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
20961 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
20963 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
20964 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
20968 + if test "$ext_shared" = "yes"; then
20969 + LDFLAGS="-L$ai_p $LDFLAGS"
20970 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
20975 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
20977 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
20978 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
20979 + eval "LIBPATH$unique=set"
20981 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
20982 + LDFLAGS="$LDFLAGS -L$ai_p"
20983 + PHP_RPATHS="$PHP_RPATHS $ai_p"
20996 + echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
20997 +echo "configure:82108: checking for readline in -ledit" >&5
20998 +ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
20999 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21000 + echo $ac_n "(cached) $ac_c" 1>&6
21002 + ac_save_LIBS="$LIBS"
21003 +LIBS="-ledit $LIBS"
21004 +cat > conftest.$ac_ext <<EOF
21005 +#line 82116 "configure"
21006 +#include "confdefs.h"
21007 +/* Override any gcc2 internal prototype to avoid an error. */
21008 +/* We use char because int might match the return type of a gcc2
21009 + builtin and then its argument prototype would still apply. */
21016 +if { (eval echo configure:82127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21018 + eval "ac_cv_lib_$ac_lib_var=yes"
21020 + echo "configure: failed program was:" >&5
21021 + cat conftest.$ac_ext >&5
21023 + eval "ac_cv_lib_$ac_lib_var=no"
21026 +LIBS="$ac_save_LIBS"
21029 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21030 + echo "$ac_t""yes" 1>&6
21032 + LDFLAGS=$save_old_LDFLAGS
21033 + ext_shared=$save_ext_shared
21037 + if test "$ext_shared" = "yes"; then
21038 + READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD"
21039 + if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then
21041 + if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
21043 + if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
21044 + ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
21047 + ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
21049 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21050 + ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
21054 + if test "$ext_shared" = "yes"; then
21055 + READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD"
21056 + test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD"
21061 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21063 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
21064 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
21065 + eval "LIBPATH$unique=set"
21067 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
21068 + LDFLAGS="$LDFLAGS -L$ai_p"
21069 + PHP_RPATHS="$PHP_RPATHS $ai_p"
21082 + if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then
21084 + if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
21086 + if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
21087 + ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
21090 + ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
21092 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21093 + ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
21100 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21102 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
21103 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
21104 + eval "LIBPATH$unique=set"
21106 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
21107 + LDFLAGS="$LDFLAGS -L$ai_p"
21108 + PHP_RPATHS="$PHP_RPATHS $ai_p"
21120 + c|c_r|pthread*) ;;
21122 + LIBS="-ledit $LIBS"
21135 + echo "$ac_t""no" 1>&6
21137 + LDFLAGS=$save_old_LDFLAGS
21138 + ext_shared=$save_ext_shared
21139 + unset ac_cv_lib_edit_readline
21141 + { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; }
21147 + cat >> confdefs.h <<\EOF
21148 +#define HAVE_LIBEDIT 1
21153 +if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
21154 + for ac_func in rl_completion_matches
21156 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
21157 +echo "configure:82268: checking for $ac_func" >&5
21158 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
21159 + echo $ac_n "(cached) $ac_c" 1>&6
21161 + cat > conftest.$ac_ext <<EOF
21162 +#line 82273 "configure"
21163 +#include "confdefs.h"
21164 +/* System header to define __stub macros and hopefully few prototypes,
21165 + which can conflict with char $ac_func(); below. */
21166 +#include <assert.h>
21167 +/* Override any gcc2 internal prototype to avoid an error. */
21168 +/* We use char because int might match the return type of a gcc2
21169 + builtin and then its argument prototype would still apply. */
21174 +/* The GNU C library defines this for functions which it implements
21175 + to always fail with ENOSYS. Some functions are actually named
21176 + something starting with __ and the normal name is an alias. */
21177 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
21185 +if { (eval echo configure:82296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21187 + eval "ac_cv_func_$ac_func=yes"
21189 + echo "configure: failed program was:" >&5
21190 + cat conftest.$ac_ext >&5
21192 + eval "ac_cv_func_$ac_func=no"
21197 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
21198 + echo "$ac_t""yes" 1>&6
21199 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
21200 + cat >> confdefs.h <<EOF
21201 +#define $ac_tr_func 1
21205 + echo "$ac_t""no" 1>&6
21210 + ext_builddir=ext/readline
21211 + ext_srcdir=$abs_srcdir/ext/readline
21215 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then
21216 + PHP_READLINE_SHARED=no
21219 + case ext/readline in
21220 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
21221 + /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21222 + *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21227 + b_c_pre=$php_c_pre
21228 + b_cxx_pre=$php_cxx_pre
21229 + b_c_meta=$php_c_meta
21230 + b_cxx_meta=$php_cxx_meta
21231 + b_c_post=$php_c_post
21232 + b_cxx_post=$php_cxx_post
21237 + for ac_src in readline.c; do
21244 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
21247 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21248 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21249 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21250 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
21253 + cat >>Makefile.objects<<EOF
21254 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
21260 + EXT_STATIC="$EXT_STATIC readline"
21261 + if test "$ext_shared" != "nocli"; then
21262 + EXT_CLI_STATIC="$EXT_CLI_STATIC readline"
21265 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
21266 + PHP_READLINE_SHARED=yes
21268 + case ext/readline in
21269 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
21270 + /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21271 + *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21276 + b_c_pre=$shared_c_pre
21277 + b_cxx_pre=$shared_cxx_pre
21278 + b_c_meta=$shared_c_meta
21279 + b_cxx_meta=$shared_cxx_meta
21280 + b_c_post=$shared_c_post
21281 + b_cxx_post=$shared_cxx_post
21286 + for ac_src in readline.c; do
21293 + shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo"
21296 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21297 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21298 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21299 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
21302 + cat >>Makefile.objects<<EOF
21303 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
21308 + case $host_alias in
21311 + install_modules="install-modules"
21313 + case $host_alias in
21316 + 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'
21320 + link_cmd='$(LIBTOOL) --mode=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)'
21324 + link_cmd='$(LIBTOOL) --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)'
21328 + if test "x" = "xyes"; then
21329 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreadline.$suffix"
21331 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix"
21334 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline"
21336 + cat >>Makefile.objects<<EOF
21337 +\$(phplibdir)/phpreadline.$suffix: $ext_builddir/phpreadline.$suffix
21338 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpreadline.$suffix \$(phplibdir)
21340 +$ext_builddir/phpreadline.$suffix: \$(shared_objects_readline) \$(PHPREADLINE_SHARED_DEPENDENCIES)
21348 + install_modules="install-modules"
21350 + case $host_alias in
21353 + 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'
21357 + link_cmd='$(LIBTOOL) --mode=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)'
21361 + link_cmd='$(LIBTOOL) --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)'
21365 + if test "x" = "xyes"; then
21366 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/readline.$suffix"
21368 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/readline.$suffix"
21371 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline"
21373 + cat >>Makefile.objects<<EOF
21374 +\$(phplibdir)/readline.$suffix: $ext_builddir/readline.$suffix
21375 + \$(LIBTOOL) --mode=install cp $ext_builddir/readline.$suffix \$(phplibdir)
21377 +$ext_builddir/readline.$suffix: \$(shared_objects_readline) \$(READLINE_SHARED_DEPENDENCIES)
21384 + cat >> confdefs.h <<EOF
21385 +#define COMPILE_DL_READLINE 1
21391 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" = "cli"; then
21392 + PHP_READLINE_SHARED=no
21393 + case "$PHP_SAPI" in
21397 + case ext/readline in
21398 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
21399 + /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21400 + *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21405 + b_c_pre=$php_c_pre
21406 + b_cxx_pre=$php_cxx_pre
21407 + b_c_meta=$php_c_meta
21408 + b_cxx_meta=$php_cxx_meta
21409 + b_c_post=$php_c_post
21410 + b_cxx_post=$php_cxx_post
21415 + for ac_src in readline.c; do
21422 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
21425 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21426 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21427 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21428 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
21431 + cat >>Makefile.objects<<EOF
21432 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
21438 + EXT_STATIC="$EXT_STATIC readline"
21443 + case ext/readline in
21444 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
21445 + /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
21446 + *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
21451 + b_c_pre=$php_c_pre
21452 + b_cxx_pre=$php_cxx_pre
21453 + b_c_meta=$php_c_meta
21454 + b_cxx_meta=$php_cxx_meta
21455 + b_c_post=$php_c_post
21456 + b_cxx_post=$php_cxx_post
21461 + for ac_src in readline.c; do
21468 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
21471 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21472 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21473 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
21474 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
21477 + cat >>Makefile.objects<<EOF
21478 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
21486 + EXT_CLI_STATIC="$EXT_CLI_STATIC readline"
21490 + BUILD_DIR="$BUILD_DIR $ext_builddir"
21494 + if test "$ext_builddir" = "."; then
21495 + PHP_PECL_EXTENSION=readline
21497 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
21502 + PHP_VAR_SUBST="$PHP_VAR_SUBST READLINE_SHARED_LIBADD"
21508 +php_with_recode=no
21510 +echo $ac_n "checking for recode support""... $ac_c" 1>&6
21511 +echo "configure:82622: checking for recode support" >&5
21512 +# Check whether --with-recode or --without-recode was given.
21513 +if test "${with_recode+set}" = set; then
21514 + withval="$with_recode"
21515 + PHP_RECODE=$withval
21519 + test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL
21525 +ext_output="yes, shared"
21527 +case $PHP_RECODE in
21529 + PHP_RECODE=`echo "$PHP_RECODE"|$SED 's/^shared,//'`
21546 +echo "$ac_t""$ext_output" 1>&6
21551 +if test "$PHP_RECODE" != "no"; then
21552 + RECODE_LIST="$PHP_RECODE /usr/local /usr /opt"
21554 + for i in $RECODE_LIST; do
21555 + if test -f $i/include/recode.h; then
21557 + RECODE_INC=include
21558 + RECODE_LIB=$PHP_LIBDIR
21560 + if test -f $i/include/recode/recode.h; then
21562 + RECODE_INC=include/recode
21563 + RECODE_LIB=$PHP_LIBDIR/recode
21565 + if test -f $i/recode/include/recode.h; then
21566 + RECODE_DIR=$i/recode
21567 + RECODE_INC=include
21568 + RECODE_LIB=$PHP_LIBDIR
21570 + test -n "$RECODE_DIR" && break
21573 + if test -z "$RECODE_DIR"; then
21574 + { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; }
21578 + save_old_LDFLAGS=$LDFLAGS
21580 + -L$RECODE_DIR/$RECODE_LIB
21583 + save_ext_shared=$ext_shared
21586 + for ac_i in $ac_stuff; do
21589 + if test "$ext_shared" = "yes"; then
21590 + LDFLAGS="$LDFLAGS -pthread"
21594 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
21596 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
21597 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
21598 + eval "EXTRA_LDFLAGS$unique=set"
21599 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
21605 + ac_ii=`echo $ac_i|cut -c 3-`
21609 + c|c_r|pthread*) ;;
21611 + if test "$ext_shared" = "yes"; then
21612 + LDFLAGS="$LDFLAGS -l$ac_ii"
21617 + c|c_r|pthread*) ;;
21619 + LIBS="$LIBS -l$ac_ii"
21631 + ac_ii=`echo $ac_i|cut -c 3-`
21633 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
21635 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
21639 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
21641 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21642 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
21646 + if test "$ext_shared" = "yes"; then
21647 + LDFLAGS="-L$ai_p $LDFLAGS"
21648 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
21653 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21655 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
21656 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
21657 + eval "LIBPATH$unique=set"
21659 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
21660 + LDFLAGS="$LDFLAGS -L$ai_p"
21661 + PHP_RPATHS="$PHP_RPATHS $ai_p"
21674 + echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6
21675 +echo "configure:82786: checking for recode_format_table in -lrecode" >&5
21676 +ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'`
21677 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
21678 + echo $ac_n "(cached) $ac_c" 1>&6
21680 + ac_save_LIBS="$LIBS"
21681 +LIBS="-lrecode $LIBS"
21682 +cat > conftest.$ac_ext <<EOF
21683 +#line 82794 "configure"
21684 +#include "confdefs.h"
21685 +/* Override any gcc2 internal prototype to avoid an error. */
21686 +/* We use char because int might match the return type of a gcc2
21687 + builtin and then its argument prototype would still apply. */
21688 +char recode_format_table();
21691 +recode_format_table()
21694 +if { (eval echo configure:82805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21696 + eval "ac_cv_lib_$ac_lib_var=yes"
21698 + echo "configure: failed program was:" >&5
21699 + cat conftest.$ac_ext >&5
21701 + eval "ac_cv_lib_$ac_lib_var=no"
21704 +LIBS="$ac_save_LIBS"
21707 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
21708 + echo "$ac_t""yes" 1>&6
21710 + LDFLAGS=$save_old_LDFLAGS
21711 + ext_shared=$save_ext_shared
21715 + if test "$ext_shared" = "yes"; then
21716 + RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD"
21717 + if test -n "$RECODE_DIR/$RECODE_LIB"; then
21719 + if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
21721 + if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
21722 + ai_p=$RECODE_DIR/$RECODE_LIB
21725 + ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
21727 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21728 + ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
21732 + if test "$ext_shared" = "yes"; then
21733 + RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD"
21734 + test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD"
21739 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21741 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
21742 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
21743 + eval "LIBPATH$unique=set"
21745 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
21746 + LDFLAGS="$LDFLAGS -L$ai_p"
21747 + PHP_RPATHS="$PHP_RPATHS $ai_p"
21760 + if test -n "$RECODE_DIR/$RECODE_LIB"; then
21762 + if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
21764 + if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
21765 + ai_p=$RECODE_DIR/$RECODE_LIB
21768 + ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
21770 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21771 + ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
21778 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21780 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
21781 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
21782 + eval "LIBPATH$unique=set"
21784 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
21785 + LDFLAGS="$LDFLAGS -L$ai_p"
21786 + PHP_RPATHS="$PHP_RPATHS $ai_p"
21798 + c|c_r|pthread*) ;;
21800 + LIBS="-lrecode $LIBS"
21813 + echo "$ac_t""no" 1>&6
21815 + LDFLAGS=$save_old_LDFLAGS
21816 + ext_shared=$save_ext_shared
21817 + unset ac_cv_lib_recode_recode_format_table
21819 + old_LDFLAGS=$LDFLAGS
21821 + LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
21822 + LIBS="$LIBS -lrecode"
21823 + cat > conftest.$ac_ext <<EOF
21824 +#line 82935 "configure"
21825 +#include "confdefs.h"
21827 +char *program_name;
21831 +recode_format_table();
21835 +if { (eval echo configure:82946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
21840 + if test "$ext_shared" = "yes"; then
21841 + RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD"
21842 + if test -n "$RECODE_DIR/$RECODE_LIB"; then
21844 + if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
21846 + if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
21847 + ai_p=$RECODE_DIR/$RECODE_LIB
21850 + ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
21852 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21853 + ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
21857 + if test "$ext_shared" = "yes"; then
21858 + RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD"
21859 + test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD"
21864 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21866 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
21867 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
21868 + eval "LIBPATH$unique=set"
21870 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
21871 + LDFLAGS="$LDFLAGS -L$ai_p"
21872 + PHP_RPATHS="$PHP_RPATHS $ai_p"
21885 + if test -n "$RECODE_DIR/$RECODE_LIB"; then
21887 + if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
21889 + if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
21890 + ai_p=$RECODE_DIR/$RECODE_LIB
21893 + ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
21895 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21896 + ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
21903 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21905 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
21906 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
21907 + eval "LIBPATH$unique=set"
21909 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
21910 + LDFLAGS="$LDFLAGS -L$ai_p"
21911 + PHP_RPATHS="$PHP_RPATHS $ai_p"
21923 + c|c_r|pthread*) ;;
21925 + DLIBS="-lrecode $DLIBS"
21935 + cat >> confdefs.h <<\EOF
21936 +#define HAVE_BROKEN_RECODE 1
21941 + echo "configure: failed program was:" >&5
21942 + cat conftest.$ac_ext >&5
21945 + { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; }
21950 + LDFLAGS=$old_LDFLAGS
21956 + cat >> confdefs.h <<\EOF
21957 +#define HAVE_LIBRECODE 1
21961 + if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then
21963 + if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then
21964 + ai_p=$RECODE_DIR/$RECODE_INC
21967 + ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`"
21969 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
21970 + ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`"
21975 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
21977 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
21978 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
21979 + eval "INCLUDEPATH$unique=set"
21982 + INCLUDES="-I$ai_p $INCLUDES"
21984 + INCLUDES="$INCLUDES -I$ai_p"
21992 + PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD"
21994 + for ac_hdr in stdbool.h
21996 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
21997 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
21998 +echo "configure:83109: checking for $ac_hdr" >&5
21999 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
22000 + echo $ac_n "(cached) $ac_c" 1>&6
22002 + cat > conftest.$ac_ext <<EOF
22003 +#line 83114 "configure"
22004 +#include "confdefs.h"
22005 +#include <$ac_hdr>
22007 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
22008 +{ (eval echo configure:83119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
22009 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
22010 +if test -z "$ac_err"; then
22012 + eval "ac_cv_header_$ac_safe=yes"
22014 + echo "$ac_err" >&5
22015 + echo "configure: failed program was:" >&5
22016 + cat conftest.$ac_ext >&5
22018 + eval "ac_cv_header_$ac_safe=no"
22022 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
22023 + echo "$ac_t""yes" 1>&6
22024 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
22025 + cat >> confdefs.h <<EOF
22026 +#define $ac_tr_hdr 1
22030 + echo "$ac_t""no" 1>&6
22035 + ext_builddir=ext/recode
22036 + ext_srcdir=$abs_srcdir/ext/recode
22040 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
22041 + PHP_RECODE_SHARED=no
22044 + case ext/recode in
22045 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22046 + /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22047 + *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22052 + b_c_pre=$php_c_pre
22053 + b_cxx_pre=$php_cxx_pre
22054 + b_c_meta=$php_c_meta
22055 + b_cxx_meta=$php_cxx_meta
22056 + b_c_post=$php_c_post
22057 + b_cxx_post=$php_cxx_post
22062 + for ac_src in recode.c; do
22069 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
22072 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22073 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22074 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22075 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
22078 + cat >>Makefile.objects<<EOF
22079 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
22085 + EXT_STATIC="$EXT_STATIC recode"
22086 + if test "$ext_shared" != "nocli"; then
22087 + EXT_CLI_STATIC="$EXT_CLI_STATIC recode"
22090 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
22091 + PHP_RECODE_SHARED=yes
22093 + case ext/recode in
22094 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22095 + /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22096 + *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22101 + b_c_pre=$shared_c_pre
22102 + b_cxx_pre=$shared_cxx_pre
22103 + b_c_meta=$shared_c_meta
22104 + b_cxx_meta=$shared_cxx_meta
22105 + b_c_post=$shared_c_post
22106 + b_cxx_post=$shared_cxx_post
22111 + for ac_src in recode.c; do
22118 + shared_objects_recode="$shared_objects_recode $ac_bdir$ac_obj.lo"
22121 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22122 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22123 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22124 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
22127 + cat >>Makefile.objects<<EOF
22128 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
22133 + case $host_alias in
22136 + install_modules="install-modules"
22138 + case $host_alias in
22141 + 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'
22145 + link_cmd='$(LIBTOOL) --mode=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)'
22149 + link_cmd='$(LIBTOOL) --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)'
22153 + if test "x" = "xyes"; then
22154 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phprecode.$suffix"
22156 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phprecode.$suffix"
22159 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode"
22161 + cat >>Makefile.objects<<EOF
22162 +\$(phplibdir)/phprecode.$suffix: $ext_builddir/phprecode.$suffix
22163 + \$(LIBTOOL) --mode=install cp $ext_builddir/phprecode.$suffix \$(phplibdir)
22165 +$ext_builddir/phprecode.$suffix: \$(shared_objects_recode) \$(PHPRECODE_SHARED_DEPENDENCIES)
22173 + install_modules="install-modules"
22175 + case $host_alias in
22178 + 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'
22182 + link_cmd='$(LIBTOOL) --mode=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)'
22186 + link_cmd='$(LIBTOOL) --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)'
22190 + if test "x" = "xyes"; then
22191 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/recode.$suffix"
22193 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/recode.$suffix"
22196 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode"
22198 + cat >>Makefile.objects<<EOF
22199 +\$(phplibdir)/recode.$suffix: $ext_builddir/recode.$suffix
22200 + \$(LIBTOOL) --mode=install cp $ext_builddir/recode.$suffix \$(phplibdir)
22202 +$ext_builddir/recode.$suffix: \$(shared_objects_recode) \$(RECODE_SHARED_DEPENDENCIES)
22209 + cat >> confdefs.h <<EOF
22210 +#define COMPILE_DL_RECODE 1
22216 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
22217 + PHP_RECODE_SHARED=no
22218 + case "$PHP_SAPI" in
22222 + case ext/recode in
22223 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22224 + /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22225 + *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22230 + b_c_pre=$php_c_pre
22231 + b_cxx_pre=$php_cxx_pre
22232 + b_c_meta=$php_c_meta
22233 + b_cxx_meta=$php_cxx_meta
22234 + b_c_post=$php_c_post
22235 + b_cxx_post=$php_cxx_post
22240 + for ac_src in recode.c; do
22247 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
22250 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22251 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22252 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22253 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
22256 + cat >>Makefile.objects<<EOF
22257 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
22263 + EXT_STATIC="$EXT_STATIC recode"
22268 + case ext/recode in
22269 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22270 + /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22271 + *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22276 + b_c_pre=$php_c_pre
22277 + b_cxx_pre=$php_cxx_pre
22278 + b_c_meta=$php_c_meta
22279 + b_cxx_meta=$php_cxx_meta
22280 + b_c_post=$php_c_post
22281 + b_cxx_post=$php_cxx_post
22286 + for ac_src in recode.c; do
22293 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
22296 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22297 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22298 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22299 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
22302 + cat >>Makefile.objects<<EOF
22303 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
22311 + EXT_CLI_STATIC="$EXT_CLI_STATIC recode"
22315 + BUILD_DIR="$BUILD_DIR $ext_builddir"
22319 + if test "$ext_builddir" = "."; then
22320 + PHP_PECL_EXTENSION=recode
22322 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
22329 +cat >> confdefs.h <<\EOF
22330 +#define HAVE_REFLECTION 1
22334 + ext_builddir=ext/reflection
22335 + ext_srcdir=$abs_srcdir/ext/reflection
22339 + if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
22340 + PHP_REFLECTION_SHARED=no
22343 + case ext/reflection in
22344 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22345 + /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22346 + *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22351 + b_c_pre=$php_c_pre
22352 + b_cxx_pre=$php_cxx_pre
22353 + b_c_meta=$php_c_meta
22354 + b_cxx_meta=$php_cxx_meta
22355 + b_c_post=$php_c_post
22356 + b_cxx_post=$php_cxx_post
22361 + for ac_src in php_reflection.c; do
22368 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
22371 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22372 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22373 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22374 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
22377 + cat >>Makefile.objects<<EOF
22378 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
22384 + EXT_STATIC="$EXT_STATIC reflection"
22385 + if test "no" != "nocli"; then
22386 + EXT_CLI_STATIC="$EXT_CLI_STATIC reflection"
22389 + if test "no" = "shared" || test "no" = "yes"; then
22390 + PHP_REFLECTION_SHARED=yes
22392 + case ext/reflection in
22393 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22394 + /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22395 + *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22400 + b_c_pre=$shared_c_pre
22401 + b_cxx_pre=$shared_cxx_pre
22402 + b_c_meta=$shared_c_meta
22403 + b_cxx_meta=$shared_cxx_meta
22404 + b_c_post=$shared_c_post
22405 + b_cxx_post=$shared_cxx_post
22410 + for ac_src in php_reflection.c; do
22417 + shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo"
22420 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22421 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22422 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22423 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
22426 + cat >>Makefile.objects<<EOF
22427 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
22432 + case $host_alias in
22435 + install_modules="install-modules"
22437 + case $host_alias in
22440 + 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'
22444 + link_cmd='$(LIBTOOL) --mode=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)'
22448 + link_cmd='$(LIBTOOL) --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)'
22452 + if test "x" = "xyes"; then
22453 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreflection.$suffix"
22455 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix"
22458 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection"
22460 + cat >>Makefile.objects<<EOF
22461 +\$(phplibdir)/phpreflection.$suffix: $ext_builddir/phpreflection.$suffix
22462 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpreflection.$suffix \$(phplibdir)
22464 +$ext_builddir/phpreflection.$suffix: \$(shared_objects_reflection) \$(PHPREFLECTION_SHARED_DEPENDENCIES)
22472 + install_modules="install-modules"
22474 + case $host_alias in
22477 + 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'
22481 + link_cmd='$(LIBTOOL) --mode=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)'
22485 + link_cmd='$(LIBTOOL) --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)'
22489 + if test "x" = "xyes"; then
22490 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/reflection.$suffix"
22492 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/reflection.$suffix"
22495 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection"
22497 + cat >>Makefile.objects<<EOF
22498 +\$(phplibdir)/reflection.$suffix: $ext_builddir/reflection.$suffix
22499 + \$(LIBTOOL) --mode=install cp $ext_builddir/reflection.$suffix \$(phplibdir)
22501 +$ext_builddir/reflection.$suffix: \$(shared_objects_reflection) \$(REFLECTION_SHARED_DEPENDENCIES)
22508 + cat >> confdefs.h <<EOF
22509 +#define COMPILE_DL_REFLECTION 1
22515 + if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
22516 + PHP_REFLECTION_SHARED=no
22517 + case "$PHP_SAPI" in
22521 + case ext/reflection in
22522 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22523 + /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22524 + *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22529 + b_c_pre=$php_c_pre
22530 + b_cxx_pre=$php_cxx_pre
22531 + b_c_meta=$php_c_meta
22532 + b_cxx_meta=$php_cxx_meta
22533 + b_c_post=$php_c_post
22534 + b_cxx_post=$php_cxx_post
22539 + for ac_src in php_reflection.c; do
22546 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
22549 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22550 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22551 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22552 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
22555 + cat >>Makefile.objects<<EOF
22556 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
22562 + EXT_STATIC="$EXT_STATIC reflection"
22567 + case ext/reflection in
22568 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
22569 + /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
22570 + *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
22575 + b_c_pre=$php_c_pre
22576 + b_cxx_pre=$php_cxx_pre
22577 + b_c_meta=$php_c_meta
22578 + b_cxx_meta=$php_cxx_meta
22579 + b_c_post=$php_c_post
22580 + b_cxx_post=$php_cxx_post
22585 + for ac_src in php_reflection.c; do
22592 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
22595 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22596 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22597 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
22598 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
22601 + cat >>Makefile.objects<<EOF
22602 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
22610 + EXT_CLI_STATIC="$EXT_CLI_STATIC reflection"
22614 + BUILD_DIR="$BUILD_DIR $ext_builddir"
22618 + if test "$ext_builddir" = "."; then
22619 + PHP_PECL_EXTENSION=reflection
22621 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
22628 +php_enable_session=yes
22630 +echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6
22631 +echo "configure:83742: checking whether to enable PHP sessions" >&5
22632 +# Check whether --enable-session or --disable-session was given.
22633 +if test "${enable_session+set}" = set; then
22634 + enableval="$enable_session"
22635 + PHP_SESSION=$enableval
22637 - echo "$ac_t""no" 1>&6
22640 + test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL
22644 - echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6
22645 -echo "configure:76592: checking for PQftable in -lpq" >&5
22646 -ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'`
22647 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22648 - echo $ac_n "(cached) $ac_c" 1>&6
22650 - ac_save_LIBS="$LIBS"
22652 -cat > conftest.$ac_ext <<EOF
22653 -#line 76600 "configure"
22654 -#include "confdefs.h"
22655 -/* Override any gcc2 internal prototype to avoid an error. */
22656 -/* We use char because int might match the return type of a gcc2
22657 - builtin and then its argument prototype would still apply. */
22664 -if { (eval echo configure:76611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22666 - eval "ac_cv_lib_$ac_lib_var=yes"
22668 - echo "configure: failed program was:" >&5
22669 - cat conftest.$ac_ext >&5
22671 - eval "ac_cv_lib_$ac_lib_var=no"
22674 -LIBS="$ac_save_LIBS"
22677 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22678 - echo "$ac_t""yes" 1>&6
22679 - cat >> confdefs.h <<\EOF
22680 -#define HAVE_PQFTABLE 1
22682 +ext_output="yes, shared"
22684 +case $PHP_SESSION in
22686 + PHP_SESSION=`echo "$PHP_SESSION"|$SED 's/^shared,//'`
22702 - echo "$ac_t""no" 1>&6
22705 - echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
22706 -echo "configure:76635: checking for PQescapeStringConn in -lpq" >&5
22707 -ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
22708 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22709 - echo $ac_n "(cached) $ac_c" 1>&6
22711 - ac_save_LIBS="$LIBS"
22713 -cat > conftest.$ac_ext <<EOF
22714 -#line 76643 "configure"
22715 -#include "confdefs.h"
22716 -/* Override any gcc2 internal prototype to avoid an error. */
22717 -/* We use char because int might match the return type of a gcc2
22718 - builtin and then its argument prototype would still apply. */
22719 -char PQescapeStringConn();
22722 -PQescapeStringConn()
22725 -if { (eval echo configure:76654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22727 - eval "ac_cv_lib_$ac_lib_var=yes"
22729 - echo "configure: failed program was:" >&5
22730 - cat conftest.$ac_ext >&5
22732 - eval "ac_cv_lib_$ac_lib_var=no"
22735 -LIBS="$ac_save_LIBS"
22736 +echo "$ac_t""$ext_output" 1>&6
22739 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22740 - echo "$ac_t""yes" 1>&6
22741 - cat >> confdefs.h <<\EOF
22742 -#define HAVE_PQESCAPE_CONN 1
22746 - echo "$ac_t""no" 1>&6
22749 - echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
22750 -echo "configure:76678: checking for PQescapeByteaConn in -lpq" >&5
22751 -ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
22752 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22753 - echo $ac_n "(cached) $ac_c" 1>&6
22755 - ac_save_LIBS="$LIBS"
22757 -cat > conftest.$ac_ext <<EOF
22758 -#line 76686 "configure"
22759 -#include "confdefs.h"
22760 -/* Override any gcc2 internal prototype to avoid an error. */
22761 -/* We use char because int might match the return type of a gcc2
22762 - builtin and then its argument prototype would still apply. */
22763 -char PQescapeByteaConn();
22766 -PQescapeByteaConn()
22769 -if { (eval echo configure:76697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22771 - eval "ac_cv_lib_$ac_lib_var=yes"
22773 - echo "configure: failed program was:" >&5
22774 - cat conftest.$ac_ext >&5
22776 - eval "ac_cv_lib_$ac_lib_var=no"
22779 -LIBS="$ac_save_LIBS"
22782 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22783 - echo "$ac_t""yes" 1>&6
22784 - cat >> confdefs.h <<\EOF
22785 -#define HAVE_PQESCAPE_BYTEA_CONN 1
22789 +echo $ac_n "checking for mm support""... $ac_c" 1>&6
22790 +echo "configure:83786: checking for mm support" >&5
22791 +# Check whether --with-mm or --without-mm was given.
22792 +if test "${with_mm+set}" = set; then
22793 + withval="$with_mm"
22796 - echo "$ac_t""no" 1>&6
22803 - echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
22804 -echo "configure:76721: checking for pg_encoding_to_char in -lpq" >&5
22805 -ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
22806 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22807 - echo $ac_n "(cached) $ac_c" 1>&6
22809 - ac_save_LIBS="$LIBS"
22811 -cat > conftest.$ac_ext <<EOF
22812 -#line 76729 "configure"
22813 -#include "confdefs.h"
22814 -/* Override any gcc2 internal prototype to avoid an error. */
22815 -/* We use char because int might match the return type of a gcc2
22816 - builtin and then its argument prototype would still apply. */
22817 -char pg_encoding_to_char();
22820 -pg_encoding_to_char()
22823 -if { (eval echo configure:76740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22825 - eval "ac_cv_lib_$ac_lib_var=yes"
22827 - echo "configure: failed program was:" >&5
22828 - cat conftest.$ac_ext >&5
22830 - eval "ac_cv_lib_$ac_lib_var=no"
22833 -LIBS="$ac_save_LIBS"
22834 +ext_output=$PHP_MM
22835 +echo "$ac_t""$ext_output" 1>&6
22838 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22839 - echo "$ac_t""yes" 1>&6
22840 - cat >> confdefs.h <<\EOF
22841 -#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1
22845 - echo "$ac_t""no" 1>&6
22848 - echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6
22849 -echo "configure:76764: checking for lo_create in -lpq" >&5
22850 -ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'`
22851 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22853 +if test "$PHP_SESSION" != "no"; then
22855 + echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6
22856 +echo "configure:83808: checking whether pwrite works" >&5
22857 +if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then
22858 echo $ac_n "(cached) $ac_c" 1>&6
22860 - ac_save_LIBS="$LIBS"
22862 -cat > conftest.$ac_ext <<EOF
22863 -#line 76772 "configure"
22866 + if test "$cross_compiling" = yes; then
22871 + cat > conftest.$ac_ext <<EOF
22872 +#line 83820 "configure"
22873 #include "confdefs.h"
22874 -/* Override any gcc2 internal prototype to avoid an error. */
22875 -/* We use char because int might match the return type of a gcc2
22876 - builtin and then its argument prototype would still apply. */
22882 +#include <sys/types.h>
22883 +#include <sys/stat.h>
22884 +#include <fcntl.h>
22885 +#include <unistd.h>
22886 +#include <errno.h>
22889 + int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600);
22891 + if (fd < 0) exit(1);
22892 + if (pwrite(fd, "text", 4, 0) != 4) exit(1);
22893 + /* Linux glibc breakage until 2.2.5 */
22894 + if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1);
22900 -if { (eval echo configure:76783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22902 - eval "ac_cv_lib_$ac_lib_var=yes"
22903 +if { (eval echo configure:83841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
22909 echo "configure: failed program was:" >&5
22910 cat conftest.$ac_ext >&5
22912 - eval "ac_cv_lib_$ac_lib_var=no"
22919 -LIBS="$ac_save_LIBS"
22923 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
22924 - echo "$ac_t""yes" 1>&6
22925 - cat >> confdefs.h <<\EOF
22926 -#define HAVE_PG_LO_CREATE 1
22930 - echo "$ac_t""no" 1>&6
22933 - echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6
22934 -echo "configure:76807: checking for lo_import_with_oid in -lpq" >&5
22935 -ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'`
22936 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
22937 - echo $ac_n "(cached) $ac_c" 1>&6
22938 + if test "$ac_cv_pwrite" = "no"; then
22940 + if test "$cross_compiling" = yes; then
22945 - ac_save_LIBS="$LIBS"
22947 -cat > conftest.$ac_ext <<EOF
22948 -#line 76815 "configure"
22949 + cat > conftest.$ac_ext <<EOF
22950 +#line 83866 "configure"
22951 #include "confdefs.h"
22952 -/* Override any gcc2 internal prototype to avoid an error. */
22953 -/* We use char because int might match the return type of a gcc2
22954 - builtin and then its argument prototype would still apply. */
22955 -char lo_import_with_oid();
22958 -lo_import_with_oid()
22960 +#include <sys/types.h>
22961 +#include <sys/stat.h>
22962 +#include <fcntl.h>
22963 +#include <unistd.h>
22964 +#include <errno.h>
22965 +ssize_t pwrite(int, void *, size_t, off64_t);
22967 + int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600);
22969 + if (fd < 0) exit(1);
22970 + if (pwrite(fd, "text", 4, 0) != 4) exit(1);
22971 + /* Linux glibc breakage until 2.2.5 */
22972 + if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1);
22978 -if { (eval echo configure:76826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
22980 - eval "ac_cv_lib_$ac_lib_var=yes"
22981 +if { (eval echo configure:83887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
22987 echo "configure: failed program was:" >&5
22988 cat conftest.$ac_ext >&5
22990 - eval "ac_cv_lib_$ac_lib_var=no"
22993 -LIBS="$ac_save_LIBS"
23000 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
23001 - echo "$ac_t""yes" 1>&6
23002 - cat >> confdefs.h <<\EOF
23003 -#define HAVE_PG_LO_IMPORT_WITH_OID 1
23007 - echo "$ac_t""no" 1>&6
23012 - LDFLAGS=$old_LDFLAGS
23014 + if test "$ac_cv_pwrite" = "yes"; then
23021 - if test "$ext_shared" = "yes"; then
23022 - PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD"
23023 - if test -n "$PGSQL_LIBDIR"; then
23025 - if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
23027 - if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
23028 - ai_p=$PGSQL_LIBDIR
23031 - ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
23033 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23034 - ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
23038 - if test "$ext_shared" = "yes"; then
23039 - PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD"
23040 - test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_SHARED_LIBADD"
23045 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
23047 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
23048 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
23049 - eval "LIBPATH$unique=set"
23051 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
23052 - LDFLAGS="$LDFLAGS -L$ai_p"
23053 - PHP_RPATHS="$PHP_RPATHS $ai_p"
23056 +echo "$ac_t""$ac_cv_pwrite" 1>&6
23058 + if test "$ac_cv_pwrite" != "no"; then
23059 + cat >> confdefs.h <<\EOF
23060 +#define HAVE_PWRITE 1
23066 + if test "$ac_cv_pwrite" = "64"; then
23067 + cat >> confdefs.h <<\EOF
23068 +#define PHP_PWRITE_64 1
23075 - if test -n "$PGSQL_LIBDIR"; then
23077 - if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then
23079 - if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then
23080 - ai_p=$PGSQL_LIBDIR
23083 - ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
23085 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23086 - ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
23094 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
23095 + echo $ac_n "checking whether pread works""... $ac_c" 1>&6
23096 +echo "configure:83928: checking whether pread works" >&5
23097 +if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then
23098 + echo $ac_n "(cached) $ac_c" 1>&6
23101 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
23102 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
23103 - eval "LIBPATH$unique=set"
23105 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
23106 - LDFLAGS="$LDFLAGS -L$ai_p"
23107 - PHP_RPATHS="$PHP_RPATHS $ai_p"
23108 + echo test > conftest_in
23109 + if test "$cross_compiling" = yes; then
23116 + cat > conftest.$ac_ext <<EOF
23117 +#line 83941 "configure"
23118 +#include "confdefs.h"
23122 +#include <sys/types.h>
23123 +#include <sys/stat.h>
23124 +#include <fcntl.h>
23125 +#include <unistd.h>
23126 +#include <errno.h>
23131 + int fd = open("conftest_in", O_RDONLY);
23132 + if (fd < 0) exit(1);
23133 + if (pread(fd, buf, 2, 0) != 2) exit(1);
23134 + /* Linux glibc breakage until 2.2.5 */
23135 + if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1);
23140 +if { (eval echo configure:83961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
23144 - c|c_r|pthread*) ;;
23146 - LIBS="-lpq $LIBS"
23158 - PHP_VAR_SUBST="$PHP_VAR_SUBST PGSQL_SHARED_LIBADD"
23160 + echo "configure: failed program was:" >&5
23161 + cat conftest.$ac_ext >&5
23170 + rm -f conftest_in
23172 + if test "$ac_cv_pread" = "no"; then
23174 + echo test > conftest_in
23175 + if test "$cross_compiling" = yes; then
23177 - if test "$PGSQL_INCLUDE" != "/usr/include"; then
23179 - if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then
23180 - ai_p=$PGSQL_INCLUDE
23183 - ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
23185 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23186 - ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
23191 + cat > conftest.$ac_ext <<EOF
23192 +#line 83988 "configure"
23193 +#include "confdefs.h"
23196 +#include <sys/types.h>
23197 +#include <sys/stat.h>
23198 +#include <fcntl.h>
23199 +#include <unistd.h>
23200 +#include <errno.h>
23201 +ssize_t pread(int, void *, size_t, off64_t);
23204 + int fd = open("conftest_in", O_RDONLY);
23205 + if (fd < 0) exit(1);
23206 + if (pread(fd, buf, 2, 0) != 2) exit(1);
23207 + /* Linux glibc breakage until 2.2.5 */
23208 + if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1);
23212 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
23214 +if { (eval echo configure:84008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
23217 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
23218 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
23219 - eval "INCLUDEPATH$unique=set"
23222 - INCLUDES="-I$ai_p $INCLUDES"
23224 - INCLUDES="$INCLUDES -I$ai_p"
23228 + echo "configure: failed program was:" >&5
23229 + cat conftest.$ac_ext >&5
23238 + rm -f conftest_in
23240 + if test "$ac_cv_pread" = "yes"; then
23250 +echo "$ac_t""$ac_cv_pread" 1>&6
23252 + if test "$ac_cv_pread" != "no"; then
23253 + cat >> confdefs.h <<\EOF
23254 +#define HAVE_PREAD 1
23257 + if test "$ac_cv_pread" = "64"; then
23258 + cat >> confdefs.h <<\EOF
23259 +#define PHP_PREAD_64 1
23266 - ext_builddir=ext/pgsql
23267 - ext_srcdir=$abs_srcdir/ext/pgsql
23268 + ext_builddir=ext/session
23269 + ext_srcdir=$abs_srcdir/ext/session
23273 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
23274 - PHP_PGSQL_SHARED=no
23275 + PHP_SESSION_SHARED=no
23278 - case ext/pgsql in
23279 + case ext/session in
23280 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
23281 - /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23282 - *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23283 + /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23284 + *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23288 @@ -77009,7 +84072,7 @@ fi
23292 - for ac_src in pgsql.c; do
23293 + for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
23297 @@ -77032,18 +84095,18 @@ EOF
23301 - EXT_STATIC="$EXT_STATIC pgsql"
23302 + EXT_STATIC="$EXT_STATIC session"
23303 if test "$ext_shared" != "nocli"; then
23304 - EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql"
23305 + EXT_CLI_STATIC="$EXT_CLI_STATIC session"
23308 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
23309 - PHP_PGSQL_SHARED=yes
23310 + PHP_SESSION_SHARED=yes
23312 - case ext/pgsql in
23313 + case ext/session in
23314 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
23315 - /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23316 - *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23317 + /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23318 + *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23322 @@ -77058,14 +84121,14 @@ EOF
23326 - for ac_src in pgsql.c; do
23327 + for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
23334 - shared_objects_pgsql="$shared_objects_pgsql $ac_bdir$ac_obj.lo"
23335 + shared_objects_session="$shared_objects_session $ac_bdir$ac_obj.lo"
23338 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23339 @@ -77088,31 +84151,31 @@ EOF
23340 case $host_alias in
23343 - 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'
23344 + 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'
23348 - link_cmd='$(LIBTOOL) --mode=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)'
23349 + link_cmd='$(LIBTOOL) --mode=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)'
23353 - link_cmd='$(LIBTOOL) --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)'
23354 + link_cmd='$(LIBTOOL) --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)'
23358 if test "x" = "xyes"; then
23359 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppgsql.$suffix"
23360 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsession.$suffix"
23362 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppgsql.$suffix"
23363 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix"
23366 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql"
23367 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session"
23369 cat >>Makefile.objects<<EOF
23370 -\$(phplibdir)/phppgsql.$suffix: $ext_builddir/phppgsql.$suffix
23371 - \$(LIBTOOL) --mode=install cp $ext_builddir/phppgsql.$suffix \$(phplibdir)
23372 +\$(phplibdir)/phpsession.$suffix: $ext_builddir/phpsession.$suffix
23373 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpsession.$suffix \$(phplibdir)
23375 -$ext_builddir/phppgsql.$suffix: \$(shared_objects_pgsql) \$(PHPPGSQL_SHARED_DEPENDENCIES)
23376 +$ext_builddir/phpsession.$suffix: \$(shared_objects_session) \$(PHPSESSION_SHARED_DEPENDENCIES)
23380 @@ -77125,31 +84188,31 @@ EOF
23381 case $host_alias in
23384 - 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'
23385 + 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'
23389 - link_cmd='$(LIBTOOL) --mode=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)'
23390 + link_cmd='$(LIBTOOL) --mode=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)'
23394 - link_cmd='$(LIBTOOL) --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)'
23395 + link_cmd='$(LIBTOOL) --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)'
23399 if test "x" = "xyes"; then
23400 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pgsql.$suffix"
23401 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/session.$suffix"
23403 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/pgsql.$suffix"
23404 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/session.$suffix"
23407 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql"
23408 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session"
23410 cat >>Makefile.objects<<EOF
23411 -\$(phplibdir)/pgsql.$suffix: $ext_builddir/pgsql.$suffix
23412 - \$(LIBTOOL) --mode=install cp $ext_builddir/pgsql.$suffix \$(phplibdir)
23413 +\$(phplibdir)/session.$suffix: $ext_builddir/session.$suffix
23414 + \$(LIBTOOL) --mode=install cp $ext_builddir/session.$suffix \$(phplibdir)
23416 -$ext_builddir/pgsql.$suffix: \$(shared_objects_pgsql) \$(PGSQL_SHARED_DEPENDENCIES)
23417 +$ext_builddir/session.$suffix: \$(shared_objects_session) \$(SESSION_SHARED_DEPENDENCIES)
23421 @@ -77157,22 +84220,22 @@ EOF
23424 cat >> confdefs.h <<EOF
23425 -#define COMPILE_DL_PGSQL 1
23426 +#define COMPILE_DL_SESSION 1
23432 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
23433 - PHP_PGSQL_SHARED=no
23434 + PHP_SESSION_SHARED=no
23435 case "$PHP_SAPI" in
23439 - case ext/pgsql in
23440 + case ext/session in
23441 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
23442 - /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23443 - *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23444 + /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23445 + *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23449 @@ -77187,7 +84250,7 @@ EOF
23453 - for ac_src in pgsql.c; do
23454 + for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
23458 @@ -77210,15 +84273,15 @@ EOF
23462 - EXT_STATIC="$EXT_STATIC pgsql"
23463 + EXT_STATIC="$EXT_STATIC session"
23468 - case ext/pgsql in
23469 + case ext/session in
23470 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
23471 - /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23472 - *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23473 + /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23474 + *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23478 @@ -77233,7 +84296,7 @@ EOF
23482 - for ac_src in pgsql.c; do
23483 + for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
23487 @@ -77258,7 +84321,7 @@ EOF
23491 - EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql"
23492 + EXT_CLI_STATIC="$EXT_CLI_STATIC session"
23496 @@ -77267,439 +84330,253 @@ EOF
23499 if test "$ext_builddir" = "."; then
23500 - PHP_PECL_EXTENSION=pgsql
23501 + PHP_PECL_EXTENSION=session
23503 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
23513 -php_enable_phar=yes
23515 -echo $ac_n "checking for phar archive support""... $ac_c" 1>&6
23516 -echo "configure:77286: checking for phar archive support" >&5
23517 -# Check whether --enable-phar or --disable-phar was given.
23518 -if test "${enable_phar+set}" = set; then
23519 - enableval="$enable_phar"
23520 - PHP_PHAR=$enableval
23524 - test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL
23530 -ext_output="yes, shared"
23534 - PHP_PHAR=`echo "$PHP_PHAR"|$SED 's/^shared,//'`
23551 -echo "$ac_t""$ext_output" 1>&6
23556 -if test "$PHP_PHAR" != "no"; then
23557 + am_i_shared=$PHP_SESSION_SHARED
23558 + is_it_shared=$PHP_HASH_SHARED
23559 + is_it_enabled=$PHP_HASH
23560 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
23561 + { echo "configure: error:
23562 +You've configured extension session to build statically, but it
23563 +depends on extension hash, which you've configured to build shared.
23564 +You either need to build session shared or build hash statically for the
23565 +build to be successful.
23568 + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
23569 + { echo "configure: error:
23570 +You've configured extension session, which depends on extension hash,
23571 +but you've either not enabled hash, or have disabled it.
23575 - ext_builddir=ext/phar
23576 - ext_srcdir=$abs_srcdir/ext/phar
23580 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
23581 - PHP_PHAR_SHARED=no
23585 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
23586 - /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23587 - *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23589 + am_i_shared=$PHP_SESSION_SHARED
23590 + is_it_shared=$PHP_SPL_SHARED
23591 + is_it_enabled=$PHP_SPL
23592 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
23593 + { echo "configure: error:
23594 +You've configured extension session to build statically, but it
23595 +depends on extension spl, which you've configured to build shared.
23596 +You either need to build session shared or build spl statically for the
23597 +build to be successful.
23600 + if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
23601 + { echo "configure: error:
23602 +You've configured extension session, which depends on extension spl,
23603 +but you've either not enabled spl, or have disabled it.
23608 + PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD"
23610 - b_c_pre=$php_c_pre
23611 - b_cxx_pre=$php_cxx_pre
23612 - b_c_meta=$php_c_meta
23613 - b_cxx_meta=$php_cxx_meta
23614 - b_c_post=$php_c_post
23615 - b_cxx_post=$php_cxx_post
23620 - 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
23627 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
23630 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23631 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23632 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23633 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
23636 - cat >>Makefile.objects<<EOF
23637 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
23643 - EXT_STATIC="$EXT_STATIC phar"
23644 - if test "$ext_shared" != "nocli"; then
23645 - EXT_CLI_STATIC="$EXT_CLI_STATIC phar"
23648 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
23649 - PHP_PHAR_SHARED=yes
23652 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
23653 - /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23654 - *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23657 + header_path=ext/session
23658 + for header_file in php_session.h mod_files.h mod_user.h; do
23659 + hp_hf="$header_path/$header_file"
23663 - b_c_pre=$shared_c_pre
23664 - b_cxx_pre=$shared_cxx_pre
23665 - b_c_meta=$shared_c_meta
23666 - b_cxx_meta=$shared_cxx_meta
23667 - b_c_post=$shared_c_post
23668 - b_cxx_post=$shared_cxx_post
23673 - 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
23674 + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
23680 + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
23681 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
23682 + eval "INSTALLHEADERS$unique=set"
23684 + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
23686 - shared_objects_phar="$shared_objects_phar $ac_bdir$ac_obj.lo"
23689 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23690 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23691 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23692 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
23695 - cat >>Makefile.objects<<EOF
23696 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
23701 - case $host_alias in
23704 - install_modules="install-modules"
23706 - case $host_alias in
23709 - 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'
23713 - link_cmd='$(LIBTOOL) --mode=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)'
23717 - link_cmd='$(LIBTOOL) --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)'
23721 - if test "x" = "xyes"; then
23722 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpphar.$suffix"
23724 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpphar.$suffix"
23727 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar"
23729 - cat >>Makefile.objects<<EOF
23730 -\$(phplibdir)/phpphar.$suffix: $ext_builddir/phpphar.$suffix
23731 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpphar.$suffix \$(phplibdir)
23733 -$ext_builddir/phpphar.$suffix: \$(shared_objects_phar) \$(PHPPHAR_SHARED_DEPENDENCIES)
23738 + cat >> confdefs.h <<\EOF
23739 +#define HAVE_PHP_SESSION 1
23745 - install_modules="install-modules"
23748 - case $host_alias in
23751 - 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'
23755 - link_cmd='$(LIBTOOL) --mode=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)'
23759 - link_cmd='$(LIBTOOL) --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)'
23762 +if test "$PHP_MM" != "no"; then
23763 + for i in $PHP_MM /usr/local /usr; do
23764 + test -f "$i/include/mm.h" && MM_DIR=$i && break
23767 - if test "x" = "xyes"; then
23768 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phar.$suffix"
23770 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phar.$suffix"
23771 + if test -z "$MM_DIR" ; then
23772 + { echo "configure: error: cannot find mm library" 1>&2; exit 1; }
23775 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar"
23777 - cat >>Makefile.objects<<EOF
23778 -\$(phplibdir)/phar.$suffix: $ext_builddir/phar.$suffix
23779 - \$(LIBTOOL) --mode=install cp $ext_builddir/phar.$suffix \$(phplibdir)
23781 -$ext_builddir/phar.$suffix: \$(shared_objects_phar) \$(PHAR_SHARED_DEPENDENCIES)
23788 - cat >> confdefs.h <<EOF
23789 -#define COMPILE_DL_PHAR 1
23794 + if test "$ext_shared" = "yes"; then
23795 + SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD"
23796 + if test -n "$MM_DIR/$PHP_LIBDIR"; then
23798 + if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
23800 + if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
23801 + ai_p=$MM_DIR/$PHP_LIBDIR
23804 + ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
23806 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23807 + ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
23810 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
23811 - PHP_PHAR_SHARED=no
23812 - case "$PHP_SAPI" in
23815 + if test "$ext_shared" = "yes"; then
23816 + SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD"
23817 + test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD"
23822 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
23823 - /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23824 - *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23827 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
23830 - b_c_pre=$php_c_pre
23831 - b_cxx_pre=$php_cxx_pre
23832 - b_c_meta=$php_c_meta
23833 - b_cxx_meta=$php_cxx_meta
23834 - b_c_post=$php_c_post
23835 - b_cxx_post=$php_cxx_post
23840 - 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
23841 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
23842 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
23843 + eval "LIBPATH$unique=set"
23845 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
23846 + LDFLAGS="$LDFLAGS -L$ai_p"
23847 + PHP_RPATHS="$PHP_RPATHS $ai_p"
23854 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
23858 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23859 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23860 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23861 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
23864 - cat >>Makefile.objects<<EOF
23865 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
23877 - EXT_STATIC="$EXT_STATIC phar"
23883 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
23884 - /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
23885 - *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
23887 + if test -n "$MM_DIR/$PHP_LIBDIR"; then
23889 + if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
23891 + if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
23892 + ai_p=$MM_DIR/$PHP_LIBDIR
23895 + ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
23897 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23898 + ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
23906 - b_c_pre=$php_c_pre
23907 - b_cxx_pre=$php_cxx_pre
23908 - b_c_meta=$php_c_meta
23909 - b_cxx_meta=$php_cxx_meta
23910 - b_c_post=$php_c_post
23911 - b_cxx_post=$php_cxx_post
23916 - 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
23917 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
23924 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
23927 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23928 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23929 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
23930 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
23932 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
23933 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
23934 + eval "LIBPATH$unique=set"
23936 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
23937 + LDFLAGS="$LDFLAGS -L$ai_p"
23938 + PHP_RPATHS="$PHP_RPATHS $ai_p"
23942 - cat >>Makefile.objects<<EOF
23943 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
23953 - EXT_CLI_STATIC="$EXT_CLI_STATIC phar"
23957 - BUILD_DIR="$BUILD_DIR $ext_builddir"
23960 + c|c_r|pthread*) ;;
23962 + LIBS="-lmm $LIBS"
23968 - if test "$ext_builddir" = "."; then
23969 - PHP_PECL_EXTENSION=phar
23971 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
23975 - echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6
23976 -echo "configure:77620: checking for phar openssl support" >&5
23977 - if test "$PHP_HASH_SHARED" != "yes"; then
23978 - if test "$PHP_HASH" != "no"; then
23979 - cat >> confdefs.h <<\EOF
23980 -#define PHAR_HASH_OK 1
23985 + if test "$MM_DIR/include" != "/usr/include"; then
23987 + if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then
23988 + ai_p=$MM_DIR/include
23990 - echo "configure: warning: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" 1>&2
23992 + ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
23994 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
23995 + ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`"
23997 - if test "$PHP_OPENSSL_SHARED" = "yes"; then
23998 - echo "$ac_t""no (shared openssl)" 1>&6
24000 - if test "$PHP_OPENSSL" = "yes"; then
24001 - echo "$ac_t""yes" 1>&6
24002 - cat >> confdefs.h <<\EOF
24003 -#define PHAR_HAVE_OPENSSL 1
24007 - echo "$ac_t""no" 1>&6
24012 - am_i_shared=$PHP_PHAR_SHARED
24013 - is_it_shared=$PHP_HASH_SHARED
24014 - is_it_enabled=$PHP_HASH
24015 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
24016 - { echo "configure: error:
24017 -You've configured extension phar to build statically, but it
24018 -depends on extension hash, which you've configured to build shared.
24019 -You either need to build phar shared or build hash statically for the
24020 -build to be successful.
24022 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
24024 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
24025 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
24026 + eval "INCLUDEPATH$unique=set"
24029 + INCLUDES="-I$ai_p $INCLUDES"
24031 + INCLUDES="$INCLUDES -I$ai_p"
24035 - if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
24036 - { echo "configure: error:
24037 -You've configured extension phar, which depends on extension hash,
24038 -but you've either not enabled hash, or have disabled it.
24045 - am_i_shared=$PHP_PHAR_SHARED
24046 - is_it_shared=$PHP_SPL_SHARED
24047 - is_it_enabled=$PHP_SPL
24048 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
24049 - { echo "configure: error:
24050 -You've configured extension phar to build statically, but it
24051 -depends on extension spl, which you've configured to build shared.
24052 -You either need to build phar shared or build spl statically for the
24053 -build to be successful.
24056 - if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
24057 - { echo "configure: error:
24058 -You've configured extension phar, which depends on extension spl,
24059 -but you've either not enabled spl, or have disabled it.
24062 + for header_file in ext/session/mod_mm.h; do
24065 + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
24067 - src=$ext_srcdir/Makefile.frag
24068 - ac_srcdir=$ext_srcdir
24069 - ac_builddir=$ext_builddir
24070 - test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
24071 + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
24072 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
24073 + eval "INSTALLHEADERS$unique=set"
24075 + INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
24083 + cat >> confdefs.h <<\EOF
24084 +#define HAVE_LIBMM 1
24090 -php_enable_posix=yes
24091 +php_enable_shmop=no
24093 -echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6
24094 -echo "configure:77695: checking whether to enable POSIX-like functions" >&5
24095 -# Check whether --enable-posix or --disable-posix was given.
24096 -if test "${enable_posix+set}" = set; then
24097 - enableval="$enable_posix"
24098 - PHP_POSIX=$enableval
24099 +echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6
24100 +echo "configure:84572: checking whether to enable shmop support" >&5
24101 +# Check whether --enable-shmop or --disable-shmop was given.
24102 +if test "${enable_shmop+set}" = set; then
24103 + enableval="$enable_shmop"
24104 + PHP_SHMOP=$enableval
24108 - test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL
24110 + test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL
24114 @@ -77707,12 +84584,12 @@ fi
24116 ext_output="yes, shared"
24118 -case $PHP_POSIX in
24119 +case $PHP_SHMOP in
24121 - PHP_POSIX=`echo "$PHP_POSIX"|$SED 's/^shared,//'`
24122 + PHP_SHMOP=`echo "$PHP_SHMOP"|$SED 's/^shared,//'`
24130 @@ -77731,25 +84608,25 @@ echo "$ac_t""$ext_output" 1>&6
24134 -if test "$PHP_POSIX" = "yes"; then
24135 +if test "$PHP_SHMOP" != "no"; then
24136 cat >> confdefs.h <<\EOF
24137 -#define HAVE_POSIX 1
24138 +#define HAVE_SHMOP 1
24142 - ext_builddir=ext/posix
24143 - ext_srcdir=$abs_srcdir/ext/posix
24144 + ext_builddir=ext/shmop
24145 + ext_srcdir=$abs_srcdir/ext/shmop
24149 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
24150 - PHP_POSIX_SHARED=no
24151 + PHP_SHMOP_SHARED=no
24154 - case ext/posix in
24155 + case ext/shmop in
24156 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
24157 - /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24158 - *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24159 + /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24160 + *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24164 @@ -77764,7 +84641,7 @@ EOF
24168 - for ac_src in posix.c; do
24169 + for ac_src in shmop.c; do
24173 @@ -77787,18 +84664,18 @@ EOF
24177 - EXT_STATIC="$EXT_STATIC posix"
24178 + EXT_STATIC="$EXT_STATIC shmop"
24179 if test "$ext_shared" != "nocli"; then
24180 - EXT_CLI_STATIC="$EXT_CLI_STATIC posix"
24181 + EXT_CLI_STATIC="$EXT_CLI_STATIC shmop"
24184 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
24185 - PHP_POSIX_SHARED=yes
24186 + PHP_SHMOP_SHARED=yes
24188 - case ext/posix in
24189 + case ext/shmop in
24190 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
24191 - /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24192 - *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24193 + /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24194 + *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24198 @@ -77813,14 +84690,14 @@ EOF
24202 - for ac_src in posix.c; do
24203 + for ac_src in shmop.c; do
24210 - shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo"
24211 + shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo"
24214 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
24215 @@ -77843,31 +84720,31 @@ EOF
24216 case $host_alias in
24219 - 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'
24220 + 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'
24224 - link_cmd='$(LIBTOOL) --mode=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)'
24225 + link_cmd='$(LIBTOOL) --mode=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)'
24229 - link_cmd='$(LIBTOOL) --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)'
24230 + link_cmd='$(LIBTOOL) --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)'
24234 if test "x" = "xyes"; then
24235 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpposix.$suffix"
24236 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpshmop.$suffix"
24238 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpposix.$suffix"
24239 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix"
24242 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix"
24243 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop"
24245 cat >>Makefile.objects<<EOF
24246 -\$(phplibdir)/phpposix.$suffix: $ext_builddir/phpposix.$suffix
24247 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpposix.$suffix \$(phplibdir)
24248 +\$(phplibdir)/phpshmop.$suffix: $ext_builddir/phpshmop.$suffix
24249 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpshmop.$suffix \$(phplibdir)
24251 -$ext_builddir/phpposix.$suffix: \$(shared_objects_posix) \$(PHPPOSIX_SHARED_DEPENDENCIES)
24252 +$ext_builddir/phpshmop.$suffix: \$(shared_objects_shmop) \$(PHPSHMOP_SHARED_DEPENDENCIES)
24256 @@ -77880,31 +84757,31 @@ EOF
24257 case $host_alias in
24260 - 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'
24261 + 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'
24265 - link_cmd='$(LIBTOOL) --mode=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)'
24266 + link_cmd='$(LIBTOOL) --mode=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)'
24270 - link_cmd='$(LIBTOOL) --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)'
24271 + link_cmd='$(LIBTOOL) --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)'
24275 if test "x" = "xyes"; then
24276 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/posix.$suffix"
24277 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/shmop.$suffix"
24279 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/posix.$suffix"
24280 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/shmop.$suffix"
24283 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix"
24284 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop"
24286 cat >>Makefile.objects<<EOF
24287 -\$(phplibdir)/posix.$suffix: $ext_builddir/posix.$suffix
24288 - \$(LIBTOOL) --mode=install cp $ext_builddir/posix.$suffix \$(phplibdir)
24289 +\$(phplibdir)/shmop.$suffix: $ext_builddir/shmop.$suffix
24290 + \$(LIBTOOL) --mode=install cp $ext_builddir/shmop.$suffix \$(phplibdir)
24292 -$ext_builddir/posix.$suffix: \$(shared_objects_posix) \$(POSIX_SHARED_DEPENDENCIES)
24293 +$ext_builddir/shmop.$suffix: \$(shared_objects_shmop) \$(SHMOP_SHARED_DEPENDENCIES)
24297 @@ -77912,22 +84789,22 @@ EOF
24300 cat >> confdefs.h <<EOF
24301 -#define COMPILE_DL_POSIX 1
24302 +#define COMPILE_DL_SHMOP 1
24308 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
24309 - PHP_POSIX_SHARED=no
24310 + PHP_SHMOP_SHARED=no
24311 case "$PHP_SAPI" in
24315 - case ext/posix in
24316 + case ext/shmop in
24317 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
24318 - /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24319 - *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24320 + /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24321 + *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24325 @@ -77942,7 +84819,7 @@ EOF
24329 - for ac_src in posix.c; do
24330 + for ac_src in shmop.c; do
24334 @@ -77965,15 +84842,15 @@ EOF
24338 - EXT_STATIC="$EXT_STATIC posix"
24339 + EXT_STATIC="$EXT_STATIC shmop"
24344 - case ext/posix in
24345 + case ext/shmop in
24346 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
24347 - /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24348 - *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24349 + /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24350 + *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24354 @@ -77988,7 +84865,7 @@ EOF
24358 - for ac_src in posix.c; do
24359 + for ac_src in shmop.c; do
24363 @@ -78013,7 +84890,7 @@ EOF
24367 - EXT_CLI_STATIC="$EXT_CLI_STATIC posix"
24368 + EXT_CLI_STATIC="$EXT_CLI_STATIC shmop"
24372 @@ -78022,257 +84899,330 @@ EOF
24375 if test "$ext_builddir" = "."; then
24376 - PHP_PECL_EXTENSION=posix
24377 + PHP_PECL_EXTENSION=shmop
24379 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
24385 - for ac_hdr in sys/mkdev.h
24387 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
24388 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
24389 -echo "configure:78037: checking for $ac_hdr" >&5
24390 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
24391 - echo $ac_n "(cached) $ac_c" 1>&6
24393 - cat > conftest.$ac_ext <<EOF
24394 -#line 78042 "configure"
24395 -#include "confdefs.h"
24396 -#include <$ac_hdr>
24398 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
24399 -{ (eval echo configure:78047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
24400 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
24401 -if test -z "$ac_err"; then
24403 - eval "ac_cv_header_$ac_safe=yes"
24406 +php_enable_simplexml=yes
24408 +echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6
24409 +echo "configure:84916: checking whether to enable SimpleXML support" >&5
24410 +# Check whether --enable-simplexml or --disable-simplexml was given.
24411 +if test "${enable_simplexml+set}" = set; then
24412 + enableval="$enable_simplexml"
24413 + PHP_SIMPLEXML=$enableval
24415 - echo "$ac_err" >&5
24416 - echo "configure: failed program was:" >&5
24417 - cat conftest.$ac_ext >&5
24419 - eval "ac_cv_header_$ac_safe=no"
24423 + PHP_SIMPLEXML=yes
24424 + test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL
24427 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
24428 - echo "$ac_t""yes" 1>&6
24429 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
24430 - cat >> confdefs.h <<EOF
24431 -#define $ac_tr_hdr 1
24437 +ext_output="yes, shared"
24439 +case $PHP_SIMPLEXML in
24441 + PHP_SIMPLEXML=`echo "$PHP_SIMPLEXML"|$SED 's/^shared,//'`
24444 + PHP_SIMPLEXML=yes
24458 +echo "$ac_t""$ext_output" 1>&6
24463 +if test -z "$PHP_LIBXML_DIR"; then
24465 +php_with_libxml_dir=no
24467 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
24468 +echo "configure:84961: checking libxml2 install dir" >&5
24469 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
24470 +if test "${with_libxml_dir+set}" = set; then
24471 + withval="$with_libxml_dir"
24472 + PHP_LIBXML_DIR=$withval
24474 - echo "$ac_t""no" 1>&6
24476 + PHP_LIBXML_DIR=no
24483 - for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r
24485 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
24486 -echo "configure:78077: checking for $ac_func" >&5
24487 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
24488 +ext_output=$PHP_LIBXML_DIR
24489 +echo "$ac_t""$ext_output" 1>&6
24495 +if test "$PHP_SIMPLEXML" != "no"; then
24497 + if test "$PHP_LIBXML" = "no"; then
24498 + { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
24502 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
24503 +echo "configure:84989: checking for xml2-config path" >&5
24504 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
24505 echo $ac_n "(cached) $ac_c" 1>&6
24507 - cat > conftest.$ac_ext <<EOF
24508 -#line 78082 "configure"
24509 -#include "confdefs.h"
24510 -/* System header to define __stub macros and hopefully few prototypes,
24511 - which can conflict with char $ac_func(); below. */
24512 -#include <assert.h>
24513 -/* Override any gcc2 internal prototype to avoid an error. */
24514 -/* We use char because int might match the return type of a gcc2
24515 - builtin and then its argument prototype would still apply. */
24518 + for i in $PHP_LIBXML_DIR /usr/local /usr; do
24519 + if test -x "$i/bin/xml2-config"; then
24520 + ac_cv_php_xml2_config_path="$i/bin/xml2-config"
24528 -/* The GNU C library defines this for functions which it implements
24529 - to always fail with ENOSYS. Some functions are actually named
24530 - something starting with __ and the normal name is an alias. */
24531 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
24536 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
24538 + if test -x "$ac_cv_php_xml2_config_path"; then
24539 + XML2_CONFIG="$ac_cv_php_xml2_config_path"
24540 + libxml_full_version=`$XML2_CONFIG --version`
24543 + set $libxml_full_version
24545 + LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
24546 + if test "$LIBXML_VERSION" -ge "2006011"; then
24547 + LIBXML_LIBS=`$XML2_CONFIG --libs`
24548 + LIBXML_INCS=`$XML2_CONFIG --cflags`
24550 + for ac_i in $LIBXML_LIBS; do
24553 + if test "$ext_shared" = "yes"; then
24554 + SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread"
24558 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
24560 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
24561 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
24562 + eval "EXTRA_LDFLAGS$unique=set"
24563 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
24569 + ac_ii=`echo $ac_i|cut -c 3-`
24573 + c|c_r|pthread*) ;;
24575 + if test "$ext_shared" = "yes"; then
24576 + SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii"
24581 + c|c_r|pthread*) ;;
24583 + LIBS="$LIBS -l$ac_ii"
24595 + ac_ii=`echo $ac_i|cut -c 3-`
24597 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
24599 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
24603 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
24605 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
24606 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
24610 + if test "$ext_shared" = "yes"; then
24611 + SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD"
24612 + test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_SHARED_LIBADD"
24617 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
24619 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
24620 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
24621 + eval "LIBPATH$unique=set"
24623 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
24624 + LDFLAGS="$LDFLAGS -L$ai_p"
24625 + PHP_RPATHS="$PHP_RPATHS $ai_p"
24639 + for ac_i in $LIBXML_INCS; do
24642 + ac_ii=`echo $ac_i|cut -c 3-`
24644 + if test "$ac_ii" != "/usr/include"; then
24646 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
24650 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
24652 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
24653 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
24658 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
24660 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
24661 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
24662 + eval "INCLUDEPATH$unique=set"
24665 + INCLUDES="-I$ai_p $INCLUDES"
24667 + INCLUDES="$INCLUDES -I$ai_p"
24674 -if { (eval echo configure:78105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
24676 - eval "ac_cv_func_$ac_func=yes"
24678 - echo "configure: failed program was:" >&5
24679 - cat conftest.$ac_ext >&5
24681 - eval "ac_cv_func_$ac_func=no"
24687 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
24688 - echo "$ac_t""yes" 1>&6
24689 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
24690 - cat >> confdefs.h <<EOF
24691 -#define $ac_tr_func 1
24695 - echo "$ac_t""no" 1>&6
24703 - echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6
24704 -echo "configure:78131: checking for working ttyname_r() implementation" >&5
24705 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
24706 +echo "configure:85147: checking whether libxml build works" >&5
24707 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
24708 + echo $ac_n "(cached) $ac_c" 1>&6
24714 + $SIMPLEXML_SHARED_LIBADD
24716 if test "$cross_compiling" = yes; then
24718 - echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6
24722 cat > conftest.$ac_ext <<EOF
24723 -#line 78138 "configure"
24724 +#line 85163 "configure"
24725 #include "confdefs.h"
24727 -#include <unistd.h>
24729 -int main(int argc, char *argv[])
24733 - return ttyname_r(0, buf, 64) ? 1 : 0;
24736 + char xmlInitParser();
24743 -if { (eval echo configure:78151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
24744 +if { (eval echo configure:85174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
24747 - echo "$ac_t""yes" 1>&6
24748 - cat >> confdefs.h <<\EOF
24749 -#define HAVE_TTYNAME_R 1
24754 + php_cv_libxml_build_works=yes
24758 echo "configure: failed program was:" >&5
24759 cat conftest.$ac_ext >&5
24762 - echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6
24765 + echo "$ac_t""no" 1>&6
24766 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
24774 - echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6
24775 -echo "configure:78173: checking for utsname.domainname" >&5
24776 -if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then
24777 - echo $ac_n "(cached) $ac_c" 1>&6
24780 - cat > conftest.$ac_ext <<EOF
24781 -#line 78179 "configure"
24782 -#include "confdefs.h"
24784 - #define _GNU_SOURCE
24785 - #include <sys/utsname.h>
24791 - return sizeof(((struct utsname *)0)->domainname);
24794 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
24795 + if test "$php_cv_libxml_build_works" = "yes"; then
24796 + cat >> confdefs.h <<\EOF
24797 +#define HAVE_LIBXML 1
24799 -if { (eval echo configure:78191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
24802 - ac_cv_have_utsname_domainname=yes
24805 - echo "configure: failed program was:" >&5
24806 - cat conftest.$ac_ext >&5
24809 - ac_cv_have_utsname_domainname=no
24816 -echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6
24817 - if test "$ac_cv_have_utsname_domainname" = yes; then
24820 cat >> confdefs.h <<\EOF
24821 -#define HAVE_UTSNAME_DOMAINNAME 1
24822 +#define HAVE_SIMPLEXML 1
24830 -php_with_pspell=no
24832 -echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6
24833 -echo "configure:78222: checking for PSPELL support" >&5
24834 -# Check whether --with-pspell or --without-pspell was given.
24835 -if test "${with_pspell+set}" = set; then
24836 - withval="$with_pspell"
24837 - PHP_PSPELL=$withval
24841 - test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL
24847 -ext_output="yes, shared"
24849 -case $PHP_PSPELL in
24851 - PHP_PSPELL=`echo "$PHP_PSPELL"|$SED 's/^shared,//'`
24868 -echo "$ac_t""$ext_output" 1>&6
24873 -if test "$PHP_PSPELL" != "no"; then
24875 - ext_builddir=ext/pspell
24876 - ext_srcdir=$abs_srcdir/ext/pspell
24878 + ext_builddir=ext/simplexml
24879 + ext_srcdir=$abs_srcdir/ext/simplexml
24883 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
24884 - PHP_PSPELL_SHARED=no
24885 + PHP_SIMPLEXML_SHARED=no
24888 - case ext/pspell in
24889 + case ext/simplexml in
24890 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
24891 - /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24892 - *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24893 + /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24894 + *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24898 @@ -78287,7 +85237,7 @@ if test "$PHP_PSPELL" != "no"; then
24902 - for ac_src in pspell.c; do
24903 + for ac_src in simplexml.c sxe.c; do
24907 @@ -78310,18 +85260,18 @@ EOF
24911 - EXT_STATIC="$EXT_STATIC pspell"
24912 + EXT_STATIC="$EXT_STATIC simplexml"
24913 if test "$ext_shared" != "nocli"; then
24914 - EXT_CLI_STATIC="$EXT_CLI_STATIC pspell"
24915 + EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml"
24918 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
24919 - PHP_PSPELL_SHARED=yes
24920 + PHP_SIMPLEXML_SHARED=yes
24922 - case ext/pspell in
24923 + case ext/simplexml in
24924 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
24925 - /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24926 - *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24927 + /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
24928 + *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
24932 @@ -78336,14 +85286,14 @@ EOF
24936 - for ac_src in pspell.c; do
24937 + for ac_src in simplexml.c sxe.c; do
24944 - shared_objects_pspell="$shared_objects_pspell $ac_bdir$ac_obj.lo"
24945 + shared_objects_simplexml="$shared_objects_simplexml $ac_bdir$ac_obj.lo"
24948 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
24949 @@ -78366,31 +85316,31 @@ EOF
24950 case $host_alias in
24953 - 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'
24954 + 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'
24958 - link_cmd='$(LIBTOOL) --mode=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)'
24959 + link_cmd='$(LIBTOOL) --mode=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)'
24963 - link_cmd='$(LIBTOOL) --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)'
24964 + link_cmd='$(LIBTOOL) --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)'
24968 if test "x" = "xyes"; then
24969 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppspell.$suffix"
24970 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsimplexml.$suffix"
24972 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppspell.$suffix"
24973 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix"
24976 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell"
24977 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml"
24979 cat >>Makefile.objects<<EOF
24980 -\$(phplibdir)/phppspell.$suffix: $ext_builddir/phppspell.$suffix
24981 - \$(LIBTOOL) --mode=install cp $ext_builddir/phppspell.$suffix \$(phplibdir)
24982 +\$(phplibdir)/phpsimplexml.$suffix: $ext_builddir/phpsimplexml.$suffix
24983 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpsimplexml.$suffix \$(phplibdir)
24985 -$ext_builddir/phppspell.$suffix: \$(shared_objects_pspell) \$(PHPPSPELL_SHARED_DEPENDENCIES)
24986 +$ext_builddir/phpsimplexml.$suffix: \$(shared_objects_simplexml) \$(PHPSIMPLEXML_SHARED_DEPENDENCIES)
24990 @@ -78403,31 +85353,31 @@ EOF
24991 case $host_alias in
24994 - 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'
24995 + 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'
24999 - link_cmd='$(LIBTOOL) --mode=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)'
25000 + link_cmd='$(LIBTOOL) --mode=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)'
25004 - link_cmd='$(LIBTOOL) --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)'
25005 + link_cmd='$(LIBTOOL) --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)'
25009 if test "x" = "xyes"; then
25010 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pspell.$suffix"
25011 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/simplexml.$suffix"
25013 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/pspell.$suffix"
25014 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/simplexml.$suffix"
25017 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell"
25018 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml"
25020 cat >>Makefile.objects<<EOF
25021 -\$(phplibdir)/pspell.$suffix: $ext_builddir/pspell.$suffix
25022 - \$(LIBTOOL) --mode=install cp $ext_builddir/pspell.$suffix \$(phplibdir)
25023 +\$(phplibdir)/simplexml.$suffix: $ext_builddir/simplexml.$suffix
25024 + \$(LIBTOOL) --mode=install cp $ext_builddir/simplexml.$suffix \$(phplibdir)
25026 -$ext_builddir/pspell.$suffix: \$(shared_objects_pspell) \$(PSPELL_SHARED_DEPENDENCIES)
25027 +$ext_builddir/simplexml.$suffix: \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_DEPENDENCIES)
25031 @@ -78435,22 +85385,22 @@ EOF
25034 cat >> confdefs.h <<EOF
25035 -#define COMPILE_DL_PSPELL 1
25036 +#define COMPILE_DL_SIMPLEXML 1
25042 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
25043 - PHP_PSPELL_SHARED=no
25044 + PHP_SIMPLEXML_SHARED=no
25045 case "$PHP_SAPI" in
25049 - case ext/pspell in
25050 + case ext/simplexml in
25051 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
25052 - /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25053 - *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25054 + /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25055 + *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25059 @@ -78465,7 +85415,7 @@ EOF
25063 - for ac_src in pspell.c; do
25064 + for ac_src in simplexml.c sxe.c; do
25068 @@ -78488,15 +85438,15 @@ EOF
25072 - EXT_STATIC="$EXT_STATIC pspell"
25073 + EXT_STATIC="$EXT_STATIC simplexml"
25078 - case ext/pspell in
25079 + case ext/simplexml in
25080 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
25081 - /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25082 - *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25083 + /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
25084 + *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
25088 @@ -78511,7 +85461,7 @@ EOF
25092 - for ac_src in pspell.c; do
25093 + for ac_src in simplexml.c sxe.c; do
25097 @@ -78536,7 +85486,7 @@ EOF
25101 - EXT_CLI_STATIC="$EXT_CLI_STATIC pspell"
25102 + EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml"
25106 @@ -78545,145 +85495,240 @@ EOF
25109 if test "$ext_builddir" = "."; then
25110 - PHP_PECL_EXTENSION=pspell
25111 + PHP_PECL_EXTENSION=simplexml
25113 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
25117 - if test "$PHP_PSPELL" != "yes"; then
25118 - PSPELL_SEARCH_DIRS=$PHP_PSPELL
25120 - PSPELL_SEARCH_DIRS="/usr/local /usr"
25122 - for i in $PSPELL_SEARCH_DIRS; do
25123 - if test -f $i/include/pspell/pspell.h; then
25125 - PSPELL_INCDIR=$i/include/pspell
25126 - elif test -f $i/include/pspell.h; then
25128 - PSPELL_INCDIR=$i/include
25132 - if test -z "$PSPELL_DIR"; then
25133 - { echo "configure: error: Cannot find pspell" 1>&2; exit 1; }
25136 - PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR
25140 - if test "$ext_shared" = "yes"; then
25141 - PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD"
25142 - if test -n "$PSPELL_LIBDIR"; then
25144 - if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
25146 - if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
25147 - ai_p=$PSPELL_LIBDIR
25150 - ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
25152 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25153 - ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
25155 + PHP_VAR_SUBST="$PHP_VAR_SUBST SIMPLEXML_SHARED_LIBADD"
25158 - if test "$ext_shared" = "yes"; then
25159 - PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD"
25160 - test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD"
25165 + { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
25168 + { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
25170 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
25174 + am_i_shared=$PHP_SIMPLEXML_SHARED
25175 + is_it_shared=$PHP_LIBXML_SHARED
25176 + is_it_enabled=$PHP_LIBXML
25177 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
25178 + { echo "configure: error:
25179 +You've configured extension simplexml to build statically, but it
25180 +depends on extension libxml, which you've configured to build shared.
25181 +You either need to build simplexml shared or build libxml statically for the
25182 +build to be successful.
25185 + if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
25186 + { echo "configure: error:
25187 +You've configured extension simplexml, which depends on extension libxml,
25188 +but you've either not enabled libxml, or have disabled it.
25192 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
25193 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
25194 - eval "LIBPATH$unique=set"
25196 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
25197 - LDFLAGS="$LDFLAGS -L$ai_p"
25198 - PHP_RPATHS="$PHP_RPATHS $ai_p"
25200 + am_i_shared=$PHP_SIMPLEXML_SHARED
25201 + is_it_shared=$PHP_SPL_SHARED
25202 + is_it_enabled=$PHP_SPL
25203 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
25204 + { echo "configure: error:
25205 +You've configured extension simplexml to build statically, but it
25206 +depends on extension spl, which you've configured to build shared.
25207 +You either need to build simplexml shared or build spl statically for the
25208 +build to be successful.
25211 + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
25212 + { echo "configure: error:
25213 +You've configured extension simplexml, which depends on extension spl,
25214 +but you've either not enabled spl, or have disabled it.
25230 - if test -n "$PSPELL_LIBDIR"; then
25232 - if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
25234 - if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
25235 - ai_p=$PSPELL_LIBDIR
25238 - ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
25240 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25241 - ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
25243 +echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
25244 +echo "configure:85562: checking for SNMP support" >&5
25245 +# Check whether --with-snmp or --without-snmp was given.
25246 +if test "${with_snmp+set}" = set; then
25247 + withval="$with_snmp"
25248 + PHP_SNMP=$withval
25252 + test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL
25260 +ext_output="yes, shared"
25264 + PHP_SNMP=`echo "$PHP_SNMP"|$SED 's/^shared,//'`
25281 +echo "$ac_t""$ext_output" 1>&6
25287 +php_with_openssl_dir=no
25289 +echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6
25290 +echo "configure:85606: checking OpenSSL dir for SNMP" >&5
25291 +# Check whether --with-openssl-dir or --without-openssl-dir was given.
25292 +if test "${with_openssl_dir+set}" = set; then
25293 + withval="$with_openssl_dir"
25294 + PHP_OPENSSL_DIR=$withval
25297 + PHP_OPENSSL_DIR=no
25299 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
25304 +ext_output=$PHP_OPENSSL_DIR
25305 +echo "$ac_t""$ext_output" 1>&6
25311 +php_enable_ucd_snmp_hack=no
25313 +echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
25314 +echo "configure:85629: checking whether to enable UCD SNMP hack" >&5
25315 +# Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given.
25316 +if test "${enable_ucd_snmp_hack+set}" = set; then
25317 + enableval="$enable_ucd_snmp_hack"
25318 + PHP_UCD_SNMP_HACK=$enableval
25321 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
25322 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
25323 - eval "LIBPATH$unique=set"
25325 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
25326 - LDFLAGS="$LDFLAGS -L$ai_p"
25327 - PHP_RPATHS="$PHP_RPATHS $ai_p"
25328 + PHP_UCD_SNMP_HACK=no
25334 +ext_output=$PHP_UCD_SNMP_HACK
25335 +echo "$ac_t""$ext_output" 1>&6
25340 +if test "$PHP_SNMP" != "no"; then
25342 + if test "$PHP_SNMP" = "yes"; then
25343 + # Extract the first word of "net-snmp-config", so it can be a program name with args.
25344 +set dummy net-snmp-config; ac_word=$2
25345 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
25346 +echo "configure:85654: checking for $ac_word" >&5
25347 +if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then
25348 + echo $ac_n "(cached) $ac_c" 1>&6
25350 + case "$SNMP_CONFIG" in
25352 + ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
25355 + ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a dos path.
25358 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
25359 + ac_dummy="/usr/local/bin:$PATH"
25360 + for ac_dir in $ac_dummy; do
25361 + test -z "$ac_dir" && ac_dir=.
25362 + if test -f $ac_dir/$ac_word; then
25363 + ac_cv_path_SNMP_CONFIG="$ac_dir/$ac_word"
25367 + IFS="$ac_save_ifs"
25371 +SNMP_CONFIG="$ac_cv_path_SNMP_CONFIG"
25372 +if test -n "$SNMP_CONFIG"; then
25373 + echo "$ac_t""$SNMP_CONFIG" 1>&6
25375 + echo "$ac_t""no" 1>&6
25379 + SNMP_CONFIG="$PHP_SNMP/bin/net-snmp-config"
25382 + if test -x "$SNMP_CONFIG"; then
25383 + SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs`
25384 + SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`"
25385 + SNMP_PREFIX=`$SNMP_CONFIG --prefix`
25387 + if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
25389 + if test "${SNMP_PREFIX}/include" != "/usr/include"; then
25391 + if test -z "${SNMP_PREFIX}/include" || echo "${SNMP_PREFIX}/include" | grep '^/' >/dev/null ; then
25392 + ai_p=${SNMP_PREFIX}/include
25395 + ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`"
25397 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25398 + ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`"
25404 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
25407 - c|c_r|pthread*) ;;
25409 - LIBS="-lpspell $LIBS"
25416 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
25417 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
25418 + eval "INCLUDEPATH$unique=set"
25421 + INCLUDES="-I$ai_p $INCLUDES"
25423 + INCLUDES="$INCLUDES -I$ai_p"
25432 - save_old_LDFLAGS=$LDFLAGS
25437 - save_ext_shared=$ext_shared
25440 - for ac_i in $ac_stuff; do
25442 + for ac_i in $SNMP_LIBS; do
25445 if test "$ext_shared" = "yes"; then
25446 - LDFLAGS="$LDFLAGS -pthread"
25447 + SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread"
25451 @@ -78705,7 +85750,7 @@ EOF
25454 if test "$ext_shared" = "yes"; then
25455 - LDFLAGS="$LDFLAGS -l$ac_ii"
25456 + SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii"
25460 @@ -78740,8 +85785,8 @@ EOF
25463 if test "$ext_shared" = "yes"; then
25464 - LDFLAGS="-L$ai_p $LDFLAGS"
25465 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
25466 + SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
25467 + test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
25471 @@ -78767,108 +85812,252 @@ EOF
25475 - echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6
25476 -echo "configure:78772: checking for new_aspell_config in -laspell" >&5
25477 -ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'`
25478 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
25479 + cat >> confdefs.h <<\EOF
25480 +#define HAVE_NET_SNMP 1
25483 + SNMP_LIBNAME=netsnmp
25485 + { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; }
25490 + if test "$PHP_SNMP" = "yes"; then
25491 + for i in /usr/include /usr/local/include; do
25492 + test -f $i/snmp.h && SNMP_INCDIR=$i
25493 + test -f $i/ucd-snmp/snmp.h && SNMP_INCDIR=$i/ucd-snmp
25494 + test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp
25495 + test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
25497 + for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do
25498 + test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i
25501 + SNMP_INCDIR=$PHP_SNMP/include
25502 + test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp
25503 + SNMP_LIBDIR=$PHP_SNMP/lib
25506 + if test -z "$SNMP_INCDIR"; then
25507 + { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; }
25508 + elif test -z "$SNMP_LIBDIR"; then
25509 + { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; }
25512 + old_CPPFLAGS=$CPPFLAGS
25513 + CPPFLAGS=-I$SNMP_INCDIR
25514 + for ac_hdr in default_store.h
25516 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
25517 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
25518 +echo "configure:85855: checking for $ac_hdr" >&5
25519 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
25520 echo $ac_n "(cached) $ac_c" 1>&6
25522 - ac_save_LIBS="$LIBS"
25523 -LIBS="-laspell $LIBS"
25524 -cat > conftest.$ac_ext <<EOF
25525 -#line 78780 "configure"
25526 + cat > conftest.$ac_ext <<EOF
25527 +#line 85860 "configure"
25528 #include "confdefs.h"
25529 -/* Override any gcc2 internal prototype to avoid an error. */
25530 -/* We use char because int might match the return type of a gcc2
25531 - builtin and then its argument prototype would still apply. */
25532 -char new_aspell_config();
25535 -new_aspell_config()
25537 +#include <$ac_hdr>
25539 -if { (eval echo configure:78791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
25540 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
25541 +{ (eval echo configure:85865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
25542 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
25543 +if test -z "$ac_err"; then
25545 - eval "ac_cv_lib_$ac_lib_var=yes"
25546 + eval "ac_cv_header_$ac_safe=yes"
25548 + echo "$ac_err" >&5
25549 echo "configure: failed program was:" >&5
25550 cat conftest.$ac_ext >&5
25552 - eval "ac_cv_lib_$ac_lib_var=no"
25553 + eval "ac_cv_header_$ac_safe=no"
25556 -LIBS="$ac_save_LIBS"
25559 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
25560 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
25561 echo "$ac_t""yes" 1>&6
25562 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
25563 + cat >> confdefs.h <<EOF
25564 +#define $ac_tr_hdr 1
25568 + echo "$ac_t""no" 1>&6
25572 + if test "$ac_cv_header_default_store_h" = "yes"; then
25573 + echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6
25574 +echo "configure:85893: checking for OpenSSL support in SNMP libraries" >&5
25575 + cat > conftest.$ac_ext <<EOF
25576 +#line 85895 "configure"
25577 +#include "confdefs.h"
25579 +#include <ucd-snmp-config.h>
25585 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
25586 + egrep "yes" >/dev/null 2>&1; then
25589 - LDFLAGS=$save_old_LDFLAGS
25590 - ext_shared=$save_ext_shared
25603 - if test "$ext_shared" = "yes"; then
25604 - PSPELL_SHARED_LIBADD="-laspell $PSPELL_SHARED_LIBADD"
25605 - if test -n "$PSPELL_LIBDIR"; then
25607 + CPPFLAGS=$old_CPPFLAGS
25608 + echo "$ac_t""$SNMP_SSL" 1>&6
25610 + if test "$SNMP_SSL" = "yes"; then
25611 + if test "$PHP_OPENSSL_DIR" != "no"; then
25612 + PHP_OPENSSL=$PHP_OPENSSL_DIR
25615 - if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
25617 - if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
25618 - ai_p=$PSPELL_LIBDIR
25621 - ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
25623 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25624 - ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
25625 + if test "$PHP_OPENSSL" = "no"; then
25626 + { echo "configure: error: The UCD-SNMP in this system is built with SSL support.
25628 + Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; }
25632 + unset OPENSSL_INCDIR
25633 + unset OPENSSL_LIBDIR
25635 + test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
25636 + test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
25638 + if test "$PHP_OPENSSL" != "no"; then
25639 + PHP_OPENSSL_DIR=$PHP_OPENSSL
25640 + elif test "$PHP_IMAP_SSL" != "no"; then
25641 + PHP_OPENSSL_DIR=$PHP_IMAP_SSL
25645 + if test -z "$PKG_CONFIG"; then
25646 + # Extract the first word of "pkg-config", so it can be a program name with args.
25647 +set dummy pkg-config; ac_word=$2
25648 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
25649 +echo "configure:85950: checking for $ac_word" >&5
25650 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
25651 + echo $ac_n "(cached) $ac_c" 1>&6
25653 + case "$PKG_CONFIG" in
25655 + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
25658 + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
25661 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
25663 + for ac_dir in $ac_dummy; do
25664 + test -z "$ac_dir" && ac_dir=.
25665 + if test -f $ac_dir/$ac_word; then
25666 + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
25670 + IFS="$ac_save_ifs"
25671 + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
25675 +PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
25676 +if test -n "$PKG_CONFIG"; then
25677 + echo "$ac_t""$PKG_CONFIG" 1>&6
25679 + echo "$ac_t""no" 1>&6
25684 + if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
25685 + if $PKG_CONFIG --atleast-version=0.9.6 openssl; then
25686 + found_openssl=yes
25687 + OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
25688 + OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
25689 + OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
25691 + { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
25694 + if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
25696 + for ac_i in $OPENSSL_LIBS; do
25699 if test "$ext_shared" = "yes"; then
25700 - PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD"
25701 - test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD"
25702 + SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread"
25706 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
25708 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
25710 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
25711 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
25712 if test -n "$unique" && test "`eval $cmd`" = "" ; then
25713 - eval "LIBPATH$unique=set"
25715 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
25716 - LDFLAGS="$LDFLAGS -L$ai_p"
25717 - PHP_RPATHS="$PHP_RPATHS $ai_p"
25719 + eval "EXTRA_LDFLAGS$unique=set"
25720 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
25729 + ac_ii=`echo $ac_i|cut -c 3-`
25733 + c|c_r|pthread*) ;;
25735 + if test "$ext_shared" = "yes"; then
25736 + SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii"
25741 + c|c_r|pthread*) ;;
25743 + LIBS="$LIBS -l$ac_ii"
25754 - if test -n "$PSPELL_LIBDIR"; then
25756 - if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then
25760 + ac_ii=`echo $ac_i|cut -c 3-`
25762 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
25764 - if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then
25765 - ai_p=$PSPELL_LIBDIR
25766 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
25770 - ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
25771 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
25773 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25774 - ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
25775 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
25780 + if test "$ext_shared" = "yes"; then
25781 + SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
25782 + test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
25787 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
25788 @@ -78884,49 +86073,30 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
25800 - c|c_r|pthread*) ;;
25802 - LIBS="-laspell $LIBS"
25815 - echo "$ac_t""no" 1>&6
25817 - LDFLAGS=$save_old_LDFLAGS
25818 - ext_shared=$save_ext_shared
25819 - unset ac_cv_lib_aspell_new_aspell_config
25829 - if test "$PSPELL_INCDIR" != "/usr/include"; then
25831 + for ac_i in $OPENSSL_INCS; do
25834 + ac_ii=`echo $ac_i|cut -c 3-`
25836 + if test "$ac_ii" != "/usr/include"; then
25838 - if test -z "$PSPELL_INCDIR" || echo "$PSPELL_INCDIR" | grep '^/' >/dev/null ; then
25839 - ai_p=$PSPELL_INCDIR
25840 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
25844 - ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
25845 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
25847 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
25848 - ai_p="$ep_realdir/`basename \"$PSPELL_INCDIR\"`"
25849 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
25853 @@ -78947,128 +86117,78 @@ fi
25858 - PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD"
25860 - cat >> confdefs.h <<\EOF
25861 -#define HAVE_PSPELL 1
25871 -php_with_libedit=no
25875 -echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6
25876 -echo "configure:78965: checking for libedit readline replacement" >&5
25877 -# Check whether --with-libedit or --without-libedit was given.
25878 -if test "${with_libedit+set}" = set; then
25879 - withval="$with_libedit"
25880 - PHP_LIBEDIT=$withval
25882 + if test "$found_openssl" = "no"; then
25885 - test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL
25891 -ext_output="yes, shared"
25893 -case $PHP_LIBEDIT in
25895 - PHP_LIBEDIT=`echo "$PHP_LIBEDIT"|$SED 's/^shared,//'`
25911 + if test "$PHP_OPENSSL_DIR" = "yes"; then
25912 + PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
25915 -echo "$ac_t""$ext_output" 1>&6
25916 + for i in $PHP_OPENSSL_DIR; do
25917 + if test -r $i/include/openssl/evp.h; then
25918 + OPENSSL_INCDIR=$i/include
25920 + if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then
25921 + OPENSSL_LIBDIR=$i/$PHP_LIBDIR
25923 + test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
25926 + if test -z "$OPENSSL_INCDIR"; then
25927 + { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; }
25930 + if test -z "$OPENSSL_LIBDIR"; then
25931 + { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; }
25934 + old_CPPFLAGS=$CPPFLAGS
25935 + CPPFLAGS=-I$OPENSSL_INCDIR
25936 + echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
25937 +echo "configure:86155: checking for OpenSSL version" >&5
25938 + cat > conftest.$ac_ext <<EOF
25939 +#line 86157 "configure"
25940 +#include "confdefs.h"
25942 -if test "$PHP_LIBEDIT" = "no"; then
25943 +#include <openssl/opensslv.h>
25944 +#if OPENSSL_VERSION_NUMBER >= 0x0090600fL
25949 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
25950 + egrep "yes" >/dev/null 2>&1; then
25953 -php_with_readline=no
25955 -echo $ac_n "checking for readline support""... $ac_c" 1>&6
25956 -echo "configure:79010: checking for readline support" >&5
25957 -# Check whether --with-readline or --without-readline was given.
25958 -if test "${with_readline+set}" = set; then
25959 - withval="$with_readline"
25960 - PHP_READLINE=$withval
25961 + echo "$ac_t"">= 0.9.6" 1>&6
25967 - test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL
25973 -ext_output="yes, shared"
25975 -case $PHP_READLINE in
25977 - PHP_READLINE=`echo "$PHP_READLINE"|$SED 's/^shared,//'`
25994 -echo "$ac_t""$ext_output" 1>&6
25999 - php_with_readline=no
26000 + { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
26005 -if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
26006 - for i in $PHP_READLINE /usr/local /usr; do
26007 - test -f $i/include/readline/readline.h && READLINE_DIR=$i && break
26010 - if test -z "$READLINE_DIR"; then
26011 - { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; }
26013 + CPPFLAGS=$old_CPPFLAGS
26016 - if test "$READLINE_DIR/include" != "/usr/include"; then
26018 - if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then
26019 - ai_p=$READLINE_DIR/include
26020 + if test "$OPENSSL_INCDIR" != "/usr/include"; then
26022 + if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then
26023 + ai_p=$OPENSSL_INCDIR
26026 - ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
26027 + ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
26029 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
26030 - ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`"
26031 + ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`"
26035 @@ -79089,58 +86209,50 @@ if test "$PHP_READLINE" && test "$PHP_RE
26040 - PHP_READLINE_LIBS=""
26041 - echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
26042 -echo "configure:79096: checking for tgetent in -lncurses" >&5
26043 -ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
26044 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
26045 - echo $ac_n "(cached) $ac_c" 1>&6
26047 - ac_save_LIBS="$LIBS"
26048 -LIBS="-lncurses $LIBS"
26049 -cat > conftest.$ac_ext <<EOF
26050 -#line 79104 "configure"
26051 -#include "confdefs.h"
26052 -/* Override any gcc2 internal prototype to avoid an error. */
26053 -/* We use char because int might match the return type of a gcc2
26054 - builtin and then its argument prototype would still apply. */
26061 -if { (eval echo configure:79115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26063 - eval "ac_cv_lib_$ac_lib_var=yes"
26065 - echo "configure: failed program was:" >&5
26066 - cat conftest.$ac_ext >&5
26068 - eval "ac_cv_lib_$ac_lib_var=no"
26071 -LIBS="$ac_save_LIBS"
26074 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
26075 - echo "$ac_t""yes" 1>&6
26078 + save_old_LDFLAGS=$LDFLAGS
26080 + -L$OPENSSL_LIBDIR
26084 + save_ext_shared=$ext_shared
26087 + for ac_i in $ac_stuff; do
26090 + if test "$ext_shared" = "yes"; then
26091 + LDFLAGS="$LDFLAGS -pthread"
26095 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
26097 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
26098 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
26099 + eval "EXTRA_LDFLAGS$unique=set"
26100 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
26106 + ac_ii=`echo $ac_i|cut -c 3-`
26112 if test "$ext_shared" = "yes"; then
26113 - READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
26114 + LDFLAGS="$LDFLAGS -l$ac_ii"
26122 - LIBS="-lncurses $LIBS"
26123 + LIBS="$LIBS -l$ac_ii"
26127 @@ -79150,32 +86262,72 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
26131 - PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses"
26134 + ac_ii=`echo $ac_i|cut -c 3-`
26136 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
26138 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
26142 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
26144 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
26145 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
26149 + if test "$ext_shared" = "yes"; then
26150 + LDFLAGS="-L$ai_p $LDFLAGS"
26151 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
26156 - echo "$ac_t""no" 1>&6
26158 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
26160 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
26161 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
26162 + eval "LIBPATH$unique=set"
26164 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
26165 + LDFLAGS="$LDFLAGS -L$ai_p"
26166 + PHP_RPATHS="$PHP_RPATHS $ai_p"
26170 - echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
26171 -echo "configure:79160: checking for tgetent in -ltermcap" >&5
26172 -ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
26182 + echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
26183 +echo "configure:86312: checking for CRYPTO_free in -lcrypto" >&5
26184 +ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
26185 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
26186 echo $ac_n "(cached) $ac_c" 1>&6
26188 ac_save_LIBS="$LIBS"
26189 -LIBS="-ltermcap $LIBS"
26190 +LIBS="-lcrypto $LIBS"
26191 cat > conftest.$ac_ext <<EOF
26192 -#line 79168 "configure"
26193 +#line 86320 "configure"
26194 #include "confdefs.h"
26195 /* Override any gcc2 internal prototype to avoid an error. */
26196 /* We use char because int might match the return type of a gcc2
26197 builtin and then its argument prototype would still apply. */
26199 +char CRYPTO_free();
26206 -if { (eval echo configure:79179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26207 +if { (eval echo configure:86331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26209 eval "ac_cv_lib_$ac_lib_var=yes"
26211 @@ -79191,20 +86343,23 @@ fi
26212 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
26213 echo "$ac_t""yes" 1>&6
26215 + LDFLAGS=$save_old_LDFLAGS
26216 + ext_shared=$save_ext_shared
26224 if test "$ext_shared" = "yes"; then
26225 - READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
26226 + SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD"
26234 - LIBS="-ltermcap $LIBS"
26235 + LIBS="-lcrypto $LIBS"
26239 @@ -79214,21 +86369,28 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
26243 - PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap"
26247 echo "$ac_t""no" 1>&6
26250 + LDFLAGS=$save_old_LDFLAGS
26251 + ext_shared=$save_ext_shared
26252 + unset ac_cv_lib_crypto_CRYPTO_free
26254 + { echo "configure: error: libcrypto not found!" 1>&2; exit 1; }
26262 + LIBS="$LIBS -lcrypto"
26264 save_old_LDFLAGS=$LDFLAGS
26266 - -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
26268 + -L$OPENSSL_LIBDIR
26271 save_ext_shared=$ext_shared
26273 @@ -79321,27 +86483,27 @@ fi
26277 - echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
26278 -echo "configure:79326: checking for readline in -lreadline" >&5
26279 -ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
26280 + echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
26281 +echo "configure:86488: checking for SSL_CTX_set_ssl_version in -lssl" >&5
26282 +ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
26283 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
26284 echo $ac_n "(cached) $ac_c" 1>&6
26286 ac_save_LIBS="$LIBS"
26287 -LIBS="-lreadline $LIBS"
26288 +LIBS="-lssl $LIBS"
26289 cat > conftest.$ac_ext <<EOF
26290 -#line 79334 "configure"
26291 +#line 86496 "configure"
26292 #include "confdefs.h"
26293 /* Override any gcc2 internal prototype to avoid an error. */
26294 /* We use char because int might match the return type of a gcc2
26295 builtin and then its argument prototype would still apply. */
26297 +char SSL_CTX_set_ssl_version();
26301 +SSL_CTX_set_ssl_version()
26304 -if { (eval echo configure:79345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26305 +if { (eval echo configure:86507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26307 eval "ac_cv_lib_$ac_lib_var=yes"
26309 @@ -79360,69 +86522,88 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
26310 LDFLAGS=$save_old_LDFLAGS
26311 ext_shared=$save_ext_shared
26313 + found_openssl=yes
26317 + echo "$ac_t""no" 1>&6
26319 - if test "$ext_shared" = "yes"; then
26320 - READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD"
26321 - if test -n "$READLINE_DIR/$PHP_LIBDIR"; then
26323 - if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
26325 - if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
26326 - ai_p=$READLINE_DIR/$PHP_LIBDIR
26328 + LDFLAGS=$save_old_LDFLAGS
26329 + ext_shared=$save_ext_shared
26330 + unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version
26332 - ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
26333 + { echo "configure: error: libssl not found!" 1>&2; exit 1; }
26335 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
26336 - ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
26343 - if test "$ext_shared" = "yes"; then
26344 - READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD"
26345 - test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD"
26350 + c|c_r|pthread*) ;;
26352 + if test "$ext_shared" = "yes"; then
26353 + SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD"
26357 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
26359 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
26360 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
26361 - eval "LIBPATH$unique=set"
26363 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
26364 - LDFLAGS="$LDFLAGS -L$ai_p"
26365 - PHP_RPATHS="$PHP_RPATHS $ai_p"
26369 + c|c_r|pthread*) ;;
26371 + LIBS="-lssl $LIBS"
26386 + c|c_r|pthread*) ;;
26388 + if test "$ext_shared" = "yes"; then
26389 + SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD"
26394 + c|c_r|pthread*) ;;
26396 + LIBS="-lcrypto $LIBS"
26409 - if test -n "$READLINE_DIR/$PHP_LIBDIR"; then
26411 - if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
26412 + if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then
26414 - if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
26415 - ai_p=$READLINE_DIR/$PHP_LIBDIR
26416 + if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then
26417 + ai_p=$OPENSSL_LIBDIR
26420 - ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
26421 + ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
26423 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
26424 - ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
26425 + ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`"
26430 + if test "$ext_shared" = "yes"; then
26431 + SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
26432 + test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
26437 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
26438 @@ -79438,83 +86619,74 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
26450 - c|c_r|pthread*) ;;
26452 - LIBS="-lreadline $LIBS"
26458 + if test "$found_openssl" = "yes"; then
26459 + OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
26464 + { echo "configure: error: SNMP: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; }
26473 + echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
26474 +echo "configure:86643: checking for kstat_read in -lkstat" >&5
26475 +ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'`
26476 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
26477 + echo $ac_n "(cached) $ac_c" 1>&6
26479 - echo "$ac_t""no" 1>&6
26480 + ac_save_LIBS="$LIBS"
26481 +LIBS="-lkstat $LIBS"
26482 +cat > conftest.$ac_ext <<EOF
26483 +#line 86651 "configure"
26484 +#include "confdefs.h"
26485 +/* Override any gcc2 internal prototype to avoid an error. */
26486 +/* We use char because int might match the return type of a gcc2
26487 + builtin and then its argument prototype would still apply. */
26488 +char kstat_read();
26490 - LDFLAGS=$save_old_LDFLAGS
26491 - ext_shared=$save_ext_shared
26492 - unset ac_cv_lib_readline_readline
26494 - { echo "configure: error: readline library not found" 1>&2; exit 1; }
26501 +if { (eval echo configure:86662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26503 + eval "ac_cv_lib_$ac_lib_var=yes"
26505 + echo "configure: failed program was:" >&5
26506 + cat conftest.$ac_ext >&5
26508 + eval "ac_cv_lib_$ac_lib_var=no"
26511 +LIBS="$ac_save_LIBS"
26515 - save_old_LDFLAGS=$LDFLAGS
26517 - -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
26520 - save_ext_shared=$ext_shared
26523 - for ac_i in $ac_stuff; do
26526 - if test "$ext_shared" = "yes"; then
26527 - LDFLAGS="$LDFLAGS -pthread"
26531 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
26533 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
26534 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
26535 - eval "EXTRA_LDFLAGS$unique=set"
26536 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
26542 - ac_ii=`echo $ac_i|cut -c 3-`
26545 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
26546 + echo "$ac_t""yes" 1>&6
26553 if test "$ext_shared" = "yes"; then
26554 - LDFLAGS="$LDFLAGS -l$ac_ii"
26555 + SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD"
26563 - LIBS="$LIBS -l$ac_ii"
26564 + LIBS="-lkstat $LIBS"
26568 @@ -79523,27 +86695,64 @@ fi
26574 + echo "$ac_t""no" 1>&6
26578 + if test "$SNMP_INCDIR" != "/usr/include"; then
26580 + if test -z "$SNMP_INCDIR" || echo "$SNMP_INCDIR" | grep '^/' >/dev/null ; then
26581 + ai_p=$SNMP_INCDIR
26584 + ep_dir="`echo $SNMP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
26586 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
26587 + ai_p="$ep_realdir/`basename \"$SNMP_INCDIR\"`"
26592 - ac_ii=`echo $ac_i|cut -c 3-`
26595 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
26597 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
26598 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
26599 + eval "INCLUDEPATH$unique=set"
26602 + INCLUDES="-I$ai_p $INCLUDES"
26604 + INCLUDES="$INCLUDES -I$ai_p"
26613 + if test "$ext_shared" = "yes"; then
26614 + SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD"
26615 + if test -n "$SNMP_LIBDIR"; then
26617 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
26618 + if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then
26620 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
26622 + if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
26623 + ai_p=$SNMP_LIBDIR
26626 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
26627 + ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
26629 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
26630 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
26631 + ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`"
26635 if test "$ext_shared" = "yes"; then
26636 - LDFLAGS="-L$ai_p $LDFLAGS"
26637 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
26638 + SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
26639 + test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
26643 @@ -79565,67 +86774,67 @@ fi
26651 - echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6
26652 -echo "configure:79574: checking for rl_pending_input in -lreadline" >&5
26653 -ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'`
26654 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
26655 - echo $ac_n "(cached) $ac_c" 1>&6
26657 - ac_save_LIBS="$LIBS"
26658 -LIBS="-lreadline $LIBS"
26659 -cat > conftest.$ac_ext <<EOF
26660 -#line 79582 "configure"
26661 -#include "confdefs.h"
26662 -/* Override any gcc2 internal prototype to avoid an error. */
26663 -/* We use char because int might match the return type of a gcc2
26664 - builtin and then its argument prototype would still apply. */
26665 -char rl_pending_input();
26671 -rl_pending_input()
26674 -if { (eval echo configure:79593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26676 - eval "ac_cv_lib_$ac_lib_var=yes"
26678 - echo "configure: failed program was:" >&5
26679 - cat conftest.$ac_ext >&5
26681 - eval "ac_cv_lib_$ac_lib_var=no"
26684 -LIBS="$ac_save_LIBS"
26685 + if test -n "$SNMP_LIBDIR"; then
26687 + if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then
26689 + if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
26690 + ai_p=$SNMP_LIBDIR
26693 + ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
26695 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
26696 + ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`"
26700 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
26701 - echo "$ac_t""yes" 1>&6
26705 - LDFLAGS=$save_old_LDFLAGS
26706 - ext_shared=$save_ext_shared
26708 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
26710 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
26711 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
26712 + eval "LIBPATH$unique=set"
26714 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
26715 + LDFLAGS="$LDFLAGS -L$ai_p"
26716 + PHP_RPATHS="$PHP_RPATHS $ai_p"
26719 - echo "$ac_t""no" 1>&6
26723 - LDFLAGS=$save_old_LDFLAGS
26724 - ext_shared=$save_ext_shared
26725 - unset ac_cv_lib_readline_rl_pending_input
26727 - { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; }
26735 + c|c_r|pthread*) ;;
26737 + LIBS="-lsnmp $LIBS"
26748 + SNMP_LIBNAME=snmp
26752 save_old_LDFLAGS=$LDFLAGS
26754 - -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
26755 + $SNMP_SHARED_LIBADD
26758 save_ext_shared=$ext_shared
26759 @@ -79719,27 +86928,27 @@ fi
26763 - echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6
26764 -echo "configure:79724: checking for rl_callback_read_char in -lreadline" >&5
26765 -ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'`
26766 + echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6
26767 +echo "configure:86933: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
26768 +ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'`
26769 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
26770 echo $ac_n "(cached) $ac_c" 1>&6
26772 ac_save_LIBS="$LIBS"
26773 -LIBS="-lreadline $LIBS"
26774 +LIBS="-l$SNMP_LIBNAME $LIBS"
26775 cat > conftest.$ac_ext <<EOF
26776 -#line 79732 "configure"
26777 +#line 86941 "configure"
26778 #include "confdefs.h"
26779 /* Override any gcc2 internal prototype to avoid an error. */
26780 /* We use char because int might match the return type of a gcc2
26781 builtin and then its argument prototype would still apply. */
26782 -char rl_callback_read_char();
26783 +char snmp_parse_oid();
26786 -rl_callback_read_char()
26790 -if { (eval echo configure:79743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26791 +if { (eval echo configure:86952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26793 eval "ac_cv_lib_$ac_lib_var=yes"
26795 @@ -79759,7 +86968,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
26796 ext_shared=$save_ext_shared
26798 cat >> confdefs.h <<\EOF
26799 -#define HAVE_RL_CALLBACK_READ_CHAR 1
26800 +#define HAVE_SNMP_PARSE_OID 1
26804 @@ -79769,194 +86978,16 @@ else
26806 LDFLAGS=$save_old_LDFLAGS
26807 ext_shared=$save_ext_shared
26808 - unset ac_cv_lib_readline_rl_callback_read_char
26814 - cat >> confdefs.h <<\EOF
26815 -#define HAVE_LIBREADLINE 1
26819 -elif test "$PHP_LIBEDIT" != "no"; then
26821 - for i in $PHP_LIBEDIT /usr/local /usr; do
26822 - test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
26825 - if test -z "$LIBEDIT_DIR"; then
26826 - { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; }
26830 - if test "$LIBEDIT_DIR/include" != "/usr/include"; then
26832 - if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then
26833 - ai_p=$LIBEDIT_DIR/include
26836 - ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
26838 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
26839 - ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`"
26844 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
26846 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
26847 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
26848 - eval "INCLUDEPATH$unique=set"
26851 - INCLUDES="-I$ai_p $INCLUDES"
26853 - INCLUDES="$INCLUDES -I$ai_p"
26861 - echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
26862 -echo "configure:79827: checking for tgetent in -lncurses" >&5
26863 -ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
26864 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
26865 - echo $ac_n "(cached) $ac_c" 1>&6
26867 - ac_save_LIBS="$LIBS"
26868 -LIBS="-lncurses $LIBS"
26869 -cat > conftest.$ac_ext <<EOF
26870 -#line 79835 "configure"
26871 -#include "confdefs.h"
26872 -/* Override any gcc2 internal prototype to avoid an error. */
26873 -/* We use char because int might match the return type of a gcc2
26874 - builtin and then its argument prototype would still apply. */
26881 -if { (eval echo configure:79846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26883 - eval "ac_cv_lib_$ac_lib_var=yes"
26885 - echo "configure: failed program was:" >&5
26886 - cat conftest.$ac_ext >&5
26888 - eval "ac_cv_lib_$ac_lib_var=no"
26891 -LIBS="$ac_save_LIBS"
26894 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
26895 - echo "$ac_t""yes" 1>&6
26897 + unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid
26901 - c|c_r|pthread*) ;;
26903 - if test "$ext_shared" = "yes"; then
26904 - READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD"
26909 - c|c_r|pthread*) ;;
26911 - LIBS="-lncurses $LIBS"
26923 - echo "$ac_t""no" 1>&6
26925 - echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
26926 -echo "configure:79890: checking for tgetent in -ltermcap" >&5
26927 -ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
26928 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
26929 - echo $ac_n "(cached) $ac_c" 1>&6
26931 - ac_save_LIBS="$LIBS"
26932 -LIBS="-ltermcap $LIBS"
26933 -cat > conftest.$ac_ext <<EOF
26934 -#line 79898 "configure"
26935 -#include "confdefs.h"
26936 -/* Override any gcc2 internal prototype to avoid an error. */
26937 -/* We use char because int might match the return type of a gcc2
26938 - builtin and then its argument prototype would still apply. */
26945 -if { (eval echo configure:79909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
26947 - eval "ac_cv_lib_$ac_lib_var=yes"
26949 - echo "configure: failed program was:" >&5
26950 - cat conftest.$ac_ext >&5
26952 - eval "ac_cv_lib_$ac_lib_var=no"
26955 -LIBS="$ac_save_LIBS"
26958 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
26959 - echo "$ac_t""yes" 1>&6
26964 - c|c_r|pthread*) ;;
26966 - if test "$ext_shared" = "yes"; then
26967 - READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD"
26972 - c|c_r|pthread*) ;;
26974 - LIBS="-ltermcap $LIBS"
26986 - echo "$ac_t""no" 1>&6
26994 save_old_LDFLAGS=$LDFLAGS
26996 - -L$READLINE_DIR/$PHP_LIBDIR
26997 + $SNMP_SHARED_LIBADD
27000 save_ext_shared=$ext_shared
27001 @@ -80050,27 +87081,27 @@ fi
27005 - echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
27006 -echo "configure:80055: checking for readline in -ledit" >&5
27007 -ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
27008 + echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6
27009 +echo "configure:87086: checking for init_snmp in -l$SNMP_LIBNAME" >&5
27010 +ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'`
27011 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
27012 echo $ac_n "(cached) $ac_c" 1>&6
27014 ac_save_LIBS="$LIBS"
27015 -LIBS="-ledit $LIBS"
27016 +LIBS="-l$SNMP_LIBNAME $LIBS"
27017 cat > conftest.$ac_ext <<EOF
27018 -#line 80063 "configure"
27019 +#line 87094 "configure"
27020 #include "confdefs.h"
27021 /* Override any gcc2 internal prototype to avoid an error. */
27022 /* We use char because int might match the return type of a gcc2
27023 builtin and then its argument prototype would still apply. */
27032 -if { (eval echo configure:80074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
27033 +if { (eval echo configure:87105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
27035 eval "ac_cv_lib_$ac_lib_var=yes"
27037 @@ -80089,194 +87120,46 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
27038 LDFLAGS=$save_old_LDFLAGS
27039 ext_shared=$save_ext_shared
27043 - if test "$ext_shared" = "yes"; then
27044 - READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD"
27045 - if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then
27047 - if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
27049 - if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
27050 - ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
27053 - ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
27055 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
27056 - ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
27060 - if test "$ext_shared" = "yes"; then
27061 - READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD"
27062 - test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD"
27067 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
27069 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
27070 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
27071 - eval "LIBPATH$unique=set"
27073 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
27074 - LDFLAGS="$LDFLAGS -L$ai_p"
27075 - PHP_RPATHS="$PHP_RPATHS $ai_p"
27088 - if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then
27090 - if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
27092 - if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
27093 - ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
27096 - ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
27098 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
27099 - ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
27106 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
27108 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
27109 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
27110 - eval "LIBPATH$unique=set"
27112 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
27113 - LDFLAGS="$LDFLAGS -L$ai_p"
27114 - PHP_RPATHS="$PHP_RPATHS $ai_p"
27126 - c|c_r|pthread*) ;;
27128 - LIBS="-ledit $LIBS"
27136 + cat >> confdefs.h <<\EOF
27137 +#define HAVE_SNMP 1
27144 echo "$ac_t""no" 1>&6
27146 LDFLAGS=$save_old_LDFLAGS
27147 ext_shared=$save_ext_shared
27148 - unset ac_cv_lib_edit_readline
27149 + unset ac_cv_lib_$SNMP_LIBNAME_init_snmp
27151 - { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; }
27152 + { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; }
27158 - cat >> confdefs.h <<\EOF
27159 -#define HAVE_LIBEDIT 1
27164 -if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
27165 - for ac_func in rl_completion_matches
27167 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
27168 -echo "configure:80215: checking for $ac_func" >&5
27169 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
27170 - echo $ac_n "(cached) $ac_c" 1>&6
27172 - cat > conftest.$ac_ext <<EOF
27173 -#line 80220 "configure"
27174 -#include "confdefs.h"
27175 -/* System header to define __stub macros and hopefully few prototypes,
27176 - which can conflict with char $ac_func(); below. */
27177 -#include <assert.h>
27178 -/* Override any gcc2 internal prototype to avoid an error. */
27179 -/* We use char because int might match the return type of a gcc2
27180 - builtin and then its argument prototype would still apply. */
27185 -/* The GNU C library defines this for functions which it implements
27186 - to always fail with ENOSYS. Some functions are actually named
27187 - something starting with __ and the normal name is an alias. */
27188 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
27196 -if { (eval echo configure:80243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
27198 - eval "ac_cv_func_$ac_func=yes"
27200 - echo "configure: failed program was:" >&5
27201 - cat conftest.$ac_ext >&5
27203 - eval "ac_cv_func_$ac_func=no"
27208 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
27209 - echo "$ac_t""yes" 1>&6
27210 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
27211 - cat >> confdefs.h <<EOF
27212 -#define $ac_tr_func 1
27213 + if test "$PHP_UCD_SNMP_HACK" = "yes" ; then
27214 + cat >> confdefs.h <<\EOF
27215 +#define UCD_SNMP_HACK 1
27219 - echo "$ac_t""no" 1>&6
27225 - ext_builddir=ext/readline
27226 - ext_srcdir=$abs_srcdir/ext/readline
27228 + ext_builddir=ext/snmp
27229 + ext_srcdir=$abs_srcdir/ext/snmp
27233 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then
27234 - PHP_READLINE_SHARED=no
27235 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
27236 + PHP_SNMP_SHARED=no
27239 - case ext/readline in
27241 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
27242 - /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
27243 - *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
27244 + /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
27245 + *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
27249 @@ -80291,7 +87174,7 @@ done
27253 - for ac_src in readline.c; do
27254 + for ac_src in snmp.c; do
27258 @@ -80314,18 +87197,18 @@ EOF
27262 - EXT_STATIC="$EXT_STATIC readline"
27263 + EXT_STATIC="$EXT_STATIC snmp"
27264 if test "$ext_shared" != "nocli"; then
27265 - EXT_CLI_STATIC="$EXT_CLI_STATIC readline"
27266 + EXT_CLI_STATIC="$EXT_CLI_STATIC snmp"
27269 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
27270 - PHP_READLINE_SHARED=yes
27271 + PHP_SNMP_SHARED=yes
27273 - case ext/readline in
27275 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
27276 - /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
27277 - *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
27278 + /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
27279 + *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
27283 @@ -80340,14 +87223,14 @@ EOF
27287 - for ac_src in readline.c; do
27288 + for ac_src in snmp.c; do
27295 - shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo"
27296 + shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo"
27299 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
27300 @@ -80370,31 +87253,31 @@ EOF
27301 case $host_alias in
27304 - 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'
27305 + 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'
27309 - link_cmd='$(LIBTOOL) --mode=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)'
27310 + link_cmd='$(LIBTOOL) --mode=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)'
27314 - link_cmd='$(LIBTOOL) --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)'
27315 + link_cmd='$(LIBTOOL) --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)'
27319 if test "x" = "xyes"; then
27320 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreadline.$suffix"
27321 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsnmp.$suffix"
27323 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix"
27324 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix"
27327 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline"
27328 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp"
27330 cat >>Makefile.objects<<EOF
27331 -\$(phplibdir)/phpreadline.$suffix: $ext_builddir/phpreadline.$suffix
27332 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpreadline.$suffix \$(phplibdir)
27333 +\$(phplibdir)/phpsnmp.$suffix: $ext_builddir/phpsnmp.$suffix
27334 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpsnmp.$suffix \$(phplibdir)
27336 -$ext_builddir/phpreadline.$suffix: \$(shared_objects_readline) \$(PHPREADLINE_SHARED_DEPENDENCIES)
27337 +$ext_builddir/phpsnmp.$suffix: \$(shared_objects_snmp) \$(PHPSNMP_SHARED_DEPENDENCIES)
27341 @@ -80407,31 +87290,31 @@ EOF
27342 case $host_alias in
27345 - 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'
27346 + 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'
27350 - link_cmd='$(LIBTOOL) --mode=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)'
27351 + link_cmd='$(LIBTOOL) --mode=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)'
27355 - link_cmd='$(LIBTOOL) --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)'
27356 + link_cmd='$(LIBTOOL) --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)'
27360 if test "x" = "xyes"; then
27361 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/readline.$suffix"
27362 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/snmp.$suffix"
27364 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/readline.$suffix"
27365 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/snmp.$suffix"
27368 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline"
27369 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp"
27371 cat >>Makefile.objects<<EOF
27372 -\$(phplibdir)/readline.$suffix: $ext_builddir/readline.$suffix
27373 - \$(LIBTOOL) --mode=install cp $ext_builddir/readline.$suffix \$(phplibdir)
27374 +\$(phplibdir)/snmp.$suffix: $ext_builddir/snmp.$suffix
27375 + \$(LIBTOOL) --mode=install cp $ext_builddir/snmp.$suffix \$(phplibdir)
27377 -$ext_builddir/readline.$suffix: \$(shared_objects_readline) \$(READLINE_SHARED_DEPENDENCIES)
27378 +$ext_builddir/snmp.$suffix: \$(shared_objects_snmp) \$(SNMP_SHARED_DEPENDENCIES)
27382 @@ -80439,22 +87322,22 @@ EOF
27385 cat >> confdefs.h <<EOF
27386 -#define COMPILE_DL_READLINE 1
27387 +#define COMPILE_DL_SNMP 1
27393 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" = "cli"; then
27394 - PHP_READLINE_SHARED=no
27395 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
27396 + PHP_SNMP_SHARED=no
27397 case "$PHP_SAPI" in
27401 - case ext/readline in
27403 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
27404 - /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
27405 - *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
27406 + /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
27407 + *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
27411 @@ -80469,7 +87352,7 @@ EOF
27415 - for ac_src in readline.c; do
27416 + for ac_src in snmp.c; do
27420 @@ -80492,15 +87375,15 @@ EOF
27424 - EXT_STATIC="$EXT_STATIC readline"
27425 + EXT_STATIC="$EXT_STATIC snmp"
27430 - case ext/readline in
27432 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
27433 - /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
27434 - *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
27435 + /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
27436 + *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
27440 @@ -80515,7 +87398,7 @@ EOF
27444 - for ac_src in readline.c; do
27445 + for ac_src in snmp.c; do
27449 @@ -80540,7 +87423,7 @@ EOF
27453 - EXT_CLI_STATIC="$EXT_CLI_STATIC readline"
27454 + EXT_CLI_STATIC="$EXT_CLI_STATIC snmp"
27458 @@ -80549,31 +87432,31 @@ EOF
27461 if test "$ext_builddir" = "."; then
27462 - PHP_PECL_EXTENSION=readline
27463 + PHP_PECL_EXTENSION=snmp
27465 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
27470 - PHP_VAR_SUBST="$PHP_VAR_SUBST READLINE_SHARED_LIBADD"
27471 + PHP_VAR_SUBST="$PHP_VAR_SUBST SNMP_SHARED_LIBADD"
27477 -php_with_recode=no
27478 +php_enable_soap=no
27480 -echo $ac_n "checking for recode support""... $ac_c" 1>&6
27481 -echo "configure:80569: checking for recode support" >&5
27482 -# Check whether --with-recode or --without-recode was given.
27483 -if test "${with_recode+set}" = set; then
27484 - withval="$with_recode"
27485 - PHP_RECODE=$withval
27486 +echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6
27487 +echo "configure:87452: checking whether to enable SOAP support" >&5
27488 +# Check whether --enable-soap or --disable-soap was given.
27489 +if test "${enable_soap+set}" = set; then
27490 + enableval="$enable_soap"
27491 + PHP_SOAP=$enableval
27495 - test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL
27497 + test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL
27501 @@ -80581,12 +87464,12 @@ fi
27503 ext_output="yes, shared"
27505 -case $PHP_RECODE in
27508 - PHP_RECODE=`echo "$PHP_RECODE"|$SED 's/^shared,//'`
27509 + PHP_SOAP=`echo "$PHP_SOAP"|$SED 's/^shared,//'`
27517 @@ -80605,46 +87488,72 @@ echo "$ac_t""$ext_output" 1>&6
27521 -if test "$PHP_RECODE" != "no"; then
27522 - RECODE_LIST="$PHP_RECODE /usr/local /usr /opt"
27523 +if test -z "$PHP_LIBXML_DIR"; then
27525 +php_with_libxml_dir=no
27527 - for i in $RECODE_LIST; do
27528 - if test -f $i/include/recode.h; then
27530 - RECODE_INC=include
27531 - RECODE_LIB=$PHP_LIBDIR
27533 - if test -f $i/include/recode/recode.h; then
27535 - RECODE_INC=include/recode
27536 - RECODE_LIB=$PHP_LIBDIR/recode
27538 - if test -f $i/recode/include/recode.h; then
27539 - RECODE_DIR=$i/recode
27540 - RECODE_INC=include
27541 - RECODE_LIB=$PHP_LIBDIR
27543 - test -n "$RECODE_DIR" && break
27545 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
27546 +echo "configure:87497: checking libxml2 install dir" >&5
27547 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
27548 +if test "${with_libxml_dir+set}" = set; then
27549 + withval="$with_libxml_dir"
27550 + PHP_LIBXML_DIR=$withval
27553 + PHP_LIBXML_DIR=no
27556 - if test -z "$RECODE_DIR"; then
27557 - { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; }
27561 +ext_output=$PHP_LIBXML_DIR
27562 +echo "$ac_t""$ext_output" 1>&6
27568 +if test "$PHP_SOAP" != "no"; then
27570 + if test "$PHP_LIBXML" = "no"; then
27571 + { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
27575 - save_old_LDFLAGS=$LDFLAGS
27577 - -L$RECODE_DIR/$RECODE_LIB
27580 - save_ext_shared=$ext_shared
27582 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
27583 +echo "configure:87525: checking for xml2-config path" >&5
27584 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
27585 + echo $ac_n "(cached) $ac_c" 1>&6
27588 - for ac_i in $ac_stuff; do
27589 + for i in $PHP_LIBXML_DIR /usr/local /usr; do
27590 + if test -x "$i/bin/xml2-config"; then
27591 + ac_cv_php_xml2_config_path="$i/bin/xml2-config"
27598 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
27600 + if test -x "$ac_cv_php_xml2_config_path"; then
27601 + XML2_CONFIG="$ac_cv_php_xml2_config_path"
27602 + libxml_full_version=`$XML2_CONFIG --version`
27605 + set $libxml_full_version
27607 + LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
27608 + if test "$LIBXML_VERSION" -ge "2006011"; then
27609 + LIBXML_LIBS=`$XML2_CONFIG --libs`
27610 + LIBXML_INCS=`$XML2_CONFIG --cflags`
27612 + for ac_i in $LIBXML_LIBS; do
27615 if test "$ext_shared" = "yes"; then
27616 - LDFLAGS="$LDFLAGS -pthread"
27617 + SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -pthread"
27621 @@ -80666,7 +87575,7 @@ if test "$PHP_RECODE" != "no"; then
27624 if test "$ext_shared" = "yes"; then
27625 - LDFLAGS="$LDFLAGS -l$ac_ii"
27626 + SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii"
27630 @@ -80701,8 +87610,8 @@ if test "$PHP_RECODE" != "no"; then
27633 if test "$ext_shared" = "yes"; then
27634 - LDFLAGS="-L$ai_p $LDFLAGS"
27635 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
27636 + SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD"
27637 + test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_SHARED_LIBADD"
27641 @@ -80728,380 +87637,128 @@ if test "$PHP_RECODE" != "no"; then
27645 - echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6
27646 -echo "configure:80733: checking for recode_format_table in -lrecode" >&5
27647 -ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'`
27648 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
27649 - echo $ac_n "(cached) $ac_c" 1>&6
27651 - ac_save_LIBS="$LIBS"
27652 -LIBS="-lrecode $LIBS"
27653 -cat > conftest.$ac_ext <<EOF
27654 -#line 80741 "configure"
27655 -#include "confdefs.h"
27656 -/* Override any gcc2 internal prototype to avoid an error. */
27657 -/* We use char because int might match the return type of a gcc2
27658 - builtin and then its argument prototype would still apply. */
27659 -char recode_format_table();
27662 -recode_format_table()
27665 -if { (eval echo configure:80752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
27667 - eval "ac_cv_lib_$ac_lib_var=yes"
27669 - echo "configure: failed program was:" >&5
27670 - cat conftest.$ac_ext >&5
27672 - eval "ac_cv_lib_$ac_lib_var=no"
27675 -LIBS="$ac_save_LIBS"
27678 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
27679 - echo "$ac_t""yes" 1>&6
27681 - LDFLAGS=$save_old_LDFLAGS
27682 - ext_shared=$save_ext_shared
27686 - if test "$ext_shared" = "yes"; then
27687 - RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD"
27688 - if test -n "$RECODE_DIR/$RECODE_LIB"; then
27690 - if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
27691 + for ac_i in $LIBXML_INCS; do
27694 + ac_ii=`echo $ac_i|cut -c 3-`
27696 + if test "$ac_ii" != "/usr/include"; then
27698 - if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
27699 - ai_p=$RECODE_DIR/$RECODE_LIB
27700 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
27704 - ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
27705 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
27707 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
27708 - ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
27709 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
27713 - if test "$ext_shared" = "yes"; then
27714 - RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD"
27715 - test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD"
27720 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
27722 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
27723 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
27724 if test -n "$unique" && test "`eval $cmd`" = "" ; then
27725 - eval "LIBPATH$unique=set"
27726 + eval "INCLUDEPATH$unique=set"
27728 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
27729 - LDFLAGS="$LDFLAGS -L$ai_p"
27730 - PHP_RPATHS="$PHP_RPATHS $ai_p"
27736 + INCLUDES="-I$ai_p $INCLUDES"
27738 + INCLUDES="$INCLUDES -I$ai_p"
27747 - if test -n "$RECODE_DIR/$RECODE_LIB"; then
27749 - if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
27751 - if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
27752 - ai_p=$RECODE_DIR/$RECODE_LIB
27755 - ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
27757 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
27758 - ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
27765 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
27767 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
27768 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
27769 - eval "LIBPATH$unique=set"
27771 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
27772 - LDFLAGS="$LDFLAGS -L$ai_p"
27773 - PHP_RPATHS="$PHP_RPATHS $ai_p"
27786 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
27787 +echo "configure:87683: checking whether libxml build works" >&5
27788 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
27789 + echo $ac_n "(cached) $ac_c" 1>&6
27793 - c|c_r|pthread*) ;;
27795 - LIBS="-lrecode $LIBS"
27808 + $SOAP_SHARED_LIBADD
27810 + if test "$cross_compiling" = yes; then
27815 - echo "$ac_t""no" 1>&6
27817 - LDFLAGS=$save_old_LDFLAGS
27818 - ext_shared=$save_ext_shared
27819 - unset ac_cv_lib_recode_recode_format_table
27821 - old_LDFLAGS=$LDFLAGS
27823 - LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
27824 - LIBS="$LIBS -lrecode"
27825 - cat > conftest.$ac_ext <<EOF
27826 -#line 80882 "configure"
27827 + cat > conftest.$ac_ext <<EOF
27828 +#line 87699 "configure"
27829 #include "confdefs.h"
27831 -char *program_name;
27835 -recode_format_table();
27838 + char xmlInitParser();
27845 -if { (eval echo configure:80893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
27847 +if { (eval echo configure:87710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
27852 - if test "$ext_shared" = "yes"; then
27853 - RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD"
27854 - if test -n "$RECODE_DIR/$RECODE_LIB"; then
27856 - if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
27858 - if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
27859 - ai_p=$RECODE_DIR/$RECODE_LIB
27862 - ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
27864 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
27865 - ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
27870 - if test "$ext_shared" = "yes"; then
27871 - RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD"
27872 - test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD"
27874 + php_cv_libxml_build_works=yes
27878 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
27880 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
27881 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
27882 - eval "LIBPATH$unique=set"
27884 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
27885 - LDFLAGS="$LDFLAGS -L$ai_p"
27886 - PHP_RPATHS="$PHP_RPATHS $ai_p"
27899 - if test -n "$RECODE_DIR/$RECODE_LIB"; then
27901 - if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then
27903 - if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then
27904 - ai_p=$RECODE_DIR/$RECODE_LIB
27907 - ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
27909 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
27910 - ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
27917 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
27919 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
27920 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
27921 - eval "LIBPATH$unique=set"
27923 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
27924 - LDFLAGS="$LDFLAGS -L$ai_p"
27925 - PHP_RPATHS="$PHP_RPATHS $ai_p"
27937 - c|c_r|pthread*) ;;
27939 - DLIBS="-lrecode $DLIBS"
27949 - cat >> confdefs.h <<\EOF
27950 -#define HAVE_BROKEN_RECODE 1
27955 echo "configure: failed program was:" >&5
27956 cat conftest.$ac_ext >&5
27960 - { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; }
27965 - LDFLAGS=$old_LDFLAGS
27968 + echo "$ac_t""no" 1>&6
27969 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
27977 - cat >> confdefs.h <<\EOF
27978 -#define HAVE_LIBRECODE 1
27984 - if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then
27986 - if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then
27987 - ai_p=$RECODE_DIR/$RECODE_INC
27990 - ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`"
27992 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
27993 - ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`"
27995 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
27996 + if test "$php_cv_libxml_build_works" = "yes"; then
27997 + cat >> confdefs.h <<\EOF
27998 +#define HAVE_LIBXML 1
28003 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
28005 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
28006 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
28007 - eval "INCLUDEPATH$unique=set"
28010 - INCLUDES="-I$ai_p $INCLUDES"
28012 - INCLUDES="$INCLUDES -I$ai_p"
28020 - PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD"
28022 - for ac_hdr in stdbool.h
28024 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
28025 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
28026 -echo "configure:81056: checking for $ac_hdr" >&5
28027 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
28028 - echo $ac_n "(cached) $ac_c" 1>&6
28030 - cat > conftest.$ac_ext <<EOF
28031 -#line 81061 "configure"
28032 -#include "confdefs.h"
28033 -#include <$ac_hdr>
28035 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
28036 -{ (eval echo configure:81066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
28037 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
28038 -if test -z "$ac_err"; then
28040 - eval "ac_cv_header_$ac_safe=yes"
28042 - echo "$ac_err" >&5
28043 - echo "configure: failed program was:" >&5
28044 - cat conftest.$ac_ext >&5
28046 - eval "ac_cv_header_$ac_safe=no"
28050 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
28051 - echo "$ac_t""yes" 1>&6
28052 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
28053 - cat >> confdefs.h <<EOF
28054 -#define $ac_tr_hdr 1
28056 + cat >> confdefs.h <<\EOF
28057 +#define HAVE_SOAP 1
28061 - echo "$ac_t""no" 1>&6
28066 - ext_builddir=ext/recode
28067 - ext_srcdir=$abs_srcdir/ext/recode
28069 + ext_builddir=ext/soap
28070 + ext_srcdir=$abs_srcdir/ext/soap
28074 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
28075 - PHP_RECODE_SHARED=no
28076 + PHP_SOAP_SHARED=no
28079 - case ext/recode in
28081 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28082 - /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28083 - *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28084 + /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28085 + *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28089 @@ -81116,7 +87773,7 @@ done
28093 - for ac_src in recode.c; do
28094 + 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
28098 @@ -81139,18 +87796,18 @@ EOF
28102 - EXT_STATIC="$EXT_STATIC recode"
28103 + EXT_STATIC="$EXT_STATIC soap"
28104 if test "$ext_shared" != "nocli"; then
28105 - EXT_CLI_STATIC="$EXT_CLI_STATIC recode"
28106 + EXT_CLI_STATIC="$EXT_CLI_STATIC soap"
28109 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
28110 - PHP_RECODE_SHARED=yes
28111 + PHP_SOAP_SHARED=yes
28113 - case ext/recode in
28115 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28116 - /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28117 - *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28118 + /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28119 + *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28123 @@ -81165,14 +87822,14 @@ EOF
28127 - for ac_src in recode.c; do
28128 + 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
28135 - shared_objects_recode="$shared_objects_recode $ac_bdir$ac_obj.lo"
28136 + shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo"
28139 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
28140 @@ -81195,31 +87852,31 @@ EOF
28141 case $host_alias in
28144 - 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'
28145 + 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'
28149 - link_cmd='$(LIBTOOL) --mode=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)'
28150 + link_cmd='$(LIBTOOL) --mode=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)'
28154 - link_cmd='$(LIBTOOL) --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)'
28155 + link_cmd='$(LIBTOOL) --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)'
28159 if test "x" = "xyes"; then
28160 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phprecode.$suffix"
28161 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsoap.$suffix"
28163 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phprecode.$suffix"
28164 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix"
28167 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode"
28168 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap"
28170 cat >>Makefile.objects<<EOF
28171 -\$(phplibdir)/phprecode.$suffix: $ext_builddir/phprecode.$suffix
28172 - \$(LIBTOOL) --mode=install cp $ext_builddir/phprecode.$suffix \$(phplibdir)
28173 +\$(phplibdir)/phpsoap.$suffix: $ext_builddir/phpsoap.$suffix
28174 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpsoap.$suffix \$(phplibdir)
28176 -$ext_builddir/phprecode.$suffix: \$(shared_objects_recode) \$(PHPRECODE_SHARED_DEPENDENCIES)
28177 +$ext_builddir/phpsoap.$suffix: \$(shared_objects_soap) \$(PHPSOAP_SHARED_DEPENDENCIES)
28181 @@ -81232,31 +87889,31 @@ EOF
28182 case $host_alias in
28185 - 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'
28186 + 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'
28190 - link_cmd='$(LIBTOOL) --mode=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)'
28191 + link_cmd='$(LIBTOOL) --mode=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)'
28195 - link_cmd='$(LIBTOOL) --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)'
28196 + link_cmd='$(LIBTOOL) --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)'
28200 if test "x" = "xyes"; then
28201 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/recode.$suffix"
28202 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/soap.$suffix"
28204 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/recode.$suffix"
28205 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/soap.$suffix"
28208 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode"
28209 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap"
28211 cat >>Makefile.objects<<EOF
28212 -\$(phplibdir)/recode.$suffix: $ext_builddir/recode.$suffix
28213 - \$(LIBTOOL) --mode=install cp $ext_builddir/recode.$suffix \$(phplibdir)
28214 +\$(phplibdir)/soap.$suffix: $ext_builddir/soap.$suffix
28215 + \$(LIBTOOL) --mode=install cp $ext_builddir/soap.$suffix \$(phplibdir)
28217 -$ext_builddir/recode.$suffix: \$(shared_objects_recode) \$(RECODE_SHARED_DEPENDENCIES)
28218 +$ext_builddir/soap.$suffix: \$(shared_objects_soap) \$(SOAP_SHARED_DEPENDENCIES)
28222 @@ -81264,22 +87921,22 @@ EOF
28225 cat >> confdefs.h <<EOF
28226 -#define COMPILE_DL_RECODE 1
28227 +#define COMPILE_DL_SOAP 1
28233 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
28234 - PHP_RECODE_SHARED=no
28235 + PHP_SOAP_SHARED=no
28236 case "$PHP_SAPI" in
28240 - case ext/recode in
28242 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28243 - /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28244 - *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28245 + /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28246 + *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28250 @@ -81294,7 +87951,7 @@ EOF
28254 - for ac_src in recode.c; do
28255 + 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
28259 @@ -81317,15 +87974,15 @@ EOF
28263 - EXT_STATIC="$EXT_STATIC recode"
28264 + EXT_STATIC="$EXT_STATIC soap"
28269 - case ext/recode in
28271 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28272 - /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28273 - *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28274 + /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28275 + *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28279 @@ -81340,7 +87997,7 @@ EOF
28283 - for ac_src in recode.c; do
28284 + 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
28288 @@ -81365,7 +88022,7 @@ EOF
28292 - EXT_CLI_STATIC="$EXT_CLI_STATIC recode"
28293 + EXT_CLI_STATIC="$EXT_CLI_STATIC soap"
28297 @@ -81374,33 +88031,248 @@ EOF
28300 if test "$ext_builddir" = "."; then
28301 - PHP_PECL_EXTENSION=recode
28302 + PHP_PECL_EXTENSION=soap
28304 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
28309 + PHP_VAR_SUBST="$PHP_VAR_SUBST SOAP_SHARED_LIBADD"
28313 + { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
28316 + { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
28323 -cat >> confdefs.h <<\EOF
28324 -#define HAVE_REFLECTION 1
28326 +php_enable_sockets=no
28328 +echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6
28329 +echo "configure:88060: checking whether to enable sockets support" >&5
28330 +# Check whether --enable-sockets or --disable-sockets was given.
28331 +if test "${enable_sockets+set}" = set; then
28332 + enableval="$enable_sockets"
28333 + PHP_SOCKETS=$enableval
28337 + test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL
28343 +ext_output="yes, shared"
28345 +case $PHP_SOCKETS in
28347 + PHP_SOCKETS=`echo "$PHP_SOCKETS"|$SED 's/^shared,//'`
28364 +echo "$ac_t""$ext_output" 1>&6
28369 +if test "$PHP_SOCKETS" != "no"; then
28370 + echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
28371 +echo "configure:88102: checking for struct cmsghdr" >&5
28372 +if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then
28373 + echo $ac_n "(cached) $ac_c" 1>&6
28376 + cat > conftest.$ac_ext <<EOF
28377 +#line 88108 "configure"
28378 +#include "confdefs.h"
28380 +#include <sys/types.h>
28381 +#include <sys/socket.h>
28383 +struct cmsghdr s; s
28386 +if { (eval echo configure:88117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
28388 + ac_cv_cmsghdr=yes
28390 + echo "configure: failed program was:" >&5
28391 + cat conftest.$ac_ext >&5
28399 +echo "$ac_t""$ac_cv_cmsghdr" 1>&6
28401 - ext_builddir=ext/reflection
28402 - ext_srcdir=$abs_srcdir/ext/reflection
28403 + if test "$ac_cv_cmsghdr" = yes; then
28404 + cat >> confdefs.h <<\EOF
28405 +#define HAVE_CMSGHDR 1
28410 + for ac_func in hstrerror socketpair
28412 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
28413 +echo "configure:88142: checking for $ac_func" >&5
28414 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
28415 + echo $ac_n "(cached) $ac_c" 1>&6
28417 + cat > conftest.$ac_ext <<EOF
28418 +#line 88147 "configure"
28419 +#include "confdefs.h"
28420 +/* System header to define __stub macros and hopefully few prototypes,
28421 + which can conflict with char $ac_func(); below. */
28422 +#include <assert.h>
28423 +/* Override any gcc2 internal prototype to avoid an error. */
28424 +/* We use char because int might match the return type of a gcc2
28425 + builtin and then its argument prototype would still apply. */
28430 +/* The GNU C library defines this for functions which it implements
28431 + to always fail with ENOSYS. Some functions are actually named
28432 + something starting with __ and the normal name is an alias. */
28433 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
28441 +if { (eval echo configure:88170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
28443 + eval "ac_cv_func_$ac_func=yes"
28445 + echo "configure: failed program was:" >&5
28446 + cat conftest.$ac_ext >&5
28448 + eval "ac_cv_func_$ac_func=no"
28453 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
28454 + echo "$ac_t""yes" 1>&6
28455 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
28456 + cat >> confdefs.h <<EOF
28457 +#define $ac_tr_func 1
28461 + echo "$ac_t""no" 1>&6
28465 + for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h
28467 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
28468 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
28469 +echo "configure:88198: checking for $ac_hdr" >&5
28470 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
28471 + echo $ac_n "(cached) $ac_c" 1>&6
28473 + cat > conftest.$ac_ext <<EOF
28474 +#line 88203 "configure"
28475 +#include "confdefs.h"
28476 +#include <$ac_hdr>
28478 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
28479 +{ (eval echo configure:88208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
28480 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
28481 +if test -z "$ac_err"; then
28483 + eval "ac_cv_header_$ac_safe=yes"
28485 + echo "$ac_err" >&5
28486 + echo "configure: failed program was:" >&5
28487 + cat conftest.$ac_ext >&5
28489 + eval "ac_cv_header_$ac_safe=no"
28493 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
28494 + echo "$ac_t""yes" 1>&6
28495 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
28496 + cat >> confdefs.h <<EOF
28497 +#define $ac_tr_hdr 1
28501 + echo "$ac_t""no" 1>&6
28505 + cat > conftest.$ac_ext <<EOF
28506 +#line 88235 "configure"
28507 +#include "confdefs.h"
28509 +#include <sys/types.h>
28510 +#include <sys/socket.h>
28513 +static struct msghdr tp; int n = (int) tp.msg_flags; return n
28516 +if { (eval echo configure:88245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
28519 + echo "configure: failed program was:" >&5
28520 + cat conftest.$ac_ext >&5
28522 + cat >> confdefs.h <<\EOF
28523 +#define MISSING_MSGHDR_MSGFLAGS 1
28529 + cat >> confdefs.h <<\EOF
28530 +#define HAVE_SOCKETS 1
28535 + ext_builddir=ext/sockets
28536 + ext_srcdir=$abs_srcdir/ext/sockets
28540 - if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
28541 - PHP_REFLECTION_SHARED=no
28542 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
28543 + PHP_SOCKETS_SHARED=no
28546 - case ext/reflection in
28547 + case ext/sockets in
28548 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28549 - /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28550 - *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28551 + /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28552 + *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28556 @@ -81415,7 +88287,7 @@ EOF
28560 - for ac_src in php_reflection.c; do
28561 + for ac_src in sockets.c; do
28565 @@ -81438,18 +88310,18 @@ EOF
28569 - EXT_STATIC="$EXT_STATIC reflection"
28570 - if test "no" != "nocli"; then
28571 - EXT_CLI_STATIC="$EXT_CLI_STATIC reflection"
28572 + EXT_STATIC="$EXT_STATIC sockets"
28573 + if test "$ext_shared" != "nocli"; then
28574 + EXT_CLI_STATIC="$EXT_CLI_STATIC sockets"
28577 - if test "no" = "shared" || test "no" = "yes"; then
28578 - PHP_REFLECTION_SHARED=yes
28579 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
28580 + PHP_SOCKETS_SHARED=yes
28582 - case ext/reflection in
28583 + case ext/sockets in
28584 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28585 - /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28586 - *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28587 + /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28588 + *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28592 @@ -81464,14 +88336,14 @@ EOF
28596 - for ac_src in php_reflection.c; do
28597 + for ac_src in sockets.c; do
28604 - shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo"
28605 + shared_objects_sockets="$shared_objects_sockets $ac_bdir$ac_obj.lo"
28608 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
28609 @@ -81494,31 +88366,31 @@ EOF
28610 case $host_alias in
28613 - 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'
28614 + 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'
28618 - link_cmd='$(LIBTOOL) --mode=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)'
28619 + link_cmd='$(LIBTOOL) --mode=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)'
28623 - link_cmd='$(LIBTOOL) --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)'
28624 + link_cmd='$(LIBTOOL) --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)'
28628 if test "x" = "xyes"; then
28629 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreflection.$suffix"
28630 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsockets.$suffix"
28632 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix"
28633 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsockets.$suffix"
28636 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection"
28637 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets"
28639 cat >>Makefile.objects<<EOF
28640 -\$(phplibdir)/phpreflection.$suffix: $ext_builddir/phpreflection.$suffix
28641 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpreflection.$suffix \$(phplibdir)
28642 +\$(phplibdir)/phpsockets.$suffix: $ext_builddir/phpsockets.$suffix
28643 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpsockets.$suffix \$(phplibdir)
28645 -$ext_builddir/phpreflection.$suffix: \$(shared_objects_reflection) \$(PHPREFLECTION_SHARED_DEPENDENCIES)
28646 +$ext_builddir/phpsockets.$suffix: \$(shared_objects_sockets) \$(PHPSOCKETS_SHARED_DEPENDENCIES)
28650 @@ -81531,31 +88403,31 @@ EOF
28651 case $host_alias in
28654 - 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'
28655 + 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'
28659 - link_cmd='$(LIBTOOL) --mode=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)'
28660 + link_cmd='$(LIBTOOL) --mode=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)'
28664 - link_cmd='$(LIBTOOL) --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)'
28665 + link_cmd='$(LIBTOOL) --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)'
28669 if test "x" = "xyes"; then
28670 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/reflection.$suffix"
28671 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sockets.$suffix"
28673 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/reflection.$suffix"
28674 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/sockets.$suffix"
28677 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection"
28678 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets"
28680 cat >>Makefile.objects<<EOF
28681 -\$(phplibdir)/reflection.$suffix: $ext_builddir/reflection.$suffix
28682 - \$(LIBTOOL) --mode=install cp $ext_builddir/reflection.$suffix \$(phplibdir)
28683 +\$(phplibdir)/sockets.$suffix: $ext_builddir/sockets.$suffix
28684 + \$(LIBTOOL) --mode=install cp $ext_builddir/sockets.$suffix \$(phplibdir)
28686 -$ext_builddir/reflection.$suffix: \$(shared_objects_reflection) \$(REFLECTION_SHARED_DEPENDENCIES)
28687 +$ext_builddir/sockets.$suffix: \$(shared_objects_sockets) \$(SOCKETS_SHARED_DEPENDENCIES)
28691 @@ -81563,22 +88435,22 @@ EOF
28694 cat >> confdefs.h <<EOF
28695 -#define COMPILE_DL_REFLECTION 1
28696 +#define COMPILE_DL_SOCKETS 1
28702 - if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
28703 - PHP_REFLECTION_SHARED=no
28704 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
28705 + PHP_SOCKETS_SHARED=no
28706 case "$PHP_SAPI" in
28710 - case ext/reflection in
28711 + case ext/sockets in
28712 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28713 - /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28714 - *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28715 + /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28716 + *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28720 @@ -81593,7 +88465,7 @@ EOF
28724 - for ac_src in php_reflection.c; do
28725 + for ac_src in sockets.c; do
28729 @@ -81616,15 +88488,15 @@ EOF
28733 - EXT_STATIC="$EXT_STATIC reflection"
28734 + EXT_STATIC="$EXT_STATIC sockets"
28739 - case ext/reflection in
28740 + case ext/sockets in
28741 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
28742 - /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28743 - *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28744 + /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
28745 + *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
28749 @@ -81639,7 +88511,7 @@ EOF
28753 - for ac_src in php_reflection.c; do
28754 + for ac_src in sockets.c; do
28758 @@ -81661,350 +88533,108 @@ $ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
28765 - EXT_CLI_STATIC="$EXT_CLI_STATIC reflection"
28769 - BUILD_DIR="$BUILD_DIR $ext_builddir"
28773 - if test "$ext_builddir" = "."; then
28774 - PHP_PECL_EXTENSION=reflection
28776 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
28783 -php_enable_session=yes
28785 -echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6
28786 -echo "configure:81689: checking whether to enable PHP sessions" >&5
28787 -# Check whether --enable-session or --disable-session was given.
28788 -if test "${enable_session+set}" = set; then
28789 - enableval="$enable_session"
28790 - PHP_SESSION=$enableval
28794 - test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL
28800 -ext_output="yes, shared"
28802 -case $PHP_SESSION in
28804 - PHP_SESSION=`echo "$PHP_SESSION"|$SED 's/^shared,//'`
28821 -echo "$ac_t""$ext_output" 1>&6
28829 -echo $ac_n "checking for mm support""... $ac_c" 1>&6
28830 -echo "configure:81733: checking for mm support" >&5
28831 -# Check whether --with-mm or --without-mm was given.
28832 -if test "${with_mm+set}" = set; then
28833 - withval="$with_mm"
28843 -ext_output=$PHP_MM
28844 -echo "$ac_t""$ext_output" 1>&6
28849 -if test "$PHP_SESSION" != "no"; then
28851 - echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6
28852 -echo "configure:81755: checking whether pwrite works" >&5
28853 -if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then
28854 - echo $ac_n "(cached) $ac_c" 1>&6
28858 - if test "$cross_compiling" = yes; then
28863 - cat > conftest.$ac_ext <<EOF
28864 -#line 81767 "configure"
28865 -#include "confdefs.h"
28867 -#include <sys/types.h>
28868 -#include <sys/stat.h>
28869 -#include <fcntl.h>
28870 -#include <unistd.h>
28871 -#include <errno.h>
28874 - int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600);
28876 - if (fd < 0) exit(1);
28877 - if (pwrite(fd, "text", 4, 0) != 4) exit(1);
28878 - /* Linux glibc breakage until 2.2.5 */
28879 - if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1);
28885 -if { (eval echo configure:81788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
28891 - echo "configure: failed program was:" >&5
28892 - cat conftest.$ac_ext >&5
28902 - if test "$ac_cv_pwrite" = "no"; then
28904 - if test "$cross_compiling" = yes; then
28909 - cat > conftest.$ac_ext <<EOF
28910 -#line 81813 "configure"
28911 -#include "confdefs.h"
28913 -#include <sys/types.h>
28914 -#include <sys/stat.h>
28915 -#include <fcntl.h>
28916 -#include <unistd.h>
28917 -#include <errno.h>
28918 -ssize_t pwrite(int, void *, size_t, off64_t);
28920 - int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600);
28922 - if (fd < 0) exit(1);
28923 - if (pwrite(fd, "text", 4, 0) != 4) exit(1);
28924 - /* Linux glibc breakage until 2.2.5 */
28925 - if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1);
28931 -if { (eval echo configure:81834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
28937 - echo "configure: failed program was:" >&5
28938 - cat conftest.$ac_ext >&5
28948 - if test "$ac_cv_pwrite" = "yes"; then
28955 -echo "$ac_t""$ac_cv_pwrite" 1>&6
28957 - if test "$ac_cv_pwrite" != "no"; then
28958 - cat >> confdefs.h <<\EOF
28959 -#define HAVE_PWRITE 1
28962 - if test "$ac_cv_pwrite" = "64"; then
28963 - cat >> confdefs.h <<\EOF
28964 -#define PHP_PWRITE_64 1
28971 - echo $ac_n "checking whether pread works""... $ac_c" 1>&6
28972 -echo "configure:81875: checking whether pread works" >&5
28973 -if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then
28974 - echo $ac_n "(cached) $ac_c" 1>&6
28979 + EXT_CLI_STATIC="$EXT_CLI_STATIC sockets"
28983 - echo test > conftest_in
28984 - if test "$cross_compiling" = yes; then
28987 + BUILD_DIR="$BUILD_DIR $ext_builddir"
28990 - cat > conftest.$ac_ext <<EOF
28991 -#line 81888 "configure"
28992 -#include "confdefs.h"
28994 -#include <sys/types.h>
28995 -#include <sys/stat.h>
28996 -#include <fcntl.h>
28997 -#include <unistd.h>
28998 -#include <errno.h>
29002 - int fd = open("conftest_in", O_RDONLY);
29003 - if (fd < 0) exit(1);
29004 - if (pread(fd, buf, 2, 0) != 2) exit(1);
29005 - /* Linux glibc breakage until 2.2.5 */
29006 - if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1);
29009 + if test "$ext_builddir" = "."; then
29010 + PHP_PECL_EXTENSION=sockets
29012 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
29018 -if { (eval echo configure:81908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
29022 + header_path=ext/sockets/
29023 + for header_file in php_sockets.h; do
29024 + hp_hf="$header_path/$header_file"
29028 - echo "configure: failed program was:" >&5
29029 - cat conftest.$ac_ext >&5
29031 + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
29034 + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
29035 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
29036 + eval "INSTALLHEADERS$unique=set"
29038 + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
29049 - rm -f conftest_in
29051 - if test "$ac_cv_pread" = "no"; then
29053 - echo test > conftest_in
29054 + echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6
29055 +echo "configure:88579: checking whether zend_object_value is packed" >&5
29056 + old_CPPFLAGS=$CPPFLAGS
29057 + CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS"
29058 if test "$cross_compiling" = yes; then
29062 + echo "$ac_t""no" 1>&6
29065 cat > conftest.$ac_ext <<EOF
29066 -#line 81935 "configure"
29067 +#line 88589 "configure"
29068 #include "confdefs.h"
29070 -#include <sys/types.h>
29071 -#include <sys/stat.h>
29072 -#include <fcntl.h>
29073 -#include <unistd.h>
29074 -#include <errno.h>
29075 -ssize_t pread(int, void *, size_t, off64_t);
29078 - int fd = open("conftest_in", O_RDONLY);
29079 - if (fd < 0) exit(1);
29080 - if (pread(fd, buf, 2, 0) != 2) exit(1);
29081 - /* Linux glibc breakage until 2.2.5 */
29082 - if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1);
29085 +#include "Zend/zend_types.h"
29086 +int main(int argc, char **argv) {
29087 + return ((sizeof(zend_object_handle) + sizeof(zend_object_handlers*)) == sizeof(zend_object_value)) ? 0 : 1;
29091 -if { (eval echo configure:81955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
29092 +if { (eval echo configure:88598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
29097 + echo "$ac_t""yes" 1>&6
29100 echo "configure: failed program was:" >&5
29101 cat conftest.$ac_ext >&5
29106 + echo "$ac_t""no" 1>&6
29112 - rm -f conftest_in
29114 - if test "$ac_cv_pread" = "yes"; then
29121 -echo "$ac_t""$ac_cv_pread" 1>&6
29123 - if test "$ac_cv_pread" != "no"; then
29124 - cat >> confdefs.h <<\EOF
29125 -#define HAVE_PREAD 1
29126 + CPPFLAGS=$old_CPPFLAGS
29127 + cat >> confdefs.h <<EOF
29128 +#define HAVE_PACKED_OBJECT_VALUE $ac_result
29131 - if test "$ac_cv_pread" = "64"; then
29132 - cat >> confdefs.h <<\EOF
29133 -#define PHP_PREAD_64 1
29134 + cat >> confdefs.h <<\EOF
29135 +#define HAVE_SPL 1
29143 - ext_builddir=ext/session
29144 - ext_srcdir=$abs_srcdir/ext/session
29145 + ext_builddir=ext/spl
29146 + ext_srcdir=$abs_srcdir/ext/spl
29150 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
29151 - PHP_SESSION_SHARED=no
29152 + if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
29153 + PHP_SPL_SHARED=no
29156 - case ext/session in
29158 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
29159 - /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29160 - *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29161 + /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29162 + *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29166 @@ -82019,7 +88649,7 @@ EOF
29170 - for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
29171 + 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
29175 @@ -82042,18 +88672,18 @@ EOF
29179 - EXT_STATIC="$EXT_STATIC session"
29180 - if test "$ext_shared" != "nocli"; then
29181 - EXT_CLI_STATIC="$EXT_CLI_STATIC session"
29182 + EXT_STATIC="$EXT_STATIC spl"
29183 + if test "no" != "nocli"; then
29184 + EXT_CLI_STATIC="$EXT_CLI_STATIC spl"
29187 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
29188 - PHP_SESSION_SHARED=yes
29189 + if test "no" = "shared" || test "no" = "yes"; then
29190 + PHP_SPL_SHARED=yes
29192 - case ext/session in
29194 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
29195 - /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29196 - *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29197 + /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29198 + *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29202 @@ -82068,14 +88698,14 @@ EOF
29206 - for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
29207 + 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
29214 - shared_objects_session="$shared_objects_session $ac_bdir$ac_obj.lo"
29215 + shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo"
29218 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
29219 @@ -82098,31 +88728,31 @@ EOF
29220 case $host_alias in
29223 - 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'
29224 + 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'
29228 - link_cmd='$(LIBTOOL) --mode=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)'
29229 + link_cmd='$(LIBTOOL) --mode=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)'
29233 - link_cmd='$(LIBTOOL) --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)'
29234 + link_cmd='$(LIBTOOL) --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)'
29238 if test "x" = "xyes"; then
29239 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsession.$suffix"
29240 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpspl.$suffix"
29242 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix"
29243 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix"
29246 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session"
29247 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl"
29249 cat >>Makefile.objects<<EOF
29250 -\$(phplibdir)/phpsession.$suffix: $ext_builddir/phpsession.$suffix
29251 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpsession.$suffix \$(phplibdir)
29252 +\$(phplibdir)/phpspl.$suffix: $ext_builddir/phpspl.$suffix
29253 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpspl.$suffix \$(phplibdir)
29255 -$ext_builddir/phpsession.$suffix: \$(shared_objects_session) \$(PHPSESSION_SHARED_DEPENDENCIES)
29256 +$ext_builddir/phpspl.$suffix: \$(shared_objects_spl) \$(PHPSPL_SHARED_DEPENDENCIES)
29260 @@ -82135,31 +88765,31 @@ EOF
29261 case $host_alias in
29264 - 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'
29265 + 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'
29269 - link_cmd='$(LIBTOOL) --mode=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)'
29270 + link_cmd='$(LIBTOOL) --mode=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)'
29274 - link_cmd='$(LIBTOOL) --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)'
29275 + link_cmd='$(LIBTOOL) --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)'
29279 if test "x" = "xyes"; then
29280 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/session.$suffix"
29281 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/spl.$suffix"
29283 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/session.$suffix"
29284 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix"
29287 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session"
29288 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl"
29290 cat >>Makefile.objects<<EOF
29291 -\$(phplibdir)/session.$suffix: $ext_builddir/session.$suffix
29292 - \$(LIBTOOL) --mode=install cp $ext_builddir/session.$suffix \$(phplibdir)
29293 +\$(phplibdir)/spl.$suffix: $ext_builddir/spl.$suffix
29294 + \$(LIBTOOL) --mode=install cp $ext_builddir/spl.$suffix \$(phplibdir)
29296 -$ext_builddir/session.$suffix: \$(shared_objects_session) \$(SESSION_SHARED_DEPENDENCIES)
29297 +$ext_builddir/spl.$suffix: \$(shared_objects_spl) \$(SPL_SHARED_DEPENDENCIES)
29301 @@ -82167,22 +88797,22 @@ EOF
29304 cat >> confdefs.h <<EOF
29305 -#define COMPILE_DL_SESSION 1
29306 +#define COMPILE_DL_SPL 1
29312 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
29313 - PHP_SESSION_SHARED=no
29314 + if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
29315 + PHP_SPL_SHARED=no
29316 case "$PHP_SAPI" in
29320 - case ext/session in
29322 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
29323 - /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29324 - *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29325 + /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29326 + *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29330 @@ -82197,7 +88827,7 @@ EOF
29334 - for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
29335 + 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
29339 @@ -82220,15 +88850,15 @@ EOF
29343 - EXT_STATIC="$EXT_STATIC session"
29344 + EXT_STATIC="$EXT_STATIC spl"
29349 - case ext/session in
29351 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
29352 - /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29353 - *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29354 + /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
29355 + *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
29359 @@ -82243,7 +88873,7 @@ EOF
29363 - for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do
29364 + 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
29368 @@ -82268,7 +88898,7 @@ EOF
29372 - EXT_CLI_STATIC="$EXT_CLI_STATIC session"
29373 + EXT_CLI_STATIC="$EXT_CLI_STATIC spl"
29377 @@ -82277,110 +88907,341 @@ EOF
29380 if test "$ext_builddir" = "."; then
29381 - PHP_PECL_EXTENSION=session
29382 + PHP_PECL_EXTENSION=spl
29384 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
29389 - am_i_shared=$PHP_SESSION_SHARED
29390 - is_it_shared=$PHP_HASH_SHARED
29391 - is_it_enabled=$PHP_HASH
29393 + header_path=ext/spl
29394 + 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
29395 + hp_hf="$header_path/$header_file"
29398 + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
29400 + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
29401 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
29402 + eval "INSTALLHEADERS$unique=set"
29404 + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
29412 + am_i_shared=$PHP_SPL_SHARED
29413 + is_it_shared=$PHP_PCRE_SHARED
29414 + is_it_enabled=$PHP_PCRE
29415 if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
29416 { echo "configure: error:
29417 -You've configured extension session to build statically, but it
29418 -depends on extension hash, which you've configured to build shared.
29419 -You either need to build session shared or build hash statically for the
29420 +You've configured extension spl to build statically, but it
29421 +depends on extension pcre, which you've configured to build shared.
29422 +You either need to build spl shared or build pcre statically for the
29423 build to be successful.
29426 if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
29427 { echo "configure: error:
29428 -You've configured extension session, which depends on extension hash,
29429 -but you've either not enabled hash, or have disabled it.
29430 +You've configured extension spl, which depends on extension pcre,
29431 +but you've either not enabled pcre, or have disabled it.
29438 +php_with_sqlite=yes
29440 +echo $ac_n "checking for sqlite support""... $ac_c" 1>&6
29441 +echo "configure:88962: checking for sqlite support" >&5
29442 +# Check whether --with-sqlite or --without-sqlite was given.
29443 +if test "${with_sqlite+set}" = set; then
29444 + withval="$with_sqlite"
29445 + PHP_SQLITE=$withval
29448 - am_i_shared=$PHP_SESSION_SHARED
29449 - is_it_shared=$PHP_SPL_SHARED
29450 - is_it_enabled=$PHP_SPL
29451 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
29452 - { echo "configure: error:
29453 -You've configured extension session to build statically, but it
29454 -depends on extension spl, which you've configured to build shared.
29455 -You either need to build session shared or build spl statically for the
29456 -build to be successful.
29459 - if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
29460 - { echo "configure: error:
29461 -You've configured extension session, which depends on extension spl,
29462 -but you've either not enabled spl, or have disabled it.
29465 + test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL
29471 +ext_output="yes, shared"
29473 +case $PHP_SQLITE in
29475 + PHP_SQLITE=`echo "$PHP_SQLITE"|$SED 's/^shared,//'`
29492 +echo "$ac_t""$ext_output" 1>&6
29498 +php_enable_sqlite_utf8=no
29500 +echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6
29501 +echo "configure:89006: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
29502 +# Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given.
29503 +if test "${enable_sqlite_utf8+set}" = set; then
29504 + enableval="$enable_sqlite_utf8"
29505 + PHP_SQLITE_UTF8=$enableval
29508 + PHP_SQLITE_UTF8=no
29514 +ext_output=$PHP_SQLITE_UTF8
29515 +echo "$ac_t""$ext_output" 1>&6
29525 +if test "$PHP_SQLITE" != "no"; then
29526 + if test "$PHP_PDO" != "no"; then
29528 + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
29529 +echo "configure:89034: checking for PDO includes" >&5
29530 +if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
29531 + echo $ac_n "(cached) $ac_c" 1>&6
29534 + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
29535 +echo "configure:89040: checking for PDO includes" >&5
29536 + if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
29537 + pdo_inc_path=$abs_srcdir/ext
29538 + elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
29539 + pdo_inc_path=$abs_srcdir/ext
29540 + elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
29541 + pdo_inc_path=$prefix/include/php/ext
29546 +echo "$ac_t""$pdo_inc_path" 1>&6
29547 + if test -n "$pdo_inc_path"; then
29550 +echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2
29553 + if test -n "$pdo_inc_path"; then
29554 + cat >> confdefs.h <<\EOF
29555 +#define PHP_SQLITE2_HAVE_PDO 1
29558 + pdo_inc_path="-I$pdo_inc_path"
29562 + if test "$PHP_SQLITE" != "yes"; then
29563 + SEARCH_PATH="/usr/local /usr"
29564 + SEARCH_FOR="/include/sqlite.h"
29565 + if test -r $PHP_SQLITE/; then # path given as parameter
29566 + SQLITE_DIR=$PHP_SQLITE
29567 + else # search default path list
29568 + echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6
29569 +echo "configure:89074: checking for sqlite files in default path" >&5
29570 + for i in $SEARCH_PATH ; do
29571 + if test -r $i/$SEARCH_FOR; then
29573 + echo "$ac_t""found in $i" 1>&6
29578 + if test -z "$SQLITE_DIR"; then
29579 + echo "$ac_t""not found" 1>&6
29580 + { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; }
29584 + save_old_LDFLAGS=$LDFLAGS
29586 + -L$SQLITE_DIR/$PHP_LIBDIR -lm
29589 + save_ext_shared=$ext_shared
29592 - PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD"
29593 + for ac_i in $ac_stuff; do
29596 + if test "$ext_shared" = "yes"; then
29597 + LDFLAGS="$LDFLAGS -pthread"
29601 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
29603 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
29604 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
29605 + eval "EXTRA_LDFLAGS$unique=set"
29606 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
29612 + ac_ii=`echo $ac_i|cut -c 3-`
29616 + c|c_r|pthread*) ;;
29618 + if test "$ext_shared" = "yes"; then
29619 + LDFLAGS="$LDFLAGS -l$ac_ii"
29623 - header_path=ext/session
29624 - for header_file in php_session.h mod_files.h mod_user.h; do
29625 - hp_hf="$header_path/$header_file"
29627 + c|c_r|pthread*) ;;
29629 + LIBS="$LIBS -l$ac_ii"
29641 + ac_ii=`echo $ac_i|cut -c 3-`
29643 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
29645 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
29649 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
29651 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
29652 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
29656 + if test "$ext_shared" = "yes"; then
29657 + LDFLAGS="-L$ai_p $LDFLAGS"
29658 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
29662 - unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
29664 - cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
29665 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
29667 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
29668 if test -n "$unique" && test "`eval $cmd`" = "" ; then
29669 - eval "INSTALLHEADERS$unique=set"
29670 + eval "LIBPATH$unique=set"
29672 - INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
29674 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
29675 + LDFLAGS="$LDFLAGS -L$ai_p"
29676 + PHP_RPATHS="$PHP_RPATHS $ai_p"
29683 - cat >> confdefs.h <<\EOF
29684 -#define HAVE_PHP_SESSION 1
29693 + echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6
29694 +echo "configure:89186: checking for sqlite_open in -lsqlite" >&5
29695 +ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'`
29696 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
29697 + echo $ac_n "(cached) $ac_c" 1>&6
29699 + ac_save_LIBS="$LIBS"
29700 +LIBS="-lsqlite $LIBS"
29701 +cat > conftest.$ac_ext <<EOF
29702 +#line 89194 "configure"
29703 +#include "confdefs.h"
29704 +/* Override any gcc2 internal prototype to avoid an error. */
29705 +/* We use char because int might match the return type of a gcc2
29706 + builtin and then its argument prototype would still apply. */
29707 +char sqlite_open();
29714 +if { (eval echo configure:89205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
29716 + eval "ac_cv_lib_$ac_lib_var=yes"
29718 + echo "configure: failed program was:" >&5
29719 + cat conftest.$ac_ext >&5
29721 + eval "ac_cv_lib_$ac_lib_var=no"
29724 +LIBS="$ac_save_LIBS"
29726 -if test "$PHP_MM" != "no"; then
29727 - for i in $PHP_MM /usr/local /usr; do
29728 - test -f "$i/include/mm.h" && MM_DIR=$i && break
29731 - if test -z "$MM_DIR" ; then
29732 - { echo "configure: error: cannot find mm library" 1>&2; exit 1; }
29736 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
29737 + echo "$ac_t""yes" 1>&6
29739 + LDFLAGS=$save_old_LDFLAGS
29740 + ext_shared=$save_ext_shared
29744 if test "$ext_shared" = "yes"; then
29745 - SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD"
29746 - if test -n "$MM_DIR/$PHP_LIBDIR"; then
29747 + SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD"
29748 + if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then
29750 - if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
29751 + if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
29753 - if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
29754 - ai_p=$MM_DIR/$PHP_LIBDIR
29755 + if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
29756 + ai_p=$SQLITE_DIR/$PHP_LIBDIR
29759 - ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
29760 + ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
29762 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
29763 - ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
29764 + ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`"
29768 if test "$ext_shared" = "yes"; then
29769 - SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD"
29770 - test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD"
29771 + SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD"
29772 + test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_SHARED_LIBADD"
29776 @@ -82406,18 +89267,18 @@ if test "$PHP_MM" != "no"; then
29780 - if test -n "$MM_DIR/$PHP_LIBDIR"; then
29781 + if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then
29783 - if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then
29784 + if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
29786 - if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
29787 - ai_p=$MM_DIR/$PHP_LIBDIR
29788 + if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
29789 + ai_p=$SQLITE_DIR/$PHP_LIBDIR
29792 - ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
29793 + ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
29795 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
29796 - ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
29797 + ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`"
29801 @@ -82443,10 +89304,10 @@ if test "$PHP_MM" != "no"; then
29809 - LIBS="-lmm $LIBS"
29810 + LIBS="-lsqlite $LIBS"
29814 @@ -82456,17 +89317,17 @@ if test "$PHP_MM" != "no"; then
29819 - if test "$MM_DIR/include" != "/usr/include"; then
29821 + if test "$SQLITE_DIR/include" != "/usr/include"; then
29823 - if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then
29824 - ai_p=$MM_DIR/include
29825 + if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then
29826 + ai_p=$SQLITE_DIR/include
29829 - ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
29830 + ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
29832 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
29833 - ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`"
29834 + ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`"
29838 @@ -82487,93 +89348,121 @@ if test "$PHP_MM" != "no"; then
29844 - for header_file in ext/session/mod_mm.h; do
29847 - unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
29849 - cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
29850 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
29851 - eval "INSTALLHEADERS$unique=set"
29853 - INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
29860 + echo "$ac_t""no" 1>&6
29862 - cat >> confdefs.h <<\EOF
29863 -#define HAVE_LIBMM 1
29866 + LDFLAGS=$save_old_LDFLAGS
29867 + ext_shared=$save_ext_shared
29868 + unset ac_cv_lib_sqlite_sqlite_open
29870 + { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; }
29875 + SQLITE_MODULE_TYPE=external
29876 + PHP_SQLITE_CFLAGS=$pdo_inc_path
29877 + sqlite_extra_sources="libsqlite/src/encode.c"
29879 + # use bundled library
29881 + # we only support certain lemon versions
29882 + lemon_version_list="1.0"
29884 -php_enable_shmop=no
29885 + # Extract the first word of "lemon", so it can be a program name with args.
29886 +set dummy lemon; ac_word=$2
29887 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
29888 +echo "configure:89378: checking for $ac_word" >&5
29889 +if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then
29890 + echo $ac_n "(cached) $ac_c" 1>&6
29892 + if test -n "$LEMON"; then
29893 + ac_cv_prog_LEMON="$LEMON" # Let the user override the test.
29895 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
29897 + for ac_dir in $ac_dummy; do
29898 + test -z "$ac_dir" && ac_dir=.
29899 + if test -f $ac_dir/$ac_word; then
29900 + ac_cv_prog_LEMON="lemon"
29904 + IFS="$ac_save_ifs"
29907 +LEMON="$ac_cv_prog_LEMON"
29908 +if test -n "$LEMON"; then
29909 + echo "$ac_t""$LEMON" 1>&6
29911 + echo "$ac_t""no" 1>&6
29914 -echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6
29915 -echo "configure:82519: checking whether to enable shmop support" >&5
29916 -# Check whether --enable-shmop or --disable-shmop was given.
29917 -if test "${enable_shmop+set}" = set; then
29918 - enableval="$enable_shmop"
29919 - PHP_SHMOP=$enableval
29920 + if test "$LEMON"; then
29921 + echo $ac_n "checking for lemon version""... $ac_c" 1>&6
29922 +echo "configure:89406: checking for lemon version" >&5
29923 +if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then
29924 + echo $ac_n "(cached) $ac_c" 1>&6
29928 - test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL
29930 + lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'`
29931 + php_cv_lemon_version=invalid
29932 + for lemon_check_version in $lemon_version_list; do
29933 + if test "$lemon_version" = "$lemon_check_version"; then
29934 + php_cv_lemon_version="$lemon_check_version (ok)"
29940 +echo "$ac_t""$php_cv_lemon_version" 1>&6
29942 + lemon_version=none
29944 + case $php_cv_lemon_version in
29946 + lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)."
29947 + echo "configure: warning: $lemon_msg" 1>&2
29952 + PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON"
29955 -ext_output="yes, shared"
29957 -case $PHP_SHMOP in
29959 - PHP_SHMOP=`echo "$PHP_SHMOP"|$SED 's/^shared,//'`
29976 -echo "$ac_t""$ext_output" 1>&6
29981 -if test "$PHP_SHMOP" != "no"; then
29982 - cat >> confdefs.h <<\EOF
29983 -#define HAVE_SHMOP 1
29986 + SQLITE_MODULE_TYPE=builtin
29987 + PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path"
29988 + sqlite_extra_sources="libsqlite/src/opcodes.c \
29989 + libsqlite/src/parse.c libsqlite/src/encode.c \
29990 + libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
29991 + libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
29992 + libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \
29993 + libsqlite/src/os.c libsqlite/src/pager.c \
29994 + libsqlite/src/printf.c libsqlite/src/random.c \
29995 + libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \
29996 + libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \
29997 + libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \
29998 + libsqlite/src/vacuum.c libsqlite/src/copy.c \
29999 + libsqlite/src/vdbeaux.c libsqlite/src/date.c \
30000 + libsqlite/src/where.c libsqlite/src/trigger.c"
30002 + sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources"
30004 - ext_builddir=ext/shmop
30005 - ext_srcdir=$abs_srcdir/ext/shmop
30006 + ext_builddir=ext/sqlite
30007 + ext_srcdir=$abs_srcdir/ext/sqlite
30010 + ac_extra=`echo "$PHP_SQLITE_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
30012 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
30013 - PHP_SHMOP_SHARED=no
30014 + PHP_SQLITE_SHARED=no
30017 - case ext/shmop in
30018 + case ext/sqlite in
30019 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
30020 - /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30021 - *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30022 + /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30023 + *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30027 @@ -82588,7 +89477,7 @@ EOF
30031 - for ac_src in shmop.c; do
30032 + for ac_src in $sqlite_sources; do
30036 @@ -82611,18 +89500,18 @@ EOF
30040 - EXT_STATIC="$EXT_STATIC shmop"
30041 + EXT_STATIC="$EXT_STATIC sqlite"
30042 if test "$ext_shared" != "nocli"; then
30043 - EXT_CLI_STATIC="$EXT_CLI_STATIC shmop"
30044 + EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
30047 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
30048 - PHP_SHMOP_SHARED=yes
30049 + PHP_SQLITE_SHARED=yes
30051 - case ext/shmop in
30052 + case ext/sqlite in
30053 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
30054 - /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30055 - *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30056 + /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30057 + *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30061 @@ -82637,14 +89526,14 @@ EOF
30065 - for ac_src in shmop.c; do
30066 + for ac_src in $sqlite_sources; do
30073 - shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo"
30074 + shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo"
30077 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30078 @@ -82667,31 +89556,31 @@ EOF
30079 case $host_alias in
30082 - 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'
30083 + 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'
30087 - link_cmd='$(LIBTOOL) --mode=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)'
30088 + link_cmd='$(LIBTOOL) --mode=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)'
30092 - link_cmd='$(LIBTOOL) --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)'
30093 + link_cmd='$(LIBTOOL) --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)'
30097 if test "x" = "xyes"; then
30098 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpshmop.$suffix"
30099 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsqlite.$suffix"
30101 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix"
30102 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix"
30105 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop"
30106 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
30108 cat >>Makefile.objects<<EOF
30109 -\$(phplibdir)/phpshmop.$suffix: $ext_builddir/phpshmop.$suffix
30110 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpshmop.$suffix \$(phplibdir)
30111 +\$(phplibdir)/phpsqlite.$suffix: $ext_builddir/phpsqlite.$suffix
30112 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpsqlite.$suffix \$(phplibdir)
30114 -$ext_builddir/phpshmop.$suffix: \$(shared_objects_shmop) \$(PHPSHMOP_SHARED_DEPENDENCIES)
30115 +$ext_builddir/phpsqlite.$suffix: \$(shared_objects_sqlite) \$(PHPSQLITE_SHARED_DEPENDENCIES)
30119 @@ -82704,696 +89593,983 @@ EOF
30120 case $host_alias in
30123 - 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'
30124 + 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'
30128 - link_cmd='$(LIBTOOL) --mode=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)'
30129 + link_cmd='$(LIBTOOL) --mode=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)'
30133 - link_cmd='$(LIBTOOL) --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)'
30134 + link_cmd='$(LIBTOOL) --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)'
30138 if test "x" = "xyes"; then
30139 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/shmop.$suffix"
30140 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sqlite.$suffix"
30142 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/shmop.$suffix"
30143 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix"
30146 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop"
30147 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
30149 + cat >>Makefile.objects<<EOF
30150 +\$(phplibdir)/sqlite.$suffix: $ext_builddir/sqlite.$suffix
30151 + \$(LIBTOOL) --mode=install cp $ext_builddir/sqlite.$suffix \$(phplibdir)
30153 +$ext_builddir/sqlite.$suffix: \$(shared_objects_sqlite) \$(SQLITE_SHARED_DEPENDENCIES)
30160 + cat >> confdefs.h <<EOF
30161 +#define COMPILE_DL_SQLITE 1
30167 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
30168 + PHP_SQLITE_SHARED=no
30169 + case "$PHP_SAPI" in
30173 + case ext/sqlite in
30174 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
30175 + /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30176 + *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30181 + b_c_pre=$php_c_pre
30182 + b_cxx_pre=$php_cxx_pre
30183 + b_c_meta=$php_c_meta
30184 + b_cxx_meta=$php_cxx_meta
30185 + b_c_post=$php_c_post
30186 + b_cxx_post=$php_cxx_post
30191 + for ac_src in $sqlite_sources; do
30198 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
30201 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30202 + *.s) ac_comp="$b_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 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
30207 + cat >>Makefile.objects<<EOF
30208 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
30214 + EXT_STATIC="$EXT_STATIC sqlite"
30219 + case ext/sqlite in
30220 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
30221 + /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30222 + *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30227 + b_c_pre=$php_c_pre
30228 + b_cxx_pre=$php_cxx_pre
30229 + b_c_meta=$php_c_meta
30230 + b_cxx_meta=$php_cxx_meta
30231 + b_c_post=$php_c_post
30232 + b_cxx_post=$php_cxx_post
30237 + for ac_src in $sqlite_sources; do
30244 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
30247 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30248 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30249 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30250 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
30253 + cat >>Makefile.objects<<EOF
30254 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
30262 + EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
30266 + BUILD_DIR="$BUILD_DIR $ext_builddir"
30270 + if test "$ext_builddir" = "."; then
30271 + PHP_PECL_EXTENSION=sqlite
30273 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
30278 + am_i_shared=$PHP_SQLITE_SHARED
30279 + is_it_shared=$PHP_SPL_SHARED
30280 + is_it_enabled=$PHP_SPL
30281 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
30282 + { echo "configure: error:
30283 +You've configured extension sqlite to build statically, but it
30284 +depends on extension spl, which you've configured to build shared.
30285 +You either need to build sqlite shared or build spl statically for the
30286 +build to be successful.
30289 + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
30290 + { echo "configure: error:
30291 +You've configured extension sqlite, which depends on extension spl,
30292 +but you've either not enabled spl, or have disabled it.
30297 + am_i_shared=$PHP_SQLITE_SHARED
30298 + is_it_shared=$PHP_PDO_SHARED
30299 + is_it_enabled=$PHP_PDO
30300 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
30301 + { echo "configure: error:
30302 +You've configured extension sqlite to build statically, but it
30303 +depends on extension pdo, which you've configured to build shared.
30304 +You either need to build sqlite shared or build pdo statically for the
30305 +build to be successful.
30308 + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
30309 + { echo "configure: error:
30310 +You've configured extension sqlite, which depends on extension pdo,
30311 +but you've either not enabled pdo, or have disabled it.
30317 + src=$ext_srcdir/Makefile.frag
30318 + ac_srcdir=$ext_srcdir
30319 + ac_builddir=$ext_builddir
30320 + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
30323 + PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD"
30327 + for header_file in $ext_builddir/libsqlite/src/sqlite.h; do
30330 + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
30332 + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
30333 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
30334 + eval "INSTALLHEADERS$unique=set"
30336 + INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
30344 + if test "$SQLITE_MODULE_TYPE" = "builtin"; then
30347 + $php_shtool mkdir -p $ext_builddir/libsqlite/src
30350 + echo $ac_n "checking size of char *""... $ac_c" 1>&6
30351 +echo "configure:89819: checking size of char *" >&5
30352 +if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
30353 + echo $ac_n "(cached) $ac_c" 1>&6
30355 + if test "$cross_compiling" = yes; then
30356 + ac_cv_sizeof_char_p=4
30358 + cat > conftest.$ac_ext <<EOF
30359 +#line 89827 "configure"
30360 +#include "confdefs.h"
30361 +#include <stdio.h>
30362 +#include <sys/types.h>
30365 + FILE *f=fopen("conftestval", "w");
30367 + fprintf(f, "%d\n", sizeof(char *));
30371 +if { (eval echo configure:89839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
30373 + ac_cv_sizeof_char_p=`cat conftestval`
30375 + echo "configure: failed program was:" >&5
30376 + cat conftest.$ac_ext >&5
30378 + ac_cv_sizeof_char_p=0
30383 - cat >>Makefile.objects<<EOF
30384 -\$(phplibdir)/shmop.$suffix: $ext_builddir/shmop.$suffix
30385 - \$(LIBTOOL) --mode=install cp $ext_builddir/shmop.$suffix \$(phplibdir)
30387 +echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6
30388 +cat >> confdefs.h <<EOF
30389 +#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
30392 -$ext_builddir/shmop.$suffix: \$(shared_objects_shmop) \$(SHMOP_SHARED_DEPENDENCIES)
30395 + cat >> confdefs.h <<\EOF
30396 +#define SQLITE_PTR_SZ SIZEOF_CHAR_P
30401 - cat >> confdefs.h <<EOF
30402 -#define COMPILE_DL_SHMOP 1
30403 + if test "$PHP_SQLITE_UTF8" = "yes"; then
30404 + SQLITE_ENCODING="UTF8"
30405 + cat >> confdefs.h <<\EOF
30406 +#define SQLITE_UTF8 1
30410 + SQLITE_ENCODING="ISO8859"
30414 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
30415 - PHP_SHMOP_SHARED=no
30416 - case "$PHP_SAPI" in
30420 - case ext/shmop in
30421 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
30422 - /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30423 - *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30428 + PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING"
30430 - b_c_pre=$php_c_pre
30431 - b_cxx_pre=$php_cxx_pre
30432 - b_c_meta=$php_c_meta
30433 - b_cxx_meta=$php_cxx_meta
30434 - b_c_post=$php_c_post
30435 - b_cxx_post=$php_cxx_post
30438 + SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
30440 + PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION"
30443 - for ac_src in shmop.c; do
30450 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
30453 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30454 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30455 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30456 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
30458 + sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h
30460 - cat >>Makefile.objects<<EOF
30461 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
30463 + if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then
30464 + echo '#include <php_config.h>' > $ext_builddir/libsqlite/src/config.h
30466 + echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h
30469 + cat >> $ext_builddir/libsqlite/src/config.h <<EOF
30471 +# define THREADSAFE 1
30480 - EXT_STATIC="$EXT_STATIC shmop"
30485 - case ext/shmop in
30486 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
30487 - /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
30488 - *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
30493 + for ac_func in usleep nanosleep
30495 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
30496 +echo "configure:89901: checking for $ac_func" >&5
30497 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
30498 + echo $ac_n "(cached) $ac_c" 1>&6
30500 + cat > conftest.$ac_ext <<EOF
30501 +#line 89906 "configure"
30502 +#include "confdefs.h"
30503 +/* System header to define __stub macros and hopefully few prototypes,
30504 + which can conflict with char $ac_func(); below. */
30505 +#include <assert.h>
30506 +/* Override any gcc2 internal prototype to avoid an error. */
30507 +/* We use char because int might match the return type of a gcc2
30508 + builtin and then its argument prototype would still apply. */
30511 - b_c_pre=$php_c_pre
30512 - b_cxx_pre=$php_cxx_pre
30513 - b_c_meta=$php_c_meta
30514 - b_cxx_meta=$php_cxx_meta
30515 - b_c_post=$php_c_post
30516 - b_cxx_post=$php_cxx_post
30520 +/* The GNU C library defines this for functions which it implements
30521 + to always fail with ENOSYS. Some functions are actually named
30522 + something starting with __ and the normal name is an alias. */
30523 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
30530 - for ac_src in shmop.c; do
30537 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
30540 +if { (eval echo configure:89929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
30542 + eval "ac_cv_func_$ac_func=yes"
30544 + echo "configure: failed program was:" >&5
30545 + cat conftest.$ac_ext >&5
30547 + eval "ac_cv_func_$ac_func=no"
30553 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30554 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30555 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
30556 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
30558 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
30559 + echo "$ac_t""yes" 1>&6
30560 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
30561 + cat >> confdefs.h <<EOF
30562 +#define $ac_tr_func 1
30566 + echo "$ac_t""no" 1>&6
30570 - cat >>Makefile.objects<<EOF
30571 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
30573 + for ac_hdr in time.h
30575 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
30576 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
30577 +echo "configure:89957: checking for $ac_hdr" >&5
30578 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
30579 + echo $ac_n "(cached) $ac_c" 1>&6
30581 + cat > conftest.$ac_ext <<EOF
30582 +#line 89962 "configure"
30583 +#include "confdefs.h"
30584 +#include <$ac_hdr>
30587 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
30588 +{ (eval echo configure:89967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
30589 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
30590 +if test -z "$ac_err"; then
30592 + eval "ac_cv_header_$ac_safe=yes"
30594 + echo "$ac_err" >&5
30595 + echo "configure: failed program was:" >&5
30596 + cat conftest.$ac_ext >&5
30598 + eval "ac_cv_header_$ac_safe=no"
30602 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
30603 + echo "$ac_t""yes" 1>&6
30604 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
30605 + cat >> confdefs.h <<EOF
30606 +#define $ac_tr_hdr 1
30610 + echo "$ac_t""no" 1>&6
30618 - EXT_CLI_STATIC="$EXT_CLI_STATIC shmop"
30622 - BUILD_DIR="$BUILD_DIR $ext_builddir"
30626 - if test "$ext_builddir" = "."; then
30627 - PHP_PECL_EXTENSION=shmop
30629 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
30630 +echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6
30631 +echo "configure:89998: checking whether flush should be called explicitly after a buffered io" >&5
30632 +if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then
30633 + echo $ac_n "(cached) $ac_c" 1>&6
30636 +if test "$cross_compiling" = yes; then
30638 + ac_cv_flush_io=no
30642 + cat > conftest.$ac_ext <<EOF
30643 +#line 90009 "configure"
30644 +#include "confdefs.h"
30647 +#include <stdio.h>
30648 +#include <stdlib.h>
30650 +int main(int argc, char **argv)
30652 + char *filename = tmpnam(NULL);
30656 + FILE *fp = fopen(filename, "wb");
30659 + fputs("line 1\n", fp);
30660 + fputs("line 2\n", fp);
30663 + fp = fopen(filename, "rb+");
30666 + fgets(buffer, sizeof(buffer), fp);
30667 + fputs("line 3\n", fp);
30669 + fgets(buffer, sizeof(buffer), fp);
30670 + if (0 != strcmp(buffer, "line 1\n"))
30672 + fgets(buffer, sizeof(buffer), fp);
30673 + if (0 != strcmp(buffer, "line 3\n"))
30676 + unlink(filename);
30681 -php_enable_simplexml=yes
30683 +if { (eval echo configure:90047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
30686 + ac_cv_flush_io=no
30688 -echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6
30689 -echo "configure:82863: checking whether to enable SimpleXML support" >&5
30690 -# Check whether --enable-simplexml or --disable-simplexml was given.
30691 -if test "${enable_simplexml+set}" = set; then
30692 - enableval="$enable_simplexml"
30693 - PHP_SIMPLEXML=$enableval
30695 + echo "configure: failed program was:" >&5
30696 + cat conftest.$ac_ext >&5
30699 - PHP_SIMPLEXML=yes
30700 - test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL
30701 + ac_cv_flush_io=yes
30709 +echo "$ac_t""$ac_cv_flush_io" 1>&6
30710 +if test "$ac_cv_flush_io" = "yes"; then
30711 + cat >> confdefs.h <<\EOF
30712 +#define HAVE_FLUSHIO 1
30715 -ext_output="yes, shared"
30717 -case $PHP_SIMPLEXML in
30719 - PHP_SIMPLEXML=`echo "$PHP_SIMPLEXML"|$SED 's/^shared,//'`
30722 - PHP_SIMPLEXML=yes
30736 -echo "$ac_t""$ext_output" 1>&6
30739 +if test "$ac_cv_func_crypt" = "no"; then
30740 + echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
30741 +echo "configure:90075: checking for crypt in -lcrypt" >&5
30742 +ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
30743 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
30744 + echo $ac_n "(cached) $ac_c" 1>&6
30746 + ac_save_LIBS="$LIBS"
30747 +LIBS="-lcrypt $LIBS"
30748 +cat > conftest.$ac_ext <<EOF
30749 +#line 90083 "configure"
30750 +#include "confdefs.h"
30751 +/* Override any gcc2 internal prototype to avoid an error. */
30752 +/* We use char because int might match the return type of a gcc2
30753 + builtin and then its argument prototype would still apply. */
30760 +if { (eval echo configure:90094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
30762 + eval "ac_cv_lib_$ac_lib_var=yes"
30764 + echo "configure: failed program was:" >&5
30765 + cat conftest.$ac_ext >&5
30767 + eval "ac_cv_lib_$ac_lib_var=no"
30770 +LIBS="$ac_save_LIBS"
30773 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
30774 + echo "$ac_t""yes" 1>&6
30776 + LIBS="-lcrypt $LIBS -lcrypt"
30777 + cat >> confdefs.h <<\EOF
30778 +#define HAVE_CRYPT 1
30781 -if test -z "$PHP_LIBXML_DIR"; then
30783 -php_with_libxml_dir=no
30785 + echo "$ac_t""no" 1>&6
30788 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
30789 -echo "configure:82908: checking libxml2 install dir" >&5
30790 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
30791 -if test "${with_libxml_dir+set}" = set; then
30792 - withval="$with_libxml_dir"
30793 - PHP_LIBXML_DIR=$withval
30796 +echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
30797 +echo "configure:90123: checking for standard DES crypt" >&5
30798 +if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then
30799 + echo $ac_n "(cached) $ac_c" 1>&6
30802 - PHP_LIBXML_DIR=no
30803 + if test "$cross_compiling" = yes; then
30805 + ac_cv_crypt_des=yes
30809 + cat > conftest.$ac_ext <<EOF
30810 +#line 90134 "configure"
30811 +#include "confdefs.h"
30814 +#include <unistd.h>
30817 -ext_output=$PHP_LIBXML_DIR
30818 -echo "$ac_t""$ext_output" 1>&6
30820 +#include <crypt.h>
30825 + exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M"));
30831 +if { (eval echo configure:90153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
30834 + ac_cv_crypt_des=yes
30837 + echo "configure: failed program was:" >&5
30838 + cat conftest.$ac_ext >&5
30841 + ac_cv_crypt_des=no
30847 -if test "$PHP_SIMPLEXML" != "no"; then
30850 - if test "$PHP_LIBXML" = "no"; then
30851 - { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
30853 +echo "$ac_t""$ac_cv_crypt_des" 1>&6
30856 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
30857 -echo "configure:82936: checking for xml2-config path" >&5
30858 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
30859 +echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
30860 +echo "configure:90174: checking for extended DES crypt" >&5
30861 +if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then
30862 echo $ac_n "(cached) $ac_c" 1>&6
30865 - for i in $PHP_LIBXML_DIR /usr/local /usr; do
30866 - if test -x "$i/bin/xml2-config"; then
30867 - ac_cv_php_xml2_config_path="$i/bin/xml2-config"
30871 + if test "$cross_compiling" = yes; then
30873 + ac_cv_crypt_ext_des=no
30877 + cat > conftest.$ac_ext <<EOF
30878 +#line 90185 "configure"
30879 +#include "confdefs.h"
30881 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
30883 +#include <unistd.h>
30886 - if test -x "$ac_cv_php_xml2_config_path"; then
30887 - XML2_CONFIG="$ac_cv_php_xml2_config_path"
30888 - libxml_full_version=`$XML2_CONFIG --version`
30891 - set $libxml_full_version
30893 - LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
30894 - if test "$LIBXML_VERSION" -ge "2006011"; then
30895 - LIBXML_LIBS=`$XML2_CONFIG --libs`
30896 - LIBXML_INCS=`$XML2_CONFIG --cflags`
30898 - for ac_i in $LIBXML_LIBS; do
30901 - if test "$ext_shared" = "yes"; then
30902 - SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread"
30906 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
30908 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
30909 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
30910 - eval "EXTRA_LDFLAGS$unique=set"
30911 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
30914 +#include <crypt.h>
30920 - ac_ii=`echo $ac_i|cut -c 3-`
30924 - c|c_r|pthread*) ;;
30926 - if test "$ext_shared" = "yes"; then
30927 - SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii"
30932 + exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc"));
30938 +if { (eval echo configure:90204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
30942 - c|c_r|pthread*) ;;
30944 - LIBS="$LIBS -l$ac_ii"
30947 + ac_cv_crypt_ext_des=yes
30950 + echo "configure: failed program was:" >&5
30951 + cat conftest.$ac_ext >&5
30954 + ac_cv_crypt_ext_des=no
30967 - ac_ii=`echo $ac_i|cut -c 3-`
30969 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
30971 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
30975 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
30977 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
30978 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
30980 +echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6
30983 - if test "$ext_shared" = "yes"; then
30984 - SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD"
30985 - test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_SHARED_LIBADD"
30990 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
30991 +echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
30992 +echo "configure:90225: checking for MD5 crypt" >&5
30993 +if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then
30994 + echo $ac_n "(cached) $ac_c" 1>&6
30997 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
30998 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
30999 - eval "LIBPATH$unique=set"
31001 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
31002 - LDFLAGS="$LDFLAGS -L$ai_p"
31003 - PHP_RPATHS="$PHP_RPATHS $ai_p"
31004 +if test "$cross_compiling" = yes; then
31007 + ac_cv_crypt_md5=no
31010 + cat > conftest.$ac_ext <<EOF
31011 +#line 90236 "configure"
31012 +#include "confdefs.h"
31018 +#include <unistd.h>
31025 +#include <crypt.h>
31029 - for ac_i in $LIBXML_INCS; do
31032 - ac_ii=`echo $ac_i|cut -c 3-`
31034 - if test "$ac_ii" != "/usr/include"; then
31036 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
31040 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
31042 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
31043 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
31047 + char salt[15], answer[40];
31050 + salt[0]='$'; salt[1]='1'; salt[2]='$';
31051 + salt[3]='r'; salt[4]='a'; salt[5]='s';
31052 + salt[6]='m'; salt[7]='u'; salt[8]='s';
31053 + salt[9]='l'; salt[10]='e'; salt[11]='$';
31055 + strcpy(answer,salt);
31056 + strcat(answer,"rISCgZzpwk3UhDidwXvin0");
31057 + exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
31063 +if { (eval echo configure:90264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
31066 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
31067 + ac_cv_crypt_md5=yes
31070 + echo "configure: failed program was:" >&5
31071 + cat conftest.$ac_ext >&5
31074 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
31075 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
31076 - eval "INCLUDEPATH$unique=set"
31079 - INCLUDES="-I$ai_p $INCLUDES"
31081 - INCLUDES="$INCLUDES -I$ai_p"
31085 + ac_cv_crypt_md5=no
31097 +echo "$ac_t""$ac_cv_crypt_md5" 1>&6
31099 - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
31100 -echo "configure:83094: checking whether libxml build works" >&5
31101 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
31102 +echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
31103 +echo "configure:90285: checking for Blowfish crypt" >&5
31104 +if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then
31105 echo $ac_n "(cached) $ac_c" 1>&6
31111 - $SIMPLEXML_SHARED_LIBADD
31113 - if test "$cross_compiling" = yes; then
31116 +if test "$cross_compiling" = yes; then
31118 + ac_cv_crypt_blowfish=no
31121 cat > conftest.$ac_ext <<EOF
31122 -#line 83110 "configure"
31123 +#line 90296 "configure"
31124 #include "confdefs.h"
31127 +#include <unistd.h>
31131 +#include <crypt.h>
31136 + char salt[30], answer[70];
31138 - char xmlInitParser();
31144 + salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0';
31145 + strcat(salt,"rasmuslerd............");
31146 + strcpy(answer,salt);
31147 + strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra");
31148 + exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
31154 -if { (eval echo configure:83121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
31155 +if { (eval echo configure:90321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
31160 - php_cv_libxml_build_works=yes
31163 + ac_cv_crypt_blowfish=yes
31166 echo "configure: failed program was:" >&5
31167 cat conftest.$ac_ext >&5
31172 - echo "$ac_t""no" 1>&6
31173 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
31176 + ac_cv_crypt_blowfish=no
31186 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
31187 - if test "$php_cv_libxml_build_works" = "yes"; then
31188 - cat >> confdefs.h <<\EOF
31189 -#define HAVE_LIBXML 1
31191 +echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6
31195 - cat >> confdefs.h <<\EOF
31196 -#define HAVE_SIMPLEXML 1
31198 +echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6
31199 +echo "configure:90342: checking for SHA512 crypt" >&5
31200 +if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then
31201 + echo $ac_n "(cached) $ac_c" 1>&6
31204 +if test "$cross_compiling" = yes; then
31206 + ac_cv_crypt_SHA512=no
31209 - ext_builddir=ext/simplexml
31210 - ext_srcdir=$abs_srcdir/ext/simplexml
31212 + cat > conftest.$ac_ext <<EOF
31213 +#line 90353 "configure"
31214 +#include "confdefs.h"
31218 +#include <unistd.h>
31221 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
31222 - PHP_SIMPLEXML_SHARED=no
31224 +#include <crypt.h>
31229 + char salt[30], answer[80];
31231 + salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0';
31232 + strcpy(answer, salt);
31233 + strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu.");
31234 + exit (strcmp((char *)crypt("foo",salt),answer));
31240 +if { (eval echo configure:90377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
31243 - case ext/simplexml in
31244 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
31245 - /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31246 - *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31251 - b_c_pre=$php_c_pre
31252 - b_cxx_pre=$php_cxx_pre
31253 - b_c_meta=$php_c_meta
31254 - b_cxx_meta=$php_cxx_meta
31255 - b_c_post=$php_c_post
31256 - b_cxx_post=$php_cxx_post
31259 + ac_cv_crypt_SHA512=yes
31262 - for ac_src in simplexml.c sxe.c; do
31264 + echo "configure: failed program was:" >&5
31265 + cat conftest.$ac_ext >&5
31273 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
31274 + ac_cv_crypt_SHA512=no
31277 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31278 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31279 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31280 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
31286 - cat >>Makefile.objects<<EOF
31287 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
31293 +echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6
31295 - EXT_STATIC="$EXT_STATIC simplexml"
31296 - if test "$ext_shared" != "nocli"; then
31297 - EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml"
31300 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
31301 - PHP_SIMPLEXML_SHARED=yes
31303 - case ext/simplexml in
31304 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
31305 - /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31306 - *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31308 +echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6
31309 +echo "configure:90398: checking for SHA256 crypt" >&5
31310 +if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then
31311 + echo $ac_n "(cached) $ac_c" 1>&6
31314 +if test "$cross_compiling" = yes; then
31316 + ac_cv_crypt_SHA256=no
31318 - b_c_pre=$shared_c_pre
31319 - b_cxx_pre=$shared_cxx_pre
31320 - b_c_meta=$shared_c_meta
31321 - b_cxx_meta=$shared_cxx_meta
31322 - b_c_post=$shared_c_post
31323 - b_cxx_post=$shared_cxx_post
31327 + cat > conftest.$ac_ext <<EOF
31328 +#line 90409 "configure"
31329 +#include "confdefs.h"
31332 - for ac_src in simplexml.c sxe.c; do
31339 - shared_objects_simplexml="$shared_objects_simplexml $ac_bdir$ac_obj.lo"
31341 +#include <unistd.h>
31345 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31346 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31347 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31348 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
31351 +#include <crypt.h>
31354 - cat >>Makefile.objects<<EOF
31355 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
31359 + char salt[30], answer[80];
31360 + 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';
31362 + strcpy(answer, salt);
31363 + strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5");
31364 + exit (strcmp((char *)crypt("foo",salt),answer));
31372 - case $host_alias in
31375 - install_modules="install-modules"
31377 - case $host_alias in
31380 - 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'
31384 - link_cmd='$(LIBTOOL) --mode=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)'
31388 - link_cmd='$(LIBTOOL) --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)'
31391 +if { (eval echo configure:90433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
31394 + ac_cv_crypt_SHA256=yes
31396 - if test "x" = "xyes"; then
31397 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsimplexml.$suffix"
31399 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix"
31402 + echo "configure: failed program was:" >&5
31403 + cat conftest.$ac_ext >&5
31406 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml"
31407 + ac_cv_crypt_SHA256=no
31409 - cat >>Makefile.objects<<EOF
31410 -\$(phplibdir)/phpsimplexml.$suffix: $ext_builddir/phpsimplexml.$suffix
31411 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpsimplexml.$suffix \$(phplibdir)
31416 -$ext_builddir/phpsimplexml.$suffix: \$(shared_objects_simplexml) \$(PHPSIMPLEXML_SHARED_DEPENDENCIES)
31421 +echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6
31426 - install_modules="install-modules"
31428 - case $host_alias in
31431 - 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'
31435 - link_cmd='$(LIBTOOL) --mode=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)'
31439 - link_cmd='$(LIBTOOL) --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)'
31442 +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
31444 - if test "x" = "xyes"; then
31445 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/simplexml.$suffix"
31447 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/simplexml.$suffix"
31449 + echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6
31450 +echo "configure:90457: checking whether the compiler supports __alignof__" >&5
31451 +if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then
31452 + echo $ac_n "(cached) $ac_c" 1>&6
31455 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml"
31457 - cat >>Makefile.objects<<EOF
31458 -\$(phplibdir)/simplexml.$suffix: $ext_builddir/simplexml.$suffix
31459 - \$(LIBTOOL) --mode=install cp $ext_builddir/simplexml.$suffix \$(phplibdir)
31460 + cat > conftest.$ac_ext <<EOF
31461 +#line 90463 "configure"
31462 +#include "confdefs.h"
31464 -$ext_builddir/simplexml.$suffix: \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_DEPENDENCIES)
31469 + int align = __alignof__(int);
31473 +if { (eval echo configure:90473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
31476 + ac_cv_alignof_exists=yes
31479 + echo "configure: failed program was:" >&5
31480 + cat conftest.$ac_ext >&5
31483 + ac_cv_alignof_exists=no
31491 - cat >> confdefs.h <<EOF
31492 -#define COMPILE_DL_SIMPLEXML 1
31493 +echo "$ac_t""$ac_cv_alignof_exists" 1>&6
31494 + if test "$ac_cv_alignof_exists" = "yes"; then
31495 + cat >> confdefs.h <<\EOF
31496 +#define HAVE_ALIGNOF 1
31502 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
31503 - PHP_SIMPLEXML_SHARED=no
31504 - case "$PHP_SAPI" in
31507 + echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6
31508 +echo "configure:90498: checking whether the compiler supports aligned attribute" >&5
31509 +if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then
31510 + echo $ac_n "(cached) $ac_c" 1>&6
31513 - case ext/simplexml in
31514 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
31515 - /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31516 - *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31518 + cat > conftest.$ac_ext <<EOF
31519 +#line 90504 "configure"
31520 +#include "confdefs.h"
31525 + unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int))));
31529 +if { (eval echo configure:90514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
31532 + ac_cv_attribute_aligned=yes
31535 + echo "configure: failed program was:" >&5
31536 + cat conftest.$ac_ext >&5
31539 + ac_cv_attribute_aligned=no
31545 - b_c_pre=$php_c_pre
31546 - b_cxx_pre=$php_cxx_pre
31547 - b_c_meta=$php_c_meta
31548 - b_cxx_meta=$php_cxx_meta
31549 - b_c_post=$php_c_post
31550 - b_cxx_post=$php_cxx_post
31552 +echo "$ac_t""$ac_cv_attribute_aligned" 1>&6
31553 + if test "$ac_cv_attribute_aligned" = "yes"; then
31554 + cat >> confdefs.h <<\EOF
31555 +#define HAVE_ATTRIBUTE_ALIGNED 1
31561 + cat >> confdefs.h <<EOF
31562 +#define PHP_USE_PHP_CRYPT_R 1
31566 - for ac_src in simplexml.c sxe.c; do
31573 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
31574 + cat >> confdefs.h <<EOF
31575 +#define PHP_STD_DES_CRYPT 1
31579 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31580 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31581 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31582 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
31584 + cat >> confdefs.h <<EOF
31585 +#define PHP_BLOWFISH_CRYPT 1
31588 + cat >> confdefs.h <<EOF
31589 +#define PHP_EXT_DES_CRYPT 1
31592 + cat >> confdefs.h <<EOF
31593 +#define PHP_MD5_CRYPT 1
31596 - cat >>Makefile.objects<<EOF
31597 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
31599 + cat >> confdefs.h <<EOF
31600 +#define PHP_SHA512_CRYPT 1
31603 + cat >> confdefs.h <<EOF
31604 +#define PHP_SHA256_CRYPT 1
31609 - EXT_STATIC="$EXT_STATIC simplexml"
31614 - case ext/simplexml in
31616 + case ext/standard in
31617 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
31618 - /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31619 - *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31620 + /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
31621 + *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
31625 @@ -83408,20 +90584,20 @@ EOF
31629 - for ac_src in simplexml.c sxe.c; do
31630 + for ac_src in crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c; do
31637 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
31638 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
31641 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31642 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31643 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
31644 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
31645 + *.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" ;;
31646 + *.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" ;;
31647 + *.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" ;;
31648 + *.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" ;;
31651 cat >>Makefile.objects<<EOF
31652 @@ -83431,850 +90607,533 @@ EOF
31658 - EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml"
31660 + if test "$ac_cv_crypt_des" = "yes"; then
31669 - BUILD_DIR="$BUILD_DIR $ext_builddir"
31672 + cat >> confdefs.h <<EOF
31673 +#define PHP_STD_DES_CRYPT $ac_result
31676 - if test "$ext_builddir" = "."; then
31677 - PHP_PECL_EXTENSION=simplexml
31679 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
31681 + if test "$ac_cv_crypt_blowfish" = "yes"; then
31683 + ac_crypt_blowfish=1
31686 + ac_crypt_blowfish=0
31688 + cat >> confdefs.h <<EOF
31689 +#define PHP_BLOWFISH_CRYPT $ac_result
31693 - PHP_VAR_SUBST="$PHP_VAR_SUBST SIMPLEXML_SHARED_LIBADD"
31697 - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
31700 - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
31702 + if test "$ac_cv_crypt_ext_des" = "yes"; then
31709 + cat >> confdefs.h <<EOF
31710 +#define PHP_EXT_DES_CRYPT $ac_result
31714 - am_i_shared=$PHP_SIMPLEXML_SHARED
31715 - is_it_shared=$PHP_LIBXML_SHARED
31716 - is_it_enabled=$PHP_LIBXML
31717 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
31718 - { echo "configure: error:
31719 -You've configured extension simplexml to build statically, but it
31720 -depends on extension libxml, which you've configured to build shared.
31721 -You either need to build simplexml shared or build libxml statically for the
31722 -build to be successful.
31725 - if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
31726 - { echo "configure: error:
31727 -You've configured extension simplexml, which depends on extension libxml,
31728 -but you've either not enabled libxml, or have disabled it.
31731 + if test "$ac_cv_crypt_md5" = "yes"; then
31738 + cat >> confdefs.h <<EOF
31739 +#define PHP_MD5_CRYPT $ac_result
31743 - am_i_shared=$PHP_SIMPLEXML_SHARED
31744 - is_it_shared=$PHP_SPL_SHARED
31745 - is_it_enabled=$PHP_SPL
31746 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
31747 - { echo "configure: error:
31748 -You've configured extension simplexml to build statically, but it
31749 -depends on extension spl, which you've configured to build shared.
31750 -You either need to build simplexml shared or build spl statically for the
31751 -build to be successful.
31754 - if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
31755 - { echo "configure: error:
31756 -You've configured extension simplexml, which depends on extension spl,
31757 -but you've either not enabled spl, or have disabled it.
31759 + if test "$ac_cv_crypt_sha512" = "yes"; then
31761 + ac_crypt_sha512=1
31764 + ac_crypt_sha512=0
31768 + cat >> confdefs.h <<EOF
31769 +#define PHP_SHA512_CRYPT $ac_result
31773 + if test "$ac_cv_crypt_sha256" = "yes"; then
31775 + ac_crypt_sha256=1
31778 + ac_crypt_sha256=0
31780 + cat >> confdefs.h <<EOF
31781 +#define PHP_SHA256_CRYPT $ac_result
31786 -echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
31787 -echo "configure:83509: checking for SNMP support" >&5
31788 -# Check whether --with-snmp or --without-snmp was given.
31789 -if test "${with_snmp+set}" = set; then
31790 - withval="$with_snmp"
31791 - PHP_SNMP=$withval
31795 - test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL
31796 + cat >> confdefs.h <<EOF
31797 +#define PHP_USE_PHP_CRYPT_R 0
31802 +for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy
31804 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
31805 +echo "configure:90693: checking for $ac_func" >&5
31806 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
31807 + echo $ac_n "(cached) $ac_c" 1>&6
31809 + cat > conftest.$ac_ext <<EOF
31810 +#line 90698 "configure"
31811 +#include "confdefs.h"
31812 +/* System header to define __stub macros and hopefully few prototypes,
31813 + which can conflict with char $ac_func(); below. */
31814 +#include <assert.h>
31815 +/* Override any gcc2 internal prototype to avoid an error. */
31816 +/* We use char because int might match the return type of a gcc2
31817 + builtin and then its argument prototype would still apply. */
31822 -ext_output="yes, shared"
31826 - PHP_SNMP=`echo "$PHP_SNMP"|$SED 's/^shared,//'`
31843 -echo "$ac_t""$ext_output" 1>&6
31849 -php_with_openssl_dir=no
31850 +/* The GNU C library defines this for functions which it implements
31851 + to always fail with ENOSYS. Some functions are actually named
31852 + something starting with __ and the normal name is an alias. */
31853 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
31859 -echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6
31860 -echo "configure:83553: checking OpenSSL dir for SNMP" >&5
31861 -# Check whether --with-openssl-dir or --without-openssl-dir was given.
31862 -if test "${with_openssl_dir+set}" = set; then
31863 - withval="$with_openssl_dir"
31864 - PHP_OPENSSL_DIR=$withval
31867 +if { (eval echo configure:90721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
31869 + eval "ac_cv_func_$ac_func=yes"
31872 - PHP_OPENSSL_DIR=no
31875 + echo "configure: failed program was:" >&5
31876 + cat conftest.$ac_ext >&5
31878 + eval "ac_cv_func_$ac_func=no"
31884 -ext_output=$PHP_OPENSSL_DIR
31885 -echo "$ac_t""$ext_output" 1>&6
31891 -php_enable_ucd_snmp_hack=no
31893 -echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
31894 -echo "configure:83576: checking whether to enable UCD SNMP hack" >&5
31895 -# Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given.
31896 -if test "${enable_ucd_snmp_hack+set}" = set; then
31897 - enableval="$enable_ucd_snmp_hack"
31898 - PHP_UCD_SNMP_HACK=$enableval
31899 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
31900 + echo "$ac_t""yes" 1>&6
31901 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
31902 + cat >> confdefs.h <<EOF
31903 +#define $ac_tr_func 1
31908 - PHP_UCD_SNMP_HACK=no
31911 + echo "$ac_t""no" 1>&6
31916 -ext_output=$PHP_UCD_SNMP_HACK
31917 -echo "$ac_t""$ext_output" 1>&6
31922 -if test "$PHP_SNMP" != "no"; then
31924 - if test "$PHP_SNMP" = "yes"; then
31925 - # Extract the first word of "net-snmp-config", so it can be a program name with args.
31926 -set dummy net-snmp-config; ac_word=$2
31927 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
31928 -echo "configure:83601: checking for $ac_word" >&5
31929 -if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then
31930 +echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
31931 +echo "configure:90746: checking for working fnmatch" >&5
31932 +if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then
31933 echo $ac_n "(cached) $ac_c" 1>&6
31935 - case "$SNMP_CONFIG" in
31937 - ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
31940 - ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a dos path.
31943 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
31944 - ac_dummy="/usr/local/bin:$PATH"
31945 - for ac_dir in $ac_dummy; do
31946 - test -z "$ac_dir" && ac_dir=.
31947 - if test -f $ac_dir/$ac_word; then
31948 - ac_cv_path_SNMP_CONFIG="$ac_dir/$ac_word"
31952 - IFS="$ac_save_ifs"
31956 -SNMP_CONFIG="$ac_cv_path_SNMP_CONFIG"
31957 -if test -n "$SNMP_CONFIG"; then
31958 - echo "$ac_t""$SNMP_CONFIG" 1>&6
31959 + # Some versions of Solaris or SCO have a broken fnmatch function.
31960 +# So we run a test program. If we are cross-compiling, take no chance.
31961 +# Thanks to John Oleynick and Franc,ois Pinard for this test.
31962 +if test "$cross_compiling" = yes; then
31963 + ac_cv_func_fnmatch_works=no
31965 - echo "$ac_t""no" 1>&6
31966 + cat > conftest.$ac_ext <<EOF
31967 +#line 90757 "configure"
31968 +#include "confdefs.h"
31969 +main() { exit (fnmatch ("a*", "abc", 0) != 0); }
31971 +if { (eval echo configure:90761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
31973 + ac_cv_func_fnmatch_works=yes
31975 + echo "configure: failed program was:" >&5
31976 + cat conftest.$ac_ext >&5
31978 + ac_cv_func_fnmatch_works=no
31984 - SNMP_CONFIG="$PHP_SNMP/bin/net-snmp-config"
31987 - if test -x "$SNMP_CONFIG"; then
31988 - SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs`
31989 - SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`"
31990 - SNMP_PREFIX=`$SNMP_CONFIG --prefix`
31992 - if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
31994 - if test "${SNMP_PREFIX}/include" != "/usr/include"; then
31996 - if test -z "${SNMP_PREFIX}/include" || echo "${SNMP_PREFIX}/include" | grep '^/' >/dev/null ; then
31997 - ai_p=${SNMP_PREFIX}/include
32000 - ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`"
32002 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
32003 - ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`"
32008 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
32010 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
32011 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
32012 - eval "INCLUDEPATH$unique=set"
32015 - INCLUDES="-I$ai_p $INCLUDES"
32017 - INCLUDES="$INCLUDES -I$ai_p"
32025 - for ac_i in $SNMP_LIBS; do
32028 - if test "$ext_shared" = "yes"; then
32029 - SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread"
32033 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
32035 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
32036 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
32037 - eval "EXTRA_LDFLAGS$unique=set"
32038 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
32044 - ac_ii=`echo $ac_i|cut -c 3-`
32048 - c|c_r|pthread*) ;;
32050 - if test "$ext_shared" = "yes"; then
32051 - SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii"
32056 - c|c_r|pthread*) ;;
32058 - LIBS="$LIBS -l$ac_ii"
32070 - ac_ii=`echo $ac_i|cut -c 3-`
32072 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
32074 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
32078 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
32080 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
32081 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
32085 - if test "$ext_shared" = "yes"; then
32086 - SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
32087 - test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
32092 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
32094 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
32095 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
32096 - eval "LIBPATH$unique=set"
32098 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
32099 - LDFLAGS="$LDFLAGS -L$ai_p"
32100 - PHP_RPATHS="$PHP_RPATHS $ai_p"
32114 - cat >> confdefs.h <<\EOF
32115 -#define HAVE_NET_SNMP 1
32116 +echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6
32117 +if test $ac_cv_func_fnmatch_works = yes; then
32118 + cat >> confdefs.h <<\EOF
32119 +#define HAVE_FNMATCH 1
32122 - SNMP_LIBNAME=netsnmp
32124 - { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; }
32129 - if test "$PHP_SNMP" = "yes"; then
32130 - for i in /usr/include /usr/local/include; do
32131 - test -f $i/snmp.h && SNMP_INCDIR=$i
32132 - test -f $i/ucd-snmp/snmp.h && SNMP_INCDIR=$i/ucd-snmp
32133 - test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp
32134 - test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
32136 - for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do
32137 - test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i
32140 - SNMP_INCDIR=$PHP_SNMP/include
32141 - test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp
32142 - SNMP_LIBDIR=$PHP_SNMP/lib
32147 - if test -z "$SNMP_INCDIR"; then
32148 - { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; }
32149 - elif test -z "$SNMP_LIBDIR"; then
32150 - { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; }
32153 - old_CPPFLAGS=$CPPFLAGS
32154 - CPPFLAGS=-I$SNMP_INCDIR
32155 - for ac_hdr in default_store.h
32156 +for ac_func in fork CreateProcess
32158 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
32159 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
32160 -echo "configure:83802: checking for $ac_hdr" >&5
32161 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
32162 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
32163 +echo "configure:90788: checking for $ac_func" >&5
32164 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
32165 echo $ac_n "(cached) $ac_c" 1>&6
32167 cat > conftest.$ac_ext <<EOF
32168 -#line 83807 "configure"
32169 +#line 90793 "configure"
32170 #include "confdefs.h"
32171 -#include <$ac_hdr>
32172 +/* System header to define __stub macros and hopefully few prototypes,
32173 + which can conflict with char $ac_func(); below. */
32174 +#include <assert.h>
32175 +/* Override any gcc2 internal prototype to avoid an error. */
32176 +/* We use char because int might match the return type of a gcc2
32177 + builtin and then its argument prototype would still apply. */
32182 +/* The GNU C library defines this for functions which it implements
32183 + to always fail with ENOSYS. Some functions are actually named
32184 + something starting with __ and the normal name is an alias. */
32185 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
32193 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
32194 -{ (eval echo configure:83812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
32195 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
32196 -if test -z "$ac_err"; then
32197 +if { (eval echo configure:90816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32199 - eval "ac_cv_header_$ac_safe=yes"
32200 + eval "ac_cv_func_$ac_func=yes"
32202 - echo "$ac_err" >&5
32203 echo "configure: failed program was:" >&5
32204 cat conftest.$ac_ext >&5
32206 - eval "ac_cv_header_$ac_safe=no"
32207 + eval "ac_cv_func_$ac_func=no"
32211 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
32213 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
32214 echo "$ac_t""yes" 1>&6
32215 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
32216 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
32217 cat >> confdefs.h <<EOF
32218 -#define $ac_tr_hdr 1
32219 +#define $ac_tr_func 1
32222 + php_can_support_proc_open=yes
32226 echo "$ac_t""no" 1>&6
32227 +php_can_support_proc_open=no
32232 - if test "$ac_cv_header_default_store_h" = "yes"; then
32233 - echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6
32234 -echo "configure:83840: checking for OpenSSL support in SNMP libraries" >&5
32235 - cat > conftest.$ac_ext <<EOF
32236 -#line 83842 "configure"
32237 +echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6
32238 +echo "configure:90846: checking if your OS can spawn processes with inherited handles" >&5
32239 +if test "$php_can_support_proc_open" = "yes"; then
32240 + echo "$ac_t""yes" 1>&6
32241 + cat >> confdefs.h <<\EOF
32242 +#define PHP_CAN_SUPPORT_PROC_OPEN 1
32246 + echo "$ac_t""no" 1>&6
32249 +if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then
32250 + cat >> confdefs.h <<\EOF
32251 +#define ENABLE_CHROOT_FUNC 1
32257 + unset ac_cv_func_res_nsearch
32258 + unset ac_cv_func___res_nsearch
32261 + echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6
32262 +echo "configure:90870: checking for res_nsearch" >&5
32263 +if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then
32264 + echo $ac_n "(cached) $ac_c" 1>&6
32266 + cat > conftest.$ac_ext <<EOF
32267 +#line 90875 "configure"
32268 #include "confdefs.h"
32269 +/* System header to define __stub macros and hopefully few prototypes,
32270 + which can conflict with char res_nsearch(); below. */
32271 +#include <assert.h>
32272 +/* Override any gcc2 internal prototype to avoid an error. */
32273 +/* We use char because int might match the return type of a gcc2
32274 + builtin and then its argument prototype would still apply. */
32275 +char res_nsearch();
32277 -#include <ucd-snmp-config.h>
32282 +/* The GNU C library defines this for functions which it implements
32283 + to always fail with ENOSYS. Some functions are actually named
32284 + something starting with __ and the normal name is an alias. */
32285 +#if defined (__stub_res_nsearch) || defined (__stub___res_nsearch)
32294 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
32295 - egrep "yes" >/dev/null 2>&1; then
32296 +if { (eval echo configure:90898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32301 + eval "ac_cv_func_res_nsearch=yes"
32303 + echo "configure: failed program was:" >&5
32304 + cat conftest.$ac_ext >&5
32309 + eval "ac_cv_func_res_nsearch=no"
32315 - CPPFLAGS=$old_CPPFLAGS
32316 - echo "$ac_t""$SNMP_SSL" 1>&6
32318 - if test "$SNMP_SSL" = "yes"; then
32319 - if test "$PHP_OPENSSL_DIR" != "no"; then
32320 - PHP_OPENSSL=$PHP_OPENSSL_DIR
32323 - if test "$PHP_OPENSSL" = "no"; then
32324 - { echo "configure: error: The UCD-SNMP in this system is built with SSL support.
32326 - Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; }
32330 - unset OPENSSL_INCDIR
32331 - unset OPENSSL_LIBDIR
32332 +if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then
32333 + echo "$ac_t""yes" 1>&6
32336 + echo "$ac_t""no" 1>&6
32337 + echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6
32338 +echo "configure:90916: checking for __res_nsearch" >&5
32339 +if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then
32340 + echo $ac_n "(cached) $ac_c" 1>&6
32342 + cat > conftest.$ac_ext <<EOF
32343 +#line 90921 "configure"
32344 +#include "confdefs.h"
32345 +/* System header to define __stub macros and hopefully few prototypes,
32346 + which can conflict with char __res_nsearch(); below. */
32347 +#include <assert.h>
32348 +/* Override any gcc2 internal prototype to avoid an error. */
32349 +/* We use char because int might match the return type of a gcc2
32350 + builtin and then its argument prototype would still apply. */
32351 +char __res_nsearch();
32353 - test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
32354 - test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
32357 - if test "$PHP_OPENSSL" != "no"; then
32358 - PHP_OPENSSL_DIR=$PHP_OPENSSL
32359 - elif test "$PHP_IMAP_SSL" != "no"; then
32360 - PHP_OPENSSL_DIR=$PHP_IMAP_SSL
32362 +/* The GNU C library defines this for functions which it implements
32363 + to always fail with ENOSYS. Some functions are actually named
32364 + something starting with __ and the normal name is an alias. */
32365 +#if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch)
32371 - if test -z "$PKG_CONFIG"; then
32372 - # Extract the first word of "pkg-config", so it can be a program name with args.
32373 -set dummy pkg-config; ac_word=$2
32374 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
32375 -echo "configure:83897: checking for $ac_word" >&5
32376 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
32377 - echo $ac_n "(cached) $ac_c" 1>&6
32380 +if { (eval echo configure:90944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32382 + eval "ac_cv_func___res_nsearch=yes"
32384 - case "$PKG_CONFIG" in
32386 - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
32389 - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
32392 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
32394 - for ac_dir in $ac_dummy; do
32395 - test -z "$ac_dir" && ac_dir=.
32396 - if test -f $ac_dir/$ac_word; then
32397 - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
32401 - IFS="$ac_save_ifs"
32402 - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
32405 + echo "configure: failed program was:" >&5
32406 + cat conftest.$ac_ext >&5
32408 + eval "ac_cv_func___res_nsearch=no"
32410 -PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
32411 -if test -n "$PKG_CONFIG"; then
32412 - echo "$ac_t""$PKG_CONFIG" 1>&6
32416 +if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then
32417 + echo "$ac_t""yes" 1>&6
32420 echo "$ac_t""no" 1>&6
32428 - if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
32429 - if $PKG_CONFIG --atleast-version=0.9.6 openssl; then
32430 - found_openssl=yes
32431 - OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
32432 - OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
32433 - OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
32435 - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
32438 - if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then
32440 - for ac_i in $OPENSSL_LIBS; do
32443 - if test "$ext_shared" = "yes"; then
32444 - SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread"
32448 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
32450 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
32451 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
32452 - eval "EXTRA_LDFLAGS$unique=set"
32453 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
32459 - ac_ii=`echo $ac_i|cut -c 3-`
32463 - c|c_r|pthread*) ;;
32465 - if test "$ext_shared" = "yes"; then
32466 - SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii"
32471 - c|c_r|pthread*) ;;
32473 - LIBS="$LIBS -l$ac_ii"
32485 - ac_ii=`echo $ac_i|cut -c 3-`
32487 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
32489 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
32493 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
32495 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
32496 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
32500 - if test "$ext_shared" = "yes"; then
32501 - SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
32502 - test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
32507 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
32509 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
32510 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
32511 - eval "LIBPATH$unique=set"
32513 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
32514 - LDFLAGS="$LDFLAGS -L$ai_p"
32515 - PHP_RPATHS="$PHP_RPATHS $ai_p"
32529 - for ac_i in $OPENSSL_INCS; do
32532 - ac_ii=`echo $ac_i|cut -c 3-`
32534 - if test "$ac_ii" != "/usr/include"; then
32536 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
32540 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
32542 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
32543 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
32547 + cat >> confdefs.h <<\EOF
32548 +#define HAVE_RES_NSEARCH 1
32553 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
32554 + ac_cv_func_res_nsearch=yes
32557 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
32558 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
32559 - eval "INCLUDEPATH$unique=set"
32562 - INCLUDES="-I$ai_p $INCLUDES"
32564 - INCLUDES="$INCLUDES -I$ai_p"
32578 - if test "$found_openssl" = "no"; then
32581 - if test "$PHP_OPENSSL_DIR" = "yes"; then
32582 - PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
32585 - for i in $PHP_OPENSSL_DIR; do
32586 - if test -r $i/include/openssl/evp.h; then
32587 - OPENSSL_INCDIR=$i/include
32589 - if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then
32590 - OPENSSL_LIBDIR=$i/$PHP_LIBDIR
32592 - test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
32594 + unset ac_cv_lib_resolv_res_nsearch
32595 + unset ac_cv_lib_resolv___res_nsearch
32597 + echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6
32598 +echo "configure:90982: checking for res_nsearch in -lresolv" >&5
32599 +ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'`
32600 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
32601 + echo $ac_n "(cached) $ac_c" 1>&6
32603 + ac_save_LIBS="$LIBS"
32604 +LIBS="-lresolv $LIBS"
32605 +cat > conftest.$ac_ext <<EOF
32606 +#line 90990 "configure"
32607 +#include "confdefs.h"
32608 +/* Override any gcc2 internal prototype to avoid an error. */
32609 +/* We use char because int might match the return type of a gcc2
32610 + builtin and then its argument prototype would still apply. */
32611 +char res_nsearch();
32613 - if test -z "$OPENSSL_INCDIR"; then
32614 - { echo "configure: error: Cannot find OpenSSL's <evp.h>" 1>&2; exit 1; }
32620 +if { (eval echo configure:91001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32622 + eval "ac_cv_lib_$ac_lib_var=yes"
32624 + echo "configure: failed program was:" >&5
32625 + cat conftest.$ac_ext >&5
32627 + eval "ac_cv_lib_$ac_lib_var=no"
32630 +LIBS="$ac_save_LIBS"
32632 - if test -z "$OPENSSL_LIBDIR"; then
32633 - { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; }
32636 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
32637 + echo "$ac_t""yes" 1>&6
32640 + echo "$ac_t""no" 1>&6
32642 - old_CPPFLAGS=$CPPFLAGS
32643 - CPPFLAGS=-I$OPENSSL_INCDIR
32644 - echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
32645 -echo "configure:84102: checking for OpenSSL version" >&5
32646 - cat > conftest.$ac_ext <<EOF
32647 -#line 84104 "configure"
32648 + echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6
32649 +echo "configure:91021: checking for __res_nsearch in -lresolv" >&5
32650 +ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'`
32651 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
32652 + echo $ac_n "(cached) $ac_c" 1>&6
32654 + ac_save_LIBS="$LIBS"
32655 +LIBS="-lresolv $LIBS"
32656 +cat > conftest.$ac_ext <<EOF
32657 +#line 91029 "configure"
32658 #include "confdefs.h"
32659 +/* Override any gcc2 internal prototype to avoid an error. */
32660 +/* We use char because int might match the return type of a gcc2
32661 + builtin and then its argument prototype would still apply. */
32662 +char __res_nsearch();
32664 -#include <openssl/opensslv.h>
32665 -#if OPENSSL_VERSION_NUMBER >= 0x0090600fL
32673 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
32674 - egrep "yes" >/dev/null 2>&1; then
32675 +if { (eval echo configure:91040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32678 - echo "$ac_t"">= 0.9.6" 1>&6
32680 + eval "ac_cv_lib_$ac_lib_var=yes"
32682 + echo "configure: failed program was:" >&5
32683 + cat conftest.$ac_ext >&5
32686 - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; }
32688 + eval "ac_cv_lib_$ac_lib_var=no"
32691 +LIBS="$ac_save_LIBS"
32693 - CPPFLAGS=$old_CPPFLAGS
32696 - if test "$OPENSSL_INCDIR" != "/usr/include"; then
32698 - if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then
32699 - ai_p=$OPENSSL_INCDIR
32702 - ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
32704 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
32705 - ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`"
32708 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
32709 + echo "$ac_t""yes" 1>&6
32712 + echo "$ac_t""no" 1>&6
32718 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
32720 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
32721 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
32722 - eval "INCLUDEPATH$unique=set"
32725 - INCLUDES="-I$ai_p $INCLUDES"
32727 - INCLUDES="$INCLUDES -I$ai_p"
32737 - save_old_LDFLAGS=$LDFLAGS
32739 - -L$OPENSSL_LIBDIR
32742 - save_ext_shared=$ext_shared
32745 - for ac_i in $ac_stuff; do
32748 - if test "$ext_shared" = "yes"; then
32749 - LDFLAGS="$LDFLAGS -pthread"
32753 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
32755 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
32756 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
32757 - eval "EXTRA_LDFLAGS$unique=set"
32758 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
32759 + if test "$found" = "yes"; then
32761 + LIBS="$LIBS -lresolv"
32762 + if test "$cross_compiling" = yes; then
32765 + cat > conftest.$ac_ext <<EOF
32766 +#line 91072 "configure"
32767 +#include "confdefs.h"
32768 +main() { return (0); }
32770 +if { (eval echo configure:91076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
32774 + echo "configure: failed program was:" >&5
32775 + cat conftest.$ac_ext >&5
32788 - ac_ii=`echo $ac_i|cut -c 3-`
32792 - c|c_r|pthread*) ;;
32794 - if test "$ext_shared" = "yes"; then
32795 - LDFLAGS="$LDFLAGS -l$ac_ii"
32798 + if test "$found" = "yes"; then
32805 - LIBS="$LIBS -l$ac_ii"
32806 + LIBS="-lresolv $LIBS"
32814 + cat >> confdefs.h <<\EOF
32815 +#define HAVE_RES_NSEARCH 1
32818 + cat >> confdefs.h <<\EOF
32819 +#define HAVE_LIBRESOLV 1
32824 - ac_ii=`echo $ac_i|cut -c 3-`
32826 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
32828 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
32830 + ac_cv_func_res_nsearch=yes
32833 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
32835 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
32836 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
32840 - if test "$ext_shared" = "yes"; then
32841 - LDFLAGS="-L$ai_p $LDFLAGS"
32842 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
32847 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
32849 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
32850 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
32851 - eval "LIBPATH$unique=set"
32853 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
32854 - LDFLAGS="$LDFLAGS -L$ai_p"
32855 - PHP_RPATHS="$PHP_RPATHS $ai_p"
32868 - echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
32869 -echo "configure:84259: checking for CRYPTO_free in -lcrypto" >&5
32870 -ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
32871 + unset ac_cv_lib_bind_res_nsearch
32872 + unset ac_cv_lib_bind___res_nsearch
32874 + echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6
32875 +echo "configure:91118: checking for res_nsearch in -lbind" >&5
32876 +ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'`
32877 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
32878 echo $ac_n "(cached) $ac_c" 1>&6
32880 ac_save_LIBS="$LIBS"
32881 -LIBS="-lcrypto $LIBS"
32882 +LIBS="-lbind $LIBS"
32883 cat > conftest.$ac_ext <<EOF
32884 -#line 84267 "configure"
32885 +#line 91126 "configure"
32886 #include "confdefs.h"
32887 /* Override any gcc2 internal prototype to avoid an error. */
32888 /* We use char because int might match the return type of a gcc2
32889 builtin and then its argument prototype would still apply. */
32890 -char CRYPTO_free();
32891 +char res_nsearch();
32898 -if { (eval echo configure:84278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32899 +if { (eval echo configure:91137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32901 eval "ac_cv_lib_$ac_lib_var=yes"
32903 @@ -84289,168 +91148,167 @@ LIBS="$ac_save_LIBS"
32905 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
32906 echo "$ac_t""yes" 1>&6
32908 - LDFLAGS=$save_old_LDFLAGS
32909 - ext_shared=$save_ext_shared
32914 - c|c_r|pthread*) ;;
32916 - if test "$ext_shared" = "yes"; then
32917 - SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD"
32922 - c|c_r|pthread*) ;;
32924 - LIBS="-lcrypto $LIBS"
32930 + echo "$ac_t""no" 1>&6
32935 + echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6
32936 +echo "configure:91157: checking for __res_nsearch in -lbind" >&5
32937 +ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'`
32938 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
32939 + echo $ac_n "(cached) $ac_c" 1>&6
32941 + ac_save_LIBS="$LIBS"
32942 +LIBS="-lbind $LIBS"
32943 +cat > conftest.$ac_ext <<EOF
32944 +#line 91165 "configure"
32945 +#include "confdefs.h"
32946 +/* Override any gcc2 internal prototype to avoid an error. */
32947 +/* We use char because int might match the return type of a gcc2
32948 + builtin and then its argument prototype would still apply. */
32949 +char __res_nsearch();
32955 +if { (eval echo configure:91176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
32957 + eval "ac_cv_lib_$ac_lib_var=yes"
32959 + echo "configure: failed program was:" >&5
32960 + cat conftest.$ac_ext >&5
32962 + eval "ac_cv_lib_$ac_lib_var=no"
32965 +LIBS="$ac_save_LIBS"
32970 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
32971 + echo "$ac_t""yes" 1>&6
32974 echo "$ac_t""no" 1>&6
32978 - LDFLAGS=$save_old_LDFLAGS
32979 - ext_shared=$save_ext_shared
32980 - unset ac_cv_lib_crypto_CRYPTO_free
32982 - { echo "configure: error: libcrypto not found!" 1>&2; exit 1; }
32989 - LIBS="$LIBS -lcrypto"
32991 - save_old_LDFLAGS=$LDFLAGS
32993 - -L$OPENSSL_LIBDIR
32996 - save_ext_shared=$ext_shared
32999 - for ac_i in $ac_stuff; do
33002 - if test "$ext_shared" = "yes"; then
33003 - LDFLAGS="$LDFLAGS -pthread"
33007 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
33009 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
33010 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
33011 - eval "EXTRA_LDFLAGS$unique=set"
33012 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
33013 + if test "$found" = "yes"; then
33015 + LIBS="$LIBS -lbind"
33016 + if test "$cross_compiling" = yes; then
33019 + cat > conftest.$ac_ext <<EOF
33020 +#line 91208 "configure"
33021 +#include "confdefs.h"
33022 +main() { return (0); }
33024 +if { (eval echo configure:91212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
33028 + echo "configure: failed program was:" >&5
33029 + cat conftest.$ac_ext >&5
33042 - ac_ii=`echo $ac_i|cut -c 3-`
33046 - c|c_r|pthread*) ;;
33048 - if test "$ext_shared" = "yes"; then
33049 - LDFLAGS="$LDFLAGS -l$ac_ii"
33052 + if test "$found" = "yes"; then
33059 - LIBS="$LIBS -l$ac_ii"
33060 + LIBS="-lbind $LIBS"
33068 + cat >> confdefs.h <<\EOF
33069 +#define HAVE_RES_NSEARCH 1
33072 + cat >> confdefs.h <<\EOF
33073 +#define HAVE_LIBBIND 1
33078 - ac_ii=`echo $ac_i|cut -c 3-`
33080 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
33082 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
33084 + ac_cv_func_res_nsearch=yes
33087 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
33089 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
33090 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
33094 - if test "$ext_shared" = "yes"; then
33095 - LDFLAGS="-L$ai_p $LDFLAGS"
33096 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
33101 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
33103 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
33104 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
33105 - eval "LIBPATH$unique=set"
33107 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
33108 - LDFLAGS="$LDFLAGS -L$ai_p"
33109 - PHP_RPATHS="$PHP_RPATHS $ai_p"
33113 + unset ac_cv_lib_socket_res_nsearch
33114 + unset ac_cv_lib_socket___res_nsearch
33116 + echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6
33117 +echo "configure:91254: checking for res_nsearch in -lsocket" >&5
33118 +ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'`
33119 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33120 + echo $ac_n "(cached) $ac_c" 1>&6
33122 + ac_save_LIBS="$LIBS"
33123 +LIBS="-lsocket $LIBS"
33124 +cat > conftest.$ac_ext <<EOF
33125 +#line 91262 "configure"
33126 +#include "confdefs.h"
33127 +/* Override any gcc2 internal prototype to avoid an error. */
33128 +/* We use char because int might match the return type of a gcc2
33129 + builtin and then its argument prototype would still apply. */
33130 +char res_nsearch();
33139 +if { (eval echo configure:91273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33141 + eval "ac_cv_lib_$ac_lib_var=yes"
33143 + echo "configure: failed program was:" >&5
33144 + cat conftest.$ac_ext >&5
33146 + eval "ac_cv_lib_$ac_lib_var=no"
33149 +LIBS="$ac_save_LIBS"
33155 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
33156 + echo "$ac_t""yes" 1>&6
33159 + echo "$ac_t""no" 1>&6
33161 - echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
33162 -echo "configure:84435: checking for SSL_CTX_set_ssl_version in -lssl" >&5
33163 -ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
33164 + echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6
33165 +echo "configure:91293: checking for __res_nsearch in -lsocket" >&5
33166 +ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'`
33167 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33168 echo $ac_n "(cached) $ac_c" 1>&6
33170 ac_save_LIBS="$LIBS"
33171 -LIBS="-lssl $LIBS"
33172 +LIBS="-lsocket $LIBS"
33173 cat > conftest.$ac_ext <<EOF
33174 -#line 84443 "configure"
33175 +#line 91301 "configure"
33176 #include "confdefs.h"
33177 /* Override any gcc2 internal prototype to avoid an error. */
33178 /* We use char because int might match the return type of a gcc2
33179 builtin and then its argument prototype would still apply. */
33180 -char SSL_CTX_set_ssl_version();
33181 +char __res_nsearch();
33184 -SSL_CTX_set_ssl_version()
33188 -if { (eval echo configure:84454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33189 +if { (eval echo configure:91312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33191 eval "ac_cv_lib_$ac_lib_var=yes"
33193 @@ -84465,147 +91323,216 @@ LIBS="$ac_save_LIBS"
33195 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
33196 echo "$ac_t""yes" 1>&6
33198 - LDFLAGS=$save_old_LDFLAGS
33199 - ext_shared=$save_ext_shared
33201 - found_openssl=yes
33206 echo "$ac_t""no" 1>&6
33208 - LDFLAGS=$save_old_LDFLAGS
33209 - ext_shared=$save_ext_shared
33210 - unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version
33212 - { echo "configure: error: libssl not found!" 1>&2; exit 1; }
33222 - c|c_r|pthread*) ;;
33224 - if test "$ext_shared" = "yes"; then
33225 - SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD"
33230 - c|c_r|pthread*) ;;
33232 - LIBS="-lssl $LIBS"
33241 + if test "$found" = "yes"; then
33243 + LIBS="$LIBS -lsocket"
33244 + if test "$cross_compiling" = yes; then
33247 + cat > conftest.$ac_ext <<EOF
33248 +#line 91344 "configure"
33249 +#include "confdefs.h"
33250 +main() { return (0); }
33252 +if { (eval echo configure:91348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
33256 + echo "configure: failed program was:" >&5
33257 + cat conftest.$ac_ext >&5
33267 + if test "$found" = "yes"; then
33271 - c|c_r|pthread*) ;;
33273 - if test "$ext_shared" = "yes"; then
33274 - SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD"
33282 - LIBS="-lcrypto $LIBS"
33283 + LIBS="-lsocket $LIBS"
33292 + cat >> confdefs.h <<\EOF
33293 +#define HAVE_RES_NSEARCH 1
33296 + cat >> confdefs.h <<\EOF
33297 +#define HAVE_LIBSOCKET 1
33301 - if test "$OPENSSL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$OPENSSL_LIBDIR" != "/usr/lib"; then
33303 - if test -z "$OPENSSL_LIBDIR" || echo "$OPENSSL_LIBDIR" | grep '^/' >/dev/null ; then
33304 - ai_p=$OPENSSL_LIBDIR
33305 + ac_cv_func_res_nsearch=yes
33308 - ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
33310 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
33311 - ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`"
33318 - if test "$ext_shared" = "yes"; then
33319 - SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
33320 - test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
33328 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
33331 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
33332 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
33333 - eval "LIBPATH$unique=set"
33335 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
33336 - LDFLAGS="$LDFLAGS -L$ai_p"
33337 - PHP_RPATHS="$PHP_RPATHS $ai_p"
33341 + unset ac_cv_func_dns_search
33342 + unset ac_cv_func___dns_search
33346 + echo $ac_n "checking for dns_search""... $ac_c" 1>&6
33347 +echo "configure:91405: checking for dns_search" >&5
33348 +if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then
33349 + echo $ac_n "(cached) $ac_c" 1>&6
33351 + cat > conftest.$ac_ext <<EOF
33352 +#line 91410 "configure"
33353 +#include "confdefs.h"
33354 +/* System header to define __stub macros and hopefully few prototypes,
33355 + which can conflict with char dns_search(); below. */
33356 +#include <assert.h>
33357 +/* Override any gcc2 internal prototype to avoid an error. */
33358 +/* We use char because int might match the return type of a gcc2
33359 + builtin and then its argument prototype would still apply. */
33360 +char dns_search();
33364 +/* The GNU C library defines this for functions which it implements
33365 + to always fail with ENOSYS. Some functions are actually named
33366 + something starting with __ and the normal name is an alias. */
33367 +#if defined (__stub_dns_search) || defined (__stub___dns_search)
33375 +if { (eval echo configure:91433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33377 + eval "ac_cv_func_dns_search=yes"
33379 + echo "configure: failed program was:" >&5
33380 + cat conftest.$ac_ext >&5
33382 + eval "ac_cv_func_dns_search=no"
33387 +if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then
33388 + echo "$ac_t""yes" 1>&6
33391 + echo "$ac_t""no" 1>&6
33392 + echo $ac_n "checking for __dns_search""... $ac_c" 1>&6
33393 +echo "configure:91451: checking for __dns_search" >&5
33394 +if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then
33395 + echo $ac_n "(cached) $ac_c" 1>&6
33397 + cat > conftest.$ac_ext <<EOF
33398 +#line 91456 "configure"
33399 +#include "confdefs.h"
33400 +/* System header to define __stub macros and hopefully few prototypes,
33401 + which can conflict with char __dns_search(); below. */
33402 +#include <assert.h>
33403 +/* Override any gcc2 internal prototype to avoid an error. */
33404 +/* We use char because int might match the return type of a gcc2
33405 + builtin and then its argument prototype would still apply. */
33406 +char __dns_search();
33410 +/* The GNU C library defines this for functions which it implements
33411 + to always fail with ENOSYS. Some functions are actually named
33412 + something starting with __ and the normal name is an alias. */
33413 +#if defined (__stub___dns_search) || defined (__stub_____dns_search)
33421 +if { (eval echo configure:91479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33423 + eval "ac_cv_func___dns_search=yes"
33425 + echo "configure: failed program was:" >&5
33426 + cat conftest.$ac_ext >&5
33428 + eval "ac_cv_func___dns_search=no"
33433 +if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then
33434 + echo "$ac_t""yes" 1>&6
33437 + echo "$ac_t""no" 1>&6
33450 + cat >> confdefs.h <<\EOF
33451 +#define HAVE_DNS_SEARCH 1
33454 - if test "$found_openssl" = "yes"; then
33455 - OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
33456 + ac_cv_func_dns_search=yes
33462 - { echo "configure: error: SNMP: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; }
33469 - echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
33470 -echo "configure:84590: checking for kstat_read in -lkstat" >&5
33471 -ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'`
33474 + unset ac_cv_lib_resolv_dns_search
33475 + unset ac_cv_lib_resolv___dns_search
33477 + echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6
33478 +echo "configure:91517: checking for dns_search in -lresolv" >&5
33479 +ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'`
33480 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33481 echo $ac_n "(cached) $ac_c" 1>&6
33483 ac_save_LIBS="$LIBS"
33484 -LIBS="-lkstat $LIBS"
33485 +LIBS="-lresolv $LIBS"
33486 cat > conftest.$ac_ext <<EOF
33487 -#line 84598 "configure"
33488 +#line 91525 "configure"
33489 #include "confdefs.h"
33490 /* Override any gcc2 internal prototype to avoid an error. */
33491 /* We use char because int might match the return type of a gcc2
33492 builtin and then its argument prototype would still apply. */
33493 -char kstat_read();
33494 +char dns_search();
33501 -if { (eval echo configure:84609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33502 +if { (eval echo configure:91536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33504 eval "ac_cv_lib_$ac_lib_var=yes"
33506 @@ -84620,282 +91547,167 @@ LIBS="$ac_save_LIBS"
33508 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
33509 echo "$ac_t""yes" 1>&6
33513 - c|c_r|pthread*) ;;
33515 - if test "$ext_shared" = "yes"; then
33516 - SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD"
33521 - c|c_r|pthread*) ;;
33523 - LIBS="-lkstat $LIBS"
33528 + echo "$ac_t""no" 1>&6
33530 + echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6
33531 +echo "configure:91556: checking for __dns_search in -lresolv" >&5
33532 +ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'`
33533 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33534 + echo $ac_n "(cached) $ac_c" 1>&6
33536 + ac_save_LIBS="$LIBS"
33537 +LIBS="-lresolv $LIBS"
33538 +cat > conftest.$ac_ext <<EOF
33539 +#line 91564 "configure"
33540 +#include "confdefs.h"
33541 +/* Override any gcc2 internal prototype to avoid an error. */
33542 +/* We use char because int might match the return type of a gcc2
33543 + builtin and then its argument prototype would still apply. */
33544 +char __dns_search();
33553 +if { (eval echo configure:91575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33555 + eval "ac_cv_lib_$ac_lib_var=yes"
33557 + echo "configure: failed program was:" >&5
33558 + cat conftest.$ac_ext >&5
33560 + eval "ac_cv_lib_$ac_lib_var=no"
33563 +LIBS="$ac_save_LIBS"
33567 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
33568 + echo "$ac_t""yes" 1>&6
33571 echo "$ac_t""no" 1>&6
33576 - if test "$SNMP_INCDIR" != "/usr/include"; then
33578 - if test -z "$SNMP_INCDIR" || echo "$SNMP_INCDIR" | grep '^/' >/dev/null ; then
33579 - ai_p=$SNMP_INCDIR
33582 - ep_dir="`echo $SNMP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
33584 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
33585 - ai_p="$ep_realdir/`basename \"$SNMP_INCDIR\"`"
33590 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
33592 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
33593 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
33594 - eval "INCLUDEPATH$unique=set"
33597 - INCLUDES="-I$ai_p $INCLUDES"
33599 - INCLUDES="$INCLUDES -I$ai_p"
33608 - if test "$ext_shared" = "yes"; then
33609 - SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD"
33610 - if test -n "$SNMP_LIBDIR"; then
33612 - if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then
33614 - if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
33615 - ai_p=$SNMP_LIBDIR
33618 - ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
33620 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
33621 - ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`"
33625 - if test "$ext_shared" = "yes"; then
33626 - SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD"
33627 - test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD"
33632 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
33634 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
33635 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
33636 - eval "LIBPATH$unique=set"
33638 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
33639 - LDFLAGS="$LDFLAGS -L$ai_p"
33640 - PHP_RPATHS="$PHP_RPATHS $ai_p"
33653 - if test -n "$SNMP_LIBDIR"; then
33655 - if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then
33657 - if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then
33658 - ai_p=$SNMP_LIBDIR
33661 - ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
33663 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
33664 - ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`"
33671 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
33673 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
33674 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
33675 - eval "LIBPATH$unique=set"
33677 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
33678 - LDFLAGS="$LDFLAGS -L$ai_p"
33679 - PHP_RPATHS="$PHP_RPATHS $ai_p"
33691 - c|c_r|pthread*) ;;
33693 - LIBS="-lsnmp $LIBS"
33703 + if test "$found" = "yes"; then
33705 + LIBS="$LIBS -lresolv"
33706 + if test "$cross_compiling" = yes; then
33709 + cat > conftest.$ac_ext <<EOF
33710 +#line 91607 "configure"
33711 +#include "confdefs.h"
33712 +main() { return (0); }
33714 +if { (eval echo configure:91611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
33718 + echo "configure: failed program was:" >&5
33719 + cat conftest.$ac_ext >&5
33726 - SNMP_LIBNAME=snmp
33730 + if test "$found" = "yes"; then
33732 - save_old_LDFLAGS=$LDFLAGS
33734 - $SNMP_SHARED_LIBADD
33737 - save_ext_shared=$ext_shared
33740 - for ac_i in $ac_stuff; do
33743 - if test "$ext_shared" = "yes"; then
33744 - LDFLAGS="$LDFLAGS -pthread"
33748 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
33750 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
33751 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
33752 - eval "EXTRA_LDFLAGS$unique=set"
33753 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
33759 - ac_ii=`echo $ac_i|cut -c 3-`
33763 - c|c_r|pthread*) ;;
33765 - if test "$ext_shared" = "yes"; then
33766 - LDFLAGS="$LDFLAGS -l$ac_ii"
33774 - LIBS="$LIBS -l$ac_ii"
33775 + LIBS="-lresolv $LIBS"
33783 + cat >> confdefs.h <<\EOF
33784 +#define HAVE_DNS_SEARCH 1
33787 + cat >> confdefs.h <<\EOF
33788 +#define HAVE_LIBRESOLV 1
33793 - ac_ii=`echo $ac_i|cut -c 3-`
33795 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
33797 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
33799 + ac_cv_func_dns_search=yes
33802 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
33804 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
33805 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
33809 - if test "$ext_shared" = "yes"; then
33810 - LDFLAGS="-L$ai_p $LDFLAGS"
33811 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
33816 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
33818 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
33819 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
33820 - eval "LIBPATH$unique=set"
33822 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
33823 - LDFLAGS="$LDFLAGS -L$ai_p"
33824 - PHP_RPATHS="$PHP_RPATHS $ai_p"
33828 + unset ac_cv_lib_bind_dns_search
33829 + unset ac_cv_lib_bind___dns_search
33831 + echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6
33832 +echo "configure:91653: checking for dns_search in -lbind" >&5
33833 +ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'`
33834 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33835 + echo $ac_n "(cached) $ac_c" 1>&6
33837 + ac_save_LIBS="$LIBS"
33838 +LIBS="-lbind $LIBS"
33839 +cat > conftest.$ac_ext <<EOF
33840 +#line 91661 "configure"
33841 +#include "confdefs.h"
33842 +/* Override any gcc2 internal prototype to avoid an error. */
33843 +/* We use char because int might match the return type of a gcc2
33844 + builtin and then its argument prototype would still apply. */
33845 +char dns_search();
33854 +if { (eval echo configure:91672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33856 + eval "ac_cv_lib_$ac_lib_var=yes"
33858 + echo "configure: failed program was:" >&5
33859 + cat conftest.$ac_ext >&5
33861 + eval "ac_cv_lib_$ac_lib_var=no"
33864 +LIBS="$ac_save_LIBS"
33870 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
33871 + echo "$ac_t""yes" 1>&6
33874 + echo "$ac_t""no" 1>&6
33876 - echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6
33877 -echo "configure:84880: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
33878 -ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'`
33879 + echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6
33880 +echo "configure:91692: checking for __dns_search in -lbind" >&5
33881 +ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'`
33882 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33883 echo $ac_n "(cached) $ac_c" 1>&6
33885 ac_save_LIBS="$LIBS"
33886 -LIBS="-l$SNMP_LIBNAME $LIBS"
33887 +LIBS="-lbind $LIBS"
33888 cat > conftest.$ac_ext <<EOF
33889 -#line 84888 "configure"
33890 +#line 91700 "configure"
33891 #include "confdefs.h"
33892 /* Override any gcc2 internal prototype to avoid an error. */
33893 /* We use char because int might match the return type of a gcc2
33894 builtin and then its argument prototype would still apply. */
33895 -char snmp_parse_oid();
33896 +char __dns_search();
33903 -if { (eval echo configure:84899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33904 +if { (eval echo configure:91711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
33906 eval "ac_cv_lib_$ac_lib_var=yes"
33908 @@ -84910,145 +91722,89 @@ LIBS="$ac_save_LIBS"
33910 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
33911 echo "$ac_t""yes" 1>&6
33913 - LDFLAGS=$save_old_LDFLAGS
33914 - ext_shared=$save_ext_shared
33916 - cat >> confdefs.h <<\EOF
33917 -#define HAVE_SNMP_PARSE_OID 1
33924 echo "$ac_t""no" 1>&6
33928 - LDFLAGS=$save_old_LDFLAGS
33929 - ext_shared=$save_ext_shared
33930 - unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid
33937 - save_old_LDFLAGS=$LDFLAGS
33939 - $SNMP_SHARED_LIBADD
33942 - save_ext_shared=$ext_shared
33945 - for ac_i in $ac_stuff; do
33948 - if test "$ext_shared" = "yes"; then
33949 - LDFLAGS="$LDFLAGS -pthread"
33953 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
33955 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
33956 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
33957 - eval "EXTRA_LDFLAGS$unique=set"
33958 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
33959 + if test "$found" = "yes"; then
33961 + LIBS="$LIBS -lbind"
33962 + if test "$cross_compiling" = yes; then
33965 + cat > conftest.$ac_ext <<EOF
33966 +#line 91743 "configure"
33967 +#include "confdefs.h"
33968 +main() { return (0); }
33970 +if { (eval echo configure:91747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
33974 + echo "configure: failed program was:" >&5
33975 + cat conftest.$ac_ext >&5
33988 - ac_ii=`echo $ac_i|cut -c 3-`
33992 - c|c_r|pthread*) ;;
33994 - if test "$ext_shared" = "yes"; then
33995 - LDFLAGS="$LDFLAGS -l$ac_ii"
33998 + if test "$found" = "yes"; then
34005 - LIBS="$LIBS -l$ac_ii"
34011 + LIBS="-lbind $LIBS"
34018 - ac_ii=`echo $ac_i|cut -c 3-`
34020 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
34022 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
34026 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
34028 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
34029 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
34033 - if test "$ext_shared" = "yes"; then
34034 - LDFLAGS="-L$ai_p $LDFLAGS"
34035 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
34040 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
34042 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
34043 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
34044 - eval "LIBPATH$unique=set"
34046 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
34047 - LDFLAGS="$LDFLAGS -L$ai_p"
34048 - PHP_RPATHS="$PHP_RPATHS $ai_p"
34056 + cat >> confdefs.h <<\EOF
34057 +#define HAVE_DNS_SEARCH 1
34063 + cat >> confdefs.h <<\EOF
34064 +#define HAVE_LIBBIND 1
34067 - echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6
34068 -echo "configure:85033: checking for init_snmp in -l$SNMP_LIBNAME" >&5
34069 -ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'`
34070 + ac_cv_func_dns_search=yes
34074 + unset ac_cv_lib_socket_dns_search
34075 + unset ac_cv_lib_socket___dns_search
34077 + echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6
34078 +echo "configure:91789: checking for dns_search in -lsocket" >&5
34079 +ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'`
34080 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
34081 echo $ac_n "(cached) $ac_c" 1>&6
34083 ac_save_LIBS="$LIBS"
34084 -LIBS="-l$SNMP_LIBNAME $LIBS"
34085 +LIBS="-lsocket $LIBS"
34086 cat > conftest.$ac_ext <<EOF
34087 -#line 85041 "configure"
34088 +#line 91797 "configure"
34089 #include "confdefs.h"
34090 /* Override any gcc2 internal prototype to avoid an error. */
34091 /* We use char because int might match the return type of a gcc2
34092 builtin and then its argument prototype would still apply. */
34094 +char dns_search();
34101 -if { (eval echo configure:85052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
34102 +if { (eval echo configure:91808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
34104 eval "ac_cv_lib_$ac_lib_var=yes"
34106 @@ -85063,2353 +91819,2264 @@ LIBS="$ac_save_LIBS"
34108 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
34109 echo "$ac_t""yes" 1>&6
34111 - LDFLAGS=$save_old_LDFLAGS
34112 - ext_shared=$save_ext_shared
34114 - cat >> confdefs.h <<\EOF
34115 -#define HAVE_SNMP 1
34118 + echo "$ac_t""no" 1>&6
34120 + echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6
34121 +echo "configure:91828: checking for __dns_search in -lsocket" >&5
34122 +ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'`
34123 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
34124 + echo $ac_n "(cached) $ac_c" 1>&6
34126 + ac_save_LIBS="$LIBS"
34127 +LIBS="-lsocket $LIBS"
34128 +cat > conftest.$ac_ext <<EOF
34129 +#line 91836 "configure"
34130 +#include "confdefs.h"
34131 +/* Override any gcc2 internal prototype to avoid an error. */
34132 +/* We use char because int might match the return type of a gcc2
34133 + builtin and then its argument prototype would still apply. */
34134 +char __dns_search();
34140 +if { (eval echo configure:91847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
34142 + eval "ac_cv_lib_$ac_lib_var=yes"
34144 + echo "configure: failed program was:" >&5
34145 + cat conftest.$ac_ext >&5
34147 + eval "ac_cv_lib_$ac_lib_var=no"
34150 +LIBS="$ac_save_LIBS"
34155 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
34156 + echo "$ac_t""yes" 1>&6
34159 echo "$ac_t""no" 1>&6
34163 - LDFLAGS=$save_old_LDFLAGS
34164 - ext_shared=$save_ext_shared
34165 - unset ac_cv_lib_$SNMP_LIBNAME_init_snmp
34167 - { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; }
34173 - if test "$PHP_UCD_SNMP_HACK" = "yes" ; then
34174 - cat >> confdefs.h <<\EOF
34175 -#define UCD_SNMP_HACK 1
34176 + if test "$found" = "yes"; then
34178 + LIBS="$LIBS -lsocket"
34179 + if test "$cross_compiling" = yes; then
34182 + cat > conftest.$ac_ext <<EOF
34183 +#line 91879 "configure"
34184 +#include "confdefs.h"
34185 +main() { return (0); }
34187 +if { (eval echo configure:91883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
34191 + echo "configure: failed program was:" >&5
34192 + cat conftest.$ac_ext >&5
34203 - ext_builddir=ext/snmp
34204 - ext_srcdir=$abs_srcdir/ext/snmp
34208 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
34209 - PHP_SNMP_SHARED=no
34210 + if test "$found" = "yes"; then
34214 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
34215 - /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
34216 - *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
34218 + c|c_r|pthread*) ;;
34220 + LIBS="-lsocket $LIBS"
34226 - b_c_pre=$php_c_pre
34227 - b_cxx_pre=$php_cxx_pre
34228 - b_c_meta=$php_c_meta
34229 - b_cxx_meta=$php_cxx_meta
34230 - b_c_post=$php_c_post
34231 - b_cxx_post=$php_cxx_post
34236 - for ac_src in snmp.c; do
34243 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
34246 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34247 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34248 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34249 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
34252 - cat >>Makefile.objects<<EOF
34253 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
34255 + cat >> confdefs.h <<\EOF
34256 +#define HAVE_DNS_SEARCH 1
34261 - EXT_STATIC="$EXT_STATIC snmp"
34262 - if test "$ext_shared" != "nocli"; then
34263 - EXT_CLI_STATIC="$EXT_CLI_STATIC snmp"
34266 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
34267 - PHP_SNMP_SHARED=yes
34270 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
34271 - /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
34272 - *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
34277 - b_c_pre=$shared_c_pre
34278 - b_cxx_pre=$shared_cxx_pre
34279 - b_c_meta=$shared_c_meta
34280 - b_cxx_meta=$shared_cxx_meta
34281 - b_c_post=$shared_c_post
34282 - b_cxx_post=$shared_cxx_post
34287 - for ac_src in snmp.c; do
34294 - shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo"
34297 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34298 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34299 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34300 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
34303 - cat >>Makefile.objects<<EOF
34304 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
34306 + cat >> confdefs.h <<\EOF
34307 +#define HAVE_LIBSOCKET 1
34311 - case $host_alias in
34314 - install_modules="install-modules"
34316 - case $host_alias in
34319 - 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'
34323 - link_cmd='$(LIBTOOL) --mode=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)'
34327 - link_cmd='$(LIBTOOL) --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)'
34331 - if test "x" = "xyes"; then
34332 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsnmp.$suffix"
34333 + ac_cv_func_dns_search=yes
34335 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix"
34338 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp"
34340 - cat >>Makefile.objects<<EOF
34341 -\$(phplibdir)/phpsnmp.$suffix: $ext_builddir/phpsnmp.$suffix
34342 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpsnmp.$suffix \$(phplibdir)
34344 -$ext_builddir/phpsnmp.$suffix: \$(shared_objects_snmp) \$(PHPSNMP_SHARED_DEPENDENCIES)
34352 - install_modules="install-modules"
34354 - case $host_alias in
34357 - 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'
34361 - link_cmd='$(LIBTOOL) --mode=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)'
34365 - link_cmd='$(LIBTOOL) --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)'
34371 - if test "x" = "xyes"; then
34372 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/snmp.$suffix"
34374 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/snmp.$suffix"
34377 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp"
34379 - cat >>Makefile.objects<<EOF
34380 -\$(phplibdir)/snmp.$suffix: $ext_builddir/snmp.$suffix
34381 - \$(LIBTOOL) --mode=install cp $ext_builddir/snmp.$suffix \$(phplibdir)
34383 -$ext_builddir/snmp.$suffix: \$(shared_objects_snmp) \$(SNMP_SHARED_DEPENDENCIES)
34390 - cat >> confdefs.h <<EOF
34391 -#define COMPILE_DL_SNMP 1
34397 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
34398 - PHP_SNMP_SHARED=no
34399 - case "$PHP_SAPI" in
34404 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
34405 - /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
34406 - *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
34411 - b_c_pre=$php_c_pre
34412 - b_cxx_pre=$php_cxx_pre
34413 - b_c_meta=$php_c_meta
34414 - b_cxx_meta=$php_cxx_meta
34415 - b_c_post=$php_c_post
34416 - b_cxx_post=$php_cxx_post
34421 - for ac_src in snmp.c; do
34428 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
34431 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34432 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34433 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34434 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
34437 - cat >>Makefile.objects<<EOF
34438 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
34444 - EXT_STATIC="$EXT_STATIC snmp"
34450 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
34451 - /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
34452 - *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
34457 - b_c_pre=$php_c_pre
34458 - b_cxx_pre=$php_cxx_pre
34459 - b_c_meta=$php_c_meta
34460 - b_cxx_meta=$php_cxx_meta
34461 - b_c_post=$php_c_post
34462 - b_cxx_post=$php_cxx_post
34467 - for ac_src in snmp.c; do
34474 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
34477 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34478 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34479 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
34480 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
34483 - cat >>Makefile.objects<<EOF
34484 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
34492 - EXT_CLI_STATIC="$EXT_CLI_STATIC snmp"
34497 - BUILD_DIR="$BUILD_DIR $ext_builddir"
34501 - if test "$ext_builddir" = "."; then
34502 - PHP_PECL_EXTENSION=snmp
34504 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
34509 + unset ac_cv_func_dn_expand
34510 + unset ac_cv_func___dn_expand
34513 - PHP_VAR_SUBST="$PHP_VAR_SUBST SNMP_SHARED_LIBADD"
34517 + echo $ac_n "checking for dn_expand""... $ac_c" 1>&6
34518 +echo "configure:91940: checking for dn_expand" >&5
34519 +if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then
34520 + echo $ac_n "(cached) $ac_c" 1>&6
34522 + cat > conftest.$ac_ext <<EOF
34523 +#line 91945 "configure"
34524 +#include "confdefs.h"
34525 +/* System header to define __stub macros and hopefully few prototypes,
34526 + which can conflict with char dn_expand(); below. */
34527 +#include <assert.h>
34528 +/* Override any gcc2 internal prototype to avoid an error. */
34529 +/* We use char because int might match the return type of a gcc2
34530 + builtin and then its argument prototype would still apply. */
34535 -php_enable_soap=no
34536 +/* The GNU C library defines this for functions which it implements
34537 + to always fail with ENOSYS. Some functions are actually named
34538 + something starting with __ and the normal name is an alias. */
34539 +#if defined (__stub_dn_expand) || defined (__stub___dn_expand)
34545 -echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6
34546 -echo "configure:85399: checking whether to enable SOAP support" >&5
34547 -# Check whether --enable-soap or --disable-soap was given.
34548 -if test "${enable_soap+set}" = set; then
34549 - enableval="$enable_soap"
34550 - PHP_SOAP=$enableval
34553 +if { (eval echo configure:91968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
34555 + eval "ac_cv_func_dn_expand=yes"
34559 - test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL
34561 + echo "configure: failed program was:" >&5
34562 + cat conftest.$ac_ext >&5
34564 + eval "ac_cv_func_dn_expand=no"
34569 +if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then
34570 + echo "$ac_t""yes" 1>&6
34573 + echo "$ac_t""no" 1>&6
34574 + echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6
34575 +echo "configure:91986: checking for __dn_expand" >&5
34576 +if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then
34577 + echo $ac_n "(cached) $ac_c" 1>&6
34579 + cat > conftest.$ac_ext <<EOF
34580 +#line 91991 "configure"
34581 +#include "confdefs.h"
34582 +/* System header to define __stub macros and hopefully few prototypes,
34583 + which can conflict with char __dn_expand(); below. */
34584 +#include <assert.h>
34585 +/* Override any gcc2 internal prototype to avoid an error. */
34586 +/* We use char because int might match the return type of a gcc2
34587 + builtin and then its argument prototype would still apply. */
34588 +char __dn_expand();
34592 -ext_output="yes, shared"
34596 - PHP_SOAP=`echo "$PHP_SOAP"|$SED 's/^shared,//'`
34613 -echo "$ac_t""$ext_output" 1>&6
34618 -if test -z "$PHP_LIBXML_DIR"; then
34620 -php_with_libxml_dir=no
34621 +/* The GNU C library defines this for functions which it implements
34622 + to always fail with ENOSYS. Some functions are actually named
34623 + something starting with __ and the normal name is an alias. */
34624 +#if defined (__stub___dn_expand) || defined (__stub_____dn_expand)
34630 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
34631 -echo "configure:85444: checking libxml2 install dir" >&5
34632 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
34633 -if test "${with_libxml_dir+set}" = set; then
34634 - withval="$with_libxml_dir"
34635 - PHP_LIBXML_DIR=$withval
34638 +if { (eval echo configure:92014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
34640 + eval "ac_cv_func___dn_expand=yes"
34643 - PHP_LIBXML_DIR=no
34646 + echo "configure: failed program was:" >&5
34647 + cat conftest.$ac_ext >&5
34649 + eval "ac_cv_func___dn_expand=no"
34654 +if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then
34655 + echo "$ac_t""yes" 1>&6
34658 + echo "$ac_t""no" 1>&6
34664 -ext_output=$PHP_LIBXML_DIR
34665 -echo "$ac_t""$ext_output" 1>&6
34669 + cat >> confdefs.h <<\EOF
34670 +#define HAVE_DN_EXPAND 1
34673 + ac_cv_func_dn_expand=yes
34678 + unset ac_cv_lib_resolv_dn_expand
34679 + unset ac_cv_lib_resolv___dn_expand
34681 + echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
34682 +echo "configure:92052: checking for dn_expand in -lresolv" >&5
34683 +ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
34684 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
34685 + echo $ac_n "(cached) $ac_c" 1>&6
34687 + ac_save_LIBS="$LIBS"
34688 +LIBS="-lresolv $LIBS"
34689 +cat > conftest.$ac_ext <<EOF
34690 +#line 92060 "configure"
34691 +#include "confdefs.h"
34692 +/* Override any gcc2 internal prototype to avoid an error. */
34693 +/* We use char because int might match the return type of a gcc2
34694 + builtin and then its argument prototype would still apply. */
34701 +if { (eval echo configure:92071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
34703 + eval "ac_cv_lib_$ac_lib_var=yes"
34705 + echo "configure: failed program was:" >&5
34706 + cat conftest.$ac_ext >&5
34708 + eval "ac_cv_lib_$ac_lib_var=no"
34711 +LIBS="$ac_save_LIBS"
34713 -if test "$PHP_SOAP" != "no"; then
34715 - if test "$PHP_LIBXML" = "no"; then
34716 - { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
34719 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
34720 + echo "$ac_t""yes" 1>&6
34723 + echo "$ac_t""no" 1>&6
34726 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
34727 -echo "configure:85472: checking for xml2-config path" >&5
34728 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
34729 + echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
34730 +echo "configure:92091: checking for __dn_expand in -lresolv" >&5
34731 +ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'`
34732 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
34733 echo $ac_n "(cached) $ac_c" 1>&6
34736 - for i in $PHP_LIBXML_DIR /usr/local /usr; do
34737 - if test -x "$i/bin/xml2-config"; then
34738 - ac_cv_php_xml2_config_path="$i/bin/xml2-config"
34742 + ac_save_LIBS="$LIBS"
34743 +LIBS="-lresolv $LIBS"
34744 +cat > conftest.$ac_ext <<EOF
34745 +#line 92099 "configure"
34746 +#include "confdefs.h"
34747 +/* Override any gcc2 internal prototype to avoid an error. */
34748 +/* We use char because int might match the return type of a gcc2
34749 + builtin and then its argument prototype would still apply. */
34750 +char __dn_expand();
34756 +if { (eval echo configure:92110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
34758 + eval "ac_cv_lib_$ac_lib_var=yes"
34760 + echo "configure: failed program was:" >&5
34761 + cat conftest.$ac_ext >&5
34763 + eval "ac_cv_lib_$ac_lib_var=no"
34766 +LIBS="$ac_save_LIBS"
34768 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
34770 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
34771 + echo "$ac_t""yes" 1>&6
34774 + echo "$ac_t""no" 1>&6
34778 - if test -x "$ac_cv_php_xml2_config_path"; then
34779 - XML2_CONFIG="$ac_cv_php_xml2_config_path"
34780 - libxml_full_version=`$XML2_CONFIG --version`
34783 - set $libxml_full_version
34785 - LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
34786 - if test "$LIBXML_VERSION" -ge "2006011"; then
34787 - LIBXML_LIBS=`$XML2_CONFIG --libs`
34788 - LIBXML_INCS=`$XML2_CONFIG --cflags`
34790 - for ac_i in $LIBXML_LIBS; do
34793 - if test "$ext_shared" = "yes"; then
34794 - SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -pthread"
34798 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
34800 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
34801 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
34802 - eval "EXTRA_LDFLAGS$unique=set"
34803 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
34807 + if test "$found" = "yes"; then
34809 + LIBS="$LIBS -lresolv"
34810 + if test "$cross_compiling" = yes; then
34813 + cat > conftest.$ac_ext <<EOF
34814 +#line 92142 "configure"
34815 +#include "confdefs.h"
34816 +main() { return (0); }
34818 +if { (eval echo configure:92146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
34822 + echo "configure: failed program was:" >&5
34823 + cat conftest.$ac_ext >&5
34836 - ac_ii=`echo $ac_i|cut -c 3-`
34840 - c|c_r|pthread*) ;;
34842 - if test "$ext_shared" = "yes"; then
34843 - SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii"
34846 + if test "$found" = "yes"; then
34853 - LIBS="$LIBS -l$ac_ii"
34854 + LIBS="-lresolv $LIBS"
34862 + cat >> confdefs.h <<\EOF
34863 +#define HAVE_DN_EXPAND 1
34866 + cat >> confdefs.h <<\EOF
34867 +#define HAVE_LIBRESOLV 1
34872 - ac_ii=`echo $ac_i|cut -c 3-`
34874 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
34876 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
34878 + ac_cv_func_dn_expand=yes
34881 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
34883 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
34884 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
34888 - if test "$ext_shared" = "yes"; then
34889 - SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD"
34890 - test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_SHARED_LIBADD"
34895 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
34897 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
34898 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
34899 - eval "LIBPATH$unique=set"
34901 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
34902 - LDFLAGS="$LDFLAGS -L$ai_p"
34903 - PHP_RPATHS="$PHP_RPATHS $ai_p"
34907 + unset ac_cv_lib_bind_dn_expand
34908 + unset ac_cv_lib_bind___dn_expand
34910 + echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6
34911 +echo "configure:92188: checking for dn_expand in -lbind" >&5
34912 +ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'`
34913 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
34914 + echo $ac_n "(cached) $ac_c" 1>&6
34916 + ac_save_LIBS="$LIBS"
34917 +LIBS="-lbind $LIBS"
34918 +cat > conftest.$ac_ext <<EOF
34919 +#line 92196 "configure"
34920 +#include "confdefs.h"
34921 +/* Override any gcc2 internal prototype to avoid an error. */
34922 +/* We use char because int might match the return type of a gcc2
34923 + builtin and then its argument prototype would still apply. */
34933 +if { (eval echo configure:92207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
34935 + eval "ac_cv_lib_$ac_lib_var=yes"
34937 + echo "configure: failed program was:" >&5
34938 + cat conftest.$ac_ext >&5
34940 + eval "ac_cv_lib_$ac_lib_var=no"
34943 +LIBS="$ac_save_LIBS"
34949 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
34950 + echo "$ac_t""yes" 1>&6
34953 + echo "$ac_t""no" 1>&6
34956 - for ac_i in $LIBXML_INCS; do
34959 - ac_ii=`echo $ac_i|cut -c 3-`
34961 - if test "$ac_ii" != "/usr/include"; then
34963 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
34967 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
34969 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
34970 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
34972 + echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6
34973 +echo "configure:92227: checking for __dn_expand in -lbind" >&5
34974 +ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'`
34975 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
34976 + echo $ac_n "(cached) $ac_c" 1>&6
34978 + ac_save_LIBS="$LIBS"
34979 +LIBS="-lbind $LIBS"
34980 +cat > conftest.$ac_ext <<EOF
34981 +#line 92235 "configure"
34982 +#include "confdefs.h"
34983 +/* Override any gcc2 internal prototype to avoid an error. */
34984 +/* We use char because int might match the return type of a gcc2
34985 + builtin and then its argument prototype would still apply. */
34986 +char __dn_expand();
34990 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
34992 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
34993 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
34994 - eval "INCLUDEPATH$unique=set"
34997 - INCLUDES="-I$ai_p $INCLUDES"
34999 - INCLUDES="$INCLUDES -I$ai_p"
35007 +if { (eval echo configure:92246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35009 + eval "ac_cv_lib_$ac_lib_var=yes"
35011 + echo "configure: failed program was:" >&5
35012 + cat conftest.$ac_ext >&5
35014 + eval "ac_cv_lib_$ac_lib_var=no"
35017 +LIBS="$ac_save_LIBS"
35021 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35022 + echo "$ac_t""yes" 1>&6
35025 + echo "$ac_t""no" 1>&6
35036 - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
35037 -echo "configure:85630: checking whether libxml build works" >&5
35038 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
35039 - echo $ac_n "(cached) $ac_c" 1>&6
35045 - $SOAP_SHARED_LIBADD
35047 - if test "$cross_compiling" = yes; then
35051 + if test "$found" = "yes"; then
35053 + LIBS="$LIBS -lbind"
35054 + if test "$cross_compiling" = yes; then
35057 cat > conftest.$ac_ext <<EOF
35058 -#line 85646 "configure"
35059 +#line 92278 "configure"
35060 #include "confdefs.h"
35063 - char xmlInitParser();
35069 +main() { return (0); }
35071 -if { (eval echo configure:85657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
35072 +if { (eval echo configure:92282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
35077 - php_cv_libxml_build_works=yes
35082 echo "configure: failed program was:" >&5
35083 cat conftest.$ac_ext >&5
35088 - echo "$ac_t""no" 1>&6
35089 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
35103 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
35104 - if test "$php_cv_libxml_build_works" = "yes"; then
35105 - cat >> confdefs.h <<\EOF
35106 -#define HAVE_LIBXML 1
35111 - cat >> confdefs.h <<\EOF
35112 -#define HAVE_SOAP 1
35116 - ext_builddir=ext/soap
35117 - ext_srcdir=$abs_srcdir/ext/soap
35121 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
35122 - PHP_SOAP_SHARED=no
35123 + if test "$found" = "yes"; then
35127 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
35128 - /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
35129 - *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
35131 + c|c_r|pthread*) ;;
35133 + LIBS="-lbind $LIBS"
35139 - b_c_pre=$php_c_pre
35140 - b_cxx_pre=$php_cxx_pre
35141 - b_c_meta=$php_c_meta
35142 - b_cxx_meta=$php_cxx_meta
35143 - b_c_post=$php_c_post
35144 - b_cxx_post=$php_cxx_post
35149 - 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
35156 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
35159 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35160 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35161 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35162 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
35165 - cat >>Makefile.objects<<EOF
35166 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
35168 + cat >> confdefs.h <<\EOF
35169 +#define HAVE_DN_EXPAND 1
35173 + cat >> confdefs.h <<\EOF
35174 +#define HAVE_LIBBIND 1
35177 - EXT_STATIC="$EXT_STATIC soap"
35178 - if test "$ext_shared" != "nocli"; then
35179 - EXT_CLI_STATIC="$EXT_CLI_STATIC soap"
35181 + ac_cv_func_dn_expand=yes
35183 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
35184 - PHP_SOAP_SHARED=yes
35187 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
35188 - /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
35189 - *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
35194 + unset ac_cv_lib_socket_dn_expand
35195 + unset ac_cv_lib_socket___dn_expand
35197 + echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6
35198 +echo "configure:92324: checking for dn_expand in -lsocket" >&5
35199 +ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'`
35200 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35201 + echo $ac_n "(cached) $ac_c" 1>&6
35203 + ac_save_LIBS="$LIBS"
35204 +LIBS="-lsocket $LIBS"
35205 +cat > conftest.$ac_ext <<EOF
35206 +#line 92332 "configure"
35207 +#include "confdefs.h"
35208 +/* Override any gcc2 internal prototype to avoid an error. */
35209 +/* We use char because int might match the return type of a gcc2
35210 + builtin and then its argument prototype would still apply. */
35213 - b_c_pre=$shared_c_pre
35214 - b_cxx_pre=$shared_cxx_pre
35215 - b_c_meta=$shared_c_meta
35216 - b_cxx_meta=$shared_cxx_meta
35217 - b_c_post=$shared_c_post
35218 - b_cxx_post=$shared_cxx_post
35225 +if { (eval echo configure:92343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35227 + eval "ac_cv_lib_$ac_lib_var=yes"
35229 + echo "configure: failed program was:" >&5
35230 + cat conftest.$ac_ext >&5
35232 + eval "ac_cv_lib_$ac_lib_var=no"
35235 +LIBS="$ac_save_LIBS"
35238 - 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
35245 - shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo"
35247 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35248 + echo "$ac_t""yes" 1>&6
35251 + echo "$ac_t""no" 1>&6
35254 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35255 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35256 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35257 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
35259 + echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6
35260 +echo "configure:92363: checking for __dn_expand in -lsocket" >&5
35261 +ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'`
35262 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35263 + echo $ac_n "(cached) $ac_c" 1>&6
35265 + ac_save_LIBS="$LIBS"
35266 +LIBS="-lsocket $LIBS"
35267 +cat > conftest.$ac_ext <<EOF
35268 +#line 92371 "configure"
35269 +#include "confdefs.h"
35270 +/* Override any gcc2 internal prototype to avoid an error. */
35271 +/* We use char because int might match the return type of a gcc2
35272 + builtin and then its argument prototype would still apply. */
35273 +char __dn_expand();
35275 - cat >>Makefile.objects<<EOF
35276 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
35284 - case $host_alias in
35287 - install_modules="install-modules"
35288 +if { (eval echo configure:92382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35290 + eval "ac_cv_lib_$ac_lib_var=yes"
35292 + echo "configure: failed program was:" >&5
35293 + cat conftest.$ac_ext >&5
35295 + eval "ac_cv_lib_$ac_lib_var=no"
35298 +LIBS="$ac_save_LIBS"
35300 - case $host_alias in
35303 - 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'
35307 - link_cmd='$(LIBTOOL) --mode=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)'
35311 - link_cmd='$(LIBTOOL) --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)'
35315 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35316 + echo "$ac_t""yes" 1>&6
35319 + echo "$ac_t""no" 1>&6
35323 - if test "x" = "xyes"; then
35324 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsoap.$suffix"
35326 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix"
35329 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap"
35331 - cat >>Makefile.objects<<EOF
35332 -\$(phplibdir)/phpsoap.$suffix: $ext_builddir/phpsoap.$suffix
35333 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpsoap.$suffix \$(phplibdir)
35336 -$ext_builddir/phpsoap.$suffix: \$(shared_objects_soap) \$(PHPSOAP_SHARED_DEPENDENCIES)
35339 + if test "$found" = "yes"; then
35341 + LIBS="$LIBS -lsocket"
35342 + if test "$cross_compiling" = yes; then
35345 + cat > conftest.$ac_ext <<EOF
35346 +#line 92414 "configure"
35347 +#include "confdefs.h"
35348 +main() { return (0); }
35350 +if { (eval echo configure:92418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
35354 + echo "configure: failed program was:" >&5
35355 + cat conftest.$ac_ext >&5
35365 - install_modules="install-modules"
35367 - case $host_alias in
35370 - 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'
35374 - link_cmd='$(LIBTOOL) --mode=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)'
35378 - link_cmd='$(LIBTOOL) --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)'
35382 - if test "x" = "xyes"; then
35383 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/soap.$suffix"
35385 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/soap.$suffix"
35389 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap"
35391 - cat >>Makefile.objects<<EOF
35392 -\$(phplibdir)/soap.$suffix: $ext_builddir/soap.$suffix
35393 - \$(LIBTOOL) --mode=install cp $ext_builddir/soap.$suffix \$(phplibdir)
35394 + if test "$found" = "yes"; then
35398 + c|c_r|pthread*) ;;
35400 + LIBS="-lsocket $LIBS"
35404 -$ext_builddir/soap.$suffix: \$(shared_objects_soap) \$(SOAP_SHARED_DEPENDENCIES)
35407 + cat >> confdefs.h <<\EOF
35408 +#define HAVE_DN_EXPAND 1
35413 - cat >> confdefs.h <<EOF
35414 -#define COMPILE_DL_SOAP 1
35415 + cat >> confdefs.h <<\EOF
35416 +#define HAVE_LIBSOCKET 1
35420 + ac_cv_func_dn_expand=yes
35428 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
35429 - PHP_SOAP_SHARED=no
35430 - case "$PHP_SAPI" in
35436 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
35437 - /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
35438 - *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
35446 - b_c_pre=$php_c_pre
35447 - b_cxx_pre=$php_cxx_pre
35448 - b_c_meta=$php_c_meta
35449 - b_cxx_meta=$php_cxx_meta
35450 - b_c_post=$php_c_post
35451 - b_cxx_post=$php_cxx_post
35457 - 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
35458 + unset ac_cv_func_dn_skipname
35459 + unset ac_cv_func___dn_skipname
35467 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
35468 + echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6
35469 +echo "configure:92475: checking for dn_skipname" >&5
35470 +if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then
35471 + echo $ac_n "(cached) $ac_c" 1>&6
35473 + cat > conftest.$ac_ext <<EOF
35474 +#line 92480 "configure"
35475 +#include "confdefs.h"
35476 +/* System header to define __stub macros and hopefully few prototypes,
35477 + which can conflict with char dn_skipname(); below. */
35478 +#include <assert.h>
35479 +/* Override any gcc2 internal prototype to avoid an error. */
35480 +/* We use char because int might match the return type of a gcc2
35481 + builtin and then its argument prototype would still apply. */
35482 +char dn_skipname();
35485 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35486 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35487 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35488 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
35492 - cat >>Makefile.objects<<EOF
35493 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
35495 +/* The GNU C library defines this for functions which it implements
35496 + to always fail with ENOSYS. Some functions are actually named
35497 + something starting with __ and the normal name is an alias. */
35498 +#if defined (__stub_dn_skipname) || defined (__stub___dn_skipname)
35507 +if { (eval echo configure:92503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35509 + eval "ac_cv_func_dn_skipname=yes"
35511 + echo "configure: failed program was:" >&5
35512 + cat conftest.$ac_ext >&5
35514 + eval "ac_cv_func_dn_skipname=no"
35519 +if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then
35520 + echo "$ac_t""yes" 1>&6
35523 + echo "$ac_t""no" 1>&6
35524 + echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6
35525 +echo "configure:92521: checking for __dn_skipname" >&5
35526 +if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then
35527 + echo $ac_n "(cached) $ac_c" 1>&6
35529 + cat > conftest.$ac_ext <<EOF
35530 +#line 92526 "configure"
35531 +#include "confdefs.h"
35532 +/* System header to define __stub macros and hopefully few prototypes,
35533 + which can conflict with char __dn_skipname(); below. */
35534 +#include <assert.h>
35535 +/* Override any gcc2 internal prototype to avoid an error. */
35536 +/* We use char because int might match the return type of a gcc2
35537 + builtin and then its argument prototype would still apply. */
35538 +char __dn_skipname();
35540 - EXT_STATIC="$EXT_STATIC soap"
35546 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
35547 - /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
35548 - *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
35554 - b_c_pre=$php_c_pre
35555 - b_cxx_pre=$php_cxx_pre
35556 - b_c_meta=$php_c_meta
35557 - b_cxx_meta=$php_cxx_meta
35558 - b_c_post=$php_c_post
35559 - b_cxx_post=$php_cxx_post
35561 +/* The GNU C library defines this for functions which it implements
35562 + to always fail with ENOSYS. Some functions are actually named
35563 + something starting with __ and the normal name is an alias. */
35564 +#if defined (__stub___dn_skipname) || defined (__stub_____dn_skipname)
35572 +if { (eval echo configure:92549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35574 + eval "ac_cv_func___dn_skipname=yes"
35576 + echo "configure: failed program was:" >&5
35577 + cat conftest.$ac_ext >&5
35579 + eval "ac_cv_func___dn_skipname=no"
35585 - 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
35592 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
35593 +if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then
35594 + echo "$ac_t""yes" 1>&6
35597 + echo "$ac_t""no" 1>&6
35604 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35605 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35606 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
35607 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
35610 - cat >>Makefile.objects<<EOF
35611 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
35615 + cat >> confdefs.h <<\EOF
35616 +#define HAVE_DN_SKIPNAME 1
35623 - EXT_CLI_STATIC="$EXT_CLI_STATIC soap"
35626 + ac_cv_func_dn_skipname=yes
35629 - BUILD_DIR="$BUILD_DIR $ext_builddir"
35632 + unset ac_cv_lib_resolv_dn_skipname
35633 + unset ac_cv_lib_resolv___dn_skipname
35635 + echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6
35636 +echo "configure:92587: checking for dn_skipname in -lresolv" >&5
35637 +ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'`
35638 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35639 + echo $ac_n "(cached) $ac_c" 1>&6
35641 + ac_save_LIBS="$LIBS"
35642 +LIBS="-lresolv $LIBS"
35643 +cat > conftest.$ac_ext <<EOF
35644 +#line 92595 "configure"
35645 +#include "confdefs.h"
35646 +/* Override any gcc2 internal prototype to avoid an error. */
35647 +/* We use char because int might match the return type of a gcc2
35648 + builtin and then its argument prototype would still apply. */
35649 +char dn_skipname();
35655 +if { (eval echo configure:92606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35657 + eval "ac_cv_lib_$ac_lib_var=yes"
35659 + echo "configure: failed program was:" >&5
35660 + cat conftest.$ac_ext >&5
35662 + eval "ac_cv_lib_$ac_lib_var=no"
35665 +LIBS="$ac_save_LIBS"
35667 - if test "$ext_builddir" = "."; then
35668 - PHP_PECL_EXTENSION=soap
35670 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
35675 - PHP_VAR_SUBST="$PHP_VAR_SUBST SOAP_SHARED_LIBADD"
35677 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35678 + echo "$ac_t""yes" 1>&6
35681 + echo "$ac_t""no" 1>&6
35685 - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
35688 - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
35691 + echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6
35692 +echo "configure:92626: checking for __dn_skipname in -lresolv" >&5
35693 +ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'`
35694 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35695 + echo $ac_n "(cached) $ac_c" 1>&6
35697 + ac_save_LIBS="$LIBS"
35698 +LIBS="-lresolv $LIBS"
35699 +cat > conftest.$ac_ext <<EOF
35700 +#line 92634 "configure"
35701 +#include "confdefs.h"
35702 +/* Override any gcc2 internal prototype to avoid an error. */
35703 +/* We use char because int might match the return type of a gcc2
35704 + builtin and then its argument prototype would still apply. */
35705 +char __dn_skipname();
35711 +if { (eval echo configure:92645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35713 + eval "ac_cv_lib_$ac_lib_var=yes"
35715 + echo "configure: failed program was:" >&5
35716 + cat conftest.$ac_ext >&5
35718 + eval "ac_cv_lib_$ac_lib_var=no"
35721 +LIBS="$ac_save_LIBS"
35724 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35725 + echo "$ac_t""yes" 1>&6
35728 + echo "$ac_t""no" 1>&6
35735 -php_enable_sockets=no
35737 -echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6
35738 -echo "configure:86007: checking whether to enable sockets support" >&5
35739 -# Check whether --enable-sockets or --disable-sockets was given.
35740 -if test "${enable_sockets+set}" = set; then
35741 - enableval="$enable_sockets"
35742 - PHP_SOCKETS=$enableval
35743 + if test "$found" = "yes"; then
35745 + LIBS="$LIBS -lresolv"
35746 + if test "$cross_compiling" = yes; then
35751 - test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL
35753 + cat > conftest.$ac_ext <<EOF
35754 +#line 92677 "configure"
35755 +#include "confdefs.h"
35756 +main() { return (0); }
35758 +if { (eval echo configure:92681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
35762 + echo "configure: failed program was:" >&5
35763 + cat conftest.$ac_ext >&5
35774 -ext_output="yes, shared"
35776 -case $PHP_SOCKETS in
35778 - PHP_SOCKETS=`echo "$PHP_SOCKETS"|$SED 's/^shared,//'`
35792 + if test "$found" = "yes"; then
35796 + c|c_r|pthread*) ;;
35798 + LIBS="-lresolv $LIBS"
35803 + cat >> confdefs.h <<\EOF
35804 +#define HAVE_DN_SKIPNAME 1
35807 -echo "$ac_t""$ext_output" 1>&6
35808 + cat >> confdefs.h <<\EOF
35809 +#define HAVE_LIBRESOLV 1
35812 + ac_cv_func_dn_skipname=yes
35816 + unset ac_cv_lib_bind_dn_skipname
35817 + unset ac_cv_lib_bind___dn_skipname
35819 + echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6
35820 +echo "configure:92723: checking for dn_skipname in -lbind" >&5
35821 +ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'`
35822 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35823 + echo $ac_n "(cached) $ac_c" 1>&6
35825 + ac_save_LIBS="$LIBS"
35826 +LIBS="-lbind $LIBS"
35827 +cat > conftest.$ac_ext <<EOF
35828 +#line 92731 "configure"
35829 +#include "confdefs.h"
35830 +/* Override any gcc2 internal prototype to avoid an error. */
35831 +/* We use char because int might match the return type of a gcc2
35832 + builtin and then its argument prototype would still apply. */
35833 +char dn_skipname();
35839 +if { (eval echo configure:92742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35841 + eval "ac_cv_lib_$ac_lib_var=yes"
35843 + echo "configure: failed program was:" >&5
35844 + cat conftest.$ac_ext >&5
35846 + eval "ac_cv_lib_$ac_lib_var=no"
35849 +LIBS="$ac_save_LIBS"
35852 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35853 + echo "$ac_t""yes" 1>&6
35856 + echo "$ac_t""no" 1>&6
35858 -if test "$PHP_SOCKETS" != "no"; then
35859 - echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
35860 -echo "configure:86049: checking for struct cmsghdr" >&5
35861 -if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then
35862 + echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
35863 +echo "configure:92762: checking for __dn_skipname in -lbind" >&5
35864 +ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'`
35865 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35866 echo $ac_n "(cached) $ac_c" 1>&6
35869 - cat > conftest.$ac_ext <<EOF
35870 -#line 86055 "configure"
35871 + ac_save_LIBS="$LIBS"
35872 +LIBS="-lbind $LIBS"
35873 +cat > conftest.$ac_ext <<EOF
35874 +#line 92770 "configure"
35875 #include "confdefs.h"
35876 +/* Override any gcc2 internal prototype to avoid an error. */
35877 +/* We use char because int might match the return type of a gcc2
35878 + builtin and then its argument prototype would still apply. */
35879 +char __dn_skipname();
35881 -#include <sys/types.h>
35882 -#include <sys/socket.h>
35884 -struct cmsghdr s; s
35888 -if { (eval echo configure:86064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
35889 +if { (eval echo configure:92781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
35891 - ac_cv_cmsghdr=yes
35892 + eval "ac_cv_lib_$ac_lib_var=yes"
35894 echo "configure: failed program was:" >&5
35895 cat conftest.$ac_ext >&5
35898 + eval "ac_cv_lib_$ac_lib_var=no"
35901 +LIBS="$ac_save_LIBS"
35904 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
35905 + echo "$ac_t""yes" 1>&6
35908 + echo "$ac_t""no" 1>&6
35915 -echo "$ac_t""$ac_cv_cmsghdr" 1>&6
35917 - if test "$ac_cv_cmsghdr" = yes; then
35918 + if test "$found" = "yes"; then
35920 + LIBS="$LIBS -lbind"
35921 + if test "$cross_compiling" = yes; then
35924 + cat > conftest.$ac_ext <<EOF
35925 +#line 92813 "configure"
35926 +#include "confdefs.h"
35927 +main() { return (0); }
35929 +if { (eval echo configure:92817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
35933 + echo "configure: failed program was:" >&5
35934 + cat conftest.$ac_ext >&5
35944 + if test "$found" = "yes"; then
35948 + c|c_r|pthread*) ;;
35950 + LIBS="-lbind $LIBS"
35955 cat >> confdefs.h <<\EOF
35956 -#define HAVE_CMSGHDR 1
35957 +#define HAVE_DN_SKIPNAME 1
35961 + cat >> confdefs.h <<\EOF
35962 +#define HAVE_LIBBIND 1
35965 - for ac_func in hstrerror socketpair
35967 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
35968 -echo "configure:86089: checking for $ac_func" >&5
35969 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
35970 + ac_cv_func_dn_skipname=yes
35974 + unset ac_cv_lib_socket_dn_skipname
35975 + unset ac_cv_lib_socket___dn_skipname
35977 + echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6
35978 +echo "configure:92859: checking for dn_skipname in -lsocket" >&5
35979 +ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'`
35980 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35981 echo $ac_n "(cached) $ac_c" 1>&6
35983 - cat > conftest.$ac_ext <<EOF
35984 -#line 86094 "configure"
35985 + ac_save_LIBS="$LIBS"
35986 +LIBS="-lsocket $LIBS"
35987 +cat > conftest.$ac_ext <<EOF
35988 +#line 92867 "configure"
35989 #include "confdefs.h"
35990 -/* System header to define __stub macros and hopefully few prototypes,
35991 - which can conflict with char $ac_func(); below. */
35992 -#include <assert.h>
35993 /* Override any gcc2 internal prototype to avoid an error. */
35994 /* We use char because int might match the return type of a gcc2
35995 builtin and then its argument prototype would still apply. */
35997 +char dn_skipname();
36001 -/* The GNU C library defines this for functions which it implements
36002 - to always fail with ENOSYS. Some functions are actually named
36003 - something starting with __ and the normal name is an alias. */
36004 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
36013 -if { (eval echo configure:86117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
36014 +if { (eval echo configure:92878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
36016 - eval "ac_cv_func_$ac_func=yes"
36017 + eval "ac_cv_lib_$ac_lib_var=yes"
36019 echo "configure: failed program was:" >&5
36020 cat conftest.$ac_ext >&5
36022 - eval "ac_cv_func_$ac_func=no"
36023 + eval "ac_cv_lib_$ac_lib_var=no"
36027 +LIBS="$ac_save_LIBS"
36029 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
36031 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
36032 echo "$ac_t""yes" 1>&6
36033 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
36034 - cat >> confdefs.h <<EOF
36035 -#define $ac_tr_func 1
36040 echo "$ac_t""no" 1>&6
36044 - for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h
36046 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
36047 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
36048 -echo "configure:86145: checking for $ac_hdr" >&5
36049 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
36050 + echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6
36051 +echo "configure:92898: checking for __dn_skipname in -lsocket" >&5
36052 +ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'`
36053 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
36054 echo $ac_n "(cached) $ac_c" 1>&6
36056 - cat > conftest.$ac_ext <<EOF
36057 -#line 86150 "configure"
36058 + ac_save_LIBS="$LIBS"
36059 +LIBS="-lsocket $LIBS"
36060 +cat > conftest.$ac_ext <<EOF
36061 +#line 92906 "configure"
36062 #include "confdefs.h"
36063 -#include <$ac_hdr>
36064 +/* Override any gcc2 internal prototype to avoid an error. */
36065 +/* We use char because int might match the return type of a gcc2
36066 + builtin and then its argument prototype would still apply. */
36067 +char __dn_skipname();
36073 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
36074 -{ (eval echo configure:86155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
36075 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
36076 -if test -z "$ac_err"; then
36077 +if { (eval echo configure:92917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
36079 - eval "ac_cv_header_$ac_safe=yes"
36080 + eval "ac_cv_lib_$ac_lib_var=yes"
36082 - echo "$ac_err" >&5
36083 echo "configure: failed program was:" >&5
36084 cat conftest.$ac_ext >&5
36086 - eval "ac_cv_header_$ac_safe=no"
36087 + eval "ac_cv_lib_$ac_lib_var=no"
36090 +LIBS="$ac_save_LIBS"
36093 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
36094 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
36095 echo "$ac_t""yes" 1>&6
36096 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
36097 - cat >> confdefs.h <<EOF
36098 -#define $ac_tr_hdr 1
36103 echo "$ac_t""no" 1>&6
36112 + if test "$found" = "yes"; then
36114 + LIBS="$LIBS -lsocket"
36115 + if test "$cross_compiling" = yes; then
36118 cat > conftest.$ac_ext <<EOF
36119 -#line 86182 "configure"
36120 +#line 92949 "configure"
36121 #include "confdefs.h"
36123 -#include <sys/types.h>
36124 -#include <sys/socket.h>
36127 -static struct msghdr tp; int n = (int) tp.msg_flags; return n
36129 +main() { return (0); }
36131 -if { (eval echo configure:86192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
36133 +if { (eval echo configure:92953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
36137 echo "configure: failed program was:" >&5
36138 cat conftest.$ac_ext >&5
36140 - cat >> confdefs.h <<\EOF
36141 -#define MISSING_MSGHDR_MSGFLAGS 1
36151 - cat >> confdefs.h <<\EOF
36152 -#define HAVE_SOCKETS 1
36157 - ext_builddir=ext/sockets
36158 - ext_srcdir=$abs_srcdir/ext/sockets
36164 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
36165 - PHP_SOCKETS_SHARED=no
36166 + if test "$found" = "yes"; then
36169 - case ext/sockets in
36170 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
36171 - /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36172 - *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36174 + c|c_r|pthread*) ;;
36176 + LIBS="-lsocket $LIBS"
36182 - b_c_pre=$php_c_pre
36183 - b_cxx_pre=$php_cxx_pre
36184 - b_c_meta=$php_c_meta
36185 - b_cxx_meta=$php_cxx_meta
36186 - b_c_post=$php_c_post
36187 - b_cxx_post=$php_cxx_post
36192 - for ac_src in sockets.c; do
36199 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
36202 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36203 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36204 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36205 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
36208 - cat >>Makefile.objects<<EOF
36209 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
36211 + cat >> confdefs.h <<\EOF
36212 +#define HAVE_DN_SKIPNAME 1
36217 - EXT_STATIC="$EXT_STATIC sockets"
36218 - if test "$ext_shared" != "nocli"; then
36219 - EXT_CLI_STATIC="$EXT_CLI_STATIC sockets"
36222 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
36223 - PHP_SOCKETS_SHARED=yes
36225 - case ext/sockets in
36226 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
36227 - /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36228 - *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36233 - b_c_pre=$shared_c_pre
36234 - b_cxx_pre=$shared_cxx_pre
36235 - b_c_meta=$shared_c_meta
36236 - b_cxx_meta=$shared_cxx_meta
36237 - b_c_post=$shared_c_post
36238 - b_cxx_post=$shared_cxx_post
36243 - for ac_src in sockets.c; do
36250 - shared_objects_sockets="$shared_objects_sockets $ac_bdir$ac_obj.lo"
36253 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36254 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36255 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36256 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
36259 - cat >>Makefile.objects<<EOF
36260 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
36262 + cat >> confdefs.h <<\EOF
36263 +#define HAVE_LIBSOCKET 1
36267 - case $host_alias in
36270 - install_modules="install-modules"
36272 - case $host_alias in
36275 - 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'
36279 - link_cmd='$(LIBTOOL) --mode=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)'
36283 - link_cmd='$(LIBTOOL) --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)'
36287 - if test "x" = "xyes"; then
36288 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsockets.$suffix"
36289 + ac_cv_func_dn_skipname=yes
36291 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsockets.$suffix"
36297 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets"
36299 - cat >>Makefile.objects<<EOF
36300 -\$(phplibdir)/phpsockets.$suffix: $ext_builddir/phpsockets.$suffix
36301 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpsockets.$suffix \$(phplibdir)
36303 -$ext_builddir/phpsockets.$suffix: \$(shared_objects_sockets) \$(PHPSOCKETS_SHARED_DEPENDENCIES)
36311 - install_modules="install-modules"
36313 - case $host_alias in
36316 - 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'
36320 - link_cmd='$(LIBTOOL) --mode=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)'
36324 - link_cmd='$(LIBTOOL) --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)'
36328 - if test "x" = "xyes"; then
36329 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sockets.$suffix"
36331 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/sockets.$suffix"
36334 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets"
36336 - cat >>Makefile.objects<<EOF
36337 -\$(phplibdir)/sockets.$suffix: $ext_builddir/sockets.$suffix
36338 - \$(LIBTOOL) --mode=install cp $ext_builddir/sockets.$suffix \$(phplibdir)
36340 -$ext_builddir/sockets.$suffix: \$(shared_objects_sockets) \$(SOCKETS_SHARED_DEPENDENCIES)
36347 - cat >> confdefs.h <<EOF
36348 -#define COMPILE_DL_SOCKETS 1
36354 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
36355 - PHP_SOCKETS_SHARED=no
36356 - case "$PHP_SAPI" in
36360 - case ext/sockets in
36361 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
36362 - /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36363 - *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36369 - b_c_pre=$php_c_pre
36370 - b_cxx_pre=$php_cxx_pre
36371 - b_c_meta=$php_c_meta
36372 - b_cxx_meta=$php_cxx_meta
36373 - b_c_post=$php_c_post
36374 - b_cxx_post=$php_cxx_post
36380 - for ac_src in sockets.c; do
36387 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
36390 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36391 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36392 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36393 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
36396 - cat >>Makefile.objects<<EOF
36397 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
36401 + unset ac_cv_func_res_search
36402 + unset ac_cv_func___res_search
36405 + echo $ac_n "checking for res_search""... $ac_c" 1>&6
36406 +echo "configure:93012: checking for res_search" >&5
36407 +if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
36408 + echo $ac_n "(cached) $ac_c" 1>&6
36410 + cat > conftest.$ac_ext <<EOF
36411 +#line 93017 "configure"
36412 +#include "confdefs.h"
36413 +/* System header to define __stub macros and hopefully few prototypes,
36414 + which can conflict with char res_search(); below. */
36415 +#include <assert.h>
36416 +/* Override any gcc2 internal prototype to avoid an error. */
36417 +/* We use char because int might match the return type of a gcc2
36418 + builtin and then its argument prototype would still apply. */
36419 +char res_search();
36423 - EXT_STATIC="$EXT_STATIC sockets"
36428 - case ext/sockets in
36429 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
36430 - /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36431 - *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36435 +/* The GNU C library defines this for functions which it implements
36436 + to always fail with ENOSYS. Some functions are actually named
36437 + something starting with __ and the normal name is an alias. */
36438 +#if defined (__stub_res_search) || defined (__stub___res_search)
36444 - b_c_pre=$php_c_pre
36445 - b_cxx_pre=$php_cxx_pre
36446 - b_c_meta=$php_c_meta
36447 - b_cxx_meta=$php_cxx_meta
36448 - b_c_post=$php_c_post
36449 - b_cxx_post=$php_cxx_post
36453 +if { (eval echo configure:93040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
36455 + eval "ac_cv_func_res_search=yes"
36457 + echo "configure: failed program was:" >&5
36458 + cat conftest.$ac_ext >&5
36460 + eval "ac_cv_func_res_search=no"
36465 +if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then
36466 + echo "$ac_t""yes" 1>&6
36469 + echo "$ac_t""no" 1>&6
36470 + echo $ac_n "checking for __res_search""... $ac_c" 1>&6
36471 +echo "configure:93058: checking for __res_search" >&5
36472 +if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then
36473 + echo $ac_n "(cached) $ac_c" 1>&6
36475 + cat > conftest.$ac_ext <<EOF
36476 +#line 93063 "configure"
36477 +#include "confdefs.h"
36478 +/* System header to define __stub macros and hopefully few prototypes,
36479 + which can conflict with char __res_search(); below. */
36480 +#include <assert.h>
36481 +/* Override any gcc2 internal prototype to avoid an error. */
36482 +/* We use char because int might match the return type of a gcc2
36483 + builtin and then its argument prototype would still apply. */
36484 +char __res_search();
36487 - for ac_src in sockets.c; do
36494 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
36498 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36499 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36500 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36501 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
36503 +/* The GNU C library defines this for functions which it implements
36504 + to always fail with ENOSYS. Some functions are actually named
36505 + something starting with __ and the normal name is an alias. */
36506 +#if defined (__stub___res_search) || defined (__stub_____res_search)
36512 - cat >>Makefile.objects<<EOF
36513 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
36518 +if { (eval echo configure:93086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
36520 + eval "ac_cv_func___res_search=yes"
36522 + echo "configure: failed program was:" >&5
36523 + cat conftest.$ac_ext >&5
36525 + eval "ac_cv_func___res_search=no"
36530 +if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then
36531 + echo "$ac_t""yes" 1>&6
36534 + echo "$ac_t""no" 1>&6
36543 - EXT_CLI_STATIC="$EXT_CLI_STATIC sockets"
36548 + cat >> confdefs.h <<\EOF
36549 +#define HAVE_RES_SEARCH 1
36552 + ac_cv_func_res_search=yes
36555 - BUILD_DIR="$BUILD_DIR $ext_builddir"
36558 + unset ac_cv_lib_resolv_res_search
36559 + unset ac_cv_lib_resolv___res_search
36561 + echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
36562 +echo "configure:93124: checking for res_search in -lresolv" >&5
36563 +ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
36564 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
36565 + echo $ac_n "(cached) $ac_c" 1>&6
36567 + ac_save_LIBS="$LIBS"
36568 +LIBS="-lresolv $LIBS"
36569 +cat > conftest.$ac_ext <<EOF
36570 +#line 93132 "configure"
36571 +#include "confdefs.h"
36572 +/* Override any gcc2 internal prototype to avoid an error. */
36573 +/* We use char because int might match the return type of a gcc2
36574 + builtin and then its argument prototype would still apply. */
36575 +char res_search();
36581 +if { (eval echo configure:93143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
36583 + eval "ac_cv_lib_$ac_lib_var=yes"
36585 + echo "configure: failed program was:" >&5
36586 + cat conftest.$ac_ext >&5
36588 + eval "ac_cv_lib_$ac_lib_var=no"
36591 +LIBS="$ac_save_LIBS"
36593 - if test "$ext_builddir" = "."; then
36594 - PHP_PECL_EXTENSION=sockets
36596 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
36598 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
36599 + echo "$ac_t""yes" 1>&6
36602 + echo "$ac_t""no" 1>&6
36605 + echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6
36606 +echo "configure:93163: checking for __res_search in -lresolv" >&5
36607 +ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'`
36608 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
36609 + echo $ac_n "(cached) $ac_c" 1>&6
36611 + ac_save_LIBS="$LIBS"
36612 +LIBS="-lresolv $LIBS"
36613 +cat > conftest.$ac_ext <<EOF
36614 +#line 93171 "configure"
36615 +#include "confdefs.h"
36616 +/* Override any gcc2 internal prototype to avoid an error. */
36617 +/* We use char because int might match the return type of a gcc2
36618 + builtin and then its argument prototype would still apply. */
36619 +char __res_search();
36623 - header_path=ext/sockets/
36624 - for header_file in php_sockets.h; do
36625 - hp_hf="$header_path/$header_file"
36628 - unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
36630 - cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
36631 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
36632 - eval "INSTALLHEADERS$unique=set"
36634 - INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
36641 +if { (eval echo configure:93182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
36643 + eval "ac_cv_lib_$ac_lib_var=yes"
36645 + echo "configure: failed program was:" >&5
36646 + cat conftest.$ac_ext >&5
36648 + eval "ac_cv_lib_$ac_lib_var=no"
36651 +LIBS="$ac_save_LIBS"
36656 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
36657 + echo "$ac_t""yes" 1>&6
36660 + echo "$ac_t""no" 1>&6
36668 - echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6
36669 -echo "configure:86526: checking whether zend_object_value is packed" >&5
36670 - old_CPPFLAGS=$CPPFLAGS
36671 - CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS"
36672 - if test "$cross_compiling" = yes; then
36675 - echo "$ac_t""no" 1>&6
36677 + if test "$found" = "yes"; then
36679 + LIBS="$LIBS -lresolv"
36680 + if test "$cross_compiling" = yes; then
36683 cat > conftest.$ac_ext <<EOF
36684 -#line 86536 "configure"
36685 +#line 93214 "configure"
36686 #include "confdefs.h"
36688 -#include "Zend/zend_types.h"
36689 -int main(int argc, char **argv) {
36690 - return ((sizeof(zend_object_handle) + sizeof(zend_object_handlers*)) == sizeof(zend_object_value)) ? 0 : 1;
36693 +main() { return (0); }
36695 -if { (eval echo configure:86545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
36696 +if { (eval echo configure:93218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
36700 - echo "$ac_t""yes" 1>&6
36704 echo "configure: failed program was:" >&5
36705 cat conftest.$ac_ext >&5
36709 - echo "$ac_t""no" 1>&6
36716 - CPPFLAGS=$old_CPPFLAGS
36717 - cat >> confdefs.h <<EOF
36718 -#define HAVE_PACKED_OBJECT_VALUE $ac_result
36721 - cat >> confdefs.h <<\EOF
36722 -#define HAVE_SPL 1
36726 - ext_builddir=ext/spl
36727 - ext_srcdir=$abs_srcdir/ext/spl
36733 - if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then
36734 - PHP_SPL_SHARED=no
36735 + if test "$found" = "yes"; then
36739 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
36740 - /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36741 - *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36743 + c|c_r|pthread*) ;;
36745 + LIBS="-lresolv $LIBS"
36751 - b_c_pre=$php_c_pre
36752 - b_cxx_pre=$php_cxx_pre
36753 - b_c_meta=$php_c_meta
36754 - b_cxx_meta=$php_cxx_meta
36755 - b_c_post=$php_c_post
36756 - b_cxx_post=$php_cxx_post
36759 + cat >> confdefs.h <<\EOF
36760 +#define HAVE_RES_SEARCH 1
36764 - 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
36771 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
36772 + cat >> confdefs.h <<\EOF
36773 +#define HAVE_LIBRESOLV 1
36777 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36778 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36779 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36780 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
36782 + ac_cv_func_res_search=yes
36786 + unset ac_cv_lib_bind_res_search
36787 + unset ac_cv_lib_bind___res_search
36789 + echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6
36790 +echo "configure:93260: checking for res_search in -lbind" >&5
36791 +ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'`
36792 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
36793 + echo $ac_n "(cached) $ac_c" 1>&6
36795 + ac_save_LIBS="$LIBS"
36796 +LIBS="-lbind $LIBS"
36797 +cat > conftest.$ac_ext <<EOF
36798 +#line 93268 "configure"
36799 +#include "confdefs.h"
36800 +/* Override any gcc2 internal prototype to avoid an error. */
36801 +/* We use char because int might match the return type of a gcc2
36802 + builtin and then its argument prototype would still apply. */
36803 +char res_search();
36805 - cat >>Makefile.objects<<EOF
36806 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
36813 +if { (eval echo configure:93279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
36815 + eval "ac_cv_lib_$ac_lib_var=yes"
36817 + echo "configure: failed program was:" >&5
36818 + cat conftest.$ac_ext >&5
36820 + eval "ac_cv_lib_$ac_lib_var=no"
36823 +LIBS="$ac_save_LIBS"
36826 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
36827 + echo "$ac_t""yes" 1>&6
36830 + echo "$ac_t""no" 1>&6
36832 - EXT_STATIC="$EXT_STATIC spl"
36833 - if test "no" != "nocli"; then
36834 - EXT_CLI_STATIC="$EXT_CLI_STATIC spl"
36837 - if test "no" = "shared" || test "no" = "yes"; then
36838 - PHP_SPL_SHARED=yes
36841 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
36842 - /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
36843 - *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
36847 + echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6
36848 +echo "configure:93299: checking for __res_search in -lbind" >&5
36849 +ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'`
36850 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
36851 + echo $ac_n "(cached) $ac_c" 1>&6
36853 + ac_save_LIBS="$LIBS"
36854 +LIBS="-lbind $LIBS"
36855 +cat > conftest.$ac_ext <<EOF
36856 +#line 93307 "configure"
36857 +#include "confdefs.h"
36858 +/* Override any gcc2 internal prototype to avoid an error. */
36859 +/* We use char because int might match the return type of a gcc2
36860 + builtin and then its argument prototype would still apply. */
36861 +char __res_search();
36863 - b_c_pre=$shared_c_pre
36864 - b_cxx_pre=$shared_cxx_pre
36865 - b_c_meta=$shared_c_meta
36866 - b_cxx_meta=$shared_cxx_meta
36867 - b_c_post=$shared_c_post
36868 - b_cxx_post=$shared_cxx_post
36874 +if { (eval echo configure:93318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
36876 + eval "ac_cv_lib_$ac_lib_var=yes"
36878 + echo "configure: failed program was:" >&5
36879 + cat conftest.$ac_ext >&5
36881 + eval "ac_cv_lib_$ac_lib_var=no"
36884 +LIBS="$ac_save_LIBS"
36887 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
36888 + echo "$ac_t""yes" 1>&6
36891 + echo "$ac_t""no" 1>&6
36896 - 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
36903 - shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo"
36907 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36908 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36909 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
36910 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
36913 - cat >>Makefile.objects<<EOF
36914 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
36916 + if test "$found" = "yes"; then
36918 + LIBS="$LIBS -lbind"
36919 + if test "$cross_compiling" = yes; then
36922 + cat > conftest.$ac_ext <<EOF
36923 +#line 93350 "configure"
36924 +#include "confdefs.h"
36925 +main() { return (0); }
36928 +if { (eval echo configure:93354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
36932 + echo "configure: failed program was:" >&5
36933 + cat conftest.$ac_ext >&5
36940 - case $host_alias in
36943 - install_modules="install-modules"
36947 - case $host_alias in
36950 - 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'
36954 - link_cmd='$(LIBTOOL) --mode=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)'
36958 - link_cmd='$(LIBTOOL) --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)'
36960 + if test "$found" = "yes"; then
36964 + c|c_r|pthread*) ;;
36966 + LIBS="-lbind $LIBS"
36970 - if test "x" = "xyes"; then
36971 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpspl.$suffix"
36973 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix"
36976 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl"
36978 - cat >>Makefile.objects<<EOF
36979 -\$(phplibdir)/phpspl.$suffix: $ext_builddir/phpspl.$suffix
36980 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpspl.$suffix \$(phplibdir)
36981 + cat >> confdefs.h <<\EOF
36982 +#define HAVE_RES_SEARCH 1
36985 -$ext_builddir/phpspl.$suffix: \$(shared_objects_spl) \$(PHPSPL_SHARED_DEPENDENCIES)
36987 + cat >> confdefs.h <<\EOF
36988 +#define HAVE_LIBBIND 1
36991 + ac_cv_func_res_search=yes
36995 + unset ac_cv_lib_socket_res_search
36996 + unset ac_cv_lib_socket___res_search
36998 + echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6
36999 +echo "configure:93396: checking for res_search in -lsocket" >&5
37000 +ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'`
37001 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
37002 + echo $ac_n "(cached) $ac_c" 1>&6
37004 + ac_save_LIBS="$LIBS"
37005 +LIBS="-lsocket $LIBS"
37006 +cat > conftest.$ac_ext <<EOF
37007 +#line 93404 "configure"
37008 +#include "confdefs.h"
37009 +/* Override any gcc2 internal prototype to avoid an error. */
37010 +/* We use char because int might match the return type of a gcc2
37011 + builtin and then its argument prototype would still apply. */
37012 +char res_search();
37018 +if { (eval echo configure:93415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
37020 + eval "ac_cv_lib_$ac_lib_var=yes"
37022 + echo "configure: failed program was:" >&5
37023 + cat conftest.$ac_ext >&5
37025 + eval "ac_cv_lib_$ac_lib_var=no"
37028 +LIBS="$ac_save_LIBS"
37033 - install_modules="install-modules"
37035 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
37036 + echo "$ac_t""yes" 1>&6
37039 + echo "$ac_t""no" 1>&6
37041 - case $host_alias in
37044 - 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'
37048 - link_cmd='$(LIBTOOL) --mode=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)'
37052 - link_cmd='$(LIBTOOL) --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)'
37055 + echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6
37056 +echo "configure:93435: checking for __res_search in -lsocket" >&5
37057 +ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'`
37058 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
37059 + echo $ac_n "(cached) $ac_c" 1>&6
37061 + ac_save_LIBS="$LIBS"
37062 +LIBS="-lsocket $LIBS"
37063 +cat > conftest.$ac_ext <<EOF
37064 +#line 93443 "configure"
37065 +#include "confdefs.h"
37066 +/* Override any gcc2 internal prototype to avoid an error. */
37067 +/* We use char because int might match the return type of a gcc2
37068 + builtin and then its argument prototype would still apply. */
37069 +char __res_search();
37071 - if test "x" = "xyes"; then
37072 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/spl.$suffix"
37074 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix"
37077 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl"
37082 +if { (eval echo configure:93454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
37084 + eval "ac_cv_lib_$ac_lib_var=yes"
37086 + echo "configure: failed program was:" >&5
37087 + cat conftest.$ac_ext >&5
37089 + eval "ac_cv_lib_$ac_lib_var=no"
37092 +LIBS="$ac_save_LIBS"
37094 - cat >>Makefile.objects<<EOF
37095 -\$(phplibdir)/spl.$suffix: $ext_builddir/spl.$suffix
37096 - \$(LIBTOOL) --mode=install cp $ext_builddir/spl.$suffix \$(phplibdir)
37098 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
37099 + echo "$ac_t""yes" 1>&6
37102 + echo "$ac_t""no" 1>&6
37106 -$ext_builddir/spl.$suffix: \$(shared_objects_spl) \$(SPL_SHARED_DEPENDENCIES)
37115 - cat >> confdefs.h <<EOF
37116 -#define COMPILE_DL_SPL 1
37117 + if test "$found" = "yes"; then
37119 + LIBS="$LIBS -lsocket"
37120 + if test "$cross_compiling" = yes; then
37123 + cat > conftest.$ac_ext <<EOF
37124 +#line 93486 "configure"
37125 +#include "confdefs.h"
37126 +main() { return (0); }
37128 +if { (eval echo configure:93490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
37132 + echo "configure: failed program was:" >&5
37133 + cat conftest.$ac_ext >&5
37144 - if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then
37145 - PHP_SPL_SHARED=no
37146 - case "$PHP_SAPI" in
37149 + if test "$found" = "yes"; then
37153 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
37154 - /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
37155 - *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
37157 + c|c_r|pthread*) ;;
37159 + LIBS="-lsocket $LIBS"
37165 - b_c_pre=$php_c_pre
37166 - b_cxx_pre=$php_cxx_pre
37167 - b_c_meta=$php_c_meta
37168 - b_cxx_meta=$php_cxx_meta
37169 - b_c_post=$php_c_post
37170 - b_cxx_post=$php_cxx_post
37173 + cat >> confdefs.h <<\EOF
37174 +#define HAVE_RES_SEARCH 1
37178 - 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
37185 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
37186 + cat >> confdefs.h <<\EOF
37187 +#define HAVE_LIBSOCKET 1
37191 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37192 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37193 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37194 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
37196 + ac_cv_func_res_search=yes
37201 - cat >>Makefile.objects<<EOF
37202 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
37212 - EXT_STATIC="$EXT_STATIC spl"
37221 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
37222 - /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
37223 - *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
37227 +echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6
37228 +echo "configure:93543: checking whether atof() accepts NAN" >&5
37229 +if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then
37230 + echo $ac_n "(cached) $ac_c" 1>&6
37233 +if test "$cross_compiling" = yes; then
37235 + ac_cv_atof_accept_nan=no
37237 - b_c_pre=$php_c_pre
37238 - b_cxx_pre=$php_cxx_pre
37239 - b_c_meta=$php_c_meta
37240 - b_cxx_meta=$php_cxx_meta
37241 - b_c_post=$php_c_post
37242 - b_cxx_post=$php_cxx_post
37245 + cat > conftest.$ac_ext <<EOF
37246 +#line 93554 "configure"
37247 +#include "confdefs.h"
37250 +#include <stdlib.h>
37253 - 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
37260 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
37262 +#define zend_isnan(a) isnan(a)
37263 +#elif defined(HAVE_FPCLASS)
37264 +#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
37266 +#define zend_isnan(a) 0
37270 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37271 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37272 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
37273 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
37275 +int main(int argc, char** argv)
37277 + return zend_isnan(atof("NAN")) ? 0 : 1;
37280 - cat >>Makefile.objects<<EOF
37281 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
37289 - EXT_CLI_STATIC="$EXT_CLI_STATIC spl"
37292 +if { (eval echo configure:93574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
37295 - BUILD_DIR="$BUILD_DIR $ext_builddir"
37296 + ac_cv_atof_accept_nan=yes
37299 + echo "configure: failed program was:" >&5
37300 + cat conftest.$ac_ext >&5
37303 + ac_cv_atof_accept_nan=no
37309 - if test "$ext_builddir" = "."; then
37310 - PHP_PECL_EXTENSION=spl
37312 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
37316 +echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6
37317 +if test "$ac_cv_atof_accept_nan" = "yes"; then
37318 + cat >> confdefs.h <<\EOF
37319 +#define HAVE_ATOF_ACCEPTS_NAN 1
37324 +echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6
37325 +echo "configure:93601: checking whether atof() accepts INF" >&5
37326 +if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then
37327 + echo $ac_n "(cached) $ac_c" 1>&6
37330 +if test "$cross_compiling" = yes; then
37332 - header_path=ext/spl
37333 - 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
37334 - hp_hf="$header_path/$header_file"
37337 - unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
37339 - cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
37340 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
37341 - eval "INSTALLHEADERS$unique=set"
37343 - INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
37346 + ac_cv_atof_accept_inf=no
37351 + cat > conftest.$ac_ext <<EOF
37352 +#line 93612 "configure"
37353 +#include "confdefs.h"
37356 - am_i_shared=$PHP_SPL_SHARED
37357 - is_it_shared=$PHP_PCRE_SHARED
37358 - is_it_enabled=$PHP_PCRE
37359 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
37360 - { echo "configure: error:
37361 -You've configured extension spl to build statically, but it
37362 -depends on extension pcre, which you've configured to build shared.
37363 -You either need to build spl shared or build pcre statically for the
37364 -build to be successful.
37367 - if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
37368 - { echo "configure: error:
37369 -You've configured extension spl, which depends on extension pcre,
37370 -but you've either not enabled pcre, or have disabled it.
37375 +#include <stdlib.h>
37378 +#define zend_isinf(a) isinf(a)
37379 +#elif defined(INFINITY)
37380 +/* Might not work, but is required by ISO C99 */
37381 +#define zend_isinf(a) (((a)==INFINITY)?1:0)
37382 +#elif defined(HAVE_FPCLASS)
37383 +#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
37385 +#define zend_isinf(a) 0
37388 +int main(int argc, char** argv)
37390 + return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1;
37393 -php_with_sqlite=yes
37395 +if { (eval echo configure:93635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
37398 + ac_cv_atof_accept_inf=yes
37400 -echo $ac_n "checking for sqlite support""... $ac_c" 1>&6
37401 -echo "configure:86909: checking for sqlite support" >&5
37402 -# Check whether --with-sqlite or --without-sqlite was given.
37403 -if test "${with_sqlite+set}" = set; then
37404 - withval="$with_sqlite"
37405 - PHP_SQLITE=$withval
37407 + echo "configure: failed program was:" >&5
37408 + cat conftest.$ac_ext >&5
37412 - test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL
37413 + ac_cv_atof_accept_inf=no
37421 +echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6
37422 +if test "$ac_cv_atof_accept_inf" = "yes"; then
37423 + cat >> confdefs.h <<\EOF
37424 +#define HAVE_ATOF_ACCEPTS_INF 1
37427 -ext_output="yes, shared"
37429 -case $PHP_SQLITE in
37431 - PHP_SQLITE=`echo "$PHP_SQLITE"|$SED 's/^shared,//'`
37449 -echo "$ac_t""$ext_output" 1>&6
37450 +echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6
37451 +echo "configure:93662: checking whether HUGE_VAL == INF" >&5
37452 +if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then
37453 + echo $ac_n "(cached) $ac_c" 1>&6
37456 +if test "$cross_compiling" = yes; then
37458 + ac_cv_huge_val_inf=yes
37461 + cat > conftest.$ac_ext <<EOF
37462 +#line 93673 "configure"
37463 +#include "confdefs.h"
37466 +#include <stdlib.h>
37469 +#define zend_isinf(a) isinf(a)
37470 +#elif defined(INFINITY)
37471 +/* Might not work, but is required by ISO C99 */
37472 +#define zend_isinf(a) (((a)==INFINITY)?1:0)
37473 +#elif defined(HAVE_FPCLASS)
37474 +#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
37476 +#define zend_isinf(a) 0
37479 +int main(int argc, char** argv)
37481 + return zend_isinf(HUGE_VAL) ? 0 : 1;
37484 -php_enable_sqlite_utf8=no
37486 +if { (eval echo configure:93696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
37489 + ac_cv_huge_val_inf=yes
37491 -echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6
37492 -echo "configure:86953: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
37493 -# Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given.
37494 -if test "${enable_sqlite_utf8+set}" = set; then
37495 - enableval="$enable_sqlite_utf8"
37496 - PHP_SQLITE_UTF8=$enableval
37498 + echo "configure: failed program was:" >&5
37499 + cat conftest.$ac_ext >&5
37502 - PHP_SQLITE_UTF8=no
37504 + ac_cv_huge_val_inf=no
37512 -ext_output=$PHP_SQLITE_UTF8
37513 -echo "$ac_t""$ext_output" 1>&6
37515 +echo "$ac_t""$ac_cv_huge_val_inf" 1>&6
37516 +if test "$ac_cv_huge_val_inf" = "yes"; then
37517 + cat >> confdefs.h <<\EOF
37518 +#define HAVE_HUGE_VAL_INF 1
37523 +echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6
37524 +echo "configure:93723: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
37525 +if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then
37526 + echo $ac_n "(cached) $ac_c" 1>&6
37529 +if test "$cross_compiling" = yes; then
37531 + ac_cv_huge_val_nan=yes
37534 + cat > conftest.$ac_ext <<EOF
37535 +#line 93734 "configure"
37536 +#include "confdefs.h"
37539 +#include <stdlib.h>
37542 +#define zend_isnan(a) isnan(a)
37543 +#elif defined(HAVE_FPCLASS)
37544 +#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
37546 +#define zend_isnan(a) 0
37549 +int main(int argc, char** argv)
37551 +#if defined(__sparc__) && !(__GNUC__ >= 3)
37552 + /* prevent bug #27830 */
37555 + return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1;
37560 +if { (eval echo configure:93759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
37563 + ac_cv_huge_val_nan=yes
37565 -if test "$PHP_SQLITE" != "no"; then
37566 - if test "$PHP_PDO" != "no"; then
37568 - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
37569 -echo "configure:86981: checking for PDO includes" >&5
37570 -if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
37571 - echo $ac_n "(cached) $ac_c" 1>&6
37573 + echo "configure: failed program was:" >&5
37574 + cat conftest.$ac_ext >&5
37577 - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
37578 -echo "configure:86987: checking for PDO includes" >&5
37579 - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
37580 - pdo_inc_path=$abs_srcdir/ext
37581 - elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
37582 - pdo_inc_path=$abs_srcdir/ext
37583 - elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
37584 - pdo_inc_path=$prefix/include/php/ext
37587 + ac_cv_huge_val_nan=no
37593 -echo "$ac_t""$pdo_inc_path" 1>&6
37594 - if test -n "$pdo_inc_path"; then
37597 -echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2
37601 - if test -n "$pdo_inc_path"; then
37602 - cat >> confdefs.h <<\EOF
37603 -#define PHP_SQLITE2_HAVE_PDO 1
37604 +echo "$ac_t""$ac_cv_huge_val_nan" 1>&6
37605 +if test "$ac_cv_huge_val_nan" = "yes"; then
37606 + cat >> confdefs.h <<\EOF
37607 +#define HAVE_HUGE_VAL_NAN 1
37610 - pdo_inc_path="-I$pdo_inc_path"
37614 - if test "$PHP_SQLITE" != "yes"; then
37615 - SEARCH_PATH="/usr/local /usr"
37616 - SEARCH_FOR="/include/sqlite.h"
37617 - if test -r $PHP_SQLITE/; then # path given as parameter
37618 - SQLITE_DIR=$PHP_SQLITE
37619 - else # search default path list
37620 - echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6
37621 -echo "configure:87021: checking for sqlite files in default path" >&5
37622 - for i in $SEARCH_PATH ; do
37623 - if test -r $i/$SEARCH_FOR; then
37625 - echo "$ac_t""found in $i" 1>&6
37630 - if test -z "$SQLITE_DIR"; then
37631 - echo "$ac_t""not found" 1>&6
37632 - { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; }
37636 - save_old_LDFLAGS=$LDFLAGS
37638 - -L$SQLITE_DIR/$PHP_LIBDIR -lm
37641 - save_ext_shared=$ext_shared
37644 - for ac_i in $ac_stuff; do
37647 - if test "$ext_shared" = "yes"; then
37648 - LDFLAGS="$LDFLAGS -pthread"
37652 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
37654 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
37655 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
37656 - eval "EXTRA_LDFLAGS$unique=set"
37657 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
37664 - ac_ii=`echo $ac_i|cut -c 3-`
37668 - c|c_r|pthread*) ;;
37670 - if test "$ext_shared" = "yes"; then
37671 - LDFLAGS="$LDFLAGS -l$ac_ii"
37674 +echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6
37675 +echo "configure:93786: checking whether strptime() declaration fails" >&5
37676 +if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then
37677 + echo $ac_n "(cached) $ac_c" 1>&6
37681 - c|c_r|pthread*) ;;
37683 - LIBS="$LIBS -l$ac_ii"
37691 +cat > conftest.$ac_ext <<EOF
37692 +#line 93792 "configure"
37693 +#include "confdefs.h"
37699 - ac_ii=`echo $ac_i|cut -c 3-`
37701 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
37703 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
37707 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
37709 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
37710 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
37715 - if test "$ext_shared" = "yes"; then
37716 - LDFLAGS="-L$ai_p $LDFLAGS"
37717 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
37722 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
37723 +#ifndef HAVE_STRPTIME
37724 +#error no strptime() on this platform
37726 +/* use invalid strptime() declaration to see if it fails to compile */
37727 +int strptime(const char *s, const char *format, struct tm *tm);
37732 +if { (eval echo configure:93808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
37735 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
37736 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
37737 - eval "LIBPATH$unique=set"
37739 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
37740 - LDFLAGS="$LDFLAGS -L$ai_p"
37741 - PHP_RPATHS="$PHP_RPATHS $ai_p"
37742 + ac_cv_strptime_decl_fails=no
37745 + echo "configure: failed program was:" >&5
37746 + cat conftest.$ac_ext >&5
37750 + ac_cv_strptime_decl_fails=yes
37759 +echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6
37760 +if test "$ac_cv_strptime_decl_fails" = "yes"; then
37761 + cat >> confdefs.h <<\EOF
37762 +#define HAVE_STRPTIME_DECL_FAILS 1
37770 - echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6
37771 -echo "configure:87133: checking for sqlite_open in -lsqlite" >&5
37772 -ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'`
37773 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
37774 +for ac_hdr in wchar.h
37776 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
37777 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
37778 +echo "configure:93836: checking for $ac_hdr" >&5
37779 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
37780 echo $ac_n "(cached) $ac_c" 1>&6
37782 - ac_save_LIBS="$LIBS"
37783 -LIBS="-lsqlite $LIBS"
37784 -cat > conftest.$ac_ext <<EOF
37785 -#line 87141 "configure"
37786 + cat > conftest.$ac_ext <<EOF
37787 +#line 93841 "configure"
37788 +#include "confdefs.h"
37789 +#include <$ac_hdr>
37791 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
37792 +{ (eval echo configure:93846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
37793 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
37794 +if test -z "$ac_err"; then
37796 + eval "ac_cv_header_$ac_safe=yes"
37798 + echo "$ac_err" >&5
37799 + echo "configure: failed program was:" >&5
37800 + cat conftest.$ac_ext >&5
37802 + eval "ac_cv_header_$ac_safe=no"
37806 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
37807 + echo "$ac_t""yes" 1>&6
37808 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
37809 + cat >> confdefs.h <<EOF
37810 +#define $ac_tr_hdr 1
37814 + echo "$ac_t""no" 1>&6
37818 +for ac_func in mblen
37820 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
37821 +echo "configure:93875: checking for $ac_func" >&5
37822 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
37823 + echo $ac_n "(cached) $ac_c" 1>&6
37825 + cat > conftest.$ac_ext <<EOF
37826 +#line 93880 "configure"
37827 #include "confdefs.h"
37828 +/* System header to define __stub macros and hopefully few prototypes,
37829 + which can conflict with char $ac_func(); below. */
37830 +#include <assert.h>
37831 /* Override any gcc2 internal prototype to avoid an error. */
37832 /* We use char because int might match the return type of a gcc2
37833 builtin and then its argument prototype would still apply. */
37834 -char sqlite_open();
37840 +/* The GNU C library defines this for functions which it implements
37841 + to always fail with ENOSYS. Some functions are actually named
37842 + something starting with __ and the normal name is an alias. */
37843 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
37851 -if { (eval echo configure:87152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
37852 +if { (eval echo configure:93903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
37854 - eval "ac_cv_lib_$ac_lib_var=yes"
37855 + eval "ac_cv_func_$ac_func=yes"
37857 echo "configure: failed program was:" >&5
37858 cat conftest.$ac_ext >&5
37860 - eval "ac_cv_lib_$ac_lib_var=no"
37861 + eval "ac_cv_func_$ac_func=no"
37864 -LIBS="$ac_save_LIBS"
37867 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
37868 - echo "$ac_t""yes" 1>&6
37870 - LDFLAGS=$save_old_LDFLAGS
37871 - ext_shared=$save_ext_shared
37875 - if test "$ext_shared" = "yes"; then
37876 - SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD"
37877 - if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then
37879 - if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
37881 - if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
37882 - ai_p=$SQLITE_DIR/$PHP_LIBDIR
37885 - ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
37887 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
37888 - ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`"
37892 - if test "$ext_shared" = "yes"; then
37893 - SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD"
37894 - test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_SHARED_LIBADD"
37899 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
37901 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
37902 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
37903 - eval "LIBPATH$unique=set"
37905 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
37906 - LDFLAGS="$LDFLAGS -L$ai_p"
37907 - PHP_RPATHS="$PHP_RPATHS $ai_p"
37915 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
37916 + echo "$ac_t""yes" 1>&6
37917 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
37918 + cat >> confdefs.h <<EOF
37919 +#define $ac_tr_func 1
37923 + echo "$ac_t""no" 1>&6
37930 +for ac_func in mbrlen mbsinit
37932 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
37933 +echo "configure:93930: checking for $ac_func" >&5
37934 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
37935 + echo $ac_n "(cached) $ac_c" 1>&6
37937 + cat > conftest.$ac_ext <<EOF
37938 +#line 93935 "configure"
37939 +#include "confdefs.h"
37940 +/* System header to define __stub macros and hopefully few prototypes,
37941 + which can conflict with char $ac_func(); below. */
37942 +#include <assert.h>
37943 +/* Override any gcc2 internal prototype to avoid an error. */
37944 +/* We use char because int might match the return type of a gcc2
37945 + builtin and then its argument prototype would still apply. */
37948 - if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then
37950 - if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then
37952 - if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
37953 - ai_p=$SQLITE_DIR/$PHP_LIBDIR
37956 - ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
37958 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
37959 - ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`"
37967 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
37969 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
37970 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
37971 - eval "LIBPATH$unique=set"
37973 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
37974 - LDFLAGS="$LDFLAGS -L$ai_p"
37975 - PHP_RPATHS="$PHP_RPATHS $ai_p"
37978 +/* The GNU C library defines this for functions which it implements
37979 + to always fail with ENOSYS. Some functions are actually named
37980 + something starting with __ and the normal name is an alias. */
37981 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
37989 +if { (eval echo configure:93958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
37991 + eval "ac_cv_func_$ac_func=yes"
37993 + echo "configure: failed program was:" >&5
37994 + cat conftest.$ac_ext >&5
37996 + eval "ac_cv_func_$ac_func=no"
38003 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
38004 + echo "$ac_t""yes" 1>&6
38005 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
38006 + cat >> confdefs.h <<EOF
38007 +#define $ac_tr_func 1
38011 + echo "$ac_t""no" 1>&6
38017 +echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
38018 +echo "configure:93983: checking for mbstate_t" >&5
38019 +if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then
38020 + echo $ac_n "(cached) $ac_c" 1>&6
38024 - c|c_r|pthread*) ;;
38026 - LIBS="-lsqlite $LIBS"
38032 +cat > conftest.$ac_ext <<EOF
38033 +#line 93989 "configure"
38034 +#include "confdefs.h"
38037 +#ifdef HAVE_WCHAR_H
38038 +# include <wchar.h>
38044 - if test "$SQLITE_DIR/include" != "/usr/include"; then
38046 - if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then
38047 - ai_p=$SQLITE_DIR/include
38050 - ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
38052 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
38053 - ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`"
38055 +int __tmp__() { mbstate_t a; }
38059 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
38062 +if { (eval echo configure:94002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
38065 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
38066 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
38067 - eval "INCLUDEPATH$unique=set"
38070 - INCLUDES="-I$ai_p $INCLUDES"
38072 - INCLUDES="$INCLUDES -I$ai_p"
38078 + ac_cv_type_mbstate_t=yes
38083 - echo "$ac_t""no" 1>&6
38085 - LDFLAGS=$save_old_LDFLAGS
38086 - ext_shared=$save_ext_shared
38087 - unset ac_cv_lib_sqlite_sqlite_open
38089 - { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; }
38091 + echo "configure: failed program was:" >&5
38092 + cat conftest.$ac_ext >&5
38095 + ac_cv_type_mbstate_t=no
38101 - SQLITE_MODULE_TYPE=external
38102 - PHP_SQLITE_CFLAGS=$pdo_inc_path
38103 - sqlite_extra_sources="libsqlite/src/encode.c"
38105 - # use bundled library
38107 - # we only support certain lemon versions
38108 - lemon_version_list="1.0"
38109 +echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6
38110 +if test "$ac_cv_type_mbstate_t" = "yes"; then
38111 + cat >> confdefs.h <<\EOF
38112 +#define HAVE_MBSTATE_T 1
38115 - # Extract the first word of "lemon", so it can be a program name with args.
38116 -set dummy lemon; ac_word=$2
38117 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
38118 -echo "configure:87325: checking for $ac_word" >&5
38119 -if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then
38122 +for ac_hdr in atomic.h
38124 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
38125 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
38126 +echo "configure:94030: checking for $ac_hdr" >&5
38127 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
38128 echo $ac_n "(cached) $ac_c" 1>&6
38130 - if test -n "$LEMON"; then
38131 - ac_cv_prog_LEMON="$LEMON" # Let the user override the test.
38132 + cat > conftest.$ac_ext <<EOF
38133 +#line 94035 "configure"
38134 +#include "confdefs.h"
38135 +#include <$ac_hdr>
38137 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
38138 +{ (eval echo configure:94040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
38139 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
38140 +if test -z "$ac_err"; then
38142 + eval "ac_cv_header_$ac_safe=yes"
38144 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
38146 - for ac_dir in $ac_dummy; do
38147 - test -z "$ac_dir" && ac_dir=.
38148 - if test -f $ac_dir/$ac_word; then
38149 - ac_cv_prog_LEMON="lemon"
38153 - IFS="$ac_save_ifs"
38154 + echo "$ac_err" >&5
38155 + echo "configure: failed program was:" >&5
38156 + cat conftest.$ac_ext >&5
38158 + eval "ac_cv_header_$ac_safe=no"
38162 -LEMON="$ac_cv_prog_LEMON"
38163 -if test -n "$LEMON"; then
38164 - echo "$ac_t""$LEMON" 1>&6
38165 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
38166 + echo "$ac_t""yes" 1>&6
38167 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
38168 + cat >> confdefs.h <<EOF
38169 +#define $ac_tr_hdr 1
38173 echo "$ac_t""no" 1>&6
38177 - if test "$LEMON"; then
38178 - echo $ac_n "checking for lemon version""... $ac_c" 1>&6
38179 -echo "configure:87353: checking for lemon version" >&5
38180 -if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then
38181 - echo $ac_n "(cached) $ac_c" 1>&6
38184 - lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'`
38185 - php_cv_lemon_version=invalid
38186 - for lemon_check_version in $lemon_version_list; do
38187 - if test "$lemon_version" = "$lemon_check_version"; then
38188 - php_cv_lemon_version="$lemon_check_version (ok)"
38194 -echo "$ac_t""$php_cv_lemon_version" 1>&6
38196 - lemon_version=none
38198 - case $php_cv_lemon_version in
38200 - lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)."
38201 - echo "configure: warning: $lemon_msg" 1>&2
38206 - PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON"
38209 - SQLITE_MODULE_TYPE=builtin
38210 - PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path"
38211 - sqlite_extra_sources="libsqlite/src/opcodes.c \
38212 - libsqlite/src/parse.c libsqlite/src/encode.c \
38213 - libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
38214 - libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
38215 - libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \
38216 - libsqlite/src/os.c libsqlite/src/pager.c \
38217 - libsqlite/src/printf.c libsqlite/src/random.c \
38218 - libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \
38219 - libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \
38220 - libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \
38221 - libsqlite/src/vacuum.c libsqlite/src/copy.c \
38222 - libsqlite/src/vdbeaux.c libsqlite/src/date.c \
38223 - libsqlite/src/where.c libsqlite/src/trigger.c"
38225 - sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources"
38227 - ext_builddir=ext/sqlite
38228 - ext_srcdir=$abs_srcdir/ext/sqlite
38229 + ext_builddir=ext/standard
38230 + ext_srcdir=$abs_srcdir/ext/standard
38232 - ac_extra=`echo "$PHP_SQLITE_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
38235 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
38236 - PHP_SQLITE_SHARED=no
38237 + if test "" != "shared" && test "" != "yes" && test "" != "cli"; then
38238 + PHP_STANDARD_SHARED=no
38241 - case ext/sqlite in
38242 + case ext/standard in
38243 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
38244 - /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38245 - *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38246 + /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38247 + *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38251 @@ -87424,7 +94091,17 @@ echo "$ac_t""$php_cv_lemon_version" 1>&6
38255 - for ac_src in $sqlite_sources; do
38256 + for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
38257 + cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
38258 + flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
38259 + info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
38260 + microtime.c pack.c pageinfo.c quot_print.c rand.c \
38261 + soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
38262 + var.c versioning.c assert.c strnatcmp.c levenshtein.c \
38263 + incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
38264 + http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
38265 + var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
38266 + filters.c proc_open.c streamsfuncs.c http.c; do
38270 @@ -87447,18 +94124,18 @@ EOF
38274 - EXT_STATIC="$EXT_STATIC sqlite"
38275 - if test "$ext_shared" != "nocli"; then
38276 - EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
38277 + EXT_STATIC="$EXT_STATIC standard"
38278 + if test "" != "nocli"; then
38279 + EXT_CLI_STATIC="$EXT_CLI_STATIC standard"
38282 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
38283 - PHP_SQLITE_SHARED=yes
38284 + if test "" = "shared" || test "" = "yes"; then
38285 + PHP_STANDARD_SHARED=yes
38287 - case ext/sqlite in
38288 + case ext/standard in
38289 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
38290 - /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38291 - *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38292 + /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38293 + *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38297 @@ -87473,14 +94150,24 @@ EOF
38301 - for ac_src in $sqlite_sources; do
38302 + for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
38303 + cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
38304 + flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
38305 + info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
38306 + microtime.c pack.c pageinfo.c quot_print.c rand.c \
38307 + soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
38308 + var.c versioning.c assert.c strnatcmp.c levenshtein.c \
38309 + incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
38310 + http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
38311 + var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
38312 + filters.c proc_open.c streamsfuncs.c http.c; do
38319 - shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo"
38320 + shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo"
38323 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
38324 @@ -87503,31 +94190,31 @@ EOF
38325 case $host_alias in
38328 - 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'
38329 + 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'
38333 - link_cmd='$(LIBTOOL) --mode=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)'
38334 + link_cmd='$(LIBTOOL) --mode=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)'
38338 - link_cmd='$(LIBTOOL) --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)'
38339 + link_cmd='$(LIBTOOL) --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)'
38343 if test "x" = "xyes"; then
38344 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsqlite.$suffix"
38345 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix"
38347 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix"
38348 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix"
38351 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
38352 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard"
38354 cat >>Makefile.objects<<EOF
38355 -\$(phplibdir)/phpsqlite.$suffix: $ext_builddir/phpsqlite.$suffix
38356 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpsqlite.$suffix \$(phplibdir)
38357 +\$(phplibdir)/phpstandard.$suffix: $ext_builddir/phpstandard.$suffix
38358 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpstandard.$suffix \$(phplibdir)
38360 -$ext_builddir/phpsqlite.$suffix: \$(shared_objects_sqlite) \$(PHPSQLITE_SHARED_DEPENDENCIES)
38361 +$ext_builddir/phpstandard.$suffix: \$(shared_objects_standard) \$(PHPSTANDARD_SHARED_DEPENDENCIES)
38365 @@ -87540,31 +94227,31 @@ EOF
38366 case $host_alias in
38369 - 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'
38370 + 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'
38374 - link_cmd='$(LIBTOOL) --mode=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)'
38375 + link_cmd='$(LIBTOOL) --mode=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)'
38379 - link_cmd='$(LIBTOOL) --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)'
38380 + link_cmd='$(LIBTOOL) --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)'
38384 if test "x" = "xyes"; then
38385 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sqlite.$suffix"
38386 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/standard.$suffix"
38388 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix"
38389 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/standard.$suffix"
38392 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite"
38393 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard"
38395 cat >>Makefile.objects<<EOF
38396 -\$(phplibdir)/sqlite.$suffix: $ext_builddir/sqlite.$suffix
38397 - \$(LIBTOOL) --mode=install cp $ext_builddir/sqlite.$suffix \$(phplibdir)
38398 +\$(phplibdir)/standard.$suffix: $ext_builddir/standard.$suffix
38399 + \$(LIBTOOL) --mode=install cp $ext_builddir/standard.$suffix \$(phplibdir)
38401 -$ext_builddir/sqlite.$suffix: \$(shared_objects_sqlite) \$(SQLITE_SHARED_DEPENDENCIES)
38402 +$ext_builddir/standard.$suffix: \$(shared_objects_standard) \$(STANDARD_SHARED_DEPENDENCIES)
38406 @@ -87572,22 +94259,22 @@ EOF
38409 cat >> confdefs.h <<EOF
38410 -#define COMPILE_DL_SQLITE 1
38411 +#define COMPILE_DL_STANDARD 1
38417 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
38418 - PHP_SQLITE_SHARED=no
38419 + if test "" != "shared" && test "" != "yes" && test "" = "cli"; then
38420 + PHP_STANDARD_SHARED=no
38421 case "$PHP_SAPI" in
38425 - case ext/sqlite in
38426 + case ext/standard in
38427 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
38428 - /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38429 - *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38430 + /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38431 + *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38435 @@ -87602,7 +94289,17 @@ EOF
38439 - for ac_src in $sqlite_sources; do
38440 + for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
38441 + cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
38442 + flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
38443 + info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
38444 + microtime.c pack.c pageinfo.c quot_print.c rand.c \
38445 + soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
38446 + var.c versioning.c assert.c strnatcmp.c levenshtein.c \
38447 + incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
38448 + http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
38449 + var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
38450 + filters.c proc_open.c streamsfuncs.c http.c; do
38454 @@ -87625,15 +94322,15 @@ EOF
38458 - EXT_STATIC="$EXT_STATIC sqlite"
38459 + EXT_STATIC="$EXT_STATIC standard"
38464 - case ext/sqlite in
38465 + case ext/standard in
38466 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
38467 - /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38468 - *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38469 + /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
38470 + *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
38474 @@ -87648,7 +94345,17 @@ EOF
38478 - for ac_src in $sqlite_sources; do
38479 + for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
38480 + cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
38481 + flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
38482 + info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
38483 + microtime.c pack.c pageinfo.c quot_print.c rand.c \
38484 + soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
38485 + var.c versioning.c assert.c strnatcmp.c levenshtein.c \
38486 + incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
38487 + http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
38488 + var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
38489 + filters.c proc_open.c streamsfuncs.c http.c; do
38493 @@ -87664,859 +94371,349 @@ EOF
38494 *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
38497 - cat >>Makefile.objects<<EOF
38498 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
38506 - EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite"
38510 - BUILD_DIR="$BUILD_DIR $ext_builddir"
38514 - if test "$ext_builddir" = "."; then
38515 - PHP_PECL_EXTENSION=sqlite
38517 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
38522 - am_i_shared=$PHP_SQLITE_SHARED
38523 - is_it_shared=$PHP_SPL_SHARED
38524 - is_it_enabled=$PHP_SPL
38525 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
38526 - { echo "configure: error:
38527 -You've configured extension sqlite to build statically, but it
38528 -depends on extension spl, which you've configured to build shared.
38529 -You either need to build sqlite shared or build spl statically for the
38530 -build to be successful.
38533 - if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
38534 - { echo "configure: error:
38535 -You've configured extension sqlite, which depends on extension spl,
38536 -but you've either not enabled spl, or have disabled it.
38541 - am_i_shared=$PHP_SQLITE_SHARED
38542 - is_it_shared=$PHP_PDO_SHARED
38543 - is_it_enabled=$PHP_PDO
38544 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
38545 - { echo "configure: error:
38546 -You've configured extension sqlite to build statically, but it
38547 -depends on extension pdo, which you've configured to build shared.
38548 -You either need to build sqlite shared or build pdo statically for the
38549 -build to be successful.
38552 - if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
38553 - { echo "configure: error:
38554 -You've configured extension sqlite, which depends on extension pdo,
38555 -but you've either not enabled pdo, or have disabled it.
38561 - src=$ext_srcdir/Makefile.frag
38562 - ac_srcdir=$ext_srcdir
38563 - ac_builddir=$ext_builddir
38564 - test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
38567 - PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD"
38571 - for header_file in $ext_builddir/libsqlite/src/sqlite.h; do
38574 - unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
38576 - cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
38577 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
38578 - eval "INSTALLHEADERS$unique=set"
38580 - INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
38588 - if test "$SQLITE_MODULE_TYPE" = "builtin"; then
38591 - $php_shtool mkdir -p $ext_builddir/libsqlite/src
38594 - echo $ac_n "checking size of char *""... $ac_c" 1>&6
38595 -echo "configure:87766: checking size of char *" >&5
38596 -if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
38597 - echo $ac_n "(cached) $ac_c" 1>&6
38599 - if test "$cross_compiling" = yes; then
38600 - ac_cv_sizeof_char_p=4
38602 - cat > conftest.$ac_ext <<EOF
38603 -#line 87774 "configure"
38604 -#include "confdefs.h"
38605 -#include <stdio.h>
38606 -#include <sys/types.h>
38609 - FILE *f=fopen("conftestval", "w");
38611 - fprintf(f, "%d\n", sizeof(char *));
38615 -if { (eval echo configure:87786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
38617 - ac_cv_sizeof_char_p=`cat conftestval`
38619 - echo "configure: failed program was:" >&5
38620 - cat conftest.$ac_ext >&5
38622 - ac_cv_sizeof_char_p=0
38628 -echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6
38629 -cat >> confdefs.h <<EOF
38630 -#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
38634 - cat >> confdefs.h <<\EOF
38635 -#define SQLITE_PTR_SZ SIZEOF_CHAR_P
38638 - if test "$PHP_SQLITE_UTF8" = "yes"; then
38639 - SQLITE_ENCODING="UTF8"
38640 - cat >> confdefs.h <<\EOF
38641 -#define SQLITE_UTF8 1
38645 - SQLITE_ENCODING="ISO8859"
38648 - PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING"
38651 - SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
38653 - PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION"
38656 - sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h
38658 - if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then
38659 - echo '#include <php_config.h>' > $ext_builddir/libsqlite/src/config.h
38661 - echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h
38664 - cat >> $ext_builddir/libsqlite/src/config.h <<EOF
38666 -# define THREADSAFE 1
38674 - for ac_func in usleep nanosleep
38676 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
38677 -echo "configure:87848: checking for $ac_func" >&5
38678 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
38679 - echo $ac_n "(cached) $ac_c" 1>&6
38681 - cat > conftest.$ac_ext <<EOF
38682 -#line 87853 "configure"
38683 -#include "confdefs.h"
38684 -/* System header to define __stub macros and hopefully few prototypes,
38685 - which can conflict with char $ac_func(); below. */
38686 -#include <assert.h>
38687 -/* Override any gcc2 internal prototype to avoid an error. */
38688 -/* We use char because int might match the return type of a gcc2
38689 - builtin and then its argument prototype would still apply. */
38694 -/* The GNU C library defines this for functions which it implements
38695 - to always fail with ENOSYS. Some functions are actually named
38696 - something starting with __ and the normal name is an alias. */
38697 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
38705 -if { (eval echo configure:87876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
38707 - eval "ac_cv_func_$ac_func=yes"
38709 - echo "configure: failed program was:" >&5
38710 - cat conftest.$ac_ext >&5
38712 - eval "ac_cv_func_$ac_func=no"
38717 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
38718 - echo "$ac_t""yes" 1>&6
38719 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
38720 - cat >> confdefs.h <<EOF
38721 -#define $ac_tr_func 1
38725 - echo "$ac_t""no" 1>&6
38729 - for ac_hdr in time.h
38731 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
38732 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
38733 -echo "configure:87904: checking for $ac_hdr" >&5
38734 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
38735 - echo $ac_n "(cached) $ac_c" 1>&6
38737 - cat > conftest.$ac_ext <<EOF
38738 -#line 87909 "configure"
38739 -#include "confdefs.h"
38740 -#include <$ac_hdr>
38742 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
38743 -{ (eval echo configure:87914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
38744 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
38745 -if test -z "$ac_err"; then
38747 - eval "ac_cv_header_$ac_safe=yes"
38749 - echo "$ac_err" >&5
38750 - echo "configure: failed program was:" >&5
38751 - cat conftest.$ac_ext >&5
38753 - eval "ac_cv_header_$ac_safe=no"
38757 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
38758 - echo "$ac_t""yes" 1>&6
38759 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
38760 - cat >> confdefs.h <<EOF
38761 -#define $ac_tr_hdr 1
38765 - echo "$ac_t""no" 1>&6
38773 -echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6
38774 -echo "configure:87945: checking whether flush should be called explicitly after a buffered io" >&5
38775 -if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then
38776 - echo $ac_n "(cached) $ac_c" 1>&6
38779 -if test "$cross_compiling" = yes; then
38781 - ac_cv_flush_io=no
38784 - cat > conftest.$ac_ext <<EOF
38785 -#line 87956 "configure"
38786 -#include "confdefs.h"
38788 -#include <stdio.h>
38789 -#include <stdlib.h>
38791 -int main(int argc, char **argv)
38793 - char *filename = tmpnam(NULL);
38797 - FILE *fp = fopen(filename, "wb");
38800 - fputs("line 1\n", fp);
38801 - fputs("line 2\n", fp);
38804 - fp = fopen(filename, "rb+");
38807 - fgets(buffer, sizeof(buffer), fp);
38808 - fputs("line 3\n", fp);
38810 - fgets(buffer, sizeof(buffer), fp);
38811 - if (0 != strcmp(buffer, "line 1\n"))
38813 - fgets(buffer, sizeof(buffer), fp);
38814 - if (0 != strcmp(buffer, "line 3\n"))
38817 - unlink(filename);
38823 -if { (eval echo configure:87994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
38826 - ac_cv_flush_io=no
38829 - echo "configure: failed program was:" >&5
38830 - cat conftest.$ac_ext >&5
38833 - ac_cv_flush_io=yes
38841 -echo "$ac_t""$ac_cv_flush_io" 1>&6
38842 -if test "$ac_cv_flush_io" = "yes"; then
38843 - cat >> confdefs.h <<\EOF
38844 -#define HAVE_FLUSHIO 1
38849 -if test "$ac_cv_func_crypt" = "no"; then
38850 - echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
38851 -echo "configure:88022: checking for crypt in -lcrypt" >&5
38852 -ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
38853 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
38854 - echo $ac_n "(cached) $ac_c" 1>&6
38856 - ac_save_LIBS="$LIBS"
38857 -LIBS="-lcrypt $LIBS"
38858 -cat > conftest.$ac_ext <<EOF
38859 -#line 88030 "configure"
38860 -#include "confdefs.h"
38861 -/* Override any gcc2 internal prototype to avoid an error. */
38862 -/* We use char because int might match the return type of a gcc2
38863 - builtin and then its argument prototype would still apply. */
38870 -if { (eval echo configure:88041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
38872 - eval "ac_cv_lib_$ac_lib_var=yes"
38874 - echo "configure: failed program was:" >&5
38875 - cat conftest.$ac_ext >&5
38877 - eval "ac_cv_lib_$ac_lib_var=no"
38880 -LIBS="$ac_save_LIBS"
38883 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
38884 - echo "$ac_t""yes" 1>&6
38886 - LIBS="-lcrypt $LIBS -lcrypt"
38887 - cat >> confdefs.h <<\EOF
38888 -#define HAVE_CRYPT 1
38893 - echo "$ac_t""no" 1>&6
38898 -echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
38899 -echo "configure:88070: checking for standard DES crypt" >&5
38900 -if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then
38901 - echo $ac_n "(cached) $ac_c" 1>&6
38904 - if test "$cross_compiling" = yes; then
38906 - ac_cv_crypt_des=yes
38909 - cat > conftest.$ac_ext <<EOF
38910 -#line 88081 "configure"
38911 -#include "confdefs.h"
38914 -#include <unistd.h>
38918 -#include <crypt.h>
38923 - exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M"));
38929 -if { (eval echo configure:88100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
38932 - ac_cv_crypt_des=yes
38935 - echo "configure: failed program was:" >&5
38936 - cat conftest.$ac_ext >&5
38939 - ac_cv_crypt_des=no
38946 + cat >>Makefile.objects<<EOF
38947 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
38952 -echo "$ac_t""$ac_cv_crypt_des" 1>&6
38954 -echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
38955 -echo "configure:88121: checking for extended DES crypt" >&5
38956 -if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then
38957 - echo $ac_n "(cached) $ac_c" 1>&6
38961 + EXT_CLI_STATIC="$EXT_CLI_STATIC standard"
38964 - if test "$cross_compiling" = yes; then
38966 - ac_cv_crypt_ext_des=no
38969 - cat > conftest.$ac_ext <<EOF
38970 -#line 88132 "configure"
38971 -#include "confdefs.h"
38972 + BUILD_DIR="$BUILD_DIR $ext_builddir"
38976 -#include <unistd.h>
38980 -#include <crypt.h>
38982 + if test "$ext_builddir" = "."; then
38983 + PHP_PECL_EXTENSION=standard
38985 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
38989 - exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc"));
38995 -if { (eval echo configure:88151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
38998 - ac_cv_crypt_ext_des=yes
39002 - echo "configure: failed program was:" >&5
39003 - cat conftest.$ac_ext >&5
39006 - ac_cv_crypt_ext_des=no
39013 + src=$ext_srcdir/Makefile.frag
39014 + ac_srcdir=$ext_srcdir
39015 + ac_builddir=$ext_builddir
39016 + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
39018 -echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6
39020 -echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
39021 -echo "configure:88172: checking for MD5 crypt" >&5
39022 -if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then
39023 - echo $ac_n "(cached) $ac_c" 1>&6
39026 -if test "$cross_compiling" = yes; then
39027 + for header_file in ext/standard/; do
39030 - ac_cv_crypt_md5=no
39031 + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
39033 + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
39034 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
39035 + eval "INSTALLHEADERS$unique=set"
39037 + INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
39042 - cat > conftest.$ac_ext <<EOF
39043 -#line 88183 "configure"
39044 -#include "confdefs.h"
39049 -#include <unistd.h>
39053 -#include <crypt.h>
39058 - char salt[15], answer[40];
39060 - salt[0]='$'; salt[1]='1'; salt[2]='$';
39061 - salt[3]='r'; salt[4]='a'; salt[5]='s';
39062 - salt[6]='m'; salt[7]='u'; salt[8]='s';
39063 - salt[9]='l'; salt[10]='e'; salt[11]='$';
39065 - strcpy(answer,salt);
39066 - strcat(answer,"rISCgZzpwk3UhDidwXvin0");
39067 - exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
39073 -if { (eval echo configure:88211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
39076 - ac_cv_crypt_md5=yes
39077 +php_with_sybase_ct=no
39079 +echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
39080 +echo "configure:94430: checking for Sybase-CT support" >&5
39081 +# Check whether --with-sybase-ct or --without-sybase-ct was given.
39082 +if test "${with_sybase_ct+set}" = set; then
39083 + withval="$with_sybase_ct"
39084 + PHP_SYBASE_CT=$withval
39086 - echo "configure: failed program was:" >&5
39087 - cat conftest.$ac_ext >&5
39090 - ac_cv_crypt_md5=no
39096 + test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL
39100 -echo "$ac_t""$ac_cv_crypt_md5" 1>&6
39102 -echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
39103 -echo "configure:88232: checking for Blowfish crypt" >&5
39104 -if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then
39105 - echo $ac_n "(cached) $ac_c" 1>&6
39108 -if test "$cross_compiling" = yes; then
39110 - ac_cv_crypt_blowfish=no
39113 - cat > conftest.$ac_ext <<EOF
39114 -#line 88243 "configure"
39115 -#include "confdefs.h"
39116 +ext_output="yes, shared"
39118 +case $PHP_SYBASE_CT in
39120 + PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|$SED 's/^shared,//'`
39123 + PHP_SYBASE_CT=yes
39136 -#include <unistd.h>
39140 -#include <crypt.h>
39145 - char salt[30], answer[70];
39147 - salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0';
39148 - strcat(salt,"rasmuslerd............");
39149 - strcpy(answer,salt);
39150 - strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra");
39151 - exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer));
39157 -if { (eval echo configure:88268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
39160 - ac_cv_crypt_blowfish=yes
39161 +echo "$ac_t""$ext_output" 1>&6
39164 - echo "configure: failed program was:" >&5
39165 - cat conftest.$ac_ext >&5
39168 - ac_cv_crypt_blowfish=no
39176 -echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6
39177 +if test "$PHP_SYBASE_CT" != "no"; then
39179 -echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6
39180 -echo "configure:88289: checking for SHA512 crypt" >&5
39181 -if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then
39182 - echo $ac_n "(cached) $ac_c" 1>&6
39185 -if test "$cross_compiling" = yes; then
39187 - ac_cv_crypt_SHA512=no
39188 + if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then
39189 + { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; }
39193 - cat > conftest.$ac_ext <<EOF
39194 -#line 88300 "configure"
39195 -#include "confdefs.h"
39196 + cat >> confdefs.h <<\EOF
39197 +#define HAVE_SYBASE_CT 1
39201 -#include <unistd.h>
39204 + ext_builddir=ext/sybase_ct
39205 + ext_srcdir=$abs_srcdir/ext/sybase_ct
39208 -#include <crypt.h>
39214 - char salt[30], answer[80];
39215 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
39216 + PHP_SYBASE_CT_SHARED=no
39218 - salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0';
39219 - strcpy(answer, salt);
39220 - strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu.");
39221 - exit (strcmp((char *)crypt("foo",salt),answer));
39227 -if { (eval echo configure:88324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
39230 - ac_cv_crypt_SHA512=yes
39233 - echo "configure: failed program was:" >&5
39234 - cat conftest.$ac_ext >&5
39236 + case ext/sybase_ct in
39237 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
39238 + /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
39239 + *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
39243 - ac_cv_crypt_SHA512=no
39250 + b_c_pre=$php_c_pre
39251 + b_cxx_pre=$php_cxx_pre
39252 + b_c_meta=$php_c_meta
39253 + b_cxx_meta=$php_cxx_meta
39254 + b_c_post=$php_c_post
39255 + b_cxx_post=$php_cxx_post
39258 -echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6
39260 -echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6
39261 -echo "configure:88345: checking for SHA256 crypt" >&5
39262 -if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then
39263 - echo $ac_n "(cached) $ac_c" 1>&6
39266 -if test "$cross_compiling" = yes; then
39268 + for ac_src in php_sybase_ct.c; do
39270 - ac_cv_crypt_SHA256=no
39276 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
39279 - cat > conftest.$ac_ext <<EOF
39280 -#line 88356 "configure"
39281 -#include "confdefs.h"
39283 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39284 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39285 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39286 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
39290 -#include <unistd.h>
39292 + cat >>Makefile.objects<<EOF
39293 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
39299 -#include <crypt.h>
39304 - char salt[30], answer[80];
39305 - 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';
39307 - strcpy(answer, salt);
39308 - strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5");
39309 - exit (strcmp((char *)crypt("foo",salt),answer));
39315 -if { (eval echo configure:88380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
39317 + EXT_STATIC="$EXT_STATIC sybase_ct"
39318 + if test "$ext_shared" != "nocli"; then
39319 + EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct"
39322 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
39323 + PHP_SYBASE_CT_SHARED=yes
39325 + case ext/sybase_ct in
39326 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
39327 + /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
39328 + *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
39331 - ac_cv_crypt_SHA256=yes
39334 - echo "configure: failed program was:" >&5
39335 - cat conftest.$ac_ext >&5
39338 - ac_cv_crypt_SHA256=no
39343 + b_c_pre=$shared_c_pre
39344 + b_cxx_pre=$shared_cxx_pre
39345 + b_c_meta=$shared_c_meta
39346 + b_cxx_meta=$shared_cxx_meta
39347 + b_c_post=$shared_c_post
39348 + b_cxx_post=$shared_cxx_post
39353 -echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6
39355 + for ac_src in php_sybase_ct.c; do
39362 + shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo"
39365 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39366 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39367 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39368 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
39371 -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
39372 + cat >>Makefile.objects<<EOF
39373 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
39378 - echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6
39379 -echo "configure:88404: checking whether the compiler supports __alignof__" >&5
39380 -if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then
39381 - echo $ac_n "(cached) $ac_c" 1>&6
39384 - cat > conftest.$ac_ext <<EOF
39385 -#line 88410 "configure"
39386 -#include "confdefs.h"
39387 + case $host_alias in
39390 + install_modules="install-modules"
39394 + case $host_alias in
39397 + 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'
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_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)'
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_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD)'
39409 - int align = __alignof__(int);
39413 -if { (eval echo configure:88420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
39416 - ac_cv_alignof_exists=yes
39419 - echo "configure: failed program was:" >&5
39420 - cat conftest.$ac_ext >&5
39423 - ac_cv_alignof_exists=no
39424 + if test "x" = "xyes"; then
39425 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix"
39427 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix"
39433 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct"
39435 + cat >>Makefile.objects<<EOF
39436 +\$(phplibdir)/phpsybase_ct.$suffix: $ext_builddir/phpsybase_ct.$suffix
39437 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpsybase_ct.$suffix \$(phplibdir)
39439 +$ext_builddir/phpsybase_ct.$suffix: \$(shared_objects_sybase_ct) \$(PHPSYBASE_CT_SHARED_DEPENDENCIES)
39442 -echo "$ac_t""$ac_cv_alignof_exists" 1>&6
39443 - if test "$ac_cv_alignof_exists" = "yes"; then
39444 - cat >> confdefs.h <<\EOF
39445 -#define HAVE_ALIGNOF 1
39452 + install_modules="install-modules"
39454 - echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6
39455 -echo "configure:88445: checking whether the compiler supports aligned attribute" >&5
39456 -if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then
39457 - echo $ac_n "(cached) $ac_c" 1>&6
39460 - cat > conftest.$ac_ext <<EOF
39461 -#line 88451 "configure"
39462 -#include "confdefs.h"
39463 + case $host_alias in
39466 + 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'
39470 + link_cmd='$(LIBTOOL) --mode=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)'
39474 + link_cmd='$(LIBTOOL) --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)'
39478 + if test "x" = "xyes"; then
39479 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sybase_ct.$suffix"
39481 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/sybase_ct.$suffix"
39485 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct"
39487 + cat >>Makefile.objects<<EOF
39488 +\$(phplibdir)/sybase_ct.$suffix: $ext_builddir/sybase_ct.$suffix
39489 + \$(LIBTOOL) --mode=install cp $ext_builddir/sybase_ct.$suffix \$(phplibdir)
39491 +$ext_builddir/sybase_ct.$suffix: \$(shared_objects_sybase_ct) \$(SYBASE_CT_SHARED_DEPENDENCIES)
39494 - unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int))));
39498 -if { (eval echo configure:88461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
39501 - ac_cv_attribute_aligned=yes
39504 - echo "configure: failed program was:" >&5
39505 - cat conftest.$ac_ext >&5
39508 - ac_cv_attribute_aligned=no
39514 -echo "$ac_t""$ac_cv_attribute_aligned" 1>&6
39515 - if test "$ac_cv_attribute_aligned" = "yes"; then
39516 - cat >> confdefs.h <<\EOF
39517 -#define HAVE_ATTRIBUTE_ALIGNED 1
39520 + cat >> confdefs.h <<EOF
39521 +#define COMPILE_DL_SYBASE_CT 1
39528 - cat >> confdefs.h <<EOF
39529 -#define PHP_USE_PHP_CRYPT_R 1
39532 - cat >> confdefs.h <<EOF
39533 -#define PHP_STD_DES_CRYPT 1
39535 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
39536 + PHP_SYBASE_CT_SHARED=no
39537 + case "$PHP_SAPI" in
39541 + case ext/sybase_ct in
39542 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
39543 + /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
39544 + *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
39549 - cat >> confdefs.h <<EOF
39550 -#define PHP_BLOWFISH_CRYPT 1
39552 + b_c_pre=$php_c_pre
39553 + b_cxx_pre=$php_cxx_pre
39554 + b_c_meta=$php_c_meta
39555 + b_cxx_meta=$php_cxx_meta
39556 + b_c_post=$php_c_post
39557 + b_cxx_post=$php_cxx_post
39560 - cat >> confdefs.h <<EOF
39561 -#define PHP_EXT_DES_CRYPT 1
39564 - cat >> confdefs.h <<EOF
39565 -#define PHP_MD5_CRYPT 1
39568 + for ac_src in php_sybase_ct.c; do
39575 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
39577 - cat >> confdefs.h <<EOF
39578 -#define PHP_SHA512_CRYPT 1
39581 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39582 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39583 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39584 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
39587 - cat >> confdefs.h <<EOF
39588 -#define PHP_SHA256_CRYPT 1
39589 + cat >>Makefile.objects<<EOF
39590 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
39596 + EXT_STATIC="$EXT_STATIC sybase_ct"
39602 - case ext/standard in
39603 + case ext/sybase_ct in
39604 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
39605 - /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
39606 - *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
39607 + /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
39608 + *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
39612 @@ -88531,20 +94728,20 @@ EOF
39616 - for ac_src in crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c; do
39617 + for ac_src in php_sybase_ct.c; do
39624 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
39625 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
39628 - *.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" ;;
39629 - *.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" ;;
39630 - *.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" ;;
39631 - *.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" ;;
39632 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39633 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39634 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
39635 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
39638 cat >>Makefile.objects<<EOF
39639 @@ -88554,397 +94751,416 @@ EOF
39644 - if test "$ac_cv_crypt_des" = "yes"; then
39652 + EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct"
39654 - cat >> confdefs.h <<EOF
39655 -#define PHP_STD_DES_CRYPT $ac_result
39659 + BUILD_DIR="$BUILD_DIR $ext_builddir"
39663 - if test "$ac_cv_crypt_blowfish" = "yes"; then
39665 - ac_crypt_blowfish=1
39666 + if test "$ext_builddir" = "."; then
39667 + PHP_PECL_EXTENSION=sybase_ct
39669 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
39674 + PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD"
39677 + if test "$PHP_SYBASE_CT" = "yes"; then
39678 + SYBASE_CT_INCDIR=/home/sybase/include
39679 + SYBASE_CT_LIBDIR=/home/sybase/lib
39682 - ac_crypt_blowfish=0
39683 + SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include
39684 + SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib
39686 - cat >> confdefs.h <<EOF
39687 -#define PHP_BLOWFISH_CRYPT $ac_result
39689 + echo $ac_n "checking size of long int""... $ac_c" 1>&6
39690 +echo "configure:94785: checking size of long int" >&5
39691 +if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
39692 + echo $ac_n "(cached) $ac_c" 1>&6
39694 + if test "$cross_compiling" = yes; then
39695 + ac_cv_sizeof_long_int=4
39697 + cat > conftest.$ac_ext <<EOF
39698 +#line 94793 "configure"
39699 +#include "confdefs.h"
39700 +#include <stdio.h>
39701 +#include <sys/types.h>
39704 + FILE *f=fopen("conftestval", "w");
39706 + fprintf(f, "%d\n", sizeof(long int));
39710 +if { (eval echo configure:94805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
39712 + ac_cv_sizeof_long_int=`cat conftestval`
39714 + echo "configure: failed program was:" >&5
39715 + cat conftest.$ac_ext >&5
39717 + ac_cv_sizeof_long_int=0
39723 +echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6
39724 +cat >> confdefs.h <<EOF
39725 +#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
39729 - if test "$ac_cv_crypt_ext_des" = "yes"; then
39732 + echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
39733 +echo "configure:94825: checking checking if we're on a 64-bit platform" >&5
39734 + if test "$ac_cv_sizeof_long_int" = "4"; then
39735 + echo "$ac_t""no" 1>&6
39740 + echo "$ac_t""yes" 1>&6
39741 + PHP_SYBASE_64=yes
39743 - cat >> confdefs.h <<EOF
39744 -#define PHP_EXT_DES_CRYPT $ac_result
39748 - if test "$ac_cv_crypt_md5" = "yes"; then
39751 + echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6
39752 +echo "configure:94836: checking Checking for ctpublic.h" >&5
39753 + if test -f $SYBASE_CT_INCDIR/ctpublic.h; then
39754 + echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6
39756 + if test "$SYBASE_CT_INCDIR" != "/usr/include"; then
39758 + if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then
39759 + ai_p=$SYBASE_CT_INCDIR
39764 + ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
39766 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
39767 + ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`"
39769 - cat >> confdefs.h <<EOF
39770 -#define PHP_MD5_CRYPT $ac_result
39775 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
39777 - if test "$ac_cv_crypt_sha512" = "yes"; then
39779 - ac_crypt_sha512=1
39782 - ac_crypt_sha512=0
39783 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
39784 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
39785 + eval "INCLUDEPATH$unique=set"
39788 + INCLUDES="-I$ai_p $INCLUDES"
39790 + INCLUDES="$INCLUDES -I$ai_p"
39794 - cat >> confdefs.h <<EOF
39795 -#define PHP_SHA512_CRYPT $ac_result
39800 - if test "$ac_cv_crypt_sha256" = "yes"; then
39802 - ac_crypt_sha256=1
39805 - ac_crypt_sha256=0
39806 + { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; }
39808 - cat >> confdefs.h <<EOF
39809 -#define PHP_SHA256_CRYPT $ac_result
39812 + echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6
39813 +echo "configure:94875: checking Checking Sybase libdir" >&5
39814 + echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6
39816 + echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6
39817 +echo "configure:94879: checking Checking for Sybase platform libraries" >&5
39820 + if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then
39822 + if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then
39823 + ai_p=$SYBASE_CT_LIBDIR
39826 + ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
39828 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
39829 + ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`"
39832 - cat >> confdefs.h <<EOF
39833 -#define PHP_USE_PHP_CRYPT_R 0
39836 + if test "$ext_shared" = "yes"; then
39837 + SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD"
39838 + test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_SHARED_LIBADD"
39843 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
39845 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
39846 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
39847 + eval "LIBPATH$unique=set"
39849 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
39850 + LDFLAGS="$LDFLAGS -L$ai_p"
39851 + PHP_RPATHS="$PHP_RPATHS $ai_p"
39857 -for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy
39859 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
39860 -echo "configure:88640: checking for $ac_func" >&5
39861 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
39862 - echo $ac_n "(cached) $ac_c" 1>&6
39864 - cat > conftest.$ac_ext <<EOF
39865 -#line 88645 "configure"
39866 -#include "confdefs.h"
39867 -/* System header to define __stub macros and hopefully few prototypes,
39868 - which can conflict with char $ac_func(); below. */
39869 -#include <assert.h>
39870 -/* Override any gcc2 internal prototype to avoid an error. */
39871 -/* We use char because int might match the return type of a gcc2
39872 - builtin and then its argument prototype would still apply. */
39879 + if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
39883 + c|c_r|pthread*) ;;
39885 + if test "$ext_shared" = "yes"; then
39886 + SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD"
39891 + c|c_r|pthread*) ;;
39893 + LIBS="-lct $LIBS"
39897 -/* The GNU C library defines this for functions which it implements
39898 - to always fail with ENOSYS. Some functions are actually named
39899 - something starting with __ and the normal name is an alias. */
39900 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
39908 -if { (eval echo configure:88668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
39910 - eval "ac_cv_func_$ac_func=yes"
39912 - echo "configure: failed program was:" >&5
39913 - cat conftest.$ac_ext >&5
39915 - eval "ac_cv_func_$ac_func=no"
39923 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
39924 - echo "$ac_t""yes" 1>&6
39925 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
39926 - cat >> confdefs.h <<EOF
39927 -#define $ac_tr_func 1
39931 - echo "$ac_t""no" 1>&6
39935 -echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
39936 -echo "configure:88693: checking for working fnmatch" >&5
39937 -if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then
39938 - echo $ac_n "(cached) $ac_c" 1>&6
39940 - # Some versions of Solaris or SCO have a broken fnmatch function.
39941 -# So we run a test program. If we are cross-compiling, take no chance.
39942 -# Thanks to John Oleynick and Franc,ois Pinard for this test.
39943 -if test "$cross_compiling" = yes; then
39944 - ac_cv_func_fnmatch_works=no
39946 - cat > conftest.$ac_ext <<EOF
39947 -#line 88704 "configure"
39948 -#include "confdefs.h"
39949 -main() { exit (fnmatch ("a*", "abc", 0) != 0); }
39951 -if { (eval echo configure:88708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
39953 - ac_cv_func_fnmatch_works=yes
39955 - echo "configure: failed program was:" >&5
39956 - cat conftest.$ac_ext >&5
39958 - ac_cv_func_fnmatch_works=no
39962 + SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
39963 + echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6
39964 + elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then
39968 + c|c_r|pthread*) ;;
39970 + if test "$ext_shared" = "yes"; then
39971 + SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD"
39976 + c|c_r|pthread*) ;;
39978 + LIBS="-lsybcs64 $LIBS"
39984 -echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6
39985 -if test $ac_cv_func_fnmatch_works = yes; then
39986 - cat >> confdefs.h <<\EOF
39987 -#define HAVE_FNMATCH 1
39999 + c|c_r|pthread*) ;;
40001 + if test "$ext_shared" = "yes"; then
40002 + SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD"
40007 + c|c_r|pthread*) ;;
40009 + LIBS="-lsybct64 $LIBS"
40013 -for ac_func in fork CreateProcess
40015 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
40016 -echo "configure:88735: checking for $ac_func" >&5
40017 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
40018 - echo $ac_n "(cached) $ac_c" 1>&6
40020 - cat > conftest.$ac_ext <<EOF
40021 -#line 88740 "configure"
40022 -#include "confdefs.h"
40023 -/* System header to define __stub macros and hopefully few prototypes,
40024 - which can conflict with char $ac_func(); below. */
40025 -#include <assert.h>
40026 -/* Override any gcc2 internal prototype to avoid an error. */
40027 -/* We use char because int might match the return type of a gcc2
40028 - builtin and then its argument prototype would still apply. */
40036 -/* The GNU C library defines this for functions which it implements
40037 - to always fail with ENOSYS. Some functions are actually named
40038 - something starting with __ and the normal name is an alias. */
40039 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
40047 -if { (eval echo configure:88763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40049 - eval "ac_cv_func_$ac_func=yes"
40051 - echo "configure: failed program was:" >&5
40052 - cat conftest.$ac_ext >&5
40054 - eval "ac_cv_func_$ac_func=no"
40060 + case sybcomn64 in
40061 + c|c_r|pthread*) ;;
40063 + if test "$ext_shared" = "yes"; then
40064 + SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD"
40068 + case sybcomn64 in
40069 + c|c_r|pthread*) ;;
40071 + LIBS="-lsybcomn64 $LIBS"
40075 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
40076 - echo "$ac_t""yes" 1>&6
40077 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
40078 - cat >> confdefs.h <<EOF
40079 -#define $ac_tr_func 1
40082 - php_can_support_proc_open=yes
40086 - echo "$ac_t""no" 1>&6
40087 -php_can_support_proc_open=no
40095 -echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6
40096 -echo "configure:88793: checking if your OS can spawn processes with inherited handles" >&5
40097 -if test "$php_can_support_proc_open" = "yes"; then
40098 - echo "$ac_t""yes" 1>&6
40099 - cat >> confdefs.h <<\EOF
40100 -#define PHP_CAN_SUPPORT_PROC_OPEN 1
40104 + case sybintl64 in
40105 + c|c_r|pthread*) ;;
40107 + if test "$ext_shared" = "yes"; then
40108 + SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD"
40112 + case sybintl64 in
40113 + c|c_r|pthread*) ;;
40115 + LIBS="-lsybintl64 $LIBS"
40120 - echo "$ac_t""no" 1>&6
40123 -if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then
40124 - cat >> confdefs.h <<\EOF
40125 -#define ENABLE_CHROOT_FUNC 1
40134 - unset ac_cv_func_res_nsearch
40135 - unset ac_cv_func___res_nsearch
40137 + ac_solid_uname_s=`uname -s 2>/dev/null`
40138 + case $ac_solid_uname_s in
40139 + *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define
40140 + *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; #
40142 + SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64"
40143 + echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6
40146 + save_old_LDFLAGS=$LDFLAGS
40151 + save_ext_shared=$ext_shared
40154 + for ac_i in $ac_stuff; do
40157 + if test "$ext_shared" = "yes"; then
40158 + LDFLAGS="$LDFLAGS -pthread"
40162 - echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6
40163 -echo "configure:88817: checking for res_nsearch" >&5
40164 -if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then
40165 - echo $ac_n "(cached) $ac_c" 1>&6
40167 - cat > conftest.$ac_ext <<EOF
40168 -#line 88822 "configure"
40169 -#include "confdefs.h"
40170 -/* System header to define __stub macros and hopefully few prototypes,
40171 - which can conflict with char res_nsearch(); below. */
40172 -#include <assert.h>
40173 -/* Override any gcc2 internal prototype to avoid an error. */
40174 -/* We use char because int might match the return type of a gcc2
40175 - builtin and then its argument prototype would still apply. */
40176 -char res_nsearch();
40179 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
40181 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
40182 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
40183 + eval "EXTRA_LDFLAGS$unique=set"
40184 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
40187 -/* The GNU C library defines this for functions which it implements
40188 - to always fail with ENOSYS. Some functions are actually named
40189 - something starting with __ and the normal name is an alias. */
40190 -#if defined (__stub_res_nsearch) || defined (__stub___res_nsearch)
40198 + ac_ii=`echo $ac_i|cut -c 3-`
40202 + c|c_r|pthread*) ;;
40204 + if test "$ext_shared" = "yes"; then
40205 + LDFLAGS="$LDFLAGS -l$ac_ii"
40210 + c|c_r|pthread*) ;;
40212 + LIBS="$LIBS -l$ac_ii"
40218 -if { (eval echo configure:88845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40220 - eval "ac_cv_func_res_nsearch=yes"
40222 - echo "configure: failed program was:" >&5
40223 - cat conftest.$ac_ext >&5
40225 - eval "ac_cv_func_res_nsearch=no"
40230 -if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then
40231 - echo "$ac_t""yes" 1>&6
40234 - echo "$ac_t""no" 1>&6
40235 - echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6
40236 -echo "configure:88863: checking for __res_nsearch" >&5
40237 -if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then
40238 - echo $ac_n "(cached) $ac_c" 1>&6
40240 - cat > conftest.$ac_ext <<EOF
40241 -#line 88868 "configure"
40242 -#include "confdefs.h"
40243 -/* System header to define __stub macros and hopefully few prototypes,
40244 - which can conflict with char __res_nsearch(); below. */
40245 -#include <assert.h>
40246 -/* Override any gcc2 internal prototype to avoid an error. */
40247 -/* We use char because int might match the return type of a gcc2
40248 - builtin and then its argument prototype would still apply. */
40249 -char __res_nsearch();
40256 -/* The GNU C library defines this for functions which it implements
40257 - to always fail with ENOSYS. Some functions are actually named
40258 - something starting with __ and the normal name is an alias. */
40259 -#if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch)
40266 + ac_ii=`echo $ac_i|cut -c 3-`
40268 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
40270 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
40274 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
40276 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
40277 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
40282 -if { (eval echo configure:88891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40284 - eval "ac_cv_func___res_nsearch=yes"
40286 - echo "configure: failed program was:" >&5
40287 - cat conftest.$ac_ext >&5
40289 - eval "ac_cv_func___res_nsearch=no"
40294 + if test "$ext_shared" = "yes"; then
40295 + LDFLAGS="-L$ai_p $LDFLAGS"
40296 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
40301 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
40303 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
40304 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
40305 + eval "LIBPATH$unique=set"
40307 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
40308 + LDFLAGS="$LDFLAGS -L$ai_p"
40309 + PHP_RPATHS="$PHP_RPATHS $ai_p"
40313 -if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then
40314 - echo "$ac_t""yes" 1>&6
40317 - echo "$ac_t""no" 1>&6
40329 - cat >> confdefs.h <<\EOF
40330 -#define HAVE_RES_NSEARCH 1
40336 - ac_cv_func_res_nsearch=yes
40341 - unset ac_cv_lib_resolv_res_nsearch
40342 - unset ac_cv_lib_resolv___res_nsearch
40344 - echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6
40345 -echo "configure:88929: checking for res_nsearch in -lresolv" >&5
40346 -ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'`
40347 + echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6
40348 +echo "configure:95145: checking for netg_errstr in -lsybtcl64" >&5
40349 +ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'`
40350 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
40351 echo $ac_n "(cached) $ac_c" 1>&6
40353 ac_save_LIBS="$LIBS"
40354 -LIBS="-lresolv $LIBS"
40355 +LIBS="-lsybtcl64 $LIBS"
40356 cat > conftest.$ac_ext <<EOF
40357 -#line 88937 "configure"
40358 +#line 95153 "configure"
40359 #include "confdefs.h"
40360 /* Override any gcc2 internal prototype to avoid an error. */
40361 /* We use char because int might match the return type of a gcc2
40362 builtin and then its argument prototype would still apply. */
40363 -char res_nsearch();
40364 +char netg_errstr();
40371 -if { (eval echo configure:88948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40372 +if { (eval echo configure:95164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40374 eval "ac_cv_lib_$ac_lib_var=yes"
40376 @@ -88959,167 +95175,186 @@ LIBS="$ac_save_LIBS"
40378 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
40379 echo "$ac_t""yes" 1>&6
40382 - echo "$ac_t""no" 1>&6
40384 + LDFLAGS=$save_old_LDFLAGS
40385 + ext_shared=$save_ext_shared
40390 + c|c_r|pthread*) ;;
40392 + if test "$ext_shared" = "yes"; then
40393 + SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD"
40398 + c|c_r|pthread*) ;;
40400 + LIBS="-lsybtcl64 $LIBS"
40404 - echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6
40405 -echo "configure:88968: checking for __res_nsearch in -lresolv" >&5
40406 -ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'`
40407 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
40408 - echo $ac_n "(cached) $ac_c" 1>&6
40410 - ac_save_LIBS="$LIBS"
40411 -LIBS="-lresolv $LIBS"
40412 -cat > conftest.$ac_ext <<EOF
40413 -#line 88976 "configure"
40414 -#include "confdefs.h"
40415 -/* Override any gcc2 internal prototype to avoid an error. */
40416 -/* We use char because int might match the return type of a gcc2
40417 - builtin and then its argument prototype would still apply. */
40418 -char __res_nsearch();
40424 -if { (eval echo configure:88987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40426 - eval "ac_cv_lib_$ac_lib_var=yes"
40428 - echo "configure: failed program was:" >&5
40429 - cat conftest.$ac_ext >&5
40431 - eval "ac_cv_lib_$ac_lib_var=no"
40434 -LIBS="$ac_save_LIBS"
40440 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
40441 - echo "$ac_t""yes" 1>&6
40447 echo "$ac_t""no" 1>&6
40451 + LDFLAGS=$save_old_LDFLAGS
40452 + ext_shared=$save_ext_shared
40453 + unset ac_cv_lib_sybtcl64_netg_errstr
40459 + c|c_r|pthread*) ;;
40461 + if test "$ext_shared" = "yes"; then
40462 + SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD"
40467 + c|c_r|pthread*) ;;
40469 + LIBS="-lsybtcl64 $LIBS"
40474 - if test "$found" = "yes"; then
40476 - LIBS="$LIBS -lresolv"
40477 - if test "$cross_compiling" = yes; then
40480 - cat > conftest.$ac_ext <<EOF
40481 -#line 89019 "configure"
40482 -#include "confdefs.h"
40483 -main() { return (0); }
40485 -if { (eval echo configure:89023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
40489 - echo "configure: failed program was:" >&5
40490 - cat conftest.$ac_ext >&5
40507 + save_old_LDFLAGS=$LDFLAGS
40508 + ac_stuff="-L$SYBASE_CT_LIBDIR"
40510 + save_ext_shared=$ext_shared
40513 + for ac_i in $ac_stuff; do
40516 + if test "$ext_shared" = "yes"; then
40517 + LDFLAGS="$LDFLAGS -pthread"
40521 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
40523 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
40524 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
40525 + eval "EXTRA_LDFLAGS$unique=set"
40526 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
40529 - if test "$found" = "yes"; then
40534 + ac_ii=`echo $ac_i|cut -c 3-`
40541 - LIBS="-lresolv $LIBS"
40542 + if test "$ext_shared" = "yes"; then
40543 + LDFLAGS="$LDFLAGS -l$ac_ii"
40548 + c|c_r|pthread*) ;;
40550 + LIBS="$LIBS -l$ac_ii"
40555 - cat >> confdefs.h <<\EOF
40556 -#define HAVE_RES_NSEARCH 1
40562 - cat >> confdefs.h <<\EOF
40563 -#define HAVE_LIBRESOLV 1
40566 - ac_cv_func_res_nsearch=yes
40569 + ac_ii=`echo $ac_i|cut -c 3-`
40571 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
40573 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
40577 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
40579 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
40580 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
40584 + if test "$ext_shared" = "yes"; then
40585 + LDFLAGS="-L$ai_p $LDFLAGS"
40586 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
40591 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
40593 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
40594 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
40595 + eval "LIBPATH$unique=set"
40597 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
40598 + LDFLAGS="$LDFLAGS -L$ai_p"
40599 + PHP_RPATHS="$PHP_RPATHS $ai_p"
40601 - unset ac_cv_lib_bind_res_nsearch
40602 - unset ac_cv_lib_bind___res_nsearch
40604 - echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6
40605 -echo "configure:89065: checking for res_nsearch in -lbind" >&5
40606 -ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'`
40607 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
40608 - echo $ac_n "(cached) $ac_c" 1>&6
40610 - ac_save_LIBS="$LIBS"
40611 -LIBS="-lbind $LIBS"
40612 -cat > conftest.$ac_ext <<EOF
40613 -#line 89073 "configure"
40614 -#include "confdefs.h"
40615 -/* Override any gcc2 internal prototype to avoid an error. */
40616 -/* We use char because int might match the return type of a gcc2
40617 - builtin and then its argument prototype would still apply. */
40618 -char res_nsearch();
40625 -if { (eval echo configure:89084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40627 - eval "ac_cv_lib_$ac_lib_var=yes"
40629 - echo "configure: failed program was:" >&5
40630 - cat conftest.$ac_ext >&5
40632 - eval "ac_cv_lib_$ac_lib_var=no"
40635 -LIBS="$ac_save_LIBS"
40638 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
40639 - echo "$ac_t""yes" 1>&6
40642 - echo "$ac_t""no" 1>&6
40647 - echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6
40648 -echo "configure:89104: checking for __res_nsearch in -lbind" >&5
40649 -ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'`
40654 + echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6
40655 +echo "configure:95339: checking for insck__getVdate in -linsck64" >&5
40656 +ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'`
40657 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
40658 echo $ac_n "(cached) $ac_c" 1>&6
40660 ac_save_LIBS="$LIBS"
40661 -LIBS="-lbind $LIBS"
40662 +LIBS="-linsck64 $LIBS"
40663 cat > conftest.$ac_ext <<EOF
40664 -#line 89112 "configure"
40665 +#line 95347 "configure"
40666 #include "confdefs.h"
40667 /* Override any gcc2 internal prototype to avoid an error. */
40668 /* We use char because int might match the return type of a gcc2
40669 builtin and then its argument prototype would still apply. */
40670 -char __res_nsearch();
40671 +char insck__getVdate();
40678 -if { (eval echo configure:89123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40679 +if { (eval echo configure:95358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40681 eval "ac_cv_lib_$ac_lib_var=yes"
40683 @@ -89134,128 +95369,159 @@ LIBS="$ac_save_LIBS"
40685 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
40686 echo "$ac_t""yes" 1>&6
40689 - echo "$ac_t""no" 1>&6
40695 + LDFLAGS=$save_old_LDFLAGS
40696 + ext_shared=$save_ext_shared
40700 + c|c_r|pthread*) ;;
40702 + if test "$ext_shared" = "yes"; then
40703 + SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD"
40708 + c|c_r|pthread*) ;;
40710 + LIBS="-linsck64 $LIBS"
40715 - if test "$found" = "yes"; then
40717 - LIBS="$LIBS -lbind"
40718 - if test "$cross_compiling" = yes; then
40721 - cat > conftest.$ac_ext <<EOF
40722 -#line 89155 "configure"
40723 -#include "confdefs.h"
40724 -main() { return (0); }
40726 -if { (eval echo configure:89159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
40736 - echo "configure: failed program was:" >&5
40737 - cat conftest.$ac_ext >&5
40742 + echo "$ac_t""no" 1>&6
40744 + LDFLAGS=$save_old_LDFLAGS
40745 + ext_shared=$save_ext_shared
40746 + unset ac_cv_lib_insck64_insck__getVdate
40753 + save_old_LDFLAGS=$LDFLAGS
40754 + ac_stuff="-L$SYBASE_CT_LIBDIR"
40756 + save_ext_shared=$ext_shared
40759 + for ac_i in $ac_stuff; do
40762 + if test "$ext_shared" = "yes"; then
40763 + LDFLAGS="$LDFLAGS -pthread"
40767 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
40769 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
40770 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
40771 + eval "EXTRA_LDFLAGS$unique=set"
40772 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
40775 - if test "$found" = "yes"; then
40780 + ac_ii=`echo $ac_i|cut -c 3-`
40784 + c|c_r|pthread*) ;;
40786 + if test "$ext_shared" = "yes"; then
40787 + LDFLAGS="$LDFLAGS -l$ac_ii"
40795 - LIBS="-lbind $LIBS"
40796 + LIBS="$LIBS -l$ac_ii"
40801 - cat >> confdefs.h <<\EOF
40802 -#define HAVE_RES_NSEARCH 1
40808 - cat >> confdefs.h <<\EOF
40809 -#define HAVE_LIBBIND 1
40812 - ac_cv_func_res_nsearch=yes
40815 + ac_ii=`echo $ac_i|cut -c 3-`
40817 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
40819 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
40823 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
40825 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
40826 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
40830 + if test "$ext_shared" = "yes"; then
40831 + LDFLAGS="-L$ai_p $LDFLAGS"
40832 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
40837 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
40839 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
40840 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
40841 + eval "LIBPATH$unique=set"
40843 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
40844 + LDFLAGS="$LDFLAGS -L$ai_p"
40845 + PHP_RPATHS="$PHP_RPATHS $ai_p"
40847 - unset ac_cv_lib_socket_res_nsearch
40848 - unset ac_cv_lib_socket___res_nsearch
40850 - echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6
40851 -echo "configure:89201: checking for res_nsearch in -lsocket" >&5
40852 -ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'`
40853 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
40854 - echo $ac_n "(cached) $ac_c" 1>&6
40856 - ac_save_LIBS="$LIBS"
40857 -LIBS="-lsocket $LIBS"
40858 -cat > conftest.$ac_ext <<EOF
40859 -#line 89209 "configure"
40860 -#include "confdefs.h"
40861 -/* Override any gcc2 internal prototype to avoid an error. */
40862 -/* We use char because int might match the return type of a gcc2
40863 - builtin and then its argument prototype would still apply. */
40864 -char res_nsearch();
40871 -if { (eval echo configure:89220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40873 - eval "ac_cv_lib_$ac_lib_var=yes"
40875 - echo "configure: failed program was:" >&5
40876 - cat conftest.$ac_ext >&5
40878 - eval "ac_cv_lib_$ac_lib_var=no"
40881 -LIBS="$ac_save_LIBS"
40884 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
40885 - echo "$ac_t""yes" 1>&6
40888 - echo "$ac_t""no" 1>&6
40893 - echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6
40894 -echo "configure:89240: checking for __res_nsearch in -lsocket" >&5
40895 -ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'`
40900 + echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6
40901 +echo "configure:95506: checking for bsd_tcp in -linsck64" >&5
40902 +ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'`
40903 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
40904 echo $ac_n "(cached) $ac_c" 1>&6
40906 ac_save_LIBS="$LIBS"
40907 -LIBS="-lsocket $LIBS"
40908 +LIBS="-linsck64 $LIBS"
40909 cat > conftest.$ac_ext <<EOF
40910 -#line 89248 "configure"
40911 +#line 95514 "configure"
40912 #include "confdefs.h"
40913 /* Override any gcc2 internal prototype to avoid an error. */
40914 /* We use char because int might match the return type of a gcc2
40915 builtin and then its argument prototype would still apply. */
40916 -char __res_nsearch();
40924 -if { (eval echo configure:89259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40925 +if { (eval echo configure:95525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
40927 eval "ac_cv_lib_$ac_lib_var=yes"
40929 @@ -89270,352 +95536,258 @@ LIBS="$ac_save_LIBS"
40931 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
40932 echo "$ac_t""yes" 1>&6
40935 - echo "$ac_t""no" 1>&6
40943 - if test "$found" = "yes"; then
40945 - LIBS="$LIBS -lsocket"
40946 - if test "$cross_compiling" = yes; then
40949 - cat > conftest.$ac_ext <<EOF
40950 -#line 89291 "configure"
40951 -#include "confdefs.h"
40952 -main() { return (0); }
40954 -if { (eval echo configure:89295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
40958 - echo "configure: failed program was:" >&5
40959 - cat conftest.$ac_ext >&5
40969 - if test "$found" = "yes"; then
40970 + LDFLAGS=$save_old_LDFLAGS
40971 + ext_shared=$save_ext_shared
40978 - LIBS="-lsocket $LIBS"
40979 + if test "$ext_shared" = "yes"; then
40980 + SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD"
40985 + c|c_r|pthread*) ;;
40987 + LIBS="-linsck64 $LIBS"
40992 - cat >> confdefs.h <<\EOF
40993 -#define HAVE_RES_NSEARCH 1
40996 - cat >> confdefs.h <<\EOF
40997 -#define HAVE_LIBSOCKET 1
41003 - ac_cv_func_res_nsearch=yes
41011 + echo "$ac_t""no" 1>&6
41014 + LDFLAGS=$save_old_LDFLAGS
41015 + ext_shared=$save_ext_shared
41016 + unset ac_cv_lib_insck64_bsd_tcp
41022 + elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then
41027 + c|c_r|pthread*) ;;
41029 + if test "$ext_shared" = "yes"; then
41030 + SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD"
41035 + c|c_r|pthread*) ;;
41037 + LIBS="-lsybcs $LIBS"
41042 - unset ac_cv_func_dns_search
41043 - unset ac_cv_func___dns_search
41046 - echo $ac_n "checking for dns_search""... $ac_c" 1>&6
41047 -echo "configure:89352: checking for dns_search" >&5
41048 -if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then
41049 - echo $ac_n "(cached) $ac_c" 1>&6
41051 - cat > conftest.$ac_ext <<EOF
41052 -#line 89357 "configure"
41053 -#include "confdefs.h"
41054 -/* System header to define __stub macros and hopefully few prototypes,
41055 - which can conflict with char dns_search(); below. */
41056 -#include <assert.h>
41057 -/* Override any gcc2 internal prototype to avoid an error. */
41058 -/* We use char because int might match the return type of a gcc2
41059 - builtin and then its argument prototype would still apply. */
41060 -char dns_search();
41067 -/* The GNU C library defines this for functions which it implements
41068 - to always fail with ENOSYS. Some functions are actually named
41069 - something starting with __ and the normal name is an alias. */
41070 -#if defined (__stub_dns_search) || defined (__stub___dns_search)
41078 -if { (eval echo configure:89380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41080 - eval "ac_cv_func_dns_search=yes"
41082 - echo "configure: failed program was:" >&5
41083 - cat conftest.$ac_ext >&5
41085 - eval "ac_cv_func_dns_search=no"
41092 + c|c_r|pthread*) ;;
41094 + if test "$ext_shared" = "yes"; then
41095 + SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD"
41100 + c|c_r|pthread*) ;;
41102 + LIBS="-lsybct $LIBS"
41106 -if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then
41107 - echo "$ac_t""yes" 1>&6
41110 - echo "$ac_t""no" 1>&6
41111 - echo $ac_n "checking for __dns_search""... $ac_c" 1>&6
41112 -echo "configure:89398: checking for __dns_search" >&5
41113 -if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then
41114 - echo $ac_n "(cached) $ac_c" 1>&6
41116 - cat > conftest.$ac_ext <<EOF
41117 -#line 89403 "configure"
41118 -#include "confdefs.h"
41119 -/* System header to define __stub macros and hopefully few prototypes,
41120 - which can conflict with char __dns_search(); below. */
41121 -#include <assert.h>
41122 -/* Override any gcc2 internal prototype to avoid an error. */
41123 -/* We use char because int might match the return type of a gcc2
41124 - builtin and then its argument prototype would still apply. */
41125 -char __dns_search();
41132 -/* The GNU C library defines this for functions which it implements
41133 - to always fail with ENOSYS. Some functions are actually named
41134 - something starting with __ and the normal name is an alias. */
41135 -#if defined (__stub___dns_search) || defined (__stub_____dns_search)
41143 -if { (eval echo configure:89426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41145 - eval "ac_cv_func___dns_search=yes"
41147 - echo "configure: failed program was:" >&5
41148 - cat conftest.$ac_ext >&5
41150 - eval "ac_cv_func___dns_search=no"
41157 + c|c_r|pthread*) ;;
41159 + if test "$ext_shared" = "yes"; then
41160 + SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD"
41165 + c|c_r|pthread*) ;;
41167 + LIBS="-lsybcomn $LIBS"
41171 -if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then
41172 - echo "$ac_t""yes" 1>&6
41175 - echo "$ac_t""no" 1>&6
41187 - cat >> confdefs.h <<\EOF
41188 -#define HAVE_DNS_SEARCH 1
41191 - ac_cv_func_dns_search=yes
41197 + c|c_r|pthread*) ;;
41199 + if test "$ext_shared" = "yes"; then
41200 + SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD"
41204 - unset ac_cv_lib_resolv_dns_search
41205 - unset ac_cv_lib_resolv___dns_search
41207 - echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6
41208 -echo "configure:89464: checking for dns_search in -lresolv" >&5
41209 -ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'`
41210 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41211 - echo $ac_n "(cached) $ac_c" 1>&6
41213 - ac_save_LIBS="$LIBS"
41214 -LIBS="-lresolv $LIBS"
41215 -cat > conftest.$ac_ext <<EOF
41216 -#line 89472 "configure"
41217 -#include "confdefs.h"
41218 -/* Override any gcc2 internal prototype to avoid an error. */
41219 -/* We use char because int might match the return type of a gcc2
41220 - builtin and then its argument prototype would still apply. */
41221 -char dns_search();
41227 -if { (eval echo configure:89483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41229 - eval "ac_cv_lib_$ac_lib_var=yes"
41231 - echo "configure: failed program was:" >&5
41232 - cat conftest.$ac_ext >&5
41234 - eval "ac_cv_lib_$ac_lib_var=no"
41237 -LIBS="$ac_save_LIBS"
41239 + c|c_r|pthread*) ;;
41241 + LIBS="-lsybintl $LIBS"
41246 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
41247 - echo "$ac_t""yes" 1>&6
41250 - echo "$ac_t""no" 1>&6
41252 - echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6
41253 -echo "configure:89503: checking for __dns_search in -lresolv" >&5
41254 -ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'`
41255 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41256 - echo $ac_n "(cached) $ac_c" 1>&6
41258 - ac_save_LIBS="$LIBS"
41259 -LIBS="-lresolv $LIBS"
41260 -cat > conftest.$ac_ext <<EOF
41261 -#line 89511 "configure"
41262 -#include "confdefs.h"
41263 -/* Override any gcc2 internal prototype to avoid an error. */
41264 -/* We use char because int might match the return type of a gcc2
41265 - builtin and then its argument prototype would still apply. */
41266 -char __dns_search();
41275 -if { (eval echo configure:89522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41277 - eval "ac_cv_lib_$ac_lib_var=yes"
41279 - echo "configure: failed program was:" >&5
41280 - cat conftest.$ac_ext >&5
41282 - eval "ac_cv_lib_$ac_lib_var=no"
41285 -LIBS="$ac_save_LIBS"
41288 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
41289 - echo "$ac_t""yes" 1>&6
41292 - echo "$ac_t""no" 1>&6
41296 + SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl"
41297 + echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6
41300 + save_old_LDFLAGS=$LDFLAGS
41305 + save_ext_shared=$ext_shared
41308 + for ac_i in $ac_stuff; do
41311 + if test "$ext_shared" = "yes"; then
41312 + LDFLAGS="$LDFLAGS -pthread"
41316 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
41318 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
41319 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
41320 + eval "EXTRA_LDFLAGS$unique=set"
41321 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
41327 + ac_ii=`echo $ac_i|cut -c 3-`
41332 + c|c_r|pthread*) ;;
41334 + if test "$ext_shared" = "yes"; then
41335 + LDFLAGS="$LDFLAGS -l$ac_ii"
41340 + c|c_r|pthread*) ;;
41342 + LIBS="$LIBS -l$ac_ii"
41347 - if test "$found" = "yes"; then
41349 - LIBS="$LIBS -lresolv"
41350 - if test "$cross_compiling" = yes; then
41353 - cat > conftest.$ac_ext <<EOF
41354 -#line 89554 "configure"
41355 -#include "confdefs.h"
41356 -main() { return (0); }
41358 -if { (eval echo configure:89558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
41362 - echo "configure: failed program was:" >&5
41363 - cat conftest.$ac_ext >&5
41377 + ac_ii=`echo $ac_i|cut -c 3-`
41379 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
41381 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
41385 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
41387 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
41388 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
41391 - if test "$found" = "yes"; then
41393 + if test "$ext_shared" = "yes"; then
41394 + LDFLAGS="-L$ai_p $LDFLAGS"
41395 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
41400 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
41402 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
41403 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
41404 + eval "LIBPATH$unique=set"
41406 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
41407 + LDFLAGS="$LDFLAGS -L$ai_p"
41408 + PHP_RPATHS="$PHP_RPATHS $ai_p"
41411 - c|c_r|pthread*) ;;
41413 - LIBS="-lresolv $LIBS"
41419 - cat >> confdefs.h <<\EOF
41420 -#define HAVE_DNS_SEARCH 1
41426 - cat >> confdefs.h <<\EOF
41427 -#define HAVE_LIBRESOLV 1
41433 - ac_cv_func_dns_search=yes
41437 - unset ac_cv_lib_bind_dns_search
41438 - unset ac_cv_lib_bind___dns_search
41440 - echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6
41441 -echo "configure:89600: checking for dns_search in -lbind" >&5
41442 -ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'`
41443 + echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6
41444 +echo "configure:95772: checking for netg_errstr in -lsybtcl" >&5
41445 +ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'`
41446 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41447 echo $ac_n "(cached) $ac_c" 1>&6
41449 ac_save_LIBS="$LIBS"
41450 -LIBS="-lbind $LIBS"
41451 +LIBS="-lsybtcl $LIBS"
41452 cat > conftest.$ac_ext <<EOF
41453 -#line 89608 "configure"
41454 +#line 95780 "configure"
41455 #include "confdefs.h"
41456 /* Override any gcc2 internal prototype to avoid an error. */
41457 /* We use char because int might match the return type of a gcc2
41458 builtin and then its argument prototype would still apply. */
41459 -char dns_search();
41460 +char netg_errstr();
41467 -if { (eval echo configure:89619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41468 +if { (eval echo configure:95791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41470 eval "ac_cv_lib_$ac_lib_var=yes"
41472 @@ -89630,167 +95802,186 @@ LIBS="$ac_save_LIBS"
41474 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
41475 echo "$ac_t""yes" 1>&6
41478 - echo "$ac_t""no" 1>&6
41480 + LDFLAGS=$save_old_LDFLAGS
41481 + ext_shared=$save_ext_shared
41486 + c|c_r|pthread*) ;;
41488 + if test "$ext_shared" = "yes"; then
41489 + SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
41494 + c|c_r|pthread*) ;;
41496 + LIBS="-lsybtcl $LIBS"
41500 - echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6
41501 -echo "configure:89639: checking for __dns_search in -lbind" >&5
41502 -ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'`
41503 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41504 - echo $ac_n "(cached) $ac_c" 1>&6
41506 - ac_save_LIBS="$LIBS"
41507 -LIBS="-lbind $LIBS"
41508 -cat > conftest.$ac_ext <<EOF
41509 -#line 89647 "configure"
41510 -#include "confdefs.h"
41511 -/* Override any gcc2 internal prototype to avoid an error. */
41512 -/* We use char because int might match the return type of a gcc2
41513 - builtin and then its argument prototype would still apply. */
41514 -char __dns_search();
41520 -if { (eval echo configure:89658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41522 - eval "ac_cv_lib_$ac_lib_var=yes"
41524 - echo "configure: failed program was:" >&5
41525 - cat conftest.$ac_ext >&5
41527 - eval "ac_cv_lib_$ac_lib_var=no"
41530 -LIBS="$ac_save_LIBS"
41536 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
41537 - echo "$ac_t""yes" 1>&6
41543 echo "$ac_t""no" 1>&6
41547 + LDFLAGS=$save_old_LDFLAGS
41548 + ext_shared=$save_ext_shared
41549 + unset ac_cv_lib_sybtcl_netg_errstr
41555 + c|c_r|pthread*) ;;
41557 + if test "$ext_shared" = "yes"; then
41558 + SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
41563 + c|c_r|pthread*) ;;
41565 + LIBS="-lsybtcl $LIBS"
41570 - if test "$found" = "yes"; then
41572 - LIBS="$LIBS -lbind"
41573 - if test "$cross_compiling" = yes; then
41576 - cat > conftest.$ac_ext <<EOF
41577 -#line 89690 "configure"
41578 -#include "confdefs.h"
41579 -main() { return (0); }
41581 -if { (eval echo configure:89694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
41585 - echo "configure: failed program was:" >&5
41586 - cat conftest.$ac_ext >&5
41603 + save_old_LDFLAGS=$LDFLAGS
41604 + ac_stuff="-L$SYBASE_CT_LIBDIR"
41606 + save_ext_shared=$ext_shared
41609 + for ac_i in $ac_stuff; do
41612 + if test "$ext_shared" = "yes"; then
41613 + LDFLAGS="$LDFLAGS -pthread"
41617 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
41619 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
41620 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
41621 + eval "EXTRA_LDFLAGS$unique=set"
41622 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
41625 - if test "$found" = "yes"; then
41630 + ac_ii=`echo $ac_i|cut -c 3-`
41637 - LIBS="-lbind $LIBS"
41638 + if test "$ext_shared" = "yes"; then
41639 + LDFLAGS="$LDFLAGS -l$ac_ii"
41644 + c|c_r|pthread*) ;;
41646 + LIBS="$LIBS -l$ac_ii"
41651 - cat >> confdefs.h <<\EOF
41652 -#define HAVE_DNS_SEARCH 1
41658 - cat >> confdefs.h <<\EOF
41659 -#define HAVE_LIBBIND 1
41662 - ac_cv_func_dns_search=yes
41665 + ac_ii=`echo $ac_i|cut -c 3-`
41667 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
41669 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
41673 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
41675 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
41676 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
41680 + if test "$ext_shared" = "yes"; then
41681 + LDFLAGS="-L$ai_p $LDFLAGS"
41682 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
41686 - unset ac_cv_lib_socket_dns_search
41687 - unset ac_cv_lib_socket___dns_search
41689 - echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6
41690 -echo "configure:89736: checking for dns_search in -lsocket" >&5
41691 -ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'`
41692 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41693 - echo $ac_n "(cached) $ac_c" 1>&6
41695 - ac_save_LIBS="$LIBS"
41696 -LIBS="-lsocket $LIBS"
41697 -cat > conftest.$ac_ext <<EOF
41698 -#line 89744 "configure"
41699 -#include "confdefs.h"
41700 -/* Override any gcc2 internal prototype to avoid an error. */
41701 -/* We use char because int might match the return type of a gcc2
41702 - builtin and then its argument prototype would still apply. */
41703 -char dns_search();
41705 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
41707 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
41708 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
41709 + eval "LIBPATH$unique=set"
41711 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
41712 + LDFLAGS="$LDFLAGS -L$ai_p"
41713 + PHP_RPATHS="$PHP_RPATHS $ai_p"
41721 -if { (eval echo configure:89755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41723 - eval "ac_cv_lib_$ac_lib_var=yes"
41725 - echo "configure: failed program was:" >&5
41726 - cat conftest.$ac_ext >&5
41728 - eval "ac_cv_lib_$ac_lib_var=no"
41731 -LIBS="$ac_save_LIBS"
41734 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
41735 - echo "$ac_t""yes" 1>&6
41738 - echo "$ac_t""no" 1>&6
41743 - echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6
41744 -echo "configure:89775: checking for __dns_search in -lsocket" >&5
41745 -ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'`
41750 + echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
41751 +echo "configure:95966: checking for insck__getVdate in -linsck" >&5
41752 +ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
41753 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
41754 echo $ac_n "(cached) $ac_c" 1>&6
41756 ac_save_LIBS="$LIBS"
41757 -LIBS="-lsocket $LIBS"
41758 +LIBS="-linsck $LIBS"
41759 cat > conftest.$ac_ext <<EOF
41760 -#line 89783 "configure"
41761 +#line 95974 "configure"
41762 #include "confdefs.h"
41763 /* Override any gcc2 internal prototype to avoid an error. */
41764 /* We use char because int might match the return type of a gcc2
41765 builtin and then its argument prototype would still apply. */
41766 -char __dns_search();
41767 +char insck__getVdate();
41774 -if { (eval echo configure:89794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41775 +if { (eval echo configure:95985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41777 eval "ac_cv_lib_$ac_lib_var=yes"
41779 @@ -89805,216 +95996,159 @@ LIBS="$ac_save_LIBS"
41781 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
41782 echo "$ac_t""yes" 1>&6
41785 - echo "$ac_t""no" 1>&6
41793 - if test "$found" = "yes"; then
41795 - LIBS="$LIBS -lsocket"
41796 - if test "$cross_compiling" = yes; then
41799 - cat > conftest.$ac_ext <<EOF
41800 -#line 89826 "configure"
41801 -#include "confdefs.h"
41802 -main() { return (0); }
41804 -if { (eval echo configure:89830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
41808 - echo "configure: failed program was:" >&5
41809 - cat conftest.$ac_ext >&5
41819 - if test "$found" = "yes"; then
41820 + LDFLAGS=$save_old_LDFLAGS
41821 + ext_shared=$save_ext_shared
41828 - LIBS="-lsocket $LIBS"
41829 + if test "$ext_shared" = "yes"; then
41830 + SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
41835 + c|c_r|pthread*) ;;
41837 + LIBS="-linsck $LIBS"
41842 - cat >> confdefs.h <<\EOF
41843 -#define HAVE_DNS_SEARCH 1
41846 - cat >> confdefs.h <<\EOF
41847 -#define HAVE_LIBSOCKET 1
41853 - ac_cv_func_dns_search=yes
41861 + echo "$ac_t""no" 1>&6
41864 + LDFLAGS=$save_old_LDFLAGS
41865 + ext_shared=$save_ext_shared
41866 + unset ac_cv_lib_insck_insck__getVdate
41873 + save_old_LDFLAGS=$LDFLAGS
41874 + ac_stuff="-L$SYBASE_CT_LIBDIR"
41877 + save_ext_shared=$ext_shared
41883 - unset ac_cv_func_dn_expand
41884 - unset ac_cv_func___dn_expand
41886 + for ac_i in $ac_stuff; do
41889 + if test "$ext_shared" = "yes"; then
41890 + LDFLAGS="$LDFLAGS -pthread"
41894 - echo $ac_n "checking for dn_expand""... $ac_c" 1>&6
41895 -echo "configure:89887: checking for dn_expand" >&5
41896 -if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then
41897 - echo $ac_n "(cached) $ac_c" 1>&6
41899 - cat > conftest.$ac_ext <<EOF
41900 -#line 89892 "configure"
41901 -#include "confdefs.h"
41902 -/* System header to define __stub macros and hopefully few prototypes,
41903 - which can conflict with char dn_expand(); below. */
41904 -#include <assert.h>
41905 -/* Override any gcc2 internal prototype to avoid an error. */
41906 -/* We use char because int might match the return type of a gcc2
41907 - builtin and then its argument prototype would still apply. */
41911 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
41913 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
41914 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
41915 + eval "EXTRA_LDFLAGS$unique=set"
41916 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
41919 -/* The GNU C library defines this for functions which it implements
41920 - to always fail with ENOSYS. Some functions are actually named
41921 - something starting with __ and the normal name is an alias. */
41922 -#if defined (__stub_dn_expand) || defined (__stub___dn_expand)
41930 + ac_ii=`echo $ac_i|cut -c 3-`
41934 + c|c_r|pthread*) ;;
41936 + if test "$ext_shared" = "yes"; then
41937 + LDFLAGS="$LDFLAGS -l$ac_ii"
41942 + c|c_r|pthread*) ;;
41944 + LIBS="$LIBS -l$ac_ii"
41950 -if { (eval echo configure:89915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
41952 - eval "ac_cv_func_dn_expand=yes"
41954 - echo "configure: failed program was:" >&5
41955 - cat conftest.$ac_ext >&5
41957 - eval "ac_cv_func_dn_expand=no"
41962 -if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then
41963 - echo "$ac_t""yes" 1>&6
41966 - echo "$ac_t""no" 1>&6
41967 - echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6
41968 -echo "configure:89933: checking for __dn_expand" >&5
41969 -if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then
41970 - echo $ac_n "(cached) $ac_c" 1>&6
41972 - cat > conftest.$ac_ext <<EOF
41973 -#line 89938 "configure"
41974 -#include "confdefs.h"
41975 -/* System header to define __stub macros and hopefully few prototypes,
41976 - which can conflict with char __dn_expand(); below. */
41977 -#include <assert.h>
41978 -/* Override any gcc2 internal prototype to avoid an error. */
41979 -/* We use char because int might match the return type of a gcc2
41980 - builtin and then its argument prototype would still apply. */
41981 -char __dn_expand();
41988 -/* The GNU C library defines this for functions which it implements
41989 - to always fail with ENOSYS. Some functions are actually named
41990 - something starting with __ and the normal name is an alias. */
41991 -#if defined (__stub___dn_expand) || defined (__stub_____dn_expand)
41998 + ac_ii=`echo $ac_i|cut -c 3-`
42000 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
42002 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
42006 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
42008 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
42009 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
42014 -if { (eval echo configure:89961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42016 - eval "ac_cv_func___dn_expand=yes"
42018 - echo "configure: failed program was:" >&5
42019 - cat conftest.$ac_ext >&5
42021 - eval "ac_cv_func___dn_expand=no"
42026 + if test "$ext_shared" = "yes"; then
42027 + LDFLAGS="-L$ai_p $LDFLAGS"
42028 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
42033 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
42035 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
42036 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
42037 + eval "LIBPATH$unique=set"
42039 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
42040 + LDFLAGS="$LDFLAGS -L$ai_p"
42041 + PHP_RPATHS="$PHP_RPATHS $ai_p"
42045 -if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then
42046 - echo "$ac_t""yes" 1>&6
42049 - echo "$ac_t""no" 1>&6
42061 - cat >> confdefs.h <<\EOF
42062 -#define HAVE_DN_EXPAND 1
42068 - ac_cv_func_dn_expand=yes
42073 - unset ac_cv_lib_resolv_dn_expand
42074 - unset ac_cv_lib_resolv___dn_expand
42076 - echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
42077 -echo "configure:89999: checking for dn_expand in -lresolv" >&5
42078 -ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
42079 + echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
42080 +echo "configure:96133: checking for bsd_tcp in -linsck" >&5
42081 +ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
42082 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
42083 echo $ac_n "(cached) $ac_c" 1>&6
42085 ac_save_LIBS="$LIBS"
42086 -LIBS="-lresolv $LIBS"
42087 +LIBS="-linsck $LIBS"
42088 cat > conftest.$ac_ext <<EOF
42089 -#line 90007 "configure"
42090 +#line 96141 "configure"
42091 #include "confdefs.h"
42092 /* Override any gcc2 internal prototype to avoid an error. */
42093 /* We use char because int might match the return type of a gcc2
42094 builtin and then its argument prototype would still apply. */
42103 -if { (eval echo configure:90018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42104 +if { (eval echo configure:96152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42106 eval "ac_cv_lib_$ac_lib_var=yes"
42108 @@ -90029,167 +96163,258 @@ LIBS="$ac_save_LIBS"
42110 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
42111 echo "$ac_t""yes" 1>&6
42114 - echo "$ac_t""no" 1>&6
42116 + LDFLAGS=$save_old_LDFLAGS
42117 + ext_shared=$save_ext_shared
42121 + c|c_r|pthread*) ;;
42123 + if test "$ext_shared" = "yes"; then
42124 + SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
42129 + c|c_r|pthread*) ;;
42131 + LIBS="-linsck $LIBS"
42135 - echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
42136 -echo "configure:90038: checking for __dn_expand in -lresolv" >&5
42137 -ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'`
42138 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
42139 - echo $ac_n "(cached) $ac_c" 1>&6
42141 - ac_save_LIBS="$LIBS"
42142 -LIBS="-lresolv $LIBS"
42143 -cat > conftest.$ac_ext <<EOF
42144 -#line 90046 "configure"
42145 -#include "confdefs.h"
42146 -/* Override any gcc2 internal prototype to avoid an error. */
42147 -/* We use char because int might match the return type of a gcc2
42148 - builtin and then its argument prototype would still apply. */
42149 -char __dn_expand();
42155 -if { (eval echo configure:90057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42157 - eval "ac_cv_lib_$ac_lib_var=yes"
42159 - echo "configure: failed program was:" >&5
42160 - cat conftest.$ac_ext >&5
42162 - eval "ac_cv_lib_$ac_lib_var=no"
42165 -LIBS="$ac_save_LIBS"
42171 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
42172 - echo "$ac_t""yes" 1>&6
42177 echo "$ac_t""no" 1>&6
42181 + LDFLAGS=$save_old_LDFLAGS
42182 + ext_shared=$save_ext_shared
42183 + unset ac_cv_lib_insck_bsd_tcp
42192 + c|c_r|pthread*) ;;
42194 + if test "$ext_shared" = "yes"; then
42195 + SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD"
42200 + c|c_r|pthread*) ;;
42202 + LIBS="-lcs $LIBS"
42206 - if test "$found" = "yes"; then
42208 - LIBS="$LIBS -lresolv"
42209 - if test "$cross_compiling" = yes; then
42212 - cat > conftest.$ac_ext <<EOF
42213 -#line 90089 "configure"
42214 -#include "confdefs.h"
42215 -main() { return (0); }
42217 -if { (eval echo configure:90093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
42221 - echo "configure: failed program was:" >&5
42222 - cat conftest.$ac_ext >&5
42236 - if test "$found" = "yes"; then
42243 - LIBS="-lresolv $LIBS"
42244 + if test "$ext_shared" = "yes"; then
42245 + SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD"
42250 + c|c_r|pthread*) ;;
42252 + LIBS="-lct $LIBS"
42257 - cat >> confdefs.h <<\EOF
42258 -#define HAVE_DN_EXPAND 1
42264 - cat >> confdefs.h <<\EOF
42265 -#define HAVE_LIBRESOLV 1
42268 - ac_cv_func_dn_expand=yes
42272 + c|c_r|pthread*) ;;
42274 + if test "$ext_shared" = "yes"; then
42275 + SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD"
42280 + c|c_r|pthread*) ;;
42282 + LIBS="-lcomn $LIBS"
42295 + c|c_r|pthread*) ;;
42297 + if test "$ext_shared" = "yes"; then
42298 + SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD"
42303 + c|c_r|pthread*) ;;
42305 + LIBS="-lintl $LIBS"
42316 + SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
42317 + echo "$ac_t""Sybase32 default: $SYBASE_CT_LIBS" 1>&6
42320 + save_old_LDFLAGS=$LDFLAGS
42325 + save_ext_shared=$ext_shared
42328 + for ac_i in $ac_stuff; do
42331 + if test "$ext_shared" = "yes"; then
42332 + LDFLAGS="$LDFLAGS -pthread"
42336 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
42338 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
42339 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
42340 + eval "EXTRA_LDFLAGS$unique=set"
42341 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
42347 + ac_ii=`echo $ac_i|cut -c 3-`
42351 + c|c_r|pthread*) ;;
42353 + if test "$ext_shared" = "yes"; then
42354 + LDFLAGS="$LDFLAGS -l$ac_ii"
42359 + c|c_r|pthread*) ;;
42361 + LIBS="$LIBS -l$ac_ii"
42373 + ac_ii=`echo $ac_i|cut -c 3-`
42375 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
42377 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
42381 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
42383 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
42384 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
42388 + if test "$ext_shared" = "yes"; then
42389 + LDFLAGS="-L$ai_p $LDFLAGS"
42390 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
42394 - unset ac_cv_lib_bind_dn_expand
42395 - unset ac_cv_lib_bind___dn_expand
42397 - echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6
42398 -echo "configure:90135: checking for dn_expand in -lbind" >&5
42399 -ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'`
42400 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
42401 - echo $ac_n "(cached) $ac_c" 1>&6
42403 - ac_save_LIBS="$LIBS"
42404 -LIBS="-lbind $LIBS"
42405 -cat > conftest.$ac_ext <<EOF
42406 -#line 90143 "configure"
42407 -#include "confdefs.h"
42408 -/* Override any gcc2 internal prototype to avoid an error. */
42409 -/* We use char because int might match the return type of a gcc2
42410 - builtin and then its argument prototype would still apply. */
42413 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
42415 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
42416 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
42417 + eval "LIBPATH$unique=set"
42419 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
42420 + LDFLAGS="$LDFLAGS -L$ai_p"
42421 + PHP_RPATHS="$PHP_RPATHS $ai_p"
42429 -if { (eval echo configure:90154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42431 - eval "ac_cv_lib_$ac_lib_var=yes"
42433 - echo "configure: failed program was:" >&5
42434 - cat conftest.$ac_ext >&5
42436 - eval "ac_cv_lib_$ac_lib_var=no"
42439 -LIBS="$ac_save_LIBS"
42442 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
42443 - echo "$ac_t""yes" 1>&6
42446 - echo "$ac_t""no" 1>&6
42451 - echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6
42452 -echo "configure:90174: checking for __dn_expand in -lbind" >&5
42453 -ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'`
42458 + echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
42459 +echo "configure:96399: checking for netg_errstr in -ltcl" >&5
42460 +ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'`
42461 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
42462 echo $ac_n "(cached) $ac_c" 1>&6
42464 ac_save_LIBS="$LIBS"
42465 -LIBS="-lbind $LIBS"
42466 +LIBS="-ltcl $LIBS"
42467 cat > conftest.$ac_ext <<EOF
42468 -#line 90182 "configure"
42469 +#line 96407 "configure"
42470 #include "confdefs.h"
42471 /* Override any gcc2 internal prototype to avoid an error. */
42472 /* We use char because int might match the return type of a gcc2
42473 builtin and then its argument prototype would still apply. */
42474 -char __dn_expand();
42475 +char netg_errstr();
42482 -if { (eval echo configure:90193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42483 +if { (eval echo configure:96418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42485 eval "ac_cv_lib_$ac_lib_var=yes"
42487 @@ -90204,89 +96429,186 @@ LIBS="$ac_save_LIBS"
42489 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
42490 echo "$ac_t""yes" 1>&6
42493 + LDFLAGS=$save_old_LDFLAGS
42494 + ext_shared=$save_ext_shared
42499 + c|c_r|pthread*) ;;
42501 + if test "$ext_shared" = "yes"; then
42502 + SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD"
42507 + c|c_r|pthread*) ;;
42509 + LIBS="-ltcl $LIBS"
42522 echo "$ac_t""no" 1>&6
42526 + LDFLAGS=$save_old_LDFLAGS
42527 + ext_shared=$save_ext_shared
42528 + unset ac_cv_lib_tcl_netg_errstr
42534 + c|c_r|pthread*) ;;
42536 + if test "$ext_shared" = "yes"; then
42537 + SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
42542 + c|c_r|pthread*) ;;
42544 + LIBS="-lsybtcl $LIBS"
42549 - if test "$found" = "yes"; then
42551 - LIBS="$LIBS -lbind"
42552 - if test "$cross_compiling" = yes; then
42555 - cat > conftest.$ac_ext <<EOF
42556 -#line 90225 "configure"
42557 -#include "confdefs.h"
42558 -main() { return (0); }
42560 -if { (eval echo configure:90229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
42564 - echo "configure: failed program was:" >&5
42565 - cat conftest.$ac_ext >&5
42582 + save_old_LDFLAGS=$LDFLAGS
42583 + ac_stuff="-L$SYBASE_CT_LIBDIR"
42585 + save_ext_shared=$ext_shared
42588 + for ac_i in $ac_stuff; do
42591 + if test "$ext_shared" = "yes"; then
42592 + LDFLAGS="$LDFLAGS -pthread"
42596 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
42598 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
42599 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
42600 + eval "EXTRA_LDFLAGS$unique=set"
42601 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
42604 - if test "$found" = "yes"; then
42608 + ac_ii=`echo $ac_i|cut -c 3-`
42612 + c|c_r|pthread*) ;;
42614 + if test "$ext_shared" = "yes"; then
42615 + LDFLAGS="$LDFLAGS -l$ac_ii"
42620 + c|c_r|pthread*) ;;
42622 + LIBS="$LIBS -l$ac_ii"
42634 + ac_ii=`echo $ac_i|cut -c 3-`
42636 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
42638 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
42642 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
42644 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
42645 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
42649 + if test "$ext_shared" = "yes"; then
42650 + LDFLAGS="-L$ai_p $LDFLAGS"
42651 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
42656 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
42658 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
42659 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
42660 + eval "LIBPATH$unique=set"
42662 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
42663 + LDFLAGS="$LDFLAGS -L$ai_p"
42664 + PHP_RPATHS="$PHP_RPATHS $ai_p"
42667 - c|c_r|pthread*) ;;
42669 - LIBS="-lbind $LIBS"
42675 - cat >> confdefs.h <<\EOF
42676 -#define HAVE_DN_EXPAND 1
42682 - cat >> confdefs.h <<\EOF
42683 -#define HAVE_LIBBIND 1
42689 - ac_cv_func_dn_expand=yes
42693 - unset ac_cv_lib_socket_dn_expand
42694 - unset ac_cv_lib_socket___dn_expand
42696 - echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6
42697 -echo "configure:90271: checking for dn_expand in -lsocket" >&5
42698 -ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'`
42699 + echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
42700 +echo "configure:96593: checking for insck__getVdate in -linsck" >&5
42701 +ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
42702 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
42703 echo $ac_n "(cached) $ac_c" 1>&6
42705 ac_save_LIBS="$LIBS"
42706 -LIBS="-lsocket $LIBS"
42707 +LIBS="-linsck $LIBS"
42708 cat > conftest.$ac_ext <<EOF
42709 -#line 90279 "configure"
42710 +#line 96601 "configure"
42711 #include "confdefs.h"
42712 /* Override any gcc2 internal prototype to avoid an error. */
42713 /* We use char because int might match the return type of a gcc2
42714 builtin and then its argument prototype would still apply. */
42716 +char insck__getVdate();
42723 -if { (eval echo configure:90290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42724 +if { (eval echo configure:96612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42726 eval "ac_cv_lib_$ac_lib_var=yes"
42728 @@ -90301,31 +96623,159 @@ LIBS="$ac_save_LIBS"
42730 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
42731 echo "$ac_t""yes" 1>&6
42734 + LDFLAGS=$save_old_LDFLAGS
42735 + ext_shared=$save_ext_shared
42739 + c|c_r|pthread*) ;;
42741 + if test "$ext_shared" = "yes"; then
42742 + SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
42747 + c|c_r|pthread*) ;;
42749 + LIBS="-linsck $LIBS"
42761 echo "$ac_t""no" 1>&6
42763 - echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6
42764 -echo "configure:90310: checking for __dn_expand in -lsocket" >&5
42765 -ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'`
42766 + LDFLAGS=$save_old_LDFLAGS
42767 + ext_shared=$save_ext_shared
42768 + unset ac_cv_lib_insck_insck__getVdate
42774 + save_old_LDFLAGS=$LDFLAGS
42775 + ac_stuff="-L$SYBASE_CT_LIBDIR"
42777 + save_ext_shared=$ext_shared
42780 + for ac_i in $ac_stuff; do
42783 + if test "$ext_shared" = "yes"; then
42784 + LDFLAGS="$LDFLAGS -pthread"
42788 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
42790 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
42791 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
42792 + eval "EXTRA_LDFLAGS$unique=set"
42793 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
42799 + ac_ii=`echo $ac_i|cut -c 3-`
42803 + c|c_r|pthread*) ;;
42805 + if test "$ext_shared" = "yes"; then
42806 + LDFLAGS="$LDFLAGS -l$ac_ii"
42811 + c|c_r|pthread*) ;;
42813 + LIBS="$LIBS -l$ac_ii"
42825 + ac_ii=`echo $ac_i|cut -c 3-`
42827 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
42829 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
42833 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
42835 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
42836 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
42840 + if test "$ext_shared" = "yes"; then
42841 + LDFLAGS="-L$ai_p $LDFLAGS"
42842 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
42847 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
42849 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
42850 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
42851 + eval "LIBPATH$unique=set"
42853 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
42854 + LDFLAGS="$LDFLAGS -L$ai_p"
42855 + PHP_RPATHS="$PHP_RPATHS $ai_p"
42868 + echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
42869 +echo "configure:96760: checking for bsd_tcp in -linsck" >&5
42870 +ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
42871 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
42872 echo $ac_n "(cached) $ac_c" 1>&6
42874 ac_save_LIBS="$LIBS"
42875 -LIBS="-lsocket $LIBS"
42876 +LIBS="-linsck $LIBS"
42877 cat > conftest.$ac_ext <<EOF
42878 -#line 90318 "configure"
42879 +#line 96768 "configure"
42880 #include "confdefs.h"
42881 /* Override any gcc2 internal prototype to avoid an error. */
42882 /* We use char because int might match the return type of a gcc2
42883 builtin and then its argument prototype would still apply. */
42884 -char __dn_expand();
42892 -if { (eval echo configure:90329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42893 +if { (eval echo configure:96779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
42895 eval "ac_cv_lib_$ac_lib_var=yes"
42897 @@ -90340,1690 +96790,1524 @@ LIBS="$ac_save_LIBS"
42899 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
42900 echo "$ac_t""yes" 1>&6
42903 - echo "$ac_t""no" 1>&6
42911 - if test "$found" = "yes"; then
42913 - LIBS="$LIBS -lsocket"
42914 - if test "$cross_compiling" = yes; then
42917 - cat > conftest.$ac_ext <<EOF
42918 -#line 90361 "configure"
42919 -#include "confdefs.h"
42920 -main() { return (0); }
42922 -if { (eval echo configure:90365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
42926 - echo "configure: failed program was:" >&5
42927 - cat conftest.$ac_ext >&5
42937 - if test "$found" = "yes"; then
42938 + LDFLAGS=$save_old_LDFLAGS
42939 + ext_shared=$save_ext_shared
42946 - LIBS="-lsocket $LIBS"
42947 + if test "$ext_shared" = "yes"; then
42948 + SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
42953 + c|c_r|pthread*) ;;
42955 + LIBS="-linsck $LIBS"
42960 - cat >> confdefs.h <<\EOF
42961 -#define HAVE_DN_EXPAND 1
42964 - cat >> confdefs.h <<\EOF
42965 -#define HAVE_LIBSOCKET 1
42971 - ac_cv_func_dn_expand=yes
42979 + echo "$ac_t""no" 1>&6
42982 + LDFLAGS=$save_old_LDFLAGS
42983 + ext_shared=$save_ext_shared
42984 + unset ac_cv_lib_insck_bsd_tcp
42997 - unset ac_cv_func_dn_skipname
42998 - unset ac_cv_func___dn_skipname
43001 - echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6
43002 -echo "configure:90422: checking for dn_skipname" >&5
43003 -if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then
43004 - echo $ac_n "(cached) $ac_c" 1>&6
43006 - cat > conftest.$ac_ext <<EOF
43007 -#line 90427 "configure"
43008 -#include "confdefs.h"
43009 -/* System header to define __stub macros and hopefully few prototypes,
43010 - which can conflict with char dn_skipname(); below. */
43011 -#include <assert.h>
43012 -/* Override any gcc2 internal prototype to avoid an error. */
43013 -/* We use char because int might match the return type of a gcc2
43014 - builtin and then its argument prototype would still apply. */
43015 -char dn_skipname();
43019 -/* The GNU C library defines this for functions which it implements
43020 - to always fail with ENOSYS. Some functions are actually named
43021 - something starting with __ and the normal name is an alias. */
43022 -#if defined (__stub_dn_skipname) || defined (__stub___dn_skipname)
43027 +php_enable_sysvmsg=no
43031 -if { (eval echo configure:90450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43033 - eval "ac_cv_func_dn_skipname=yes"
43034 +echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6
43035 +echo "configure:96839: checking whether to enable System V IPC support" >&5
43036 +# Check whether --enable-sysvmsg or --disable-sysvmsg was given.
43037 +if test "${enable_sysvmsg+set}" = set; then
43038 + enableval="$enable_sysvmsg"
43039 + PHP_SYSVMSG=$enableval
43041 - echo "configure: failed program was:" >&5
43042 - cat conftest.$ac_ext >&5
43044 - eval "ac_cv_func_dn_skipname=no"
43049 + test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL
43053 -if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then
43054 - echo "$ac_t""yes" 1>&6
43057 - echo "$ac_t""no" 1>&6
43058 - echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6
43059 -echo "configure:90468: checking for __dn_skipname" >&5
43060 -if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then
43063 +ext_output="yes, shared"
43065 +case $PHP_SYSVMSG in
43067 + PHP_SYSVMSG=`echo "$PHP_SYSVMSG"|$SED 's/^shared,//'`
43084 +echo "$ac_t""$ext_output" 1>&6
43089 +if test "$PHP_SYSVMSG" != "no"; then
43090 + ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
43091 +echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
43092 +echo "configure:96882: checking for sys/msg.h" >&5
43093 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
43094 echo $ac_n "(cached) $ac_c" 1>&6
43096 cat > conftest.$ac_ext <<EOF
43097 -#line 90473 "configure"
43098 +#line 96887 "configure"
43099 #include "confdefs.h"
43100 -/* System header to define __stub macros and hopefully few prototypes,
43101 - which can conflict with char __dn_skipname(); below. */
43102 -#include <assert.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 __dn_skipname();
43110 -/* The GNU C library defines this for functions which it implements
43111 - to always fail with ENOSYS. Some functions are actually named
43112 - something starting with __ and the normal name is an alias. */
43113 -#if defined (__stub___dn_skipname) || defined (__stub_____dn_skipname)
43120 +#include <sys/msg.h>
43122 -if { (eval echo configure:90496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43123 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
43124 +{ (eval echo configure:96892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
43125 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
43126 +if test -z "$ac_err"; then
43128 - eval "ac_cv_func___dn_skipname=yes"
43129 + eval "ac_cv_header_$ac_safe=yes"
43131 + echo "$ac_err" >&5
43132 echo "configure: failed program was:" >&5
43133 cat conftest.$ac_ext >&5
43135 - eval "ac_cv_func___dn_skipname=no"
43136 + eval "ac_cv_header_$ac_safe=no"
43141 -if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then
43142 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
43143 echo "$ac_t""yes" 1>&6
43147 echo "$ac_t""no" 1>&6
43151 +{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; }
43158 - cat >> confdefs.h <<\EOF
43159 -#define HAVE_DN_SKIPNAME 1
43160 + cat >> confdefs.h <<\EOF
43161 +#define HAVE_SYSVMSG 1
43164 - ac_cv_func_dn_skipname=yes
43168 + ext_builddir=ext/sysvmsg
43169 + ext_srcdir=$abs_srcdir/ext/sysvmsg
43173 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
43174 + PHP_SYSVMSG_SHARED=no
43177 - unset ac_cv_lib_resolv_dn_skipname
43178 - unset ac_cv_lib_resolv___dn_skipname
43180 - echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6
43181 -echo "configure:90534: checking for dn_skipname in -lresolv" >&5
43182 -ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'`
43183 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43184 - echo $ac_n "(cached) $ac_c" 1>&6
43186 - ac_save_LIBS="$LIBS"
43187 -LIBS="-lresolv $LIBS"
43188 -cat > conftest.$ac_ext <<EOF
43189 -#line 90542 "configure"
43190 -#include "confdefs.h"
43191 -/* Override any gcc2 internal prototype to avoid an error. */
43192 -/* We use char because int might match the return type of a gcc2
43193 - builtin and then its argument prototype would still apply. */
43194 -char dn_skipname();
43195 + case ext/sysvmsg in
43196 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
43197 + /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
43198 + *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
43203 + b_c_pre=$php_c_pre
43204 + b_cxx_pre=$php_cxx_pre
43205 + b_c_meta=$php_c_meta
43206 + b_cxx_meta=$php_cxx_meta
43207 + b_c_post=$php_c_post
43208 + b_cxx_post=$php_cxx_post
43213 + for ac_src in sysvmsg.c; do
43220 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
43223 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43224 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43225 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43226 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
43229 + cat >>Makefile.objects<<EOF
43230 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
43236 + EXT_STATIC="$EXT_STATIC sysvmsg"
43237 + if test "$ext_shared" != "nocli"; then
43238 + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg"
43241 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
43242 + PHP_SYSVMSG_SHARED=yes
43244 + case ext/sysvmsg in
43245 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
43246 + /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
43247 + *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
43252 + b_c_pre=$shared_c_pre
43253 + b_cxx_pre=$shared_cxx_pre
43254 + b_c_meta=$shared_c_meta
43255 + b_cxx_meta=$shared_cxx_meta
43256 + b_c_post=$shared_c_post
43257 + b_cxx_post=$shared_cxx_post
43262 + for ac_src in sysvmsg.c; do
43269 + shared_objects_sysvmsg="$shared_objects_sysvmsg $ac_bdir$ac_obj.lo"
43272 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43273 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43274 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43275 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
43278 + cat >>Makefile.objects<<EOF
43279 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
43284 + case $host_alias in
43287 + install_modules="install-modules"
43289 + case $host_alias in
43292 + 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'
43296 + link_cmd='$(LIBTOOL) --mode=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)'
43300 + link_cmd='$(LIBTOOL) --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)'
43308 -if { (eval echo configure:90553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43310 - eval "ac_cv_lib_$ac_lib_var=yes"
43312 - echo "configure: failed program was:" >&5
43313 - cat conftest.$ac_ext >&5
43315 - eval "ac_cv_lib_$ac_lib_var=no"
43318 -LIBS="$ac_save_LIBS"
43319 + if test "x" = "xyes"; then
43320 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvmsg.$suffix"
43322 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvmsg.$suffix"
43325 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg"
43328 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43329 - echo "$ac_t""yes" 1>&6
43332 - echo "$ac_t""no" 1>&6
43333 + cat >>Makefile.objects<<EOF
43334 +\$(phplibdir)/phpsysvmsg.$suffix: $ext_builddir/phpsysvmsg.$suffix
43335 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvmsg.$suffix \$(phplibdir)
43337 - echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6
43338 -echo "configure:90573: checking for __dn_skipname in -lresolv" >&5
43339 -ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'`
43340 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43341 - echo $ac_n "(cached) $ac_c" 1>&6
43343 - ac_save_LIBS="$LIBS"
43344 -LIBS="-lresolv $LIBS"
43345 -cat > conftest.$ac_ext <<EOF
43346 -#line 90581 "configure"
43347 -#include "confdefs.h"
43348 -/* Override any gcc2 internal prototype to avoid an error. */
43349 -/* We use char because int might match the return type of a gcc2
43350 - builtin and then its argument prototype would still apply. */
43351 -char __dn_skipname();
43352 +$ext_builddir/phpsysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(PHPSYSVMSG_SHARED_DEPENDENCIES)
43359 -if { (eval echo configure:90592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43361 - eval "ac_cv_lib_$ac_lib_var=yes"
43363 - echo "configure: failed program was:" >&5
43364 - cat conftest.$ac_ext >&5
43366 - eval "ac_cv_lib_$ac_lib_var=no"
43369 -LIBS="$ac_save_LIBS"
43372 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43373 - echo "$ac_t""yes" 1>&6
43376 - echo "$ac_t""no" 1>&6
43382 + install_modules="install-modules"
43384 + case $host_alias in
43387 + 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'
43391 + link_cmd='$(LIBTOOL) --mode=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)'
43395 + link_cmd='$(LIBTOOL) --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)'
43399 + if test "x" = "xyes"; then
43400 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvmsg.$suffix"
43402 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvmsg.$suffix"
43406 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg"
43408 + cat >>Makefile.objects<<EOF
43409 +\$(phplibdir)/sysvmsg.$suffix: $ext_builddir/sysvmsg.$suffix
43410 + \$(LIBTOOL) --mode=install cp $ext_builddir/sysvmsg.$suffix \$(phplibdir)
43412 +$ext_builddir/sysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_DEPENDENCIES)
43415 - if test "$found" = "yes"; then
43417 - LIBS="$LIBS -lresolv"
43418 - if test "$cross_compiling" = yes; then
43421 - cat > conftest.$ac_ext <<EOF
43422 -#line 90624 "configure"
43423 -#include "confdefs.h"
43424 -main() { return (0); }
43426 -if { (eval echo configure:90628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
43430 - echo "configure: failed program was:" >&5
43431 - cat conftest.$ac_ext >&5
43441 + cat >> confdefs.h <<EOF
43442 +#define COMPILE_DL_SYSVMSG 1
43448 - if test "$found" = "yes"; then
43450 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
43451 + PHP_SYSVMSG_SHARED=no
43452 + case "$PHP_SAPI" in
43457 - c|c_r|pthread*) ;;
43459 - LIBS="-lresolv $LIBS"
43461 + case ext/sysvmsg in
43462 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
43463 + /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
43464 + *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
43469 + b_c_pre=$php_c_pre
43470 + b_cxx_pre=$php_cxx_pre
43471 + b_c_meta=$php_c_meta
43472 + b_cxx_meta=$php_cxx_meta
43473 + b_c_post=$php_c_post
43474 + b_cxx_post=$php_cxx_post
43477 - cat >> confdefs.h <<\EOF
43478 -#define HAVE_DN_SKIPNAME 1
43481 - cat >> confdefs.h <<\EOF
43482 -#define HAVE_LIBRESOLV 1
43485 - ac_cv_func_dn_skipname=yes
43489 + for ac_src in sysvmsg.c; do
43491 - unset ac_cv_lib_bind_dn_skipname
43492 - unset ac_cv_lib_bind___dn_skipname
43494 - echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6
43495 -echo "configure:90670: checking for dn_skipname in -lbind" >&5
43496 -ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'`
43497 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43498 - echo $ac_n "(cached) $ac_c" 1>&6
43500 - ac_save_LIBS="$LIBS"
43501 -LIBS="-lbind $LIBS"
43502 -cat > conftest.$ac_ext <<EOF
43503 -#line 90678 "configure"
43504 -#include "confdefs.h"
43505 -/* Override any gcc2 internal prototype to avoid an error. */
43506 -/* We use char because int might match the return type of a gcc2
43507 - builtin and then its argument prototype would still apply. */
43508 -char dn_skipname();
43514 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
43520 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43521 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43522 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43523 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
43526 + cat >>Makefile.objects<<EOF
43527 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
43530 -if { (eval echo configure:90689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43532 - eval "ac_cv_lib_$ac_lib_var=yes"
43534 - echo "configure: failed program was:" >&5
43535 - cat conftest.$ac_ext >&5
43537 - eval "ac_cv_lib_$ac_lib_var=no"
43540 -LIBS="$ac_save_LIBS"
43544 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43545 - echo "$ac_t""yes" 1>&6
43548 - echo "$ac_t""no" 1>&6
43550 - echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
43551 -echo "configure:90709: checking for __dn_skipname in -lbind" >&5
43552 -ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'`
43553 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43554 - echo $ac_n "(cached) $ac_c" 1>&6
43556 - ac_save_LIBS="$LIBS"
43557 -LIBS="-lbind $LIBS"
43558 -cat > conftest.$ac_ext <<EOF
43559 -#line 90717 "configure"
43560 -#include "confdefs.h"
43561 -/* Override any gcc2 internal prototype to avoid an error. */
43562 -/* We use char because int might match the return type of a gcc2
43563 - builtin and then its argument prototype would still apply. */
43564 -char __dn_skipname();
43565 + EXT_STATIC="$EXT_STATIC sysvmsg"
43570 + case ext/sysvmsg in
43571 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
43572 + /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
43573 + *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
43582 -if { (eval echo configure:90728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43584 - eval "ac_cv_lib_$ac_lib_var=yes"
43586 - echo "configure: failed program was:" >&5
43587 - cat conftest.$ac_ext >&5
43589 - eval "ac_cv_lib_$ac_lib_var=no"
43592 -LIBS="$ac_save_LIBS"
43593 + b_c_pre=$php_c_pre
43594 + b_cxx_pre=$php_cxx_pre
43595 + b_c_meta=$php_c_meta
43596 + b_cxx_meta=$php_cxx_meta
43597 + b_c_post=$php_c_post
43598 + b_cxx_post=$php_cxx_post
43602 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43603 - echo "$ac_t""yes" 1>&6
43606 - echo "$ac_t""no" 1>&6
43611 + for ac_src in sysvmsg.c; do
43619 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
43622 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43623 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43624 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43625 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
43628 - if test "$found" = "yes"; then
43630 - LIBS="$LIBS -lbind"
43631 - if test "$cross_compiling" = yes; then
43634 - cat > conftest.$ac_ext <<EOF
43635 -#line 90760 "configure"
43636 -#include "confdefs.h"
43637 -main() { return (0); }
43638 + cat >>Makefile.objects<<EOF
43639 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
43642 -if { (eval echo configure:90764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
43646 - echo "configure: failed program was:" >&5
43647 - cat conftest.$ac_ext >&5
43659 + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg"
43663 + BUILD_DIR="$BUILD_DIR $ext_builddir"
43666 - if test "$found" = "yes"; then
43668 + if test "$ext_builddir" = "."; then
43669 + PHP_PECL_EXTENSION=sysvmsg
43673 - c|c_r|pthread*) ;;
43675 - LIBS="-lbind $LIBS"
43678 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
43682 - cat >> confdefs.h <<\EOF
43683 -#define HAVE_DN_SKIPNAME 1
43687 - cat >> confdefs.h <<\EOF
43688 -#define HAVE_LIBBIND 1
43691 - ac_cv_func_dn_skipname=yes
43695 - unset ac_cv_lib_socket_dn_skipname
43696 - unset ac_cv_lib_socket___dn_skipname
43698 - echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6
43699 -echo "configure:90806: checking for dn_skipname in -lsocket" >&5
43700 -ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'`
43701 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43702 - echo $ac_n "(cached) $ac_c" 1>&6
43704 - ac_save_LIBS="$LIBS"
43705 -LIBS="-lsocket $LIBS"
43706 -cat > conftest.$ac_ext <<EOF
43707 -#line 90814 "configure"
43708 -#include "confdefs.h"
43709 -/* Override any gcc2 internal prototype to avoid an error. */
43710 -/* We use char because int might match the return type of a gcc2
43711 - builtin and then its argument prototype would still apply. */
43712 -char dn_skipname();
43718 -if { (eval echo configure:90825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43720 - eval "ac_cv_lib_$ac_lib_var=yes"
43721 +php_enable_sysvsem=no
43723 +echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
43724 +echo "configure:97219: checking whether to enable System V semaphore support" >&5
43725 +# Check whether --enable-sysvsem or --disable-sysvsem was given.
43726 +if test "${enable_sysvsem+set}" = set; then
43727 + enableval="$enable_sysvsem"
43728 + PHP_SYSVSEM=$enableval
43730 - echo "configure: failed program was:" >&5
43731 - cat conftest.$ac_ext >&5
43733 - eval "ac_cv_lib_$ac_lib_var=no"
43736 -LIBS="$ac_save_LIBS"
43739 + test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL
43742 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43743 - echo "$ac_t""yes" 1>&6
43746 - echo "$ac_t""no" 1>&6
43748 - echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6
43749 -echo "configure:90845: checking for __dn_skipname in -lsocket" >&5
43750 -ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'`
43751 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
43752 - echo $ac_n "(cached) $ac_c" 1>&6
43754 - ac_save_LIBS="$LIBS"
43755 -LIBS="-lsocket $LIBS"
43756 -cat > conftest.$ac_ext <<EOF
43757 -#line 90853 "configure"
43758 -#include "confdefs.h"
43759 -/* Override any gcc2 internal prototype to avoid an error. */
43760 -/* We use char because int might match the return type of a gcc2
43761 - builtin and then its argument prototype would still apply. */
43762 -char __dn_skipname();
43768 -if { (eval echo configure:90864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43770 - eval "ac_cv_lib_$ac_lib_var=yes"
43772 - echo "configure: failed program was:" >&5
43773 - cat conftest.$ac_ext >&5
43775 - eval "ac_cv_lib_$ac_lib_var=no"
43778 -LIBS="$ac_save_LIBS"
43781 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
43782 - echo "$ac_t""yes" 1>&6
43785 - echo "$ac_t""no" 1>&6
43788 +ext_output="yes, shared"
43790 +case $PHP_SYSVSEM in
43792 + PHP_SYSVSEM=`echo "$PHP_SYSVSEM"|$SED 's/^shared,//'`
43811 - if test "$found" = "yes"; then
43813 - LIBS="$LIBS -lsocket"
43814 - if test "$cross_compiling" = yes; then
43817 - cat > conftest.$ac_ext <<EOF
43818 -#line 90896 "configure"
43819 -#include "confdefs.h"
43820 -main() { return (0); }
43822 -if { (eval echo configure:90900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
43826 - echo "configure: failed program was:" >&5
43827 - cat conftest.$ac_ext >&5
43833 +echo "$ac_t""$ext_output" 1>&6
43838 - if test "$found" = "yes"; then
43841 +if test "$PHP_SYSVSEM" != "no"; then
43843 + ext_builddir=ext/sysvsem
43844 + ext_srcdir=$abs_srcdir/ext/sysvsem
43848 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
43849 + PHP_SYSVSEM_SHARED=no
43853 - c|c_r|pthread*) ;;
43855 - LIBS="-lsocket $LIBS"
43857 + case ext/sysvsem in
43858 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
43859 + /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
43860 + *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
43865 + b_c_pre=$php_c_pre
43866 + b_cxx_pre=$php_cxx_pre
43867 + b_c_meta=$php_c_meta
43868 + b_cxx_meta=$php_cxx_meta
43869 + b_c_post=$php_c_post
43870 + b_cxx_post=$php_cxx_post
43875 + for ac_src in sysvsem.c; do
43882 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
43885 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43886 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43887 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43888 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
43891 - cat >> confdefs.h <<\EOF
43892 -#define HAVE_DN_SKIPNAME 1
43893 + cat >>Makefile.objects<<EOF
43894 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
43899 - cat >> confdefs.h <<\EOF
43900 -#define HAVE_LIBSOCKET 1
43903 - ac_cv_func_dn_skipname=yes
43904 + EXT_STATIC="$EXT_STATIC sysvsem"
43905 + if test "$ext_shared" != "nocli"; then
43906 + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem"
43919 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
43920 + PHP_SYSVSEM_SHARED=yes
43922 + case ext/sysvsem in
43923 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
43924 + /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
43925 + *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
43933 + b_c_pre=$shared_c_pre
43934 + b_cxx_pre=$shared_cxx_pre
43935 + b_c_meta=$shared_c_meta
43936 + b_cxx_meta=$shared_cxx_meta
43937 + b_c_post=$shared_c_post
43938 + b_cxx_post=$shared_cxx_post
43942 - unset ac_cv_func_res_search
43943 - unset ac_cv_func___res_search
43946 + for ac_src in sysvsem.c; do
43948 - echo $ac_n "checking for res_search""... $ac_c" 1>&6
43949 -echo "configure:90959: checking for res_search" >&5
43950 -if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
43951 - echo $ac_n "(cached) $ac_c" 1>&6
43953 - cat > conftest.$ac_ext <<EOF
43954 -#line 90964 "configure"
43955 -#include "confdefs.h"
43956 -/* System header to define __stub macros and hopefully few prototypes,
43957 - which can conflict with char res_search(); below. */
43958 -#include <assert.h>
43959 -/* Override any gcc2 internal prototype to avoid an error. */
43960 -/* We use char because int might match the return type of a gcc2
43961 - builtin and then its argument prototype would still apply. */
43962 -char res_search();
43970 + shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo"
43972 -/* The GNU C library defines this for functions which it implements
43973 - to always fail with ENOSYS. Some functions are actually named
43974 - something starting with __ and the normal name is an alias. */
43975 -#if defined (__stub_res_search) || defined (__stub___res_search)
43981 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43982 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43983 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
43984 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
43988 + cat >>Makefile.objects<<EOF
43989 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
43992 -if { (eval echo configure:90987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
43994 - eval "ac_cv_func_res_search=yes"
43996 - echo "configure: failed program was:" >&5
43997 - cat conftest.$ac_ext >&5
43999 - eval "ac_cv_func_res_search=no"
44004 -if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then
44005 - echo "$ac_t""yes" 1>&6
44008 - echo "$ac_t""no" 1>&6
44009 - echo $ac_n "checking for __res_search""... $ac_c" 1>&6
44010 -echo "configure:91005: checking for __res_search" >&5
44011 -if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then
44012 - echo $ac_n "(cached) $ac_c" 1>&6
44014 - cat > conftest.$ac_ext <<EOF
44015 -#line 91010 "configure"
44016 -#include "confdefs.h"
44017 -/* System header to define __stub macros and hopefully few prototypes,
44018 - which can conflict with char __res_search(); below. */
44019 -#include <assert.h>
44020 -/* Override any gcc2 internal prototype to avoid an error. */
44021 -/* We use char because int might match the return type of a gcc2
44022 - builtin and then its argument prototype would still apply. */
44023 -char __res_search();
44027 -/* The GNU C library defines this for functions which it implements
44028 - to always fail with ENOSYS. Some functions are actually named
44029 - something starting with __ and the normal name is an alias. */
44030 -#if defined (__stub___res_search) || defined (__stub_____res_search)
44039 -if { (eval echo configure:91033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44041 - eval "ac_cv_func___res_search=yes"
44043 - echo "configure: failed program was:" >&5
44044 - cat conftest.$ac_ext >&5
44046 - eval "ac_cv_func___res_search=no"
44050 + case $host_alias in
44053 + install_modules="install-modules"
44055 -if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then
44056 - echo "$ac_t""yes" 1>&6
44059 - echo "$ac_t""no" 1>&6
44064 + case $host_alias in
44067 + 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'
44071 + link_cmd='$(LIBTOOL) --mode=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)'
44075 + link_cmd='$(LIBTOOL) --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)'
44079 + if test "x" = "xyes"; then
44080 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvsem.$suffix"
44082 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix"
44085 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem"
44089 - cat >> confdefs.h <<\EOF
44090 -#define HAVE_RES_SEARCH 1
44092 + cat >>Makefile.objects<<EOF
44093 +\$(phplibdir)/phpsysvsem.$suffix: $ext_builddir/phpsysvsem.$suffix
44094 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvsem.$suffix \$(phplibdir)
44096 - ac_cv_func_res_search=yes
44101 - unset ac_cv_lib_resolv_res_search
44102 - unset ac_cv_lib_resolv___res_search
44104 - echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
44105 -echo "configure:91071: checking for res_search in -lresolv" >&5
44106 -ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
44107 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44108 - echo $ac_n "(cached) $ac_c" 1>&6
44110 - ac_save_LIBS="$LIBS"
44111 -LIBS="-lresolv $LIBS"
44112 -cat > conftest.$ac_ext <<EOF
44113 -#line 91079 "configure"
44114 -#include "confdefs.h"
44115 -/* Override any gcc2 internal prototype to avoid an error. */
44116 -/* We use char because int might match the return type of a gcc2
44117 - builtin and then its argument prototype would still apply. */
44118 -char res_search();
44119 +$ext_builddir/phpsysvsem.$suffix: \$(shared_objects_sysvsem) \$(PHPSYSVSEM_SHARED_DEPENDENCIES)
44126 -if { (eval echo configure:91090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44128 - eval "ac_cv_lib_$ac_lib_var=yes"
44130 - echo "configure: failed program was:" >&5
44131 - cat conftest.$ac_ext >&5
44133 - eval "ac_cv_lib_$ac_lib_var=no"
44136 -LIBS="$ac_save_LIBS"
44139 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44140 - echo "$ac_t""yes" 1>&6
44143 - echo "$ac_t""no" 1>&6
44147 + install_modules="install-modules"
44149 - echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6
44150 -echo "configure:91110: checking for __res_search in -lresolv" >&5
44151 -ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'`
44152 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44153 - echo $ac_n "(cached) $ac_c" 1>&6
44155 - ac_save_LIBS="$LIBS"
44156 -LIBS="-lresolv $LIBS"
44157 -cat > conftest.$ac_ext <<EOF
44158 -#line 91118 "configure"
44159 -#include "confdefs.h"
44160 -/* Override any gcc2 internal prototype to avoid an error. */
44161 -/* We use char because int might match the return type of a gcc2
44162 - builtin and then its argument prototype would still apply. */
44163 -char __res_search();
44164 + case $host_alias in
44167 + 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'
44171 + link_cmd='$(LIBTOOL) --mode=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)'
44175 + link_cmd='$(LIBTOOL) --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)'
44183 -if { (eval echo configure:91129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44185 - eval "ac_cv_lib_$ac_lib_var=yes"
44187 - echo "configure: failed program was:" >&5
44188 - cat conftest.$ac_ext >&5
44190 - eval "ac_cv_lib_$ac_lib_var=no"
44193 -LIBS="$ac_save_LIBS"
44194 + if test "x" = "xyes"; then
44195 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvsem.$suffix"
44197 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvsem.$suffix"
44200 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem"
44203 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44204 - echo "$ac_t""yes" 1>&6
44207 - echo "$ac_t""no" 1>&6
44210 + cat >>Makefile.objects<<EOF
44211 +\$(phplibdir)/sysvsem.$suffix: $ext_builddir/sysvsem.$suffix
44212 + \$(LIBTOOL) --mode=install cp $ext_builddir/sysvsem.$suffix \$(phplibdir)
44216 +$ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES)
44221 - if test "$found" = "yes"; then
44223 - LIBS="$LIBS -lresolv"
44224 - if test "$cross_compiling" = yes; then
44227 - cat > conftest.$ac_ext <<EOF
44228 -#line 91161 "configure"
44229 -#include "confdefs.h"
44230 -main() { return (0); }
44233 + cat >> confdefs.h <<EOF
44234 +#define COMPILE_DL_SYSVSEM 1
44236 -if { (eval echo configure:91165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
44240 - echo "configure: failed program was:" >&5
44241 - cat conftest.$ac_ext >&5
44252 - if test "$found" = "yes"; then
44254 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
44255 + PHP_SYSVSEM_SHARED=no
44256 + case "$PHP_SAPI" in
44261 - c|c_r|pthread*) ;;
44263 - LIBS="-lresolv $LIBS"
44265 + case ext/sysvsem in
44266 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
44267 + /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
44268 + *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
44273 + b_c_pre=$php_c_pre
44274 + b_cxx_pre=$php_cxx_pre
44275 + b_c_meta=$php_c_meta
44276 + b_cxx_meta=$php_cxx_meta
44277 + b_c_post=$php_c_post
44278 + b_cxx_post=$php_cxx_post
44281 - cat >> confdefs.h <<\EOF
44282 -#define HAVE_RES_SEARCH 1
44285 - cat >> confdefs.h <<\EOF
44286 -#define HAVE_LIBRESOLV 1
44289 - ac_cv_func_res_search=yes
44293 + for ac_src in sysvsem.c; do
44295 - unset ac_cv_lib_bind_res_search
44296 - unset ac_cv_lib_bind___res_search
44298 - echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6
44299 -echo "configure:91207: checking for res_search in -lbind" >&5
44300 -ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'`
44301 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44302 - echo $ac_n "(cached) $ac_c" 1>&6
44304 - ac_save_LIBS="$LIBS"
44305 -LIBS="-lbind $LIBS"
44306 -cat > conftest.$ac_ext <<EOF
44307 -#line 91215 "configure"
44308 -#include "confdefs.h"
44309 -/* Override any gcc2 internal prototype to avoid an error. */
44310 -/* We use char because int might match the return type of a gcc2
44311 - builtin and then its argument prototype would still apply. */
44312 -char res_search();
44318 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
44324 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44325 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44326 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44327 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
44330 + cat >>Makefile.objects<<EOF
44331 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
44334 -if { (eval echo configure:91226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44336 - eval "ac_cv_lib_$ac_lib_var=yes"
44338 - echo "configure: failed program was:" >&5
44339 - cat conftest.$ac_ext >&5
44341 - eval "ac_cv_lib_$ac_lib_var=no"
44344 -LIBS="$ac_save_LIBS"
44348 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44349 - echo "$ac_t""yes" 1>&6
44352 - echo "$ac_t""no" 1>&6
44354 - echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6
44355 -echo "configure:91246: checking for __res_search in -lbind" >&5
44356 -ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'`
44357 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44358 - echo $ac_n "(cached) $ac_c" 1>&6
44360 - ac_save_LIBS="$LIBS"
44361 -LIBS="-lbind $LIBS"
44362 -cat > conftest.$ac_ext <<EOF
44363 -#line 91254 "configure"
44364 -#include "confdefs.h"
44365 -/* Override any gcc2 internal prototype to avoid an error. */
44366 -/* We use char because int might match the return type of a gcc2
44367 - builtin and then its argument prototype would still apply. */
44368 -char __res_search();
44369 + EXT_STATIC="$EXT_STATIC sysvsem"
44374 + case ext/sysvsem in
44375 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
44376 + /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
44377 + *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
44386 -if { (eval echo configure:91265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44388 - eval "ac_cv_lib_$ac_lib_var=yes"
44390 - echo "configure: failed program was:" >&5
44391 - cat conftest.$ac_ext >&5
44393 - eval "ac_cv_lib_$ac_lib_var=no"
44396 -LIBS="$ac_save_LIBS"
44397 + b_c_pre=$php_c_pre
44398 + b_cxx_pre=$php_cxx_pre
44399 + b_c_meta=$php_c_meta
44400 + b_cxx_meta=$php_cxx_meta
44401 + b_c_post=$php_c_post
44402 + b_cxx_post=$php_cxx_post
44406 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44407 - echo "$ac_t""yes" 1>&6
44410 - echo "$ac_t""no" 1>&6
44415 + for ac_src in sysvsem.c; do
44423 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
44426 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44427 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44428 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44429 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
44432 - if test "$found" = "yes"; then
44434 - LIBS="$LIBS -lbind"
44435 - if test "$cross_compiling" = yes; then
44438 - cat > conftest.$ac_ext <<EOF
44439 -#line 91297 "configure"
44440 -#include "confdefs.h"
44441 -main() { return (0); }
44442 + cat >>Makefile.objects<<EOF
44443 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
44446 -if { (eval echo configure:91301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
44450 - echo "configure: failed program was:" >&5
44451 - cat conftest.$ac_ext >&5
44463 + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem"
44466 - if test "$found" = "yes"; then
44470 - c|c_r|pthread*) ;;
44472 - LIBS="-lbind $LIBS"
44476 + BUILD_DIR="$BUILD_DIR $ext_builddir"
44480 - cat >> confdefs.h <<\EOF
44481 -#define HAVE_RES_SEARCH 1
44483 + if test "$ext_builddir" = "."; then
44484 + PHP_PECL_EXTENSION=sysvsem
44486 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
44488 - cat >> confdefs.h <<\EOF
44489 -#define HAVE_LIBBIND 1
44492 + cat >> confdefs.h <<\EOF
44493 +#define HAVE_SYSVSEM 1
44496 - ac_cv_func_res_search=yes
44500 - unset ac_cv_lib_socket_res_search
44501 - unset ac_cv_lib_socket___res_search
44503 - echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6
44504 -echo "configure:91343: checking for res_search in -lsocket" >&5
44505 -ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'`
44506 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44507 + echo $ac_n "checking for union semun""... $ac_c" 1>&6
44508 +echo "configure:97557: checking for union semun" >&5
44509 +if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
44510 echo $ac_n "(cached) $ac_c" 1>&6
44512 - ac_save_LIBS="$LIBS"
44513 -LIBS="-lsocket $LIBS"
44514 -cat > conftest.$ac_ext <<EOF
44515 -#line 91351 "configure"
44516 + cat > conftest.$ac_ext <<EOF
44517 +#line 97562 "configure"
44518 #include "confdefs.h"
44519 -/* Override any gcc2 internal prototype to avoid an error. */
44520 -/* We use char because int might match the return type of a gcc2
44521 - builtin and then its argument prototype would still apply. */
44522 -char res_search();
44524 +#include <sys/types.h>
44525 +#include <sys/ipc.h>
44526 +#include <sys/sem.h>
44533 -if { (eval echo configure:91362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44534 +if { (eval echo configure:97573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
44536 - eval "ac_cv_lib_$ac_lib_var=yes"
44541 echo "configure: failed program was:" >&5
44542 cat conftest.$ac_ext >&5
44544 - eval "ac_cv_lib_$ac_lib_var=no"
44550 -LIBS="$ac_save_LIBS"
44554 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44555 - echo "$ac_t""yes" 1>&6
44558 - echo "$ac_t""no" 1>&6
44560 - echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6
44561 -echo "configure:91382: checking for __res_search in -lsocket" >&5
44562 -ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'`
44563 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
44564 - echo $ac_n "(cached) $ac_c" 1>&6
44566 - ac_save_LIBS="$LIBS"
44567 -LIBS="-lsocket $LIBS"
44568 -cat > conftest.$ac_ext <<EOF
44569 -#line 91390 "configure"
44570 -#include "confdefs.h"
44571 -/* Override any gcc2 internal prototype to avoid an error. */
44572 -/* We use char because int might match the return type of a gcc2
44573 - builtin and then its argument prototype would still apply. */
44574 -char __res_search();
44575 +echo "$ac_t""$php_cv_semun" 1>&6
44576 + if test "$php_cv_semun" = "yes"; then
44577 + cat >> confdefs.h <<\EOF
44578 +#define HAVE_SEMUN 1
44585 + cat >> confdefs.h <<\EOF
44586 +#define HAVE_SEMUN 0
44588 -if { (eval echo configure:91401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
44590 - eval "ac_cv_lib_$ac_lib_var=yes"
44592 - echo "configure: failed program was:" >&5
44593 - cat conftest.$ac_ext >&5
44595 - eval "ac_cv_lib_$ac_lib_var=no"
44598 -LIBS="$ac_save_LIBS"
44602 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
44603 - echo "$ac_t""yes" 1>&6
44606 - echo "$ac_t""no" 1>&6
44612 +php_enable_sysvshm=no
44614 +echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
44615 +echo "configure:97609: checking whether to enable System V shared memory support" >&5
44616 +# Check whether --enable-sysvshm or --disable-sysvshm was given.
44617 +if test "${enable_sysvshm+set}" = set; then
44618 + enableval="$enable_sysvshm"
44619 + PHP_SYSVSHM=$enableval
44623 + test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL
44628 - if test "$found" = "yes"; then
44630 - LIBS="$LIBS -lsocket"
44631 - if test "$cross_compiling" = yes; then
44634 - cat > conftest.$ac_ext <<EOF
44635 -#line 91433 "configure"
44636 -#include "confdefs.h"
44637 -main() { return (0); }
44639 +ext_output="yes, shared"
44641 +case $PHP_SYSVSHM in
44643 + PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'`
44660 +echo "$ac_t""$ext_output" 1>&6
44665 +if test "$PHP_SYSVSHM" != "no"; then
44666 + cat >> confdefs.h <<\EOF
44667 +#define HAVE_SYSVSHM 1
44669 -if { (eval echo configure:91437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
44673 - echo "configure: failed program was:" >&5
44674 - cat conftest.$ac_ext >&5
44684 + ext_builddir=ext/sysvshm
44685 + ext_srcdir=$abs_srcdir/ext/sysvshm
44687 - if test "$found" = "yes"; then
44690 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
44691 + PHP_SYSVSHM_SHARED=no
44695 - c|c_r|pthread*) ;;
44697 - LIBS="-lsocket $LIBS"
44699 + case ext/sysvshm in
44700 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
44701 + /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
44702 + *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
44707 + b_c_pre=$php_c_pre
44708 + b_cxx_pre=$php_cxx_pre
44709 + b_c_meta=$php_c_meta
44710 + b_cxx_meta=$php_cxx_meta
44711 + b_c_post=$php_c_post
44712 + b_cxx_post=$php_cxx_post
44715 - cat >> confdefs.h <<\EOF
44716 -#define HAVE_RES_SEARCH 1
44719 - cat >> confdefs.h <<\EOF
44720 -#define HAVE_LIBSOCKET 1
44723 + for ac_src in sysvshm.c; do
44730 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
44732 - ac_cv_func_res_search=yes
44737 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44738 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44739 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44740 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
44745 + cat >>Makefile.objects<<EOF
44746 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
44755 + EXT_STATIC="$EXT_STATIC sysvshm"
44756 + if test "$ext_shared" != "nocli"; then
44757 + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm"
44760 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
44761 + PHP_SYSVSHM_SHARED=yes
44763 + case ext/sysvshm in
44764 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
44765 + /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
44766 + *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
44773 + b_c_pre=$shared_c_pre
44774 + b_cxx_pre=$shared_cxx_pre
44775 + b_c_meta=$shared_c_meta
44776 + b_cxx_meta=$shared_cxx_meta
44777 + b_c_post=$shared_c_post
44778 + b_cxx_post=$shared_cxx_post
44782 -echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6
44783 -echo "configure:91490: checking whether atof() accepts NAN" >&5
44784 -if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then
44785 - echo $ac_n "(cached) $ac_c" 1>&6
44788 -if test "$cross_compiling" = yes; then
44790 + for ac_src in sysvshm.c; do
44792 - ac_cv_atof_accept_nan=no
44798 + shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo"
44801 - cat > conftest.$ac_ext <<EOF
44802 -#line 91501 "configure"
44803 -#include "confdefs.h"
44805 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44806 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44807 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44808 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
44812 -#include <stdlib.h>
44813 + cat >>Makefile.objects<<EOF
44814 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
44820 -#define zend_isnan(a) isnan(a)
44821 -#elif defined(HAVE_FPCLASS)
44822 -#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
44824 -#define zend_isnan(a) 0
44826 + case $host_alias in
44829 + install_modules="install-modules"
44831 -int main(int argc, char** argv)
44833 - return zend_isnan(atof("NAN")) ? 0 : 1;
44835 + case $host_alias in
44838 + 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'
44842 + link_cmd='$(LIBTOOL) --mode=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)'
44846 + link_cmd='$(LIBTOOL) --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)'
44851 -if { (eval echo configure:91521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
44853 + if test "x" = "xyes"; then
44854 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvshm.$suffix"
44856 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix"
44859 - ac_cv_atof_accept_nan=yes
44860 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm"
44863 - echo "configure: failed program was:" >&5
44864 - cat conftest.$ac_ext >&5
44866 + cat >>Makefile.objects<<EOF
44867 +\$(phplibdir)/phpsysvshm.$suffix: $ext_builddir/phpsysvshm.$suffix
44868 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvshm.$suffix \$(phplibdir)
44870 +$ext_builddir/phpsysvshm.$suffix: \$(shared_objects_sysvshm) \$(PHPSYSVSHM_SHARED_DEPENDENCIES)
44878 + install_modules="install-modules"
44880 + case $host_alias in
44883 + 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'
44887 + link_cmd='$(LIBTOOL) --mode=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)'
44891 + link_cmd='$(LIBTOOL) --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)'
44895 + if test "x" = "xyes"; then
44896 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvshm.$suffix"
44898 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvshm.$suffix"
44901 - ac_cv_atof_accept_nan=no
44902 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm"
44907 + cat >>Makefile.objects<<EOF
44908 +\$(phplibdir)/sysvshm.$suffix: $ext_builddir/sysvshm.$suffix
44909 + \$(LIBTOOL) --mode=install cp $ext_builddir/sysvshm.$suffix \$(phplibdir)
44912 +$ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES)
44915 -echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6
44916 -if test "$ac_cv_atof_accept_nan" = "yes"; then
44917 - cat >> confdefs.h <<\EOF
44918 -#define HAVE_ATOF_ACCEPTS_NAN 1
44924 + cat >> confdefs.h <<EOF
44925 +#define COMPILE_DL_SYSVSHM 1
44928 -echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6
44929 -echo "configure:91548: checking whether atof() accepts INF" >&5
44930 -if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then
44931 - echo $ac_n "(cached) $ac_c" 1>&6
44936 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
44937 + PHP_SYSVSHM_SHARED=no
44938 + case "$PHP_SAPI" in
44942 + case ext/sysvshm in
44943 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
44944 + /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
44945 + *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
44948 -if test "$cross_compiling" = yes; then
44950 - ac_cv_atof_accept_inf=no
44953 - cat > conftest.$ac_ext <<EOF
44954 -#line 91559 "configure"
44955 -#include "confdefs.h"
44956 + b_c_pre=$php_c_pre
44957 + b_cxx_pre=$php_cxx_pre
44958 + b_c_meta=$php_c_meta
44959 + b_cxx_meta=$php_cxx_meta
44960 + b_c_post=$php_c_post
44961 + b_cxx_post=$php_cxx_post
44965 -#include <stdlib.h>
44968 -#define zend_isinf(a) isinf(a)
44969 -#elif defined(INFINITY)
44970 -/* Might not work, but is required by ISO C99 */
44971 -#define zend_isinf(a) (((a)==INFINITY)?1:0)
44972 -#elif defined(HAVE_FPCLASS)
44973 -#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
44975 -#define zend_isinf(a) 0
44978 + for ac_src in sysvshm.c; do
44985 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
44987 -int main(int argc, char** argv)
44989 - return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1;
44992 + *.c) ac_comp="$b_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 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
44995 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
44998 + cat >>Makefile.objects<<EOF
44999 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
45002 -if { (eval echo configure:91582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
45005 - ac_cv_atof_accept_inf=yes
45009 - echo "configure: failed program was:" >&5
45010 - cat conftest.$ac_ext >&5
45013 + EXT_STATIC="$EXT_STATIC sysvshm"
45018 + case ext/sysvshm in
45019 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45020 + /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45021 + *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45025 - ac_cv_atof_accept_inf=no
45030 + b_c_pre=$php_c_pre
45031 + b_cxx_pre=$php_cxx_pre
45032 + b_c_meta=$php_c_meta
45033 + b_cxx_meta=$php_cxx_meta
45034 + b_c_post=$php_c_post
45035 + b_cxx_post=$php_cxx_post
45040 -echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6
45041 -if test "$ac_cv_atof_accept_inf" = "yes"; then
45042 - cat >> confdefs.h <<\EOF
45043 -#define HAVE_ATOF_ACCEPTS_INF 1
45045 + for ac_src in sysvshm.c; do
45052 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
45055 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45056 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45057 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45058 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
45061 + cat >>Makefile.objects<<EOF
45062 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
45069 -echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6
45070 -echo "configure:91609: checking whether HUGE_VAL == INF" >&5
45071 -if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then
45072 - echo $ac_n "(cached) $ac_c" 1>&6
45076 + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm"
45079 -if test "$cross_compiling" = yes; then
45081 - ac_cv_huge_val_inf=yes
45082 + BUILD_DIR="$BUILD_DIR $ext_builddir"
45086 - cat > conftest.$ac_ext <<EOF
45087 -#line 91620 "configure"
45088 -#include "confdefs.h"
45091 -#include <stdlib.h>
45092 + if test "$ext_builddir" = "."; then
45093 + PHP_PECL_EXTENSION=sysvshm
45095 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
45098 -#define zend_isinf(a) isinf(a)
45099 -#elif defined(INFINITY)
45100 -/* Might not work, but is required by ISO C99 */
45101 -#define zend_isinf(a) (((a)==INFINITY)?1:0)
45102 -#elif defined(HAVE_FPCLASS)
45103 -#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF))
45105 -#define zend_isinf(a) 0
45109 -int main(int argc, char** argv)
45111 - return zend_isinf(HUGE_VAL) ? 0 : 1;
45116 -if { (eval echo configure:91643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
45119 - ac_cv_huge_val_inf=yes
45124 +echo $ac_n "checking for TIDY support""... $ac_c" 1>&6
45125 +echo "configure:97953: checking for TIDY support" >&5
45126 +# Check whether --with-tidy or --without-tidy was given.
45127 +if test "${with_tidy+set}" = set; then
45128 + withval="$with_tidy"
45129 + PHP_TIDY=$withval
45131 - echo "configure: failed program was:" >&5
45132 - cat conftest.$ac_ext >&5
45135 - ac_cv_huge_val_inf=no
45137 + test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL
45145 -echo "$ac_t""$ac_cv_huge_val_inf" 1>&6
45146 -if test "$ac_cv_huge_val_inf" = "yes"; then
45147 - cat >> confdefs.h <<\EOF
45148 -#define HAVE_HUGE_VAL_INF 1
45152 +ext_output="yes, shared"
45156 + PHP_TIDY=`echo "$PHP_TIDY"|$SED 's/^shared,//'`
45171 -echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6
45172 -echo "configure:91670: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
45173 -if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then
45174 - echo $ac_n "(cached) $ac_c" 1>&6
45177 -if test "$cross_compiling" = yes; then
45179 - ac_cv_huge_val_nan=yes
45182 - cat > conftest.$ac_ext <<EOF
45183 -#line 91681 "configure"
45184 -#include "confdefs.h"
45187 -#include <stdlib.h>
45188 +echo "$ac_t""$ext_output" 1>&6
45191 -#define zend_isnan(a) isnan(a)
45192 -#elif defined(HAVE_FPCLASS)
45193 -#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
45195 -#define zend_isnan(a) 0
45198 -int main(int argc, char** argv)
45200 -#if defined(__sparc__) && !(__GNUC__ >= 3)
45201 - /* prevent bug #27830 */
45204 - return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1;
45209 -if { (eval echo configure:91706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
45212 - ac_cv_huge_val_nan=yes
45215 - echo "configure: failed program was:" >&5
45216 - cat conftest.$ac_ext >&5
45219 - ac_cv_huge_val_nan=no
45220 +if test "$PHP_TIDY" != "no"; then
45225 + if test "$PHP_TIDY" != "yes"; then
45226 + TIDY_SEARCH_DIRS=$PHP_TIDY
45228 + TIDY_SEARCH_DIRS="/usr/local /usr"
45232 + for i in $TIDY_SEARCH_DIRS; do
45233 + if test -f $i/include/tidy/tidy.h; then
45235 + TIDY_INCDIR=$i/include/tidy
45236 + elif test -f $i/include/tidy.h; then
45238 + TIDY_INCDIR=$i/include
45242 -echo "$ac_t""$ac_cv_huge_val_nan" 1>&6
45243 -if test "$ac_cv_huge_val_nan" = "yes"; then
45244 - cat >> confdefs.h <<\EOF
45245 -#define HAVE_HUGE_VAL_NAN 1
45247 + if test -z "$TIDY_DIR"; then
45248 + { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; }
45252 + TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
45254 -echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6
45255 -echo "configure:91733: checking whether strptime() declaration fails" >&5
45256 -if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then
45257 - echo $ac_n "(cached) $ac_c" 1>&6
45260 -cat > conftest.$ac_ext <<EOF
45261 -#line 91739 "configure"
45262 -#include "confdefs.h"
45268 -#ifndef HAVE_STRPTIME
45269 -#error no strptime() on this platform
45271 -/* use invalid strptime() declaration to see if it fails to compile */
45272 -int strptime(const char *s, const char *format, struct tm *tm);
45274 + if test "$ext_shared" = "yes"; then
45275 + TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD"
45276 + if test -n "$TIDY_LIBDIR"; then
45278 + if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then
45280 + if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then
45281 + ai_p=$TIDY_LIBDIR
45284 + ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
45286 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
45287 + ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`"
45292 -if { (eval echo configure:91755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
45295 + if test "$ext_shared" = "yes"; then
45296 + TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD"
45297 + test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD"
45301 - ac_cv_strptime_decl_fails=no
45304 - echo "configure: failed program was:" >&5
45305 - cat conftest.$ac_ext >&5
45308 - ac_cv_strptime_decl_fails=yes
45309 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
45311 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
45312 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
45313 + eval "LIBPATH$unique=set"
45315 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
45316 + LDFLAGS="$LDFLAGS -L$ai_p"
45317 + PHP_RPATHS="$PHP_RPATHS $ai_p"
45325 -echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6
45326 -if test "$ac_cv_strptime_decl_fails" = "yes"; then
45327 - cat >> confdefs.h <<\EOF
45328 -#define HAVE_STRPTIME_DECL_FAILS 1
45339 -for ac_hdr in wchar.h
45341 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
45342 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
45343 -echo "configure:91783: checking for $ac_hdr" >&5
45344 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
45345 - echo $ac_n "(cached) $ac_c" 1>&6
45347 - cat > conftest.$ac_ext <<EOF
45348 -#line 91788 "configure"
45349 -#include "confdefs.h"
45350 -#include <$ac_hdr>
45352 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
45353 -{ (eval echo configure:91793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
45354 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
45355 -if test -z "$ac_err"; then
45357 - eval "ac_cv_header_$ac_safe=yes"
45359 - echo "$ac_err" >&5
45360 - echo "configure: failed program was:" >&5
45361 - cat conftest.$ac_ext >&5
45363 - eval "ac_cv_header_$ac_safe=no"
45367 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
45368 - echo "$ac_t""yes" 1>&6
45369 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
45370 - cat >> confdefs.h <<EOF
45371 -#define $ac_tr_hdr 1
45375 - echo "$ac_t""no" 1>&6
45378 + if test -n "$TIDY_LIBDIR"; then
45380 + if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then
45382 + if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then
45383 + ai_p=$TIDY_LIBDIR
45386 + ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
45388 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
45389 + ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`"
45392 -for ac_func in mblen
45394 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
45395 -echo "configure:91822: checking for $ac_func" >&5
45396 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
45397 - echo $ac_n "(cached) $ac_c" 1>&6
45399 - cat > conftest.$ac_ext <<EOF
45400 -#line 91827 "configure"
45401 -#include "confdefs.h"
45402 -/* System header to define __stub macros and hopefully few prototypes,
45403 - which can conflict with char $ac_func(); below. */
45404 -#include <assert.h>
45405 -/* Override any gcc2 internal prototype to avoid an error. */
45406 -/* We use char because int might match the return type of a gcc2
45407 - builtin and then its argument prototype would still apply. */
45413 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
45415 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
45416 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
45417 + eval "LIBPATH$unique=set"
45419 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
45420 + LDFLAGS="$LDFLAGS -L$ai_p"
45421 + PHP_RPATHS="$PHP_RPATHS $ai_p"
45427 -/* The GNU C library defines this for functions which it implements
45428 - to always fail with ENOSYS. Some functions are actually named
45429 - something starting with __ and the normal name is an alias. */
45430 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
45440 -if { (eval echo configure:91850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
45442 - eval "ac_cv_func_$ac_func=yes"
45444 - echo "configure: failed program was:" >&5
45445 - cat conftest.$ac_ext >&5
45447 - eval "ac_cv_func_$ac_func=no"
45455 + c|c_r|pthread*) ;;
45457 + LIBS="-ltidy $LIBS"
45461 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
45462 - echo "$ac_t""yes" 1>&6
45463 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
45464 - cat >> confdefs.h <<EOF
45465 -#define $ac_tr_func 1
45469 - echo "$ac_t""no" 1>&6
45473 -for ac_func in mbrlen mbsinit
45475 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
45476 -echo "configure:91877: checking for $ac_func" >&5
45477 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
45478 - echo $ac_n "(cached) $ac_c" 1>&6
45480 - cat > conftest.$ac_ext <<EOF
45481 -#line 91882 "configure"
45482 -#include "confdefs.h"
45483 -/* System header to define __stub macros and hopefully few prototypes,
45484 - which can conflict with char $ac_func(); below. */
45485 -#include <assert.h>
45486 -/* Override any gcc2 internal prototype to avoid an error. */
45487 -/* We use char because int might match the return type of a gcc2
45488 - builtin and then its argument prototype would still apply. */
45493 -/* The GNU C library defines this for functions which it implements
45494 - to always fail with ENOSYS. Some functions are actually named
45495 - something starting with __ and the normal name is an alias. */
45496 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
45505 -if { (eval echo configure:91905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
45507 - eval "ac_cv_func_$ac_func=yes"
45509 - echo "configure: failed program was:" >&5
45510 - cat conftest.$ac_ext >&5
45512 - eval "ac_cv_func_$ac_func=no"
45517 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
45518 - echo "$ac_t""yes" 1>&6
45519 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
45520 - cat >> confdefs.h <<EOF
45521 -#define $ac_tr_func 1
45525 - echo "$ac_t""no" 1>&6
45529 + if test "$TIDY_INCDIR" != "/usr/include"; then
45531 + if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then
45532 + ai_p=$TIDY_INCDIR
45535 + ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
45537 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
45538 + ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`"
45541 -echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
45542 -echo "configure:91930: checking for mbstate_t" >&5
45543 -if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then
45544 - echo $ac_n "(cached) $ac_c" 1>&6
45548 -cat > conftest.$ac_ext <<EOF
45549 -#line 91936 "configure"
45550 -#include "confdefs.h"
45551 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
45553 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
45554 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
45555 + eval "INCLUDEPATH$unique=set"
45558 + INCLUDES="-I$ai_p $INCLUDES"
45560 + INCLUDES="$INCLUDES -I$ai_p"
45565 -#ifdef HAVE_WCHAR_H
45566 -# include <wchar.h>
45572 -int __tmp__() { mbstate_t a; }
45574 + save_old_LDFLAGS=$LDFLAGS
45577 + save_ext_shared=$ext_shared
45580 + for ac_i in $ac_stuff; do
45583 + if test "$ext_shared" = "yes"; then
45584 + LDFLAGS="$LDFLAGS -pthread"
45588 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
45590 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
45591 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
45592 + eval "EXTRA_LDFLAGS$unique=set"
45593 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
45598 -if { (eval echo configure:91949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
45603 + ac_ii=`echo $ac_i|cut -c 3-`
45606 - ac_cv_type_mbstate_t=yes
45608 + c|c_r|pthread*) ;;
45610 + if test "$ext_shared" = "yes"; then
45611 + LDFLAGS="$LDFLAGS -l$ac_ii"
45616 + c|c_r|pthread*) ;;
45618 + LIBS="$LIBS -l$ac_ii"
45623 - echo "configure: failed program was:" >&5
45624 - cat conftest.$ac_ext >&5
45634 + ac_ii=`echo $ac_i|cut -c 3-`
45636 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
45638 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
45642 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
45644 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
45645 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
45649 + if test "$ext_shared" = "yes"; then
45650 + LDFLAGS="-L$ai_p $LDFLAGS"
45651 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
45656 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
45658 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
45659 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
45660 + eval "LIBPATH$unique=set"
45662 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
45663 + LDFLAGS="$LDFLAGS -L$ai_p"
45664 + PHP_RPATHS="$PHP_RPATHS $ai_p"
45666 - ac_cv_type_mbstate_t=no
45673 -echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6
45674 -if test "$ac_cv_type_mbstate_t" = "yes"; then
45675 - cat >> confdefs.h <<\EOF
45676 -#define HAVE_MBSTATE_T 1
45687 -for ac_hdr in atomic.h
45689 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
45690 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
45691 -echo "configure:91977: checking for $ac_hdr" >&5
45692 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
45693 + echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6
45694 +echo "configure:98242: checking for tidyOptGetDoc in -ltidy" >&5
45695 +ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'`
45696 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
45697 echo $ac_n "(cached) $ac_c" 1>&6
45699 - cat > conftest.$ac_ext <<EOF
45700 -#line 91982 "configure"
45701 + ac_save_LIBS="$LIBS"
45702 +LIBS="-ltidy $LIBS"
45703 +cat > conftest.$ac_ext <<EOF
45704 +#line 98250 "configure"
45705 #include "confdefs.h"
45706 -#include <$ac_hdr>
45707 +/* Override any gcc2 internal prototype to avoid an error. */
45708 +/* We use char because int might match the return type of a gcc2
45709 + builtin and then its argument prototype would still apply. */
45710 +char tidyOptGetDoc();
45716 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
45717 -{ (eval echo configure:91987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
45718 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
45719 -if test -z "$ac_err"; then
45720 +if { (eval echo configure:98261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
45722 - eval "ac_cv_header_$ac_safe=yes"
45723 + eval "ac_cv_lib_$ac_lib_var=yes"
45725 - echo "$ac_err" >&5
45726 echo "configure: failed program was:" >&5
45727 cat conftest.$ac_ext >&5
45729 - eval "ac_cv_header_$ac_safe=no"
45730 + eval "ac_cv_lib_$ac_lib_var=no"
45733 +LIBS="$ac_save_LIBS"
45736 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
45737 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
45738 echo "$ac_t""yes" 1>&6
45739 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
45740 - cat >> confdefs.h <<EOF
45741 -#define $ac_tr_hdr 1
45743 + LDFLAGS=$save_old_LDFLAGS
45744 + ext_shared=$save_ext_shared
45746 + cat >> confdefs.h <<\EOF
45747 +#define HAVE_TIDYOPTGETDOC 1
45754 echo "$ac_t""no" 1>&6
45756 + LDFLAGS=$save_old_LDFLAGS
45757 + ext_shared=$save_ext_shared
45758 + unset ac_cv_lib_tidy_tidyOptGetDoc
45766 - ext_builddir=ext/standard
45767 - ext_srcdir=$abs_srcdir/ext/standard
45769 + ext_builddir=ext/tidy
45770 + ext_srcdir=$abs_srcdir/ext/tidy
45774 - if test "" != "shared" && test "" != "yes" && test "" != "cli"; then
45775 - PHP_STANDARD_SHARED=no
45776 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
45777 + PHP_TIDY_SHARED=no
45780 - case ext/standard in
45782 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45783 - /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45784 - *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45785 + /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45786 + *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45790 @@ -92038,17 +98322,7 @@ done
45794 - for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
45795 - cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
45796 - flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
45797 - info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
45798 - microtime.c pack.c pageinfo.c quot_print.c rand.c \
45799 - soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
45800 - var.c versioning.c assert.c strnatcmp.c levenshtein.c \
45801 - incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
45802 - http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
45803 - var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
45804 - filters.c proc_open.c streamsfuncs.c http.c; do
45805 + for ac_src in tidy.c; do
45809 @@ -92071,18 +98345,18 @@ EOF
45813 - EXT_STATIC="$EXT_STATIC standard"
45814 - if test "" != "nocli"; then
45815 - EXT_CLI_STATIC="$EXT_CLI_STATIC standard"
45816 + EXT_STATIC="$EXT_STATIC tidy"
45817 + if test "$ext_shared" != "nocli"; then
45818 + EXT_CLI_STATIC="$EXT_CLI_STATIC tidy"
45821 - if test "" = "shared" || test "" = "yes"; then
45822 - PHP_STANDARD_SHARED=yes
45823 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
45824 + PHP_TIDY_SHARED=yes
45826 - case ext/standard in
45828 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45829 - /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45830 - *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45831 + /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45832 + *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45836 @@ -92097,24 +98371,14 @@ EOF
45840 - for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
45841 - cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
45842 - flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
45843 - info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
45844 - microtime.c pack.c pageinfo.c quot_print.c rand.c \
45845 - soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
45846 - var.c versioning.c assert.c strnatcmp.c levenshtein.c \
45847 - incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
45848 - http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
45849 - var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
45850 - filters.c proc_open.c streamsfuncs.c http.c; do
45851 + for ac_src in tidy.c; do
45858 - shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo"
45859 + shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo"
45862 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
45863 @@ -92137,31 +98401,31 @@ EOF
45864 case $host_alias in
45867 - 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'
45868 + 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'
45872 - link_cmd='$(LIBTOOL) --mode=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)'
45873 + link_cmd='$(LIBTOOL) --mode=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)'
45877 - link_cmd='$(LIBTOOL) --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)'
45878 + link_cmd='$(LIBTOOL) --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)'
45882 if test "x" = "xyes"; then
45883 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix"
45884 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptidy.$suffix"
45886 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix"
45887 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix"
45890 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard"
45891 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy"
45893 cat >>Makefile.objects<<EOF
45894 -\$(phplibdir)/phpstandard.$suffix: $ext_builddir/phpstandard.$suffix
45895 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpstandard.$suffix \$(phplibdir)
45896 +\$(phplibdir)/phptidy.$suffix: $ext_builddir/phptidy.$suffix
45897 + \$(LIBTOOL) --mode=install cp $ext_builddir/phptidy.$suffix \$(phplibdir)
45899 -$ext_builddir/phpstandard.$suffix: \$(shared_objects_standard) \$(PHPSTANDARD_SHARED_DEPENDENCIES)
45900 +$ext_builddir/phptidy.$suffix: \$(shared_objects_tidy) \$(PHPTIDY_SHARED_DEPENDENCIES)
45904 @@ -92174,31 +98438,31 @@ EOF
45905 case $host_alias in
45908 - 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'
45909 + 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'
45913 - link_cmd='$(LIBTOOL) --mode=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)'
45914 + link_cmd='$(LIBTOOL) --mode=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)'
45918 - link_cmd='$(LIBTOOL) --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)'
45919 + link_cmd='$(LIBTOOL) --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)'
45923 if test "x" = "xyes"; then
45924 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/standard.$suffix"
45925 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tidy.$suffix"
45927 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/standard.$suffix"
45928 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/tidy.$suffix"
45931 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard"
45932 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy"
45934 cat >>Makefile.objects<<EOF
45935 -\$(phplibdir)/standard.$suffix: $ext_builddir/standard.$suffix
45936 - \$(LIBTOOL) --mode=install cp $ext_builddir/standard.$suffix \$(phplibdir)
45937 +\$(phplibdir)/tidy.$suffix: $ext_builddir/tidy.$suffix
45938 + \$(LIBTOOL) --mode=install cp $ext_builddir/tidy.$suffix \$(phplibdir)
45940 -$ext_builddir/standard.$suffix: \$(shared_objects_standard) \$(STANDARD_SHARED_DEPENDENCIES)
45941 +$ext_builddir/tidy.$suffix: \$(shared_objects_tidy) \$(TIDY_SHARED_DEPENDENCIES)
45945 @@ -92206,22 +98470,22 @@ EOF
45948 cat >> confdefs.h <<EOF
45949 -#define COMPILE_DL_STANDARD 1
45950 +#define COMPILE_DL_TIDY 1
45956 - if test "" != "shared" && test "" != "yes" && test "" = "cli"; then
45957 - PHP_STANDARD_SHARED=no
45958 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
45959 + PHP_TIDY_SHARED=no
45960 case "$PHP_SAPI" in
45964 - case ext/standard in
45966 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
45967 - /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45968 - *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45969 + /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
45970 + *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
45974 @@ -92236,17 +98500,7 @@ EOF
45978 - for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
45979 - cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
45980 - flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
45981 - info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
45982 - microtime.c pack.c pageinfo.c quot_print.c rand.c \
45983 - soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
45984 - var.c versioning.c assert.c strnatcmp.c levenshtein.c \
45985 - incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
45986 - http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
45987 - var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
45988 - filters.c proc_open.c streamsfuncs.c http.c; do
45989 + for ac_src in tidy.c; do
45993 @@ -92269,15 +98523,15 @@ EOF
45997 - EXT_STATIC="$EXT_STATIC standard"
45998 + EXT_STATIC="$EXT_STATIC tidy"
46003 - case ext/standard in
46005 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
46006 - /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46007 - *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46008 + /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46009 + *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46013 @@ -92292,17 +98546,7 @@ EOF
46017 - for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
46018 - cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
46019 - flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
46020 - info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
46021 - microtime.c pack.c pageinfo.c quot_print.c rand.c \
46022 - soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
46023 - var.c versioning.c assert.c strnatcmp.c levenshtein.c \
46024 - incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
46025 - http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
46026 - var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
46027 - filters.c proc_open.c streamsfuncs.c http.c; do
46028 + for ac_src in tidy.c; do
46032 @@ -92327,7 +98571,7 @@ EOF
46036 - EXT_CLI_STATIC="$EXT_CLI_STATIC standard"
46037 + EXT_CLI_STATIC="$EXT_CLI_STATIC tidy"
46041 @@ -92336,52 +98580,36 @@ EOF
46044 if test "$ext_builddir" = "."; then
46045 - PHP_PECL_EXTENSION=standard
46046 + PHP_PECL_EXTENSION=tidy
46048 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
46054 - src=$ext_srcdir/Makefile.frag
46055 - ac_srcdir=$ext_srcdir
46056 - ac_builddir=$ext_builddir
46057 - test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
46061 - for header_file in ext/standard/; do
46064 - unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
46066 - cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
46067 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
46068 - eval "INSTALLHEADERS$unique=set"
46070 - INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
46073 + PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD"
46077 + cat >> confdefs.h <<\EOF
46078 +#define HAVE_TIDY 1
46085 -php_with_sybase_ct=no
46087 -echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
46088 -echo "configure:92377: checking for Sybase-CT support" >&5
46089 -# Check whether --with-sybase-ct or --without-sybase-ct was given.
46090 -if test "${with_sybase_ct+set}" = set; then
46091 - withval="$with_sybase_ct"
46092 - PHP_SYBASE_CT=$withval
46093 +php_enable_tokenizer=yes
46095 +echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6
46096 +echo "configure:98605: checking whether to enable tokenizer support" >&5
46097 +# Check whether --enable-tokenizer or --disable-tokenizer was given.
46098 +if test "${enable_tokenizer+set}" = set; then
46099 + enableval="$enable_tokenizer"
46100 + PHP_TOKENIZER=$enableval
46104 - test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL
46105 + PHP_TOKENIZER=yes
46106 + test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL
46110 @@ -92389,12 +98617,12 @@ fi
46112 ext_output="yes, shared"
46114 -case $PHP_SYBASE_CT in
46115 +case $PHP_TOKENIZER in
46117 - PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|$SED 's/^shared,//'`
46118 + PHP_TOKENIZER=`echo "$PHP_TOKENIZER"|$SED 's/^shared,//'`
46121 - PHP_SYBASE_CT=yes
46122 + PHP_TOKENIZER=yes
46126 @@ -92413,30 +98641,21 @@ echo "$ac_t""$ext_output" 1>&6
46130 -if test "$PHP_SYBASE_CT" != "no"; then
46132 - if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then
46133 - { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; }
46136 - cat >> confdefs.h <<\EOF
46137 -#define HAVE_SYBASE_CT 1
46140 +if test "$PHP_TOKENIZER" != "no"; then
46142 - ext_builddir=ext/sybase_ct
46143 - ext_srcdir=$abs_srcdir/ext/sybase_ct
46144 + ext_builddir=ext/tokenizer
46145 + ext_srcdir=$abs_srcdir/ext/tokenizer
46149 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
46150 - PHP_SYBASE_CT_SHARED=no
46151 + PHP_TOKENIZER_SHARED=no
46154 - case ext/sybase_ct in
46155 + case ext/tokenizer in
46156 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
46157 - /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46158 - *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46159 + /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46160 + *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46164 @@ -92451,7 +98670,7 @@ EOF
46168 - for ac_src in php_sybase_ct.c; do
46169 + for ac_src in tokenizer.c tokenizer_data.c; do
46173 @@ -92474,18 +98693,18 @@ EOF
46177 - EXT_STATIC="$EXT_STATIC sybase_ct"
46178 + EXT_STATIC="$EXT_STATIC tokenizer"
46179 if test "$ext_shared" != "nocli"; then
46180 - EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct"
46181 + EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer"
46184 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
46185 - PHP_SYBASE_CT_SHARED=yes
46186 + PHP_TOKENIZER_SHARED=yes
46188 - case ext/sybase_ct in
46189 + case ext/tokenizer in
46190 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
46191 - /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46192 - *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46193 + /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46194 + *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46198 @@ -92500,14 +98719,14 @@ EOF
46202 - for ac_src in php_sybase_ct.c; do
46203 + for ac_src in tokenizer.c tokenizer_data.c; do
46210 - shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo"
46211 + shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo"
46214 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
46215 @@ -92530,31 +98749,31 @@ EOF
46216 case $host_alias in
46219 - 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'
46220 + 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'
46224 - link_cmd='$(LIBTOOL) --mode=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)'
46225 + link_cmd='$(LIBTOOL) --mode=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)'
46229 - link_cmd='$(LIBTOOL) --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)'
46230 + link_cmd='$(LIBTOOL) --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)'
46234 if test "x" = "xyes"; then
46235 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix"
46236 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptokenizer.$suffix"
46238 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix"
46239 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix"
46242 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct"
46243 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer"
46245 cat >>Makefile.objects<<EOF
46246 -\$(phplibdir)/phpsybase_ct.$suffix: $ext_builddir/phpsybase_ct.$suffix
46247 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpsybase_ct.$suffix \$(phplibdir)
46248 +\$(phplibdir)/phptokenizer.$suffix: $ext_builddir/phptokenizer.$suffix
46249 + \$(LIBTOOL) --mode=install cp $ext_builddir/phptokenizer.$suffix \$(phplibdir)
46251 -$ext_builddir/phpsybase_ct.$suffix: \$(shared_objects_sybase_ct) \$(PHPSYBASE_CT_SHARED_DEPENDENCIES)
46252 +$ext_builddir/phptokenizer.$suffix: \$(shared_objects_tokenizer) \$(PHPTOKENIZER_SHARED_DEPENDENCIES)
46256 @@ -92567,31 +98786,31 @@ EOF
46257 case $host_alias in
46260 - 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'
46261 + 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'
46265 - link_cmd='$(LIBTOOL) --mode=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)'
46266 + link_cmd='$(LIBTOOL) --mode=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)'
46270 - link_cmd='$(LIBTOOL) --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)'
46271 + link_cmd='$(LIBTOOL) --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)'
46275 if test "x" = "xyes"; then
46276 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sybase_ct.$suffix"
46277 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tokenizer.$suffix"
46279 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/sybase_ct.$suffix"
46280 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/tokenizer.$suffix"
46283 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct"
46284 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer"
46286 cat >>Makefile.objects<<EOF
46287 -\$(phplibdir)/sybase_ct.$suffix: $ext_builddir/sybase_ct.$suffix
46288 - \$(LIBTOOL) --mode=install cp $ext_builddir/sybase_ct.$suffix \$(phplibdir)
46289 +\$(phplibdir)/tokenizer.$suffix: $ext_builddir/tokenizer.$suffix
46290 + \$(LIBTOOL) --mode=install cp $ext_builddir/tokenizer.$suffix \$(phplibdir)
46292 -$ext_builddir/sybase_ct.$suffix: \$(shared_objects_sybase_ct) \$(SYBASE_CT_SHARED_DEPENDENCIES)
46293 +$ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES)
46297 @@ -92599,22 +98818,22 @@ EOF
46300 cat >> confdefs.h <<EOF
46301 -#define COMPILE_DL_SYBASE_CT 1
46302 +#define COMPILE_DL_TOKENIZER 1
46308 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
46309 - PHP_SYBASE_CT_SHARED=no
46310 + PHP_TOKENIZER_SHARED=no
46311 case "$PHP_SAPI" in
46315 - case ext/sybase_ct in
46316 + case ext/tokenizer in
46317 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
46318 - /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46319 - *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46320 + /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46321 + *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46325 @@ -92629,7 +98848,7 @@ EOF
46329 - for ac_src in php_sybase_ct.c; do
46330 + for ac_src in tokenizer.c tokenizer_data.c; do
46334 @@ -92652,15 +98871,15 @@ EOF
46338 - EXT_STATIC="$EXT_STATIC sybase_ct"
46339 + EXT_STATIC="$EXT_STATIC tokenizer"
46344 - case ext/sybase_ct in
46345 + case ext/tokenizer in
46346 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
46347 - /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46348 - *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46349 + /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46350 + *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46354 @@ -92675,7 +98894,7 @@ EOF
46358 - for ac_src in php_sybase_ct.c; do
46359 + for ac_src in tokenizer.c tokenizer_data.c; do
46363 @@ -92699,311 +98918,165 @@ EOF
46368 - EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct"
46372 - BUILD_DIR="$BUILD_DIR $ext_builddir"
46376 - if test "$ext_builddir" = "."; then
46377 - PHP_PECL_EXTENSION=sybase_ct
46379 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
46384 - PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD"
46387 - if test "$PHP_SYBASE_CT" = "yes"; then
46388 - SYBASE_CT_INCDIR=/home/sybase/include
46389 - SYBASE_CT_LIBDIR=/home/sybase/lib
46391 - SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include
46392 - SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib
46395 - echo $ac_n "checking size of long int""... $ac_c" 1>&6
46396 -echo "configure:92732: checking size of long int" >&5
46397 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
46398 - echo $ac_n "(cached) $ac_c" 1>&6
46400 - if test "$cross_compiling" = yes; then
46401 - ac_cv_sizeof_long_int=4
46403 - cat > conftest.$ac_ext <<EOF
46404 -#line 92740 "configure"
46405 -#include "confdefs.h"
46406 -#include <stdio.h>
46407 -#include <sys/types.h>
46410 - FILE *f=fopen("conftestval", "w");
46412 - fprintf(f, "%d\n", sizeof(long int));
46416 -if { (eval echo configure:92752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
46418 - ac_cv_sizeof_long_int=`cat conftestval`
46420 - echo "configure: failed program was:" >&5
46421 - cat conftest.$ac_ext >&5
46423 - ac_cv_sizeof_long_int=0
46429 -echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6
46430 -cat >> confdefs.h <<EOF
46431 -#define SIZEOF_LONG_INT $ac_cv_sizeof_long_int
46435 - echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
46436 -echo "configure:92772: checking checking if we're on a 64-bit platform" >&5
46437 - if test "$ac_cv_sizeof_long_int" = "4"; then
46438 - echo "$ac_t""no" 1>&6
46441 - echo "$ac_t""yes" 1>&6
46442 - PHP_SYBASE_64=yes
46446 - echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6
46447 -echo "configure:92783: checking Checking for ctpublic.h" >&5
46448 - if test -f $SYBASE_CT_INCDIR/ctpublic.h; then
46449 - echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6
46451 - if test "$SYBASE_CT_INCDIR" != "/usr/include"; then
46453 - if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then
46454 - ai_p=$SYBASE_CT_INCDIR
46457 - ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
46459 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
46460 - ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`"
46465 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
46467 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
46468 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
46469 - eval "INCLUDEPATH$unique=set"
46472 - INCLUDES="-I$ai_p $INCLUDES"
46474 - INCLUDES="$INCLUDES -I$ai_p"
46482 - { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; }
46485 - echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6
46486 -echo "configure:92822: checking Checking Sybase libdir" >&5
46487 - echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6
46489 - echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6
46490 -echo "configure:92826: checking Checking for Sybase platform libraries" >&5
46493 - if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then
46495 - if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then
46496 - ai_p=$SYBASE_CT_LIBDIR
46499 - ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
46501 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
46502 - ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`"
46506 - if test "$ext_shared" = "yes"; then
46507 - SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD"
46508 - test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_SHARED_LIBADD"
46513 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
46515 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
46516 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
46517 - eval "LIBPATH$unique=set"
46519 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
46520 - LDFLAGS="$LDFLAGS -L$ai_p"
46521 - PHP_RPATHS="$PHP_RPATHS $ai_p"
46524 + EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer"
46528 + BUILD_DIR="$BUILD_DIR $ext_builddir"
46533 + if test "$ext_builddir" = "."; then
46534 + PHP_PECL_EXTENSION=tokenizer
46536 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
46540 - if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
46544 - c|c_r|pthread*) ;;
46546 - if test "$ext_shared" = "yes"; then
46547 - SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD"
46552 - c|c_r|pthread*) ;;
46554 - LIBS="-lct $LIBS"
46557 + src=$ext_srcdir/Makefile.frag
46558 + ac_srcdir=$ext_srcdir
46559 + ac_builddir=$ext_builddir
46560 + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
46569 +php_enable_wddx=no
46571 - SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
46572 - echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6
46573 - elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then
46577 - c|c_r|pthread*) ;;
46579 - if test "$ext_shared" = "yes"; then
46580 - SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD"
46583 +echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6
46584 +echo "configure:98951: checking whether to enable WDDX support" >&5
46585 +# Check whether --enable-wddx or --disable-wddx was given.
46586 +if test "${enable_wddx+set}" = set; then
46587 + enableval="$enable_wddx"
46588 + PHP_WDDX=$enableval
46592 - c|c_r|pthread*) ;;
46594 - LIBS="-lsybcs64 $LIBS"
46598 + test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL
46607 +ext_output="yes, shared"
46611 + PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'`
46629 - c|c_r|pthread*) ;;
46631 - if test "$ext_shared" = "yes"; then
46632 - SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD"
46637 - c|c_r|pthread*) ;;
46639 - LIBS="-lsybct64 $LIBS"
46647 +echo "$ac_t""$ext_output" 1>&6
46653 +if test -z "$PHP_LIBXML_DIR"; then
46655 - case sybcomn64 in
46656 - c|c_r|pthread*) ;;
46658 - if test "$ext_shared" = "yes"; then
46659 - SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD"
46662 +php_with_libxml_dir=no
46664 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
46665 +echo "configure:98996: checking libxml2 install dir" >&5
46666 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
46667 +if test "${with_libxml_dir+set}" = set; then
46668 + withval="$with_libxml_dir"
46669 + PHP_LIBXML_DIR=$withval
46672 + PHP_LIBXML_DIR=no
46674 - case sybcomn64 in
46675 - c|c_r|pthread*) ;;
46677 - LIBS="-lsybcomn64 $LIBS"
46687 +ext_output=$PHP_LIBXML_DIR
46688 +echo "$ac_t""$ext_output" 1>&6
46696 +php_with_libexpat_dir=no
46698 +echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6
46699 +echo "configure:99020: checking libexpat dir for WDDX" >&5
46700 +# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
46701 +if test "${with_libexpat_dir+set}" = set; then
46702 + withval="$with_libexpat_dir"
46703 + PHP_LIBEXPAT_DIR=$withval
46706 - case sybintl64 in
46707 - c|c_r|pthread*) ;;
46709 - if test "$ext_shared" = "yes"; then
46710 - SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD"
46713 + PHP_LIBEXPAT_DIR=no
46715 - case sybintl64 in
46716 - c|c_r|pthread*) ;;
46718 - LIBS="-lsybintl64 $LIBS"
46728 +ext_output=$PHP_LIBEXPAT_DIR
46729 +echo "$ac_t""$ext_output" 1>&6
46732 - ac_solid_uname_s=`uname -s 2>/dev/null`
46733 - case $ac_solid_uname_s in
46734 - *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define
46735 - *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; #
46737 - SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64"
46738 - echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6
46742 +if test "$PHP_WDDX" != "no"; then
46744 + if test "$PHP_LIBEXPAT_DIR" = "no"; then
46745 + if test "$PHP_LIBXML" = "no"; then
46746 + { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
46750 - save_old_LDFLAGS=$LDFLAGS
46755 - save_ext_shared=$ext_shared
46757 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
46758 +echo "configure:99048: checking for xml2-config path" >&5
46759 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
46760 + echo $ac_n "(cached) $ac_c" 1>&6
46763 - for ac_i in $ac_stuff; do
46764 + for i in $PHP_LIBXML_DIR /usr/local /usr; do
46765 + if test -x "$i/bin/xml2-config"; then
46766 + ac_cv_php_xml2_config_path="$i/bin/xml2-config"
46773 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
46775 + if test -x "$ac_cv_php_xml2_config_path"; then
46776 + XML2_CONFIG="$ac_cv_php_xml2_config_path"
46777 + libxml_full_version=`$XML2_CONFIG --version`
46780 + set $libxml_full_version
46782 + LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
46783 + if test "$LIBXML_VERSION" -ge "2006011"; then
46784 + LIBXML_LIBS=`$XML2_CONFIG --libs`
46785 + LIBXML_INCS=`$XML2_CONFIG --cflags`
46787 + for ac_i in $LIBXML_LIBS; do
46790 if test "$ext_shared" = "yes"; then
46791 - LDFLAGS="$LDFLAGS -pthread"
46792 + WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread"
46796 @@ -93025,7 +99098,7 @@ echo "configure:92826: checking Checking
46799 if test "$ext_shared" = "yes"; then
46800 - LDFLAGS="$LDFLAGS -l$ac_ii"
46801 + WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii"
46805 @@ -93060,8 +99133,8 @@ echo "configure:92826: checking Checking
46808 if test "$ext_shared" = "yes"; then
46809 - LDFLAGS="-L$ai_p $LDFLAGS"
46810 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
46811 + WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD"
46812 + test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD"
46816 @@ -93087,175 +99160,236 @@ echo "configure:92826: checking Checking
46820 - echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6
46821 -echo "configure:93092: checking for netg_errstr in -lsybtcl64" >&5
46822 -ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'`
46823 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
46825 + for ac_i in $LIBXML_INCS; do
46828 + ac_ii=`echo $ac_i|cut -c 3-`
46830 + if test "$ac_ii" != "/usr/include"; then
46832 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
46836 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
46838 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
46839 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
46844 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
46846 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
46847 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
46848 + eval "INCLUDEPATH$unique=set"
46851 + INCLUDES="-I$ai_p $INCLUDES"
46853 + INCLUDES="$INCLUDES -I$ai_p"
46865 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
46866 +echo "configure:99206: checking whether libxml build works" >&5
46867 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
46868 echo $ac_n "(cached) $ac_c" 1>&6
46870 - ac_save_LIBS="$LIBS"
46871 -LIBS="-lsybtcl64 $LIBS"
46872 -cat > conftest.$ac_ext <<EOF
46873 -#line 93100 "configure"
46878 + $WDDX_SHARED_LIBADD
46880 + if test "$cross_compiling" = yes; then
46885 + cat > conftest.$ac_ext <<EOF
46886 +#line 99222 "configure"
46887 #include "confdefs.h"
46888 -/* Override any gcc2 internal prototype to avoid an error. */
46889 -/* We use char because int might match the return type of a gcc2
46890 - builtin and then its argument prototype would still apply. */
46891 -char netg_errstr();
46897 + char xmlInitParser();
46904 -if { (eval echo configure:93111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46906 - eval "ac_cv_lib_$ac_lib_var=yes"
46907 +if { (eval echo configure:99233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
46912 + php_cv_libxml_build_works=yes
46916 echo "configure: failed program was:" >&5
46917 cat conftest.$ac_ext >&5
46919 - eval "ac_cv_lib_$ac_lib_var=no"
46922 -LIBS="$ac_save_LIBS"
46925 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
46926 - echo "$ac_t""yes" 1>&6
46929 - LDFLAGS=$save_old_LDFLAGS
46930 - ext_shared=$save_ext_shared
46934 + echo "$ac_t""no" 1>&6
46935 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
46939 - c|c_r|pthread*) ;;
46941 - if test "$ext_shared" = "yes"; then
46942 - SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD"
46952 - c|c_r|pthread*) ;;
46954 - LIBS="-lsybtcl64 $LIBS"
46959 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
46960 + if test "$php_cv_libxml_build_works" = "yes"; then
46961 + cat >> confdefs.h <<\EOF
46962 +#define HAVE_LIBXML 1
46969 + if test "$PHP_XML" = "no"; then
46973 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
46974 + /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
46975 + *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
46980 + b_c_pre=$php_c_pre
46981 + b_cxx_pre=$php_cxx_pre
46982 + b_c_meta=$php_c_meta
46983 + b_cxx_meta=$php_cxx_meta
46984 + b_c_post=$php_c_post
46985 + b_cxx_post=$php_cxx_post
46991 - echo "$ac_t""no" 1>&6
46993 - LDFLAGS=$save_old_LDFLAGS
46994 - ext_shared=$save_ext_shared
46995 - unset ac_cv_lib_sybtcl64_netg_errstr
46999 + for ac_src in compat.c; do
47002 - c|c_r|pthread*) ;;
47004 - if test "$ext_shared" = "yes"; then
47005 - SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD"
47014 - c|c_r|pthread*) ;;
47016 - LIBS="-lsybtcl64 $LIBS"
47020 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
47026 + *.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" ;;
47027 + *.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" ;;
47028 + *.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" ;;
47029 + *.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" ;;
47032 + cat >>Makefile.objects<<EOF
47033 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
47044 - save_old_LDFLAGS=$LDFLAGS
47045 - ac_stuff="-L$SYBASE_CT_LIBDIR"
47047 - save_ext_shared=$ext_shared
47050 - for ac_i in $ac_stuff; do
47053 - if test "$ext_shared" = "yes"; then
47054 - LDFLAGS="$LDFLAGS -pthread"
47058 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
47059 + BUILD_DIR="$BUILD_DIR ext/xml"
47061 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
47062 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
47063 - eval "EXTRA_LDFLAGS$unique=set"
47064 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
47069 + { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
47072 + { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
47078 + if test "$PHP_LIBEXPAT_DIR" != "no"; then
47079 + for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do
47080 + if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
47086 - ac_ii=`echo $ac_i|cut -c 3-`
47090 + if test -z "$EXPAT_DIR"; then
47091 + { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; }
47095 + if test "$EXPAT_DIR/include" != "/usr/include"; then
47097 + if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then
47098 + ai_p=$EXPAT_DIR/include
47101 + ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
47103 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
47104 + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
47110 - c|c_r|pthread*) ;;
47112 - if test "$ext_shared" = "yes"; then
47113 - LDFLAGS="$LDFLAGS -l$ac_ii"
47116 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
47119 - c|c_r|pthread*) ;;
47121 - LIBS="$LIBS -l$ac_ii"
47125 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
47126 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
47127 + eval "INCLUDEPATH$unique=set"
47130 + INCLUDES="-I$ai_p $INCLUDES"
47132 + INCLUDES="$INCLUDES -I$ai_p"
47146 - ac_ii=`echo $ac_i|cut -c 3-`
47147 + if test "$ext_shared" = "yes"; then
47148 + WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD"
47149 + if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
47151 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
47152 + if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
47154 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
47156 + if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
47157 + ai_p=$EXPAT_DIR/$PHP_LIBDIR
47160 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
47161 + ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
47163 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
47164 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
47165 + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
47169 if test "$ext_shared" = "yes"; then
47170 - LDFLAGS="-L$ai_p $LDFLAGS"
47171 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
47172 + WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD"
47173 + test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD"
47177 @@ -93277,360 +99411,522 @@ fi
47185 - echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6
47186 -echo "configure:93286: checking for insck__getVdate in -linsck64" >&5
47187 -ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'`
47188 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
47189 - echo $ac_n "(cached) $ac_c" 1>&6
47191 - ac_save_LIBS="$LIBS"
47192 -LIBS="-linsck64 $LIBS"
47193 -cat > conftest.$ac_ext <<EOF
47194 -#line 93294 "configure"
47195 -#include "confdefs.h"
47196 -/* Override any gcc2 internal prototype to avoid an error. */
47197 -/* We use char because int might match the return type of a gcc2
47198 - builtin and then its argument prototype would still apply. */
47199 -char insck__getVdate();
47208 -if { (eval echo configure:93305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47210 - eval "ac_cv_lib_$ac_lib_var=yes"
47212 - echo "configure: failed program was:" >&5
47213 - cat conftest.$ac_ext >&5
47215 - eval "ac_cv_lib_$ac_lib_var=no"
47218 -LIBS="$ac_save_LIBS"
47219 + if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
47221 + if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
47223 + if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
47224 + ai_p=$EXPAT_DIR/$PHP_LIBDIR
47227 + ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
47229 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
47230 + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
47234 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
47235 - echo "$ac_t""yes" 1>&6
47239 - LDFLAGS=$save_old_LDFLAGS
47240 - ext_shared=$save_ext_shared
47242 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
47244 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
47245 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
47246 + eval "LIBPATH$unique=set"
47248 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
47249 + LDFLAGS="$LDFLAGS -L$ai_p"
47250 + PHP_RPATHS="$PHP_RPATHS $ai_p"
47253 - c|c_r|pthread*) ;;
47255 - if test "$ext_shared" = "yes"; then
47256 - SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD"
47272 - LIBS="-linsck64 $LIBS"
47273 + LIBS="-lexpat $LIBS"
47285 - echo "$ac_t""no" 1>&6
47289 + cat >> confdefs.h <<\EOF
47290 +#define HAVE_LIBEXPAT 1
47295 + cat >> confdefs.h <<\EOF
47296 +#define HAVE_WDDX 1
47299 - LDFLAGS=$save_old_LDFLAGS
47300 - ext_shared=$save_ext_shared
47301 - unset ac_cv_lib_insck64_insck__getVdate
47305 + ext_builddir=ext/wddx
47306 + ext_srcdir=$abs_srcdir/ext/wddx
47310 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
47311 + PHP_WDDX_SHARED=no
47313 - save_old_LDFLAGS=$LDFLAGS
47314 - ac_stuff="-L$SYBASE_CT_LIBDIR"
47316 - save_ext_shared=$ext_shared
47319 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
47320 + /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
47321 + *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
47324 - for ac_i in $ac_stuff; do
47327 - if test "$ext_shared" = "yes"; then
47328 - LDFLAGS="$LDFLAGS -pthread"
47332 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
47334 + b_c_pre=$php_c_pre
47335 + b_cxx_pre=$php_cxx_pre
47336 + b_c_meta=$php_c_meta
47337 + b_cxx_meta=$php_cxx_meta
47338 + b_c_post=$php_c_post
47339 + b_cxx_post=$php_cxx_post
47344 + for ac_src in wddx.c; do
47346 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
47347 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
47348 - eval "EXTRA_LDFLAGS$unique=set"
47349 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
47356 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
47361 - ac_ii=`echo $ac_i|cut -c 3-`
47363 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47364 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47365 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47366 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
47369 + cat >>Makefile.objects<<EOF
47370 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
47376 + EXT_STATIC="$EXT_STATIC wddx"
47377 + if test "$ext_shared" != "nocli"; then
47378 + EXT_CLI_STATIC="$EXT_CLI_STATIC wddx"
47381 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
47382 + PHP_WDDX_SHARED=yes
47385 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
47386 + /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
47387 + *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
47391 - c|c_r|pthread*) ;;
47393 - if test "$ext_shared" = "yes"; then
47394 - LDFLAGS="$LDFLAGS -l$ac_ii"
47398 + b_c_pre=$shared_c_pre
47399 + b_cxx_pre=$shared_cxx_pre
47400 + b_c_meta=$shared_c_meta
47401 + b_cxx_meta=$shared_cxx_meta
47402 + b_c_post=$shared_c_post
47403 + b_cxx_post=$shared_cxx_post
47408 + for ac_src in wddx.c; do
47415 + shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo"
47418 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47419 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47420 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47421 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
47424 + cat >>Makefile.objects<<EOF
47425 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
47430 + case $host_alias in
47433 + install_modules="install-modules"
47435 + case $host_alias in
47438 + 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'
47442 + link_cmd='$(LIBTOOL) --mode=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)'
47446 + link_cmd='$(LIBTOOL) --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)'
47450 + if test "x" = "xyes"; then
47451 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpwddx.$suffix"
47453 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpwddx.$suffix"
47457 - c|c_r|pthread*) ;;
47459 - LIBS="$LIBS -l$ac_ii"
47461 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx"
47463 + cat >>Makefile.objects<<EOF
47464 +\$(phplibdir)/phpwddx.$suffix: $ext_builddir/phpwddx.$suffix
47465 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpwddx.$suffix \$(phplibdir)
47467 +$ext_builddir/phpwddx.$suffix: \$(shared_objects_wddx) \$(PHPWDDX_SHARED_DEPENDENCIES)
47475 + install_modules="install-modules"
47477 + case $host_alias in
47480 + 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'
47484 + link_cmd='$(LIBTOOL) --mode=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)'
47488 + link_cmd='$(LIBTOOL) --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)'
47492 + if test "x" = "xyes"; then
47493 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/wddx.$suffix"
47495 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/wddx.$suffix"
47498 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx"
47500 + cat >>Makefile.objects<<EOF
47501 +\$(phplibdir)/wddx.$suffix: $ext_builddir/wddx.$suffix
47502 + \$(LIBTOOL) --mode=install cp $ext_builddir/wddx.$suffix \$(phplibdir)
47504 +$ext_builddir/wddx.$suffix: \$(shared_objects_wddx) \$(WDDX_SHARED_DEPENDENCIES)
47511 + cat >> confdefs.h <<EOF
47512 +#define COMPILE_DL_WDDX 1
47519 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
47520 + PHP_WDDX_SHARED=no
47521 + case "$PHP_SAPI" in
47526 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
47527 + /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
47528 + *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
47533 + b_c_pre=$php_c_pre
47534 + b_cxx_pre=$php_cxx_pre
47535 + b_c_meta=$php_c_meta
47536 + b_cxx_meta=$php_cxx_meta
47537 + b_c_post=$php_c_post
47538 + b_cxx_post=$php_cxx_post
47544 - ac_ii=`echo $ac_i|cut -c 3-`
47546 + for ac_src in wddx.c; do
47553 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
47555 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
47559 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
47561 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
47562 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
47564 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
47567 - if test "$ext_shared" = "yes"; then
47568 - LDFLAGS="-L$ai_p $LDFLAGS"
47569 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
47572 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47573 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47574 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47575 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
47578 + cat >>Makefile.objects<<EOF
47579 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
47585 + EXT_STATIC="$EXT_STATIC wddx"
47591 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
47592 + /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
47593 + *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
47596 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
47598 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
47599 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
47600 - eval "LIBPATH$unique=set"
47602 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
47603 - LDFLAGS="$LDFLAGS -L$ai_p"
47604 - PHP_RPATHS="$PHP_RPATHS $ai_p"
47608 + b_c_pre=$php_c_pre
47609 + b_cxx_pre=$php_cxx_pre
47610 + b_c_meta=$php_c_meta
47611 + b_cxx_meta=$php_cxx_meta
47612 + b_c_post=$php_c_post
47613 + b_cxx_post=$php_cxx_post
47624 + for ac_src in wddx.c; do
47631 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
47633 - echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6
47634 -echo "configure:93453: checking for bsd_tcp in -linsck64" >&5
47635 -ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'`
47636 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
47637 - echo $ac_n "(cached) $ac_c" 1>&6
47639 - ac_save_LIBS="$LIBS"
47640 -LIBS="-linsck64 $LIBS"
47641 -cat > conftest.$ac_ext <<EOF
47642 -#line 93461 "configure"
47643 -#include "confdefs.h"
47644 -/* Override any gcc2 internal prototype to avoid an error. */
47645 -/* We use char because int might match the return type of a gcc2
47646 - builtin and then its argument prototype would still apply. */
47649 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47650 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47651 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
47652 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
47658 + cat >>Makefile.objects<<EOF
47659 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
47662 -if { (eval echo configure:93472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47664 - eval "ac_cv_lib_$ac_lib_var=yes"
47666 - echo "configure: failed program was:" >&5
47667 - cat conftest.$ac_ext >&5
47669 - eval "ac_cv_lib_$ac_lib_var=no"
47672 -LIBS="$ac_save_LIBS"
47676 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
47677 - echo "$ac_t""yes" 1>&6
47681 + EXT_CLI_STATIC="$EXT_CLI_STATIC wddx"
47684 - LDFLAGS=$save_old_LDFLAGS
47685 - ext_shared=$save_ext_shared
47687 + BUILD_DIR="$BUILD_DIR $ext_builddir"
47691 + if test "$ext_builddir" = "."; then
47692 + PHP_PECL_EXTENSION=wddx
47694 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
47699 + am_i_shared=$PHP_WDDX_SHARED
47700 + is_it_shared=$PHP_LIBXML_SHARED
47701 + is_it_enabled=$PHP_LIBXML
47702 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
47703 + { echo "configure: error:
47704 +You've configured extension wddx to build statically, but it
47705 +depends on extension libxml, which you've configured to build shared.
47706 +You either need to build wddx shared or build libxml statically for the
47707 +build to be successful.
47710 + if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
47711 + { echo "configure: error:
47712 +You've configured extension wddx, which depends on extension libxml,
47713 +but you've either not enabled libxml, or have disabled it.
47718 - c|c_r|pthread*) ;;
47720 - if test "$ext_shared" = "yes"; then
47721 - SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD"
47726 - c|c_r|pthread*) ;;
47728 - LIBS="-linsck64 $LIBS"
47731 + PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD"
47742 - echo "$ac_t""no" 1>&6
47743 +php_enable_xml=yes
47745 - LDFLAGS=$save_old_LDFLAGS
47746 - ext_shared=$save_ext_shared
47747 - unset ac_cv_lib_insck64_bsd_tcp
47749 +echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6
47750 +echo "configure:99800: checking whether to enable XML support" >&5
47751 +# Check whether --enable-xml or --disable-xml was given.
47752 +if test "${enable_xml+set}" = set; then
47753 + enableval="$enable_xml"
47754 + PHP_XML=$enableval
47758 + test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL
47762 - elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then
47766 - c|c_r|pthread*) ;;
47768 - if test "$ext_shared" = "yes"; then
47769 - SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD"
47774 - c|c_r|pthread*) ;;
47776 - LIBS="-lsybcs $LIBS"
47784 +ext_output="yes, shared"
47788 + PHP_XML=`echo "$PHP_XML"|$SED 's/^shared,//'`
47807 - c|c_r|pthread*) ;;
47809 - if test "$ext_shared" = "yes"; then
47810 - SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD"
47815 - c|c_r|pthread*) ;;
47817 - LIBS="-lsybct $LIBS"
47821 +echo "$ac_t""$ext_output" 1>&6
47830 +if test -z "$PHP_LIBXML_DIR"; then
47833 - c|c_r|pthread*) ;;
47835 - if test "$ext_shared" = "yes"; then
47836 - SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD"
47839 +php_with_libxml_dir=no
47841 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
47842 +echo "configure:99845: checking libxml2 install dir" >&5
47843 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
47844 +if test "${with_libxml_dir+set}" = set; then
47845 + withval="$with_libxml_dir"
47846 + PHP_LIBXML_DIR=$withval
47849 + PHP_LIBXML_DIR=no
47852 - c|c_r|pthread*) ;;
47854 - LIBS="-lsybcomn $LIBS"
47864 +ext_output=$PHP_LIBXML_DIR
47865 +echo "$ac_t""$ext_output" 1>&6
47870 - c|c_r|pthread*) ;;
47872 - if test "$ext_shared" = "yes"; then
47873 - SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD"
47878 - c|c_r|pthread*) ;;
47880 - LIBS="-lsybintl $LIBS"
47891 +php_with_libexpat_dir=no
47893 +echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6
47894 +echo "configure:99869: checking libexpat install dir" >&5
47895 +# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
47896 +if test "${with_libexpat_dir+set}" = set; then
47897 + withval="$with_libexpat_dir"
47898 + PHP_LIBEXPAT_DIR=$withval
47901 - SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl"
47902 - echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6
47903 + PHP_LIBEXPAT_DIR=no
47909 +ext_output=$PHP_LIBEXPAT_DIR
47910 +echo "$ac_t""$ext_output" 1>&6
47915 +if test "$PHP_XML" != "no"; then
47917 + if test "$PHP_LIBEXPAT_DIR" = "no"; then
47919 + if test "$PHP_LIBXML" = "no"; then
47920 + { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
47924 - save_old_LDFLAGS=$LDFLAGS
47929 - save_ext_shared=$ext_shared
47931 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
47932 +echo "configure:99898: checking for xml2-config path" >&5
47933 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
47934 + echo $ac_n "(cached) $ac_c" 1>&6
47937 - for ac_i in $ac_stuff; do
47938 + for i in $PHP_LIBXML_DIR /usr/local /usr; do
47939 + if test -x "$i/bin/xml2-config"; then
47940 + ac_cv_php_xml2_config_path="$i/bin/xml2-config"
47947 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
47949 + if test -x "$ac_cv_php_xml2_config_path"; then
47950 + XML2_CONFIG="$ac_cv_php_xml2_config_path"
47951 + libxml_full_version=`$XML2_CONFIG --version`
47954 + set $libxml_full_version
47956 + LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
47957 + if test "$LIBXML_VERSION" -ge "2006011"; then
47958 + LIBXML_LIBS=`$XML2_CONFIG --libs`
47959 + LIBXML_INCS=`$XML2_CONFIG --cflags`
47961 + for ac_i in $LIBXML_LIBS; do
47964 if test "$ext_shared" = "yes"; then
47965 - LDFLAGS="$LDFLAGS -pthread"
47966 + XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread"
47970 @@ -93652,7 +99948,7 @@ fi
47973 if test "$ext_shared" = "yes"; then
47974 - LDFLAGS="$LDFLAGS -l$ac_ii"
47975 + XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii"
47979 @@ -93687,8 +99983,8 @@ fi
47982 if test "$ext_shared" = "yes"; then
47983 - LDFLAGS="-L$ai_p $LDFLAGS"
47984 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
47985 + XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD"
47986 + test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD"
47990 @@ -93714,160 +100010,13 @@ fi
47994 - echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6
47995 -echo "configure:93719: checking for netg_errstr in -lsybtcl" >&5
47996 -ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'`
47997 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
47998 - echo $ac_n "(cached) $ac_c" 1>&6
48000 - ac_save_LIBS="$LIBS"
48001 -LIBS="-lsybtcl $LIBS"
48002 -cat > conftest.$ac_ext <<EOF
48003 -#line 93727 "configure"
48004 -#include "confdefs.h"
48005 -/* Override any gcc2 internal prototype to avoid an error. */
48006 -/* We use char because int might match the return type of a gcc2
48007 - builtin and then its argument prototype would still apply. */
48008 -char netg_errstr();
48014 -if { (eval echo configure:93738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
48016 - eval "ac_cv_lib_$ac_lib_var=yes"
48018 - echo "configure: failed program was:" >&5
48019 - cat conftest.$ac_ext >&5
48021 - eval "ac_cv_lib_$ac_lib_var=no"
48024 -LIBS="$ac_save_LIBS"
48027 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
48028 - echo "$ac_t""yes" 1>&6
48030 - LDFLAGS=$save_old_LDFLAGS
48031 - ext_shared=$save_ext_shared
48036 - c|c_r|pthread*) ;;
48038 - if test "$ext_shared" = "yes"; then
48039 - SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
48044 - c|c_r|pthread*) ;;
48046 - LIBS="-lsybtcl $LIBS"
48059 - echo "$ac_t""no" 1>&6
48061 - LDFLAGS=$save_old_LDFLAGS
48062 - ext_shared=$save_ext_shared
48063 - unset ac_cv_lib_sybtcl_netg_errstr
48068 - c|c_r|pthread*) ;;
48070 - if test "$ext_shared" = "yes"; then
48071 - SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
48076 - c|c_r|pthread*) ;;
48078 - LIBS="-lsybtcl $LIBS"
48094 - save_old_LDFLAGS=$LDFLAGS
48095 - ac_stuff="-L$SYBASE_CT_LIBDIR"
48097 - save_ext_shared=$ext_shared
48100 - for ac_i in $ac_stuff; do
48101 + for ac_i in $LIBXML_INCS; do
48104 - if test "$ext_shared" = "yes"; then
48105 - LDFLAGS="$LDFLAGS -pthread"
48109 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
48111 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
48112 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
48113 - eval "EXTRA_LDFLAGS$unique=set"
48114 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
48120 - ac_ii=`echo $ac_i|cut -c 3-`
48124 - c|c_r|pthread*) ;;
48126 - if test "$ext_shared" = "yes"; then
48127 - LDFLAGS="$LDFLAGS -l$ac_ii"
48132 - c|c_r|pthread*) ;;
48134 - LIBS="$LIBS -l$ac_ii"
48147 ac_ii=`echo $ac_i|cut -c 3-`
48149 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
48150 + if test "$ac_ii" != "/usr/include"; then
48152 if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
48154 @@ -93880,176 +100029,187 @@ fi
48158 - if test "$ext_shared" = "yes"; then
48159 - LDFLAGS="-L$ai_p $LDFLAGS"
48160 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
48165 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48167 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
48168 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
48169 if test -n "$unique" && test "`eval $cmd`" = "" ; then
48170 - eval "LIBPATH$unique=set"
48171 + eval "INCLUDEPATH$unique=set"
48173 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
48174 - LDFLAGS="$LDFLAGS -L$ai_p"
48175 - PHP_RPATHS="$PHP_RPATHS $ai_p"
48181 + INCLUDES="-I$ai_p $INCLUDES"
48183 + INCLUDES="$INCLUDES -I$ai_p"
48194 - echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
48195 -echo "configure:93913: checking for insck__getVdate in -linsck" >&5
48196 -ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
48197 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
48199 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
48200 +echo "configure:100056: checking whether libxml build works" >&5
48201 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
48202 echo $ac_n "(cached) $ac_c" 1>&6
48204 - ac_save_LIBS="$LIBS"
48205 -LIBS="-linsck $LIBS"
48206 -cat > conftest.$ac_ext <<EOF
48207 -#line 93921 "configure"
48212 + $XML_SHARED_LIBADD
48214 + if test "$cross_compiling" = yes; then
48219 + cat > conftest.$ac_ext <<EOF
48220 +#line 100072 "configure"
48221 #include "confdefs.h"
48222 -/* Override any gcc2 internal prototype to avoid an error. */
48223 -/* We use char because int might match the return type of a gcc2
48224 - builtin and then its argument prototype would still apply. */
48225 -char insck__getVdate();
48231 + char xmlInitParser();
48238 -if { (eval echo configure:93932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
48240 - eval "ac_cv_lib_$ac_lib_var=yes"
48241 +if { (eval echo configure:100083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
48246 + php_cv_libxml_build_works=yes
48250 echo "configure: failed program was:" >&5
48251 cat conftest.$ac_ext >&5
48253 - eval "ac_cv_lib_$ac_lib_var=no"
48256 -LIBS="$ac_save_LIBS"
48259 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
48260 - echo "$ac_t""yes" 1>&6
48263 - LDFLAGS=$save_old_LDFLAGS
48264 - ext_shared=$save_ext_shared
48267 + echo "$ac_t""no" 1>&6
48268 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
48272 - c|c_r|pthread*) ;;
48274 - if test "$ext_shared" = "yes"; then
48275 - SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
48285 - c|c_r|pthread*) ;;
48287 - LIBS="-linsck $LIBS"
48292 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
48293 + if test "$php_cv_libxml_build_works" = "yes"; then
48294 + cat >> confdefs.h <<\EOF
48295 +#define HAVE_LIBXML 1
48300 + xml_extra_sources="compat.c"
48302 + am_i_shared=$PHP_XML_SHARED
48303 + is_it_shared=$PHP_LIBXML_SHARED
48304 + is_it_enabled=$PHP_LIBXML
48305 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
48306 + { echo "configure: error:
48307 +You've configured extension xml to build statically, but it
48308 +depends on extension libxml, which you've configured to build shared.
48309 +You either need to build xml shared or build libxml statically for the
48310 +build to be successful.
48313 + if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
48314 + { echo "configure: error:
48315 +You've configured extension xml, which depends on extension libxml,
48316 +but you've either not enabled libxml, or have disabled it.
48322 + { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
48328 + { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
48335 - echo "$ac_t""no" 1>&6
48336 + if test "$PHP_LIBEXPAT_DIR" != "no"; then
48337 + for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do
48338 + if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
48344 + if test -z "$EXPAT_DIR"; then
48345 + { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; }
48348 - LDFLAGS=$save_old_LDFLAGS
48349 - ext_shared=$save_ext_shared
48350 - unset ac_cv_lib_insck_insck__getVdate
48354 + if test "$EXPAT_DIR/include" != "/usr/include"; then
48356 + if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then
48357 + ai_p=$EXPAT_DIR/include
48360 + ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
48362 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48363 + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
48367 - save_old_LDFLAGS=$LDFLAGS
48368 - ac_stuff="-L$SYBASE_CT_LIBDIR"
48370 - save_ext_shared=$ext_shared
48373 - for ac_i in $ac_stuff; do
48376 - if test "$ext_shared" = "yes"; then
48377 - LDFLAGS="$LDFLAGS -pthread"
48381 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
48382 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48384 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
48385 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
48386 if test -n "$unique" && test "`eval $cmd`" = "" ; then
48387 - eval "EXTRA_LDFLAGS$unique=set"
48388 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
48391 + eval "INCLUDEPATH$unique=set"
48394 + INCLUDES="-I$ai_p $INCLUDES"
48396 + INCLUDES="$INCLUDES -I$ai_p"
48400 - ac_ii=`echo $ac_i|cut -c 3-`
48404 - c|c_r|pthread*) ;;
48406 - if test "$ext_shared" = "yes"; then
48407 - LDFLAGS="$LDFLAGS -l$ac_ii"
48412 - c|c_r|pthread*) ;;
48414 - LIBS="$LIBS -l$ac_ii"
48430 - ac_ii=`echo $ac_i|cut -c 3-`
48431 + if test "$ext_shared" = "yes"; then
48432 + XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD"
48433 + if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
48435 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
48436 + if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
48438 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
48440 + if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
48441 + ai_p=$EXPAT_DIR/$PHP_LIBDIR
48444 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
48445 + ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
48447 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48448 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
48449 + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
48453 if test "$ext_shared" = "yes"; then
48454 - LDFLAGS="-L$ai_p $LDFLAGS"
48455 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
48456 + XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD"
48457 + test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD"
48461 @@ -94071,554 +100231,496 @@ fi
48469 - echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
48470 -echo "configure:94080: checking for bsd_tcp in -linsck" >&5
48471 -ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
48472 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
48473 - echo $ac_n "(cached) $ac_c" 1>&6
48475 - ac_save_LIBS="$LIBS"
48476 -LIBS="-linsck $LIBS"
48477 -cat > conftest.$ac_ext <<EOF
48478 -#line 94088 "configure"
48479 -#include "confdefs.h"
48480 -/* Override any gcc2 internal prototype to avoid an error. */
48481 -/* We use char because int might match the return type of a gcc2
48482 - builtin and then its argument prototype would still apply. */
48492 -if { (eval echo configure:94099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
48494 - eval "ac_cv_lib_$ac_lib_var=yes"
48496 - echo "configure: failed program was:" >&5
48497 - cat conftest.$ac_ext >&5
48499 - eval "ac_cv_lib_$ac_lib_var=no"
48502 -LIBS="$ac_save_LIBS"
48503 + if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
48505 + if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
48507 + if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
48508 + ai_p=$EXPAT_DIR/$PHP_LIBDIR
48511 + ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
48513 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48514 + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
48518 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
48519 - echo "$ac_t""yes" 1>&6
48523 - LDFLAGS=$save_old_LDFLAGS
48524 - ext_shared=$save_ext_shared
48526 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48528 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
48529 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
48530 + eval "LIBPATH$unique=set"
48532 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
48533 + LDFLAGS="$LDFLAGS -L$ai_p"
48534 + PHP_RPATHS="$PHP_RPATHS $ai_p"
48537 - c|c_r|pthread*) ;;
48539 - if test "$ext_shared" = "yes"; then
48540 - SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
48556 - LIBS="-linsck $LIBS"
48557 + LIBS="-lexpat $LIBS"
48569 - echo "$ac_t""no" 1>&6
48573 + cat >> confdefs.h <<\EOF
48574 +#define HAVE_LIBEXPAT 1
48579 - LDFLAGS=$save_old_LDFLAGS
48580 - ext_shared=$save_ext_shared
48581 - unset ac_cv_lib_insck_bsd_tcp
48585 + ext_builddir=ext/xml
48586 + ext_srcdir=$abs_srcdir/ext/xml
48591 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
48592 + PHP_XML_SHARED=no
48596 - c|c_r|pthread*) ;;
48598 - if test "$ext_shared" = "yes"; then
48599 - SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD"
48604 - c|c_r|pthread*) ;;
48606 - LIBS="-lcs $LIBS"
48609 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
48610 + /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48611 + *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48620 + b_c_pre=$php_c_pre
48621 + b_cxx_pre=$php_cxx_pre
48622 + b_c_meta=$php_c_meta
48623 + b_cxx_meta=$php_cxx_meta
48624 + b_c_post=$php_c_post
48625 + b_cxx_post=$php_cxx_post
48631 + for ac_src in xml.c $xml_extra_sources; do
48634 - c|c_r|pthread*) ;;
48636 - if test "$ext_shared" = "yes"; then
48637 - SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD"
48646 - c|c_r|pthread*) ;;
48648 - LIBS="-lct $LIBS"
48651 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
48654 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
48655 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
48656 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
48657 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
48660 + cat >>Makefile.objects<<EOF
48661 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
48667 + EXT_STATIC="$EXT_STATIC xml"
48668 + if test "$ext_shared" != "nocli"; then
48669 + EXT_CLI_STATIC="$EXT_CLI_STATIC xml"
48673 + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
48674 + PHP_XML_SHARED=yes
48677 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
48678 + /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48679 + *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48684 + b_c_pre=$shared_c_pre
48685 + b_cxx_pre=$shared_cxx_pre
48686 + b_c_meta=$shared_c_meta
48687 + b_cxx_meta=$shared_cxx_meta
48688 + b_c_post=$shared_c_post
48689 + b_cxx_post=$shared_cxx_post
48695 + for ac_src in xml.c $xml_extra_sources; do
48698 - c|c_r|pthread*) ;;
48700 - if test "$ext_shared" = "yes"; then
48701 - SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD"
48710 - c|c_r|pthread*) ;;
48712 - LIBS="-lcomn $LIBS"
48715 + shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo"
48718 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
48719 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
48720 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
48721 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
48727 + cat >>Makefile.objects<<EOF
48728 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
48733 + case $host_alias in
48736 + install_modules="install-modules"
48741 - c|c_r|pthread*) ;;
48743 - if test "$ext_shared" = "yes"; then
48744 - SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD"
48749 - c|c_r|pthread*) ;;
48751 - LIBS="-lintl $LIBS"
48753 + case $host_alias in
48756 + 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'
48760 + link_cmd='$(LIBTOOL) --mode=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)'
48764 + link_cmd='$(LIBTOOL) --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)'
48768 + if test "x" = "xyes"; then
48769 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxml.$suffix"
48771 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix"
48774 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml"
48779 + cat >>Makefile.objects<<EOF
48780 +\$(phplibdir)/phpxml.$suffix: $ext_builddir/phpxml.$suffix
48781 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpxml.$suffix \$(phplibdir)
48783 +$ext_builddir/phpxml.$suffix: \$(shared_objects_xml) \$(PHPXML_SHARED_DEPENDENCIES)
48787 - SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
48788 - echo "$ac_t""Sybase32 default: $SYBASE_CT_LIBS" 1>&6
48791 - save_old_LDFLAGS=$LDFLAGS
48796 - save_ext_shared=$ext_shared
48799 - for ac_i in $ac_stuff; do
48802 - if test "$ext_shared" = "yes"; then
48803 - LDFLAGS="$LDFLAGS -pthread"
48807 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
48809 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
48810 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
48811 - eval "EXTRA_LDFLAGS$unique=set"
48812 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
48819 - ac_ii=`echo $ac_i|cut -c 3-`
48823 - c|c_r|pthread*) ;;
48825 - if test "$ext_shared" = "yes"; then
48826 - LDFLAGS="$LDFLAGS -l$ac_ii"
48831 - c|c_r|pthread*) ;;
48833 - LIBS="$LIBS -l$ac_ii"
48838 + install_modules="install-modules"
48840 + case $host_alias in
48843 + 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'
48847 + link_cmd='$(LIBTOOL) --mode=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)'
48851 + link_cmd='$(LIBTOOL) --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)'
48855 + if test "x" = "xyes"; then
48856 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xml.$suffix"
48858 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/xml.$suffix"
48861 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml"
48863 + cat >>Makefile.objects<<EOF
48864 +\$(phplibdir)/xml.$suffix: $ext_builddir/xml.$suffix
48865 + \$(LIBTOOL) --mode=install cp $ext_builddir/xml.$suffix \$(phplibdir)
48867 +$ext_builddir/xml.$suffix: \$(shared_objects_xml) \$(XML_SHARED_DEPENDENCIES)
48874 + cat >> confdefs.h <<EOF
48875 +#define COMPILE_DL_XML 1
48882 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
48883 + PHP_XML_SHARED=no
48884 + case "$PHP_SAPI" in
48889 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
48890 + /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48891 + *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48896 + b_c_pre=$php_c_pre
48897 + b_cxx_pre=$php_cxx_pre
48898 + b_c_meta=$php_c_meta
48899 + b_cxx_meta=$php_cxx_meta
48900 + b_c_post=$php_c_post
48901 + b_cxx_post=$php_cxx_post
48906 - ac_ii=`echo $ac_i|cut -c 3-`
48909 + for ac_src in xml.c $xml_extra_sources; do
48916 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
48918 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
48922 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
48924 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
48925 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
48927 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
48930 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
48931 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
48932 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
48933 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
48936 + cat >>Makefile.objects<<EOF
48937 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
48943 - if test "$ext_shared" = "yes"; then
48944 - LDFLAGS="-L$ai_p $LDFLAGS"
48945 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
48948 + EXT_STATIC="$EXT_STATIC xml"
48954 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
48955 + /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
48956 + *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
48959 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
48961 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
48962 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
48963 - eval "LIBPATH$unique=set"
48965 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
48966 - LDFLAGS="$LDFLAGS -L$ai_p"
48967 - PHP_RPATHS="$PHP_RPATHS $ai_p"
48971 + b_c_pre=$php_c_pre
48972 + b_cxx_pre=$php_cxx_pre
48973 + b_c_meta=$php_c_meta
48974 + b_cxx_meta=$php_cxx_meta
48975 + b_c_post=$php_c_post
48976 + b_cxx_post=$php_cxx_post
48987 + for ac_src in xml.c $xml_extra_sources; do
48994 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
48996 - echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
48997 -echo "configure:94346: checking for netg_errstr in -ltcl" >&5
48998 -ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'`
48999 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
49000 - echo $ac_n "(cached) $ac_c" 1>&6
49002 - ac_save_LIBS="$LIBS"
49003 -LIBS="-ltcl $LIBS"
49004 -cat > conftest.$ac_ext <<EOF
49005 -#line 94354 "configure"
49006 -#include "confdefs.h"
49007 -/* Override any gcc2 internal prototype to avoid an error. */
49008 -/* We use char because int might match the return type of a gcc2
49009 - builtin and then its argument prototype would still apply. */
49010 -char netg_errstr();
49012 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
49013 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
49014 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
49015 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
49021 + cat >>Makefile.objects<<EOF
49022 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
49025 -if { (eval echo configure:94365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
49027 - eval "ac_cv_lib_$ac_lib_var=yes"
49029 - echo "configure: failed program was:" >&5
49030 - cat conftest.$ac_ext >&5
49032 - eval "ac_cv_lib_$ac_lib_var=no"
49035 -LIBS="$ac_save_LIBS"
49039 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
49040 - echo "$ac_t""yes" 1>&6
49044 + EXT_CLI_STATIC="$EXT_CLI_STATIC xml"
49047 - LDFLAGS=$save_old_LDFLAGS
49048 - ext_shared=$save_ext_shared
49053 - c|c_r|pthread*) ;;
49055 - if test "$ext_shared" = "yes"; then
49056 - SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD"
49059 + BUILD_DIR="$BUILD_DIR $ext_builddir"
49062 - c|c_r|pthread*) ;;
49064 - LIBS="-ltcl $LIBS"
49072 + if test "$ext_builddir" = "."; then
49073 + PHP_PECL_EXTENSION=xml
49075 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
49082 - echo "$ac_t""no" 1>&6
49083 + PHP_VAR_SUBST="$PHP_VAR_SUBST XML_SHARED_LIBADD"
49085 - LDFLAGS=$save_old_LDFLAGS
49086 - ext_shared=$save_ext_shared
49087 - unset ac_cv_lib_tcl_netg_errstr
49091 + for header_file in ext/xml/; do
49095 - c|c_r|pthread*) ;;
49097 - if test "$ext_shared" = "yes"; then
49098 - SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
49100 + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
49102 + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
49103 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
49104 + eval "INSTALLHEADERS$unique=set"
49106 + INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
49113 - c|c_r|pthread*) ;;
49115 - LIBS="-lsybtcl $LIBS"
49119 + cat >> confdefs.h <<\EOF
49120 +#define HAVE_XML 1
49131 +php_enable_xmlreader=yes
49133 +echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6
49134 +echo "configure:100619: checking whether to enable XMLReader support" >&5
49135 +# Check whether --enable-xmlreader or --disable-xmlreader was given.
49136 +if test "${enable_xmlreader+set}" = set; then
49137 + enableval="$enable_xmlreader"
49138 + PHP_XMLREADER=$enableval
49141 + PHP_XMLREADER=yes
49142 + test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL
49148 - save_old_LDFLAGS=$LDFLAGS
49149 - ac_stuff="-L$SYBASE_CT_LIBDIR"
49151 - save_ext_shared=$ext_shared
49154 - for ac_i in $ac_stuff; do
49157 - if test "$ext_shared" = "yes"; then
49158 - LDFLAGS="$LDFLAGS -pthread"
49162 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
49164 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
49165 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
49166 - eval "EXTRA_LDFLAGS$unique=set"
49167 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
49173 - ac_ii=`echo $ac_i|cut -c 3-`
49177 - c|c_r|pthread*) ;;
49179 - if test "$ext_shared" = "yes"; then
49180 - LDFLAGS="$LDFLAGS -l$ac_ii"
49185 - c|c_r|pthread*) ;;
49187 - LIBS="$LIBS -l$ac_ii"
49191 +ext_output="yes, shared"
49193 +case $PHP_XMLREADER in
49195 + PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'`
49198 + PHP_XMLREADER=yes
49217 - ac_ii=`echo $ac_i|cut -c 3-`
49219 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
49221 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
49225 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
49227 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
49228 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
49230 +echo "$ac_t""$ext_output" 1>&6
49233 - if test "$ext_shared" = "yes"; then
49234 - LDFLAGS="-L$ai_p $LDFLAGS"
49235 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
49242 +if test -z "$PHP_LIBXML_DIR"; then
49244 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
49245 +php_with_libxml_dir=no
49247 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
49248 +echo "configure:100664: checking libxml2 install dir" >&5
49249 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
49250 +if test "${with_libxml_dir+set}" = set; then
49251 + withval="$with_libxml_dir"
49252 + PHP_LIBXML_DIR=$withval
49255 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
49256 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
49257 - eval "LIBPATH$unique=set"
49259 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
49260 - LDFLAGS="$LDFLAGS -L$ai_p"
49261 - PHP_RPATHS="$PHP_RPATHS $ai_p"
49262 + PHP_LIBXML_DIR=no
49275 +ext_output=$PHP_LIBXML_DIR
49276 +echo "$ac_t""$ext_output" 1>&6
49278 - echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
49279 -echo "configure:94540: checking for insck__getVdate in -linsck" >&5
49280 -ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
49281 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
49282 - echo $ac_n "(cached) $ac_c" 1>&6
49284 - ac_save_LIBS="$LIBS"
49285 -LIBS="-linsck $LIBS"
49286 -cat > conftest.$ac_ext <<EOF
49287 -#line 94548 "configure"
49288 -#include "confdefs.h"
49289 -/* Override any gcc2 internal prototype to avoid an error. */
49290 -/* We use char because int might match the return type of a gcc2
49291 - builtin and then its argument prototype would still apply. */
49292 -char insck__getVdate();
49298 -if { (eval echo configure:94559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
49300 - eval "ac_cv_lib_$ac_lib_var=yes"
49302 - echo "configure: failed program was:" >&5
49303 - cat conftest.$ac_ext >&5
49305 - eval "ac_cv_lib_$ac_lib_var=no"
49308 -LIBS="$ac_save_LIBS"
49311 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
49312 - echo "$ac_t""yes" 1>&6
49314 - LDFLAGS=$save_old_LDFLAGS
49315 - ext_shared=$save_ext_shared
49319 - c|c_r|pthread*) ;;
49321 - if test "$ext_shared" = "yes"; then
49322 - SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
49327 - c|c_r|pthread*) ;;
49329 - LIBS="-linsck $LIBS"
49337 +if test "$PHP_XMLREADER" != "no"; then
49339 + if test "$PHP_LIBXML" = "no"; then
49340 + { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
49344 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
49345 +echo "configure:100692: checking for xml2-config path" >&5
49346 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
49347 + echo $ac_n "(cached) $ac_c" 1>&6
49349 - echo "$ac_t""no" 1>&6
49351 - LDFLAGS=$save_old_LDFLAGS
49352 - ext_shared=$save_ext_shared
49353 - unset ac_cv_lib_insck_insck__getVdate
49356 + for i in $PHP_LIBXML_DIR /usr/local /usr; do
49357 + if test -x "$i/bin/xml2-config"; then
49358 + ac_cv_php_xml2_config_path="$i/bin/xml2-config"
49366 - save_old_LDFLAGS=$LDFLAGS
49367 - ac_stuff="-L$SYBASE_CT_LIBDIR"
49369 - save_ext_shared=$ext_shared
49372 - for ac_i in $ac_stuff; do
49373 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
49375 + if test -x "$ac_cv_php_xml2_config_path"; then
49376 + XML2_CONFIG="$ac_cv_php_xml2_config_path"
49377 + libxml_full_version=`$XML2_CONFIG --version`
49380 + set $libxml_full_version
49382 + LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
49383 + if test "$LIBXML_VERSION" -ge "2006011"; then
49384 + LIBXML_LIBS=`$XML2_CONFIG --libs`
49385 + LIBXML_INCS=`$XML2_CONFIG --cflags`
49387 + for ac_i in $LIBXML_LIBS; do
49390 if test "$ext_shared" = "yes"; then
49391 - LDFLAGS="$LDFLAGS -pthread"
49392 + XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread"
49396 @@ -94640,7 +100742,7 @@ fi
49399 if test "$ext_shared" = "yes"; then
49400 - LDFLAGS="$LDFLAGS -l$ac_ii"
49401 + XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii"
49405 @@ -94675,8 +100777,8 @@ fi
49408 if test "$ext_shared" = "yes"; then
49409 - LDFLAGS="-L$ai_p $LDFLAGS"
49410 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
49411 + XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD"
49412 + test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD"
49416 @@ -94702,181 +100804,128 @@ fi
49420 - echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
49421 -echo "configure:94707: checking for bsd_tcp in -linsck" >&5
49422 -ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
49423 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
49424 - echo $ac_n "(cached) $ac_c" 1>&6
49426 - ac_save_LIBS="$LIBS"
49427 -LIBS="-linsck $LIBS"
49428 -cat > conftest.$ac_ext <<EOF
49429 -#line 94715 "configure"
49430 -#include "confdefs.h"
49431 -/* Override any gcc2 internal prototype to avoid an error. */
49432 -/* We use char because int might match the return type of a gcc2
49433 - builtin and then its argument prototype would still apply. */
49440 -if { (eval echo configure:94726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
49442 - eval "ac_cv_lib_$ac_lib_var=yes"
49444 - echo "configure: failed program was:" >&5
49445 - cat conftest.$ac_ext >&5
49447 - eval "ac_cv_lib_$ac_lib_var=no"
49450 -LIBS="$ac_save_LIBS"
49453 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
49454 - echo "$ac_t""yes" 1>&6
49456 - LDFLAGS=$save_old_LDFLAGS
49457 - ext_shared=$save_ext_shared
49461 - c|c_r|pthread*) ;;
49463 - if test "$ext_shared" = "yes"; then
49464 - SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD"
49469 - c|c_r|pthread*) ;;
49471 - LIBS="-linsck $LIBS"
49483 - echo "$ac_t""no" 1>&6
49485 - LDFLAGS=$save_old_LDFLAGS
49486 - ext_shared=$save_ext_shared
49487 - unset ac_cv_lib_insck_bsd_tcp
49488 + for ac_i in $LIBXML_INCS; do
49491 + ac_ii=`echo $ac_i|cut -c 3-`
49493 + if test "$ac_ii" != "/usr/include"; then
49503 -php_enable_sysvmsg=no
49505 -echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6
49506 -echo "configure:94786: checking whether to enable System V IPC support" >&5
49507 -# Check whether --enable-sysvmsg or --disable-sysvmsg was given.
49508 -if test "${enable_sysvmsg+set}" = set; then
49509 - enableval="$enable_sysvmsg"
49510 - PHP_SYSVMSG=$enableval
49514 - test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL
49520 -ext_output="yes, shared"
49522 -case $PHP_SYSVMSG in
49524 - PHP_SYSVMSG=`echo "$PHP_SYSVMSG"|$SED 's/^shared,//'`
49540 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
49544 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
49546 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
49547 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
49550 -echo "$ac_t""$ext_output" 1>&6
49553 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
49555 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
49556 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
49557 + eval "INCLUDEPATH$unique=set"
49560 + INCLUDES="-I$ai_p $INCLUDES"
49562 + INCLUDES="$INCLUDES -I$ai_p"
49574 -if test "$PHP_SYSVMSG" != "no"; then
49575 - ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
49576 -echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
49577 -echo "configure:94829: checking for sys/msg.h" >&5
49578 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
49579 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
49580 +echo "configure:100850: checking whether libxml build works" >&5
49581 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
49582 echo $ac_n "(cached) $ac_c" 1>&6
49588 + $XMLREADER_SHARED_LIBADD
49590 + if test "$cross_compiling" = yes; then
49595 cat > conftest.$ac_ext <<EOF
49596 -#line 94834 "configure"
49597 +#line 100866 "configure"
49598 #include "confdefs.h"
49599 -#include <sys/msg.h>
49602 + char xmlInitParser();
49609 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
49610 -{ (eval echo configure:94839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
49611 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
49612 -if test -z "$ac_err"; then
49614 - eval "ac_cv_header_$ac_safe=yes"
49615 +if { (eval echo configure:100877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
49620 + php_cv_libxml_build_works=yes
49624 - echo "$ac_err" >&5
49625 echo "configure: failed program was:" >&5
49626 cat conftest.$ac_ext >&5
49628 - eval "ac_cv_header_$ac_safe=no"
49633 + echo "$ac_t""no" 1>&6
49634 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
49641 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
49642 - echo "$ac_t""yes" 1>&6
49645 - echo "$ac_t""no" 1>&6
49646 -{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; }
49653 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
49654 + if test "$php_cv_libxml_build_works" = "yes"; then
49655 + cat >> confdefs.h <<\EOF
49656 +#define HAVE_LIBXML 1
49659 - cat >> confdefs.h <<\EOF
49660 -#define HAVE_SYSVMSG 1
49663 + cat >> confdefs.h <<\EOF
49664 +#define HAVE_XMLREADER 1
49668 - ext_builddir=ext/sysvmsg
49669 - ext_srcdir=$abs_srcdir/ext/sysvmsg
49671 + ext_builddir=ext/xmlreader
49672 + ext_srcdir=$abs_srcdir/ext/xmlreader
49676 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
49677 - PHP_SYSVMSG_SHARED=no
49678 + PHP_XMLREADER_SHARED=no
49681 - case ext/sysvmsg in
49682 + case ext/xmlreader in
49683 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49684 - /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49685 - *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49686 + /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49687 + *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49691 @@ -94891,7 +100940,7 @@ EOF
49695 - for ac_src in sysvmsg.c; do
49696 + for ac_src in php_xmlreader.c; do
49700 @@ -94914,18 +100963,18 @@ EOF
49704 - EXT_STATIC="$EXT_STATIC sysvmsg"
49705 + EXT_STATIC="$EXT_STATIC xmlreader"
49706 if test "$ext_shared" != "nocli"; then
49707 - EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg"
49708 + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader"
49711 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
49712 - PHP_SYSVMSG_SHARED=yes
49713 + PHP_XMLREADER_SHARED=yes
49715 - case ext/sysvmsg in
49716 + case ext/xmlreader in
49717 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49718 - /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49719 - *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49720 + /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49721 + *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49725 @@ -94940,14 +100989,14 @@ EOF
49729 - for ac_src in sysvmsg.c; do
49730 + for ac_src in php_xmlreader.c; do
49737 - shared_objects_sysvmsg="$shared_objects_sysvmsg $ac_bdir$ac_obj.lo"
49738 + shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo"
49741 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
49742 @@ -94970,31 +101019,31 @@ EOF
49743 case $host_alias in
49746 - 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'
49747 + 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'
49751 - link_cmd='$(LIBTOOL) --mode=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)'
49752 + link_cmd='$(LIBTOOL) --mode=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)'
49756 - link_cmd='$(LIBTOOL) --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)'
49757 + link_cmd='$(LIBTOOL) --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)'
49761 if test "x" = "xyes"; then
49762 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvmsg.$suffix"
49763 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlreader.$suffix"
49765 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvmsg.$suffix"
49766 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix"
49769 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg"
49770 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader"
49772 cat >>Makefile.objects<<EOF
49773 -\$(phplibdir)/phpsysvmsg.$suffix: $ext_builddir/phpsysvmsg.$suffix
49774 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvmsg.$suffix \$(phplibdir)
49775 +\$(phplibdir)/phpxmlreader.$suffix: $ext_builddir/phpxmlreader.$suffix
49776 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlreader.$suffix \$(phplibdir)
49778 -$ext_builddir/phpsysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(PHPSYSVMSG_SHARED_DEPENDENCIES)
49779 +$ext_builddir/phpxmlreader.$suffix: \$(shared_objects_xmlreader) \$(PHPXMLREADER_SHARED_DEPENDENCIES)
49783 @@ -95007,31 +101056,31 @@ EOF
49784 case $host_alias in
49787 - 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'
49788 + 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'
49792 - link_cmd='$(LIBTOOL) --mode=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)'
49793 + link_cmd='$(LIBTOOL) --mode=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)'
49797 - link_cmd='$(LIBTOOL) --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)'
49798 + link_cmd='$(LIBTOOL) --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)'
49802 if test "x" = "xyes"; then
49803 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvmsg.$suffix"
49804 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlreader.$suffix"
49806 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvmsg.$suffix"
49807 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlreader.$suffix"
49810 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg"
49811 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader"
49813 cat >>Makefile.objects<<EOF
49814 -\$(phplibdir)/sysvmsg.$suffix: $ext_builddir/sysvmsg.$suffix
49815 - \$(LIBTOOL) --mode=install cp $ext_builddir/sysvmsg.$suffix \$(phplibdir)
49816 +\$(phplibdir)/xmlreader.$suffix: $ext_builddir/xmlreader.$suffix
49817 + \$(LIBTOOL) --mode=install cp $ext_builddir/xmlreader.$suffix \$(phplibdir)
49819 -$ext_builddir/sysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_DEPENDENCIES)
49820 +$ext_builddir/xmlreader.$suffix: \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_DEPENDENCIES)
49824 @@ -95039,22 +101088,22 @@ EOF
49827 cat >> confdefs.h <<EOF
49828 -#define COMPILE_DL_SYSVMSG 1
49829 +#define COMPILE_DL_XMLREADER 1
49835 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
49836 - PHP_SYSVMSG_SHARED=no
49837 + PHP_XMLREADER_SHARED=no
49838 case "$PHP_SAPI" in
49842 - case ext/sysvmsg in
49843 + case ext/xmlreader in
49844 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49845 - /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49846 - *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49847 + /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49848 + *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49852 @@ -95069,7 +101118,7 @@ EOF
49856 - for ac_src in sysvmsg.c; do
49857 + for ac_src in php_xmlreader.c; do
49861 @@ -95092,15 +101141,15 @@ EOF
49865 - EXT_STATIC="$EXT_STATIC sysvmsg"
49866 + EXT_STATIC="$EXT_STATIC xmlreader"
49871 - case ext/sysvmsg in
49872 + case ext/xmlreader in
49873 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
49874 - /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49875 - *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49876 + /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
49877 + *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
49881 @@ -95115,7 +101164,7 @@ EOF
49885 - for ac_src in sysvmsg.c; do
49886 + for ac_src in php_xmlreader.c; do
49890 @@ -95140,7 +101189,7 @@ EOF
49894 - EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg"
49895 + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader"
49899 @@ -95149,28 +101198,72 @@ EOF
49902 if test "$ext_builddir" = "."; then
49903 - PHP_PECL_EXTENSION=sysvmsg
49904 + PHP_PECL_EXTENSION=xmlreader
49906 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
49911 + am_i_shared=$PHP_XMLREADER_SHARED
49912 + is_it_shared=$PHP_DOM_SHARED
49913 + is_it_enabled=$PHP_DOM
49914 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
49915 + { echo "configure: error:
49916 +You've configured extension xmlreader to build statically, but it
49917 +depends on extension dom, which you've configured to build shared.
49918 +You either need to build xmlreader shared or build dom statically for the
49919 +build to be successful.
49922 + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
49923 + { echo "configure: error:
49924 +You've configured extension xmlreader, which depends on extension dom,
49925 +but you've either not enabled dom, or have disabled it.
49930 + PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD"
49934 + { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
49937 + { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
49944 +# Local macros for automake & autoconf
49946 -php_enable_sysvsem=no
49948 -echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
49949 -echo "configure:95166: checking whether to enable System V semaphore support" >&5
49950 -# Check whether --enable-sysvsem or --disable-sysvsem was given.
49951 -if test "${enable_sysvsem+set}" = set; then
49952 - enableval="$enable_sysvsem"
49953 - PHP_SYSVSEM=$enableval
49965 +php_with_xmlrpc=no
49967 +echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
49968 +echo "configure:101259: checking for XMLRPC-EPI support" >&5
49969 +# Check whether --with-xmlrpc or --without-xmlrpc was given.
49970 +if test "${with_xmlrpc+set}" = set; then
49971 + withval="$with_xmlrpc"
49972 + PHP_XMLRPC=$withval
49976 - test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL
49978 + test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL
49982 @@ -95178,12 +101271,12 @@ fi
49984 ext_output="yes, shared"
49986 -case $PHP_SYSVSEM in
49987 +case $PHP_XMLRPC in
49989 - PHP_SYSVSEM=`echo "$PHP_SYSVSEM"|$SED 's/^shared,//'`
49990 + PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'`
49998 @@ -95202,245 +101295,341 @@ echo "$ac_t""$ext_output" 1>&6
50002 -if test "$PHP_SYSVSEM" != "no"; then
50004 - ext_builddir=ext/sysvsem
50005 - ext_srcdir=$abs_srcdir/ext/sysvsem
50009 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
50010 - PHP_SYSVSEM_SHARED=no
50012 +if test -z "$PHP_LIBXML_DIR"; then
50014 - case ext/sysvsem in
50015 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50016 - /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50017 - *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50019 +php_with_libxml_dir=no
50021 +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
50022 +echo "configure:101304: checking libxml2 install dir" >&5
50023 +# Check whether --with-libxml-dir or --without-libxml-dir was given.
50024 +if test "${with_libxml_dir+set}" = set; then
50025 + withval="$with_libxml_dir"
50026 + PHP_LIBXML_DIR=$withval
50029 + PHP_LIBXML_DIR=no
50032 - b_c_pre=$php_c_pre
50033 - b_cxx_pre=$php_cxx_pre
50034 - b_c_meta=$php_c_meta
50035 - b_cxx_meta=$php_cxx_meta
50036 - b_c_post=$php_c_post
50037 - b_cxx_post=$php_cxx_post
50043 - for ac_src in sysvsem.c; do
50050 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
50051 +ext_output=$PHP_LIBXML_DIR
50052 +echo "$ac_t""$ext_output" 1>&6
50055 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50056 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50057 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50058 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
50061 - cat >>Makefile.objects<<EOF
50062 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
50069 - EXT_STATIC="$EXT_STATIC sysvsem"
50070 - if test "$ext_shared" != "nocli"; then
50071 - EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem"
50074 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
50075 - PHP_SYSVSEM_SHARED=yes
50077 - case ext/sysvsem in
50078 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50079 - /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50080 - *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50083 +php_with_libexpat_dir=no
50085 +echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6
50086 +echo "configure:101328: checking libexpat dir for XMLRPC-EPI" >&5
50087 +# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
50088 +if test "${with_libexpat_dir+set}" = set; then
50089 + withval="$with_libexpat_dir"
50090 + PHP_LIBEXPAT_DIR=$withval
50093 + PHP_LIBEXPAT_DIR=no
50096 - b_c_pre=$shared_c_pre
50097 - b_cxx_pre=$shared_cxx_pre
50098 - b_c_meta=$shared_c_meta
50099 - b_cxx_meta=$shared_cxx_meta
50100 - b_c_post=$shared_c_post
50101 - b_cxx_post=$shared_cxx_post
50107 - for ac_src in sysvsem.c; do
50108 +ext_output=$PHP_LIBEXPAT_DIR
50109 +echo "$ac_t""$ext_output" 1>&6
50115 +php_with_iconv_dir=no
50117 +echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6
50118 +echo "configure:101351: checking iconv dir for XMLRPC-EPI" >&5
50119 +# Check whether --with-iconv-dir or --without-iconv-dir was given.
50120 +if test "${with_iconv_dir+set}" = set; then
50121 + withval="$with_iconv_dir"
50122 + PHP_ICONV_DIR=$withval
50132 - shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo"
50135 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50136 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50137 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50138 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
50142 - cat >>Makefile.objects<<EOF
50143 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
50146 +ext_output=$PHP_ICONV_DIR
50147 +echo "$ac_t""$ext_output" 1>&6
50152 +if test "$PHP_XMLRPC" != "no"; then
50155 + am_i_shared=$PHP_XMLRPC_SHARED
50156 + is_it_shared=$PHP_LIBXML_SHARED
50157 + is_it_enabled=$PHP_LIBXML
50158 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
50159 + { echo "configure: error:
50160 +You've configured extension xmlrpc to build statically, but it
50161 +depends on extension libxml, which you've configured to build shared.
50162 +You either need to build xmlrpc shared or build libxml statically for the
50163 +build to be successful.
50166 + if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
50167 + { echo "configure: error:
50168 +You've configured extension xmlrpc, which depends on extension libxml,
50169 +but you've either not enabled libxml, or have disabled it.
50174 + PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD"
50176 + cat >> confdefs.h <<\EOF
50177 +#define HAVE_XMLRPC 1
50181 + if test "$PHP_LIBEXPAT_DIR" = "no"; then
50183 + if test "$PHP_LIBXML" = "no"; then
50184 + { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
50188 +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
50189 +echo "configure:101407: checking for xml2-config path" >&5
50190 +if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
50191 + echo $ac_n "(cached) $ac_c" 1>&6
50194 + for i in $PHP_LIBXML_DIR /usr/local /usr; do
50195 + if test -x "$i/bin/xml2-config"; then
50196 + ac_cv_php_xml2_config_path="$i/bin/xml2-config"
50201 - case $host_alias in
50204 - install_modules="install-modules"
50207 - case $host_alias in
50210 - 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'
50214 - link_cmd='$(LIBTOOL) --mode=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)'
50218 - link_cmd='$(LIBTOOL) --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)'
50220 +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
50222 + if test -x "$ac_cv_php_xml2_config_path"; then
50223 + XML2_CONFIG="$ac_cv_php_xml2_config_path"
50224 + libxml_full_version=`$XML2_CONFIG --version`
50227 + set $libxml_full_version
50229 + LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
50230 + if test "$LIBXML_VERSION" -ge "2006011"; then
50231 + LIBXML_LIBS=`$XML2_CONFIG --libs`
50232 + LIBXML_INCS=`$XML2_CONFIG --cflags`
50234 + for ac_i in $LIBXML_LIBS; do
50237 + if test "$ext_shared" = "yes"; then
50238 + XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread"
50242 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
50244 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
50245 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
50246 + eval "EXTRA_LDFLAGS$unique=set"
50247 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
50253 + ac_ii=`echo $ac_i|cut -c 3-`
50257 + c|c_r|pthread*) ;;
50259 + if test "$ext_shared" = "yes"; then
50260 + XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii"
50265 + c|c_r|pthread*) ;;
50267 + LIBS="$LIBS -l$ac_ii"
50271 - if test "x" = "xyes"; then
50272 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvsem.$suffix"
50281 + ac_ii=`echo $ac_i|cut -c 3-`
50283 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
50285 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
50288 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix"
50290 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
50292 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
50293 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
50296 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem"
50298 - cat >>Makefile.objects<<EOF
50299 -\$(phplibdir)/phpsysvsem.$suffix: $ext_builddir/phpsysvsem.$suffix
50300 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvsem.$suffix \$(phplibdir)
50302 -$ext_builddir/phpsysvsem.$suffix: \$(shared_objects_sysvsem) \$(PHPSYSVSEM_SHARED_DEPENDENCIES)
50305 + if test "$ext_shared" = "yes"; then
50306 + XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
50307 + test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
50312 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
50314 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
50315 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
50316 + eval "LIBPATH$unique=set"
50318 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
50319 + LDFLAGS="$LDFLAGS -L$ai_p"
50320 + PHP_RPATHS="$PHP_RPATHS $ai_p"
50329 - install_modules="install-modules"
50334 - case $host_alias in
50337 - 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'
50341 - link_cmd='$(LIBTOOL) --mode=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)'
50345 - link_cmd='$(LIBTOOL) --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)'
50352 - if test "x" = "xyes"; then
50353 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvsem.$suffix"
50355 + for ac_i in $LIBXML_INCS; do
50358 + ac_ii=`echo $ac_i|cut -c 3-`
50360 + if test "$ac_ii" != "/usr/include"; then
50362 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
50365 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvsem.$suffix"
50367 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
50369 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
50370 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
50373 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem"
50375 - cat >>Makefile.objects<<EOF
50376 -\$(phplibdir)/sysvsem.$suffix: $ext_builddir/sysvsem.$suffix
50377 - \$(LIBTOOL) --mode=install cp $ext_builddir/sysvsem.$suffix \$(phplibdir)
50380 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
50382 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
50383 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
50384 + eval "INCLUDEPATH$unique=set"
50387 + INCLUDES="-I$ai_p $INCLUDES"
50389 + INCLUDES="$INCLUDES -I$ai_p"
50394 -$ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES)
50405 - cat >> confdefs.h <<EOF
50406 -#define COMPILE_DL_SYSVSEM 1
50411 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
50412 +echo "configure:101565: checking whether libxml build works" >&5
50413 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
50414 + echo $ac_n "(cached) $ac_c" 1>&6
50420 + $XMLRPC_SHARED_LIBADD
50422 + if test "$cross_compiling" = yes; then
50427 + cat > conftest.$ac_ext <<EOF
50428 +#line 101581 "configure"
50429 +#include "confdefs.h"
50431 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
50432 - PHP_SYSVSEM_SHARED=no
50433 - case "$PHP_SAPI" in
50436 + char xmlInitParser();
50443 +if { (eval echo configure:101592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
50448 + php_cv_libxml_build_works=yes
50451 - case ext/sysvsem in
50452 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50453 - /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50454 - *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50457 + echo "configure: failed program was:" >&5
50458 + cat conftest.$ac_ext >&5
50463 + echo "$ac_t""no" 1>&6
50464 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
50468 - b_c_pre=$php_c_pre
50469 - b_cxx_pre=$php_cxx_pre
50470 - b_c_meta=$php_c_meta
50471 - b_cxx_meta=$php_cxx_meta
50472 - b_c_post=$php_c_post
50473 - b_cxx_post=$php_cxx_post
50481 - for ac_src in sysvsem.c; do
50488 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
50491 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50492 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50493 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50494 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
50498 - cat >>Makefile.objects<<EOF
50499 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
50501 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
50502 + if test "$php_cv_libxml_build_works" = "yes"; then
50503 + cat >> confdefs.h <<\EOF
50504 +#define HAVE_LIBXML 1
50509 - EXT_STATIC="$EXT_STATIC sysvsem"
50514 + if test "$PHP_XML" = "no"; then
50517 - case ext/sysvsem in
50519 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50520 - /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50521 - *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50522 + /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50523 + *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50527 @@ -95455,20 +101644,20 @@ EOF
50531 - for ac_src in sysvsem.c; do
50532 + for ac_src in compat.c; do
50539 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
50540 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
50543 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50544 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50545 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50546 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
50547 + *.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" ;;
50548 + *.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" ;;
50549 + *.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" ;;
50550 + *.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" ;;
50553 cat >>Makefile.objects<<EOF
50554 @@ -95478,510 +101667,678 @@ EOF
50560 - EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem"
50565 - BUILD_DIR="$BUILD_DIR $ext_builddir"
50566 + BUILD_DIR="$BUILD_DIR ext/xml"
50570 - if test "$ext_builddir" = "."; then
50571 - PHP_PECL_EXTENSION=sysvsem
50575 + { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
50578 + { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
50580 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
50584 - cat >> confdefs.h <<\EOF
50585 -#define HAVE_SYSVSEM 1
50588 + for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
50589 + if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
50590 + cat >> confdefs.h <<\EOF
50591 +#define HAVE_LIBEXPAT 1
50594 - echo $ac_n "checking for union semun""... $ac_c" 1>&6
50595 -echo "configure:95504: checking for union semun" >&5
50596 -if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
50597 - echo $ac_n "(cached) $ac_c" 1>&6
50599 - cat > conftest.$ac_ext <<EOF
50600 -#line 95509 "configure"
50601 -#include "confdefs.h"
50604 -#include <sys/types.h>
50605 -#include <sys/ipc.h>
50606 -#include <sys/sem.h>
50612 -if { (eval echo configure:95520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
50614 + if test "$ext_shared" = "yes"; then
50615 + XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD"
50616 + if test -n "$i/$PHP_LIBDIR"; then
50618 + if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then
50620 + if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
50621 + ai_p=$i/$PHP_LIBDIR
50624 + ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
50626 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
50627 + ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
50631 + if test "$ext_shared" = "yes"; then
50632 + XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
50633 + test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
50640 - echo "configure: failed program was:" >&5
50641 - cat conftest.$ac_ext >&5
50651 -echo "$ac_t""$php_cv_semun" 1>&6
50652 - if test "$php_cv_semun" = "yes"; then
50653 - cat >> confdefs.h <<\EOF
50654 -#define HAVE_SEMUN 1
50658 - cat >> confdefs.h <<\EOF
50659 -#define HAVE_SEMUN 0
50661 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
50663 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
50664 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
50665 + eval "LIBPATH$unique=set"
50667 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
50668 + LDFLAGS="$LDFLAGS -L$ai_p"
50669 + PHP_RPATHS="$PHP_RPATHS $ai_p"
50684 -php_enable_sysvshm=no
50685 + if test -n "$i/$PHP_LIBDIR"; then
50687 + if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then
50689 + if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
50690 + ai_p=$i/$PHP_LIBDIR
50693 + ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
50695 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
50696 + ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
50699 -echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
50700 -echo "configure:95556: checking whether to enable System V shared memory support" >&5
50701 -# Check whether --enable-sysvshm or --disable-sysvshm was given.
50702 -if test "${enable_sysvshm+set}" = set; then
50703 - enableval="$enable_sysvshm"
50704 - PHP_SYSVSHM=$enableval
50710 - test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL
50712 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
50714 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
50715 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
50716 + eval "LIBPATH$unique=set"
50718 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
50719 + LDFLAGS="$LDFLAGS -L$ai_p"
50720 + PHP_RPATHS="$PHP_RPATHS $ai_p"
50733 + c|c_r|pthread*) ;;
50735 + LIBS="-lexpat $LIBS"
50739 -ext_output="yes, shared"
50741 -case $PHP_SYSVSHM in
50743 - PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'`
50760 -echo "$ac_t""$ext_output" 1>&6
50765 + if test "$i/include" != "/usr/include"; then
50767 + if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then
50771 + ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`"
50773 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
50774 + ai_p="$ep_realdir/`basename \"$i/include\"`"
50779 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
50781 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
50782 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
50783 + eval "INCLUDEPATH$unique=set"
50786 + INCLUDES="-I$ai_p $INCLUDES"
50788 + INCLUDES="$INCLUDES -I$ai_p"
50793 -if test "$PHP_SYSVSHM" != "no"; then
50794 - cat >> confdefs.h <<\EOF
50795 -#define HAVE_SYSVSHM 1
50800 - ext_builddir=ext/sysvshm
50801 - ext_srcdir=$abs_srcdir/ext/sysvshm
50808 + if test "$testval" = "no"; then
50809 + { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" 1>&2; exit 1; }
50813 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
50814 - PHP_SYSVSHM_SHARED=no
50817 - case ext/sysvshm in
50818 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50819 - /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50820 - *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50822 + if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then
50824 + if test "$PHP_ICONV_DIR" != "no"; then
50825 + PHP_ICONV=$PHP_ICONV_DIR
50828 + if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
50836 - b_c_pre=$php_c_pre
50837 - b_cxx_pre=$php_cxx_pre
50838 - b_c_meta=$php_c_meta
50839 - b_cxx_meta=$php_cxx_meta
50840 - b_c_post=$php_c_post
50841 - b_cxx_post=$php_cxx_post
50843 + # Create the directories for a VPATH build:
50844 + $php_shtool mkdir -p ext/iconv
50846 + echo > ext/iconv/php_have_bsd_iconv.h
50847 + echo > ext/iconv/php_have_ibm_iconv.h
50848 + echo > ext/iconv/php_have_glibc_iconv.h
50849 + echo > ext/iconv/php_have_libiconv.h
50850 + echo > ext/iconv/php_have_iconv.h
50851 + echo > ext/iconv/php_php_iconv_impl.h
50852 + echo > ext/iconv/php_iconv_aliased_libiconv.h
50853 + echo > ext/iconv/php_php_iconv_h_path.h
50854 + echo > ext/iconv/php_iconv_supports_errno.h
50857 - for ac_src in sysvshm.c; do
50864 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
50865 + if test "$PHP_ICONV" = "yes"; then
50866 + echo $ac_n "checking for iconv""... $ac_c" 1>&6
50867 +echo "configure:101861: checking for iconv" >&5
50868 +if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
50869 + echo $ac_n "(cached) $ac_c" 1>&6
50871 + cat > conftest.$ac_ext <<EOF
50872 +#line 101866 "configure"
50873 +#include "confdefs.h"
50874 +/* System header to define __stub macros and hopefully few prototypes,
50875 + which can conflict with char iconv(); below. */
50876 +#include <assert.h>
50877 +/* Override any gcc2 internal prototype to avoid an error. */
50878 +/* We use char because int might match the return type of a gcc2
50879 + builtin and then its argument prototype would still apply. */
50883 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50884 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50885 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50886 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
50890 +/* The GNU C library defines this for functions which it implements
50891 + to always fail with ENOSYS. Some functions are actually named
50892 + something starting with __ and the normal name is an alias. */
50893 +#if defined (__stub_iconv) || defined (__stub___iconv)
50899 - cat >>Makefile.objects<<EOF
50900 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
50906 +if { (eval echo configure:101889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
50908 + eval "ac_cv_func_iconv=yes"
50910 + echo "configure: failed program was:" >&5
50911 + cat conftest.$ac_ext >&5
50913 + eval "ac_cv_func_iconv=no"
50918 - EXT_STATIC="$EXT_STATIC sysvshm"
50919 - if test "$ext_shared" != "nocli"; then
50920 - EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm"
50923 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
50924 - PHP_SYSVSHM_SHARED=yes
50926 - case ext/sysvshm in
50927 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
50928 - /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
50929 - *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
50932 +if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
50933 + echo "$ac_t""yes" 1>&6
50938 + echo "$ac_t""no" 1>&6
50940 - b_c_pre=$shared_c_pre
50941 - b_cxx_pre=$shared_cxx_pre
50942 - b_c_meta=$shared_c_meta
50943 - b_cxx_meta=$shared_cxx_meta
50944 - b_c_post=$shared_c_post
50945 - b_cxx_post=$shared_cxx_post
50948 + echo $ac_n "checking for libiconv""... $ac_c" 1>&6
50949 +echo "configure:101910: checking for libiconv" >&5
50950 +if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
50951 + echo $ac_n "(cached) $ac_c" 1>&6
50953 + cat > conftest.$ac_ext <<EOF
50954 +#line 101915 "configure"
50955 +#include "confdefs.h"
50956 +/* System header to define __stub macros and hopefully few prototypes,
50957 + which can conflict with char libiconv(); below. */
50958 +#include <assert.h>
50959 +/* Override any gcc2 internal prototype to avoid an error. */
50960 +/* We use char because int might match the return type of a gcc2
50961 + builtin and then its argument prototype would still apply. */
50965 - for ac_src in sysvshm.c; do
50972 - shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo"
50976 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50977 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50978 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
50979 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
50981 +/* The GNU C library defines this for functions which it implements
50982 + to always fail with ENOSYS. Some functions are actually named
50983 + something starting with __ and the normal name is an alias. */
50984 +#if defined (__stub_libiconv) || defined (__stub___libiconv)
50990 - cat >>Makefile.objects<<EOF
50991 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
50997 - case $host_alias in
51000 - install_modules="install-modules"
51002 - case $host_alias in
51005 - 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'
51009 - link_cmd='$(LIBTOOL) --mode=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)'
51013 - link_cmd='$(LIBTOOL) --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)'
51016 +if { (eval echo configure:101938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
51018 + eval "ac_cv_func_libiconv=yes"
51020 + echo "configure: failed program was:" >&5
51021 + cat conftest.$ac_ext >&5
51023 + eval "ac_cv_func_libiconv=no"
51028 - if test "x" = "xyes"; then
51029 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvshm.$suffix"
51031 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix"
51033 +if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then
51034 + echo "$ac_t""yes" 1>&6
51036 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm"
51038 - cat >>Makefile.objects<<EOF
51039 -\$(phplibdir)/phpsysvshm.$suffix: $ext_builddir/phpsysvshm.$suffix
51040 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpsysvshm.$suffix \$(phplibdir)
51042 -$ext_builddir/phpsysvshm.$suffix: \$(shared_objects_sysvshm) \$(PHPSYSVSHM_SHARED_DEPENDENCIES)
51045 + echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
51047 + cat >> confdefs.h <<\EOF
51048 +#define HAVE_LIBICONV 1
51054 - install_modules="install-modules"
51058 + echo "$ac_t""no" 1>&6
51061 - case $host_alias in
51064 - 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'
51068 - link_cmd='$(LIBTOOL) --mode=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)'
51072 - link_cmd='$(LIBTOOL) --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)'
51078 - if test "x" = "xyes"; then
51079 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvshm.$suffix"
51081 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvshm.$suffix"
51084 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm"
51086 - cat >>Makefile.objects<<EOF
51087 -\$(phplibdir)/sysvshm.$suffix: $ext_builddir/sysvshm.$suffix
51088 - \$(LIBTOOL) --mode=install cp $ext_builddir/sysvshm.$suffix \$(phplibdir)
51090 -$ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES)
51092 + if test "$found_iconv" = "no"; then
51094 + for i in $PHP_ICONV /usr/local /usr; do
51095 + if test -r $i/include/giconv.h; then
51096 + cat >> confdefs.h <<\EOF
51097 +#define HAVE_GICONV_H 1
51102 - cat >> confdefs.h <<EOF
51103 -#define COMPILE_DL_SYSVSHM 1
51106 + iconv_lib_name=giconv
51108 + elif test -r $i/include/iconv.h; then
51110 + iconv_lib_name=iconv
51115 + if test -z "$ICONV_DIR"; then
51116 + { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
51120 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
51121 - PHP_SYSVSHM_SHARED=no
51122 - case "$PHP_SAPI" in
51126 - case ext/sysvshm in
51127 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
51128 - /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
51129 - *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
51131 + if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
51132 + test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
51135 + save_old_LDFLAGS=$LDFLAGS
51137 + -L$ICONV_DIR/$PHP_LIBDIR
51140 + save_ext_shared=$ext_shared
51143 + for ac_i in $ac_stuff; do
51146 + if test "$ext_shared" = "yes"; then
51147 + LDFLAGS="$LDFLAGS -pthread"
51151 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
51153 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
51154 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
51155 + eval "EXTRA_LDFLAGS$unique=set"
51156 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
51159 - b_c_pre=$php_c_pre
51160 - b_cxx_pre=$php_cxx_pre
51161 - b_c_meta=$php_c_meta
51162 - b_cxx_meta=$php_cxx_meta
51163 - b_c_post=$php_c_post
51164 - b_cxx_post=$php_cxx_post
51169 - for ac_src in sysvshm.c; do
51173 + ac_ii=`echo $ac_i|cut -c 3-`
51181 + c|c_r|pthread*) ;;
51183 + if test "$ext_shared" = "yes"; then
51184 + LDFLAGS="$LDFLAGS -l$ac_ii"
51187 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
51190 + c|c_r|pthread*) ;;
51192 + LIBS="$LIBS -l$ac_ii"
51197 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51198 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51199 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51200 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
51203 - cat >>Makefile.objects<<EOF
51204 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
51213 - EXT_STATIC="$EXT_STATIC sysvshm"
51218 + ac_ii=`echo $ac_i|cut -c 3-`
51220 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
51222 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
51226 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
51228 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
51229 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
51233 + if test "$ext_shared" = "yes"; then
51234 + LDFLAGS="-L$ai_p $LDFLAGS"
51235 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
51239 - case ext/sysvshm in
51240 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
51241 - /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
51242 - *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
51245 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
51247 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
51248 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
51249 + eval "LIBPATH$unique=set"
51251 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
51252 + LDFLAGS="$LDFLAGS -L$ai_p"
51253 + PHP_RPATHS="$PHP_RPATHS $ai_p"
51257 - b_c_pre=$php_c_pre
51258 - b_cxx_pre=$php_cxx_pre
51259 - b_c_meta=$php_c_meta
51260 - b_cxx_meta=$php_cxx_meta
51261 - b_c_post=$php_c_post
51262 - b_cxx_post=$php_cxx_post
51270 - for ac_src in sysvshm.c; do
51277 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
51283 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51284 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51285 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
51286 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
51288 + echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
51289 +echo "configure:102094: checking for libiconv in -l$iconv_lib_name" >&5
51290 +ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
51291 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
51292 + echo $ac_n "(cached) $ac_c" 1>&6
51294 + ac_save_LIBS="$LIBS"
51295 +LIBS="-l$iconv_lib_name $LIBS"
51296 +cat > conftest.$ac_ext <<EOF
51297 +#line 102102 "configure"
51298 +#include "confdefs.h"
51299 +/* Override any gcc2 internal prototype to avoid an error. */
51300 +/* We use char because int might match the return type of a gcc2
51301 + builtin and then its argument prototype would still apply. */
51304 - cat >>Makefile.objects<<EOF
51305 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
51313 +if { (eval echo configure:102113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
51315 + eval "ac_cv_lib_$ac_lib_var=yes"
51317 + echo "configure: failed program was:" >&5
51318 + cat conftest.$ac_ext >&5
51320 + eval "ac_cv_lib_$ac_lib_var=no"
51323 +LIBS="$ac_save_LIBS"
51327 - EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm"
51331 - BUILD_DIR="$BUILD_DIR $ext_builddir"
51333 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
51334 + echo "$ac_t""yes" 1>&6
51338 - if test "$ext_builddir" = "."; then
51339 - PHP_PECL_EXTENSION=sysvshm
51340 + LDFLAGS=$save_old_LDFLAGS
51341 + ext_shared=$save_ext_shared
51343 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
51346 + echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
51349 + cat >> confdefs.h <<\EOF
51350 +#define HAVE_LIBICONV 1
51355 + echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h
51357 + cat >> confdefs.h <<\EOF
51358 +#define ICONV_ALIASED_LIBICONV 1
51364 + echo "$ac_t""no" 1>&6
51367 + LDFLAGS=$save_old_LDFLAGS
51368 + ext_shared=$save_ext_shared
51369 + unset ac_cv_lib_$iconv_lib_name_libiconv
51372 + save_old_LDFLAGS=$LDFLAGS
51374 + -L$ICONV_DIR/$PHP_LIBDIR
51377 + save_ext_shared=$ext_shared
51380 + for ac_i in $ac_stuff; do
51383 + if test "$ext_shared" = "yes"; then
51384 + LDFLAGS="$LDFLAGS -pthread"
51388 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
51390 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
51391 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
51392 + eval "EXTRA_LDFLAGS$unique=set"
51393 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
51396 -echo $ac_n "checking for TIDY support""... $ac_c" 1>&6
51397 -echo "configure:95900: checking for TIDY support" >&5
51398 -# Check whether --with-tidy or --without-tidy was given.
51399 -if test "${with_tidy+set}" = set; then
51400 - withval="$with_tidy"
51401 - PHP_TIDY=$withval
51406 + ac_ii=`echo $ac_i|cut -c 3-`
51410 - test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL
51412 + c|c_r|pthread*) ;;
51414 + if test "$ext_shared" = "yes"; then
51415 + LDFLAGS="$LDFLAGS -l$ac_ii"
51420 + c|c_r|pthread*) ;;
51422 + LIBS="$LIBS -l$ac_ii"
51433 -ext_output="yes, shared"
51437 - PHP_TIDY=`echo "$PHP_TIDY"|$SED 's/^shared,//'`
51453 + ac_ii=`echo $ac_i|cut -c 3-`
51455 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
51457 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
51461 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
51463 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
51464 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
51468 + if test "$ext_shared" = "yes"; then
51469 + LDFLAGS="-L$ai_p $LDFLAGS"
51470 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
51475 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
51477 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
51478 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
51479 + eval "LIBPATH$unique=set"
51481 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
51482 + LDFLAGS="$LDFLAGS -L$ai_p"
51483 + PHP_RPATHS="$PHP_RPATHS $ai_p"
51492 -echo "$ac_t""$ext_output" 1>&6
51497 + echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
51498 +echo "configure:102254: checking for iconv in -l$iconv_lib_name" >&5
51499 +ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
51500 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
51501 + echo $ac_n "(cached) $ac_c" 1>&6
51503 + ac_save_LIBS="$LIBS"
51504 +LIBS="-l$iconv_lib_name $LIBS"
51505 +cat > conftest.$ac_ext <<EOF
51506 +#line 102262 "configure"
51507 +#include "confdefs.h"
51508 +/* Override any gcc2 internal prototype to avoid an error. */
51509 +/* We use char because int might match the return type of a gcc2
51510 + builtin and then its argument prototype would still apply. */
51517 +if { (eval echo configure:102273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
51519 + eval "ac_cv_lib_$ac_lib_var=yes"
51521 + echo "configure: failed program was:" >&5
51522 + cat conftest.$ac_ext >&5
51524 + eval "ac_cv_lib_$ac_lib_var=no"
51527 +LIBS="$ac_save_LIBS"
51530 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
51531 + echo "$ac_t""yes" 1>&6
51533 + LDFLAGS=$save_old_LDFLAGS
51534 + ext_shared=$save_ext_shared
51540 + echo "$ac_t""no" 1>&6
51542 -if test "$PHP_TIDY" != "no"; then
51543 + LDFLAGS=$save_old_LDFLAGS
51544 + ext_shared=$save_ext_shared
51545 + unset ac_cv_lib_$iconv_lib_name_iconv
51550 - if test "$PHP_TIDY" != "yes"; then
51551 - TIDY_SEARCH_DIRS=$PHP_TIDY
51553 - TIDY_SEARCH_DIRS="/usr/local /usr"
51559 - for i in $TIDY_SEARCH_DIRS; do
51560 - if test -f $i/include/tidy/tidy.h; then
51562 - TIDY_INCDIR=$i/include/tidy
51563 - elif test -f $i/include/tidy.h; then
51565 - TIDY_INCDIR=$i/include
51569 - if test -z "$TIDY_DIR"; then
51570 - { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; }
51573 - TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
51574 + if test "$found_iconv" = "yes"; then
51576 + echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h
51579 + cat >> confdefs.h <<\EOF
51580 +#define HAVE_ICONV 1
51583 + if test -n "$ICONV_DIR"; then
51586 if test "$ext_shared" = "yes"; then
51587 - TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD"
51588 - if test -n "$TIDY_LIBDIR"; then
51589 + XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD"
51590 + if test -n "$ICONV_DIR/$PHP_LIBDIR"; then
51592 - if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then
51593 + if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
51595 - if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then
51596 - ai_p=$TIDY_LIBDIR
51597 + if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
51598 + ai_p=$ICONV_DIR/$PHP_LIBDIR
51601 - ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
51602 + ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
51604 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
51605 - ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`"
51606 + ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
51610 if test "$ext_shared" = "yes"; then
51611 - TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD"
51612 - test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD"
51613 + XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
51614 + test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
51618 @@ -96007,18 +102364,18 @@ if test "$PHP_TIDY" != "no"; then
51622 - if test -n "$TIDY_LIBDIR"; then
51623 + if test -n "$ICONV_DIR/$PHP_LIBDIR"; then
51625 - if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then
51626 + if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
51628 - if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then
51629 - ai_p=$TIDY_LIBDIR
51630 + if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
51631 + ai_p=$ICONV_DIR/$PHP_LIBDIR
51634 - ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
51635 + ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
51637 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
51638 - ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`"
51639 + ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
51643 @@ -96041,220 +102398,639 @@ if test "$PHP_TIDY" != "no"; then
51651 - c|c_r|pthread*) ;;
51653 - LIBS="-ltidy $LIBS"
51659 + case $iconv_lib_name in
51660 + c|c_r|pthread*) ;;
51662 + LIBS="-l$iconv_lib_name $LIBS"
51673 + if test "$ICONV_DIR/include" != "/usr/include"; then
51675 + if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then
51676 + ai_p=$ICONV_DIR/include
51679 + ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
51681 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
51682 + ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`"
51687 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
51689 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
51690 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
51691 + eval "INCLUDEPATH$unique=set"
51694 + INCLUDES="-I$ai_p $INCLUDES"
51696 + INCLUDES="$INCLUDES -I$ai_p"
51706 + { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; }
51713 +if test "$PHP_XMLRPC" = "yes"; then
51714 + # Extract the first word of "ranlib", so it can be a program name with args.
51715 +set dummy ranlib; ac_word=$2
51716 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
51717 +echo "configure:102463: checking for $ac_word" >&5
51718 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
51719 + echo $ac_n "(cached) $ac_c" 1>&6
51721 + if test -n "$RANLIB"; then
51722 + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
51724 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
51726 + for ac_dir in $ac_dummy; do
51727 + test -z "$ac_dir" && ac_dir=.
51728 + if test -f $ac_dir/$ac_word; then
51729 + ac_cv_prog_RANLIB="ranlib"
51733 + IFS="$ac_save_ifs"
51734 + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
51737 +RANLIB="$ac_cv_prog_RANLIB"
51738 +if test -n "$RANLIB"; then
51739 + echo "$ac_t""$RANLIB" 1>&6
51741 + echo "$ac_t""no" 1>&6
51744 +echo $ac_n "checking for inline""... $ac_c" 1>&6
51745 +echo "configure:102491: checking for inline" >&5
51746 +if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
51747 + echo $ac_n "(cached) $ac_c" 1>&6
51749 + ac_cv_c_inline=no
51750 +for ac_kw in inline __inline__ __inline; do
51751 + cat > conftest.$ac_ext <<EOF
51752 +#line 102498 "configure"
51753 +#include "confdefs.h"
51759 +if { (eval echo configure:102505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
51761 + ac_cv_c_inline=$ac_kw; break
51763 + echo "configure: failed program was:" >&5
51764 + cat conftest.$ac_ext >&5
51771 +echo "$ac_t""$ac_cv_c_inline" 1>&6
51772 +case "$ac_cv_c_inline" in
51774 + no) cat >> confdefs.h <<\EOF
51778 + *) cat >> confdefs.h <<EOF
51779 +#define inline $ac_cv_c_inline
51790 +cat >> confdefs.h <<\EOF
51791 +#define UNDEF_THREADS_HACK
51796 +echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
51797 +echo "configure:102543: checking for ANSI C header files" >&5
51798 +if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
51799 + echo $ac_n "(cached) $ac_c" 1>&6
51801 + cat > conftest.$ac_ext <<EOF
51802 +#line 102548 "configure"
51803 +#include "confdefs.h"
51804 +#include <stdlib.h>
51805 +#include <stdarg.h>
51806 +#include <string.h>
51807 +#include <float.h>
51809 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
51810 +{ (eval echo configure:102556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
51811 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
51812 +if test -z "$ac_err"; then
51814 + ac_cv_header_stdc=yes
51816 + echo "$ac_err" >&5
51817 + echo "configure: failed program was:" >&5
51818 + cat conftest.$ac_ext >&5
51820 + ac_cv_header_stdc=no
51824 +if test $ac_cv_header_stdc = yes; then
51825 + # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
51826 +cat > conftest.$ac_ext <<EOF
51827 +#line 102573 "configure"
51828 +#include "confdefs.h"
51829 +#include <string.h>
51831 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
51832 + egrep "memchr" >/dev/null 2>&1; then
51836 + ac_cv_header_stdc=no
51842 +if test $ac_cv_header_stdc = yes; then
51843 + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
51844 +cat > conftest.$ac_ext <<EOF
51845 +#line 102591 "configure"
51846 +#include "confdefs.h"
51847 +#include <stdlib.h>
51849 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
51850 + egrep "free" >/dev/null 2>&1; then
51854 + ac_cv_header_stdc=no
51860 +if test $ac_cv_header_stdc = yes; then
51861 + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
51862 +if test "$cross_compiling" = yes; then
51865 + cat > conftest.$ac_ext <<EOF
51866 +#line 102612 "configure"
51867 +#include "confdefs.h"
51868 +#include <ctype.h>
51869 +#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
51870 +#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
51871 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
51872 +int main () { int i; for (i = 0; i < 256; i++)
51873 +if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
51877 +if { (eval echo configure:102623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
51881 + echo "configure: failed program was:" >&5
51882 + cat conftest.$ac_ext >&5
51884 + ac_cv_header_stdc=no
51892 +echo "$ac_t""$ac_cv_header_stdc" 1>&6
51893 +if test $ac_cv_header_stdc = yes; then
51894 + cat >> confdefs.h <<\EOF
51895 +#define STDC_HEADERS 1
51900 +for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h
51902 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
51903 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
51904 +echo "configure:102650: checking for $ac_hdr" >&5
51905 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
51906 + echo $ac_n "(cached) $ac_c" 1>&6
51908 + cat > conftest.$ac_ext <<EOF
51909 +#line 102655 "configure"
51910 +#include "confdefs.h"
51911 +#include <$ac_hdr>
51913 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
51914 +{ (eval echo configure:102660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
51915 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
51916 +if test -z "$ac_err"; then
51918 + eval "ac_cv_header_$ac_safe=yes"
51920 + echo "$ac_err" >&5
51921 + echo "configure: failed program was:" >&5
51922 + cat conftest.$ac_ext >&5
51924 + eval "ac_cv_header_$ac_safe=no"
51928 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
51929 + echo "$ac_t""yes" 1>&6
51930 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
51931 + cat >> confdefs.h <<EOF
51932 +#define $ac_tr_hdr 1
51936 + echo "$ac_t""no" 1>&6
51945 +echo $ac_n "checking size of char""... $ac_c" 1>&6
51946 +echo "configure:102692: checking size of char" >&5
51947 +if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
51948 + echo $ac_n "(cached) $ac_c" 1>&6
51950 + if test "$cross_compiling" = yes; then
51951 + ac_cv_sizeof_char=1
51953 + cat > conftest.$ac_ext <<EOF
51954 +#line 102700 "configure"
51955 +#include "confdefs.h"
51956 +#include <stdio.h>
51957 +#include <sys/types.h>
51960 + FILE *f=fopen("conftestval", "w");
51962 + fprintf(f, "%d\n", sizeof(char));
51966 +if { (eval echo configure:102712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
51968 + ac_cv_sizeof_char=`cat conftestval`
51970 + echo "configure: failed program was:" >&5
51971 + cat conftest.$ac_ext >&5
51973 + ac_cv_sizeof_char=0
51979 +echo "$ac_t""$ac_cv_sizeof_char" 1>&6
51980 +cat >> confdefs.h <<EOF
51981 +#define SIZEOF_CHAR $ac_cv_sizeof_char
51986 +echo $ac_n "checking size of int""... $ac_c" 1>&6
51987 +echo "configure:102733: checking size of int" >&5
51988 +if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
51989 + echo $ac_n "(cached) $ac_c" 1>&6
51991 + if test "$cross_compiling" = yes; then
51992 + ac_cv_sizeof_int=4
51994 + cat > conftest.$ac_ext <<EOF
51995 +#line 102741 "configure"
51996 +#include "confdefs.h"
51997 +#include <stdio.h>
51998 +#include <sys/types.h>
52001 + FILE *f=fopen("conftestval", "w");
52003 + fprintf(f, "%d\n", sizeof(int));
52007 +if { (eval echo configure:102753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
52009 + ac_cv_sizeof_int=`cat conftestval`
52011 + echo "configure: failed program was:" >&5
52012 + cat conftest.$ac_ext >&5
52014 + ac_cv_sizeof_int=0
52020 +echo "$ac_t""$ac_cv_sizeof_int" 1>&6
52021 +cat >> confdefs.h <<EOF
52022 +#define SIZEOF_INT $ac_cv_sizeof_int
52026 +echo $ac_n "checking size of long""... $ac_c" 1>&6
52027 +echo "configure:102773: checking size of long" >&5
52028 +if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
52029 + echo $ac_n "(cached) $ac_c" 1>&6
52031 + if test "$cross_compiling" = yes; then
52032 + ac_cv_sizeof_long=4
52034 + cat > conftest.$ac_ext <<EOF
52035 +#line 102781 "configure"
52036 +#include "confdefs.h"
52037 +#include <stdio.h>
52038 +#include <sys/types.h>
52041 + FILE *f=fopen("conftestval", "w");
52043 + fprintf(f, "%d\n", sizeof(long));
52047 +if { (eval echo configure:102793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
52049 + ac_cv_sizeof_long=`cat conftestval`
52051 + echo "configure: failed program was:" >&5
52052 + cat conftest.$ac_ext >&5
52054 + ac_cv_sizeof_long=0
52060 +echo "$ac_t""$ac_cv_sizeof_long" 1>&6
52061 +cat >> confdefs.h <<EOF
52062 +#define SIZEOF_LONG $ac_cv_sizeof_long
52066 +echo $ac_n "checking size of long long""... $ac_c" 1>&6
52067 +echo "configure:102813: checking size of long long" >&5
52068 +if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
52069 + echo $ac_n "(cached) $ac_c" 1>&6
52071 + if test "$cross_compiling" = yes; then
52072 + ac_cv_sizeof_long_long=8
52074 + cat > conftest.$ac_ext <<EOF
52075 +#line 102821 "configure"
52076 +#include "confdefs.h"
52077 +#include <stdio.h>
52078 +#include <sys/types.h>
52081 + FILE *f=fopen("conftestval", "w");
52083 + fprintf(f, "%d\n", sizeof(long long));
52087 +if { (eval echo configure:102833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
52089 + ac_cv_sizeof_long_long=`cat conftestval`
52091 + echo "configure: failed program was:" >&5
52092 + cat conftest.$ac_ext >&5
52094 + ac_cv_sizeof_long_long=0
52100 +echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
52101 +cat >> confdefs.h <<EOF
52102 +#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
52107 +echo $ac_n "checking for size_t""... $ac_c" 1>&6
52108 +echo "configure:102853: checking for size_t" >&5
52109 +if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
52110 + echo $ac_n "(cached) $ac_c" 1>&6
52112 + cat > conftest.$ac_ext <<EOF
52113 +#line 102858 "configure"
52114 +#include "confdefs.h"
52115 +#include <sys/types.h>
52117 +#include <stdlib.h>
52118 +#include <stddef.h>
52121 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
52122 + egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
52124 + ac_cv_type_size_t=yes
52127 + ac_cv_type_size_t=no
52132 +echo "$ac_t""$ac_cv_type_size_t" 1>&6
52133 +if test $ac_cv_type_size_t = no; then
52134 + cat >> confdefs.h <<\EOF
52135 +#define size_t unsigned
52139 - if test "$TIDY_INCDIR" != "/usr/include"; then
52141 - if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then
52142 - ai_p=$TIDY_INCDIR
52145 - ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
52147 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
52148 - ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`"
52154 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
52156 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
52157 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
52158 - eval "INCLUDEPATH$unique=set"
52161 - INCLUDES="-I$ai_p $INCLUDES"
52163 - INCLUDES="$INCLUDES -I$ai_p"
52167 +echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
52168 +echo "configure:102886: checking whether time.h and sys/time.h may both be included" >&5
52169 +if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
52170 + echo $ac_n "(cached) $ac_c" 1>&6
52172 + cat > conftest.$ac_ext <<EOF
52173 +#line 102891 "configure"
52174 +#include "confdefs.h"
52175 +#include <sys/types.h>
52176 +#include <sys/time.h>
52182 +if { (eval echo configure:102900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
52184 + ac_cv_header_time=yes
52186 + echo "configure: failed program was:" >&5
52187 + cat conftest.$ac_ext >&5
52189 + ac_cv_header_time=no
52195 +echo "$ac_t""$ac_cv_header_time" 1>&6
52196 +if test $ac_cv_header_time = yes; then
52197 + cat >> confdefs.h <<\EOF
52198 +#define TIME_WITH_SYS_TIME 1
52204 - save_old_LDFLAGS=$LDFLAGS
52207 - save_ext_shared=$ext_shared
52210 - for ac_i in $ac_stuff; do
52213 - if test "$ext_shared" = "yes"; then
52214 - LDFLAGS="$LDFLAGS -pthread"
52218 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
52220 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
52221 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
52222 - eval "EXTRA_LDFLAGS$unique=set"
52223 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
52225 +echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
52226 +echo "configure:102921: checking for uid_t in sys/types.h" >&5
52227 +if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
52228 + echo $ac_n "(cached) $ac_c" 1>&6
52230 + cat > conftest.$ac_ext <<EOF
52231 +#line 102926 "configure"
52232 +#include "confdefs.h"
52233 +#include <sys/types.h>
52235 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
52236 + egrep "uid_t" >/dev/null 2>&1; then
52238 + ac_cv_type_uid_t=yes
52241 + ac_cv_type_uid_t=no
52248 - ac_ii=`echo $ac_i|cut -c 3-`
52252 - c|c_r|pthread*) ;;
52254 - if test "$ext_shared" = "yes"; then
52255 - LDFLAGS="$LDFLAGS -l$ac_ii"
52260 - c|c_r|pthread*) ;;
52262 - LIBS="$LIBS -l$ac_ii"
52267 +echo "$ac_t""$ac_cv_type_uid_t" 1>&6
52268 +if test $ac_cv_type_uid_t = no; then
52269 + cat >> confdefs.h <<\EOF
52276 + cat >> confdefs.h <<\EOF
52284 - ac_ii=`echo $ac_i|cut -c 3-`
52286 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
52288 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
52292 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
52294 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
52295 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
52299 - if test "$ext_shared" = "yes"; then
52300 - LDFLAGS="-L$ai_p $LDFLAGS"
52301 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
52306 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
52308 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
52309 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
52310 - eval "LIBPATH$unique=set"
52312 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
52313 - LDFLAGS="$LDFLAGS -L$ai_p"
52314 - PHP_RPATHS="$PHP_RPATHS $ai_p"
52327 - echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6
52328 -echo "configure:96189: checking for tidyOptGetDoc in -ltidy" >&5
52329 -ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'`
52330 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
52331 +# Standard XMLRPC list
52333 + strtoul strtoull snprintf \
52334 + strstr strpbrk strerror\
52337 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
52338 +echo "configure:102966: checking for $ac_func" >&5
52339 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
52340 echo $ac_n "(cached) $ac_c" 1>&6
52342 - ac_save_LIBS="$LIBS"
52343 -LIBS="-ltidy $LIBS"
52344 -cat > conftest.$ac_ext <<EOF
52345 -#line 96197 "configure"
52346 + cat > conftest.$ac_ext <<EOF
52347 +#line 102971 "configure"
52348 #include "confdefs.h"
52349 +/* System header to define __stub macros and hopefully few prototypes,
52350 + which can conflict with char $ac_func(); below. */
52351 +#include <assert.h>
52352 /* Override any gcc2 internal prototype to avoid an error. */
52353 /* We use char because int might match the return type of a gcc2
52354 builtin and then its argument prototype would still apply. */
52355 -char tidyOptGetDoc();
52361 +/* The GNU C library defines this for functions which it implements
52362 + to always fail with ENOSYS. Some functions are actually named
52363 + something starting with __ and the normal name is an alias. */
52364 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
52372 -if { (eval echo configure:96208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
52373 +if { (eval echo configure:102994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
52375 - eval "ac_cv_lib_$ac_lib_var=yes"
52376 + eval "ac_cv_func_$ac_func=yes"
52378 echo "configure: failed program was:" >&5
52379 cat conftest.$ac_ext >&5
52381 - eval "ac_cv_lib_$ac_lib_var=no"
52382 + eval "ac_cv_func_$ac_func=no"
52385 -LIBS="$ac_save_LIBS"
52388 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
52390 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
52391 echo "$ac_t""yes" 1>&6
52393 - LDFLAGS=$save_old_LDFLAGS
52394 - ext_shared=$save_ext_shared
52396 - cat >> confdefs.h <<\EOF
52397 -#define HAVE_TIDYOPTGETDOC 1
52398 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
52399 + cat >> confdefs.h <<EOF
52400 +#define $ac_tr_func 1
52407 echo "$ac_t""no" 1>&6
52409 - LDFLAGS=$save_old_LDFLAGS
52410 - ext_shared=$save_ext_shared
52411 - unset ac_cv_lib_tidy_tidyOptGetDoc
52421 - ext_builddir=ext/tidy
52422 - ext_srcdir=$abs_srcdir/ext/tidy
52423 + ext_builddir=ext/xmlrpc
52424 + ext_srcdir=$abs_srcdir/ext/xmlrpc
52427 + ac_extra=`echo "-I@ext_srcdir@/libxmlrpc -DVERSION="0.50""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
52429 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
52430 - PHP_TIDY_SHARED=no
52431 + PHP_XMLRPC_SHARED=no
52435 + case ext/xmlrpc in
52436 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
52437 - /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52438 - *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52439 + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52440 + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52444 @@ -96269,7 +103045,12 @@ fi
52448 - for ac_src in tidy.c; do
52449 + for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
52450 + libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
52451 + libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
52452 + libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
52453 + libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
52454 + libxmlrpc/xml_to_soap.c; do
52458 @@ -96292,18 +103073,18 @@ EOF
52462 - EXT_STATIC="$EXT_STATIC tidy"
52463 + EXT_STATIC="$EXT_STATIC xmlrpc"
52464 if test "$ext_shared" != "nocli"; then
52465 - EXT_CLI_STATIC="$EXT_CLI_STATIC tidy"
52466 + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
52469 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
52470 - PHP_TIDY_SHARED=yes
52471 + PHP_XMLRPC_SHARED=yes
52474 + case ext/xmlrpc in
52475 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
52476 - /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52477 - *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52478 + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52479 + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52483 @@ -96318,14 +103099,19 @@ EOF
52487 - for ac_src in tidy.c; do
52488 + for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
52489 + libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
52490 + libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
52491 + libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
52492 + libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
52493 + libxmlrpc/xml_to_soap.c; do
52500 - shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo"
52501 + shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo"
52504 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
52505 @@ -96348,31 +103134,31 @@ EOF
52506 case $host_alias in
52509 - 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'
52510 + 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'
52514 - link_cmd='$(LIBTOOL) --mode=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)'
52515 + link_cmd='$(LIBTOOL) --mode=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)'
52519 - link_cmd='$(LIBTOOL) --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)'
52520 + link_cmd='$(LIBTOOL) --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)'
52524 if test "x" = "xyes"; then
52525 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptidy.$suffix"
52526 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix"
52528 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix"
52529 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix"
52532 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy"
52533 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
52535 cat >>Makefile.objects<<EOF
52536 -\$(phplibdir)/phptidy.$suffix: $ext_builddir/phptidy.$suffix
52537 - \$(LIBTOOL) --mode=install cp $ext_builddir/phptidy.$suffix \$(phplibdir)
52538 +\$(phplibdir)/phpxmlrpc.$suffix: $ext_builddir/phpxmlrpc.$suffix
52539 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlrpc.$suffix \$(phplibdir)
52541 -$ext_builddir/phptidy.$suffix: \$(shared_objects_tidy) \$(PHPTIDY_SHARED_DEPENDENCIES)
52542 +$ext_builddir/phpxmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(PHPXMLRPC_SHARED_DEPENDENCIES)
52546 @@ -96385,31 +103171,31 @@ EOF
52547 case $host_alias in
52550 - 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'
52551 + 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'
52555 - link_cmd='$(LIBTOOL) --mode=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)'
52556 + link_cmd='$(LIBTOOL) --mode=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)'
52560 - link_cmd='$(LIBTOOL) --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)'
52561 + link_cmd='$(LIBTOOL) --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)'
52565 if test "x" = "xyes"; then
52566 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tidy.$suffix"
52567 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix"
52569 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/tidy.$suffix"
52570 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix"
52573 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy"
52574 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
52576 cat >>Makefile.objects<<EOF
52577 -\$(phplibdir)/tidy.$suffix: $ext_builddir/tidy.$suffix
52578 - \$(LIBTOOL) --mode=install cp $ext_builddir/tidy.$suffix \$(phplibdir)
52579 +\$(phplibdir)/xmlrpc.$suffix: $ext_builddir/xmlrpc.$suffix
52580 + \$(LIBTOOL) --mode=install cp $ext_builddir/xmlrpc.$suffix \$(phplibdir)
52582 -$ext_builddir/tidy.$suffix: \$(shared_objects_tidy) \$(TIDY_SHARED_DEPENDENCIES)
52583 +$ext_builddir/xmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(XMLRPC_SHARED_DEPENDENCIES)
52587 @@ -96417,22 +103203,22 @@ EOF
52590 cat >> confdefs.h <<EOF
52591 -#define COMPILE_DL_TIDY 1
52592 +#define COMPILE_DL_XMLRPC 1
52598 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
52599 - PHP_TIDY_SHARED=no
52600 + PHP_XMLRPC_SHARED=no
52601 case "$PHP_SAPI" in
52606 + case ext/xmlrpc in
52607 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
52608 - /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52609 - *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52610 + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52611 + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52615 @@ -96447,7 +103233,12 @@ EOF
52619 - for ac_src in tidy.c; do
52620 + for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
52621 + libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
52622 + libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
52623 + libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
52624 + libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
52625 + libxmlrpc/xml_to_soap.c; do
52629 @@ -96470,15 +103261,15 @@ EOF
52633 - EXT_STATIC="$EXT_STATIC tidy"
52634 + EXT_STATIC="$EXT_STATIC xmlrpc"
52640 + case ext/xmlrpc in
52641 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
52642 - /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52643 - *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52644 + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52645 + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52649 @@ -96493,7 +103284,12 @@ EOF
52653 - for ac_src in tidy.c; do
52654 + for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
52655 + libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
52656 + libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
52657 + libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
52658 + libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
52659 + libxmlrpc/xml_to_soap.c; do
52663 @@ -96518,91 +103314,193 @@ EOF
52667 - EXT_CLI_STATIC="$EXT_CLI_STATIC tidy"
52668 + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
52672 + BUILD_DIR="$BUILD_DIR $ext_builddir"
52676 + if test "$ext_builddir" = "."; then
52677 + PHP_PECL_EXTENSION=xmlrpc
52679 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
52685 + BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc"
52688 + XMLRPC_MODULE_TYPE=builtin
52690 +elif test "$PHP_XMLRPC" != "no"; then
52692 + if test -r $PHP_XMLRPC/include/xmlrpc.h; then
52693 + XMLRPC_DIR=$PHP_XMLRPC/include
52694 + elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then
52695 + XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
52697 + echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
52698 +echo "configure:103348: checking for XMLRPC-EPI in default path" >&5
52699 + for i in /usr/local /usr; do
52700 + if test -r $i/include/xmlrpc.h; then
52701 + XMLRPC_DIR=$i/include
52702 + echo "$ac_t""found in $i" 1>&6
52708 + if test -z "$XMLRPC_DIR"; then
52709 + echo "$ac_t""not found" 1>&6
52710 + { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; }
52714 + if test "$XMLRPC_DIR" != "/usr/include"; then
52716 + if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then
52720 + ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
52722 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
52723 + ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`"
52728 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
52730 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
52731 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
52732 + eval "INCLUDEPATH$unique=set"
52735 + INCLUDES="-I$ai_p $INCLUDES"
52737 + INCLUDES="$INCLUDES -I$ai_p"
52746 + if test "$ext_shared" = "yes"; then
52747 + XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD"
52748 + if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then
52750 + if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
52752 + if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
52753 + ai_p=$XMLRPC_DIR/$PHP_LIBDIR
52756 + ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
52758 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
52759 + ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
52763 + if test "$ext_shared" = "yes"; then
52764 + XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
52765 + test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
52770 - BUILD_DIR="$BUILD_DIR $ext_builddir"
52771 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
52775 - if test "$ext_builddir" = "."; then
52776 - PHP_PECL_EXTENSION=tidy
52777 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
52778 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
52779 + eval "LIBPATH$unique=set"
52781 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
52785 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
52786 + LDFLAGS="$LDFLAGS -L$ai_p"
52787 + PHP_RPATHS="$PHP_RPATHS $ai_p"
52789 - PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD"
52791 - cat >> confdefs.h <<\EOF
52792 -#define HAVE_TIDY 1
52807 -php_enable_tokenizer=yes
52808 + if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then
52810 + if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
52812 + if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
52813 + ai_p=$XMLRPC_DIR/$PHP_LIBDIR
52816 + ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
52818 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
52819 + ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
52822 -echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6
52823 -echo "configure:96552: checking whether to enable tokenizer support" >&5
52824 -# Check whether --enable-tokenizer or --disable-tokenizer was given.
52825 -if test "${enable_tokenizer+set}" = set; then
52826 - enableval="$enable_tokenizer"
52827 - PHP_TOKENIZER=$enableval
52832 - PHP_TOKENIZER=yes
52833 - test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL
52838 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
52840 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
52841 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
52842 + eval "LIBPATH$unique=set"
52844 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
52845 + LDFLAGS="$LDFLAGS -L$ai_p"
52846 + PHP_RPATHS="$PHP_RPATHS $ai_p"
52851 -ext_output="yes, shared"
52853 -case $PHP_TOKENIZER in
52855 - PHP_TOKENIZER=`echo "$PHP_TOKENIZER"|$SED 's/^shared,//'`
52858 - PHP_TOKENIZER=yes
52876 + c|c_r|pthread*) ;;
52878 + LIBS="-lxmlrpc $LIBS"
52883 -echo "$ac_t""$ext_output" 1>&6
52889 -if test "$PHP_TOKENIZER" != "no"; then
52891 - ext_builddir=ext/tokenizer
52892 - ext_srcdir=$abs_srcdir/ext/tokenizer
52893 + ext_builddir=ext/xmlrpc
52894 + ext_srcdir=$abs_srcdir/ext/xmlrpc
52898 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
52899 - PHP_TOKENIZER_SHARED=no
52900 + PHP_XMLRPC_SHARED=no
52903 - case ext/tokenizer in
52904 + case ext/xmlrpc in
52905 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
52906 - /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52907 - *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52908 + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52909 + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52913 @@ -96617,7 +103515,7 @@ if test "$PHP_TOKENIZER" != "no"; then
52917 - for ac_src in tokenizer.c tokenizer_data.c; do
52918 + for ac_src in xmlrpc-epi-php.c; do
52922 @@ -96640,18 +103538,18 @@ EOF
52926 - EXT_STATIC="$EXT_STATIC tokenizer"
52927 + EXT_STATIC="$EXT_STATIC xmlrpc"
52928 if test "$ext_shared" != "nocli"; then
52929 - EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer"
52930 + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
52933 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
52934 - PHP_TOKENIZER_SHARED=yes
52935 + PHP_XMLRPC_SHARED=yes
52937 - case ext/tokenizer in
52938 + case ext/xmlrpc in
52939 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
52940 - /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52941 - *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52942 + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
52943 + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
52947 @@ -96666,14 +103564,14 @@ EOF
52951 - for ac_src in tokenizer.c tokenizer_data.c; do
52952 + for ac_src in xmlrpc-epi-php.c; do
52959 - shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo"
52960 + shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo"
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 @@ -96696,31 +103594,31 @@ EOF
52965 case $host_alias in
52968 - 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'
52969 + 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'
52973 - link_cmd='$(LIBTOOL) --mode=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)'
52974 + link_cmd='$(LIBTOOL) --mode=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)'
52978 - link_cmd='$(LIBTOOL) --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)'
52979 + link_cmd='$(LIBTOOL) --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)'
52983 if test "x" = "xyes"; then
52984 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptokenizer.$suffix"
52985 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix"
52987 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix"
52988 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix"
52991 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer"
52992 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
52994 cat >>Makefile.objects<<EOF
52995 -\$(phplibdir)/phptokenizer.$suffix: $ext_builddir/phptokenizer.$suffix
52996 - \$(LIBTOOL) --mode=install cp $ext_builddir/phptokenizer.$suffix \$(phplibdir)
52997 +\$(phplibdir)/phpxmlrpc.$suffix: $ext_builddir/phpxmlrpc.$suffix
52998 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlrpc.$suffix \$(phplibdir)
53000 -$ext_builddir/phptokenizer.$suffix: \$(shared_objects_tokenizer) \$(PHPTOKENIZER_SHARED_DEPENDENCIES)
53001 +$ext_builddir/phpxmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(PHPXMLRPC_SHARED_DEPENDENCIES)
53005 @@ -96733,31 +103631,31 @@ EOF
53006 case $host_alias in
53009 - 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'
53010 + 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'
53014 - link_cmd='$(LIBTOOL) --mode=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)'
53015 + link_cmd='$(LIBTOOL) --mode=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)'
53019 - link_cmd='$(LIBTOOL) --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)'
53020 + link_cmd='$(LIBTOOL) --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)'
53024 if test "x" = "xyes"; then
53025 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tokenizer.$suffix"
53026 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix"
53028 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/tokenizer.$suffix"
53029 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix"
53032 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer"
53033 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
53035 cat >>Makefile.objects<<EOF
53036 -\$(phplibdir)/tokenizer.$suffix: $ext_builddir/tokenizer.$suffix
53037 - \$(LIBTOOL) --mode=install cp $ext_builddir/tokenizer.$suffix \$(phplibdir)
53038 +\$(phplibdir)/xmlrpc.$suffix: $ext_builddir/xmlrpc.$suffix
53039 + \$(LIBTOOL) --mode=install cp $ext_builddir/xmlrpc.$suffix \$(phplibdir)
53041 -$ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES)
53042 +$ext_builddir/xmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(XMLRPC_SHARED_DEPENDENCIES)
53046 @@ -96765,22 +103663,22 @@ EOF
53049 cat >> confdefs.h <<EOF
53050 -#define COMPILE_DL_TOKENIZER 1
53051 +#define COMPILE_DL_XMLRPC 1
53057 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
53058 - PHP_TOKENIZER_SHARED=no
53059 + PHP_XMLRPC_SHARED=no
53060 case "$PHP_SAPI" in
53064 - case ext/tokenizer in
53065 + case ext/xmlrpc in
53066 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
53067 - /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53068 - *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53069 + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53070 + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53074 @@ -96795,7 +103693,7 @@ EOF
53078 - for ac_src in tokenizer.c tokenizer_data.c; do
53079 + for ac_src in xmlrpc-epi-php.c; do
53083 @@ -96818,15 +103716,15 @@ EOF
53087 - EXT_STATIC="$EXT_STATIC tokenizer"
53088 + EXT_STATIC="$EXT_STATIC xmlrpc"
53093 - case ext/tokenizer in
53094 + case ext/xmlrpc in
53095 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
53096 - /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53097 - *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53098 + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53099 + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53103 @@ -96841,7 +103739,7 @@ EOF
53107 - for ac_src in tokenizer.c tokenizer_data.c; do
53108 + for ac_src in xmlrpc-epi-php.c; do
53112 @@ -96866,7 +103764,7 @@ EOF
53116 - EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer"
53117 + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
53121 @@ -96875,34 +103773,29 @@ EOF
53124 if test "$ext_builddir" = "."; then
53125 - PHP_PECL_EXTENSION=tokenizer
53126 + PHP_PECL_EXTENSION=xmlrpc
53128 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
53133 - src=$ext_srcdir/Makefile.frag
53134 - ac_srcdir=$ext_srcdir
53135 - ac_builddir=$ext_builddir
53136 - test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
53138 + XMLRPC_MODULE_TYPE=external
53143 -php_enable_wddx=no
53144 +php_enable_xmlwriter=yes
53146 -echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6
53147 -echo "configure:96898: checking whether to enable WDDX support" >&5
53148 -# Check whether --enable-wddx or --disable-wddx was given.
53149 -if test "${enable_wddx+set}" = set; then
53150 - enableval="$enable_wddx"
53151 - PHP_WDDX=$enableval
53152 +echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6
53153 +echo "configure:103791: checking whether to enable XMLWriter support" >&5
53154 +# Check whether --enable-xmlwriter or --disable-xmlwriter was given.
53155 +if test "${enable_xmlwriter+set}" = set; then
53156 + enableval="$enable_xmlwriter"
53157 + PHP_XMLWRITER=$enableval
53161 - test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL
53162 + PHP_XMLWRITER=yes
53163 + test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL
53167 @@ -96910,12 +103803,12 @@ fi
53169 ext_output="yes, shared"
53172 +case $PHP_XMLWRITER in
53174 - PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'`
53175 + PHP_XMLWRITER=`echo "$PHP_XMLWRITER"|$SED 's/^shared,//'`
53179 + PHP_XMLWRITER=yes
53183 @@ -96939,7 +103832,7 @@ if test -z "$PHP_LIBXML_DIR"; then
53184 php_with_libxml_dir=no
53186 echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
53187 -echo "configure:96943: checking libxml2 install dir" >&5
53188 +echo "configure:103836: checking libxml2 install dir" >&5
53189 # Check whether --with-libxml-dir or --without-libxml-dir was given.
53190 if test "${with_libxml_dir+set}" = set; then
53191 withval="$with_libxml_dir"
53192 @@ -96959,39 +103852,15 @@ echo "$ac_t""$ext_output" 1>&6
53196 +if test "$PHP_XMLWRITER" != "no"; then
53198 -php_with_libexpat_dir=no
53199 + if test "$PHP_LIBXML" = "no"; then
53200 + { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
53203 -echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6
53204 -echo "configure:96967: checking libexpat dir for WDDX" >&5
53205 -# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
53206 -if test "${with_libexpat_dir+set}" = set; then
53207 - withval="$with_libexpat_dir"
53208 - PHP_LIBEXPAT_DIR=$withval
53211 - PHP_LIBEXPAT_DIR=no
53217 -ext_output=$PHP_LIBEXPAT_DIR
53218 -echo "$ac_t""$ext_output" 1>&6
53223 -if test "$PHP_WDDX" != "no"; then
53225 - if test "$PHP_LIBEXPAT_DIR" = "no"; then
53226 - if test "$PHP_LIBXML" = "no"; then
53227 - { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
53231 echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
53232 -echo "configure:96995: checking for xml2-config path" >&5
53233 +echo "configure:103864: checking for xml2-config path" >&5
53234 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
53235 echo $ac_n "(cached) $ac_c" 1>&6
53237 @@ -97023,7 +103892,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
53240 if test "$ext_shared" = "yes"; then
53241 - WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread"
53242 + XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread"
53246 @@ -97045,7 +103914,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
53249 if test "$ext_shared" = "yes"; then
53250 - WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii"
53251 + XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii"
53255 @@ -97080,8 +103949,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
53258 if test "$ext_shared" = "yes"; then
53259 - WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD"
53260 - test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD"
53261 + XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD"
53262 + test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD"
53266 @@ -97125,317 +103994,110 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
53267 ai_p="$ep_realdir/`basename \"$ac_ii\"`"
53272 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
53274 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
53275 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
53276 - eval "INCLUDEPATH$unique=set"
53279 - INCLUDES="-I$ai_p $INCLUDES"
53281 - INCLUDES="$INCLUDES -I$ai_p"
53293 - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
53294 -echo "configure:97153: checking whether libxml build works" >&5
53295 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
53296 - echo $ac_n "(cached) $ac_c" 1>&6
53302 - $WDDX_SHARED_LIBADD
53304 - if test "$cross_compiling" = yes; then
53309 - cat > conftest.$ac_ext <<EOF
53310 -#line 97169 "configure"
53311 -#include "confdefs.h"
53314 - char xmlInitParser();
53321 -if { (eval echo configure:97180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
53326 - php_cv_libxml_build_works=yes
53330 - echo "configure: failed program was:" >&5
53331 - cat conftest.$ac_ext >&5
53336 - echo "$ac_t""no" 1>&6
53337 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
53348 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
53349 - if test "$php_cv_libxml_build_works" = "yes"; then
53350 - cat >> confdefs.h <<\EOF
53351 -#define HAVE_LIBXML 1
53356 - if test "$PHP_XML" = "no"; then
53360 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
53361 - /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53362 - *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53367 - b_c_pre=$php_c_pre
53368 - b_cxx_pre=$php_cxx_pre
53369 - b_c_meta=$php_c_meta
53370 - b_cxx_meta=$php_cxx_meta
53371 - b_c_post=$php_c_post
53372 - b_cxx_post=$php_cxx_post
53377 - for ac_src in compat.c; do
53384 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
53387 - *.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" ;;
53388 - *.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" ;;
53389 - *.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" ;;
53390 - *.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" ;;
53393 - cat >>Makefile.objects<<EOF
53394 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
53402 - BUILD_DIR="$BUILD_DIR ext/xml"
53408 - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
53411 - { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
53417 - if test "$PHP_LIBEXPAT_DIR" != "no"; then
53418 - for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do
53419 - if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
53425 - if test -z "$EXPAT_DIR"; then
53426 - { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; }
53430 - if test "$EXPAT_DIR/include" != "/usr/include"; then
53432 - if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then
53433 - ai_p=$EXPAT_DIR/include
53436 - ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
53438 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
53439 - ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
53444 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
53446 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
53447 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
53448 - eval "INCLUDEPATH$unique=set"
53451 - INCLUDES="-I$ai_p $INCLUDES"
53453 - INCLUDES="$INCLUDES -I$ai_p"
53462 - if test "$ext_shared" = "yes"; then
53463 - WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD"
53464 - if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
53466 - if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
53468 - if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
53469 - ai_p=$EXPAT_DIR/$PHP_LIBDIR
53472 - ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
53474 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
53475 - ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
53479 - if test "$ext_shared" = "yes"; then
53480 - WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD"
53481 - test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD"
53486 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
53488 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
53489 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
53490 - eval "LIBPATH$unique=set"
53492 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
53493 - LDFLAGS="$LDFLAGS -L$ai_p"
53494 - PHP_RPATHS="$PHP_RPATHS $ai_p"
53507 - if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
53509 - if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
53511 - if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
53512 - ai_p=$EXPAT_DIR/$PHP_LIBDIR
53515 - ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
53517 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
53518 - ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
53526 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
53528 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
53529 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
53530 if test -n "$unique" && test "`eval $cmd`" = "" ; then
53531 - eval "LIBPATH$unique=set"
53532 + eval "INCLUDEPATH$unique=set"
53534 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
53535 - LDFLAGS="$LDFLAGS -L$ai_p"
53536 - PHP_RPATHS="$PHP_RPATHS $ai_p"
53542 + INCLUDES="-I$ai_p $INCLUDES"
53544 + INCLUDES="$INCLUDES -I$ai_p"
53553 - c|c_r|pthread*) ;;
53555 - LIBS="-lexpat $LIBS"
53564 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
53565 +echo "configure:104022: checking whether libxml build works" >&5
53566 +if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
53567 + echo $ac_n "(cached) $ac_c" 1>&6
53573 + $XMLWRITER_SHARED_LIBADD
53575 + if test "$cross_compiling" = yes; then
53580 + cat > conftest.$ac_ext <<EOF
53581 +#line 104038 "configure"
53582 +#include "confdefs.h"
53586 + char xmlInitParser();
53593 +if { (eval echo configure:104049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
53598 + php_cv_libxml_build_works=yes
53602 + echo "configure: failed program was:" >&5
53603 + cat conftest.$ac_ext >&5
53608 + echo "$ac_t""no" 1>&6
53609 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
53617 - cat >> confdefs.h <<\EOF
53618 -#define HAVE_LIBEXPAT 1
53624 +echo "$ac_t""$php_cv_libxml_build_works" 1>&6
53625 + if test "$php_cv_libxml_build_works" = "yes"; then
53626 + cat >> confdefs.h <<\EOF
53627 +#define HAVE_LIBXML 1
53630 - cat >> confdefs.h <<\EOF
53631 -#define HAVE_WDDX 1
53634 + cat >> confdefs.h <<\EOF
53635 +#define HAVE_XMLWRITER 1
53639 - ext_builddir=ext/wddx
53640 - ext_srcdir=$abs_srcdir/ext/wddx
53642 + ext_builddir=ext/xmlwriter
53643 + ext_srcdir=$abs_srcdir/ext/xmlwriter
53647 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
53648 - PHP_WDDX_SHARED=no
53649 + PHP_XMLWRITER_SHARED=no
53653 + case ext/xmlwriter in
53654 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
53655 - /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53656 - *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53657 + /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53658 + *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53662 @@ -97450,7 +104112,7 @@ EOF
53666 - for ac_src in wddx.c; do
53667 + for ac_src in php_xmlwriter.c; do
53671 @@ -97473,18 +104135,18 @@ EOF
53675 - EXT_STATIC="$EXT_STATIC wddx"
53676 + EXT_STATIC="$EXT_STATIC xmlwriter"
53677 if test "$ext_shared" != "nocli"; then
53678 - EXT_CLI_STATIC="$EXT_CLI_STATIC wddx"
53679 + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter"
53682 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
53683 - PHP_WDDX_SHARED=yes
53684 + PHP_XMLWRITER_SHARED=yes
53687 + case ext/xmlwriter in
53688 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
53689 - /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53690 - *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53691 + /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53692 + *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53696 @@ -97499,14 +104161,14 @@ EOF
53700 - for ac_src in wddx.c; do
53701 + for ac_src in php_xmlwriter.c; do
53708 - shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo"
53709 + shared_objects_xmlwriter="$shared_objects_xmlwriter $ac_bdir$ac_obj.lo"
53712 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
53713 @@ -97529,31 +104191,31 @@ EOF
53714 case $host_alias in
53717 - 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'
53718 + 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'
53722 - link_cmd='$(LIBTOOL) --mode=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)'
53723 + link_cmd='$(LIBTOOL) --mode=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)'
53727 - link_cmd='$(LIBTOOL) --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)'
53728 + link_cmd='$(LIBTOOL) --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)'
53732 if test "x" = "xyes"; then
53733 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpwddx.$suffix"
53734 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlwriter.$suffix"
53736 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpwddx.$suffix"
53737 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix"
53740 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx"
53741 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter"
53743 cat >>Makefile.objects<<EOF
53744 -\$(phplibdir)/phpwddx.$suffix: $ext_builddir/phpwddx.$suffix
53745 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpwddx.$suffix \$(phplibdir)
53746 +\$(phplibdir)/phpxmlwriter.$suffix: $ext_builddir/phpxmlwriter.$suffix
53747 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlwriter.$suffix \$(phplibdir)
53749 -$ext_builddir/phpwddx.$suffix: \$(shared_objects_wddx) \$(PHPWDDX_SHARED_DEPENDENCIES)
53750 +$ext_builddir/phpxmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(PHPXMLWRITER_SHARED_DEPENDENCIES)
53754 @@ -97566,31 +104228,31 @@ EOF
53755 case $host_alias in
53758 - 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'
53759 + 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'
53763 - link_cmd='$(LIBTOOL) --mode=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)'
53764 + link_cmd='$(LIBTOOL) --mode=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)'
53768 - link_cmd='$(LIBTOOL) --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)'
53769 + link_cmd='$(LIBTOOL) --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)'
53773 if test "x" = "xyes"; then
53774 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/wddx.$suffix"
53775 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlwriter.$suffix"
53777 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/wddx.$suffix"
53778 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlwriter.$suffix"
53781 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx"
53782 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter"
53784 cat >>Makefile.objects<<EOF
53785 -\$(phplibdir)/wddx.$suffix: $ext_builddir/wddx.$suffix
53786 - \$(LIBTOOL) --mode=install cp $ext_builddir/wddx.$suffix \$(phplibdir)
53787 +\$(phplibdir)/xmlwriter.$suffix: $ext_builddir/xmlwriter.$suffix
53788 + \$(LIBTOOL) --mode=install cp $ext_builddir/xmlwriter.$suffix \$(phplibdir)
53790 -$ext_builddir/wddx.$suffix: \$(shared_objects_wddx) \$(WDDX_SHARED_DEPENDENCIES)
53791 +$ext_builddir/xmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_DEPENDENCIES)
53795 @@ -97598,22 +104260,22 @@ EOF
53798 cat >> confdefs.h <<EOF
53799 -#define COMPILE_DL_WDDX 1
53800 +#define COMPILE_DL_XMLWRITER 1
53806 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
53807 - PHP_WDDX_SHARED=no
53808 + PHP_XMLWRITER_SHARED=no
53809 case "$PHP_SAPI" in
53814 + case ext/xmlwriter in
53815 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
53816 - /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53817 - *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53818 + /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53819 + *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53823 @@ -97628,7 +104290,7 @@ EOF
53827 - for ac_src in wddx.c; do
53828 + for ac_src in php_xmlwriter.c; do
53832 @@ -97651,15 +104313,15 @@ EOF
53836 - EXT_STATIC="$EXT_STATIC wddx"
53837 + EXT_STATIC="$EXT_STATIC xmlwriter"
53843 + case ext/xmlwriter in
53844 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
53845 - /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53846 - *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53847 + /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
53848 + *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
53852 @@ -97674,7 +104336,7 @@ EOF
53856 - for ac_src in wddx.c; do
53857 + for ac_src in php_xmlwriter.c; do
53861 @@ -97699,7 +104361,7 @@ EOF
53865 - EXT_CLI_STATIC="$EXT_CLI_STATIC wddx"
53866 + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter"
53870 @@ -97708,50 +104370,40 @@ EOF
53873 if test "$ext_builddir" = "."; then
53874 - PHP_PECL_EXTENSION=wddx
53875 + PHP_PECL_EXTENSION=xmlwriter
53877 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
53882 + PHP_VAR_SUBST="$PHP_VAR_SUBST XMLWRITER_SHARED_LIBADD"
53885 - am_i_shared=$PHP_WDDX_SHARED
53886 - is_it_shared=$PHP_LIBXML_SHARED
53887 - is_it_enabled=$PHP_LIBXML
53888 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
53889 - { echo "configure: error:
53890 -You've configured extension wddx to build statically, but it
53891 -depends on extension libxml, which you've configured to build shared.
53892 -You either need to build wddx shared or build libxml statically for the
53893 -build to be successful.
53896 - if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
53897 - { echo "configure: error:
53898 -You've configured extension wddx, which depends on extension libxml,
53899 -but you've either not enabled libxml, or have disabled it.
53904 + { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
53907 + { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
53909 - PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD"
53916 -php_enable_xml=yes
53919 -echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6
53920 -echo "configure:97747: checking whether to enable XML support" >&5
53921 -# Check whether --enable-xml or --disable-xml was given.
53922 -if test "${enable_xml+set}" = set; then
53923 - enableval="$enable_xml"
53924 - PHP_XML=$enableval
53925 +echo $ac_n "checking for XSL support""... $ac_c" 1>&6
53926 +echo "configure:104399: checking for XSL support" >&5
53927 +# Check whether --with-xsl or --without-xsl was given.
53928 +if test "${with_xsl+set}" = set; then
53929 + withval="$with_xsl"
53934 - test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL
53936 + test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL
53940 @@ -97759,12 +104411,12 @@ fi
53942 ext_output="yes, shared"
53947 - PHP_XML=`echo "$PHP_XML"|$SED 's/^shared,//'`
53948 + PHP_XSL=`echo "$PHP_XSL"|$SED 's/^shared,//'`
53956 @@ -97783,97 +104435,41 @@ echo "$ac_t""$ext_output" 1>&6
53960 -if test -z "$PHP_LIBXML_DIR"; then
53962 -php_with_libxml_dir=no
53964 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
53965 -echo "configure:97792: checking libxml2 install dir" >&5
53966 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
53967 -if test "${with_libxml_dir+set}" = set; then
53968 - withval="$with_libxml_dir"
53969 - PHP_LIBXML_DIR=$withval
53972 - PHP_LIBXML_DIR=no
53978 -ext_output=$PHP_LIBXML_DIR
53979 -echo "$ac_t""$ext_output" 1>&6
53986 -php_with_libexpat_dir=no
53987 +if test "$PHP_XSL" != "no"; then
53989 -echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6
53990 -echo "configure:97816: checking libexpat install dir" >&5
53991 -# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
53992 -if test "${with_libexpat_dir+set}" = set; then
53993 - withval="$with_libexpat_dir"
53994 - PHP_LIBEXPAT_DIR=$withval
53997 - PHP_LIBEXPAT_DIR=no
53998 + if test "$PHP_LIBXML" = "no"; then
53999 + { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
54002 + if test "$PHP_DOM" = "no"; then
54003 + { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; }
54009 -ext_output=$PHP_LIBEXPAT_DIR
54010 -echo "$ac_t""$ext_output" 1>&6
54015 -if test "$PHP_XML" != "no"; then
54017 - if test "$PHP_LIBEXPAT_DIR" = "no"; then
54019 - if test "$PHP_LIBXML" = "no"; then
54020 - { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
54024 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
54025 -echo "configure:97845: checking for xml2-config path" >&5
54026 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
54027 - echo $ac_n "(cached) $ac_c" 1>&6
54030 - for i in $PHP_LIBXML_DIR /usr/local /usr; do
54031 - if test -x "$i/bin/xml2-config"; then
54032 - ac_cv_php_xml2_config_path="$i/bin/xml2-config"
54033 + for i in $PHP_XSL /usr/local /usr; do
54034 + if test -x "$i/bin/xslt-config"; then
54035 + XSLT_CONFIG=$i/bin/xslt-config
54042 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
54044 - if test -x "$ac_cv_php_xml2_config_path"; then
54045 - XML2_CONFIG="$ac_cv_php_xml2_config_path"
54046 - libxml_full_version=`$XML2_CONFIG --version`
54047 + if test -z "$XSLT_CONFIG"; then
54048 + { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; }
54050 + libxslt_full_version=`$XSLT_CONFIG --version`
54053 - set $libxml_full_version
54054 + set $libxslt_full_version
54056 - LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
54057 - if test "$LIBXML_VERSION" -ge "2006011"; then
54058 - LIBXML_LIBS=`$XML2_CONFIG --libs`
54059 - LIBXML_INCS=`$XML2_CONFIG --cflags`
54060 + LIBXSLT_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
54061 + if test "$LIBXSLT_VERSION" -ge "1001000"; then
54062 + XSL_LIBS=`$XSLT_CONFIG --libs`
54063 + XSL_INCS=`$XSLT_CONFIG --cflags`
54065 - for ac_i in $LIBXML_LIBS; do
54066 + for ac_i in $XSL_LIBS; do
54069 if test "$ext_shared" = "yes"; then
54070 - XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread"
54071 + XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -pthread"
54075 @@ -97895,7 +104491,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
54078 if test "$ext_shared" = "yes"; then
54079 - XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii"
54080 + XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii"
54084 @@ -97930,8 +104526,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
54087 if test "$ext_shared" = "yes"; then
54088 - XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD"
54089 - test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD"
54090 + XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD"
54091 + test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD"
54095 @@ -97958,7 +104554,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
54099 - for ac_i in $LIBXML_INCS; do
54100 + for ac_i in $XSL_INCS; do
54103 ac_ii=`echo $ac_i|cut -c 3-`
54104 @@ -97997,166 +104593,41 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
54109 - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
54110 -echo "configure:98003: checking whether libxml build works" >&5
54111 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
54112 - echo $ac_n "(cached) $ac_c" 1>&6
54118 - $XML_SHARED_LIBADD
54120 - if test "$cross_compiling" = yes; then
54125 - cat > conftest.$ac_ext <<EOF
54126 -#line 98019 "configure"
54127 -#include "confdefs.h"
54130 - char xmlInitParser();
54137 -if { (eval echo configure:98030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
54142 - php_cv_libxml_build_works=yes
54146 - echo "configure: failed program was:" >&5
54147 - cat conftest.$ac_ext >&5
54152 - echo "$ac_t""no" 1>&6
54153 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
54164 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
54165 - if test "$php_cv_libxml_build_works" = "yes"; then
54166 - cat >> confdefs.h <<\EOF
54167 -#define HAVE_LIBXML 1
54172 - xml_extra_sources="compat.c"
54174 - am_i_shared=$PHP_XML_SHARED
54175 - is_it_shared=$PHP_LIBXML_SHARED
54176 - is_it_enabled=$PHP_LIBXML
54177 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
54178 - { echo "configure: error:
54179 -You've configured extension xml to build statically, but it
54180 -depends on extension libxml, which you've configured to build shared.
54181 -You either need to build xml shared or build libxml statically for the
54182 -build to be successful.
54185 - if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
54186 - { echo "configure: error:
54187 -You've configured extension xml, which depends on extension libxml,
54188 -but you've either not enabled libxml, or have disabled it.
54194 - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
54197 - { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
54203 - if test "$PHP_LIBEXPAT_DIR" != "no"; then
54204 - for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do
54205 - if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
54211 - if test -z "$EXPAT_DIR"; then
54212 - { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; }
54216 - if test "$EXPAT_DIR/include" != "/usr/include"; then
54218 - if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then
54219 - ai_p=$EXPAT_DIR/include
54222 - ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
54224 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54225 - ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
54230 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
54232 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
54233 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
54234 - eval "INCLUDEPATH$unique=set"
54237 - INCLUDES="-I$ai_p $INCLUDES"
54239 - INCLUDES="$INCLUDES -I$ai_p"
54247 + echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6
54248 +echo "configure:104599: checking for EXSLT support" >&5
54249 + for i in $PHP_XSL /usr/local /usr; do
54250 + if test -r "$i/include/libexslt/exslt.h"; then
54251 + PHP_XSL_EXSL_DIR=$i
54255 + if test -z "$PHP_XSL_EXSL_DIR"; then
54256 + echo "$ac_t""not found" 1>&6
54258 + echo "$ac_t""found" 1>&6
54261 if test "$ext_shared" = "yes"; then
54262 - XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD"
54263 - if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
54264 + XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD"
54265 + if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then
54267 - if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
54268 + if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
54270 - if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
54271 - ai_p=$EXPAT_DIR/$PHP_LIBDIR
54272 + if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
54273 + ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
54276 - ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
54277 + ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
54279 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54280 - ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
54281 + ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
54285 if test "$ext_shared" = "yes"; then
54286 - XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD"
54287 - test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD"
54288 + XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD"
54289 + test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD"
54293 @@ -98182,18 +104653,18 @@ else
54297 - if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then
54298 + if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then
54300 - if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
54301 + if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
54303 - if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
54304 - ai_p=$EXPAT_DIR/$PHP_LIBDIR
54305 + if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
54306 + ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
54309 - ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
54310 + ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
54312 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54313 - ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
54314 + ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
54318 @@ -98219,10 +104690,10 @@ else
54326 - LIBS="-lexpat $LIBS"
54327 + LIBS="-lexslt $LIBS"
54331 @@ -98232,26 +104703,67 @@ else
54335 - cat >> confdefs.h <<\EOF
54336 -#define HAVE_LIBEXPAT 1
54338 + if test "$PHP_XSL_EXSL_DIR/include" != "/usr/include"; then
54340 + if test -z "$PHP_XSL_EXSL_DIR/include" || echo "$PHP_XSL_EXSL_DIR/include" | grep '^/' >/dev/null ; then
54341 + ai_p=$PHP_XSL_EXSL_DIR/include
54344 + ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
54346 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54347 + ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`"
54352 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
54354 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
54355 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
54356 + eval "INCLUDEPATH$unique=set"
54359 + INCLUDES="-I$ai_p $INCLUDES"
54361 + INCLUDES="$INCLUDES -I$ai_p"
54368 + cat >> confdefs.h <<\EOF
54369 +#define HAVE_XSL_EXSLT 1
54374 + { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; }
54380 + cat >> confdefs.h <<\EOF
54381 +#define HAVE_XSL 1
54385 - ext_builddir=ext/xml
54386 - ext_srcdir=$abs_srcdir/ext/xml
54387 + ext_builddir=ext/xsl
54388 + ext_srcdir=$abs_srcdir/ext/xsl
54392 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
54393 - PHP_XML_SHARED=no
54394 + PHP_XSL_SHARED=no
54399 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
54400 - /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54401 - *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54402 + /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54403 + *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54407 @@ -98266,7 +104778,7 @@ EOF
54411 - for ac_src in xml.c $xml_extra_sources; do
54412 + for ac_src in php_xsl.c xsltprocessor.c; do
54416 @@ -98289,18 +104801,18 @@ EOF
54420 - EXT_STATIC="$EXT_STATIC xml"
54421 + EXT_STATIC="$EXT_STATIC xsl"
54422 if test "$ext_shared" != "nocli"; then
54423 - EXT_CLI_STATIC="$EXT_CLI_STATIC xml"
54424 + EXT_CLI_STATIC="$EXT_CLI_STATIC xsl"
54427 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
54428 - PHP_XML_SHARED=yes
54429 + PHP_XSL_SHARED=yes
54433 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
54434 - /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54435 - *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54436 + /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54437 + *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54441 @@ -98315,14 +104827,14 @@ EOF
54445 - for ac_src in xml.c $xml_extra_sources; do
54446 + for ac_src in php_xsl.c xsltprocessor.c; do
54453 - shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo"
54454 + shared_objects_xsl="$shared_objects_xsl $ac_bdir$ac_obj.lo"
54457 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
54458 @@ -98345,31 +104857,31 @@ EOF
54459 case $host_alias in
54462 - 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'
54463 + 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'
54467 - link_cmd='$(LIBTOOL) --mode=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)'
54468 + link_cmd='$(LIBTOOL) --mode=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)'
54472 - link_cmd='$(LIBTOOL) --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)'
54473 + link_cmd='$(LIBTOOL) --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)'
54477 if test "x" = "xyes"; then
54478 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxml.$suffix"
54479 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxsl.$suffix"
54481 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix"
54482 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxsl.$suffix"
54485 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml"
54486 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl"
54488 cat >>Makefile.objects<<EOF
54489 -\$(phplibdir)/phpxml.$suffix: $ext_builddir/phpxml.$suffix
54490 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpxml.$suffix \$(phplibdir)
54491 +\$(phplibdir)/phpxsl.$suffix: $ext_builddir/phpxsl.$suffix
54492 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpxsl.$suffix \$(phplibdir)
54494 -$ext_builddir/phpxml.$suffix: \$(shared_objects_xml) \$(PHPXML_SHARED_DEPENDENCIES)
54495 +$ext_builddir/phpxsl.$suffix: \$(shared_objects_xsl) \$(PHPXSL_SHARED_DEPENDENCIES)
54499 @@ -98382,31 +104894,31 @@ EOF
54500 case $host_alias in
54503 - 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'
54504 + 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'
54508 - link_cmd='$(LIBTOOL) --mode=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)'
54509 + link_cmd='$(LIBTOOL) --mode=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)'
54513 - link_cmd='$(LIBTOOL) --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)'
54514 + link_cmd='$(LIBTOOL) --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)'
54518 if test "x" = "xyes"; then
54519 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xml.$suffix"
54520 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xsl.$suffix"
54522 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/xml.$suffix"
54523 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/xsl.$suffix"
54526 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml"
54527 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl"
54529 cat >>Makefile.objects<<EOF
54530 -\$(phplibdir)/xml.$suffix: $ext_builddir/xml.$suffix
54531 - \$(LIBTOOL) --mode=install cp $ext_builddir/xml.$suffix \$(phplibdir)
54532 +\$(phplibdir)/xsl.$suffix: $ext_builddir/xsl.$suffix
54533 + \$(LIBTOOL) --mode=install cp $ext_builddir/xsl.$suffix \$(phplibdir)
54535 -$ext_builddir/xml.$suffix: \$(shared_objects_xml) \$(XML_SHARED_DEPENDENCIES)
54536 +$ext_builddir/xsl.$suffix: \$(shared_objects_xsl) \$(XSL_SHARED_DEPENDENCIES)
54540 @@ -98414,22 +104926,22 @@ EOF
54543 cat >> confdefs.h <<EOF
54544 -#define COMPILE_DL_XML 1
54545 +#define COMPILE_DL_XSL 1
54551 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
54552 - PHP_XML_SHARED=no
54553 + PHP_XSL_SHARED=no
54554 case "$PHP_SAPI" in
54560 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
54561 - /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54562 - *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54563 + /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54564 + *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54568 @@ -98444,7 +104956,7 @@ EOF
54572 - for ac_src in xml.c $xml_extra_sources; do
54573 + for ac_src in php_xsl.c xsltprocessor.c; do
54577 @@ -98467,15 +104979,15 @@ EOF
54581 - EXT_STATIC="$EXT_STATIC xml"
54582 + EXT_STATIC="$EXT_STATIC xsl"
54589 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
54590 - /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54591 - *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54592 + /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
54593 + *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
54597 @@ -98490,7 +105002,7 @@ EOF
54601 - for ac_src in xml.c $xml_extra_sources; do
54602 + for ac_src in php_xsl.c xsltprocessor.c; do
54606 @@ -98515,7 +105027,7 @@ EOF
54610 - EXT_CLI_STATIC="$EXT_CLI_STATIC xml"
54611 + EXT_CLI_STATIC="$EXT_CLI_STATIC xsl"
54615 @@ -98524,53 +105036,50 @@ EOF
54618 if test "$ext_builddir" = "."; then
54619 - PHP_PECL_EXTENSION=xml
54620 + PHP_PECL_EXTENSION=xsl
54622 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
54627 - PHP_VAR_SUBST="$PHP_VAR_SUBST XML_SHARED_LIBADD"
54628 + PHP_VAR_SUBST="$PHP_VAR_SUBST XSL_SHARED_LIBADD"
54632 - for header_file in ext/xml/; do
54635 - unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
54637 - cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
54638 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
54639 - eval "INSTALLHEADERS$unique=set"
54641 - INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
54643 + am_i_shared=$PHP_XSL_SHARED
54644 + is_it_shared=$PHP_LIBXML_SHARED
54645 + is_it_enabled=$PHP_LIBXML
54646 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
54647 + { echo "configure: error:
54648 +You've configured extension xsl to build statically, but it
54649 +depends on extension libxml, which you've configured to build shared.
54650 +You either need to build xsl shared or build libxml statically for the
54651 +build to be successful.
54654 + if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
54655 + { echo "configure: error:
54656 +You've configured extension xsl, which depends on extension libxml,
54657 +but you've either not enabled libxml, or have disabled it.
54664 - cat >> confdefs.h <<\EOF
54665 -#define HAVE_XML 1
54672 -php_enable_xmlreader=yes
54675 -echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6
54676 -echo "configure:98566: checking whether to enable XMLReader support" >&5
54677 -# Check whether --enable-xmlreader or --disable-xmlreader was given.
54678 -if test "${enable_xmlreader+set}" = set; then
54679 - enableval="$enable_xmlreader"
54680 - PHP_XMLREADER=$enableval
54681 +echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6
54682 +echo "configure:105075: checking for zip archive read/writesupport" >&5
54683 +# Check whether --enable-zip or --disable-zip was given.
54684 +if test "${enable_zip+set}" = set; then
54685 + enableval="$enable_zip"
54686 + PHP_ZIP=$enableval
54689 - PHP_XMLREADER=yes
54690 - test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL
54692 + test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL
54696 @@ -98578,12 +105087,12 @@ fi
54698 ext_output="yes, shared"
54700 -case $PHP_XMLREADER in
54703 - PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'`
54704 + PHP_ZIP=`echo "$PHP_ZIP"|$SED 's/^shared,//'`
54707 - PHP_XMLREADER=yes
54712 @@ -98602,132 +105111,147 @@ echo "$ac_t""$ext_output" 1>&6
54716 -if test -z "$PHP_LIBXML_DIR"; then
54717 +if test -z "$PHP_ZLIB_DIR"; then
54719 -php_with_libxml_dir=no
54720 +php_with_zlib_dir=no
54722 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
54723 -echo "configure:98611: checking libxml2 install dir" >&5
54724 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
54725 -if test "${with_libxml_dir+set}" = set; then
54726 - withval="$with_libxml_dir"
54727 - PHP_LIBXML_DIR=$withval
54728 +echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
54729 +echo "configure:105120: checking for the location of libz" >&5
54730 +# Check whether --with-zlib-dir or --without-zlib-dir was given.
54731 +if test "${with_zlib_dir+set}" = set; then
54732 + withval="$with_zlib_dir"
54733 + PHP_ZLIB_DIR=$withval
54736 - PHP_LIBXML_DIR=no
54743 -ext_output=$PHP_LIBXML_DIR
54744 +ext_output=$PHP_ZLIB_DIR
54745 echo "$ac_t""$ext_output" 1>&6
54751 -if test "$PHP_XMLREADER" != "no"; then
54753 - if test "$PHP_LIBXML" = "no"; then
54754 - { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
54756 +php_with_pcre_dir=no
54759 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
54760 -echo "configure:98639: checking for xml2-config path" >&5
54761 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
54762 - echo $ac_n "(cached) $ac_c" 1>&6
54763 +echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
54764 +echo "configure:105144: checking pcre install prefix" >&5
54765 +# Check whether --with-pcre-dir or --without-pcre-dir was given.
54766 +if test "${with_pcre_dir+set}" = set; then
54767 + withval="$with_pcre_dir"
54768 + PHP_PCRE_DIR=$withval
54771 - for i in $PHP_LIBXML_DIR /usr/local /usr; do
54772 - if test -x "$i/bin/xml2-config"; then
54773 - ac_cv_php_xml2_config_path="$i/bin/xml2-config"
54782 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
54784 - if test -x "$ac_cv_php_xml2_config_path"; then
54785 - XML2_CONFIG="$ac_cv_php_xml2_config_path"
54786 - libxml_full_version=`$XML2_CONFIG --version`
54789 - set $libxml_full_version
54791 - LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
54792 - if test "$LIBXML_VERSION" -ge "2006011"; then
54793 - LIBXML_LIBS=`$XML2_CONFIG --libs`
54794 - LIBXML_INCS=`$XML2_CONFIG --cflags`
54795 +ext_output=$PHP_PCRE_DIR
54796 +echo "$ac_t""$ext_output" 1>&6
54801 +if test "$PHP_ZIP" != "no"; then
54803 + if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
54804 + if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
54805 + PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
54806 + PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
54807 + elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
54808 + PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
54809 + PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
54811 + { echo "configure: error: Can not find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; }
54814 + for i in /usr/local /usr; do
54815 + if test -f "$i/include/zlib/zlib.h"; then
54816 + PHP_ZLIB_DIR="$i"
54817 + PHP_ZLIB_INCDIR="$i/include/zlib"
54818 + elif test -f "$i/include/zlib.h"; then
54819 + PHP_ZLIB_DIR="$i"
54820 + PHP_ZLIB_INCDIR="$i/include"
54825 + echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6
54826 +echo "configure:105188: checking for the location of zlib" >&5
54827 + if test "$PHP_ZLIB_DIR" = "no"; then
54828 + { 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; }
54830 + echo "$ac_t""$PHP_ZLIB_DIR" 1>&6
54833 + if test "$ext_shared" = "yes"; then
54834 + ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD"
54835 + if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
54837 - for ac_i in $LIBXML_LIBS; do
54840 + if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
54842 + if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
54843 + ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
54846 + ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
54848 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54849 + ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
54853 if test "$ext_shared" = "yes"; then
54854 - XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread"
54855 + ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD"
54856 + test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_SHARED_LIBADD"
54860 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
54862 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
54863 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
54865 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
54866 if test -n "$unique" && test "`eval $cmd`" = "" ; then
54867 - eval "EXTRA_LDFLAGS$unique=set"
54868 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
54869 + eval "LIBPATH$unique=set"
54871 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
54872 + LDFLAGS="$LDFLAGS -L$ai_p"
54873 + PHP_RPATHS="$PHP_RPATHS $ai_p"
54880 - ac_ii=`echo $ac_i|cut -c 3-`
54884 - c|c_r|pthread*) ;;
54886 - if test "$ext_shared" = "yes"; then
54887 - XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii"
54892 - c|c_r|pthread*) ;;
54894 - LIBS="$LIBS -l$ac_ii"
54911 - ac_ii=`echo $ac_i|cut -c 3-`
54913 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
54914 + if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
54916 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
54918 + if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
54920 + if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
54921 + ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
54924 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
54925 + ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
54927 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54928 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
54929 + ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
54933 - if test "$ext_shared" = "yes"; then
54934 - XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD"
54935 - test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD"
54941 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
54942 @@ -98743,30 +105267,36 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
54957 + c|c_r|pthread*) ;;
54970 - for ac_i in $LIBXML_INCS; do
54973 - ac_ii=`echo $ac_i|cut -c 3-`
54975 - if test "$ac_ii" != "/usr/include"; then
54977 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
54979 + if test "$PHP_ZLIB_INCDIR" != "/usr/include"; then
54981 + if test -z "$PHP_ZLIB_INCDIR" || echo "$PHP_ZLIB_INCDIR" | grep '^/' >/dev/null ; then
54982 + ai_p=$PHP_ZLIB_INCDIR
54985 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
54986 + ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
54988 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
54989 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
54990 + ai_p="$ep_realdir/`basename \"$PHP_ZLIB_INCDIR\"`"
54994 @@ -98787,92 +105317,97 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
55003 + old_CPPFLAGS=$CPPFLAGS
55004 + CPPFLAGS=$INCLUDES
55005 + cat > conftest.$ac_ext <<EOF
55006 +#line 105326 "configure"
55007 +#include "confdefs.h"
55009 - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
55010 -echo "configure:98797: checking whether libxml build works" >&5
55011 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
55012 - echo $ac_n "(cached) $ac_c" 1>&6
55014 +#include <main/php_config.h>
55015 +#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
55022 - $XMLREADER_SHARED_LIBADD
55024 - if test "$cross_compiling" = yes; then
55026 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
55027 + egrep "yes" >/dev/null 2>&1; then
55031 + PHP_PCRE_REGEX=yes
55034 - cat > conftest.$ac_ext <<EOF
55035 -#line 98813 "configure"
55038 + cat > conftest.$ac_ext <<EOF
55039 +#line 105345 "configure"
55040 #include "confdefs.h"
55042 +#include <main/php_config.h>
55043 +#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
55047 - char xmlInitParser();
55054 -if { (eval echo configure:98824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
55056 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
55057 + egrep "yes" >/dev/null 2>&1; then
55061 + PHP_PCRE_REGEX=pecl
55063 - php_cv_libxml_build_works=yes
55067 - echo "configure: failed program was:" >&5
55068 - cat conftest.$ac_ext >&5
55073 + PHP_PCRE_REGEX=no
55075 - echo "$ac_t""no" 1>&6
55076 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
55090 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
55091 - if test "$php_cv_libxml_build_works" = "yes"; then
55092 - cat >> confdefs.h <<\EOF
55093 -#define HAVE_LIBXML 1
55095 + CPPFLAGS=$old_CPPFLAGS
55099 - cat >> confdefs.h <<\EOF
55100 -#define HAVE_XMLREADER 1
55101 + PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \
55102 + lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c \
55103 + lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \
55104 + lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \
55105 + lib/zip_source_free.c lib/zip_unchange_all.c lib/zip_delete.c \
55106 + lib/zip_error_get_sys_type.c lib/zip_file_get_offset.c \
55107 + lib/zip_get_name.c lib/zip_replace.c lib/zip_source_function.c \
55108 + lib/zip_unchange.c lib/zip_dirent.c lib/zip_error_strerror.c \
55109 + lib/zip_filerange_crc.c lib/zip_file_strerror.c lib/zip_get_num_files.c \
55110 + lib/zip_get_archive_flag.c lib/zip_set_archive_flag.c \
55111 + lib/zip_set_name.c lib/zip_source_zip.c lib/zip_unchange_data.c \
55112 + lib/zip_entry_free.c lib/zip_error_to_str.c lib/zip_fopen.c \
55113 + lib/zip_name_locate.c lib/zip_source_buffer.c lib/zip_stat.c \
55114 + lib/zip_entry_new.c lib/zip_err_str.c lib/zip_fopen_index.c \
55115 + lib/zip_get_archive_comment.c lib/zip_get_file_comment.c \
55116 + lib/zip_new.c lib/zip_source_file.c lib/zip_stat_index.c \
55117 + lib/zip_set_archive_comment.c lib/zip_set_file_comment.c \
55118 + lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \
55119 + lib/zip_error_clear.c lib/zip_file_error_clear.c"
55121 + cat >> confdefs.h <<\EOF
55122 +#define HAVE_ZIP 1
55126 - ext_builddir=ext/xmlreader
55127 - ext_srcdir=$abs_srcdir/ext/xmlreader
55129 + ext_builddir=ext/zip
55130 + ext_srcdir=$abs_srcdir/ext/zip
55134 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
55135 - PHP_XMLREADER_SHARED=no
55136 + PHP_ZIP_SHARED=no
55139 - case ext/xmlreader in
55141 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55142 - /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55143 - *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55144 + /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55145 + *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55149 @@ -98887,7 +105422,7 @@ EOF
55153 - for ac_src in php_xmlreader.c; do
55154 + for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
55158 @@ -98910,18 +105445,18 @@ EOF
55162 - EXT_STATIC="$EXT_STATIC xmlreader"
55163 + EXT_STATIC="$EXT_STATIC zip"
55164 if test "$ext_shared" != "nocli"; then
55165 - EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader"
55166 + EXT_CLI_STATIC="$EXT_CLI_STATIC zip"
55169 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
55170 - PHP_XMLREADER_SHARED=yes
55171 + PHP_ZIP_SHARED=yes
55173 - case ext/xmlreader in
55175 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55176 - /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55177 - *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55178 + /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55179 + *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55183 @@ -98936,14 +105471,14 @@ EOF
55187 - for ac_src in php_xmlreader.c; do
55188 + for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
55195 - shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo"
55196 + shared_objects_zip="$shared_objects_zip $ac_bdir$ac_obj.lo"
55199 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55200 @@ -98966,31 +105501,31 @@ EOF
55201 case $host_alias in
55204 - 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'
55205 + 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'
55209 - link_cmd='$(LIBTOOL) --mode=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)'
55210 + link_cmd='$(LIBTOOL) --mode=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)'
55214 - link_cmd='$(LIBTOOL) --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)'
55215 + link_cmd='$(LIBTOOL) --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)'
55219 if test "x" = "xyes"; then
55220 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlreader.$suffix"
55221 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpzip.$suffix"
55223 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix"
55224 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzip.$suffix"
55227 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader"
55228 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip"
55230 cat >>Makefile.objects<<EOF
55231 -\$(phplibdir)/phpxmlreader.$suffix: $ext_builddir/phpxmlreader.$suffix
55232 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlreader.$suffix \$(phplibdir)
55233 +\$(phplibdir)/phpzip.$suffix: $ext_builddir/phpzip.$suffix
55234 + \$(LIBTOOL) --mode=install cp $ext_builddir/phpzip.$suffix \$(phplibdir)
55236 -$ext_builddir/phpxmlreader.$suffix: \$(shared_objects_xmlreader) \$(PHPXMLREADER_SHARED_DEPENDENCIES)
55237 +$ext_builddir/phpzip.$suffix: \$(shared_objects_zip) \$(PHPZIP_SHARED_DEPENDENCIES)
55241 @@ -99000,583 +105535,103 @@ EOF
55243 install_modules="install-modules"
55245 - case $host_alias in
55248 - 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'
55252 - link_cmd='$(LIBTOOL) --mode=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)'
55256 - link_cmd='$(LIBTOOL) --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)'
55260 - if test "x" = "xyes"; then
55261 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlreader.$suffix"
55263 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlreader.$suffix"
55266 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader"
55268 - cat >>Makefile.objects<<EOF
55269 -\$(phplibdir)/xmlreader.$suffix: $ext_builddir/xmlreader.$suffix
55270 - \$(LIBTOOL) --mode=install cp $ext_builddir/xmlreader.$suffix \$(phplibdir)
55272 -$ext_builddir/xmlreader.$suffix: \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_DEPENDENCIES)
55279 - cat >> confdefs.h <<EOF
55280 -#define COMPILE_DL_XMLREADER 1
55286 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
55287 - PHP_XMLREADER_SHARED=no
55288 - case "$PHP_SAPI" in
55292 - case ext/xmlreader in
55293 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55294 - /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55295 - *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55300 - b_c_pre=$php_c_pre
55301 - b_cxx_pre=$php_cxx_pre
55302 - b_c_meta=$php_c_meta
55303 - b_cxx_meta=$php_cxx_meta
55304 - b_c_post=$php_c_post
55305 - b_cxx_post=$php_cxx_post
55310 - for ac_src in php_xmlreader.c; do
55317 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
55320 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55321 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55322 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55323 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
55326 - cat >>Makefile.objects<<EOF
55327 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
55333 - EXT_STATIC="$EXT_STATIC xmlreader"
55338 - case ext/xmlreader in
55339 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55340 - /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55341 - *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55346 - b_c_pre=$php_c_pre
55347 - b_cxx_pre=$php_cxx_pre
55348 - b_c_meta=$php_c_meta
55349 - b_cxx_meta=$php_cxx_meta
55350 - b_c_post=$php_c_post
55351 - b_cxx_post=$php_cxx_post
55356 - for ac_src in php_xmlreader.c; do
55363 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
55366 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55367 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55368 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55369 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
55372 - cat >>Makefile.objects<<EOF
55373 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
55381 - EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader"
55385 - BUILD_DIR="$BUILD_DIR $ext_builddir"
55389 - if test "$ext_builddir" = "."; then
55390 - PHP_PECL_EXTENSION=xmlreader
55392 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
55397 - am_i_shared=$PHP_XMLREADER_SHARED
55398 - is_it_shared=$PHP_DOM_SHARED
55399 - is_it_enabled=$PHP_DOM
55400 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
55401 - { echo "configure: error:
55402 -You've configured extension xmlreader to build statically, but it
55403 -depends on extension dom, which you've configured to build shared.
55404 -You either need to build xmlreader shared or build dom statically for the
55405 -build to be successful.
55408 - if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
55409 - { echo "configure: error:
55410 -You've configured extension xmlreader, which depends on extension dom,
55411 -but you've either not enabled dom, or have disabled it.
55416 - PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD"
55420 - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
55423 - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
55430 -# Local macros for automake & autoconf
55444 -php_with_xmlrpc=no
55446 -echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
55447 -echo "configure:99206: checking for XMLRPC-EPI support" >&5
55448 -# Check whether --with-xmlrpc or --without-xmlrpc was given.
55449 -if test "${with_xmlrpc+set}" = set; then
55450 - withval="$with_xmlrpc"
55451 - PHP_XMLRPC=$withval
55455 - test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL
55461 -ext_output="yes, shared"
55463 -case $PHP_XMLRPC in
55465 - PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'`
55482 -echo "$ac_t""$ext_output" 1>&6
55487 -if test -z "$PHP_LIBXML_DIR"; then
55489 -php_with_libxml_dir=no
55491 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
55492 -echo "configure:99251: checking libxml2 install dir" >&5
55493 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
55494 -if test "${with_libxml_dir+set}" = set; then
55495 - withval="$with_libxml_dir"
55496 - PHP_LIBXML_DIR=$withval
55499 - PHP_LIBXML_DIR=no
55505 -ext_output=$PHP_LIBXML_DIR
55506 -echo "$ac_t""$ext_output" 1>&6
55513 -php_with_libexpat_dir=no
55515 -echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6
55516 -echo "configure:99275: checking libexpat dir for XMLRPC-EPI" >&5
55517 -# Check whether --with-libexpat-dir or --without-libexpat-dir was given.
55518 -if test "${with_libexpat_dir+set}" = set; then
55519 - withval="$with_libexpat_dir"
55520 - PHP_LIBEXPAT_DIR=$withval
55523 - PHP_LIBEXPAT_DIR=no
55529 -ext_output=$PHP_LIBEXPAT_DIR
55530 -echo "$ac_t""$ext_output" 1>&6
55536 -php_with_iconv_dir=no
55538 -echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6
55539 -echo "configure:99298: checking iconv dir for XMLRPC-EPI" >&5
55540 -# Check whether --with-iconv-dir or --without-iconv-dir was given.
55541 -if test "${with_iconv_dir+set}" = set; then
55542 - withval="$with_iconv_dir"
55543 - PHP_ICONV_DIR=$withval
55552 -ext_output=$PHP_ICONV_DIR
55553 -echo "$ac_t""$ext_output" 1>&6
55558 -if test "$PHP_XMLRPC" != "no"; then
55561 - am_i_shared=$PHP_XMLRPC_SHARED
55562 - is_it_shared=$PHP_LIBXML_SHARED
55563 - is_it_enabled=$PHP_LIBXML
55564 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
55565 - { echo "configure: error:
55566 -You've configured extension xmlrpc to build statically, but it
55567 -depends on extension libxml, which you've configured to build shared.
55568 -You either need to build xmlrpc shared or build libxml statically for the
55569 -build to be successful.
55572 - if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
55573 - { echo "configure: error:
55574 -You've configured extension xmlrpc, which depends on extension libxml,
55575 -but you've either not enabled libxml, or have disabled it.
55580 - PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD"
55582 - cat >> confdefs.h <<\EOF
55583 -#define HAVE_XMLRPC 1
55587 - if test "$PHP_LIBEXPAT_DIR" = "no"; then
55589 - if test "$PHP_LIBXML" = "no"; then
55590 - { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
55594 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
55595 -echo "configure:99354: checking for xml2-config path" >&5
55596 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
55597 - echo $ac_n "(cached) $ac_c" 1>&6
55600 - for i in $PHP_LIBXML_DIR /usr/local /usr; do
55601 - if test -x "$i/bin/xml2-config"; then
55602 - ac_cv_php_xml2_config_path="$i/bin/xml2-config"
55609 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
55611 - if test -x "$ac_cv_php_xml2_config_path"; then
55612 - XML2_CONFIG="$ac_cv_php_xml2_config_path"
55613 - libxml_full_version=`$XML2_CONFIG --version`
55616 - set $libxml_full_version
55618 - LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
55619 - if test "$LIBXML_VERSION" -ge "2006011"; then
55620 - LIBXML_LIBS=`$XML2_CONFIG --libs`
55621 - LIBXML_INCS=`$XML2_CONFIG --cflags`
55623 - for ac_i in $LIBXML_LIBS; do
55626 - if test "$ext_shared" = "yes"; then
55627 - XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread"
55631 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
55633 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
55634 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
55635 - eval "EXTRA_LDFLAGS$unique=set"
55636 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
55642 - ac_ii=`echo $ac_i|cut -c 3-`
55646 - c|c_r|pthread*) ;;
55648 - if test "$ext_shared" = "yes"; then
55649 - XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii"
55654 - c|c_r|pthread*) ;;
55656 - LIBS="$LIBS -l$ac_ii"
55668 - ac_ii=`echo $ac_i|cut -c 3-`
55670 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
55672 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
55676 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
55678 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
55679 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
55683 - if test "$ext_shared" = "yes"; then
55684 - XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
55685 - test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
55690 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
55692 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
55693 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
55694 - eval "LIBPATH$unique=set"
55696 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
55697 - LDFLAGS="$LDFLAGS -L$ai_p"
55698 - PHP_RPATHS="$PHP_RPATHS $ai_p"
55710 + case $host_alias in
55713 + 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'
55717 + link_cmd='$(LIBTOOL) --mode=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)'
55721 + link_cmd='$(LIBTOOL) --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)'
55726 - for ac_i in $LIBXML_INCS; do
55729 - ac_ii=`echo $ac_i|cut -c 3-`
55731 - if test "$ac_ii" != "/usr/include"; then
55733 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
55735 + if test "x" = "xyes"; then
55736 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/zip.$suffix"
55739 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
55741 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
55742 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
55743 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/zip.$suffix"
55748 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
55750 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
55751 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
55752 - eval "INCLUDEPATH$unique=set"
55755 - INCLUDES="-I$ai_p $INCLUDES"
55757 - INCLUDES="$INCLUDES -I$ai_p"
55763 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip"
55768 + cat >>Makefile.objects<<EOF
55769 +\$(phplibdir)/zip.$suffix: $ext_builddir/zip.$suffix
55770 + \$(LIBTOOL) --mode=install cp $ext_builddir/zip.$suffix \$(phplibdir)
55772 +$ext_builddir/zip.$suffix: \$(shared_objects_zip) \$(ZIP_SHARED_DEPENDENCIES)
55775 - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
55776 -echo "configure:99512: checking whether libxml build works" >&5
55777 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
55778 - echo $ac_n "(cached) $ac_c" 1>&6
55784 - $XMLRPC_SHARED_LIBADD
55786 - if test "$cross_compiling" = yes; then
55791 - cat > conftest.$ac_ext <<EOF
55792 -#line 99528 "configure"
55793 -#include "confdefs.h"
55797 - char xmlInitParser();
55805 + cat >> confdefs.h <<EOF
55806 +#define COMPILE_DL_ZIP 1
55808 -if { (eval echo configure:99539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
55813 - php_cv_libxml_build_works=yes
55818 + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
55819 + PHP_ZIP_SHARED=no
55820 + case "$PHP_SAPI" in
55825 - echo "configure: failed program was:" >&5
55826 - cat conftest.$ac_ext >&5
55829 + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55830 + /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55831 + *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55836 - echo "$ac_t""no" 1>&6
55837 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
55844 + b_c_pre=$php_c_pre
55845 + b_cxx_pre=$php_cxx_pre
55846 + b_c_meta=$php_c_meta
55847 + b_cxx_meta=$php_cxx_meta
55848 + b_c_post=$php_c_post
55849 + b_cxx_post=$php_cxx_post
55854 + for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
55862 + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
55864 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
55865 - if test "$php_cv_libxml_build_works" = "yes"; then
55866 - cat >> confdefs.h <<\EOF
55867 -#define HAVE_LIBXML 1
55869 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55870 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55871 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55872 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
55875 + cat >>Makefile.objects<<EOF
55876 +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
55883 - if test "$PHP_XML" = "no"; then
55885 + EXT_STATIC="$EXT_STATIC zip"
55892 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
55893 - /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55894 - *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55895 + /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
55896 + *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
55900 @@ -99591,20 +105646,20 @@ EOF
55904 - for ac_src in compat.c; do
55905 + for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
55912 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
55913 + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
55916 - *.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" ;;
55917 - *.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" ;;
55918 - *.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" ;;
55919 - *.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" ;;
55920 + *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55921 + *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55922 + *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
55923 + *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
55926 cat >>Makefile.objects<<EOF
55927 @@ -99614,449 +105669,554 @@ EOF
55934 + EXT_CLI_STATIC="$EXT_CLI_STATIC zip"
55937 - BUILD_DIR="$BUILD_DIR ext/xml"
55939 + BUILD_DIR="$BUILD_DIR $ext_builddir"
55945 - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
55948 - { echo "configure: error: xml2-config not found. Use --with-libxml-dir=<DIR>" 1>&2; exit 1; }
55950 + if test "$ext_builddir" = "."; then
55951 + PHP_PECL_EXTENSION=zip
55953 + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
55959 - for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
55960 - if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
55961 - cat >> confdefs.h <<\EOF
55962 -#define HAVE_LIBEXPAT 1
55966 + $php_shtool mkdir -p $ext_builddir/lib
55971 + PHP_VAR_SUBST="$PHP_VAR_SUBST ZIP_SHARED_LIBADD"
55973 - if test "$ext_shared" = "yes"; then
55974 - XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD"
55975 - if test -n "$i/$PHP_LIBDIR"; then
55977 - if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then
55979 - if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
55980 - ai_p=$i/$PHP_LIBDIR
55983 - ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
55985 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
55986 - ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
55990 - if test "$ext_shared" = "yes"; then
55991 - XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
55992 - test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
55996 + src=$ext_srcdir/Makefile.frag
55997 + ac_srcdir=$ext_srcdir
55998 + ac_builddir=$ext_builddir
55999 + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
56005 +php_enable_http=no
56007 +echo $ac_n "checking whether to enable extended HTTP support""... $ac_c" 1>&6
56008 +echo "configure:105712: checking whether to enable extended HTTP support" >&5
56009 +# Check whether --enable-http or --disable-http was given.
56010 +if test "${enable_http+set}" = set; then
56011 + enableval="$enable_http"
56012 + PHP_HTTP=$enableval
56015 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
56017 + test "$PHP_ENABLE_ALL" && PHP_HTTP=$PHP_ENABLE_ALL
56023 +ext_output="yes, shared"
56027 + PHP_HTTP=`echo "$PHP_HTTP"|$SED 's/^shared,//'`
56044 +echo "$ac_t""$ext_output" 1>&6
56049 +php_with_http_shared_deps=$PHP_HTTP
56051 +echo $ac_n "checking whether to depend on extensions which have been built shared""... $ac_c" 1>&6
56052 +echo "configure:105755: checking whether to depend on extensions which have been built shared" >&5
56053 +# Check whether --with-http-shared-deps or --without-http-shared-deps was given.
56054 +if test "${with_http_shared_deps+set}" = set; then
56055 + withval="$with_http_shared_deps"
56056 + PHP_HTTP_SHARED_DEPS=$withval
56059 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
56060 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
56061 - eval "LIBPATH$unique=set"
56063 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
56064 - LDFLAGS="$LDFLAGS -L$ai_p"
56065 - PHP_RPATHS="$PHP_RPATHS $ai_p"
56066 + PHP_HTTP_SHARED_DEPS=$PHP_HTTP
56079 +ext_output=$PHP_HTTP_SHARED_DEPS
56080 +echo "$ac_t""$ext_output" 1>&6
56082 - if test -n "$i/$PHP_LIBDIR"; then
56084 - if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then
56086 - if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
56087 - ai_p=$i/$PHP_LIBDIR
56090 - ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
56092 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
56093 - ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
56100 +php_with_http_curl_requests=$PHP_HTTP
56102 +echo $ac_n "checking whether to enable cURL HTTP request support""... $ac_c" 1>&6
56103 +echo "configure:105777: checking whether to enable cURL HTTP request support" >&5
56104 +# Check whether --with-http-curl-requests or --without-http-curl-requests was given.
56105 +if test "${with_http_curl_requests+set}" = set; then
56106 + withval="$with_http_curl_requests"
56107 + PHP_HTTP_CURL_REQUESTS=$withval
56110 + PHP_HTTP_CURL_REQUESTS=$PHP_HTTP
56112 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
56117 +ext_output=$PHP_HTTP_CURL_REQUESTS
56118 +echo "$ac_t""$ext_output" 1>&6
56123 +php_with_http_curl_libevent=$PHP_HTTP_CURL_REQUESTS
56125 +echo $ac_n "checking whether to enable libevent support fur cURL""... $ac_c" 1>&6
56126 +echo "configure:105799: checking whether to enable libevent support fur cURL" >&5
56127 +# Check whether --with-http-curl-libevent or --without-http-curl-libevent was given.
56128 +if test "${with_http_curl_libevent+set}" = set; then
56129 + withval="$with_http_curl_libevent"
56130 + PHP_HTTP_CURL_LIBEVENT=$withval
56133 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
56134 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
56135 - eval "LIBPATH$unique=set"
56137 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
56138 - LDFLAGS="$LDFLAGS -L$ai_p"
56139 - PHP_RPATHS="$PHP_RPATHS $ai_p"
56140 + PHP_HTTP_CURL_LIBEVENT=$PHP_HTTP_CURL_REQUESTS
56150 +ext_output=$PHP_HTTP_CURL_LIBEVENT
56151 +echo "$ac_t""$ext_output" 1>&6
56156 +php_with_http_zlib_compression=$PHP_HTTP
56158 +echo $ac_n "checking whether to enable zlib encodings support""... $ac_c" 1>&6
56159 +echo "configure:105821: checking whether to enable zlib encodings support" >&5
56160 +# Check whether --with-http-zlib-compression or --without-http-zlib-compression was given.
56161 +if test "${with_http_zlib_compression+set}" = set; then
56162 + withval="$with_http_zlib_compression"
56163 + PHP_HTTP_ZLIB_COMPRESSION=$withval
56166 + PHP_HTTP_ZLIB_COMPRESSION=$PHP_HTTP
56169 - c|c_r|pthread*) ;;
56171 - LIBS="-lexpat $LIBS"
56178 +ext_output=$PHP_HTTP_ZLIB_COMPRESSION
56179 +echo "$ac_t""$ext_output" 1>&6
56185 - if test "$i/include" != "/usr/include"; then
56187 - if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then
56191 - ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`"
56193 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
56194 - ai_p="$ep_realdir/`basename \"$i/include\"`"
56198 +php_with_http_magic_mime="no"
56200 +echo $ac_n "checking whether to enable response content type guessing""... $ac_c" 1>&6
56201 +echo "configure:105843: checking whether to enable response content type guessing" >&5
56202 +# Check whether --with-http-magic-mime or --without-http-magic-mime was given.
56203 +if test "${with_http_magic_mime+set}" = set; then
56204 + withval="$with_http_magic_mime"
56205 + PHP_HTTP_MAGIC_MIME=$withval
56208 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
56209 + PHP_HTTP_MAGIC_MIME="no"
56211 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
56212 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
56213 - eval "INCLUDEPATH$unique=set"
56216 - INCLUDES="-I$ai_p $INCLUDES"
56218 - INCLUDES="$INCLUDES -I$ai_p"
56223 +ext_output=$PHP_HTTP_MAGIC_MIME
56224 +echo "$ac_t""$ext_output" 1>&6
56229 +if test "$PHP_HTTP" != "no"; then
56232 + echo $ac_n "checking for egrep""... $ac_c" 1>&6
56233 +echo "configure:105866: checking for egrep" >&5
56234 +if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then
56235 + echo $ac_n "(cached) $ac_c" 1>&6
56237 + if echo a | (grep -E '(a|b)') >/dev/null 2>&1
56238 + then ac_cv_prog_egrep='grep -E'
56239 + else ac_cv_prog_egrep='egrep'
56243 +echo "$ac_t""$ac_cv_prog_egrep" 1>&6
56244 + EGREP=$ac_cv_prog_egrep
56250 + echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
56251 +echo "configure:105884: checking for a sed that does not truncate output" >&5
56252 +if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
56253 + echo $ac_n "(cached) $ac_c" 1>&6
56255 + # Loop through the user's path and test for sed and gsed.
56256 +# Then use that list of sed's as ones to test for truncation.
56257 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
56258 +for as_dir in $PATH
56261 + test -z "$as_dir" && as_dir=.
56262 + for lt_ac_prog in sed gsed; do
56263 + for ac_exec_ext in '' $ac_executable_extensions; do
56264 + if test -f "$as_dir/$lt_ac_prog$ac_exec_ext"; then
56265 + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
56273 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris
56274 +# along with /bin/sed that truncates output.
56275 +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
56276 + test ! -f $lt_ac_sed && continue
56277 + cat /dev/null > conftest.in
56279 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in
56280 + # Check for GNU sed and select it if it is found.
56281 + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
56282 + lt_cv_path_SED=$lt_ac_sed
56286 + cat conftest.in conftest.in >conftest.tmp
56287 + mv conftest.tmp conftest.in
56288 + cp conftest.in conftest.nl
56289 + echo >>conftest.nl
56290 + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
56291 + cmp -s conftest.out conftest.nl || break
56292 + # 10000 chars as input seems more than enough
56293 + test $lt_ac_count -gt 10 && break
56294 + lt_ac_count=`expr $lt_ac_count + 1`
56295 + if test $lt_ac_count -gt $lt_ac_max; then
56296 + lt_ac_max=$lt_ac_count
56297 + lt_cv_path_SED=$lt_ac_sed
56304 +SED=$lt_cv_path_SED
56305 +echo "$ac_t""$SED" 1>&6
56310 + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
56311 +echo "configure:105943: checking how to run the C preprocessor" >&5
56312 +# On Suns, sometimes $CPP names a directory.
56313 +if test -n "$CPP" && test -d "$CPP"; then
56316 +if test -z "$CPP"; then
56317 +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
56318 + echo $ac_n "(cached) $ac_c" 1>&6
56320 + # This must be in double quotes, not single quotes, because CPP may get
56321 + # substituted into the Makefile and "${CC-cc}" will confuse make.
56322 + CPP="${CC-cc} -E"
56323 + # On the NeXT, cc -E runs the code through the compiler's parser,
56324 + # not just through cpp.
56325 + cat > conftest.$ac_ext <<EOF
56326 +#line 105958 "configure"
56327 +#include "confdefs.h"
56328 +#include <assert.h>
56331 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
56332 +{ (eval echo configure:105964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
56333 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
56334 +if test -z "$ac_err"; then
56337 + echo "$ac_err" >&5
56338 + echo "configure: failed program was:" >&5
56339 + cat conftest.$ac_ext >&5
56341 + CPP="${CC-cc} -E -traditional-cpp"
56342 + cat > conftest.$ac_ext <<EOF
56343 +#line 105975 "configure"
56344 +#include "confdefs.h"
56345 +#include <assert.h>
56348 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
56349 +{ (eval echo configure:105981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
56350 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
56351 +if test -z "$ac_err"; then
56354 + echo "$ac_err" >&5
56355 + echo "configure: failed program was:" >&5
56356 + cat conftest.$ac_ext >&5
56358 + CPP="${CC-cc} -nologo -E"
56359 + cat > conftest.$ac_ext <<EOF
56360 +#line 105992 "configure"
56361 +#include "confdefs.h"
56362 +#include <assert.h>
56365 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
56366 +{ (eval echo configure:105998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
56367 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
56368 +if test -z "$ac_err"; then
56371 + echo "$ac_err" >&5
56372 + echo "configure: failed program was:" >&5
56373 + cat conftest.$ac_ext >&5
56382 + ac_cv_prog_CPP="$CPP"
56384 + CPP="$ac_cv_prog_CPP"
56386 + ac_cv_prog_CPP="$CPP"
56388 +echo "$ac_t""$CPP" 1>&6
56392 + if test "$PHP_HTTP_SHARED_DEPS" != "no"; then
56393 + cat >> confdefs.h <<\EOF
56394 +#define HTTP_SHARED_DEPS 1
56402 + cat >> confdefs.h <<\EOF
56403 +#define HTTP_SHARED_DEPS 0
56406 - if test "$testval" = "no"; then
56407 - { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" 1>&2; exit 1; }
56416 + if test "x$PHP_LIBDIR" = "x"; then
56420 - if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then
56421 + for ac_hdr in netdb.h unistd.h
56423 +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
56424 +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
56425 +echo "configure:106047: checking for $ac_hdr" >&5
56426 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
56427 + echo $ac_n "(cached) $ac_c" 1>&6
56429 + cat > conftest.$ac_ext <<EOF
56430 +#line 106052 "configure"
56431 +#include "confdefs.h"
56432 +#include <$ac_hdr>
56434 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
56435 +{ (eval echo configure:106057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
56436 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
56437 +if test -z "$ac_err"; then
56439 + eval "ac_cv_header_$ac_safe=yes"
56441 + echo "$ac_err" >&5
56442 + echo "configure: failed program was:" >&5
56443 + cat conftest.$ac_ext >&5
56445 + eval "ac_cv_header_$ac_safe=no"
56449 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
56450 + echo "$ac_t""yes" 1>&6
56451 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
56452 + cat >> confdefs.h <<EOF
56453 +#define $ac_tr_hdr 1
56457 + echo "$ac_t""no" 1>&6
56461 - if test "$PHP_ICONV_DIR" != "no"; then
56462 - PHP_ICONV=$PHP_ICONV_DIR
56465 - if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
56469 + unset ac_cv_func_gethostname
56470 + unset ac_cv_func___gethostname
56477 - # Create the directories for a VPATH build:
56478 - $php_shtool mkdir -p ext/iconv
56480 - echo > ext/iconv/php_have_bsd_iconv.h
56481 - echo > ext/iconv/php_have_ibm_iconv.h
56482 - echo > ext/iconv/php_have_glibc_iconv.h
56483 - echo > ext/iconv/php_have_libiconv.h
56484 - echo > ext/iconv/php_have_iconv.h
56485 - echo > ext/iconv/php_php_iconv_impl.h
56486 - echo > ext/iconv/php_iconv_aliased_libiconv.h
56487 - echo > ext/iconv/php_php_iconv_h_path.h
56488 - echo > ext/iconv/php_iconv_supports_errno.h
56490 - if test "$PHP_ICONV" = "yes"; then
56491 - echo $ac_n "checking for iconv""... $ac_c" 1>&6
56492 -echo "configure:99808: checking for iconv" >&5
56493 -if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
56494 + echo $ac_n "checking for gethostname""... $ac_c" 1>&6
56495 +echo "configure:106089: checking for gethostname" >&5
56496 +if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
56497 echo $ac_n "(cached) $ac_c" 1>&6
56499 cat > conftest.$ac_ext <<EOF
56500 -#line 99813 "configure"
56501 +#line 106094 "configure"
56502 #include "confdefs.h"
56503 /* System header to define __stub macros and hopefully few prototypes,
56504 - which can conflict with char iconv(); below. */
56505 + which can conflict with char gethostname(); below. */
56506 #include <assert.h>
56507 /* Override any gcc2 internal prototype to avoid an error. */
56508 /* We use char because int might match the return type of a gcc2
56509 builtin and then its argument prototype would still apply. */
56511 +char gethostname();
56515 /* The GNU C library defines this for functions which it implements
56516 to always fail with ENOSYS. Some functions are actually named
56517 something starting with __ and the normal name is an alias. */
56518 -#if defined (__stub_iconv) || defined (__stub___iconv)
56519 +#if defined (__stub_gethostname) || defined (__stub___gethostname)
56528 -if { (eval echo configure:99836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
56529 +if { (eval echo configure:106117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
56531 - eval "ac_cv_func_iconv=yes"
56532 + eval "ac_cv_func_gethostname=yes"
56534 echo "configure: failed program was:" >&5
56535 cat conftest.$ac_ext >&5
56537 - eval "ac_cv_func_iconv=no"
56538 + eval "ac_cv_func_gethostname=no"
56543 -if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then
56544 +if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then
56545 echo "$ac_t""yes" 1>&6
56551 echo "$ac_t""no" 1>&6
56553 - echo $ac_n "checking for libiconv""... $ac_c" 1>&6
56554 -echo "configure:99857: checking for libiconv" >&5
56555 -if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
56556 + echo $ac_n "checking for __gethostname""... $ac_c" 1>&6
56557 +echo "configure:106135: checking for __gethostname" >&5
56558 +if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then
56559 echo $ac_n "(cached) $ac_c" 1>&6
56561 cat > conftest.$ac_ext <<EOF
56562 -#line 99862 "configure"
56563 +#line 106140 "configure"
56564 #include "confdefs.h"
56565 /* System header to define __stub macros and hopefully few prototypes,
56566 - which can conflict with char libiconv(); below. */
56567 + which can conflict with char __gethostname(); below. */
56568 #include <assert.h>
56569 /* Override any gcc2 internal prototype to avoid an error. */
56570 /* We use char because int might match the return type of a gcc2
56571 builtin and then its argument prototype would still apply. */
56573 +char __gethostname();
56577 /* The GNU C library defines this for functions which it implements
56578 to always fail with ENOSYS. Some functions are actually named
56579 something starting with __ and the normal name is an alias. */
56580 -#if defined (__stub_libiconv) || defined (__stub___libiconv)
56581 +#if defined (__stub___gethostname) || defined (__stub_____gethostname)
56590 -if { (eval echo configure:99885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
56591 +if { (eval echo configure:106163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
56593 - eval "ac_cv_func_libiconv=yes"
56594 + eval "ac_cv_func___gethostname=yes"
56596 echo "configure: failed program was:" >&5
56597 cat conftest.$ac_ext >&5
56599 - eval "ac_cv_func_libiconv=no"
56600 + eval "ac_cv_func___gethostname=no"
56605 -if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then
56606 +if eval "test \"`echo '$ac_cv_func_'__gethostname`\" = yes"; then
56607 echo "$ac_t""yes" 1>&6
56610 - echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
56612 - cat >> confdefs.h <<\EOF
56613 -#define HAVE_LIBICONV 1
56620 echo "$ac_t""no" 1>&6
56630 - if test "$found_iconv" = "no"; then
56632 - for i in $PHP_ICONV /usr/local /usr; do
56633 - if test -r $i/include/giconv.h; then
56634 - cat >> confdefs.h <<\EOF
56635 -#define HAVE_GICONV_H 1
56638 + cat >> confdefs.h <<\EOF
56639 +#define HAVE_GETHOSTNAME 1
56643 - iconv_lib_name=giconv
56645 - elif test -r $i/include/iconv.h; then
56647 - iconv_lib_name=iconv
56652 - if test -z "$ICONV_DIR"; then
56653 - { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
56656 - if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
56657 - test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
56660 - save_old_LDFLAGS=$LDFLAGS
56662 - -L$ICONV_DIR/$PHP_LIBDIR
56665 - save_ext_shared=$ext_shared
56668 - for ac_i in $ac_stuff; do
56671 - if test "$ext_shared" = "yes"; then
56672 - LDFLAGS="$LDFLAGS -pthread"
56676 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
56678 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
56679 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
56680 - eval "EXTRA_LDFLAGS$unique=set"
56681 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
56687 - ac_ii=`echo $ac_i|cut -c 3-`
56691 - c|c_r|pthread*) ;;
56693 - if test "$ext_shared" = "yes"; then
56694 - LDFLAGS="$LDFLAGS -l$ac_ii"
56699 - c|c_r|pthread*) ;;
56701 - LIBS="$LIBS -l$ac_ii"
56713 - ac_ii=`echo $ac_i|cut -c 3-`
56715 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
56717 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
56721 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
56723 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
56724 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
56728 - if test "$ext_shared" = "yes"; then
56729 - LDFLAGS="-L$ai_p $LDFLAGS"
56730 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
56735 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
56736 + ac_cv_func_gethostname=yes
56739 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
56740 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
56741 - eval "LIBPATH$unique=set"
56743 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
56744 - LDFLAGS="$LDFLAGS -L$ai_p"
56745 - PHP_RPATHS="$PHP_RPATHS $ai_p"
56759 - echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
56760 -echo "configure:100041: checking for libiconv in -l$iconv_lib_name" >&5
56761 -ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
56762 + unset ac_cv_lib_nsl_gethostname
56763 + unset ac_cv_lib_nsl___gethostname
56765 + echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
56766 +echo "configure:106201: checking for gethostname in -lnsl" >&5
56767 +ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
56768 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
56769 echo $ac_n "(cached) $ac_c" 1>&6
56771 ac_save_LIBS="$LIBS"
56772 -LIBS="-l$iconv_lib_name $LIBS"
56773 +LIBS="-lnsl $LIBS"
56774 cat > conftest.$ac_ext <<EOF
56775 -#line 100049 "configure"
56776 +#line 106209 "configure"
56777 #include "confdefs.h"
56778 /* Override any gcc2 internal prototype to avoid an error. */
56779 /* We use char because int might match the return type of a gcc2
56780 builtin and then its argument prototype would still apply. */
56782 +char gethostname();
56789 -if { (eval echo configure:100060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
56790 +if { (eval echo configure:106220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
56792 eval "ac_cv_lib_$ac_lib_var=yes"
56794 @@ -100071,1294 +106231,1580 @@ LIBS="$ac_save_LIBS"
56796 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
56797 echo "$ac_t""yes" 1>&6
56799 - LDFLAGS=$save_old_LDFLAGS
56800 - ext_shared=$save_ext_shared
56804 - echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
56806 - cat >> confdefs.h <<\EOF
56807 -#define HAVE_LIBICONV 1
56811 - echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h
56813 - cat >> confdefs.h <<\EOF
56814 -#define ICONV_ALIASED_LIBICONV 1
56821 echo "$ac_t""no" 1>&6
56823 - LDFLAGS=$save_old_LDFLAGS
56824 - ext_shared=$save_ext_shared
56825 - unset ac_cv_lib_$iconv_lib_name_libiconv
56828 - save_old_LDFLAGS=$LDFLAGS
56830 - -L$ICONV_DIR/$PHP_LIBDIR
56833 - save_ext_shared=$ext_shared
56836 - for ac_i in $ac_stuff; do
56839 - if test "$ext_shared" = "yes"; then
56840 - LDFLAGS="$LDFLAGS -pthread"
56844 - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
56846 - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
56847 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
56848 - eval "EXTRA_LDFLAGS$unique=set"
56849 - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
56855 - ac_ii=`echo $ac_i|cut -c 3-`
56859 - c|c_r|pthread*) ;;
56861 - if test "$ext_shared" = "yes"; then
56862 - LDFLAGS="$LDFLAGS -l$ac_ii"
56867 - c|c_r|pthread*) ;;
56869 - LIBS="$LIBS -l$ac_ii"
56881 - ac_ii=`echo $ac_i|cut -c 3-`
56883 - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
56885 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
56889 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
56891 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
56892 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
56896 - if test "$ext_shared" = "yes"; then
56897 - LDFLAGS="-L$ai_p $LDFLAGS"
56898 - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
56903 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
56905 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
56906 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
56907 - eval "LIBPATH$unique=set"
56909 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
56910 - LDFLAGS="$LDFLAGS -L$ai_p"
56911 - PHP_RPATHS="$PHP_RPATHS $ai_p"
56924 - echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
56925 -echo "configure:100201: checking for iconv in -l$iconv_lib_name" >&5
56926 -ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
56927 + echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6
56928 +echo "configure:106240: checking for __gethostname in -lnsl" >&5
56929 +ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'`
56930 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
56931 echo $ac_n "(cached) $ac_c" 1>&6
56933 ac_save_LIBS="$LIBS"
56934 -LIBS="-l$iconv_lib_name $LIBS"
56935 +LIBS="-lnsl $LIBS"
56936 cat > conftest.$ac_ext <<EOF
56937 -#line 100209 "configure"
56938 +#line 106248 "configure"
56939 #include "confdefs.h"
56940 /* Override any gcc2 internal prototype to avoid an error. */
56941 /* We use char because int might match the return type of a gcc2
56942 builtin and then its argument prototype would still apply. */
56944 +char __gethostname();
56951 -if { (eval echo configure:100220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
56952 +if { (eval echo configure:106259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
56954 eval "ac_cv_lib_$ac_lib_var=yes"
56956 echo "configure: failed program was:" >&5
56957 cat conftest.$ac_ext >&5
56959 - eval "ac_cv_lib_$ac_lib_var=no"
56962 -LIBS="$ac_save_LIBS"
56965 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
56966 - echo "$ac_t""yes" 1>&6
56968 - LDFLAGS=$save_old_LDFLAGS
56969 - ext_shared=$save_ext_shared
56975 - echo "$ac_t""no" 1>&6
56977 - LDFLAGS=$save_old_LDFLAGS
56978 - ext_shared=$save_ext_shared
56979 - unset ac_cv_lib_$iconv_lib_name_iconv
56991 - if test "$found_iconv" = "yes"; then
56993 - echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h
56995 - cat >> confdefs.h <<\EOF
56996 -#define HAVE_ICONV 1
56999 - if test -n "$ICONV_DIR"; then
57002 - if test "$ext_shared" = "yes"; then
57003 - XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD"
57004 - if test -n "$ICONV_DIR/$PHP_LIBDIR"; then
57006 - if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
57008 - if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
57009 - ai_p=$ICONV_DIR/$PHP_LIBDIR
57012 - ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
57014 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
57015 - ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
57019 - if test "$ext_shared" = "yes"; then
57020 - XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
57021 - test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
57026 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
57028 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
57029 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
57030 - eval "LIBPATH$unique=set"
57032 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
57033 - LDFLAGS="$LDFLAGS -L$ai_p"
57034 - PHP_RPATHS="$PHP_RPATHS $ai_p"
57046 + eval "ac_cv_lib_$ac_lib_var=no"
57049 +LIBS="$ac_save_LIBS"
57051 - if test -n "$ICONV_DIR/$PHP_LIBDIR"; then
57053 - if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then
57055 - if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
57056 - ai_p=$ICONV_DIR/$PHP_LIBDIR
57059 - ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
57061 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
57062 - ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
57065 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
57066 + echo "$ac_t""yes" 1>&6
57069 + echo "$ac_t""no" 1>&6
57077 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
57079 - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
57080 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
57081 - eval "LIBPATH$unique=set"
57083 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
57084 - LDFLAGS="$LDFLAGS -L$ai_p"
57085 - PHP_RPATHS="$PHP_RPATHS $ai_p"
57093 + if test "$found" = "yes"; then
57095 + LIBS="$LIBS -lnsl"
57096 + if test "$cross_compiling" = yes; then
57099 + cat > conftest.$ac_ext <<EOF
57100 +#line 106291 "configure"
57101 +#include "confdefs.h"
57102 +main() { return (0); }
57104 +if { (eval echo configure:106295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57108 + echo "configure: failed program was:" >&5
57109 + cat conftest.$ac_ext >&5
57119 + if test "$found" = "yes"; then
57123 - case $iconv_lib_name in
57127 - LIBS="-l$iconv_lib_name $LIBS"
57128 + LIBS="-lnsl $LIBS"
57133 + cat >> confdefs.h <<\EOF
57134 +#define HAVE_GETHOSTNAME 1
57137 + cat >> confdefs.h <<\EOF
57138 +#define HAVE_LIBNSL 1
57145 - if test "$ICONV_DIR/include" != "/usr/include"; then
57147 - if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then
57148 - ai_p=$ICONV_DIR/include
57149 + ac_cv_func_gethostname=yes
57152 - ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
57154 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
57155 - ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`"
57162 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
57165 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
57166 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
57167 - eval "INCLUDEPATH$unique=set"
57170 - INCLUDES="-I$ai_p $INCLUDES"
57172 - INCLUDES="$INCLUDES -I$ai_p"
57180 + unset ac_cv_func_getdomainname
57181 + unset ac_cv_func___getdomainname
57184 + echo $ac_n "checking for getdomainname""... $ac_c" 1>&6
57185 +echo "configure:106346: checking for getdomainname" >&5
57186 +if eval "test \"`echo '$''{'ac_cv_func_getdomainname'+set}'`\" = set"; then
57187 + echo $ac_n "(cached) $ac_c" 1>&6
57189 + cat > conftest.$ac_ext <<EOF
57190 +#line 106351 "configure"
57191 +#include "confdefs.h"
57192 +/* System header to define __stub macros and hopefully few prototypes,
57193 + which can conflict with char getdomainname(); below. */
57194 +#include <assert.h>
57195 +/* Override any gcc2 internal prototype to avoid an error. */
57196 +/* We use char because int might match the return type of a gcc2
57197 + builtin and then its argument prototype would still apply. */
57198 +char getdomainname();
57203 - { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; }
57210 +/* The GNU C library defines this for functions which it implements
57211 + to always fail with ENOSYS. Some functions are actually named
57212 + something starting with __ and the normal name is an alias. */
57213 +#if defined (__stub_getdomainname) || defined (__stub___getdomainname)
57219 -if test "$PHP_XMLRPC" = "yes"; then
57220 - # Extract the first word of "ranlib", so it can be a program name with args.
57221 -set dummy ranlib; ac_word=$2
57222 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
57223 -echo "configure:100410: checking for $ac_word" >&5
57224 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
57225 - echo $ac_n "(cached) $ac_c" 1>&6
57227 - if test -n "$RANLIB"; then
57228 - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
57231 +if { (eval echo configure:106374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
57233 + eval "ac_cv_func_getdomainname=yes"
57235 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
57237 - for ac_dir in $ac_dummy; do
57238 - test -z "$ac_dir" && ac_dir=.
57239 - if test -f $ac_dir/$ac_word; then
57240 - ac_cv_prog_RANLIB="ranlib"
57244 - IFS="$ac_save_ifs"
57245 - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
57246 + echo "configure: failed program was:" >&5
57247 + cat conftest.$ac_ext >&5
57249 + eval "ac_cv_func_getdomainname=no"
57253 -RANLIB="$ac_cv_prog_RANLIB"
57254 -if test -n "$RANLIB"; then
57255 - echo "$ac_t""$RANLIB" 1>&6
57257 +if eval "test \"`echo '$ac_cv_func_'getdomainname`\" = yes"; then
57258 + echo "$ac_t""yes" 1>&6
57261 echo "$ac_t""no" 1>&6
57264 -echo $ac_n "checking for inline""... $ac_c" 1>&6
57265 -echo "configure:100438: checking for inline" >&5
57266 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
57267 + echo $ac_n "checking for __getdomainname""... $ac_c" 1>&6
57268 +echo "configure:106392: checking for __getdomainname" >&5
57269 +if eval "test \"`echo '$''{'ac_cv_func___getdomainname'+set}'`\" = set"; then
57270 echo $ac_n "(cached) $ac_c" 1>&6
57272 - ac_cv_c_inline=no
57273 -for ac_kw in inline __inline__ __inline; do
57274 cat > conftest.$ac_ext <<EOF
57275 -#line 100445 "configure"
57276 +#line 106397 "configure"
57277 #include "confdefs.h"
57278 +/* System header to define __stub macros and hopefully few prototypes,
57279 + which can conflict with char __getdomainname(); below. */
57280 +#include <assert.h>
57281 +/* Override any gcc2 internal prototype to avoid an error. */
57282 +/* We use char because int might match the return type of a gcc2
57283 + builtin and then its argument prototype would still apply. */
57284 +char __getdomainname();
57289 +/* The GNU C library defines this for functions which it implements
57290 + to always fail with ENOSYS. Some functions are actually named
57291 + something starting with __ and the normal name is an alias. */
57292 +#if defined (__stub___getdomainname) || defined (__stub_____getdomainname)
57295 +__getdomainname();
57300 -if { (eval echo configure:100452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
57301 +if { (eval echo configure:106420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
57303 - ac_cv_c_inline=$ac_kw; break
57304 + eval "ac_cv_func___getdomainname=yes"
57306 echo "configure: failed program was:" >&5
57307 cat conftest.$ac_ext >&5
57309 + eval "ac_cv_func___getdomainname=no"
57316 -echo "$ac_t""$ac_cv_c_inline" 1>&6
57317 -case "$ac_cv_c_inline" in
57319 - no) cat >> confdefs.h <<\EOF
57323 - *) cat >> confdefs.h <<EOF
57324 -#define inline $ac_cv_c_inline
57333 +if eval "test \"`echo '$ac_cv_func_'__getdomainname`\" = yes"; then
57334 + echo "$ac_t""yes" 1>&6
57337 + echo "$ac_t""no" 1>&6
57344 -cat >> confdefs.h <<\EOF
57345 -#define UNDEF_THREADS_HACK
57348 + cat >> confdefs.h <<\EOF
57349 +#define HAVE_GETDOMAINNAME 1
57354 -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
57355 -echo "configure:100490: checking for ANSI C header files" >&5
57356 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
57357 + ac_cv_func_getdomainname=yes
57362 + unset ac_cv_lib_nsl_getdomainname
57363 + unset ac_cv_lib_nsl___getdomainname
57365 + echo $ac_n "checking for getdomainname in -lnsl""... $ac_c" 1>&6
57366 +echo "configure:106458: checking for getdomainname in -lnsl" >&5
57367 +ac_lib_var=`echo nsl'_'getdomainname | sed 'y%./+-%__p_%'`
57368 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
57369 echo $ac_n "(cached) $ac_c" 1>&6
57371 - cat > conftest.$ac_ext <<EOF
57372 -#line 100495 "configure"
57373 + ac_save_LIBS="$LIBS"
57374 +LIBS="-lnsl $LIBS"
57375 +cat > conftest.$ac_ext <<EOF
57376 +#line 106466 "configure"
57377 #include "confdefs.h"
57378 -#include <stdlib.h>
57379 -#include <stdarg.h>
57380 -#include <string.h>
57381 -#include <float.h>
57382 +/* Override any gcc2 internal prototype to avoid an error. */
57383 +/* We use char because int might match the return type of a gcc2
57384 + builtin and then its argument prototype would still apply. */
57385 +char getdomainname();
57391 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
57392 -{ (eval echo configure:100503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
57393 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
57394 -if test -z "$ac_err"; then
57395 +if { (eval echo configure:106477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
57397 - ac_cv_header_stdc=yes
57398 + eval "ac_cv_lib_$ac_lib_var=yes"
57400 - echo "$ac_err" >&5
57401 echo "configure: failed program was:" >&5
57402 cat conftest.$ac_ext >&5
57404 - ac_cv_header_stdc=no
57405 + eval "ac_cv_lib_$ac_lib_var=no"
57408 +LIBS="$ac_save_LIBS"
57410 -if test $ac_cv_header_stdc = yes; then
57411 - # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
57413 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
57414 + echo "$ac_t""yes" 1>&6
57417 + echo "$ac_t""no" 1>&6
57419 + echo $ac_n "checking for __getdomainname in -lnsl""... $ac_c" 1>&6
57420 +echo "configure:106497: checking for __getdomainname in -lnsl" >&5
57421 +ac_lib_var=`echo nsl'_'__getdomainname | sed 'y%./+-%__p_%'`
57422 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
57423 + echo $ac_n "(cached) $ac_c" 1>&6
57425 + ac_save_LIBS="$LIBS"
57426 +LIBS="-lnsl $LIBS"
57427 cat > conftest.$ac_ext <<EOF
57428 -#line 100520 "configure"
57429 +#line 106505 "configure"
57430 #include "confdefs.h"
57431 -#include <string.h>
57432 +/* Override any gcc2 internal prototype to avoid an error. */
57433 +/* We use char because int might match the return type of a gcc2
57434 + builtin and then its argument prototype would still apply. */
57435 +char __getdomainname();
57441 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
57442 - egrep "memchr" >/dev/null 2>&1; then
57444 +if { (eval echo configure:106516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
57446 + eval "ac_cv_lib_$ac_lib_var=yes"
57448 + echo "configure: failed program was:" >&5
57449 + cat conftest.$ac_ext >&5
57451 - ac_cv_header_stdc=no
57452 + eval "ac_cv_lib_$ac_lib_var=no"
57455 +LIBS="$ac_save_LIBS"
57459 -if test $ac_cv_header_stdc = yes; then
57460 - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
57461 -cat > conftest.$ac_ext <<EOF
57462 -#line 100538 "configure"
57463 -#include "confdefs.h"
57464 -#include <stdlib.h>
57466 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
57467 - egrep "free" >/dev/null 2>&1; then
57469 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
57470 + echo "$ac_t""yes" 1>&6
57474 - ac_cv_header_stdc=no
57475 + echo "$ac_t""no" 1>&6
57483 -if test $ac_cv_header_stdc = yes; then
57484 - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
57485 -if test "$cross_compiling" = yes; then
57488 + if test "$found" = "yes"; then
57490 + LIBS="$LIBS -lnsl"
57491 + if test "$cross_compiling" = yes; then
57494 cat > conftest.$ac_ext <<EOF
57495 -#line 100559 "configure"
57496 +#line 106548 "configure"
57497 #include "confdefs.h"
57498 -#include <ctype.h>
57499 -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
57500 -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
57501 -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
57502 -int main () { int i; for (i = 0; i < 256; i++)
57503 -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
57506 +main() { return (0); }
57508 -if { (eval echo configure:100570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57509 +if { (eval echo configure:106552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57514 echo "configure: failed program was:" >&5
57515 cat conftest.$ac_ext >&5
57517 - ac_cv_header_stdc=no
57528 -echo "$ac_t""$ac_cv_header_stdc" 1>&6
57529 -if test $ac_cv_header_stdc = yes; then
57530 - cat >> confdefs.h <<\EOF
57531 -#define STDC_HEADERS 1
57532 + if test "$found" = "yes"; then
57536 + c|c_r|pthread*) ;;
57538 + LIBS="-lnsl $LIBS"
57543 + cat >> confdefs.h <<\EOF
57544 +#define HAVE_GETDOMAINNAME 1
57548 + cat >> confdefs.h <<\EOF
57549 +#define HAVE_LIBNSL 1
57552 -for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h
57554 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
57555 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
57556 -echo "configure:100597: checking for $ac_hdr" >&5
57557 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
57558 + ac_cv_func_getdomainname=yes
57570 + unset ac_cv_func_getservbyport
57571 + unset ac_cv_func___getservbyport
57574 + echo $ac_n "checking for getservbyport""... $ac_c" 1>&6
57575 +echo "configure:106603: checking for getservbyport" >&5
57576 +if eval "test \"`echo '$''{'ac_cv_func_getservbyport'+set}'`\" = set"; then
57577 echo $ac_n "(cached) $ac_c" 1>&6
57579 cat > conftest.$ac_ext <<EOF
57580 -#line 100602 "configure"
57581 +#line 106608 "configure"
57582 #include "confdefs.h"
57583 -#include <$ac_hdr>
57584 +/* System header to define __stub macros and hopefully few prototypes,
57585 + which can conflict with char getservbyport(); below. */
57586 +#include <assert.h>
57587 +/* Override any gcc2 internal prototype to avoid an error. */
57588 +/* We use char because int might match the return type of a gcc2
57589 + builtin and then its argument prototype would still apply. */
57590 +char getservbyport();
57594 +/* The GNU C library defines this for functions which it implements
57595 + to always fail with ENOSYS. Some functions are actually named
57596 + something starting with __ and the normal name is an alias. */
57597 +#if defined (__stub_getservbyport) || defined (__stub___getservbyport)
57605 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
57606 -{ (eval echo configure:100607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
57607 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
57608 -if test -z "$ac_err"; then
57609 +if { (eval echo configure:106631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
57611 - eval "ac_cv_header_$ac_safe=yes"
57612 + eval "ac_cv_func_getservbyport=yes"
57614 - echo "$ac_err" >&5
57615 echo "configure: failed program was:" >&5
57616 cat conftest.$ac_ext >&5
57618 - eval "ac_cv_header_$ac_safe=no"
57619 + eval "ac_cv_func_getservbyport=no"
57623 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
57625 +if eval "test \"`echo '$ac_cv_func_'getservbyport`\" = yes"; then
57626 echo "$ac_t""yes" 1>&6
57627 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
57628 - cat >> confdefs.h <<EOF
57629 -#define $ac_tr_hdr 1
57632 + echo "$ac_t""no" 1>&6
57633 + echo $ac_n "checking for __getservbyport""... $ac_c" 1>&6
57634 +echo "configure:106649: checking for __getservbyport" >&5
57635 +if eval "test \"`echo '$''{'ac_cv_func___getservbyport'+set}'`\" = set"; then
57636 + echo $ac_n "(cached) $ac_c" 1>&6
57638 + cat > conftest.$ac_ext <<EOF
57639 +#line 106654 "configure"
57640 +#include "confdefs.h"
57641 +/* System header to define __stub macros and hopefully few prototypes,
57642 + which can conflict with char __getservbyport(); below. */
57643 +#include <assert.h>
57644 +/* Override any gcc2 internal prototype to avoid an error. */
57645 +/* We use char because int might match the return type of a gcc2
57646 + builtin and then its argument prototype would still apply. */
57647 +char __getservbyport();
57651 +/* The GNU C library defines this for functions which it implements
57652 + to always fail with ENOSYS. Some functions are actually named
57653 + something starting with __ and the normal name is an alias. */
57654 +#if defined (__stub___getservbyport) || defined (__stub_____getservbyport)
57657 +__getservbyport();
57663 +if { (eval echo configure:106677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
57665 + eval "ac_cv_func___getservbyport=yes"
57667 + echo "configure: failed program was:" >&5
57668 + cat conftest.$ac_ext >&5
57670 + eval "ac_cv_func___getservbyport=no"
57675 +if eval "test \"`echo '$ac_cv_func_'__getservbyport`\" = yes"; then
57676 + echo "$ac_t""yes" 1>&6
57679 echo "$ac_t""no" 1>&6
57689 + cat >> confdefs.h <<\EOF
57690 +#define HAVE_GETSERVBYPORT 1
57693 + ac_cv_func_getservbyport=yes
57698 + unset ac_cv_lib_nsl_getservbyport
57699 + unset ac_cv_lib_nsl___getservbyport
57701 + echo $ac_n "checking for getservbyport in -lnsl""... $ac_c" 1>&6
57702 +echo "configure:106715: checking for getservbyport in -lnsl" >&5
57703 +ac_lib_var=`echo nsl'_'getservbyport | sed 'y%./+-%__p_%'`
57704 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
57705 + echo $ac_n "(cached) $ac_c" 1>&6
57707 + ac_save_LIBS="$LIBS"
57708 +LIBS="-lnsl $LIBS"
57709 +cat > conftest.$ac_ext <<EOF
57710 +#line 106723 "configure"
57711 +#include "confdefs.h"
57712 +/* Override any gcc2 internal prototype to avoid an error. */
57713 +/* We use char because int might match the return type of a gcc2
57714 + builtin and then its argument prototype would still apply. */
57715 +char getservbyport();
57721 +if { (eval echo configure:106734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
57723 + eval "ac_cv_lib_$ac_lib_var=yes"
57725 + echo "configure: failed program was:" >&5
57726 + cat conftest.$ac_ext >&5
57728 + eval "ac_cv_lib_$ac_lib_var=no"
57731 +LIBS="$ac_save_LIBS"
57734 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
57735 + echo "$ac_t""yes" 1>&6
57738 + echo "$ac_t""no" 1>&6
57740 -echo $ac_n "checking size of char""... $ac_c" 1>&6
57741 -echo "configure:100639: checking size of char" >&5
57742 -if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
57743 + echo $ac_n "checking for __getservbyport in -lnsl""... $ac_c" 1>&6
57744 +echo "configure:106754: checking for __getservbyport in -lnsl" >&5
57745 +ac_lib_var=`echo nsl'_'__getservbyport | sed 'y%./+-%__p_%'`
57746 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
57747 echo $ac_n "(cached) $ac_c" 1>&6
57749 - if test "$cross_compiling" = yes; then
57750 - ac_cv_sizeof_char=1
57752 - cat > conftest.$ac_ext <<EOF
57753 -#line 100647 "configure"
57754 + ac_save_LIBS="$LIBS"
57755 +LIBS="-lnsl $LIBS"
57756 +cat > conftest.$ac_ext <<EOF
57757 +#line 106762 "configure"
57758 #include "confdefs.h"
57759 -#include <stdio.h>
57760 -#include <sys/types.h>
57763 - FILE *f=fopen("conftestval", "w");
57765 - fprintf(f, "%d\n", sizeof(char));
57768 +/* Override any gcc2 internal prototype to avoid an error. */
57769 +/* We use char because int might match the return type of a gcc2
57770 + builtin and then its argument prototype would still apply. */
57771 +char __getservbyport();
57777 -if { (eval echo configure:100659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57779 - ac_cv_sizeof_char=`cat conftestval`
57780 +if { (eval echo configure:106773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
57782 + eval "ac_cv_lib_$ac_lib_var=yes"
57784 echo "configure: failed program was:" >&5
57785 cat conftest.$ac_ext >&5
57787 - ac_cv_sizeof_char=0
57791 + eval "ac_cv_lib_$ac_lib_var=no"
57794 +LIBS="$ac_save_LIBS"
57797 -echo "$ac_t""$ac_cv_sizeof_char" 1>&6
57798 -cat >> confdefs.h <<EOF
57799 -#define SIZEOF_CHAR $ac_cv_sizeof_char
57801 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
57802 + echo "$ac_t""yes" 1>&6
57805 + echo "$ac_t""no" 1>&6
57813 -echo $ac_n "checking size of int""... $ac_c" 1>&6
57814 -echo "configure:100680: checking size of int" >&5
57815 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
57816 - echo $ac_n "(cached) $ac_c" 1>&6
57818 - if test "$cross_compiling" = yes; then
57819 - ac_cv_sizeof_int=4
57820 + if test "$found" = "yes"; then
57822 + LIBS="$LIBS -lnsl"
57823 + if test "$cross_compiling" = yes; then
57826 cat > conftest.$ac_ext <<EOF
57827 -#line 100688 "configure"
57828 +#line 106805 "configure"
57829 #include "confdefs.h"
57830 -#include <stdio.h>
57831 -#include <sys/types.h>
57834 - FILE *f=fopen("conftestval", "w");
57836 - fprintf(f, "%d\n", sizeof(int));
57839 +main() { return (0); }
57841 -if { (eval echo configure:100700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57842 +if { (eval echo configure:106809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57844 - ac_cv_sizeof_int=`cat conftestval`
57847 echo "configure: failed program was:" >&5
57848 cat conftest.$ac_ext >&5
57850 - ac_cv_sizeof_int=0
57857 -echo "$ac_t""$ac_cv_sizeof_int" 1>&6
57858 -cat >> confdefs.h <<EOF
57859 -#define SIZEOF_INT $ac_cv_sizeof_int
57863 + if test "$found" = "yes"; then
57867 + c|c_r|pthread*) ;;
57869 + LIBS="-lnsl $LIBS"
57874 + cat >> confdefs.h <<\EOF
57875 +#define HAVE_GETSERVBYPORT 1
57878 + cat >> confdefs.h <<\EOF
57879 +#define HAVE_LIBNSL 1
57882 -echo $ac_n "checking size of long""... $ac_c" 1>&6
57883 -echo "configure:100720: checking size of long" >&5
57884 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
57885 + ac_cv_func_getservbyport=yes
57897 + unset ac_cv_func_getservbyname
57898 + unset ac_cv_func___getservbyname
57901 + echo $ac_n "checking for getservbyname""... $ac_c" 1>&6
57902 +echo "configure:106860: checking for getservbyname" >&5
57903 +if eval "test \"`echo '$''{'ac_cv_func_getservbyname'+set}'`\" = set"; then
57904 echo $ac_n "(cached) $ac_c" 1>&6
57906 - if test "$cross_compiling" = yes; then
57907 - ac_cv_sizeof_long=4
57909 cat > conftest.$ac_ext <<EOF
57910 -#line 100728 "configure"
57911 +#line 106865 "configure"
57912 #include "confdefs.h"
57913 -#include <stdio.h>
57914 -#include <sys/types.h>
57917 - FILE *f=fopen("conftestval", "w");
57919 - fprintf(f, "%d\n", sizeof(long));
57922 +/* System header to define __stub macros and hopefully few prototypes,
57923 + which can conflict with char getservbyname(); below. */
57924 +#include <assert.h>
57925 +/* Override any gcc2 internal prototype to avoid an error. */
57926 +/* We use char because int might match the return type of a gcc2
57927 + builtin and then its argument prototype would still apply. */
57928 +char getservbyname();
57932 +/* The GNU C library defines this for functions which it implements
57933 + to always fail with ENOSYS. Some functions are actually named
57934 + something starting with __ and the normal name is an alias. */
57935 +#if defined (__stub_getservbyname) || defined (__stub___getservbyname)
57943 -if { (eval echo configure:100740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
57945 - ac_cv_sizeof_long=`cat conftestval`
57946 +if { (eval echo configure:106888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
57948 + eval "ac_cv_func_getservbyname=yes"
57950 echo "configure: failed program was:" >&5
57951 cat conftest.$ac_ext >&5
57953 - ac_cv_sizeof_long=0
57957 + eval "ac_cv_func_getservbyname=no"
57962 -echo "$ac_t""$ac_cv_sizeof_long" 1>&6
57963 -cat >> confdefs.h <<EOF
57964 -#define SIZEOF_LONG $ac_cv_sizeof_long
57968 -echo $ac_n "checking size of long long""... $ac_c" 1>&6
57969 -echo "configure:100760: checking size of long long" >&5
57970 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
57971 - echo $ac_n "(cached) $ac_c" 1>&6
57972 +if eval "test \"`echo '$ac_cv_func_'getservbyname`\" = yes"; then
57973 + echo "$ac_t""yes" 1>&6
57976 - if test "$cross_compiling" = yes; then
57977 - ac_cv_sizeof_long_long=8
57978 + echo "$ac_t""no" 1>&6
57979 + echo $ac_n "checking for __getservbyname""... $ac_c" 1>&6
57980 +echo "configure:106906: checking for __getservbyname" >&5
57981 +if eval "test \"`echo '$''{'ac_cv_func___getservbyname'+set}'`\" = set"; then
57982 + echo $ac_n "(cached) $ac_c" 1>&6
57984 cat > conftest.$ac_ext <<EOF
57985 -#line 100768 "configure"
57986 +#line 106911 "configure"
57987 #include "confdefs.h"
57988 -#include <stdio.h>
57989 -#include <sys/types.h>
57992 - FILE *f=fopen("conftestval", "w");
57994 - fprintf(f, "%d\n", sizeof(long long));
57997 +/* System header to define __stub macros and hopefully few prototypes,
57998 + which can conflict with char __getservbyname(); below. */
57999 +#include <assert.h>
58000 +/* Override any gcc2 internal prototype to avoid an error. */
58001 +/* We use char because int might match the return type of a gcc2
58002 + builtin and then its argument prototype would still apply. */
58003 +char __getservbyname();
58007 +/* The GNU C library defines this for functions which it implements
58008 + to always fail with ENOSYS. Some functions are actually named
58009 + something starting with __ and the normal name is an alias. */
58010 +#if defined (__stub___getservbyname) || defined (__stub_____getservbyname)
58013 +__getservbyname();
58018 -if { (eval echo configure:100780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
58020 - ac_cv_sizeof_long_long=`cat conftestval`
58021 +if { (eval echo configure:106934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
58023 + eval "ac_cv_func___getservbyname=yes"
58025 echo "configure: failed program was:" >&5
58026 cat conftest.$ac_ext >&5
58028 - ac_cv_sizeof_long_long=0
58030 + eval "ac_cv_func___getservbyname=no"
58036 +if eval "test \"`echo '$ac_cv_func_'__getservbyname`\" = yes"; then
58037 + echo "$ac_t""yes" 1>&6
58040 + echo "$ac_t""no" 1>&6
58045 -echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
58046 -cat >> confdefs.h <<EOF
58047 -#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
58051 -echo $ac_n "checking for size_t""... $ac_c" 1>&6
58052 -echo "configure:100800: checking for size_t" >&5
58053 -if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
58056 + cat >> confdefs.h <<\EOF
58057 +#define HAVE_GETSERVBYNAME 1
58060 + ac_cv_func_getservbyname=yes
58065 + unset ac_cv_lib_nsl_getservbyname
58066 + unset ac_cv_lib_nsl___getservbyname
58068 + echo $ac_n "checking for getservbyname in -lnsl""... $ac_c" 1>&6
58069 +echo "configure:106972: checking for getservbyname in -lnsl" >&5
58070 +ac_lib_var=`echo nsl'_'getservbyname | sed 'y%./+-%__p_%'`
58071 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
58072 echo $ac_n "(cached) $ac_c" 1>&6
58074 - cat > conftest.$ac_ext <<EOF
58075 -#line 100805 "configure"
58076 + ac_save_LIBS="$LIBS"
58077 +LIBS="-lnsl $LIBS"
58078 +cat > conftest.$ac_ext <<EOF
58079 +#line 106980 "configure"
58080 #include "confdefs.h"
58081 -#include <sys/types.h>
58083 -#include <stdlib.h>
58084 -#include <stddef.h>
58086 +/* Override any gcc2 internal prototype to avoid an error. */
58087 +/* We use char because int might match the return type of a gcc2
58088 + builtin and then its argument prototype would still apply. */
58089 +char getservbyname();
58095 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
58096 - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
58097 +if { (eval echo configure:106991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
58099 - ac_cv_type_size_t=yes
58100 + eval "ac_cv_lib_$ac_lib_var=yes"
58102 + echo "configure: failed program was:" >&5
58103 + cat conftest.$ac_ext >&5
58105 - ac_cv_type_size_t=no
58106 + eval "ac_cv_lib_$ac_lib_var=no"
58109 +LIBS="$ac_save_LIBS"
58112 -echo "$ac_t""$ac_cv_type_size_t" 1>&6
58113 -if test $ac_cv_type_size_t = no; then
58114 - cat >> confdefs.h <<\EOF
58115 -#define size_t unsigned
58119 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
58120 + echo "$ac_t""yes" 1>&6
58123 + echo "$ac_t""no" 1>&6
58125 -echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
58126 -echo "configure:100833: checking whether time.h and sys/time.h may both be included" >&5
58127 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
58128 + echo $ac_n "checking for __getservbyname in -lnsl""... $ac_c" 1>&6
58129 +echo "configure:107011: checking for __getservbyname in -lnsl" >&5
58130 +ac_lib_var=`echo nsl'_'__getservbyname | sed 'y%./+-%__p_%'`
58131 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
58132 echo $ac_n "(cached) $ac_c" 1>&6
58134 - cat > conftest.$ac_ext <<EOF
58135 -#line 100838 "configure"
58136 + ac_save_LIBS="$LIBS"
58137 +LIBS="-lnsl $LIBS"
58138 +cat > conftest.$ac_ext <<EOF
58139 +#line 107019 "configure"
58140 #include "confdefs.h"
58141 -#include <sys/types.h>
58142 -#include <sys/time.h>
58144 +/* Override any gcc2 internal prototype to avoid an error. */
58145 +/* We use char because int might match the return type of a gcc2
58146 + builtin and then its argument prototype would still apply. */
58147 +char __getservbyname();
58154 -if { (eval echo configure:100847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
58155 +if { (eval echo configure:107030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
58157 - ac_cv_header_time=yes
58158 + eval "ac_cv_lib_$ac_lib_var=yes"
58160 echo "configure: failed program was:" >&5
58161 cat conftest.$ac_ext >&5
58163 - ac_cv_header_time=no
58164 + eval "ac_cv_lib_$ac_lib_var=no"
58168 +LIBS="$ac_save_LIBS"
58170 -echo "$ac_t""$ac_cv_header_time" 1>&6
58171 -if test $ac_cv_header_time = yes; then
58172 - cat >> confdefs.h <<\EOF
58173 -#define TIME_WITH_SYS_TIME 1
58176 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
58177 + echo "$ac_t""yes" 1>&6
58180 + echo "$ac_t""no" 1>&6
58187 -echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
58188 -echo "configure:100868: checking for uid_t in sys/types.h" >&5
58189 -if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
58190 - echo $ac_n "(cached) $ac_c" 1>&6
58192 + if test "$found" = "yes"; then
58194 + LIBS="$LIBS -lnsl"
58195 + if test "$cross_compiling" = yes; then
58198 cat > conftest.$ac_ext <<EOF
58199 -#line 100873 "configure"
58200 +#line 107062 "configure"
58201 #include "confdefs.h"
58202 -#include <sys/types.h>
58203 +main() { return (0); }
58205 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
58206 - egrep "uid_t" >/dev/null 2>&1; then
58208 - ac_cv_type_uid_t=yes
58209 +if { (eval echo configure:107066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
58214 - ac_cv_type_uid_t=no
58215 + echo "configure: failed program was:" >&5
58216 + cat conftest.$ac_ext >&5
58225 -echo "$ac_t""$ac_cv_type_uid_t" 1>&6
58226 -if test $ac_cv_type_uid_t = no; then
58227 - cat >> confdefs.h <<\EOF
58232 + if test "$found" = "yes"; then
58236 + c|c_r|pthread*) ;;
58238 + LIBS="-lnsl $LIBS"
58243 + cat >> confdefs.h <<\EOF
58244 +#define HAVE_GETSERVBYNAME 1
58247 - cat >> confdefs.h <<\EOF
58249 + cat >> confdefs.h <<\EOF
58250 +#define HAVE_LIBNSL 1
58254 + ac_cv_func_getservbyname=yes
58266 + if test "$PHP_HTTP_ZLIB_COMPRESSION" != "no"; then
58267 + echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
58268 +echo "configure:107114: checking for zlib.h" >&5
58270 + for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do
58271 + if test -f "$i/include/zlib.h"; then
58276 + if test "x$ZLIB_DIR" = "x"; then
58277 + echo "$ac_t""not found" 1>&6
58278 + { echo "configure: error: could not find zlib.h" 1>&2; exit 1; }
58280 + echo "$ac_t""found in $ZLIB_DIR" 1>&6
58281 + echo $ac_n "checking for zlib version >= 1.2.0.4""... $ac_c" 1>&6
58282 +echo "configure:107128: checking for zlib version >= 1.2.0.4" >&5
58283 + ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[^0-9\.]//g'`
58284 + echo "$ac_t""$ZLIB_VERSION" 1>&6
58285 + if test `echo $ZLIB_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then
58286 + { echo "configure: error: libz version greater or equal to 1.2.0.4 required" 1>&2; exit 1; }
58289 + if test "$ZLIB_DIR/include" != "/usr/include"; then
58291 + if test -z "$ZLIB_DIR/include" || echo "$ZLIB_DIR/include" | grep '^/' >/dev/null ; then
58292 + ai_p=$ZLIB_DIR/include
58295 + ep_dir="`echo $ZLIB_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
58297 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
58298 + ai_p="$ep_realdir/`basename \"$ZLIB_DIR/include\"`"
58303 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
58305 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
58306 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
58307 + eval "INCLUDEPATH$unique=set"
58310 + INCLUDES="-I$ai_p $INCLUDES"
58312 + INCLUDES="$INCLUDES -I$ai_p"
58321 + if test "$ext_shared" = "yes"; then
58322 + HTTP_SHARED_LIBADD="-lz $HTTP_SHARED_LIBADD"
58323 + if test -n "$ZLIB_DIR/$PHP_LIBDIR"; then
58325 + if test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
58327 + if test -z "$ZLIB_DIR/$PHP_LIBDIR" || echo "$ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
58328 + ai_p=$ZLIB_DIR/$PHP_LIBDIR
58331 + ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
58333 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
58334 + ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`"
58338 + if test "$ext_shared" = "yes"; then
58339 + HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
58340 + test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
58345 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
58347 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
58348 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
58349 + eval "LIBPATH$unique=set"
58351 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
58352 + LDFLAGS="$LDFLAGS -L$ai_p"
58353 + PHP_RPATHS="$PHP_RPATHS $ai_p"
58358 -# Standard XMLRPC list
58360 - strtoul strtoull snprintf \
58361 - strstr strpbrk strerror\
58364 -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
58365 -echo "configure:100913: checking for $ac_func" >&5
58366 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
58375 + if test -n "$ZLIB_DIR/$PHP_LIBDIR"; then
58377 + if test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
58379 + if test -z "$ZLIB_DIR/$PHP_LIBDIR" || echo "$ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
58380 + ai_p=$ZLIB_DIR/$PHP_LIBDIR
58383 + ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
58385 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
58386 + ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`"
58393 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
58395 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
58396 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
58397 + eval "LIBPATH$unique=set"
58399 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
58400 + LDFLAGS="$LDFLAGS -L$ai_p"
58401 + PHP_RPATHS="$PHP_RPATHS $ai_p"
58413 + c|c_r|pthread*) ;;
58425 + cat >> confdefs.h <<\EOF
58426 +#define HTTP_HAVE_ZLIB 1
58433 + if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then
58434 + echo $ac_n "checking for curl/curl.h""... $ac_c" 1>&6
58435 +echo "configure:107272: checking for curl/curl.h" >&5
58437 + for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do
58438 + if test -f "$i/include/curl/curl.h"; then
58443 + if test "x$CURL_DIR" = "x"; then
58444 + echo "$ac_t""not found" 1>&6
58445 + { echo "configure: error: could not find curl/curl.h" 1>&2; exit 1; }
58447 + echo "$ac_t""found in $CURL_DIR" 1>&6
58450 + echo $ac_n "checking for curl-config""... $ac_c" 1>&6
58451 +echo "configure:107288: checking for curl-config" >&5
58453 + for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do
58454 + if test -x "$i"; then
58459 + if test "x$CURL_CONFIG" = "x"; then
58460 + echo "$ac_t""not found" 1>&6
58461 + { echo "configure: error: could not find curl-config" 1>&2; exit 1; }
58463 + echo "$ac_t""found: $CURL_CONFIG" 1>&6
58466 + echo $ac_n "checking for curl version >= 7.12.3""... $ac_c" 1>&6
58467 +echo "configure:107304: checking for curl version >= 7.12.3" >&5
58468 + CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[^0-9\.]//g'`
58469 + echo "$ac_t""$CURL_VERSION" 1>&6
58470 + if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then
58471 + { echo "configure: error: libcurl version greater or equal to 7.12.3 required" 1>&2; exit 1; }
58475 + save_INCLUDES="$INCLUDES"
58477 + save_LIBS="$LIBS"
58479 + save_CFLAGS="$CFLAGS"
58480 + CFLAGS=`$CURL_CONFIG --cflags`
58481 + save_LDFLAGS="$LDFLAGS"
58482 + LDFLAGS=`$CURL_CONFIG --libs`
58483 + LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
58485 + echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
58486 +echo "configure:107323: checking for SSL support in libcurl" >&5
58487 + CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
58488 + if test "$CURL_SSL" = "SSL"; then
58489 + echo "$ac_t""yes" 1>&6
58490 + cat >> confdefs.h <<\EOF
58491 +#define HTTP_HAVE_SSL 1
58495 + echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
58496 +echo "configure:107333: checking for openssl support in libcurl" >&5
58497 + if test "$cross_compiling" = yes; then
58499 + echo "$ac_t""no" 1>&6
58502 + cat > conftest.$ac_ext <<EOF
58503 +#line 107340 "configure"
58504 +#include "confdefs.h"
58506 + #include <curl/curl.h>
58507 + int main(int argc, char *argv[]) {
58508 + curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
58509 + if (data && data->ssl_version && *data->ssl_version) {
58510 + const char *ptr = data->ssl_version;
58511 + while(*ptr == ' ') ++ptr;
58512 + return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
58518 +if { (eval echo configure:107355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
58521 + echo "$ac_t""yes" 1>&6
58522 + ac_safe=`echo "openssl/crypto.h" | sed 'y%./+-%__p_%'`
58523 +echo $ac_n "checking for openssl/crypto.h""... $ac_c" 1>&6
58524 +echo "configure:107361: checking for openssl/crypto.h" >&5
58525 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
58526 echo $ac_n "(cached) $ac_c" 1>&6
58528 cat > conftest.$ac_ext <<EOF
58529 -#line 100918 "configure"
58530 +#line 107366 "configure"
58531 #include "confdefs.h"
58532 -/* System header to define __stub macros and hopefully few prototypes,
58533 - which can conflict with char $ac_func(); below. */
58534 -#include <assert.h>
58535 -/* Override any gcc2 internal prototype to avoid an error. */
58536 -/* We use char because int might match the return type of a gcc2
58537 - builtin and then its argument prototype would still apply. */
58539 +#include <openssl/crypto.h>
58541 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
58542 +{ (eval echo configure:107371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
58543 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
58544 +if test -z "$ac_err"; then
58546 + eval "ac_cv_header_$ac_safe=yes"
58548 + echo "$ac_err" >&5
58549 + echo "configure: failed program was:" >&5
58550 + cat conftest.$ac_ext >&5
58552 + eval "ac_cv_header_$ac_safe=no"
58556 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
58557 + echo "$ac_t""yes" 1>&6
58559 + cat >> confdefs.h <<\EOF
58560 +#define HTTP_HAVE_OPENSSL 1
58566 + echo "$ac_t""no" 1>&6
58569 -/* The GNU C library defines this for functions which it implements
58570 - to always fail with ENOSYS. Some functions are actually named
58571 - something starting with __ and the normal name is an alias. */
58572 -#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
58579 + echo "configure: failed program was:" >&5
58580 + cat conftest.$ac_ext >&5
58583 + echo "$ac_t""no" 1>&6
58591 + echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
58592 +echo "configure:107411: checking for gnutls support in libcurl" >&5
58593 + if test "$cross_compiling" = yes; then
58595 + echo "$ac_t""no" 1>&6
58598 + cat > conftest.$ac_ext <<EOF
58599 +#line 107418 "configure"
58600 +#include "confdefs.h"
58602 + #include <curl/curl.h>
58603 + int main(int argc, char *argv[]) {
58604 + curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
58605 + if (data && data->ssl_version && *data->ssl_version) {
58606 + const char *ptr = data->ssl_version;
58607 + while(*ptr == ' ') ++ptr;
58608 + return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
58614 +if { (eval echo configure:107433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
58617 + echo "$ac_t""yes" 1>&6
58618 + ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'`
58619 +echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6
58620 +echo "configure:107439: checking for gcrypt.h" >&5
58621 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
58622 + echo $ac_n "(cached) $ac_c" 1>&6
58624 + cat > conftest.$ac_ext <<EOF
58625 +#line 107444 "configure"
58626 +#include "confdefs.h"
58627 +#include <gcrypt.h>
58629 -if { (eval echo configure:100941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
58630 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
58631 +{ (eval echo configure:107449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
58632 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
58633 +if test -z "$ac_err"; then
58635 - eval "ac_cv_func_$ac_func=yes"
58636 + eval "ac_cv_header_$ac_safe=yes"
58638 + echo "$ac_err" >&5
58639 echo "configure: failed program was:" >&5
58640 cat conftest.$ac_ext >&5
58642 - eval "ac_cv_func_$ac_func=no"
58643 + eval "ac_cv_header_$ac_safe=no"
58648 -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
58649 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
58650 echo "$ac_t""yes" 1>&6
58651 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
58652 - cat >> confdefs.h <<EOF
58653 -#define $ac_tr_func 1
58655 + cat >> confdefs.h <<\EOF
58656 +#define HTTP_HAVE_GNUTLS 1
58662 echo "$ac_t""no" 1>&6
58671 + echo "configure: failed program was:" >&5
58672 + cat conftest.$ac_ext >&5
58675 - ext_builddir=ext/xmlrpc
58676 - ext_srcdir=$abs_srcdir/ext/xmlrpc
58677 + echo "$ac_t""no" 1>&6
58683 - ac_extra=`echo "-I@ext_srcdir@/libxmlrpc -DVERSION="0.50""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
58685 + echo "$ac_t""no" 1>&6
58688 + INCLUDES="$save_INCLUDES"
58689 + LIBS="$save_LIBS"
58690 + CFLAGS="$save_CFLAGS"
58691 + LDFLAGS="$save_LDFLAGS"
58694 + echo $ac_n "checking for bundled SSL CA info""... $ac_c" 1>&6
58695 +echo "configure:107498: checking for bundled SSL CA info" >&5
58697 + for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do
58698 + if test -f "$i"; then
58703 + if test "x$CURL_CAINFO" = "x"; then
58704 + echo "$ac_t""not found" 1>&6
58706 + echo "$ac_t""$CURL_CAINFO" 1>&6
58707 + cat >> confdefs.h <<EOF
58708 +#define HTTP_CURL_CAINFO "$CURL_CAINFO"
58714 + if test "$CURL_DIR/include" != "/usr/include"; then
58716 + if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then
58717 + ai_p=$CURL_DIR/include
58720 + ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
58722 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
58723 + ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`"
58726 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
58727 - PHP_XMLRPC_SHARED=no
58730 - case ext/xmlrpc in
58731 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
58732 - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
58733 - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
58736 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
58738 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
58739 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
58740 + eval "INCLUDEPATH$unique=set"
58743 + INCLUDES="-I$ai_p $INCLUDES"
58745 + INCLUDES="$INCLUDES -I$ai_p"
58750 - b_c_pre=$php_c_pre
58751 - b_cxx_pre=$php_cxx_pre
58752 - b_c_meta=$php_c_meta
58753 - b_cxx_meta=$php_cxx_meta
58754 - b_c_post=$php_c_post
58755 - b_cxx_post=$php_cxx_post
58762 - for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
58763 - libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
58764 - libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
58765 - libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
58766 - libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
58767 - libxmlrpc/xml_to_soap.c; do
58773 + if test "$ext_shared" = "yes"; then
58774 + HTTP_SHARED_LIBADD="-lcurl $HTTP_SHARED_LIBADD"
58775 + if test -n "$CURL_DIR/$PHP_LIBDIR"; then
58777 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
58780 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58781 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58782 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58783 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
58786 - cat >>Makefile.objects<<EOF
58787 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
58793 - EXT_STATIC="$EXT_STATIC xmlrpc"
58794 - if test "$ext_shared" != "nocli"; then
58795 - EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
58797 + if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
58799 + if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
58800 + ai_p=$CURL_DIR/$PHP_LIBDIR
58802 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
58803 - PHP_XMLRPC_SHARED=yes
58805 - case ext/xmlrpc in
58806 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
58807 - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
58808 - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
58811 + ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
58813 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
58814 + ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
58818 + if test "$ext_shared" = "yes"; then
58819 + HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
58820 + test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
58826 - b_c_pre=$shared_c_pre
58827 - b_cxx_pre=$shared_cxx_pre
58828 - b_c_meta=$shared_c_meta
58829 - b_cxx_meta=$shared_cxx_meta
58830 - b_c_post=$shared_c_post
58831 - b_cxx_post=$shared_cxx_post
58836 - for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
58837 - libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
58838 - libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
58839 - libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
58840 - libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
58841 - libxmlrpc/xml_to_soap.c; do
58842 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
58849 - shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo"
58852 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58853 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58854 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
58855 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
58858 - cat >>Makefile.objects<<EOF
58859 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
58864 - case $host_alias in
58867 - install_modules="install-modules"
58869 - case $host_alias in
58872 - 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'
58876 - link_cmd='$(LIBTOOL) --mode=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)'
58880 - link_cmd='$(LIBTOOL) --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)'
58884 - if test "x" = "xyes"; then
58885 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix"
58887 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix"
58889 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
58890 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
58891 + eval "LIBPATH$unique=set"
58893 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
58894 + LDFLAGS="$LDFLAGS -L$ai_p"
58895 + PHP_RPATHS="$PHP_RPATHS $ai_p"
58897 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
58899 - cat >>Makefile.objects<<EOF
58900 -\$(phplibdir)/phpxmlrpc.$suffix: $ext_builddir/phpxmlrpc.$suffix
58901 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlrpc.$suffix \$(phplibdir)
58903 -$ext_builddir/phpxmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(PHPXMLRPC_SHARED_DEPENDENCIES)
58912 - install_modules="install-modules"
58917 - case $host_alias in
58920 - 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'
58924 - link_cmd='$(LIBTOOL) --mode=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)'
58928 - link_cmd='$(LIBTOOL) --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)'
58935 - if test "x" = "xyes"; then
58936 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix"
58937 + if test -n "$CURL_DIR/$PHP_LIBDIR"; then
58939 + if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
58941 + if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
58942 + ai_p=$CURL_DIR/$PHP_LIBDIR
58944 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix"
58946 + ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
58948 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
58949 + ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
58952 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
58954 - cat >>Makefile.objects<<EOF
58955 -\$(phplibdir)/xmlrpc.$suffix: $ext_builddir/xmlrpc.$suffix
58956 - \$(LIBTOOL) --mode=install cp $ext_builddir/xmlrpc.$suffix \$(phplibdir)
58958 -$ext_builddir/xmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(XMLRPC_SHARED_DEPENDENCIES)
58966 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
58968 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
58969 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
58970 + eval "LIBPATH$unique=set"
58972 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
58973 + LDFLAGS="$LDFLAGS -L$ai_p"
58974 + PHP_RPATHS="$PHP_RPATHS $ai_p"
58980 - cat >> confdefs.h <<EOF
58981 -#define COMPILE_DL_XMLRPC 1
58988 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
58989 - PHP_XMLRPC_SHARED=no
58990 - case "$PHP_SAPI" in
58994 - case ext/xmlrpc in
58995 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
58996 - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
58997 - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
59003 - b_c_pre=$php_c_pre
59004 - b_cxx_pre=$php_cxx_pre
59005 - b_c_meta=$php_c_meta
59006 - b_cxx_meta=$php_cxx_meta
59007 - b_c_post=$php_c_post
59008 - b_cxx_post=$php_cxx_post
59011 + c|c_r|pthread*) ;;
59013 + LIBS="-lcurl $LIBS"
59019 - for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
59020 - libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
59021 - libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
59022 - libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
59023 - libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
59024 - libxmlrpc/xml_to_soap.c; do
59031 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
59034 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59035 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59036 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59037 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
59040 - cat >>Makefile.objects<<EOF
59041 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
59048 - EXT_STATIC="$EXT_STATIC xmlrpc"
59052 + for ac_i in `$CURL_CONFIG --libs`; do
59055 + if test "$ext_shared" = "yes"; then
59056 + HTTP_SHARED_LIBADD="$HTTP_SHARED_LIBADD -pthread"
59060 - case ext/xmlrpc in
59061 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
59062 - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
59063 - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
59066 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
59068 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
59069 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
59070 + eval "EXTRA_LDFLAGS$unique=set"
59071 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
59074 - b_c_pre=$php_c_pre
59075 - b_cxx_pre=$php_cxx_pre
59076 - b_c_meta=$php_c_meta
59077 - b_cxx_meta=$php_cxx_meta
59078 - b_c_post=$php_c_post
59079 - b_cxx_post=$php_cxx_post
59084 - for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \
59085 - libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
59086 - libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
59087 - libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \
59088 - libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \
59089 - libxmlrpc/xml_to_soap.c; do
59093 + ac_ii=`echo $ac_i|cut -c 3-`
59101 + c|c_r|pthread*) ;;
59103 + if test "$ext_shared" = "yes"; then
59104 + HTTP_SHARED_LIBADD="$HTTP_SHARED_LIBADD -l$ac_ii"
59107 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
59110 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59111 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59112 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59113 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
59116 - cat >>Makefile.objects<<EOF
59117 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
59123 + c|c_r|pthread*) ;;
59125 + LIBS="$LIBS -l$ac_ii"
59132 - EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
59136 - BUILD_DIR="$BUILD_DIR $ext_builddir"
59143 - if test "$ext_builddir" = "."; then
59144 - PHP_PECL_EXTENSION=xmlrpc
59147 + ac_ii=`echo $ac_i|cut -c 3-`
59149 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
59151 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
59153 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
59157 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
59159 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
59160 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
59164 + if test "$ext_shared" = "yes"; then
59165 + HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
59166 + test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
59171 - BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc"
59172 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
59174 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
59175 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
59176 + eval "LIBPATH$unique=set"
59178 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
59179 + LDFLAGS="$LDFLAGS -L$ai_p"
59180 + PHP_RPATHS="$PHP_RPATHS $ai_p"
59184 - XMLRPC_MODULE_TYPE=builtin
59186 -elif test "$PHP_XMLRPC" != "no"; then
59188 - if test -r $PHP_XMLRPC/include/xmlrpc.h; then
59189 - XMLRPC_DIR=$PHP_XMLRPC/include
59190 - elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then
59191 - XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
59193 - echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
59194 -echo "configure:101295: checking for XMLRPC-EPI in default path" >&5
59195 - for i in /usr/local /usr; do
59196 - if test -r $i/include/xmlrpc.h; then
59197 - XMLRPC_DIR=$i/include
59198 - echo "$ac_t""found in $i" 1>&6
59205 - if test -z "$XMLRPC_DIR"; then
59206 - echo "$ac_t""not found" 1>&6
59207 - { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; }
59214 - if test "$XMLRPC_DIR" != "/usr/include"; then
59216 - if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then
59220 - ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
59222 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
59223 - ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`"
59225 + cat >> confdefs.h <<\EOF
59226 +#define HTTP_HAVE_CURL 1
59232 + save_old_LDFLAGS=$LDFLAGS
59233 + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
59236 + save_ext_shared=$ext_shared
59239 + for ac_i in $ac_stuff; do
59242 + if test "$ext_shared" = "yes"; then
59243 + LDFLAGS="$LDFLAGS -pthread"
59247 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
59248 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
59250 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
59251 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
59252 if test -n "$unique" && test "`eval $cmd`" = "" ; then
59253 - eval "INCLUDEPATH$unique=set"
59256 - INCLUDES="-I$ai_p $INCLUDES"
59258 - INCLUDES="$INCLUDES -I$ai_p"
59263 + eval "EXTRA_LDFLAGS$unique=set"
59264 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
59270 + ac_ii=`echo $ac_i|cut -c 3-`
59274 + c|c_r|pthread*) ;;
59276 + if test "$ext_shared" = "yes"; then
59277 + LDFLAGS="$LDFLAGS -l$ac_ii"
59282 + c|c_r|pthread*) ;;
59284 + LIBS="$LIBS -l$ac_ii"
59288 - if test "$ext_shared" = "yes"; then
59289 - XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD"
59290 - if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then
59299 + ac_ii=`echo $ac_i|cut -c 3-`
59301 - if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
59302 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
59304 - if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
59305 - ai_p=$XMLRPC_DIR/$PHP_LIBDIR
59306 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
59310 - ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
59311 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
59313 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
59314 - ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
59315 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
59319 if test "$ext_shared" = "yes"; then
59320 - XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD"
59321 - test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD"
59322 + LDFLAGS="-L$ai_p $LDFLAGS"
59323 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
59327 @@ -101380,26 +107826,136 @@ echo "configure:101295: checking for XML
59335 + echo $ac_n "checking for curl_share_strerror in -lcurl""... $ac_c" 1>&6
59336 +echo "configure:107835: checking for curl_share_strerror in -lcurl" >&5
59337 +ac_lib_var=`echo curl'_'curl_share_strerror | sed 'y%./+-%__p_%'`
59338 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59339 + echo $ac_n "(cached) $ac_c" 1>&6
59341 + ac_save_LIBS="$LIBS"
59342 +LIBS="-lcurl $LIBS"
59343 +cat > conftest.$ac_ext <<EOF
59344 +#line 107843 "configure"
59345 +#include "confdefs.h"
59346 +/* Override any gcc2 internal prototype to avoid an error. */
59347 +/* We use char because int might match the return type of a gcc2
59348 + builtin and then its argument prototype would still apply. */
59349 +char curl_share_strerror();
59352 +curl_share_strerror()
59355 +if { (eval echo configure:107854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59357 + eval "ac_cv_lib_$ac_lib_var=yes"
59359 + echo "configure: failed program was:" >&5
59360 + cat conftest.$ac_ext >&5
59362 + eval "ac_cv_lib_$ac_lib_var=no"
59365 +LIBS="$ac_save_LIBS"
59368 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
59369 + echo "$ac_t""yes" 1>&6
59371 + LDFLAGS=$save_old_LDFLAGS
59372 + ext_shared=$save_ext_shared
59373 + cat >> confdefs.h <<\EOF
59374 +#define HAVE_CURL_SHARE_STRERROR 1
59379 + echo "$ac_t""no" 1>&6
59381 + LDFLAGS=$save_old_LDFLAGS
59382 + ext_shared=$save_ext_shared
59383 + unset ac_cv_lib_curl_curl_share_strerror
59389 + save_old_LDFLAGS=$LDFLAGS
59390 + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
59393 + save_ext_shared=$ext_shared
59396 + for ac_i in $ac_stuff; do
59399 + if test "$ext_shared" = "yes"; then
59400 + LDFLAGS="$LDFLAGS -pthread"
59404 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
59406 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
59407 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
59408 + eval "EXTRA_LDFLAGS$unique=set"
59409 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
59415 + ac_ii=`echo $ac_i|cut -c 3-`
59419 + c|c_r|pthread*) ;;
59421 + if test "$ext_shared" = "yes"; then
59422 + LDFLAGS="$LDFLAGS -l$ac_ii"
59427 + c|c_r|pthread*) ;;
59429 + LIBS="$LIBS -l$ac_ii"
59440 - if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then
59442 - if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
59446 + ac_ii=`echo $ac_i|cut -c 3-`
59448 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
59450 - if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
59451 - ai_p=$XMLRPC_DIR/$PHP_LIBDIR
59452 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
59456 - ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
59457 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
59459 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
59460 - ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
59461 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
59466 + if test "$ext_shared" = "yes"; then
59467 + LDFLAGS="-L$ai_p $LDFLAGS"
59468 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
59473 unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
59474 @@ -101415,431 +107971,676 @@ echo "configure:101295: checking for XML
59486 - c|c_r|pthread*) ;;
59488 - LIBS="-lxmlrpc $LIBS"
59497 + echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6
59498 +echo "configure:107984: checking for curl_multi_strerror in -lcurl" >&5
59499 +ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'`
59500 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59501 + echo $ac_n "(cached) $ac_c" 1>&6
59503 + ac_save_LIBS="$LIBS"
59504 +LIBS="-lcurl $LIBS"
59505 +cat > conftest.$ac_ext <<EOF
59506 +#line 107992 "configure"
59507 +#include "confdefs.h"
59508 +/* Override any gcc2 internal prototype to avoid an error. */
59509 +/* We use char because int might match the return type of a gcc2
59510 + builtin and then its argument prototype would still apply. */
59511 +char curl_multi_strerror();
59515 +curl_multi_strerror()
59518 +if { (eval echo configure:108003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59520 + eval "ac_cv_lib_$ac_lib_var=yes"
59522 + echo "configure: failed program was:" >&5
59523 + cat conftest.$ac_ext >&5
59525 + eval "ac_cv_lib_$ac_lib_var=no"
59528 +LIBS="$ac_save_LIBS"
59531 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
59532 + echo "$ac_t""yes" 1>&6
59534 + LDFLAGS=$save_old_LDFLAGS
59535 + ext_shared=$save_ext_shared
59536 + cat >> confdefs.h <<\EOF
59537 +#define HAVE_CURL_MULTI_STRERROR 1
59541 - ext_builddir=ext/xmlrpc
59542 - ext_srcdir=$abs_srcdir/ext/xmlrpc
59544 + echo "$ac_t""no" 1>&6
59547 + LDFLAGS=$save_old_LDFLAGS
59548 + ext_shared=$save_ext_shared
59549 + unset ac_cv_lib_curl_curl_multi_strerror
59554 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
59555 - PHP_XMLRPC_SHARED=no
59558 + save_old_LDFLAGS=$LDFLAGS
59559 + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
59562 - case ext/xmlrpc in
59563 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
59564 - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
59565 - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
59567 + save_ext_shared=$ext_shared
59570 + for ac_i in $ac_stuff; do
59573 + if test "$ext_shared" = "yes"; then
59574 + LDFLAGS="$LDFLAGS -pthread"
59578 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
59580 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
59581 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
59582 + eval "EXTRA_LDFLAGS$unique=set"
59583 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
59586 - b_c_pre=$php_c_pre
59587 - b_cxx_pre=$php_cxx_pre
59588 - b_c_meta=$php_c_meta
59589 - b_cxx_meta=$php_cxx_meta
59590 - b_c_post=$php_c_post
59591 - b_cxx_post=$php_cxx_post
59596 - for ac_src in xmlrpc-epi-php.c; do
59600 + ac_ii=`echo $ac_i|cut -c 3-`
59608 + c|c_r|pthread*) ;;
59610 + if test "$ext_shared" = "yes"; then
59611 + LDFLAGS="$LDFLAGS -l$ac_ii"
59614 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
59617 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59618 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59619 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59620 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
59623 - cat >>Makefile.objects<<EOF
59624 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
59630 + c|c_r|pthread*) ;;
59632 + LIBS="$LIBS -l$ac_ii"
59637 - EXT_STATIC="$EXT_STATIC xmlrpc"
59638 - if test "$ext_shared" != "nocli"; then
59639 - EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
59642 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
59643 - PHP_XMLRPC_SHARED=yes
59645 - case ext/xmlrpc in
59646 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
59647 - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
59648 - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
59654 - b_c_pre=$shared_c_pre
59655 - b_cxx_pre=$shared_cxx_pre
59656 - b_c_meta=$shared_c_meta
59657 - b_cxx_meta=$shared_cxx_meta
59658 - b_c_post=$shared_c_post
59659 - b_cxx_post=$shared_cxx_post
59664 + ac_ii=`echo $ac_i|cut -c 3-`
59666 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
59668 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
59672 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
59674 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
59675 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
59679 - for ac_src in xmlrpc-epi-php.c; do
59681 + if test "$ext_shared" = "yes"; then
59682 + LDFLAGS="-L$ai_p $LDFLAGS"
59683 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
59692 - shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo"
59694 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
59696 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
59697 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
59698 + eval "LIBPATH$unique=set"
59700 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
59701 + LDFLAGS="$LDFLAGS -L$ai_p"
59702 + PHP_RPATHS="$PHP_RPATHS $ai_p"
59707 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59708 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59709 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59710 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
59713 - cat >>Makefile.objects<<EOF
59714 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
59725 - case $host_alias in
59728 - install_modules="install-modules"
59729 + echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6
59730 +echo "configure:108133: checking for curl_easy_strerror in -lcurl" >&5
59731 +ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'`
59732 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59733 + echo $ac_n "(cached) $ac_c" 1>&6
59735 + ac_save_LIBS="$LIBS"
59736 +LIBS="-lcurl $LIBS"
59737 +cat > conftest.$ac_ext <<EOF
59738 +#line 108141 "configure"
59739 +#include "confdefs.h"
59740 +/* Override any gcc2 internal prototype to avoid an error. */
59741 +/* We use char because int might match the return type of a gcc2
59742 + builtin and then its argument prototype would still apply. */
59743 +char curl_easy_strerror();
59745 - case $host_alias in
59748 - 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'
59752 - link_cmd='$(LIBTOOL) --mode=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)'
59756 - link_cmd='$(LIBTOOL) --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)'
59760 +curl_easy_strerror()
59763 +if { (eval echo configure:108152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
59765 + eval "ac_cv_lib_$ac_lib_var=yes"
59767 + echo "configure: failed program was:" >&5
59768 + cat conftest.$ac_ext >&5
59770 + eval "ac_cv_lib_$ac_lib_var=no"
59773 +LIBS="$ac_save_LIBS"
59775 - if test "x" = "xyes"; then
59776 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix"
59778 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix"
59781 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
59782 + echo "$ac_t""yes" 1>&6
59784 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
59786 - cat >>Makefile.objects<<EOF
59787 -\$(phplibdir)/phpxmlrpc.$suffix: $ext_builddir/phpxmlrpc.$suffix
59788 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlrpc.$suffix \$(phplibdir)
59790 -$ext_builddir/phpxmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(PHPXMLRPC_SHARED_DEPENDENCIES)
59793 + LDFLAGS=$save_old_LDFLAGS
59794 + ext_shared=$save_ext_shared
59795 + cat >> confdefs.h <<\EOF
59796 +#define HAVE_CURL_EASY_STRERROR 1
59802 - install_modules="install-modules"
59805 + echo "$ac_t""no" 1>&6
59807 - case $host_alias in
59810 - 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'
59814 - link_cmd='$(LIBTOOL) --mode=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)'
59818 - link_cmd='$(LIBTOOL) --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)'
59821 + LDFLAGS=$save_old_LDFLAGS
59822 + ext_shared=$save_ext_shared
59823 + unset ac_cv_lib_curl_curl_easy_strerror
59828 - if test "x" = "xyes"; then
59829 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix"
59831 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix"
59833 + save_old_LDFLAGS=$LDFLAGS
59834 + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
59837 + save_ext_shared=$ext_shared
59840 + for ac_i in $ac_stuff; do
59843 + if test "$ext_shared" = "yes"; then
59844 + LDFLAGS="$LDFLAGS -pthread"
59848 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
59850 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
59851 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
59852 + eval "EXTRA_LDFLAGS$unique=set"
59853 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
59856 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc"
59858 - cat >>Makefile.objects<<EOF
59859 -\$(phplibdir)/xmlrpc.$suffix: $ext_builddir/xmlrpc.$suffix
59860 - \$(LIBTOOL) --mode=install cp $ext_builddir/xmlrpc.$suffix \$(phplibdir)
59864 + ac_ii=`echo $ac_i|cut -c 3-`
59868 + c|c_r|pthread*) ;;
59870 + if test "$ext_shared" = "yes"; then
59871 + LDFLAGS="$LDFLAGS -l$ac_ii"
59876 + c|c_r|pthread*) ;;
59878 + LIBS="$LIBS -l$ac_ii"
59882 -$ext_builddir/xmlrpc.$suffix: \$(shared_objects_xmlrpc) \$(XMLRPC_SHARED_DEPENDENCIES)
59892 - cat >> confdefs.h <<EOF
59893 -#define COMPILE_DL_XMLRPC 1
59899 + ac_ii=`echo $ac_i|cut -c 3-`
59901 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
59903 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
59907 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
59909 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
59910 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
59913 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
59914 - PHP_XMLRPC_SHARED=no
59915 - case "$PHP_SAPI" in
59918 + if test "$ext_shared" = "yes"; then
59919 + LDFLAGS="-L$ai_p $LDFLAGS"
59920 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
59924 - case ext/xmlrpc in
59925 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
59926 - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
59927 - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
59930 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
59932 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
59933 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
59934 + eval "LIBPATH$unique=set"
59936 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
59937 + LDFLAGS="$LDFLAGS -L$ai_p"
59938 + PHP_RPATHS="$PHP_RPATHS $ai_p"
59942 - b_c_pre=$php_c_pre
59943 - b_cxx_pre=$php_cxx_pre
59944 - b_c_meta=$php_c_meta
59945 - b_cxx_meta=$php_cxx_meta
59946 - b_c_post=$php_c_post
59947 - b_cxx_post=$php_cxx_post
59955 - for ac_src in xmlrpc-epi-php.c; do
59962 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
59968 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59969 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59970 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
59971 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
59973 + echo $ac_n "checking for curl_easy_reset in -lcurl""... $ac_c" 1>&6
59974 +echo "configure:108282: checking for curl_easy_reset in -lcurl" >&5
59975 +ac_lib_var=`echo curl'_'curl_easy_reset | sed 'y%./+-%__p_%'`
59976 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59977 + echo $ac_n "(cached) $ac_c" 1>&6
59979 + ac_save_LIBS="$LIBS"
59980 +LIBS="-lcurl $LIBS"
59981 +cat > conftest.$ac_ext <<EOF
59982 +#line 108290 "configure"
59983 +#include "confdefs.h"
59984 +/* Override any gcc2 internal prototype to avoid an error. */
59985 +/* We use char because int might match the return type of a gcc2
59986 + builtin and then its argument prototype would still apply. */
59987 +char curl_easy_reset();
59989 - cat >>Makefile.objects<<EOF
59990 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
59998 +if { (eval echo configure:108301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60000 + eval "ac_cv_lib_$ac_lib_var=yes"
60002 + echo "configure: failed program was:" >&5
60003 + cat conftest.$ac_ext >&5
60005 + eval "ac_cv_lib_$ac_lib_var=no"
60008 +LIBS="$ac_save_LIBS"
60010 - EXT_STATIC="$EXT_STATIC xmlrpc"
60015 - case ext/xmlrpc in
60016 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
60017 - /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
60018 - *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
60021 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
60022 + echo "$ac_t""yes" 1>&6
60024 + LDFLAGS=$save_old_LDFLAGS
60025 + ext_shared=$save_ext_shared
60026 + cat >> confdefs.h <<\EOF
60027 +#define HAVE_CURL_EASY_RESET 1
60032 + echo "$ac_t""no" 1>&6
60034 - b_c_pre=$php_c_pre
60035 - b_cxx_pre=$php_cxx_pre
60036 - b_c_meta=$php_c_meta
60037 - b_cxx_meta=$php_cxx_meta
60038 - b_c_post=$php_c_post
60039 - b_cxx_post=$php_cxx_post
60041 + LDFLAGS=$save_old_LDFLAGS
60042 + ext_shared=$save_ext_shared
60043 + unset ac_cv_lib_curl_curl_easy_reset
60049 + save_old_LDFLAGS=$LDFLAGS
60050 + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
60053 + save_ext_shared=$ext_shared
60056 + for ac_i in $ac_stuff; do
60059 + if test "$ext_shared" = "yes"; then
60060 + LDFLAGS="$LDFLAGS -pthread"
60064 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
60066 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
60067 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
60068 + eval "EXTRA_LDFLAGS$unique=set"
60069 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
60073 - for ac_src in xmlrpc-epi-php.c; do
60077 + ac_ii=`echo $ac_i|cut -c 3-`
60085 + c|c_r|pthread*) ;;
60087 + if test "$ext_shared" = "yes"; then
60088 + LDFLAGS="$LDFLAGS -l$ac_ii"
60091 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
60094 + c|c_r|pthread*) ;;
60096 + LIBS="$LIBS -l$ac_ii"
60101 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60102 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60103 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60104 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
60107 - cat >>Makefile.objects<<EOF
60108 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
60119 - EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc"
60122 + ac_ii=`echo $ac_i|cut -c 3-`
60124 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
60126 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
60130 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
60132 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
60133 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
60137 + if test "$ext_shared" = "yes"; then
60138 + LDFLAGS="-L$ai_p $LDFLAGS"
60139 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
60144 - BUILD_DIR="$BUILD_DIR $ext_builddir"
60145 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
60149 - if test "$ext_builddir" = "."; then
60150 - PHP_PECL_EXTENSION=xmlrpc
60151 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
60152 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
60153 + eval "LIBPATH$unique=set"
60155 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
60157 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
60158 + LDFLAGS="$LDFLAGS -L$ai_p"
60159 + PHP_RPATHS="$PHP_RPATHS $ai_p"
60163 - XMLRPC_MODULE_TYPE=external
60171 -php_enable_xmlwriter=yes
60176 -echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6
60177 -echo "configure:101738: checking whether to enable XMLWriter support" >&5
60178 -# Check whether --enable-xmlwriter or --disable-xmlwriter was given.
60179 -if test "${enable_xmlwriter+set}" = set; then
60180 - enableval="$enable_xmlwriter"
60181 - PHP_XMLWRITER=$enableval
60182 + echo $ac_n "checking for curl_formget in -lcurl""... $ac_c" 1>&6
60183 +echo "configure:108431: checking for curl_formget in -lcurl" >&5
60184 +ac_lib_var=`echo curl'_'curl_formget | sed 'y%./+-%__p_%'`
60185 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60186 + echo $ac_n "(cached) $ac_c" 1>&6
60189 - PHP_XMLWRITER=yes
60190 - test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL
60191 + ac_save_LIBS="$LIBS"
60192 +LIBS="-lcurl $LIBS"
60193 +cat > conftest.$ac_ext <<EOF
60194 +#line 108439 "configure"
60195 +#include "confdefs.h"
60196 +/* Override any gcc2 internal prototype to avoid an error. */
60197 +/* We use char because int might match the return type of a gcc2
60198 + builtin and then its argument prototype would still apply. */
60199 +char curl_formget();
60205 +if { (eval echo configure:108450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60207 + eval "ac_cv_lib_$ac_lib_var=yes"
60209 + echo "configure: failed program was:" >&5
60210 + cat conftest.$ac_ext >&5
60212 + eval "ac_cv_lib_$ac_lib_var=no"
60215 +LIBS="$ac_save_LIBS"
60218 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
60219 + echo "$ac_t""yes" 1>&6
60221 + LDFLAGS=$save_old_LDFLAGS
60222 + ext_shared=$save_ext_shared
60223 + cat >> confdefs.h <<\EOF
60224 +#define HAVE_CURL_FORMGET 1
60229 + echo "$ac_t""no" 1>&6
60231 -ext_output="yes, shared"
60233 -case $PHP_XMLWRITER in
60235 - PHP_XMLWRITER=`echo "$PHP_XMLWRITER"|$SED 's/^shared,//'`
60238 - PHP_XMLWRITER=yes
60249 + LDFLAGS=$save_old_LDFLAGS
60250 + ext_shared=$save_ext_shared
60251 + unset ac_cv_lib_curl_curl_formget
60257 + save_old_LDFLAGS=$LDFLAGS
60258 + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
60261 + save_ext_shared=$ext_shared
60264 + for ac_i in $ac_stuff; do
60267 + if test "$ext_shared" = "yes"; then
60268 + LDFLAGS="$LDFLAGS -pthread"
60272 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
60274 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
60275 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
60276 + eval "EXTRA_LDFLAGS$unique=set"
60277 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
60283 + ac_ii=`echo $ac_i|cut -c 3-`
60287 + c|c_r|pthread*) ;;
60289 + if test "$ext_shared" = "yes"; then
60290 + LDFLAGS="$LDFLAGS -l$ac_ii"
60295 + c|c_r|pthread*) ;;
60297 + LIBS="$LIBS -l$ac_ii"
60301 -echo "$ac_t""$ext_output" 1>&6
60310 + ac_ii=`echo $ac_i|cut -c 3-`
60312 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
60314 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
60318 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
60320 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
60321 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
60324 -if test -z "$PHP_LIBXML_DIR"; then
60326 + if test "$ext_shared" = "yes"; then
60327 + LDFLAGS="-L$ai_p $LDFLAGS"
60328 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
60332 -php_with_libxml_dir=no
60334 -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
60335 -echo "configure:101783: checking libxml2 install dir" >&5
60336 -# Check whether --with-libxml-dir or --without-libxml-dir was given.
60337 -if test "${with_libxml_dir+set}" = set; then
60338 - withval="$with_libxml_dir"
60339 - PHP_LIBXML_DIR=$withval
60342 - PHP_LIBXML_DIR=no
60343 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
60347 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
60348 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
60349 + eval "LIBPATH$unique=set"
60351 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
60352 + LDFLAGS="$LDFLAGS -L$ai_p"
60353 + PHP_RPATHS="$PHP_RPATHS $ai_p"
60358 -ext_output=$PHP_LIBXML_DIR
60359 -echo "$ac_t""$ext_output" 1>&6
60368 + echo $ac_n "checking for curl_multi_setopt in -lcurl""... $ac_c" 1>&6
60369 +echo "configure:108580: checking for curl_multi_setopt in -lcurl" >&5
60370 +ac_lib_var=`echo curl'_'curl_multi_setopt | sed 'y%./+-%__p_%'`
60371 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60372 + echo $ac_n "(cached) $ac_c" 1>&6
60374 + ac_save_LIBS="$LIBS"
60375 +LIBS="-lcurl $LIBS"
60376 +cat > conftest.$ac_ext <<EOF
60377 +#line 108588 "configure"
60378 +#include "confdefs.h"
60379 +/* Override any gcc2 internal prototype to avoid an error. */
60380 +/* We use char because int might match the return type of a gcc2
60381 + builtin and then its argument prototype would still apply. */
60382 +char curl_multi_setopt();
60385 +curl_multi_setopt()
60388 +if { (eval echo configure:108599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60390 + eval "ac_cv_lib_$ac_lib_var=yes"
60392 + echo "configure: failed program was:" >&5
60393 + cat conftest.$ac_ext >&5
60395 + eval "ac_cv_lib_$ac_lib_var=no"
60398 +LIBS="$ac_save_LIBS"
60400 -if test "$PHP_XMLWRITER" != "no"; then
60402 - if test "$PHP_LIBXML" = "no"; then
60403 - { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
60406 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
60407 + echo "$ac_t""yes" 1>&6
60409 + LDFLAGS=$save_old_LDFLAGS
60410 + ext_shared=$save_ext_shared
60411 + cat >> confdefs.h <<\EOF
60412 +#define HAVE_CURL_MULTI_SETOPT 1
60416 -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
60417 -echo "configure:101811: checking for xml2-config path" >&5
60418 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
60419 - echo $ac_n "(cached) $ac_c" 1>&6
60422 - for i in $PHP_LIBXML_DIR /usr/local /usr; do
60423 - if test -x "$i/bin/xml2-config"; then
60424 - ac_cv_php_xml2_config_path="$i/bin/xml2-config"
60428 + echo "$ac_t""no" 1>&6
60430 + LDFLAGS=$save_old_LDFLAGS
60431 + ext_shared=$save_ext_shared
60432 + unset ac_cv_lib_curl_curl_multi_setopt
60437 -echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
60439 - if test -x "$ac_cv_php_xml2_config_path"; then
60440 - XML2_CONFIG="$ac_cv_php_xml2_config_path"
60441 - libxml_full_version=`$XML2_CONFIG --version`
60444 - set $libxml_full_version
60446 - LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
60447 - if test "$LIBXML_VERSION" -ge "2006011"; then
60448 - LIBXML_LIBS=`$XML2_CONFIG --libs`
60449 - LIBXML_INCS=`$XML2_CONFIG --cflags`
60451 - for ac_i in $LIBXML_LIBS; do
60453 + save_old_LDFLAGS=$LDFLAGS
60454 + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
60457 + save_ext_shared=$ext_shared
60460 + for ac_i in $ac_stuff; do
60463 if test "$ext_shared" = "yes"; then
60464 - XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread"
60465 + LDFLAGS="$LDFLAGS -pthread"
60469 @@ -101861,7 +108662,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
60472 if test "$ext_shared" = "yes"; then
60473 - XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii"
60474 + LDFLAGS="$LDFLAGS -l$ac_ii"
60478 @@ -101896,8 +108697,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
60481 if test "$ext_shared" = "yes"; then
60482 - XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD"
60483 - test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD"
60484 + LDFLAGS="-L$ai_p $LDFLAGS"
60485 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
60489 @@ -101923,22 +108724,128 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
60494 - for ac_i in $LIBXML_INCS; do
60497 - ac_ii=`echo $ac_i|cut -c 3-`
60499 - if test "$ac_ii" != "/usr/include"; then
60500 + echo $ac_n "checking for curl_multi_timeout in -lcurl""... $ac_c" 1>&6
60501 +echo "configure:108729: checking for curl_multi_timeout in -lcurl" >&5
60502 +ac_lib_var=`echo curl'_'curl_multi_timeout | sed 'y%./+-%__p_%'`
60503 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60504 + echo $ac_n "(cached) $ac_c" 1>&6
60506 + ac_save_LIBS="$LIBS"
60507 +LIBS="-lcurl $LIBS"
60508 +cat > conftest.$ac_ext <<EOF
60509 +#line 108737 "configure"
60510 +#include "confdefs.h"
60511 +/* Override any gcc2 internal prototype to avoid an error. */
60512 +/* We use char because int might match the return type of a gcc2
60513 + builtin and then its argument prototype would still apply. */
60514 +char curl_multi_timeout();
60517 +curl_multi_timeout()
60520 +if { (eval echo configure:108748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
60522 + eval "ac_cv_lib_$ac_lib_var=yes"
60524 + echo "configure: failed program was:" >&5
60525 + cat conftest.$ac_ext >&5
60527 + eval "ac_cv_lib_$ac_lib_var=no"
60530 +LIBS="$ac_save_LIBS"
60533 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
60534 + echo "$ac_t""yes" 1>&6
60536 + LDFLAGS=$save_old_LDFLAGS
60537 + ext_shared=$save_ext_shared
60538 + cat >> confdefs.h <<\EOF
60539 +#define HAVE_CURL_MULTI_TIMEOUT 1
60544 + echo "$ac_t""no" 1>&6
60546 + LDFLAGS=$save_old_LDFLAGS
60547 + ext_shared=$save_ext_shared
60548 + unset ac_cv_lib_curl_curl_multi_timeout
60555 + if test "$PHP_HTTP_CURL_LIBEVENT" != "no"; then
60558 + haveext=$PHP_EVENT
60560 + echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6
60561 +echo "configure:108789: checking for ext/$extname support" >&5
60562 + if test -x "$PHP_EXECUTABLE"; then
60563 + grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
60564 + if test "$grepext" = "$extname"; then
60565 + HTTP_HAVE_EXT_EVENT=1
60566 + echo "$ac_t""yes" 1>&6
60568 + echo "configure: warning: event support is incompatible with pecl/event; continuing without libevent support" 1>&2
60571 + HTTP_HAVE_EXT_EVENT=
60572 + echo "$ac_t""no" 1>&6
60574 + echo $ac_n "checking for event.h""... $ac_c" 1>&6
60575 +echo "configure:108803: checking for event.h" >&5
60577 + for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do
60578 + if test -f "$i/include/event.h"; then
60583 + if test "x$EVENT_DIR" = "x"; then
60584 + echo "$ac_t""not found" 1>&6
60585 + echo "configure: warning: continuing without libevent support" 1>&2
60587 + echo "$ac_t""found in $EVENT_DIR" 1>&6
60589 + echo $ac_n "checking for libevent version, roughly""... $ac_c" 1>&6
60590 +echo "configure:108818: checking for libevent version, roughly" >&5
60591 + EVENT_VER="1.1b or lower"
60592 + if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
60593 + if test -f "$EVENT_DIR/include/evrpc.h"; then
60594 + EVENT_VER="1.4 or greater"
60596 + EVENT_VER="1.2 or greater"
60599 + cat >> confdefs.h <<EOF
60600 +#define HTTP_EVENT_VERSION "$EVENT_VER"
60603 + echo "$ac_t""$EVENT_VER" 1>&6
60605 + echo $ac_n "checking for libcurl version >= 7.16.0""... $ac_c" 1>&6
60606 +echo "configure:108834: checking for libcurl version >= 7.16.0" >&5
60607 + echo "$ac_t""$CURL_VERSION" 1>&6
60608 + if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then
60609 + echo "configure: warning: libcurl version greater or equal to 7.16.0 required; continuing without libevent support" 1>&2
60612 + if test "$EVENT_DIR/include" != "/usr/include"; then
60614 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
60616 + if test -z "$EVENT_DIR/include" || echo "$EVENT_DIR/include" | grep '^/' >/dev/null ; then
60617 + ai_p=$EVENT_DIR/include
60620 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
60621 + ep_dir="`echo $EVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
60623 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
60624 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
60625 + ai_p="$ep_realdir/`basename \"$EVENT_DIR/include\"`"
60629 @@ -101959,464 +108866,120 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
60638 - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
60639 -echo "configure:101969: checking whether libxml build works" >&5
60640 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
60641 - echo $ac_n "(cached) $ac_c" 1>&6
60647 - $XMLWRITER_SHARED_LIBADD
60649 - if test "$cross_compiling" = yes; then
60654 - cat > conftest.$ac_ext <<EOF
60655 -#line 101985 "configure"
60656 -#include "confdefs.h"
60659 + if test "$ext_shared" = "yes"; then
60660 + HTTP_SHARED_LIBADD="-levent $HTTP_SHARED_LIBADD"
60661 + if test -n "$EVENT_DIR/$PHP_LIBDIR"; then
60663 + if test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
60665 - char xmlInitParser();
60672 -if { (eval echo configure:101996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
60677 - php_cv_libxml_build_works=yes
60681 - echo "configure: failed program was:" >&5
60682 - cat conftest.$ac_ext >&5
60686 + if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
60687 + ai_p=$EVENT_DIR/$PHP_LIBDIR
60690 - echo "$ac_t""no" 1>&6
60691 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; }
60702 -echo "$ac_t""$php_cv_libxml_build_works" 1>&6
60703 - if test "$php_cv_libxml_build_works" = "yes"; then
60704 - cat >> confdefs.h <<\EOF
60705 -#define HAVE_LIBXML 1
60710 - cat >> confdefs.h <<\EOF
60711 -#define HAVE_XMLWRITER 1
60714 + ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
60716 - ext_builddir=ext/xmlwriter
60717 - ext_srcdir=$abs_srcdir/ext/xmlwriter
60720 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
60721 + ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`"
60724 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
60725 - PHP_XMLWRITER_SHARED=no
60727 + if test "$ext_shared" = "yes"; then
60728 + HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
60729 + test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
60733 - case ext/xmlwriter in
60734 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
60735 - /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
60736 - *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
60739 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
60742 - b_c_pre=$php_c_pre
60743 - b_cxx_pre=$php_cxx_pre
60744 - b_c_meta=$php_c_meta
60745 - b_cxx_meta=$php_cxx_meta
60746 - b_c_post=$php_c_post
60747 - b_cxx_post=$php_cxx_post
60752 - for ac_src in php_xmlwriter.c; do
60753 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
60754 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
60755 + eval "LIBPATH$unique=set"
60757 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
60758 + LDFLAGS="$LDFLAGS -L$ai_p"
60759 + PHP_RPATHS="$PHP_RPATHS $ai_p"
60766 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
60769 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60770 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60771 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60772 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
60776 - cat >>Makefile.objects<<EOF
60777 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
60786 - EXT_STATIC="$EXT_STATIC xmlwriter"
60787 - if test "$ext_shared" != "nocli"; then
60788 - EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter"
60791 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
60792 - PHP_XMLWRITER_SHARED=yes
60794 - case ext/xmlwriter in
60795 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
60796 - /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
60797 - *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
60802 - b_c_pre=$shared_c_pre
60803 - b_cxx_pre=$shared_cxx_pre
60804 - b_c_meta=$shared_c_meta
60805 - b_cxx_meta=$shared_cxx_meta
60806 - b_c_post=$shared_c_post
60807 - b_cxx_post=$shared_cxx_post
60812 - for ac_src in php_xmlwriter.c; do
60819 - shared_objects_xmlwriter="$shared_objects_xmlwriter $ac_bdir$ac_obj.lo"
60822 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60823 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60824 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60825 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
60828 - cat >>Makefile.objects<<EOF
60829 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
60834 - case $host_alias in
60837 - install_modules="install-modules"
60839 - case $host_alias in
60842 - 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'
60846 - link_cmd='$(LIBTOOL) --mode=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)'
60850 - link_cmd='$(LIBTOOL) --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)'
60854 - if test "x" = "xyes"; then
60855 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlwriter.$suffix"
60857 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix"
60860 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter"
60862 - cat >>Makefile.objects<<EOF
60863 -\$(phplibdir)/phpxmlwriter.$suffix: $ext_builddir/phpxmlwriter.$suffix
60864 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpxmlwriter.$suffix \$(phplibdir)
60866 -$ext_builddir/phpxmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(PHPXMLWRITER_SHARED_DEPENDENCIES)
60874 - install_modules="install-modules"
60876 - case $host_alias in
60879 - 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'
60883 - link_cmd='$(LIBTOOL) --mode=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)'
60887 - link_cmd='$(LIBTOOL) --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)'
60892 - if test "x" = "xyes"; then
60893 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlwriter.$suffix"
60894 + if test -n "$EVENT_DIR/$PHP_LIBDIR"; then
60896 + if test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
60898 + if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
60899 + ai_p=$EVENT_DIR/$PHP_LIBDIR
60901 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlwriter.$suffix"
60904 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter"
60906 - cat >>Makefile.objects<<EOF
60907 -\$(phplibdir)/xmlwriter.$suffix: $ext_builddir/xmlwriter.$suffix
60908 - \$(LIBTOOL) --mode=install cp $ext_builddir/xmlwriter.$suffix \$(phplibdir)
60910 -$ext_builddir/xmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_DEPENDENCIES)
60917 - cat >> confdefs.h <<EOF
60918 -#define COMPILE_DL_XMLWRITER 1
60923 + ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
60925 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
60926 + ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`"
60929 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
60930 - PHP_XMLWRITER_SHARED=no
60931 - case "$PHP_SAPI" in
60935 - case ext/xmlwriter in
60936 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
60937 - /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
60938 - *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
60943 - b_c_pre=$php_c_pre
60944 - b_cxx_pre=$php_cxx_pre
60945 - b_c_meta=$php_c_meta
60946 - b_cxx_meta=$php_cxx_meta
60947 - b_c_post=$php_c_post
60948 - b_cxx_post=$php_cxx_post
60953 - for ac_src in php_xmlwriter.c; do
60961 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
60964 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60965 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60966 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
60967 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
60970 - cat >>Makefile.objects<<EOF
60971 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
60977 - EXT_STATIC="$EXT_STATIC xmlwriter"
60982 - case ext/xmlwriter in
60983 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
60984 - /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
60985 - *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
60988 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
60991 - b_c_pre=$php_c_pre
60992 - b_cxx_pre=$php_cxx_pre
60993 - b_c_meta=$php_c_meta
60994 - b_cxx_meta=$php_cxx_meta
60995 - b_c_post=$php_c_post
60996 - b_cxx_post=$php_cxx_post
61001 - for ac_src in php_xmlwriter.c; do
61002 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
61003 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
61004 + eval "LIBPATH$unique=set"
61006 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
61007 + LDFLAGS="$LDFLAGS -L$ai_p"
61008 + PHP_RPATHS="$PHP_RPATHS $ai_p"
61015 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
61018 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61019 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61020 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61021 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
61024 - cat >>Makefile.objects<<EOF
61025 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
61033 - EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter"
61037 - BUILD_DIR="$BUILD_DIR $ext_builddir"
61041 - if test "$ext_builddir" = "."; then
61042 - PHP_PECL_EXTENSION=xmlwriter
61044 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
61049 - PHP_VAR_SUBST="$PHP_VAR_SUBST XMLWRITER_SHARED_LIBADD"
61053 - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; }
61056 - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; }
61066 -echo $ac_n "checking for XSL support""... $ac_c" 1>&6
61067 -echo "configure:102346: checking for XSL support" >&5
61068 -# Check whether --with-xsl or --without-xsl was given.
61069 -if test "${with_xsl+set}" = set; then
61070 - withval="$with_xsl"
61075 - test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL
61081 -ext_output="yes, shared"
61085 - PHP_XSL=`echo "$PHP_XSL"|$SED 's/^shared,//'`
61102 -echo "$ac_t""$ext_output" 1>&6
61107 -if test "$PHP_XSL" != "no"; then
61109 - if test "$PHP_LIBXML" = "no"; then
61110 - { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; }
61113 - if test "$PHP_DOM" = "no"; then
61114 - { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; }
61117 - for i in $PHP_XSL /usr/local /usr; do
61118 - if test -x "$i/bin/xslt-config"; then
61119 - XSLT_CONFIG=$i/bin/xslt-config
61124 + c|c_r|pthread*) ;;
61126 + LIBS="-levent $LIBS"
61130 - if test -z "$XSLT_CONFIG"; then
61131 - { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; }
61133 - libxslt_full_version=`$XSLT_CONFIG --version`
61136 - set $libxslt_full_version
61138 - LIBXSLT_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3`
61139 - if test "$LIBXSLT_VERSION" -ge "1001000"; then
61140 - XSL_LIBS=`$XSLT_CONFIG --libs`
61141 - XSL_INCS=`$XSLT_CONFIG --cflags`
61143 - for ac_i in $XSL_LIBS; do
61150 + cat >> confdefs.h <<\EOF
61151 +#define HTTP_HAVE_EVENT 1
61155 + save_old_LDFLAGS=$LDFLAGS
61156 + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
61159 + save_ext_shared=$ext_shared
61162 + for ac_i in $ac_stuff; do
61165 if test "$ext_shared" = "yes"; then
61166 - XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -pthread"
61167 + LDFLAGS="$LDFLAGS -pthread"
61171 @@ -102438,7 +109001,7 @@ if test "$PHP_XSL" != "no"; then
61174 if test "$ext_shared" = "yes"; then
61175 - XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii"
61176 + LDFLAGS="$LDFLAGS -l$ac_ii"
61180 @@ -102473,8 +109036,8 @@ if test "$PHP_XSL" != "no"; then
61183 if test "$ext_shared" = "yes"; then
61184 - XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD"
61185 - test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD"
61186 + LDFLAGS="-L$ai_p $LDFLAGS"
61187 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
61191 @@ -102500,22 +109063,121 @@ if test "$PHP_XSL" != "no"; then
61196 - for ac_i in $XSL_INCS; do
61199 - ac_ii=`echo $ac_i|cut -c 3-`
61201 - if test "$ac_ii" != "/usr/include"; then
61202 + echo $ac_n "checking for curl_multi_socket_action in -lcurl""... $ac_c" 1>&6
61203 +echo "configure:109068: checking for curl_multi_socket_action in -lcurl" >&5
61204 +ac_lib_var=`echo curl'_'curl_multi_socket_action | sed 'y%./+-%__p_%'`
61205 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
61206 + echo $ac_n "(cached) $ac_c" 1>&6
61208 + ac_save_LIBS="$LIBS"
61209 +LIBS="-lcurl $LIBS"
61210 +cat > conftest.$ac_ext <<EOF
61211 +#line 109076 "configure"
61212 +#include "confdefs.h"
61213 +/* Override any gcc2 internal prototype to avoid an error. */
61214 +/* We use char because int might match the return type of a gcc2
61215 + builtin and then its argument prototype would still apply. */
61216 +char curl_multi_socket_action();
61219 +curl_multi_socket_action()
61222 +if { (eval echo configure:109087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
61224 + eval "ac_cv_lib_$ac_lib_var=yes"
61226 + echo "configure: failed program was:" >&5
61227 + cat conftest.$ac_ext >&5
61229 + eval "ac_cv_lib_$ac_lib_var=no"
61232 +LIBS="$ac_save_LIBS"
61235 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
61236 + echo "$ac_t""yes" 1>&6
61238 + LDFLAGS=$save_old_LDFLAGS
61239 + ext_shared=$save_ext_shared
61240 + cat >> confdefs.h <<\EOF
61241 +#define HAVE_CURL_MULTI_SOCKET_ACTION 1
61246 + echo "$ac_t""no" 1>&6
61248 + LDFLAGS=$save_old_LDFLAGS
61249 + ext_shared=$save_ext_shared
61250 + unset ac_cv_lib_curl_curl_multi_socket_action
61259 + elif test "$haveext" != "no" && test "x$haveext" != "x"; then
61260 + HTTP_HAVE_EXT_EVENT=1
61261 + echo "$ac_t""yes" 1>&6
61263 + echo "configure: warning: event support is incompatible with pecl/event; continuing without libevent support" 1>&2
61266 + HTTP_HAVE_EXT_EVENT=
61267 + echo "$ac_t""no" 1>&6
61269 + echo $ac_n "checking for event.h""... $ac_c" 1>&6
61270 +echo "configure:109135: checking for event.h" >&5
61272 + for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do
61273 + if test -f "$i/include/event.h"; then
61278 + if test "x$EVENT_DIR" = "x"; then
61279 + echo "$ac_t""not found" 1>&6
61280 + echo "configure: warning: continuing without libevent support" 1>&2
61282 + echo "$ac_t""found in $EVENT_DIR" 1>&6
61284 + echo $ac_n "checking for libevent version, roughly""... $ac_c" 1>&6
61285 +echo "configure:109150: checking for libevent version, roughly" >&5
61286 + EVENT_VER="1.1b or lower"
61287 + if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
61288 + if test -f "$EVENT_DIR/include/evrpc.h"; then
61289 + EVENT_VER="1.4 or greater"
61291 + EVENT_VER="1.2 or greater"
61294 + cat >> confdefs.h <<EOF
61295 +#define HTTP_EVENT_VERSION "$EVENT_VER"
61298 + echo "$ac_t""$EVENT_VER" 1>&6
61300 + echo $ac_n "checking for libcurl version >= 7.16.0""... $ac_c" 1>&6
61301 +echo "configure:109166: checking for libcurl version >= 7.16.0" >&5
61302 + echo "$ac_t""$CURL_VERSION" 1>&6
61303 + if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then
61304 + echo "configure: warning: libcurl version greater or equal to 7.16.0 required; continuing without libevent support" 1>&2
61307 + if test "$EVENT_DIR/include" != "/usr/include"; then
61309 - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
61311 + if test -z "$EVENT_DIR/include" || echo "$EVENT_DIR/include" | grep '^/' >/dev/null ; then
61312 + ai_p=$EVENT_DIR/include
61315 - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
61316 + ep_dir="`echo $EVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
61318 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
61319 - ai_p="$ep_realdir/`basename \"$ac_ii\"`"
61320 + ai_p="$ep_realdir/`basename \"$EVENT_DIR/include\"`"
61324 @@ -102536,45 +109198,28 @@ if test "$PHP_XSL" != "no"; then
61333 - echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6
61334 -echo "configure:102546: checking for EXSLT support" >&5
61335 - for i in $PHP_XSL /usr/local /usr; do
61336 - if test -r "$i/include/libexslt/exslt.h"; then
61337 - PHP_XSL_EXSL_DIR=$i
61341 - if test -z "$PHP_XSL_EXSL_DIR"; then
61342 - echo "$ac_t""not found" 1>&6
61344 - echo "$ac_t""found" 1>&6
61348 if test "$ext_shared" = "yes"; then
61349 - XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD"
61350 - if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then
61351 + HTTP_SHARED_LIBADD="-levent $HTTP_SHARED_LIBADD"
61352 + if test -n "$EVENT_DIR/$PHP_LIBDIR"; then
61354 - if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
61355 + if test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
61357 - if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
61358 - ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
61359 + if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
61360 + ai_p=$EVENT_DIR/$PHP_LIBDIR
61363 - ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
61364 + ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
61366 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
61367 - ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
61368 + ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`"
61372 if test "$ext_shared" = "yes"; then
61373 - XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD"
61374 - test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD"
61375 + HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
61376 + test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
61380 @@ -102600,18 +109245,18 @@ echo "configure:102546: checking for EXS
61384 - if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then
61385 + if test -n "$EVENT_DIR/$PHP_LIBDIR"; then
61387 - if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then
61388 + if test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
61390 - if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
61391 - ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
61392 + if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
61393 + ai_p=$EVENT_DIR/$PHP_LIBDIR
61396 - ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
61397 + ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
61399 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
61400 - ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
61401 + ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`"
61405 @@ -102622,542 +109267,265 @@ echo "configure:102546: checking for EXS
61407 cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
61408 if test -n "$unique" && test "`eval $cmd`" = "" ; then
61409 - eval "LIBPATH$unique=set"
61411 - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
61412 - LDFLAGS="$LDFLAGS -L$ai_p"
61413 - PHP_RPATHS="$PHP_RPATHS $ai_p"
61425 - c|c_r|pthread*) ;;
61427 - LIBS="-lexslt $LIBS"
61438 - if test "$PHP_XSL_EXSL_DIR/include" != "/usr/include"; then
61440 - if test -z "$PHP_XSL_EXSL_DIR/include" || echo "$PHP_XSL_EXSL_DIR/include" | grep '^/' >/dev/null ; then
61441 - ai_p=$PHP_XSL_EXSL_DIR/include
61444 - ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
61446 - ep_realdir="`(cd \"$ep_dir\" && pwd)`"
61447 - ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`"
61452 - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
61454 - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
61455 - if test -n "$unique" && test "`eval $cmd`" = "" ; then
61456 - eval "INCLUDEPATH$unique=set"
61459 - INCLUDES="-I$ai_p $INCLUDES"
61461 - INCLUDES="$INCLUDES -I$ai_p"
61468 - cat >> confdefs.h <<\EOF
61469 -#define HAVE_XSL_EXSLT 1
61474 - { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; }
61480 - cat >> confdefs.h <<\EOF
61481 -#define HAVE_XSL 1
61485 - ext_builddir=ext/xsl
61486 - ext_srcdir=$abs_srcdir/ext/xsl
61490 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
61491 - PHP_XSL_SHARED=no
61495 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
61496 - /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
61497 - *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
61502 - b_c_pre=$php_c_pre
61503 - b_cxx_pre=$php_cxx_pre
61504 - b_c_meta=$php_c_meta
61505 - b_cxx_meta=$php_cxx_meta
61506 - b_c_post=$php_c_post
61507 - b_cxx_post=$php_cxx_post
61512 - for ac_src in php_xsl.c xsltprocessor.c; do
61519 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
61522 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61523 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61524 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61525 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
61528 - cat >>Makefile.objects<<EOF
61529 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
61535 - EXT_STATIC="$EXT_STATIC xsl"
61536 - if test "$ext_shared" != "nocli"; then
61537 - EXT_CLI_STATIC="$EXT_CLI_STATIC xsl"
61540 - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
61541 - PHP_XSL_SHARED=yes
61544 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
61545 - /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
61546 - *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
61551 - b_c_pre=$shared_c_pre
61552 - b_cxx_pre=$shared_cxx_pre
61553 - b_c_meta=$shared_c_meta
61554 - b_cxx_meta=$shared_cxx_meta
61555 - b_c_post=$shared_c_post
61556 - b_cxx_post=$shared_cxx_post
61561 - for ac_src in php_xsl.c xsltprocessor.c; do
61568 - shared_objects_xsl="$shared_objects_xsl $ac_bdir$ac_obj.lo"
61571 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61572 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61573 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61574 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
61577 - cat >>Makefile.objects<<EOF
61578 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
61583 - case $host_alias in
61586 - install_modules="install-modules"
61588 - case $host_alias in
61591 - 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'
61595 - link_cmd='$(LIBTOOL) --mode=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)'
61599 - link_cmd='$(LIBTOOL) --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)'
61603 - if test "x" = "xyes"; then
61604 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxsl.$suffix"
61606 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxsl.$suffix"
61609 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl"
61611 - cat >>Makefile.objects<<EOF
61612 -\$(phplibdir)/phpxsl.$suffix: $ext_builddir/phpxsl.$suffix
61613 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpxsl.$suffix \$(phplibdir)
61615 -$ext_builddir/phpxsl.$suffix: \$(shared_objects_xsl) \$(PHPXSL_SHARED_DEPENDENCIES)
61623 - install_modules="install-modules"
61625 - case $host_alias in
61628 - 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'
61632 - link_cmd='$(LIBTOOL) --mode=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)'
61636 - link_cmd='$(LIBTOOL) --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)'
61640 - if test "x" = "xyes"; then
61641 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xsl.$suffix"
61643 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/xsl.$suffix"
61646 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl"
61648 - cat >>Makefile.objects<<EOF
61649 -\$(phplibdir)/xsl.$suffix: $ext_builddir/xsl.$suffix
61650 - \$(LIBTOOL) --mode=install cp $ext_builddir/xsl.$suffix \$(phplibdir)
61652 -$ext_builddir/xsl.$suffix: \$(shared_objects_xsl) \$(XSL_SHARED_DEPENDENCIES)
61659 - cat >> confdefs.h <<EOF
61660 -#define COMPILE_DL_XSL 1
61666 - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
61667 - PHP_XSL_SHARED=no
61668 - case "$PHP_SAPI" in
61673 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
61674 - /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
61675 - *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
61680 - b_c_pre=$php_c_pre
61681 - b_cxx_pre=$php_cxx_pre
61682 - b_c_meta=$php_c_meta
61683 - b_cxx_meta=$php_cxx_meta
61684 - b_c_post=$php_c_post
61685 - b_cxx_post=$php_cxx_post
61690 - for ac_src in php_xsl.c xsltprocessor.c; do
61697 - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
61700 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61701 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61702 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61703 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
61706 - cat >>Makefile.objects<<EOF
61707 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
61713 - EXT_STATIC="$EXT_STATIC xsl"
61719 - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
61720 - /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
61721 - *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
61726 - b_c_pre=$php_c_pre
61727 - b_cxx_pre=$php_cxx_pre
61728 - b_c_meta=$php_c_meta
61729 - b_cxx_meta=$php_cxx_meta
61730 - b_c_post=$php_c_post
61731 - b_cxx_post=$php_cxx_post
61736 - for ac_src in php_xsl.c xsltprocessor.c; do
61743 - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
61746 - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61747 - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61748 - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
61749 - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
61752 - cat >>Makefile.objects<<EOF
61753 -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
61761 - EXT_CLI_STATIC="$EXT_CLI_STATIC xsl"
61765 - BUILD_DIR="$BUILD_DIR $ext_builddir"
61769 - if test "$ext_builddir" = "."; then
61770 - PHP_PECL_EXTENSION=xsl
61772 - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
61777 - PHP_VAR_SUBST="$PHP_VAR_SUBST XSL_SHARED_LIBADD"
61780 - am_i_shared=$PHP_XSL_SHARED
61781 - is_it_shared=$PHP_LIBXML_SHARED
61782 - is_it_enabled=$PHP_LIBXML
61783 - if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
61784 - { echo "configure: error:
61785 -You've configured extension xsl to build statically, but it
61786 -depends on extension libxml, which you've configured to build shared.
61787 -You either need to build xsl shared or build libxml statically for the
61788 -build to be successful.
61791 - if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
61792 - { echo "configure: error:
61793 -You've configured extension xsl, which depends on extension libxml,
61794 -but you've either not enabled libxml, or have disabled it.
61804 -echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6
61805 -echo "configure:103022: checking for zip archive read/writesupport" >&5
61806 -# Check whether --enable-zip or --disable-zip was given.
61807 -if test "${enable_zip+set}" = set; then
61808 - enableval="$enable_zip"
61809 - PHP_ZIP=$enableval
61811 + eval "LIBPATH$unique=set"
61813 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
61814 + LDFLAGS="$LDFLAGS -L$ai_p"
61815 + PHP_RPATHS="$PHP_RPATHS $ai_p"
61818 - test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL
61827 -ext_output="yes, shared"
61831 - PHP_ZIP=`echo "$PHP_ZIP"|$SED 's/^shared,//'`
61849 + c|c_r|pthread*) ;;
61851 + LIBS="-levent $LIBS"
61857 -echo "$ac_t""$ext_output" 1>&6
61862 + cat >> confdefs.h <<\EOF
61863 +#define HTTP_HAVE_EVENT 1
61866 -if test -z "$PHP_ZLIB_DIR"; then
61868 + save_old_LDFLAGS=$LDFLAGS
61869 + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
61872 -php_with_zlib_dir=no
61873 + save_ext_shared=$ext_shared
61876 + for ac_i in $ac_stuff; do
61879 + if test "$ext_shared" = "yes"; then
61880 + LDFLAGS="$LDFLAGS -pthread"
61884 + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
61886 + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
61887 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
61888 + eval "EXTRA_LDFLAGS$unique=set"
61889 + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
61892 -echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
61893 -echo "configure:103067: checking for the location of libz" >&5
61894 -# Check whether --with-zlib-dir or --without-zlib-dir was given.
61895 -if test "${with_zlib_dir+set}" = set; then
61896 - withval="$with_zlib_dir"
61897 - PHP_ZLIB_DIR=$withval
61902 + ac_ii=`echo $ac_i|cut -c 3-`
61907 + c|c_r|pthread*) ;;
61909 + if test "$ext_shared" = "yes"; then
61910 + LDFLAGS="$LDFLAGS -l$ac_ii"
61915 + c|c_r|pthread*) ;;
61917 + LIBS="$LIBS -l$ac_ii"
61927 -ext_output=$PHP_ZLIB_DIR
61928 -echo "$ac_t""$ext_output" 1>&6
61932 + ac_ii=`echo $ac_i|cut -c 3-`
61934 + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
61936 + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
61940 + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
61942 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
61943 + ai_p="$ep_realdir/`basename \"$ac_ii\"`"
61947 + if test "$ext_shared" = "yes"; then
61948 + LDFLAGS="-L$ai_p $LDFLAGS"
61949 + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
61954 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
61956 + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
61957 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
61958 + eval "LIBPATH$unique=set"
61960 + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
61961 + LDFLAGS="$LDFLAGS -L$ai_p"
61962 + PHP_RPATHS="$PHP_RPATHS $ai_p"
61972 -php_with_pcre_dir=no
61977 -echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
61978 -echo "configure:103091: checking pcre install prefix" >&5
61979 -# Check whether --with-pcre-dir or --without-pcre-dir was given.
61980 -if test "${with_pcre_dir+set}" = set; then
61981 - withval="$with_pcre_dir"
61982 - PHP_PCRE_DIR=$withval
61983 + echo $ac_n "checking for curl_multi_socket_action in -lcurl""... $ac_c" 1>&6
61984 +echo "configure:109400: checking for curl_multi_socket_action in -lcurl" >&5
61985 +ac_lib_var=`echo curl'_'curl_multi_socket_action | sed 'y%./+-%__p_%'`
61986 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
61987 + echo $ac_n "(cached) $ac_c" 1>&6
61992 + ac_save_LIBS="$LIBS"
61993 +LIBS="-lcurl $LIBS"
61994 +cat > conftest.$ac_ext <<EOF
61995 +#line 109408 "configure"
61996 +#include "confdefs.h"
61997 +/* Override any gcc2 internal prototype to avoid an error. */
61998 +/* We use char because int might match the return type of a gcc2
61999 + builtin and then its argument prototype would still apply. */
62000 +char curl_multi_socket_action();
62003 +curl_multi_socket_action()
62006 +if { (eval echo configure:109419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62008 + eval "ac_cv_lib_$ac_lib_var=yes"
62010 + echo "configure: failed program was:" >&5
62011 + cat conftest.$ac_ext >&5
62013 + eval "ac_cv_lib_$ac_lib_var=no"
62016 +LIBS="$ac_save_LIBS"
62019 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
62020 + echo "$ac_t""yes" 1>&6
62022 + LDFLAGS=$save_old_LDFLAGS
62023 + ext_shared=$save_ext_shared
62024 + cat >> confdefs.h <<\EOF
62025 +#define HAVE_CURL_MULTI_SOCKET_ACTION 1
62028 -ext_output=$PHP_PCRE_DIR
62029 -echo "$ac_t""$ext_output" 1>&6
62034 + echo "$ac_t""no" 1>&6
62036 + LDFLAGS=$save_old_LDFLAGS
62037 + ext_shared=$save_ext_shared
62038 + unset ac_cv_lib_curl_curl_multi_socket_action
62043 -if test "$PHP_ZIP" != "no"; then
62052 - if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
62053 - if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
62054 - PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
62055 - PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
62056 - elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
62057 - PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
62058 - PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
62060 - { echo "configure: error: Can not find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; }
62062 + if test "$PHP_HTTP_MAGIC_MIME" != "no"; then
62063 + echo $ac_n "checking for magic.h""... $ac_c" 1>&6
62064 +echo "configure:109462: checking for magic.h" >&5
62066 + for i in "$PHP_HTTP_MAGIC_MIME" /usr/local /usr /opt; do
62067 + if test -f "$i/include/magic.h"; then
62072 + if test "x$MAGIC_DIR" = "x"; then
62073 + echo "$ac_t""not found" 1>&6
62074 + { echo "configure: error: could not find magic.h" 1>&2; exit 1; }
62076 + echo "$ac_t""found in $MAGIC_DIR" 1>&6
62080 + if test "$MAGIC_DIR/include" != "/usr/include"; then
62082 + if test -z "$MAGIC_DIR/include" || echo "$MAGIC_DIR/include" | grep '^/' >/dev/null ; then
62083 + ai_p=$MAGIC_DIR/include
62085 - for i in /usr/local /usr; do
62086 - if test -f "$i/include/zlib/zlib.h"; then
62087 - PHP_ZLIB_DIR="$i"
62088 - PHP_ZLIB_INCDIR="$i/include/zlib"
62089 - elif test -f "$i/include/zlib.h"; then
62090 - PHP_ZLIB_DIR="$i"
62091 - PHP_ZLIB_INCDIR="$i/include"
62095 + ep_dir="`echo $MAGIC_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
62097 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
62098 + ai_p="$ep_realdir/`basename \"$MAGIC_DIR/include\"`"
62101 - echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6
62102 -echo "configure:103135: checking for the location of zlib" >&5
62103 - if test "$PHP_ZLIB_DIR" = "no"; then
62104 - { 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; }
62106 - echo "$ac_t""$PHP_ZLIB_DIR" 1>&6
62109 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
62111 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
62112 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
62113 + eval "INCLUDEPATH$unique=set"
62116 + INCLUDES="-I$ai_p $INCLUDES"
62118 + INCLUDES="$INCLUDES -I$ai_p"
62127 if test "$ext_shared" = "yes"; then
62128 - ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD"
62129 - if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
62130 + HTTP_SHARED_LIBADD="-lmagic $HTTP_SHARED_LIBADD"
62131 + if test -n "$MAGIC_DIR/$PHP_LIBDIR"; then
62133 - if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
62134 + if test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
62136 - if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
62137 - ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
62138 + if test -z "$MAGIC_DIR/$PHP_LIBDIR" || echo "$MAGIC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
62139 + ai_p=$MAGIC_DIR/$PHP_LIBDIR
62142 - ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
62143 + ep_dir="`echo $MAGIC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
62145 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
62146 - ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
62147 + ai_p="$ep_realdir/`basename \"$MAGIC_DIR/$PHP_LIBDIR\"`"
62151 if test "$ext_shared" = "yes"; then
62152 - ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD"
62153 - test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_SHARED_LIBADD"
62154 + HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD"
62155 + test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD"
62159 @@ -103183,18 +109551,18 @@ echo "configure:103135: checking for the
62163 - if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then
62164 + if test -n "$MAGIC_DIR/$PHP_LIBDIR"; then
62166 - if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then
62167 + if test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/lib"; then
62169 - if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
62170 - ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
62171 + if test -z "$MAGIC_DIR/$PHP_LIBDIR" || echo "$MAGIC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
62172 + ai_p=$MAGIC_DIR/$PHP_LIBDIR
62175 - ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
62176 + ep_dir="`echo $MAGIC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
62178 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
62179 - ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
62180 + ai_p="$ep_realdir/`basename \"$MAGIC_DIR/$PHP_LIBDIR\"`"
62184 @@ -103220,10 +109588,10 @@ echo "configure:103135: checking for the
62193 + LIBS="-lmagic $LIBS"
62197 @@ -103233,17 +109601,57 @@ echo "configure:103135: checking for the
62201 + cat >> confdefs.h <<\EOF
62202 +#define HTTP_HAVE_MAGIC 1
62209 + haveext=$PHP_HASH
62211 + echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6
62212 +echo "configure:109616: checking for ext/$extname support" >&5
62213 + if test -x "$PHP_EXECUTABLE"; then
62214 + grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
62215 + if test "$grepext" = "$extname"; then
62216 + HTTP_HAVE_EXT_HASH=1
62217 + echo "$ac_t""yes" 1>&6
62219 + echo $ac_n "checking for php_hash.h""... $ac_c" 1>&6
62220 +echo "configure:109624: checking for php_hash.h" >&5
62221 + HTTP_EXT_HASH_INCDIR=
62222 + for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do
62223 + if test -d $i; then
62224 + if test -f $i/php_hash.h; then
62225 + HTTP_EXT_HASH_INCDIR=$i
62227 + elif test -f $i/ext/hash/php_hash.h; then
62228 + HTTP_EXT_HASH_INCDIR=$i/ext/hash
62233 + if test "x$HTTP_EXT_HASH_INCDIR" = "x"; then
62234 + echo "$ac_t""not found" 1>&6
62236 + echo "$ac_t""$HTTP_EXT_HASH_INCDIR" 1>&6
62237 + cat >> confdefs.h <<\EOF
62238 +#define HTTP_HAVE_PHP_HASH_H 1
62242 + if test "$HTTP_EXT_HASH_INCDIR" != "/usr/include"; then
62244 - if test "$PHP_ZLIB_INCDIR" != "/usr/include"; then
62246 - if test -z "$PHP_ZLIB_INCDIR" || echo "$PHP_ZLIB_INCDIR" | grep '^/' >/dev/null ; then
62247 - ai_p=$PHP_ZLIB_INCDIR
62248 + if test -z "$HTTP_EXT_HASH_INCDIR" || echo "$HTTP_EXT_HASH_INCDIR" | grep '^/' >/dev/null ; then
62249 + ai_p=$HTTP_EXT_HASH_INCDIR
62252 - ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
62253 + ep_dir="`echo $HTTP_EXT_HASH_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
62255 ep_realdir="`(cd \"$ep_dir\" && pwd)`"
62256 - ai_p="$ep_realdir/`basename \"$PHP_ZLIB_INCDIR\"`"
62257 + ai_p="$ep_realdir/`basename \"$HTTP_EXT_HASH_INCDIR\"`"
62261 @@ -103264,97 +109672,160 @@ echo "configure:103135: checking for the
62267 - old_CPPFLAGS=$CPPFLAGS
62268 - CPPFLAGS=$INCLUDES
62269 - cat > conftest.$ac_ext <<EOF
62270 -#line 103273 "configure"
62271 -#include "confdefs.h"
62273 -#include <main/php_config.h>
62274 -#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
62281 + HTTP_HAVE_EXT_HASH=
62282 + echo "$ac_t""no" 1>&6
62285 + elif test "$haveext" != "no" && test "x$haveext" != "x"; then
62286 + HTTP_HAVE_EXT_HASH=1
62287 + echo "$ac_t""yes" 1>&6
62289 + echo $ac_n "checking for php_hash.h""... $ac_c" 1>&6
62290 +echo "configure:109688: checking for php_hash.h" >&5
62291 + HTTP_EXT_HASH_INCDIR=
62292 + for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do
62293 + if test -d $i; then
62294 + if test -f $i/php_hash.h; then
62295 + HTTP_EXT_HASH_INCDIR=$i
62297 + elif test -f $i/ext/hash/php_hash.h; then
62298 + HTTP_EXT_HASH_INCDIR=$i/ext/hash
62303 + if test "x$HTTP_EXT_HASH_INCDIR" = "x"; then
62304 + echo "$ac_t""not found" 1>&6
62306 + echo "$ac_t""$HTTP_EXT_HASH_INCDIR" 1>&6
62307 + cat >> confdefs.h <<\EOF
62308 +#define HTTP_HAVE_PHP_HASH_H 1
62310 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
62311 - egrep "yes" >/dev/null 2>&1; then
62314 - PHP_PCRE_REGEX=yes
62319 - cat > conftest.$ac_ext <<EOF
62320 -#line 103292 "configure"
62321 -#include "confdefs.h"
62323 -#include <main/php_config.h>
62324 -#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
62328 + if test "$HTTP_EXT_HASH_INCDIR" != "/usr/include"; then
62331 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
62332 - egrep "yes" >/dev/null 2>&1; then
62335 - PHP_PCRE_REGEX=pecl
62336 + if test -z "$HTTP_EXT_HASH_INCDIR" || echo "$HTTP_EXT_HASH_INCDIR" | grep '^/' >/dev/null ; then
62337 + ai_p=$HTTP_EXT_HASH_INCDIR
62343 - PHP_PCRE_REGEX=no
62344 + ep_dir="`echo $HTTP_EXT_HASH_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
62348 + ep_realdir="`(cd \"$ep_dir\" && pwd)`"
62349 + ai_p="$ep_realdir/`basename \"$HTTP_EXT_HASH_INCDIR\"`"
62356 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
62358 + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
62359 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
62360 + eval "INCLUDEPATH$unique=set"
62363 + INCLUDES="-I$ai_p $INCLUDES"
62365 + INCLUDES="$INCLUDES -I$ai_p"
62370 - CPPFLAGS=$old_CPPFLAGS
62373 - PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \
62374 - lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c \
62375 - lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \
62376 - lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \
62377 - lib/zip_source_free.c lib/zip_unchange_all.c lib/zip_delete.c \
62378 - lib/zip_error_get_sys_type.c lib/zip_file_get_offset.c \
62379 - lib/zip_get_name.c lib/zip_replace.c lib/zip_source_function.c \
62380 - lib/zip_unchange.c lib/zip_dirent.c lib/zip_error_strerror.c \
62381 - lib/zip_filerange_crc.c lib/zip_file_strerror.c lib/zip_get_num_files.c \
62382 - lib/zip_get_archive_flag.c lib/zip_set_archive_flag.c \
62383 - lib/zip_set_name.c lib/zip_source_zip.c lib/zip_unchange_data.c \
62384 - lib/zip_entry_free.c lib/zip_error_to_str.c lib/zip_fopen.c \
62385 - lib/zip_name_locate.c lib/zip_source_buffer.c lib/zip_stat.c \
62386 - lib/zip_entry_new.c lib/zip_err_str.c lib/zip_fopen_index.c \
62387 - lib/zip_get_archive_comment.c lib/zip_get_file_comment.c \
62388 - lib/zip_new.c lib/zip_source_file.c lib/zip_stat_index.c \
62389 - lib/zip_set_archive_comment.c lib/zip_set_file_comment.c \
62390 - lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \
62391 - lib/zip_error_clear.c lib/zip_file_error_clear.c"
62395 + HTTP_HAVE_EXT_HASH=
62396 + echo "$ac_t""no" 1>&6
62401 - cat >> confdefs.h <<\EOF
62402 -#define HAVE_ZIP 1
62406 + haveext=$PHP_ICONV
62408 + echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6
62409 +echo "configure:109754: checking for ext/$extname support" >&5
62410 + if test -x "$PHP_EXECUTABLE"; then
62411 + grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
62412 + if test "$grepext" = "$extname"; then
62413 + HTTP_HAVE_EXT_ICONV=1
62414 + echo "$ac_t""yes" 1>&6
62417 + HTTP_HAVE_EXT_ICONV=
62418 + echo "$ac_t""no" 1>&6
62421 + elif test "$haveext" != "no" && test "x$haveext" != "x"; then
62422 + HTTP_HAVE_EXT_ICONV=1
62423 + echo "$ac_t""yes" 1>&6
62426 + HTTP_HAVE_EXT_ICONV=
62427 + echo "$ac_t""no" 1>&6
62433 - ext_builddir=ext/zip
62434 - ext_srcdir=$abs_srcdir/ext/zip
62437 + haveext=$PHP_SESSION
62439 + echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6
62440 +echo "configure:109782: checking for ext/$extname support" >&5
62441 + if test -x "$PHP_EXECUTABLE"; then
62442 + grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
62443 + if test "$grepext" = "$extname"; then
62444 + HTTP_HAVE_EXT_SESSION=1
62445 + echo "$ac_t""yes" 1>&6
62448 + HTTP_HAVE_EXT_SESSION=
62449 + echo "$ac_t""no" 1>&6
62452 + elif test "$haveext" != "no" && test "x$haveext" != "x"; then
62453 + HTTP_HAVE_EXT_SESSION=1
62454 + echo "$ac_t""yes" 1>&6
62457 + HTTP_HAVE_EXT_SESSION=
62458 + echo "$ac_t""no" 1>&6
62463 + PHP_HTTP_SOURCES="missing.c http.c http_functions.c phpstr/phpstr.c \
62464 + http_util_object.c http_message_object.c http_request_object.c http_request_pool_api.c \
62465 + http_response_object.c http_exception_object.c http_requestpool_object.c \
62466 + http_api.c http_cache_api.c http_request_api.c http_request_info.c http_date_api.c \
62467 + http_headers_api.c http_message_api.c http_send_api.c http_url_api.c \
62468 + http_info_api.c http_request_method_api.c http_encoding_api.c \
62469 + http_filter_api.c http_request_body_api.c http_querystring_object.c \
62470 + http_deflatestream_object.c http_inflatestream_object.c http_cookie_api.c \
62471 + http_querystring_api.c http_request_datashare_api.c http_requestdatashare_object.c \
62472 + http_persistent_handle_api.c"
62475 + ext_builddir=ext/http
62476 + ext_srcdir=$abs_srcdir/ext/http
62480 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
62481 - PHP_ZIP_SHARED=no
62482 + PHP_HTTP_SHARED=no
62487 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
62488 - /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62489 - *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62490 + /*) ac_srcdir=`echo "ext/http"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62491 + *) ac_srcdir="$abs_srcdir/ext/http/"; ac_bdir="ext/http/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62495 @@ -103369,7 +109840,7 @@ EOF
62499 - for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
62500 + for ac_src in $PHP_HTTP_SOURCES; do
62504 @@ -103392,18 +109863,18 @@ EOF
62508 - EXT_STATIC="$EXT_STATIC zip"
62509 + EXT_STATIC="$EXT_STATIC http"
62510 if test "$ext_shared" != "nocli"; then
62511 - EXT_CLI_STATIC="$EXT_CLI_STATIC zip"
62512 + EXT_CLI_STATIC="$EXT_CLI_STATIC http"
62515 if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
62516 - PHP_ZIP_SHARED=yes
62517 + PHP_HTTP_SHARED=yes
62521 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
62522 - /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62523 - *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62524 + /*) ac_srcdir=`echo "ext/http"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62525 + *) ac_srcdir="$abs_srcdir/ext/http/"; ac_bdir="ext/http/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62529 @@ -103418,14 +109889,14 @@ EOF
62533 - for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
62534 + for ac_src in $PHP_HTTP_SOURCES; do
62541 - shared_objects_zip="$shared_objects_zip $ac_bdir$ac_obj.lo"
62542 + shared_objects_http="$shared_objects_http $ac_bdir$ac_obj.lo"
62545 *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
62546 @@ -103448,31 +109919,31 @@ EOF
62547 case $host_alias in
62550 - 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'
62551 + 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'
62555 - link_cmd='$(LIBTOOL) --mode=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)'
62556 + link_cmd='$(LIBTOOL) --mode=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)'
62560 - link_cmd='$(LIBTOOL) --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)'
62561 + link_cmd='$(LIBTOOL) --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)'
62565 if test "x" = "xyes"; then
62566 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpzip.$suffix"
62567 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phphttp.$suffix"
62569 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzip.$suffix"
62570 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phphttp.$suffix"
62573 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip"
62574 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_http"
62576 cat >>Makefile.objects<<EOF
62577 -\$(phplibdir)/phpzip.$suffix: $ext_builddir/phpzip.$suffix
62578 - \$(LIBTOOL) --mode=install cp $ext_builddir/phpzip.$suffix \$(phplibdir)
62579 +\$(phplibdir)/phphttp.$suffix: $ext_builddir/phphttp.$suffix
62580 + \$(LIBTOOL) --mode=install cp $ext_builddir/phphttp.$suffix \$(phplibdir)
62582 -$ext_builddir/phpzip.$suffix: \$(shared_objects_zip) \$(PHPZIP_SHARED_DEPENDENCIES)
62583 +$ext_builddir/phphttp.$suffix: \$(shared_objects_http) \$(PHPHTTP_SHARED_DEPENDENCIES)
62587 @@ -103485,31 +109956,31 @@ EOF
62588 case $host_alias in
62591 - 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'
62592 + 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'
62596 - link_cmd='$(LIBTOOL) --mode=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)'
62597 + link_cmd='$(LIBTOOL) --mode=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)'
62601 - link_cmd='$(LIBTOOL) --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)'
62602 + link_cmd='$(LIBTOOL) --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)'
62606 if test "x" = "xyes"; then
62607 - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/zip.$suffix"
62608 + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/http.$suffix"
62610 - PHP_MODULES="$PHP_MODULES \$(phplibdir)/zip.$suffix"
62611 + PHP_MODULES="$PHP_MODULES \$(phplibdir)/http.$suffix"
62614 - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip"
62615 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_http"
62617 cat >>Makefile.objects<<EOF
62618 -\$(phplibdir)/zip.$suffix: $ext_builddir/zip.$suffix
62619 - \$(LIBTOOL) --mode=install cp $ext_builddir/zip.$suffix \$(phplibdir)
62620 +\$(phplibdir)/http.$suffix: $ext_builddir/http.$suffix
62621 + \$(LIBTOOL) --mode=install cp $ext_builddir/http.$suffix \$(phplibdir)
62623 -$ext_builddir/zip.$suffix: \$(shared_objects_zip) \$(ZIP_SHARED_DEPENDENCIES)
62624 +$ext_builddir/http.$suffix: \$(shared_objects_http) \$(HTTP_SHARED_DEPENDENCIES)
62628 @@ -103517,22 +109988,22 @@ EOF
62631 cat >> confdefs.h <<EOF
62632 -#define COMPILE_DL_ZIP 1
62633 +#define COMPILE_DL_HTTP 1
62639 if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
62640 - PHP_ZIP_SHARED=no
62641 + PHP_HTTP_SHARED=no
62642 case "$PHP_SAPI" in
62648 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
62649 - /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62650 - *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62651 + /*) ac_srcdir=`echo "ext/http"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62652 + *) ac_srcdir="$abs_srcdir/ext/http/"; ac_bdir="ext/http/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62656 @@ -103547,7 +110018,7 @@ EOF
62660 - for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
62661 + for ac_src in $PHP_HTTP_SOURCES; do
62665 @@ -103570,15 +110041,15 @@ EOF
62669 - EXT_STATIC="$EXT_STATIC zip"
62670 + EXT_STATIC="$EXT_STATIC http"
62677 "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
62678 - /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62679 - *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62680 + /*) ac_srcdir=`echo "ext/http"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
62681 + *) ac_srcdir="$abs_srcdir/ext/http/"; ac_bdir="ext/http/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
62685 @@ -103593,7 +110064,7 @@ EOF
62689 - for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do
62690 + for ac_src in $PHP_HTTP_SOURCES; do
62694 @@ -103618,7 +110089,7 @@ EOF
62698 - EXT_CLI_STATIC="$EXT_CLI_STATIC zip"
62699 + EXT_CLI_STATIC="$EXT_CLI_STATIC http"
62703 @@ -103627,26 +110098,172 @@ EOF
62706 if test "$ext_builddir" = "."; then
62707 - PHP_PECL_EXTENSION=zip
62708 + PHP_PECL_EXTENSION=http
62710 PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
62717 + haveext=$HTTP_HAVE_EXT_HASH
62719 + echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6
62720 +echo "configure:110114: checking whether to add a dependency on ext/$extname" >&5
62721 + if test "$PHP_HTTP_SHARED_DEPS" = "no"; then
62722 + echo "$ac_t""no" 1>&6
62724 + elif test "$haveext"; then
62725 + echo "$ac_t""yes" 1>&6
62728 + am_i_shared=$PHP_HTTP_SHARED
62729 + is_it_shared=$PHP_HASH_SHARED
62730 + is_it_enabled=$PHP_HASH
62731 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
62732 + { echo "configure: error:
62733 +You've configured extension http to build statically, but it
62734 +depends on extension hash, which you've configured to build shared.
62735 +You either need to build http shared or build hash statically for the
62736 +build to be successful.
62739 + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
62740 + { echo "configure: error:
62741 +You've configured extension http, which depends on extension hash,
62742 +but you've either not enabled hash, or have disabled it.
62749 + echo "$ac_t""no" 1>&6
62755 + haveext=$HTTP_HAVE_EXT_ICONV
62757 + echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6
62758 +echo "configure:110152: checking whether to add a dependency on ext/$extname" >&5
62759 + if test "$PHP_HTTP_SHARED_DEPS" = "no"; then
62760 + echo "$ac_t""no" 1>&6
62762 + elif test "$haveext"; then
62763 + echo "$ac_t""yes" 1>&6
62766 + am_i_shared=$PHP_HTTP_SHARED
62767 + is_it_shared=$PHP_ICONV_SHARED
62768 + is_it_enabled=$PHP_ICONV
62769 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
62770 + { echo "configure: error:
62771 +You've configured extension http to build statically, but it
62772 +depends on extension iconv, which you've configured to build shared.
62773 +You either need to build http shared or build iconv statically for the
62774 +build to be successful.
62777 + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
62778 + { echo "configure: error:
62779 +You've configured extension http, which depends on extension iconv,
62780 +but you've either not enabled iconv, or have disabled it.
62787 + echo "$ac_t""no" 1>&6
62793 + haveext=$HTTP_HAVE_EXT_SESSION
62795 + echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6
62796 +echo "configure:110190: checking whether to add a dependency on ext/$extname" >&5
62797 + if test "$PHP_HTTP_SHARED_DEPS" = "no"; then
62798 + echo "$ac_t""no" 1>&6
62800 + elif test "$haveext"; then
62801 + echo "$ac_t""yes" 1>&6
62804 + am_i_shared=$PHP_HTTP_SHARED
62805 + is_it_shared=$PHP_SESSION_SHARED
62806 + is_it_enabled=$PHP_SESSION
62807 + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
62808 + { echo "configure: error:
62809 +You've configured extension http to build statically, but it
62810 +depends on extension session, which you've configured to build shared.
62811 +You either need to build http shared or build session statically for the
62812 +build to be successful.
62815 + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
62816 + { echo "configure: error:
62817 +You've configured extension http, which depends on extension session,
62818 +but you've either not enabled session, or have disabled it.
62825 + echo "$ac_t""no" 1>&6
62832 + $php_shtool mkdir -p $ext_builddir/phpstr
62836 + PHP_VAR_SUBST="$PHP_VAR_SUBST HTTP_SHARED_LIBADD"
62839 + PHP_HTTP_HEADERS="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \
62840 + php_http_date_api.h php_http_headers_api.h php_http_info_api.h php_http_message_api.h \
62841 + php_http_request_api.h php_http_request_method_api.h php_http_send_api.h php_http_url_api.h \
62842 + php_http_encoding_api.h phpstr/phpstr.h missing.h php_http_request_body_api.h \
62843 + php_http_exception_object.h php_http_message_object.h php_http_request_object.h \
62844 + php_http_requestpool_object.h php_http_response_object.h php_http_util_object.h \
62845 + php_http_querystring_object.h php_http_deflatestream_object.h php_http_inflatestream_object.h \
62846 + php_http_cookie_api.h php_http_querystring_api.h php_http_request_datashare_api.h php_http_requestdatashare_object.h \
62847 + php_http_persistent_handle_api.h"
62851 + header_path=ext/http
62852 + for header_file in $PHP_HTTP_HEADERS; do
62853 + hp_hf="$header_path/$header_file"
62856 - $php_shtool mkdir -p $ext_builddir/lib
62857 + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
62859 + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
62860 + if test -n "$unique" && test "`eval $cmd`" = "" ; then
62861 + eval "INSTALLHEADERS$unique=set"
62863 + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
62869 - PHP_VAR_SUBST="$PHP_VAR_SUBST ZIP_SHARED_LIBADD"
62874 - src=$ext_srcdir/Makefile.frag
62875 - ac_srcdir=$ext_srcdir
62876 - ac_builddir=$ext_builddir
62877 - test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
62878 + cat >> confdefs.h <<\EOF
62879 +#define HAVE_HTTP 1
62884 @@ -103656,7 +110273,7 @@ fi
62885 php_enable_mysqlnd_compression_support=yes
62887 echo $ac_n "checking whether to enable compressed protocol support in mysqlnd""... $ac_c" 1>&6
62888 -echo "configure:103660: checking whether to enable compressed protocol support in mysqlnd" >&5
62889 +echo "configure:110277: checking whether to enable compressed protocol support in mysqlnd" >&5
62890 # Check whether --enable-mysqlnd_compression_support or --disable-mysqlnd_compression_support was given.
62891 if test "${enable_mysqlnd_compression_support+set}" = set; then
62892 enableval="$enable_mysqlnd_compression_support"
62893 @@ -103680,7 +110297,7 @@ if test -z "$PHP_ZLIB_DIR"; then
62894 php_with_zlib_dir=no
62896 echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
62897 -echo "configure:103684: checking for the location of libz" >&5
62898 +echo "configure:110301: checking for the location of libz" >&5
62899 # Check whether --with-zlib-dir or --without-zlib-dir was given.
62900 if test "${with_zlib_dir+set}" = set; then
62901 withval="$with_zlib_dir"
62902 @@ -104047,7 +110664,7 @@ if test "$PHP_MYSQLND_ENABLED" = "yes" |
62904 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
62905 echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6
62906 -echo "configure:104051: checking whether $php_typename exists" >&5
62907 +echo "configure:110668: checking whether $php_typename exists" >&5
62909 php_cache_value=php_cv_sizeof_$php_typename
62910 if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then
62911 @@ -104064,7 +110681,7 @@ else
62914 cat > conftest.$ac_ext <<EOF
62915 -#line 104068 "configure"
62916 +#line 110685 "configure"
62917 #include "confdefs.h"
62920 @@ -104094,7 +110711,7 @@ int main()
62924 -if { (eval echo configure:104098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
62925 +if { (eval echo configure:110715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
62928 eval $php_cache_value=`cat conftestval`
62929 @@ -104234,7 +110851,7 @@ if test "$PHP_RECODE" != "no"; then
62932 echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
62933 -echo "configure:104238: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
62934 +echo "configure:110855: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
62935 ac_lib_var=`echo $MYSQL_LIBNAME'_'hash_insert | sed 'y%./+-%__p_%'`
62936 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
62937 echo $ac_n "(cached) $ac_c" 1>&6
62938 @@ -104242,7 +110859,7 @@ else
62939 ac_save_LIBS="$LIBS"
62940 LIBS="-l$MYSQL_LIBNAME $LIBS"
62941 cat > conftest.$ac_ext <<EOF
62942 -#line 104246 "configure"
62943 +#line 110863 "configure"
62944 #include "confdefs.h"
62945 /* Override any gcc2 internal prototype to avoid an error. */
62946 /* We use char because int might match the return type of a gcc2
62947 @@ -104253,7 +110870,7 @@ int main() {
62951 -if { (eval echo configure:104257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62952 +if { (eval echo configure:110874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
62954 eval "ac_cv_lib_$ac_lib_var=yes"
62956 @@ -104355,7 +110972,7 @@ fi
62957 php_with_pear=DEFAULT
62959 echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6
62960 -echo "configure:104359: checking whether to install PEAR" >&5
62961 +echo "configure:110976: checking whether to install PEAR" >&5
62962 # Check whether --with-pear or --without-pear was given.
62963 if test "${with_pear+set}" = set; then
62964 withval="$with_pear"
62965 @@ -104457,7 +111074,7 @@ fi
62967 if test "$YACC"; then
62968 echo $ac_n "checking for bison version""... $ac_c" 1>&6
62969 -echo "configure:104461: checking for bison version" >&5
62970 +echo "configure:111078: checking for bison version" >&5
62971 if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then
62972 echo $ac_n "(cached) $ac_c" 1>&6
62974 @@ -104513,17 +111130,17 @@ dlfcn.h
62976 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
62977 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
62978 -echo "configure:104517: checking for $ac_hdr" >&5
62979 +echo "configure:111134: checking for $ac_hdr" >&5
62980 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
62981 echo $ac_n "(cached) $ac_c" 1>&6
62983 cat > conftest.$ac_ext <<EOF
62984 -#line 104522 "configure"
62985 +#line 111139 "configure"
62986 #include "confdefs.h"
62989 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
62990 -{ (eval echo configure:104527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
62991 +{ (eval echo configure:111144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
62992 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
62993 if test -z "$ac_err"; then
62995 @@ -104551,12 +111168,12 @@ done
62998 echo $ac_n "checking for size_t""... $ac_c" 1>&6
62999 -echo "configure:104555: checking for size_t" >&5
63000 +echo "configure:111172: checking for size_t" >&5
63001 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
63002 echo $ac_n "(cached) $ac_c" 1>&6
63004 cat > conftest.$ac_ext <<EOF
63005 -#line 104560 "configure"
63006 +#line 111177 "configure"
63007 #include "confdefs.h"
63008 #include <sys/types.h>
63010 @@ -104584,12 +111201,12 @@ EOF
63013 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
63014 -echo "configure:104588: checking return type of signal handlers" >&5
63015 +echo "configure:111205: checking return type of signal handlers" >&5
63016 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
63017 echo $ac_n "(cached) $ac_c" 1>&6
63019 cat > conftest.$ac_ext <<EOF
63020 -#line 104593 "configure"
63021 +#line 111210 "configure"
63022 #include "confdefs.h"
63023 #include <sys/types.h>
63024 #include <signal.h>
63025 @@ -104606,7 +111223,7 @@ int main() {
63029 -if { (eval echo configure:104610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63030 +if { (eval echo configure:111227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63032 ac_cv_type_signal=void
63034 @@ -104630,12 +111247,12 @@ EOF
63037 echo $ac_n "checking for uint""... $ac_c" 1>&6
63038 -echo "configure:104634: checking for uint" >&5
63039 +echo "configure:111251: checking for uint" >&5
63040 if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then
63041 echo $ac_n "(cached) $ac_c" 1>&6
63043 cat > conftest.$ac_ext <<EOF
63044 -#line 104639 "configure"
63045 +#line 111256 "configure"
63046 #include "confdefs.h"
63047 #include <sys/types.h>
63049 @@ -104663,12 +111280,12 @@ EOF
63052 echo $ac_n "checking for ulong""... $ac_c" 1>&6
63053 -echo "configure:104667: checking for ulong" >&5
63054 +echo "configure:111284: checking for ulong" >&5
63055 if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then
63056 echo $ac_n "(cached) $ac_c" 1>&6
63058 cat > conftest.$ac_ext <<EOF
63059 -#line 104672 "configure"
63060 +#line 111289 "configure"
63061 #include "confdefs.h"
63062 #include <sys/types.h>
63064 @@ -104698,9 +111315,9 @@ fi
63067 echo $ac_n "checking for int32_t""... $ac_c" 1>&6
63068 -echo "configure:104702: checking for int32_t" >&5
63069 +echo "configure:111319: checking for int32_t" >&5
63070 cat > conftest.$ac_ext <<EOF
63071 -#line 104704 "configure"
63072 +#line 111321 "configure"
63073 #include "confdefs.h"
63075 #if HAVE_SYS_TYPES_H
63076 @@ -104719,7 +111336,7 @@ if (sizeof (int32_t))
63080 -if { (eval echo configure:104723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63081 +if { (eval echo configure:111340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63084 cat >> confdefs.h <<EOF
63085 @@ -104738,9 +111355,9 @@ fi
63088 echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
63089 -echo "configure:104742: checking for uint32_t" >&5
63090 +echo "configure:111359: checking for uint32_t" >&5
63091 cat > conftest.$ac_ext <<EOF
63092 -#line 104744 "configure"
63093 +#line 111361 "configure"
63094 #include "confdefs.h"
63096 #if HAVE_SYS_TYPES_H
63097 @@ -104759,7 +111376,7 @@ if (sizeof (uint32_t))
63101 -if { (eval echo configure:104763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63102 +if { (eval echo configure:111380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63105 cat >> confdefs.h <<EOF
63106 @@ -104778,12 +111395,12 @@ fi
63109 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
63110 -echo "configure:104782: checking for vprintf" >&5
63111 +echo "configure:111399: checking for vprintf" >&5
63112 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
63113 echo $ac_n "(cached) $ac_c" 1>&6
63115 cat > conftest.$ac_ext <<EOF
63116 -#line 104787 "configure"
63117 +#line 111404 "configure"
63118 #include "confdefs.h"
63119 /* System header to define __stub macros and hopefully few prototypes,
63120 which can conflict with char vprintf(); below. */
63121 @@ -104806,7 +111423,7 @@ vprintf();
63125 -if { (eval echo configure:104810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63126 +if { (eval echo configure:111427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63128 eval "ac_cv_func_vprintf=yes"
63130 @@ -104830,12 +111447,12 @@ fi
63132 if test "$ac_cv_func_vprintf" != yes; then
63133 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
63134 -echo "configure:104834: checking for _doprnt" >&5
63135 +echo "configure:111451: checking for _doprnt" >&5
63136 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
63137 echo $ac_n "(cached) $ac_c" 1>&6
63139 cat > conftest.$ac_ext <<EOF
63140 -#line 104839 "configure"
63141 +#line 111456 "configure"
63142 #include "confdefs.h"
63143 /* System header to define __stub macros and hopefully few prototypes,
63144 which can conflict with char _doprnt(); below. */
63145 @@ -104858,7 +111475,7 @@ _doprnt();
63149 -if { (eval echo configure:104862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63150 +if { (eval echo configure:111479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63152 eval "ac_cv_func__doprnt=yes"
63154 @@ -104883,7 +111500,7 @@ fi
63157 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
63158 -echo "configure:104887: checking for 8-bit clean memcmp" >&5
63159 +echo "configure:111504: checking for 8-bit clean memcmp" >&5
63160 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
63161 echo $ac_n "(cached) $ac_c" 1>&6
63163 @@ -104891,7 +111508,7 @@ else
63164 ac_cv_func_memcmp_clean=no
63166 cat > conftest.$ac_ext <<EOF
63167 -#line 104895 "configure"
63168 +#line 111512 "configure"
63169 #include "confdefs.h"
63172 @@ -104901,7 +111518,7 @@ main()
63176 -if { (eval echo configure:104905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63177 +if { (eval echo configure:111522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63179 ac_cv_func_memcmp_clean=yes
63181 @@ -104921,19 +111538,19 @@ test $ac_cv_func_memcmp_clean = no && LI
63182 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
63183 # for constant arguments. Useless!
63184 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
63185 -echo "configure:104925: checking for working alloca.h" >&5
63186 +echo "configure:111542: checking for working alloca.h" >&5
63187 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
63188 echo $ac_n "(cached) $ac_c" 1>&6
63190 cat > conftest.$ac_ext <<EOF
63191 -#line 104930 "configure"
63192 +#line 111547 "configure"
63193 #include "confdefs.h"
63194 #include <alloca.h>
63196 char *p = alloca(2 * sizeof(int));
63199 -if { (eval echo configure:104937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63200 +if { (eval echo configure:111554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63202 ac_cv_header_alloca_h=yes
63204 @@ -104954,12 +111571,12 @@ EOF
63207 echo $ac_n "checking for alloca""... $ac_c" 1>&6
63208 -echo "configure:104958: checking for alloca" >&5
63209 +echo "configure:111575: checking for alloca" >&5
63210 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
63211 echo $ac_n "(cached) $ac_c" 1>&6
63213 cat > conftest.$ac_ext <<EOF
63214 -#line 104963 "configure"
63215 +#line 111580 "configure"
63216 #include "confdefs.h"
63219 @@ -104987,7 +111604,7 @@ int main() {
63220 char *p = (char *) alloca(1);
63223 -if { (eval echo configure:104991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63224 +if { (eval echo configure:111608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63226 ac_cv_func_alloca_works=yes
63228 @@ -105019,12 +111636,12 @@ EOF
63231 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
63232 -echo "configure:105023: checking whether alloca needs Cray hooks" >&5
63233 +echo "configure:111640: checking whether alloca needs Cray hooks" >&5
63234 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
63235 echo $ac_n "(cached) $ac_c" 1>&6
63237 cat > conftest.$ac_ext <<EOF
63238 -#line 105028 "configure"
63239 +#line 111645 "configure"
63240 #include "confdefs.h"
63241 #if defined(CRAY) && ! defined(CRAY2)
63243 @@ -105049,12 +111666,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
63244 if test $ac_cv_os_cray = yes; then
63245 for ac_func in _getb67 GETB67 getb67; do
63246 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
63247 -echo "configure:105053: checking for $ac_func" >&5
63248 +echo "configure:111670: checking for $ac_func" >&5
63249 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
63250 echo $ac_n "(cached) $ac_c" 1>&6
63252 cat > conftest.$ac_ext <<EOF
63253 -#line 105058 "configure"
63254 +#line 111675 "configure"
63255 #include "confdefs.h"
63256 /* System header to define __stub macros and hopefully few prototypes,
63257 which can conflict with char $ac_func(); below. */
63258 @@ -105077,7 +111694,7 @@ $ac_func();
63262 -if { (eval echo configure:105081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63263 +if { (eval echo configure:111698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63265 eval "ac_cv_func_$ac_func=yes"
63267 @@ -105104,7 +111721,7 @@ done
63270 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
63271 -echo "configure:105108: checking stack direction for C alloca" >&5
63272 +echo "configure:111725: checking stack direction for C alloca" >&5
63273 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
63274 echo $ac_n "(cached) $ac_c" 1>&6
63276 @@ -105112,7 +111729,7 @@ else
63277 ac_cv_c_stack_direction=0
63279 cat > conftest.$ac_ext <<EOF
63280 -#line 105116 "configure"
63281 +#line 111733 "configure"
63282 #include "confdefs.h"
63283 find_stack_direction ()
63285 @@ -105131,7 +111748,7 @@ main ()
63286 exit (find_stack_direction() < 0);
63289 -if { (eval echo configure:105135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63290 +if { (eval echo configure:111752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63292 ac_cv_c_stack_direction=1
63294 @@ -105155,12 +111772,12 @@ fi
63295 for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp
63297 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
63298 -echo "configure:105159: checking for $ac_func" >&5
63299 +echo "configure:111776: checking for $ac_func" >&5
63300 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
63301 echo $ac_n "(cached) $ac_c" 1>&6
63303 cat > conftest.$ac_ext <<EOF
63304 -#line 105164 "configure"
63305 +#line 111781 "configure"
63306 #include "confdefs.h"
63307 /* System header to define __stub macros and hopefully few prototypes,
63308 which can conflict with char $ac_func(); below. */
63309 @@ -105183,7 +111800,7 @@ $ac_func();
63313 -if { (eval echo configure:105187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63314 +if { (eval echo configure:111804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63316 eval "ac_cv_func_$ac_func=yes"
63318 @@ -105209,7 +111826,7 @@ done
63321 echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6
63322 -echo "configure:105213: checking whether sprintf is broken" >&5
63323 +echo "configure:111830: checking whether sprintf is broken" >&5
63324 if eval "test \"`echo '$''{'ac_cv_broken_sprintf'+set}'`\" = set"; then
63325 echo $ac_n "(cached) $ac_c" 1>&6
63327 @@ -105220,11 +111837,11 @@ else
63330 cat > conftest.$ac_ext <<EOF
63331 -#line 105224 "configure"
63332 +#line 111841 "configure"
63333 #include "confdefs.h"
63334 main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }
63336 -if { (eval echo configure:105228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63337 +if { (eval echo configure:111845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63340 ac_cv_broken_sprintf=no
63341 @@ -105258,12 +111875,12 @@ EOF
63342 for ac_func in finite isfinite isinf isnan
63344 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
63345 -echo "configure:105262: checking for $ac_func" >&5
63346 +echo "configure:111879: checking for $ac_func" >&5
63347 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
63348 echo $ac_n "(cached) $ac_c" 1>&6
63350 cat > conftest.$ac_ext <<EOF
63351 -#line 105267 "configure"
63352 +#line 111884 "configure"
63353 #include "confdefs.h"
63354 /* System header to define __stub macros and hopefully few prototypes,
63355 which can conflict with char $ac_func(); below. */
63356 @@ -105286,7 +111903,7 @@ $ac_func();
63360 -if { (eval echo configure:105290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63361 +if { (eval echo configure:111907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63363 eval "ac_cv_func_$ac_func=yes"
63365 @@ -105313,13 +111930,13 @@ done
63368 echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6
63369 -echo "configure:105317: checking whether fp_except is defined" >&5
63370 +echo "configure:111934: checking whether fp_except is defined" >&5
63371 if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then
63372 echo $ac_n "(cached) $ac_c" 1>&6
63375 cat > conftest.$ac_ext <<EOF
63376 -#line 105323 "configure"
63377 +#line 111940 "configure"
63378 #include "confdefs.h"
63380 #include <floatingpoint.h>
63381 @@ -105330,7 +111947,7 @@ fp_except x = (fp_except) 0;
63385 -if { (eval echo configure:105334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63386 +if { (eval echo configure:111951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63389 ac_cv_type_fp_except=yes
63390 @@ -105357,9 +111974,9 @@ EOF
63393 echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6
63394 -echo "configure:105361: checking for usable _FPU_SETCW" >&5
63395 +echo "configure:111978: checking for usable _FPU_SETCW" >&5
63396 cat > conftest.$ac_ext <<EOF
63397 -#line 105363 "configure"
63398 +#line 111980 "configure"
63399 #include "confdefs.h"
63401 #include <fpu_control.h>
63402 @@ -105379,7 +111996,7 @@ int main() {
63406 -if { (eval echo configure:105383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63407 +if { (eval echo configure:112000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63409 ac_cfp_have__fpu_setcw=yes
63411 @@ -105400,9 +112017,9 @@ EOF
63414 echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6
63415 -echo "configure:105404: checking for usable fpsetprec" >&5
63416 +echo "configure:112021: checking for usable fpsetprec" >&5
63417 cat > conftest.$ac_ext <<EOF
63418 -#line 105406 "configure"
63419 +#line 112023 "configure"
63420 #include "confdefs.h"
63422 #include <machine/ieeefp.h>
63423 @@ -105421,7 +112038,7 @@ int main() {
63427 -if { (eval echo configure:105425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63428 +if { (eval echo configure:112042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63430 ac_cfp_have_fpsetprec=yes
63432 @@ -105442,9 +112059,9 @@ EOF
63435 echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6
63436 -echo "configure:105446: checking for usable _controlfp" >&5
63437 +echo "configure:112063: checking for usable _controlfp" >&5
63438 cat > conftest.$ac_ext <<EOF
63439 -#line 105448 "configure"
63440 +#line 112065 "configure"
63441 #include "confdefs.h"
63444 @@ -105463,7 +112080,7 @@ int main() {
63448 -if { (eval echo configure:105467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63449 +if { (eval echo configure:112084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63451 ac_cfp_have__controlfp=yes
63453 @@ -105484,9 +112101,9 @@ EOF
63456 echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6
63457 -echo "configure:105488: checking for usable _controlfp_s" >&5
63458 +echo "configure:112105: checking for usable _controlfp_s" >&5
63459 cat > conftest.$ac_ext <<EOF
63460 -#line 105490 "configure"
63461 +#line 112107 "configure"
63462 #include "confdefs.h"
63465 @@ -105506,7 +112123,7 @@ int main() {
63469 -if { (eval echo configure:105510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63470 +if { (eval echo configure:112127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63472 ac_cfp_have__controlfp_s=yes
63474 @@ -105527,9 +112144,9 @@ EOF
63477 echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6
63478 -echo "configure:105531: checking whether FPU control word can be manipulated by inline assembler" >&5
63479 +echo "configure:112148: checking whether FPU control word can be manipulated by inline assembler" >&5
63480 cat > conftest.$ac_ext <<EOF
63481 -#line 105533 "configure"
63482 +#line 112150 "configure"
63483 #include "confdefs.h"
63486 @@ -105551,7 +112168,7 @@ int main() {
63490 -if { (eval echo configure:105555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63491 +if { (eval echo configure:112172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63493 ac_cfp_have_fpu_inline_asm_x86=yes
63495 @@ -105573,7 +112190,7 @@ EOF
63498 echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6
63499 -echo "configure:105577: checking whether double cast to long preserves least significant bits" >&5
63500 +echo "configure:112194: checking whether double cast to long preserves least significant bits" >&5
63502 if test "$cross_compiling" = yes; then
63504 @@ -105581,7 +112198,7 @@ if test "$cross_compiling" = yes; then
63507 cat > conftest.$ac_ext <<EOF
63508 -#line 105585 "configure"
63509 +#line 112202 "configure"
63510 #include "confdefs.h"
63512 #include <limits.h>
63513 @@ -105605,7 +112222,7 @@ int main()
63517 -if { (eval echo configure:105609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63518 +if { (eval echo configure:112226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63521 cat >> confdefs.h <<\EOF
63522 @@ -105631,17 +112248,17 @@ for ac_hdr in dlfcn.h
63524 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
63525 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
63526 -echo "configure:105635: checking for $ac_hdr" >&5
63527 +echo "configure:112252: checking for $ac_hdr" >&5
63528 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
63529 echo $ac_n "(cached) $ac_c" 1>&6
63531 cat > conftest.$ac_ext <<EOF
63532 -#line 105640 "configure"
63533 +#line 112257 "configure"
63534 #include "confdefs.h"
63537 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
63538 -{ (eval echo configure:105645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
63539 +{ (eval echo configure:112262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
63540 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
63541 if test -z "$ac_err"; then
63543 @@ -105669,14 +112286,14 @@ done
63546 echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6
63547 -echo "configure:105673: checking whether dlsym() requires a leading underscore in symbol names" >&5
63548 +echo "configure:112290: checking whether dlsym() requires a leading underscore in symbol names" >&5
63549 if test "$cross_compiling" = yes; then :
63552 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
63553 lt_status=$lt_dlunknown
63554 cat > conftest.$ac_ext <<EOF
63555 -#line 105680 "configure"
63556 +#line 112297 "configure"
63557 #include "confdefs.h"
63560 @@ -105739,7 +112356,7 @@ int main ()
63564 - if { (eval echo configure:105743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
63565 + if { (eval echo configure:112360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
63566 (./conftest; exit; ) >&5 2>/dev/null
63568 case x$lt_status in
63569 @@ -105822,23 +112439,23 @@ fi
63572 echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6
63573 -echo "configure:105826: checking virtual machine dispatch method" >&5
63574 +echo "configure:112443: checking virtual machine dispatch method" >&5
63575 echo "$ac_t""$PHP_ZEND_VM" 1>&6
63577 echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6
63578 -echo "configure:105830: checking whether to enable thread-safety" >&5
63579 +echo "configure:112447: checking whether to enable thread-safety" >&5
63580 echo "$ac_t""$ZEND_MAINTAINER_ZTS" 1>&6
63582 echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6
63583 -echo "configure:105834: checking whether to enable inline optimization for GCC" >&5
63584 +echo "configure:112451: checking whether to enable inline optimization for GCC" >&5
63585 echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6
63587 echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6
63588 -echo "configure:105838: checking whether to enable Zend debugging" >&5
63589 +echo "configure:112455: checking whether to enable Zend debugging" >&5
63590 echo "$ac_t""$ZEND_DEBUG" 1>&6
63592 echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6
63593 -echo "configure:105842: checking whether to enable Zend multibyte" >&5
63594 +echo "configure:112459: checking whether to enable Zend multibyte" >&5
63595 echo "$ac_t""$ZEND_MULTIBYTE" 1>&6
63597 case $PHP_ZEND_VM in
63598 @@ -105911,21 +112528,21 @@ fi
63601 echo $ac_n "checking for inline""... $ac_c" 1>&6
63602 -echo "configure:105915: checking for inline" >&5
63603 +echo "configure:112532: checking for inline" >&5
63604 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
63605 echo $ac_n "(cached) $ac_c" 1>&6
63608 for ac_kw in inline __inline__ __inline; do
63609 cat > conftest.$ac_ext <<EOF
63610 -#line 105922 "configure"
63611 +#line 112539 "configure"
63612 #include "confdefs.h"
63618 -if { (eval echo configure:105929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63619 +if { (eval echo configure:112546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63621 ac_cv_c_inline=$ac_kw; break
63623 @@ -105954,7 +112571,7 @@ esac
63626 echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6
63627 -echo "configure:105958: checking target system is Darwin" >&5
63628 +echo "configure:112575: checking target system is Darwin" >&5
63629 if echo "$target" | grep "darwin" > /dev/null; then
63630 cat >> confdefs.h <<\EOF
63632 @@ -105966,7 +112583,7 @@ else
63635 echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6
63636 -echo "configure:105970: checking for MM alignment and log values" >&5
63637 +echo "configure:112587: checking for MM alignment and log values" >&5
63639 if test "$cross_compiling" = yes; then
63641 @@ -105974,7 +112591,7 @@ if test "$cross_compiling" = yes; then
63644 cat > conftest.$ac_ext <<EOF
63645 -#line 105978 "configure"
63646 +#line 112595 "configure"
63647 #include "confdefs.h"
63650 @@ -106010,7 +112627,7 @@ int main()
63654 -if { (eval echo configure:106014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63655 +if { (eval echo configure:112631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63658 LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
63659 @@ -106035,7 +112652,7 @@ fi
63660 echo "$ac_t""done" 1>&6
63662 echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6
63663 -echo "configure:106039: checking for memory allocation using mmap(MAP_ANON)" >&5
63664 +echo "configure:112656: checking for memory allocation using mmap(MAP_ANON)" >&5
63666 if test "$cross_compiling" = yes; then
63668 @@ -106043,7 +112660,7 @@ if test "$cross_compiling" = yes; then
63671 cat > conftest.$ac_ext <<EOF
63672 -#line 106047 "configure"
63673 +#line 112664 "configure"
63674 #include "confdefs.h"
63676 #include <sys/types.h>
63677 @@ -106079,7 +112696,7 @@ int main()
63681 -if { (eval echo configure:106083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63682 +if { (eval echo configure:112700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63685 cat >> confdefs.h <<\EOF
63686 @@ -106101,7 +112718,7 @@ fi
63689 echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6
63690 -echo "configure:106105: checking for memory allocation using mmap("/dev/zero")" >&5
63691 +echo "configure:112722: checking for memory allocation using mmap("/dev/zero")" >&5
63693 if test "$cross_compiling" = yes; then
63695 @@ -106109,7 +112726,7 @@ if test "$cross_compiling" = yes; then
63698 cat > conftest.$ac_ext <<EOF
63699 -#line 106113 "configure"
63700 +#line 112730 "configure"
63701 #include "confdefs.h"
63703 #include <sys/types.h>
63704 @@ -106155,7 +112772,7 @@ int main()
63708 -if { (eval echo configure:106159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63709 +if { (eval echo configure:112776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63712 cat >> confdefs.h <<\EOF
63713 @@ -106179,12 +112796,12 @@ fi
63714 for ac_func in mremap
63716 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
63717 -echo "configure:106183: checking for $ac_func" >&5
63718 +echo "configure:112800: checking for $ac_func" >&5
63719 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
63720 echo $ac_n "(cached) $ac_c" 1>&6
63722 cat > conftest.$ac_ext <<EOF
63723 -#line 106188 "configure"
63724 +#line 112805 "configure"
63725 #include "confdefs.h"
63726 /* System header to define __stub macros and hopefully few prototypes,
63727 which can conflict with char $ac_func(); below. */
63728 @@ -106207,7 +112824,7 @@ $ac_func();
63732 -if { (eval echo configure:106211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63733 +if { (eval echo configure:112828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
63735 eval "ac_cv_func_$ac_func=yes"
63737 @@ -106274,17 +112891,17 @@ for ac_hdr in stdarg.h
63739 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
63740 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
63741 -echo "configure:106278: checking for $ac_hdr" >&5
63742 +echo "configure:112895: checking for $ac_hdr" >&5
63743 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
63744 echo $ac_n "(cached) $ac_c" 1>&6
63746 cat > conftest.$ac_ext <<EOF
63747 -#line 106283 "configure"
63748 +#line 112900 "configure"
63749 #include "confdefs.h"
63752 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
63753 -{ (eval echo configure:106288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
63754 +{ (eval echo configure:112905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
63755 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
63756 if test -z "$ac_err"; then
63758 @@ -106361,7 +112978,7 @@ if test "$TSRM_PTH" != "no"; then
63761 echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6
63762 -echo "configure:106365: checking for GNU Pth" >&5
63763 +echo "configure:112982: checking for GNU Pth" >&5
63764 PTH_PREFIX="`$TSRM_PTH --prefix`"
63765 if test -z "$PTH_PREFIX"; then
63766 echo "$ac_t""Please check your Pth installation" 1>&6
63767 @@ -106391,17 +113008,17 @@ elif test "$TSRM_ST" != "no"; then
63769 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
63770 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
63771 -echo "configure:106395: checking for $ac_hdr" >&5
63772 +echo "configure:113012: checking for $ac_hdr" >&5
63773 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
63774 echo $ac_n "(cached) $ac_c" 1>&6
63776 cat > conftest.$ac_ext <<EOF
63777 -#line 106400 "configure"
63778 +#line 113017 "configure"
63779 #include "confdefs.h"
63782 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
63783 -{ (eval echo configure:106405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
63784 +{ (eval echo configure:113022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
63785 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
63786 if test -z "$ac_err"; then
63788 @@ -106431,7 +113048,7 @@ done
63791 echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6
63792 -echo "configure:106435: checking for SGI's State Threads" >&5
63793 +echo "configure:113052: checking for SGI's State Threads" >&5
63794 echo "$ac_t""yes" 1>&6
63795 cat >> confdefs.h <<\EOF
63797 @@ -106470,7 +113087,7 @@ if test "$cross_compiling" = yes; then
63800 cat > conftest.$ac_ext <<EOF
63801 -#line 106474 "configure"
63802 +#line 113091 "configure"
63803 #include "confdefs.h"
63805 #include <pthread.h>
63806 @@ -106488,7 +113105,7 @@ int main() {
63807 return pthread_create(&thd, NULL, thread_routine, &data);
63810 -if { (eval echo configure:106492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63811 +if { (eval echo configure:113109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63814 pthreads_working=yes
63815 @@ -106508,7 +113125,7 @@ fi
63816 CFLAGS=$save_CFLAGS
63818 echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
63819 -echo "configure:106512: checking for pthreads_cflags" >&5
63820 +echo "configure:113129: checking for pthreads_cflags" >&5
63821 if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
63822 echo $ac_n "(cached) $ac_c" 1>&6
63824 @@ -106530,7 +113147,7 @@ if test "$cross_compiling" = yes; then
63827 cat > conftest.$ac_ext <<EOF
63828 -#line 106534 "configure"
63829 +#line 113151 "configure"
63830 #include "confdefs.h"
63832 #include <pthread.h>
63833 @@ -106548,7 +113165,7 @@ int main() {
63834 return pthread_create(&thd, NULL, thread_routine, &data);
63837 -if { (eval echo configure:106552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63838 +if { (eval echo configure:113169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63841 pthreads_working=yes
63842 @@ -106578,7 +113195,7 @@ fi
63843 echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
63845 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
63846 -echo "configure:106582: checking for pthreads_lib" >&5
63847 +echo "configure:113199: checking for pthreads_lib" >&5
63848 if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
63849 echo $ac_n "(cached) $ac_c" 1>&6
63851 @@ -106600,7 +113217,7 @@ if test "$cross_compiling" = yes; then
63854 cat > conftest.$ac_ext <<EOF
63855 -#line 106604 "configure"
63856 +#line 113221 "configure"
63857 #include "confdefs.h"
63859 #include <pthread.h>
63860 @@ -106618,7 +113235,7 @@ int main() {
63861 return pthread_create(&thd, NULL, thread_routine, &data);
63864 -if { (eval echo configure:106622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63865 +if { (eval echo configure:113239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
63868 pthreads_working=yes
63869 @@ -106669,7 +113286,7 @@ EOF
63872 echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
63873 -echo "configure:106673: checking for POSIX threads" >&5
63874 +echo "configure:113290: checking for POSIX threads" >&5
63875 echo "$ac_t""yes" 1>&6
63878 @@ -107305,7 +113922,7 @@ fi
63881 echo $ac_n "checking build system type""... $ac_c" 1>&6
63882 -echo "configure:107309: checking build system type" >&5
63883 +echo "configure:113926: checking build system type" >&5
63886 case "$build_alias" in
63887 @@ -107334,7 +113951,7 @@ ac_prog=ld
63888 if test "$GCC" = yes; then
63889 # Check if gcc -print-prog-name=ld gives a path.
63890 echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
63891 -echo "configure:107338: checking for ld used by $CC" >&5
63892 +echo "configure:113955: checking for ld used by $CC" >&5
63895 # gcc leaves a trailing carriage return which upsets mingw
63896 @@ -107364,10 +113981,10 @@ echo "configure:107338: checking for ld
63898 elif test "$with_gnu_ld" = yes; then
63899 echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
63900 -echo "configure:107368: checking for GNU ld" >&5
63901 +echo "configure:113985: checking for GNU ld" >&5
63903 echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
63904 -echo "configure:107371: checking for non-GNU ld" >&5
63905 +echo "configure:113988: checking for non-GNU ld" >&5
63907 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
63908 echo $ac_n "(cached) $ac_c" 1>&6
63909 @@ -107406,7 +114023,7 @@ else
63911 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
63912 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
63913 -echo "configure:107410: checking if the linker ($LD) is GNU ld" >&5
63914 +echo "configure:114027: checking if the linker ($LD) is GNU ld" >&5
63915 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
63916 echo $ac_n "(cached) $ac_c" 1>&6
63918 @@ -107426,7 +114043,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
63921 echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
63922 -echo "configure:107430: checking for $LD option to reload object files" >&5
63923 +echo "configure:114047: checking for $LD option to reload object files" >&5
63924 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
63925 echo $ac_n "(cached) $ac_c" 1>&6
63927 @@ -107451,7 +114068,7 @@ case $host_os in
63930 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
63931 -echo "configure:107455: checking for BSD-compatible nm" >&5
63932 +echo "configure:114072: checking for BSD-compatible nm" >&5
63933 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
63934 echo $ac_n "(cached) $ac_c" 1>&6
63936 @@ -107504,7 +114121,7 @@ echo "$ac_t""$lt_cv_path_NM" 1>&6
63937 NM="$lt_cv_path_NM"
63939 echo $ac_n "checking how to recognize dependent libraries""... $ac_c" 1>&6
63940 -echo "configure:107508: checking how to recognize dependent libraries" >&5
63941 +echo "configure:114125: checking how to recognize dependent libraries" >&5
63942 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
63943 echo $ac_n "(cached) $ac_c" 1>&6
63945 @@ -107696,13 +114313,13 @@ deplibs_check_method=$lt_cv_deplibs_chec
63946 test -z "$deplibs_check_method" && deplibs_check_method=unknown
63948 echo $ac_n "checking for object suffix""... $ac_c" 1>&6
63949 -echo "configure:107700: checking for object suffix" >&5
63950 +echo "configure:114317: checking for object suffix" >&5
63951 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
63952 echo $ac_n "(cached) $ac_c" 1>&6
63955 echo 'int i = 1;' > conftest.$ac_ext
63956 -if { (eval echo configure:107706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63957 +if { (eval echo configure:114323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63958 for ac_file in conftest.*; do
63961 @@ -107722,7 +114339,7 @@ ac_objext=$ac_cv_objext
63964 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
63965 -echo "configure:107726: checking for executable suffix" >&5
63966 +echo "configure:114343: checking for executable suffix" >&5
63967 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
63968 echo $ac_n "(cached) $ac_c" 1>&6
63970 @@ -107732,7 +114349,7 @@ else
63972 echo 'int main () { return 0; }' > conftest.$ac_ext
63974 - if { (eval echo configure:107736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
63975 + if { (eval echo configure:114353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
63976 for file in conftest.*; do
63978 *.$ac_ext | *.c | *.o | *.obj) ;;
63979 @@ -107778,7 +114395,7 @@ case $host in
63981 # Find out which ABI we are using.
63982 echo 'int i;' > conftest.$ac_ext
63983 - if { (eval echo configure:107782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63984 + if { (eval echo configure:114399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63985 case `/usr/bin/file conftest.$ac_objext` in
63987 HPUX_IA64_MODE="32"
63988 @@ -107792,8 +114409,8 @@ ia64-*-hpux*)
63991 # Find out which ABI we are using.
63992 - echo '#line 107796 "configure"' > conftest.$ac_ext
63993 - if { (eval echo configure:107797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63994 + echo '#line 114413 "configure"' > conftest.$ac_ext
63995 + if { (eval echo configure:114414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
63996 if test "$lt_cv_prog_gnu_ld" = yes; then
63997 case `/usr/bin/file conftest.$ac_objext` in
63999 @@ -107827,7 +114444,7 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
64000 s390*-*linux*|sparc*-*linux*)
64001 # Find out which ABI we are using.
64002 echo 'int i;' > conftest.$ac_ext
64003 - if { (eval echo configure:107831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
64004 + if { (eval echo configure:114448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
64005 case `/usr/bin/file conftest.o` in
64008 @@ -107877,7 +114494,7 @@ s390*-*linux*|sparc*-*linux*)
64009 SAVE_CFLAGS="$CFLAGS"
64010 CFLAGS="$CFLAGS -belf"
64011 echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
64012 -echo "configure:107881: checking whether the C compiler needs -belf" >&5
64013 +echo "configure:114498: checking whether the C compiler needs -belf" >&5
64014 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
64015 echo $ac_n "(cached) $ac_c" 1>&6
64017 @@ -107890,14 +114507,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext
64018 cross_compiling=$ac_cv_prog_cc_cross
64020 cat > conftest.$ac_ext <<EOF
64021 -#line 107894 "configure"
64022 +#line 114511 "configure"
64023 #include "confdefs.h"
64029 -if { (eval echo configure:107901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64030 +if { (eval echo configure:114518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64032 lt_cv_cc_needs_belf=yes
64034 @@ -107925,7 +114542,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
64036 # Find out which ABI we are using.
64037 echo 'int i;' > conftest.$ac_ext
64038 - if { (eval echo configure:107929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
64039 + if { (eval echo configure:114546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
64040 case `/usr/bin/file conftest.o` in
64042 case $lt_cv_prog_gnu_ld in
64043 @@ -107954,7 +114571,7 @@ if test -n "$CXX" && ( test "X$CXX" != "
64044 ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
64045 (test "X$CXX" != "Xg++"))) ; then
64046 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
64047 -echo "configure:107958: checking how to run the C++ preprocessor" >&5
64048 +echo "configure:114575: checking how to run the C++ preprocessor" >&5
64049 if test -z "$CXXCPP"; then
64050 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
64051 echo $ac_n "(cached) $ac_c" 1>&6
64052 @@ -107967,12 +114584,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee
64053 cross_compiling=$ac_cv_prog_cxx_cross
64054 CXXCPP="${CXX-g++} -E"
64055 cat > conftest.$ac_ext <<EOF
64056 -#line 107971 "configure"
64057 +#line 114588 "configure"
64058 #include "confdefs.h"
64059 #include <stdlib.h>
64061 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
64062 -{ (eval echo configure:107976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
64063 +{ (eval echo configure:114593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
64064 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
64065 if test -z "$ac_err"; then
64067 @@ -108002,7 +114619,7 @@ fi
64068 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
64069 # find the maximum length of command line arguments
64070 echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6
64071 -echo "configure:108006: checking the maximum length of command line arguments" >&5
64072 +echo "configure:114623: checking the maximum length of command line arguments" >&5
64073 if eval "test \"`echo '$''{'lt_cv_sys_max_cmd_len'+set}'`\" = set"; then
64074 echo $ac_n "(cached) $ac_c" 1>&6
64076 @@ -108124,7 +114741,7 @@ fi
64078 # Check for command to grab the raw symbol name followed by C symbol from nm.
64079 echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6
64080 -echo "configure:108128: checking command to parse $NM output from $compiler object" >&5
64081 +echo "configure:114745: checking command to parse $NM output from $compiler object" >&5
64082 if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
64083 echo $ac_n "(cached) $ac_c" 1>&6
64085 @@ -108228,10 +114845,10 @@ void nm_test_func(){}
64086 int main(){nm_test_var='a';nm_test_func();return(0);}
64089 - if { (eval echo configure:108232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
64090 + if { (eval echo configure:114849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
64091 # Now try to grab the symbols.
64093 - if { (eval echo configure:108235: \"$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
64094 + if { (eval echo configure:114852: \"$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
64095 # Try sorting and uniquifying the output.
64096 if sort "$nlist" | uniq > "$nlist"T; then
64097 mv -f "$nlist"T "$nlist"
64098 @@ -108282,7 +114899,7 @@ EOF
64099 lt_save_CFLAGS="$CFLAGS"
64100 LIBS="conftstm.$ac_objext"
64101 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
64102 - if { (eval echo configure:108286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64103 + if { (eval echo configure:114903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64106 LIBS="$lt_save_LIBS"
64107 @@ -108322,7 +114939,7 @@ else
64110 echo $ac_n "checking for objdir""... $ac_c" 1>&6
64111 -echo "configure:108326: checking for objdir" >&5
64112 +echo "configure:114943: checking for objdir" >&5
64113 if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then
64114 echo $ac_n "(cached) $ac_c" 1>&6
64116 @@ -108388,7 +115005,7 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
64117 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
64118 set dummy ${ac_tool_prefix}ar; ac_word=$2
64119 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
64120 -echo "configure:108392: checking for $ac_word" >&5
64121 +echo "configure:115009: checking for $ac_word" >&5
64122 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
64123 echo $ac_n "(cached) $ac_c" 1>&6
64125 @@ -108420,7 +115037,7 @@ if test -n "$ac_tool_prefix"; then
64126 # Extract the first word of "ar", so it can be a program name with args.
64127 set dummy ar; ac_word=$2
64128 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
64129 -echo "configure:108424: checking for $ac_word" >&5
64130 +echo "configure:115041: checking for $ac_word" >&5
64131 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
64132 echo $ac_n "(cached) $ac_c" 1>&6
64134 @@ -108455,7 +115072,7 @@ fi
64135 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
64136 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
64137 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
64138 -echo "configure:108459: checking for $ac_word" >&5
64139 +echo "configure:115076: checking for $ac_word" >&5
64140 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
64141 echo $ac_n "(cached) $ac_c" 1>&6
64143 @@ -108487,7 +115104,7 @@ if test -n "$ac_tool_prefix"; then
64144 # Extract the first word of "ranlib", so it can be a program name with args.
64145 set dummy ranlib; ac_word=$2
64146 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
64147 -echo "configure:108491: checking for $ac_word" >&5
64148 +echo "configure:115108: checking for $ac_word" >&5
64149 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
64150 echo $ac_n "(cached) $ac_c" 1>&6
64152 @@ -108522,7 +115139,7 @@ fi
64153 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
64154 set dummy ${ac_tool_prefix}strip; ac_word=$2
64155 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
64156 -echo "configure:108526: checking for $ac_word" >&5
64157 +echo "configure:115143: checking for $ac_word" >&5
64158 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
64159 echo $ac_n "(cached) $ac_c" 1>&6
64161 @@ -108554,7 +115171,7 @@ if test -n "$ac_tool_prefix"; then
64162 # Extract the first word of "strip", so it can be a program name with args.
64163 set dummy strip; ac_word=$2
64164 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
64165 -echo "configure:108558: checking for $ac_word" >&5
64166 +echo "configure:115175: checking for $ac_word" >&5
64167 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
64168 echo $ac_n "(cached) $ac_c" 1>&6
64170 @@ -108641,7 +115258,7 @@ case $deplibs_check_method in
64172 if test "$file_magic_cmd" = '$MAGIC_CMD'; then
64173 echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
64174 -echo "configure:108645: checking for ${ac_tool_prefix}file" >&5
64175 +echo "configure:115262: checking for ${ac_tool_prefix}file" >&5
64176 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
64177 echo $ac_n "(cached) $ac_c" 1>&6
64179 @@ -108701,7 +115318,7 @@ fi
64180 if test -z "$lt_cv_path_MAGIC_CMD"; then
64181 if test -n "$ac_tool_prefix"; then
64182 echo $ac_n "checking for file""... $ac_c" 1>&6
64183 -echo "configure:108705: checking for file" >&5
64184 +echo "configure:115322: checking for file" >&5
64185 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
64186 echo $ac_n "(cached) $ac_c" 1>&6
64188 @@ -108773,7 +115390,7 @@ esac
64189 # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
64190 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
64191 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
64192 -echo "configure:108777: checking for $ac_word" >&5
64193 +echo "configure:115394: checking for $ac_word" >&5
64194 if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then
64195 echo $ac_n "(cached) $ac_c" 1>&6
64197 @@ -108805,7 +115422,7 @@ if test -n "$ac_tool_prefix"; then
64198 # Extract the first word of "dsymutil", so it can be a program name with args.
64199 set dummy dsymutil; ac_word=$2
64200 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
64201 -echo "configure:108809: checking for $ac_word" >&5
64202 +echo "configure:115426: checking for $ac_word" >&5
64203 if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then
64204 echo $ac_n "(cached) $ac_c" 1>&6
64206 @@ -108840,7 +115457,7 @@ fi
64207 # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
64208 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
64209 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
64210 -echo "configure:108844: checking for $ac_word" >&5
64211 +echo "configure:115461: checking for $ac_word" >&5
64212 if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then
64213 echo $ac_n "(cached) $ac_c" 1>&6
64215 @@ -108872,7 +115489,7 @@ if test -n "$ac_tool_prefix"; then
64216 # Extract the first word of "nmedit", so it can be a program name with args.
64217 set dummy nmedit; ac_word=$2
64218 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
64219 -echo "configure:108876: checking for $ac_word" >&5
64220 +echo "configure:115493: checking for $ac_word" >&5
64221 if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then
64222 echo $ac_n "(cached) $ac_c" 1>&6
64224 @@ -108906,7 +115523,7 @@ fi
64227 echo $ac_n "checking for -single_module linker flag""... $ac_c" 1>&6
64228 -echo "configure:108910: checking for -single_module linker flag" >&5
64229 +echo "configure:115527: checking for -single_module linker flag" >&5
64230 if eval "test \"`echo '$''{'lt_cv_apple_cc_single_mod'+set}'`\" = set"; then
64231 echo $ac_n "(cached) $ac_c" 1>&6
64233 @@ -108929,7 +115546,7 @@ fi
64235 echo "$ac_t""$lt_cv_apple_cc_single_mod" 1>&6
64236 echo $ac_n "checking for -exported_symbols_list linker flag""... $ac_c" 1>&6
64237 -echo "configure:108933: checking for -exported_symbols_list linker flag" >&5
64238 +echo "configure:115550: checking for -exported_symbols_list linker flag" >&5
64239 if eval "test \"`echo '$''{'lt_cv_ld_exported_symbols_list'+set}'`\" = set"; then
64240 echo $ac_n "(cached) $ac_c" 1>&6
64242 @@ -108939,12 +115556,12 @@ else
64243 LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
64245 cat > conftest.$ac_ext <<EOF
64246 -#line 108943 "configure"
64247 +#line 115560 "configure"
64248 #include "confdefs.h"
64252 -if { (eval echo configure:108948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64253 +if { (eval echo configure:115565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64254 lt_cv_ld_exported_symbols_list=yes
64257 @@ -109078,7 +115695,7 @@ if test "$GCC" = yes; then
64260 echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
64261 -echo "configure:109082: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
64262 +echo "configure:115699: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
64263 if eval "test \"`echo '$''{'lt_cv_prog_compiler_rtti_exceptions'+set}'`\" = set"; then
64264 echo $ac_n "(cached) $ac_c" 1>&6
64266 @@ -109095,11 +115712,11 @@ else
64267 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
64268 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
64269 -e 's:$: $lt_compiler_flag:'`
64270 - (eval echo "\"configure:109099: $lt_compile\"" >&5)
64271 + (eval echo "\"configure:115716: $lt_compile\"" >&5)
64272 (eval "$lt_compile" 2>conftest.err)
64274 cat conftest.err >&5
64275 - echo "configure:109103: \$? = $ac_status" >&5
64276 + echo "configure:115720: \$? = $ac_status" >&5
64277 if (exit $ac_status) && test -s "$ac_outfile"; then
64278 # The compiler can only warn and ignore the option if not recognized
64279 # So say no if there are warnings other than the usual output.
64280 @@ -109128,7 +115745,7 @@ lt_prog_compiler_pic=
64281 lt_prog_compiler_static=
64283 echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
64284 -echo "configure:109132: checking for $compiler option to produce PIC" >&5
64285 +echo "configure:115749: checking for $compiler option to produce PIC" >&5
64287 if test "$GCC" = yes; then
64288 lt_prog_compiler_wl='-Wl,'
64289 @@ -109375,7 +115992,7 @@ echo "$ac_t""$lt_prog_compiler_pic" 1>&6
64290 if test -n "$lt_prog_compiler_pic"; then
64292 echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6
64293 -echo "configure:109379: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
64294 +echo "configure:115996: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
64295 if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works'+set}'`\" = set"; then
64296 echo $ac_n "(cached) $ac_c" 1>&6
64298 @@ -109392,11 +116009,11 @@ else
64299 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
64300 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
64301 -e 's:$: $lt_compiler_flag:'`
64302 - (eval echo "\"configure:109396: $lt_compile\"" >&5)
64303 + (eval echo "\"configure:116013: $lt_compile\"" >&5)
64304 (eval "$lt_compile" 2>conftest.err)
64306 cat conftest.err >&5
64307 - echo "configure:109400: \$? = $ac_status" >&5
64308 + echo "configure:116017: \$? = $ac_status" >&5
64309 if (exit $ac_status) && test -s "$ac_outfile"; then
64310 # The compiler can only warn and ignore the option if not recognized
64311 # So say no if there are warnings other than the usual output.
64312 @@ -109438,7 +116055,7 @@ esac
64314 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
64315 echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6
64316 -echo "configure:109442: checking if $compiler static flag $lt_tmp_static_flag works" >&5
64317 +echo "configure:116059: checking if $compiler static flag $lt_tmp_static_flag works" >&5
64318 if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works'+set}'`\" = set"; then
64319 echo $ac_n "(cached) $ac_c" 1>&6
64321 @@ -109476,7 +116093,7 @@ fi
64324 echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
64325 -echo "configure:109480: checking if $compiler supports -c -o file.$ac_objext" >&5
64326 +echo "configure:116097: checking if $compiler supports -c -o file.$ac_objext" >&5
64327 if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o'+set}'`\" = set"; then
64328 echo $ac_n "(cached) $ac_c" 1>&6
64330 @@ -109496,11 +116113,11 @@ else
64331 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
64332 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
64333 -e 's:$: $lt_compiler_flag:'`
64334 - (eval echo "\"configure:109500: $lt_compile\"" >&5)
64335 + (eval echo "\"configure:116117: $lt_compile\"" >&5)
64336 (eval "$lt_compile" 2>out/conftest.err)
64338 cat out/conftest.err >&5
64339 - echo "configure:109504: \$? = $ac_status" >&5
64340 + echo "configure:116121: \$? = $ac_status" >&5
64341 if (exit $ac_status) && test -s out/conftest2.$ac_objext
64343 # The compiler can only warn and ignore the option if not recognized
64344 @@ -109530,7 +116147,7 @@ hard_links="nottested"
64345 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
64346 # do not overwrite the value of need_locks provided by the user
64347 echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
64348 -echo "configure:109534: checking if we can lock with hard links" >&5
64349 +echo "configure:116151: checking if we can lock with hard links" >&5
64352 ln conftest.a conftest.b 2>/dev/null && hard_links=no
64353 @@ -109547,7 +116164,7 @@ else
64356 echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
64357 -echo "configure:109551: checking whether the $compiler linker ($LD) supports shared libraries" >&5
64358 +echo "configure:116168: checking whether the $compiler linker ($LD) supports shared libraries" >&5
64361 allow_undefined_flag=
64362 @@ -109958,12 +116575,12 @@ _LT_EOF
64363 # Determine the default libpath from the value encoded in an empty executable.
64365 cat > conftest.$ac_ext <<EOF
64366 -#line 109962 "configure"
64367 +#line 116579 "configure"
64368 #include "confdefs.h"
64372 -if { (eval echo configure:109967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64373 +if { (eval echo configure:116584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64375 lt_aix_libpath_sed='
64376 /Import File Strings/,/^$/ {
64377 @@ -109996,12 +116613,12 @@ if test -z "$aix_libpath"; then aix_libp
64378 # Determine the default libpath from the value encoded in an empty executable.
64380 cat > conftest.$ac_ext <<EOF
64381 -#line 110000 "configure"
64382 +#line 116617 "configure"
64383 #include "confdefs.h"
64387 -if { (eval echo configure:110005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64388 +if { (eval echo configure:116622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64390 lt_aix_libpath_sed='
64391 /Import File Strings/,/^$/ {
64392 @@ -110491,11 +117108,11 @@ x|xyes)
64393 # systems, -lgcc has to come before -lc. If gcc already passes -lc
64394 # to ld, don't add -lc before -lgcc.
64395 echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
64396 -echo "configure:110495: checking whether -lc should be explicitly linked in" >&5
64397 +echo "configure:117112: checking whether -lc should be explicitly linked in" >&5
64399 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
64401 - if { (eval echo configure:110499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
64402 + if { (eval echo configure:117116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
64405 libobjs=conftest.$ac_objext
64406 @@ -110509,7 +117126,7 @@ echo "configure:110495: checking whether
64408 lt_save_allow_undefined_flag=$allow_undefined_flag
64409 allow_undefined_flag=
64410 - if { (eval echo configure:110513: \"$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; }
64411 + if { (eval echo configure:117130: \"$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; }
64413 archive_cmds_need_lc=no
64415 @@ -110528,7 +117145,7 @@ echo "configure:110495: checking whether
64418 echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
64419 -echo "configure:110532: checking dynamic linker characteristics" >&5
64420 +echo "configure:117149: checking dynamic linker characteristics" >&5
64421 library_names_spec=
64422 libname_spec='lib$name'
64424 @@ -111153,7 +117770,7 @@ if test "$GCC" = yes; then
64427 echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
64428 -echo "configure:111157: checking how to hardcode library paths into programs" >&5
64429 +echo "configure:117774: checking how to hardcode library paths into programs" >&5
64431 if test -n "$hardcode_libdir_flag_spec" || \
64432 test -n "$runpath_var" || \
64433 @@ -111191,7 +117808,7 @@ fi
64436 echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
64437 -echo "configure:111195: checking whether stripping libraries is possible" >&5
64438 +echo "configure:117812: checking whether stripping libraries is possible" >&5
64439 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
64440 test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
64441 test -z "$striplib" && striplib="$STRIP --strip-unneeded"
64442 @@ -111242,7 +117859,7 @@ else
64444 # if libdl is installed we need to link against it
64445 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
64446 -echo "configure:111246: checking for dlopen in -ldl" >&5
64447 +echo "configure:117863: checking for dlopen in -ldl" >&5
64448 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
64449 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
64450 echo $ac_n "(cached) $ac_c" 1>&6
64451 @@ -111250,7 +117867,7 @@ else
64452 ac_save_LIBS="$LIBS"
64454 cat > conftest.$ac_ext <<EOF
64455 -#line 111254 "configure"
64456 +#line 117871 "configure"
64457 #include "confdefs.h"
64458 /* Override any gcc2 internal prototype to avoid an error. */
64459 /* We use char because int might match the return type of a gcc2
64460 @@ -111261,7 +117878,7 @@ int main() {
64464 -if { (eval echo configure:111265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64465 +if { (eval echo configure:117882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64467 eval "ac_cv_lib_$ac_lib_var=yes"
64469 @@ -111290,12 +117907,12 @@ fi
64472 echo $ac_n "checking for shl_load""... $ac_c" 1>&6
64473 -echo "configure:111294: checking for shl_load" >&5
64474 +echo "configure:117911: checking for shl_load" >&5
64475 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
64476 echo $ac_n "(cached) $ac_c" 1>&6
64478 cat > conftest.$ac_ext <<EOF
64479 -#line 111299 "configure"
64480 +#line 117916 "configure"
64481 #include "confdefs.h"
64482 /* System header to define __stub macros and hopefully few prototypes,
64483 which can conflict with char shl_load(); below. */
64484 @@ -111318,7 +117935,7 @@ shl_load();
64488 -if { (eval echo configure:111322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64489 +if { (eval echo configure:117939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64491 eval "ac_cv_func_shl_load=yes"
64493 @@ -111336,7 +117953,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_
64495 echo "$ac_t""no" 1>&6
64496 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
64497 -echo "configure:111340: checking for shl_load in -ldld" >&5
64498 +echo "configure:117957: checking for shl_load in -ldld" >&5
64499 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
64500 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
64501 echo $ac_n "(cached) $ac_c" 1>&6
64502 @@ -111344,7 +117961,7 @@ else
64503 ac_save_LIBS="$LIBS"
64505 cat > conftest.$ac_ext <<EOF
64506 -#line 111348 "configure"
64507 +#line 117965 "configure"
64508 #include "confdefs.h"
64509 /* Override any gcc2 internal prototype to avoid an error. */
64510 /* We use char because int might match the return type of a gcc2
64511 @@ -111355,7 +117972,7 @@ int main() {
64515 -if { (eval echo configure:111359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64516 +if { (eval echo configure:117976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64518 eval "ac_cv_lib_$ac_lib_var=yes"
64520 @@ -111374,12 +117991,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
64522 echo "$ac_t""no" 1>&6
64523 echo $ac_n "checking for dlopen""... $ac_c" 1>&6
64524 -echo "configure:111378: checking for dlopen" >&5
64525 +echo "configure:117995: checking for dlopen" >&5
64526 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
64527 echo $ac_n "(cached) $ac_c" 1>&6
64529 cat > conftest.$ac_ext <<EOF
64530 -#line 111383 "configure"
64531 +#line 118000 "configure"
64532 #include "confdefs.h"
64533 /* System header to define __stub macros and hopefully few prototypes,
64534 which can conflict with char dlopen(); below. */
64535 @@ -111402,7 +118019,7 @@ dlopen();
64539 -if { (eval echo configure:111406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64540 +if { (eval echo configure:118023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64542 eval "ac_cv_func_dlopen=yes"
64544 @@ -111420,7 +118037,7 @@ if eval "test \"`echo '$ac_cv_func_'dlop
64546 echo "$ac_t""no" 1>&6
64547 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
64548 -echo "configure:111424: checking for dlopen in -ldl" >&5
64549 +echo "configure:118041: checking for dlopen in -ldl" >&5
64550 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
64551 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
64552 echo $ac_n "(cached) $ac_c" 1>&6
64553 @@ -111428,7 +118045,7 @@ else
64554 ac_save_LIBS="$LIBS"
64556 cat > conftest.$ac_ext <<EOF
64557 -#line 111432 "configure"
64558 +#line 118049 "configure"
64559 #include "confdefs.h"
64560 /* Override any gcc2 internal prototype to avoid an error. */
64561 /* We use char because int might match the return type of a gcc2
64562 @@ -111439,7 +118056,7 @@ int main() {
64566 -if { (eval echo configure:111443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64567 +if { (eval echo configure:118060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64569 eval "ac_cv_lib_$ac_lib_var=yes"
64571 @@ -111458,7 +118075,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
64573 echo "$ac_t""no" 1>&6
64574 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
64575 -echo "configure:111462: checking for dlopen in -lsvld" >&5
64576 +echo "configure:118079: checking for dlopen in -lsvld" >&5
64577 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
64578 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
64579 echo $ac_n "(cached) $ac_c" 1>&6
64580 @@ -111466,7 +118083,7 @@ else
64581 ac_save_LIBS="$LIBS"
64582 LIBS="-lsvld $LIBS"
64583 cat > conftest.$ac_ext <<EOF
64584 -#line 111470 "configure"
64585 +#line 118087 "configure"
64586 #include "confdefs.h"
64587 /* Override any gcc2 internal prototype to avoid an error. */
64588 /* We use char because int might match the return type of a gcc2
64589 @@ -111477,7 +118094,7 @@ int main() {
64593 -if { (eval echo configure:111481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64594 +if { (eval echo configure:118098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64596 eval "ac_cv_lib_$ac_lib_var=yes"
64598 @@ -111496,7 +118113,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
64600 echo "$ac_t""no" 1>&6
64601 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
64602 -echo "configure:111500: checking for dld_link in -ldld" >&5
64603 +echo "configure:118117: checking for dld_link in -ldld" >&5
64604 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
64605 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
64606 echo $ac_n "(cached) $ac_c" 1>&6
64607 @@ -111504,7 +118121,7 @@ else
64608 ac_save_LIBS="$LIBS"
64610 cat > conftest.$ac_ext <<EOF
64611 -#line 111508 "configure"
64612 +#line 118125 "configure"
64613 #include "confdefs.h"
64614 /* Override any gcc2 internal prototype to avoid an error. */
64615 /* We use char because int might match the return type of a gcc2
64616 @@ -111515,7 +118132,7 @@ int main() {
64620 -if { (eval echo configure:111519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64621 +if { (eval echo configure:118136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64623 eval "ac_cv_lib_$ac_lib_var=yes"
64625 @@ -111571,7 +118188,7 @@ fi
64626 LIBS="$lt_cv_dlopen_libs $LIBS"
64628 echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
64629 -echo "configure:111575: checking whether a program can dlopen itself" >&5
64630 +echo "configure:118192: checking whether a program can dlopen itself" >&5
64631 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
64632 echo $ac_n "(cached) $ac_c" 1>&6
64634 @@ -111581,7 +118198,7 @@ else
64635 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
64636 lt_status=$lt_dlunknown
64637 cat > conftest.$ac_ext <<EOF
64638 -#line 111585 "configure"
64639 +#line 118202 "configure"
64640 #include "confdefs.h"
64643 @@ -111644,7 +118261,7 @@ int main ()
64647 - if { (eval echo configure:111648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
64648 + if { (eval echo configure:118265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
64649 (./conftest; exit; ) >&5 2>/dev/null
64651 case x$lt_status in
64652 @@ -111667,7 +118284,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
64653 if test "x$lt_cv_dlopen_self" = xyes; then
64654 wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
64655 echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
64656 -echo "configure:111671: checking whether a statically linked program can dlopen itself" >&5
64657 +echo "configure:118288: checking whether a statically linked program can dlopen itself" >&5
64658 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
64659 echo $ac_n "(cached) $ac_c" 1>&6
64661 @@ -111677,7 +118294,7 @@ else
64662 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
64663 lt_status=$lt_dlunknown
64664 cat > conftest.$ac_ext <<EOF
64665 -#line 111681 "configure"
64666 +#line 118298 "configure"
64667 #include "confdefs.h"
64670 @@ -111740,7 +118357,7 @@ int main ()
64674 - if { (eval echo configure:111744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
64675 + if { (eval echo configure:118361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
64676 (./conftest; exit; ) >&5 2>/dev/null
64678 case x$lt_status in
64679 @@ -111781,11 +118398,11 @@ fi
64681 # Report which library types will actually be built
64682 echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
64683 -echo "configure:111785: checking if libtool supports shared libraries" >&5
64684 +echo "configure:118402: checking if libtool supports shared libraries" >&5
64685 echo "$ac_t""$can_build_shared" 1>&6
64687 echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
64688 -echo "configure:111789: checking whether to build shared libraries" >&5
64689 +echo "configure:118406: checking whether to build shared libraries" >&5
64690 test "$can_build_shared" = "no" && enable_shared=no
64692 # On AIX, shared libraries and static libraries use the same namespace, and
64693 @@ -111808,7 +118425,7 @@ esac
64694 echo "$ac_t""$enable_shared" 1>&6
64696 echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
64697 -echo "configure:111812: checking whether to build static libraries" >&5
64698 +echo "configure:118429: checking whether to build static libraries" >&5
64699 # Make sure either enable_shared or enable_static is yes.
64700 test "$enable_shared" = yes || enable_static=yes
64701 echo "$ac_t""$enable_static" 1>&6
64702 @@ -112494,7 +119111,7 @@ ac_prog=ld
64703 if test "$GCC" = yes; then
64704 # Check if gcc -print-prog-name=ld gives a path.
64705 echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
64706 -echo "configure:112498: checking for ld used by $CC" >&5
64707 +echo "configure:119115: checking for ld used by $CC" >&5
64710 # gcc leaves a trailing carriage return which upsets mingw
64711 @@ -112524,10 +119141,10 @@ echo "configure:112498: checking for ld
64713 elif test "$with_gnu_ld" = yes; then
64714 echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
64715 -echo "configure:112528: checking for GNU ld" >&5
64716 +echo "configure:119145: checking for GNU ld" >&5
64718 echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
64719 -echo "configure:112531: checking for non-GNU ld" >&5
64720 +echo "configure:119148: checking for non-GNU ld" >&5
64722 if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
64723 echo $ac_n "(cached) $ac_c" 1>&6
64724 @@ -112566,7 +119183,7 @@ else
64726 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
64727 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
64728 -echo "configure:112570: checking if the linker ($LD) is GNU ld" >&5
64729 +echo "configure:119187: checking if the linker ($LD) is GNU ld" >&5
64730 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
64731 echo $ac_n "(cached) $ac_c" 1>&6
64733 @@ -112632,7 +119249,7 @@ fi
64735 # PORTME: fill in a description of your system's C++ link characteristics
64736 echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
64737 -echo "configure:112636: checking whether the $compiler linker ($LD) supports shared libraries" >&5
64738 +echo "configure:119253: checking whether the $compiler linker ($LD) supports shared libraries" >&5
64742 @@ -112730,12 +119347,12 @@ case $host_os in
64743 # Determine the default libpath from the value encoded in an empty executable.
64745 cat > conftest.$ac_ext <<EOF
64746 -#line 112734 "configure"
64747 +#line 119351 "configure"
64748 #include "confdefs.h"
64752 -if { (eval echo configure:112739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64753 +if { (eval echo configure:119356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64755 lt_aix_libpath_sed='
64756 /Import File Strings/,/^$/ {
64757 @@ -112769,12 +119386,12 @@ if test -z "$aix_libpath"; then aix_libp
64758 # Determine the default libpath from the value encoded in an empty executable.
64760 cat > conftest.$ac_ext <<EOF
64761 -#line 112773 "configure"
64762 +#line 119390 "configure"
64763 #include "confdefs.h"
64767 -if { (eval echo configure:112778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64768 +if { (eval echo configure:119395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
64770 lt_aix_libpath_sed='
64771 /Import File Strings/,/^$/ {
64772 @@ -113541,7 +120158,7 @@ private:
64776 -if { (eval echo configure:113545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
64777 +if { (eval echo configure:120162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
64778 # Parse the compiler output and extract the necessary
64779 # objects, libraries and library flags.
64781 @@ -113697,7 +120314,7 @@ lt_prog_compiler_pic_CXX=
64782 lt_prog_compiler_static_CXX=
64784 echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
64785 -echo "configure:113701: checking for $compiler option to produce PIC" >&5
64786 +echo "configure:120318: checking for $compiler option to produce PIC" >&5
64788 # C++ specific cases for pic, static, wl, etc.
64789 if test "$GXX" = yes; then
64790 @@ -113994,7 +120611,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX"
64791 if test -n "$lt_prog_compiler_pic_CXX"; then
64793 echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6
64794 -echo "configure:113998: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
64795 +echo "configure:120615: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
64796 if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works_CXX'+set}'`\" = set"; then
64797 echo $ac_n "(cached) $ac_c" 1>&6
64799 @@ -114011,11 +120628,11 @@ else
64800 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
64801 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
64802 -e 's:$: $lt_compiler_flag:'`
64803 - (eval echo "\"configure:114015: $lt_compile\"" >&5)
64804 + (eval echo "\"configure:120632: $lt_compile\"" >&5)
64805 (eval "$lt_compile" 2>conftest.err)
64807 cat conftest.err >&5
64808 - echo "configure:114019: \$? = $ac_status" >&5
64809 + echo "configure:120636: \$? = $ac_status" >&5
64810 if (exit $ac_status) && test -s "$ac_outfile"; then
64811 # The compiler can only warn and ignore the option if not recognized
64812 # So say no if there are warnings other than the usual output.
64813 @@ -114057,7 +120674,7 @@ esac
64815 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
64816 echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6
64817 -echo "configure:114061: checking if $compiler static flag $lt_tmp_static_flag works" >&5
64818 +echo "configure:120678: checking if $compiler static flag $lt_tmp_static_flag works" >&5
64819 if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works_CXX'+set}'`\" = set"; then
64820 echo $ac_n "(cached) $ac_c" 1>&6
64822 @@ -114095,7 +120712,7 @@ fi
64825 echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
64826 -echo "configure:114099: checking if $compiler supports -c -o file.$ac_objext" >&5
64827 +echo "configure:120716: checking if $compiler supports -c -o file.$ac_objext" >&5
64828 if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o_CXX'+set}'`\" = set"; then
64829 echo $ac_n "(cached) $ac_c" 1>&6
64831 @@ -114115,11 +120732,11 @@ else
64832 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
64833 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
64834 -e 's:$: $lt_compiler_flag:'`
64835 - (eval echo "\"configure:114119: $lt_compile\"" >&5)
64836 + (eval echo "\"configure:120736: $lt_compile\"" >&5)
64837 (eval "$lt_compile" 2>out/conftest.err)
64839 cat out/conftest.err >&5
64840 - echo "configure:114123: \$? = $ac_status" >&5
64841 + echo "configure:120740: \$? = $ac_status" >&5
64842 if (exit $ac_status) && test -s out/conftest2.$ac_objext
64844 # The compiler can only warn and ignore the option if not recognized
64845 @@ -114149,7 +120766,7 @@ hard_links="nottested"
64846 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
64847 # do not overwrite the value of need_locks provided by the user
64848 echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
64849 -echo "configure:114153: checking if we can lock with hard links" >&5
64850 +echo "configure:120770: checking if we can lock with hard links" >&5
64853 ln conftest.a conftest.b 2>/dev/null && hard_links=no
64854 @@ -114166,7 +120783,7 @@ else
64857 echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
64858 -echo "configure:114170: checking whether the $compiler linker ($LD) supports shared libraries" >&5
64859 +echo "configure:120787: checking whether the $compiler linker ($LD) supports shared libraries" >&5
64861 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
64863 @@ -114212,11 +120829,11 @@ x|xyes)
64864 # systems, -lgcc has to come before -lc. If gcc already passes -lc
64865 # to ld, don't add -lc before -lgcc.
64866 echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
64867 -echo "configure:114216: checking whether -lc should be explicitly linked in" >&5
64868 +echo "configure:120833: checking whether -lc should be explicitly linked in" >&5
64870 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
64872 - if { (eval echo configure:114220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
64873 + if { (eval echo configure:120837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
64876 libobjs=conftest.$ac_objext
64877 @@ -114230,7 +120847,7 @@ echo "configure:114216: checking whether
64879 lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
64880 allow_undefined_flag_CXX=
64881 - if { (eval echo configure:114234: \"$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; }
64882 + if { (eval echo configure:120851: \"$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; }
64884 archive_cmds_need_lc_CXX=no
64886 @@ -114249,7 +120866,7 @@ echo "configure:114216: checking whether
64889 echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
64890 -echo "configure:114253: checking dynamic linker characteristics" >&5
64891 +echo "configure:120870: checking dynamic linker characteristics" >&5
64892 library_names_spec=
64893 libname_spec='lib$name'
64895 @@ -114822,7 +121439,7 @@ if test "$GCC" = yes; then
64898 echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
64899 -echo "configure:114826: checking how to hardcode library paths into programs" >&5
64900 +echo "configure:121443: checking how to hardcode library paths into programs" >&5
64901 hardcode_action_CXX=
64902 if test -n "$hardcode_libdir_flag_spec_CXX" || \
64903 test -n "$runpath_var_CXX" || \
64904 --- a/generated_lists
64905 +++ b/generated_lists
64907 makefile_am_files = Zend/Makefile.am TSRM/Makefile.am
64908 config_h_files = Zend/acconfig.h TSRM/acconfig.h
64909 -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
64910 +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
64911 --- a/main/php_config.h.in
64912 +++ b/main/php_config.h.in
64913 @@ -1334,6 +1334,51 @@
64921 +#undef APC_FILEHITS
64924 +#undef __DEBUG_APC__
64927 +#undef APC_SEM_LOCKS
64930 +#undef APC_SPIN_LOCKS
64933 +#undef APC_PTHREADMUTEX_LOCKS
64936 +#undef APC_FCNTL_LOCKS
64938 +/* shm/mmap memory protection */
64939 +#undef APC_MEMPROTECT
64942 +#undef APC_HAVE_LOOKUP_HOOKS
64945 +#undef APC_HAVE_LOOKUP_HOOKS
64953 +/* enable valgrind memchecks */
64954 +#undef HAVE_VALGRIND_MEMCHECK_H
64956 +/* Whether to build apc as dynamic module */
64957 +#undef COMPILE_DL_APC
64962 /* Whether to build bcmath as dynamic module */
64963 #undef COMPILE_DL_BCMATH
64965 @@ -1472,6 +1517,9 @@
64966 /* Whether to build dba as dynamic module */
64967 #undef COMPILE_DL_DBA
64969 +/* Whether to build dio as dynamic module */
64970 +#undef COMPILE_DL_DIO
64975 @@ -1895,6 +1943,9 @@
64976 /* LDAP SASL support */
64977 #undef HAVE_LDAP_SASL
64979 +/* Whether to build libevent as dynamic module */
64980 +#undef COMPILE_DL_LIBEVENT
64982 /* whether to have multibyte string support */
64983 #undef HAVE_MBSTRING
64985 @@ -2813,6 +2864,120 @@
64986 /* Whether to build zip as dynamic module */
64987 #undef COMPILE_DL_ZIP
64990 +#undef HTTP_SHARED_DEPS
64993 +#undef HTTP_SHARED_DEPS
64996 +#undef HAVE_GETHOSTNAME
64999 +#undef HAVE_GETHOSTNAME
65002 +#undef HAVE_LIBNSL
65005 +#undef HAVE_GETDOMAINNAME
65008 +#undef HAVE_GETDOMAINNAME
65011 +#undef HAVE_LIBNSL
65014 +#undef HAVE_GETSERVBYPORT
65017 +#undef HAVE_GETSERVBYPORT
65020 +#undef HAVE_LIBNSL
65023 +#undef HAVE_GETSERVBYNAME
65026 +#undef HAVE_GETSERVBYNAME
65029 +#undef HAVE_LIBNSL
65031 +/* Have zlib support */
65032 +#undef HTTP_HAVE_ZLIB
65035 +#undef HTTP_HAVE_SSL
65038 +#undef HTTP_HAVE_OPENSSL
65041 +#undef HTTP_HAVE_GNUTLS
65043 +/* path to bundled SSL CA info */
65044 +#undef HTTP_CURL_CAINFO
65046 +/* Have cURL support */
65047 +#undef HTTP_HAVE_CURL
65050 +#undef HAVE_CURL_SHARE_STRERROR
65053 +#undef HAVE_CURL_MULTI_STRERROR
65056 +#undef HAVE_CURL_EASY_STRERROR
65059 +#undef HAVE_CURL_EASY_RESET
65062 +#undef HAVE_CURL_FORMGET
65065 +#undef HAVE_CURL_MULTI_SETOPT
65068 +#undef HAVE_CURL_MULTI_TIMEOUT
65071 +#undef HTTP_EVENT_VERSION
65073 +/* Have libevent support for cURL */
65074 +#undef HTTP_HAVE_EVENT
65077 +#undef HAVE_CURL_MULTI_SOCKET_ACTION
65080 +#undef HTTP_EVENT_VERSION
65082 +/* Have libevent support for cURL */
65083 +#undef HTTP_HAVE_EVENT
65086 +#undef HAVE_CURL_MULTI_SOCKET_ACTION
65088 +/* Have magic mime support */
65089 +#undef HTTP_HAVE_MAGIC
65091 +/* Have ext/hash support */
65092 +#undef HTTP_HAVE_PHP_HASH_H
65094 +/* Have ext/hash support */
65095 +#undef HTTP_HAVE_PHP_HASH_H
65097 +/* Whether to build http as dynamic module */
65098 +#undef COMPILE_DL_HTTP
65100 +/* Have extended HTTP support */
65103 /* Enable compressed protocol support */
65104 #undef MYSQLND_COMPRESSION_WANTED