diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6923 |
1 files changed, 3899 insertions, 3024 deletions
@@ -238,6 +238,13 @@ + + + + + + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 ## Free Software Foundation, Inc. @@ -1195,9 +1202,6 @@ ac_help="$ac_help ac_help="$ac_help --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix" ac_help="$ac_help - --with-informix[=DIR] Include Informix support. DIR is the Informix base - install directory, defaults to ${INFORMIXDIR:-nothing}" -ac_help="$ac_help --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base install directory, defaults to /usr/interbase" ac_help="$ac_help @@ -1248,7 +1252,7 @@ ac_help="$ac_help --with-oci8[=DIR] Include Oracle (OCI8) support. The default DIR is ORACLE_HOME. Use --with-oci8=instantclient,/path/to/oic/lib - to use Oracle Instant Client installation" + to use an Oracle Instant Client installation" ac_help="$ac_help --with-adabas[=DIR] Include Adabas D support. DIR is the Adabas base install directory [/usr/local]" @@ -1317,6 +1321,8 @@ ac_help="$ac_help ac_help="$ac_help --with-pdo-mysql[=DIR] PDO: MySQL support. DIR is the MySQL base directory" ac_help="$ac_help + --with-zlib-dir[=DIR] PDO_MySQL: Set the path to libz install prefix" +ac_help="$ac_help --with-pdo-oci[=DIR] PDO: Oracle-OCI support. Default DIR is ORACLE_HOME. You may also use --with-pdo-oci=instantclient,prefix,version to use the InstantClient SDK. For Linux with 10.1.0.3 rpms (for example) use: @@ -1461,16 +1467,11 @@ ac_help="$ac_help --with-zend-vm=TYPE Set virtual machine dispatch method. Type is one of "CALL", "SWITCH" or "GOTO" [TYPE=CALL]" ac_help="$ac_help - --enable-malloc-mm Use environment variable for run-time malloc/emalloc - selection - FOR DEVELOPERS ONLY!!" -ac_help="$ac_help --enable-maintainer-zts Enable thread safety - for code maintainers only!!" ac_help="$ac_help --disable-inline-optimization If building zend_execute.lo fails, try this switch" ac_help="$ac_help - --enable-memory-limit Compile with memory limit support" -ac_help="$ac_help --enable-zend-multibyte Compile with zend multibyte support" ac_help="$ac_help @@ -2170,12 +2171,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:2174: checking for Cygwin environment" >&5 +echo "configure:2175: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2179 "configure" +#line 2180 "configure" #include "confdefs.h" int main() { @@ -2186,7 +2187,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:2190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2203,19 +2204,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:2207: checking for mingw32 environment" >&5 +echo "configure:2208: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2212 "configure" +#line 2213 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:2219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -2234,7 +2235,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for egrep""... $ac_c" 1>&6 -echo "configure:2238: checking for egrep" >&5 +echo "configure:2239: checking for egrep" >&5 if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2249,7 +2250,7 @@ echo "$ac_t""$ac_cv_prog_egrep" 1>&6 echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6 -echo "configure:2253: checking for a sed that does not truncate output" >&5 +echo "configure:2254: checking for a sed that does not truncate output" >&5 if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2322,7 +2323,7 @@ echo "$ac_t""$SED" 1>&6 EOF - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS CC CXX; do + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS EXTRA_LDFLAGS_PROGRAM LIBS CC CXX; do eval val=\$$var if test -n "$val"; then echo "$var='$val' \\" >> config.nice @@ -2386,7 +2387,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:2390: checking host system type" >&5 +echo "configure:2391: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -2407,7 +2408,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:2411: checking target system type" >&5 +echo "configure:2412: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -2437,7 +2438,7 @@ echo "$ac_t""$target" 1>&6 MAJOR_VERSION=5 MINOR_VERSION=2 -RELEASE_VERSION=0 +RELEASE_VERSION=2 EXTRA_VERSION="" PHP_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" PHP_VERSION_ID=`expr $MAJOR_VERSION \* 10000 + $MINOR_VERSION \* 100 + $RELEASE_VERSION` @@ -2506,7 +2507,7 @@ rm -f libs/* # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2510: checking for $ac_word" >&5 +echo "configure:2511: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2536,7 +2537,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2540: checking for $ac_word" >&5 +echo "configure:2541: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2587,7 +2588,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2591: checking for $ac_word" >&5 +echo "configure:2592: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2619,7 +2620,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2623: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2624: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2630,12 +2631,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2634 "configure" +#line 2635 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2661,12 +2662,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2665: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2666: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2670: checking whether we are using GNU C" >&5 +echo "configure:2671: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2675,7 +2676,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2694,7 +2695,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2698: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2699: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2725,12 +2726,115 @@ else fi fi +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:2731: checking how to run the C preprocessor" >&5 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext <<EOF +#line 2746 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext <<EOF +#line 2763 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +#line 2780 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP=/lib/cpp +fi +rm -f conftest* +fi +rm -f conftest* +fi +rm -f conftest* + ac_cv_prog_CPP="$CPP" +fi + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" +fi +echo "$ac_t""$CPP" 1>&6 + + + ICC="no" + echo $ac_n "checking for icc""... $ac_c" 1>&6 +echo "configure:2813: checking for icc" >&5 + cat > conftest.$ac_ext <<EOF +#line 2815 "configure" +#include "confdefs.h" +__INTEL_COMPILER +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "^__INTEL_COMPILER" >/dev/null 2>&1; then + rm -rf conftest* + ICC="no" + echo "$ac_t""no" 1>&6 +else + rm -rf conftest* + ICC="yes" + echo "$ac_t""yes" 1>&6 + +fi +rm -f conftest* + + if test "x$CC" != xcc; then echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 -echo "configure:2731: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:2835: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:2734: checking whether cc understands -c and -o together" >&5 +echo "configure:2838: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" @@ -2742,16 +2846,16 @@ else # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:2746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:2850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:2754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:2858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -2778,7 +2882,7 @@ EOF fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2782: checking how to run the C preprocessor" >&5 +echo "configure:2886: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2793,13 +2897,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2797 "configure" +#line 2901 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2810,13 +2914,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2814 "configure" +#line 2918 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2827,13 +2931,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2831 "configure" +#line 2935 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2858,9 +2962,9 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2862: checking for AIX" >&5 +echo "configure:2966: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 2864 "configure" +#line 2968 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -2882,7 +2986,7 @@ rm -f conftest* echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2886: checking whether ln -s works" >&5 +echo "configure:2990: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2914,7 +3018,7 @@ fi echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6 -echo "configure:2918: checking if compiler supports -R" >&5 +echo "configure:3022: checking if compiler supports -R" >&5 if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2922,14 +3026,14 @@ else SAVE_LIBS=$LIBS LIBS="-R /usr/$PHP_LIBDIR $LIBS" cat > conftest.$ac_ext <<EOF -#line 2926 "configure" +#line 3030 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* php_cv_cc_dashr=yes else @@ -2947,7 +3051,7 @@ if test $php_cv_cc_dashr = "yes"; then ld_runpath_switch=-R else echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6 -echo "configure:2951: checking if compiler supports -Wl,-rpath," >&5 +echo "configure:3055: checking if compiler supports -Wl,-rpath," >&5 if eval "test \"`echo '$''{'php_cv_cc_rpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2955,14 +3059,14 @@ else SAVE_LIBS=$LIBS LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" cat > conftest.$ac_ext <<EOF -#line 2959 "configure" +#line 3063 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* php_cv_cc_rpath=yes else @@ -2988,7 +3092,7 @@ fi # Extract the first word of "re2c", so it can be a program name with args. set dummy re2c; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2992: checking for $ac_word" >&5 +echo "configure:3096: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RE2C'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3016,7 +3120,7 @@ fi if test -n "$RE2C"; then echo $ac_n "checking for re2c version""... $ac_c" 1>&6 -echo "configure:3020: checking for re2c version" >&5 +echo "configure:3124: checking for re2c version" >&5 if eval "test \"`echo '$''{'php_cv_re2c_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3048,7 +3152,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3052: checking for $ac_word" >&5 +echo "configure:3156: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3089,7 +3193,7 @@ test -n "$AWK" || AWK="bork" ;; *) echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6 -echo "configure:3093: checking if $AWK is broken" >&5 +echo "configure:3197: checking if $AWK is broken" >&5 if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then echo "$ac_t""yes" 1>&6 { echo "configure: error: You should install GNU awk" 1>&2; exit 1; } @@ -3108,7 +3212,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3112: checking for $ac_word" >&5 +echo "configure:3216: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3148,7 +3252,7 @@ test -n "$YACC" || YACC="yacc" bison_version=none if test "$YACC"; then echo $ac_n "checking for bison version""... $ac_c" 1>&6 -echo "configure:3152: checking for bison version" >&5 +echo "configure:3256: checking for bison version" >&5 if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3189,7 +3293,7 @@ echo "$ac_t""$php_cv_bison_version" 1>&6 # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3193: checking for $ac_word" >&5 +echo "configure:3297: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3223,7 +3327,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:3227: checking for yywrap in -l$ac_lib" >&5 +echo "configure:3331: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3231,7 +3335,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 3235 "configure" +#line 3339 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3242,7 +3346,7 @@ int main() { yywrap() ; return 0; } EOF -if { (eval echo configure:3246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3266,7 +3370,7 @@ fi if test -n "$LEX"; then echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:3270: checking lex output file root" >&5 +echo "configure:3374: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3287,7 +3391,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:3291: checking whether yytext is a pointer" >&5 +echo "configure:3395: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3299,14 +3403,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <<EOF -#line 3303 "configure" +#line 3407 "configure" #include "confdefs.h" `cat $LEX_OUTPUT_ROOT.c` int main() { ; return 0; } EOF -if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -3330,12 +3434,12 @@ fi : fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3334: checking for working const" >&5 +echo "configure:3438: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3339 "configure" +#line 3443 "configure" #include "confdefs.h" int main() { @@ -3384,7 +3488,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:3388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3410,7 +3514,7 @@ fi if test "$LEX"; then echo $ac_n "checking for flex version""... $ac_c" 1>&6 -echo "configure:3414: checking for flex version" >&5 +echo "configure:3518: checking for flex version" >&5 if eval "test \"`echo '$''{'php_cv_flex_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3463,7 +3567,39 @@ case $host_alias in *dgux*) CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR";; *darwin*|*rhapsody*) - CPPFLAGS="$CPPFLAGS -no-cpp-precomp" + if test -n "$GCC"; then + + gcc_arg_name=ac_cv_gcc_arg_no_cpp_precomp + echo $ac_n "checking whether $CC supports -no-cpp-precomp""... $ac_c" 1>&6 +echo "configure:3575: checking whether $CC supports -no-cpp-precomp" >&5 +if eval "test \"`echo '$''{'ac_cv_gcc_arg_no_cpp_precomp'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + echo 'void somefunc() { };' > conftest.c + cmd='$CC -no-cpp-precomp -c conftest.c' + if eval $cmd 2>&1 | $EGREP -e -no-cpp-precomp >/dev/null ; then + ac_result=no + else + ac_result=yes + fi + eval $gcc_arg_name=$ac_result + rm -f conftest.* + +fi + +echo "$ac_t""$ac_cv_gcc_arg_no_cpp_precomp" 1>&6 + if eval test "\$$gcc_arg_name" = "yes"; then + gcc_no_cpp_precomp=yes + else + : + + fi + + if test "$gcc_no_cpp_precomp" = "yes"; then + CPPFLAGS="$CPPFLAGS -no-cpp-precomp" + fi + fi cat >> confdefs.h <<\EOF #define BIND_8_COMPAT 1 EOF @@ -3633,7 +3769,7 @@ esac # Disable PIC mode by default where it is known to be safe to do so, # to avoid the performance hit from the lost register echo $ac_n "checking whether to force non-PIC code in shared modules""... $ac_c" 1>&6 -echo "configure:3637: checking whether to force non-PIC code in shared modules" >&5 +echo "configure:3773: checking whether to force non-PIC code in shared modules" >&5 case $host_alias in i?86-*-linux*|i?86-*-freebsd*) if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then @@ -3660,6 +3796,17 @@ esac +echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6 +echo "configure:3801: checking whether /dev/urandom exists" >&5 +if test -r "/dev/urandom" && test -c "/dev/urandom"; then + cat >> confdefs.h <<\EOF +#define HAVE_DEV_URANDOM 1 +EOF + + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi @@ -3711,7 +3858,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 3715 "configure" +#line 3862 "configure" #include "confdefs.h" #include <pthread.h> @@ -3729,7 +3876,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:3733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes @@ -3749,7 +3896,7 @@ fi CFLAGS=$save_CFLAGS echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 -echo "configure:3753: checking for pthreads_cflags" >&5 +echo "configure:3900: checking for pthreads_cflags" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3771,7 +3918,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 3775 "configure" +#line 3922 "configure" #include "confdefs.h" #include <pthread.h> @@ -3789,7 +3936,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:3793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes @@ -3819,7 +3966,7 @@ fi echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 -echo "configure:3823: checking for pthreads_lib" >&5 +echo "configure:3970: checking for pthreads_lib" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3841,7 +3988,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 3845 "configure" +#line 3992 "configure" #include "confdefs.h" #include <pthread.h> @@ -3859,7 +4006,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:3863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes @@ -3968,7 +4115,7 @@ SAPI_LIBTOOL=libphp5.la echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6 -echo "configure:3972: checking for AOLserver support" >&5 +echo "configure:4119: checking for AOLserver support" >&5 # Check whether --with-aolserver or --without-aolserver was given. if test "${with_aolserver+set}" = set; then withval="$with_aolserver" @@ -4211,7 +4358,7 @@ fi echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:4215: checking for Apache 1.x module support via DSO through APXS" >&5 +echo "configure:4362: checking for Apache 1.x module support via DSO through APXS" >&5 # Check whether --with-apxs or --without-apxs was given. if test "${with_apxs+set}" = set; then withval="$with_apxs" @@ -4516,7 +4663,7 @@ fi if test "$PHP_SAPI" != "apache"; then echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6 -echo "configure:4520: checking for Apache 1.x module support" >&5 +echo "configure:4667: checking for Apache 1.x module support" >&5 # Check whether --with-apache or --without-apache was given. if test "${with_apache+set}" = set; then withval="$with_apache" @@ -5359,7 +5506,7 @@ fi fi echo $ac_n "checking for mod_charset compatibility option""... $ac_c" 1>&6 -echo "configure:5363: checking for mod_charset compatibility option" >&5 +echo "configure:5510: checking for mod_charset compatibility option" >&5 # Check whether --with-mod_charset or --without-mod_charset was given. if test "${with_mod_charset+set}" = set; then withval="$with_mod_charset" @@ -5383,7 +5530,7 @@ if test -n "$APACHE_MODULE"; then gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 -echo "configure:5387: checking whether $CC supports -rdynamic" >&5 +echo "configure:5534: checking whether $CC supports -rdynamic" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5426,7 +5573,7 @@ if test -n "$APACHE_INSTALL"; then echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 -echo "configure:5430: checking for member fd in BUFF *" >&5 +echo "configure:5577: checking for member fd in BUFF *" >&5 if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5438,14 +5585,14 @@ else CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" fi cat > conftest.$ac_ext <<EOF -#line 5442 "configure" +#line 5589 "configure" #include "confdefs.h" #include <httpd.h> int main() { conn_rec *c; int fd = c->client->fd; ; return 0; } EOF -if { (eval echo configure:5449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_php_fd_in_buff=yes @@ -5496,7 +5643,7 @@ fi echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:5500: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 +echo "configure:5647: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 # Check whether --with-apxs2filter or --without-apxs2filter was given. if test "${with_apxs2filter+set}" = set; then withval="$with_apxs2filter" @@ -6326,7 +6473,7 @@ fi echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:6330: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 +echo "configure:6477: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 # Check whether --with-apxs2 or --without-apxs2 was given. if test "${with_apxs2+set}" = set; then withval="$with_apxs2" @@ -7157,7 +7304,7 @@ fi echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6 -echo "configure:7161: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 +echo "configure:7308: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 # Check whether --with-apache-hooks or --without-apache-hooks was given. if test "${with_apache_hooks+set}" = set; then withval="$with_apache_hooks" @@ -7462,7 +7609,7 @@ fi if test "$PHP_SAPI" != "apache_hooks"; then echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6 -echo "configure:7466: checking for Apache 1.x (hooks) module support" >&5 +echo "configure:7613: checking for Apache 1.x (hooks) module support" >&5 # Check whether --with-apache-hooks-static or --without-apache-hooks-static was given. if test "${with_apache_hooks_static+set}" = set; then withval="$with_apache_hooks_static" @@ -8305,7 +8452,7 @@ fi fi echo $ac_n "checking for mod_charset compatibility option""... $ac_c" 1>&6 -echo "configure:8309: checking for mod_charset compatibility option" >&5 +echo "configure:8456: checking for mod_charset compatibility option" >&5 # Check whether --with-mod_charset or --without-mod_charset was given. if test "${with_mod_charset+set}" = set; then withval="$with_mod_charset" @@ -8329,7 +8476,7 @@ if test -n "$APACHE_HOOKS_MODULE"; then gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 -echo "configure:8333: checking whether $CC supports -rdynamic" >&5 +echo "configure:8480: checking whether $CC supports -rdynamic" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8372,7 +8519,7 @@ if test -n "$APACHE_HOOKS_INSTALL"; then echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 -echo "configure:8376: checking for member fd in BUFF *" >&5 +echo "configure:8523: checking for member fd in BUFF *" >&5 if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8384,14 +8531,14 @@ else CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" fi cat > conftest.$ac_ext <<EOF -#line 8388 "configure" +#line 8535 "configure" #include "confdefs.h" #include <httpd.h> int main() { conn_rec *c; int fd = c->client->fd; ; return 0; } EOF -if { (eval echo configure:8395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_php_fd_in_buff=yes @@ -8443,7 +8590,7 @@ fi RESULT=no echo $ac_n "checking for Caudium support""... $ac_c" 1>&6 -echo "configure:8447: checking for Caudium support" >&5 +echo "configure:8594: checking for Caudium support" >&5 # Check whether --with-caudium or --without-caudium was given. if test "${with_caudium+set}" = set; then withval="$with_caudium" @@ -8515,7 +8662,7 @@ if test "${with_caudium+set}" = set; then PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE` fi echo $ac_n "checking for C includes in $PIKE_C_INCLUDE""... $ac_c" 1>&6 -echo "configure:8519: checking for C includes in $PIKE_C_INCLUDE" >&5 +echo "configure:8666: checking for C includes in $PIKE_C_INCLUDE" >&5 if test -f $PIKE_C_INCLUDE/version.h; then PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'` ###### VERSION MATCH CHECK ####### @@ -8775,7 +8922,7 @@ echo "$ac_t""$RESULT" 1>&6 echo $ac_n "checking for CLI build""... $ac_c" 1>&6 -echo "configure:8779: checking for CLI build" >&5 +echo "configure:8926: checking for CLI build" >&5 # Check whether --enable-cli or --disable-cli was given. if test "${enable_cli+set}" = set; then @@ -8795,7 +8942,7 @@ if test "$PHP_SAPI_CLI" != "no"; then src=$abs_srcdir/sapi/cli/Makefile.frag ac_srcdir=$abs_srcdir/sapi/cli ac_builddir=sapi/cli - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments SAPI_CLI_PATH=sapi/cli/php @@ -8833,7 +8980,7 @@ echo "$ac_t""$PHP_SAPI_CLI" 1>&6 echo $ac_n "checking for Continuity support""... $ac_c" 1>&6 -echo "configure:8837: checking for Continuity support" >&5 +echo "configure:8984: checking for Continuity support" >&5 # Check whether --with-continuity or --without-continuity was given. if test "${with_continuity+set}" = set; then withval="$with_continuity" @@ -8854,7 +9001,7 @@ if test "$PHP_CONTINUITY" != "no"; then { echo "configure: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" 1>&2; exit 1; } fi echo $ac_n "checking for Continuity include files""... $ac_c" 1>&6 -echo "configure:8858: checking for Continuity include files" >&5 +echo "configure:9005: checking for Continuity include files" >&5 if test -d $PHP_CONTINUITY/include ; then CAPI_INCLUDE=$PHP_CONTINUITY/include echo "$ac_t""Continuity Binary Distribution" 1>&6 @@ -9080,7 +9227,7 @@ fi echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6 -echo "configure:9084: checking for embedded SAPI library support" >&5 +echo "configure:9231: checking for embedded SAPI library support" >&5 # Check whether --enable-embed or --disable-embed was given. if test "${enable_embed+set}" = set; then @@ -9303,7 +9450,7 @@ fi RESULT=no echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6 -echo "configure:9307: checking for Zeus ISAPI support" >&5 +echo "configure:9454: checking for Zeus ISAPI support" >&5 # Check whether --with-isapi or --without-isapi was given. if test "${with_isapi+set}" = set; then withval="$with_isapi" @@ -9535,7 +9682,7 @@ echo "$ac_t""$RESULT" 1>&6 echo $ac_n "checking for Milter support""... $ac_c" 1>&6 -echo "configure:9539: checking for Milter support" >&5 +echo "configure:9686: checking for Milter support" >&5 # Check whether --with-milter or --without-milter was given. if test "${with_milter+set}" = set; then withval="$with_milter" @@ -9568,7 +9715,7 @@ if test "${with_milter+set}" = set; then src=$abs_srcdir/sapi/milter/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments @@ -9810,7 +9957,7 @@ echo "$ac_t""$RESULT" 1>&6 echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6 -echo "configure:9814: checking for NSAPI support" >&5 +echo "configure:9961: checking for NSAPI support" >&5 # Check whether --with-nsapi or --without-nsapi was given. if test "${with_nsapi+set}" = set; then withval="$with_nsapi" @@ -9830,7 +9977,7 @@ if test "$PHP_NSAPI" != "no"; then { echo "configure: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" 1>&2; exit 1; } fi echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6 -echo "configure:9834: checking for NSAPI include files" >&5 +echo "configure:9981: checking for NSAPI include files" >&5 if test -d $PHP_NSAPI/include ; then NSAPI_INC_DIR="$PHP_NSAPI/include" echo "$ac_t""Netscape 3.x / Sun 7.x style" 1>&6 @@ -9838,17 +9985,17 @@ echo "configure:9834: checking for NSAPI include files" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9842: checking for $ac_hdr" >&5 +echo "configure:9989: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9847 "configure" +#line 9994 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9883,17 +10030,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9887: checking for $ac_hdr" >&5 +echo "configure:10034: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9892 "configure" +#line 10039 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10153,7 +10300,7 @@ fi RESULT=no echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6 -echo "configure:10157: checking for PHTTPD support" >&5 +echo "configure:10304: checking for PHTTPD support" >&5 # Check whether --with-phttpd or --without-phttpd was given. if test "${with_phttpd+set}" = set; then withval="$with_phttpd" @@ -10384,7 +10531,7 @@ echo "$ac_t""$RESULT" 1>&6 RESULT=no echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6 -echo "configure:10388: checking for Pi3Web support" >&5 +echo "configure:10535: checking for Pi3Web support" >&5 # Check whether --with-pi3web or --without-pi3web was given. if test "${with_pi3web+set}" = set; then @@ -10715,7 +10862,7 @@ echo "$ac_t""$RESULT" 1>&6 RESULT=no echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6 -echo "configure:10719: checking for Roxen/Pike support" >&5 +echo "configure:10866: checking for Roxen/Pike support" >&5 # Check whether --with-roxen or --without-roxen was given. if test "${with_roxen+set}" = set; then withval="$with_roxen" @@ -10959,7 +11106,7 @@ echo "$ac_t""$RESULT" 1>&6 if test "$RESULT" != "no" ; then RESULT=no echo $ac_n "checking if Roxen should use ZTS""... $ac_c" 1>&6 -echo "configure:10963: checking if Roxen should use ZTS" >&5 +echo "configure:11110: checking if Roxen should use ZTS" >&5 # Check whether --enable-roxen-zts or --disable-roxen-zts was given. if test "${enable_roxen_zts+set}" = set; then enableval="$enable_roxen_zts" @@ -11019,7 +11166,7 @@ if test "${with_thttpd+set}" = set; then gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 -echo "configure:11023: checking whether $CC supports -rdynamic" >&5 +echo "configure:11170: checking whether $CC supports -rdynamic" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11226,7 +11373,7 @@ fi echo $ac_n "checking for thttpd""... $ac_c" 1>&6 -echo "configure:11230: checking for thttpd" >&5 +echo "configure:11377: checking for thttpd" >&5 echo "$ac_t""$PHP_THTTPD" 1>&6 @@ -11241,17 +11388,17 @@ if test "${with_tux+set}" = set; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11245: checking for $ac_hdr" >&5 +echo "configure:11392: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11250 "configure" +#line 11397 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11454,7 +11601,7 @@ fi echo $ac_n "checking for TUX""... $ac_c" 1>&6 -echo "configure:11458: checking for TUX" >&5 +echo "configure:11605: checking for TUX" >&5 echo "$ac_t""$PHP_TUX" 1>&6 unset PHP_TUX @@ -11690,7 +11837,7 @@ fi echo $ac_n "checking for webjames""... $ac_c" 1>&6 -echo "configure:11694: checking for webjames" >&5 +echo "configure:11841: checking for webjames" >&5 echo "$ac_t""$PHP_WEBJAMES" 1>&6 @@ -11759,12 +11906,9 @@ else fi - - - if test "$PHP_SAPI" = "default"; then echo $ac_n "checking for CGI build""... $ac_c" 1>&6 -echo "configure:11768: checking for CGI build" >&5 +echo "configure:11912: checking for CGI build" >&5 if test "$PHP_SAPI_CGI" != "no"; then echo "$ac_t""yes" 1>&6 @@ -11772,7 +11916,7 @@ echo "configure:11768: checking for CGI build" >&5 src=$abs_srcdir/sapi/cgi/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments case $host_alias in *cygwin* ) @@ -11786,67 +11930,8 @@ echo "configure:11768: checking for CGI build" >&5 PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH" - - echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6 -echo "configure:11792: checking whether writing to stdout works" >&5 -if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - if test "$cross_compiling" = yes; then - - ac_cv_write_stdout=no - -else - cat > conftest.$ac_ext <<EOF -#line 11803 "configure" -#include "confdefs.h" - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#define TEXT "This is the test message -- " - -main() -{ - int n; - - n = write(1, TEXT, sizeof(TEXT)-1); - return (!(n == sizeof(TEXT)-1)); -} - -EOF -if { (eval echo configure:11821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - ac_cv_write_stdout=yes - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - - ac_cv_write_stdout=no - -fi -rm -fr conftest* -fi - - -fi - -echo "$ac_t""$ac_cv_write_stdout" 1>&6 - if test "$ac_cv_write_stdout" = "yes"; then - cat >> confdefs.h <<\EOF -#define PHP_WRITE_STDOUT 1 -EOF - - fi - - echo $ac_n "checking whether to force Apache CGI redirect""... $ac_c" 1>&6 -echo "configure:11850: checking whether to force Apache CGI redirect" >&5 +echo "configure:11935: checking whether to force Apache CGI redirect" >&5 if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then REDIRECT=1 else @@ -11860,7 +11945,7 @@ EOF echo $ac_n "checking whether to discard path_info + path_translated""... $ac_c" 1>&6 -echo "configure:11864: checking whether to discard path_info + path_translated" >&5 +echo "configure:11949: checking whether to discard path_info + path_translated" >&5 if test "$PHP_DISCARD_PATH" = "yes"; then DISCARD_PATH=1 else @@ -11873,7 +11958,7 @@ EOF echo "$ac_t""$PHP_DISCARD_PATH" 1>&6 echo $ac_n "checking whether to enable path info checking""... $ac_c" 1>&6 -echo "configure:11877: checking whether to enable path info checking" >&5 +echo "configure:11962: checking whether to enable path info checking" >&5 if test "$PHP_ENABLE_PATHINFO_CHECK" = "yes"; then ENABLE_PATHINFO_CHECK=1 else @@ -11886,7 +11971,7 @@ EOF echo "$ac_t""$PHP_ENABLE_PATHINFO_CHECK" 1>&6 echo $ac_n "checking whether to enable fastcgi support""... $ac_c" 1>&6 -echo "configure:11890: checking whether to enable fastcgi support" >&5 +echo "configure:11975: checking whether to enable fastcgi support" >&5 if test "$PHP_ENABLE_FASTCGI" = "yes"; then PHP_FASTCGI=1 PHP_FCGI_FILES="fastcgi.c" @@ -12106,7 +12191,7 @@ fi echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6 -echo "configure:12110: checking for chosen SAPI module" >&5 +echo "configure:12195: checking for chosen SAPI module" >&5 echo "$ac_t""$PHP_SAPI" 1>&6 if test "$enable_maintainer_zts" = "yes"; then @@ -12173,7 +12258,7 @@ fi # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12177: checking for $ac_word" >&5 +echo "configure:12262: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PROG_SENDMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12218,7 +12303,7 @@ EOF echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6 -echo "configure:12222: checking whether system uses EBCDIC" >&5 +echo "configure:12307: checking whether system uses EBCDIC" >&5 if eval "test \"`echo '$''{'ac_cv_ebcdic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12229,7 +12314,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 12233 "configure" +#line 12318 "configure" #include "confdefs.h" int main(void) { @@ -12237,7 +12322,7 @@ int main(void) { } EOF -if { (eval echo configure:12241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_ebcdic=yes @@ -12265,7 +12350,7 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:12269: checking whether byte ordering is bigendian" >&5 +echo "configure:12354: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12275,7 +12360,7 @@ else ac_cv_c_bigendian_php=unknown else cat > conftest.$ac_ext <<EOF -#line 12279 "configure" +#line 12364 "configure" #include "confdefs.h" int main(void) @@ -12291,7 +12376,7 @@ int main(void) } EOF -if { (eval echo configure:12295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian_php=yes else @@ -12315,6 +12400,65 @@ EOF fi + + echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6 +echo "configure:12406: checking whether writing to stdout works" >&5 +if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + if test "$cross_compiling" = yes; then + + ac_cv_write_stdout=no + +else + cat > conftest.$ac_ext <<EOF +#line 12417 "configure" +#include "confdefs.h" + +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + +#define TEXT "This is the test message -- " + +main() +{ + int n; + + n = write(1, TEXT, sizeof(TEXT)-1); + return (!(n == sizeof(TEXT)-1)); +} + +EOF +if { (eval echo configure:12435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + ac_cv_write_stdout=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + + ac_cv_write_stdout=no + +fi +rm -fr conftest* +fi + + +fi + +echo "$ac_t""$ac_cv_write_stdout" 1>&6 + if test "$ac_cv_write_stdout" = "yes"; then + cat >> confdefs.h <<\EOF +#define PHP_WRITE_STDOUT 1 +EOF + + fi + + if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" LDFLAGS="$LDFLAGS -L/usr/pkg/lib" @@ -12362,12 +12506,12 @@ test -d /usr/ucblib && unset found echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:12366: checking for socket" >&5 +echo "configure:12510: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12371 "configure" +#line 12515 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -12390,7 +12534,7 @@ socket(); ; return 0; } EOF -if { (eval echo configure:12394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -12408,12 +12552,12 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socket""... $ac_c" 1>&6 -echo "configure:12412: checking for __socket" >&5 +echo "configure:12556: checking for __socket" >&5 if eval "test \"`echo '$''{'ac_cv_func___socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12417 "configure" +#line 12561 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __socket(); below. */ @@ -12436,7 +12580,7 @@ __socket(); ; return 0; } EOF -if { (eval echo configure:12440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___socket=yes" else @@ -12474,7 +12618,7 @@ EOF unset ac_cv_lib_socket___socket unset found echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:12478: checking for socket in -lsocket" >&5 +echo "configure:12622: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12482,7 +12626,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 12486 "configure" +#line 12630 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -12493,7 +12637,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:12497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12513,7 +12657,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6 -echo "configure:12517: checking for __socket in -lsocket" >&5 +echo "configure:12661: checking for __socket in -lsocket" >&5 ac_lib_var=`echo socket'_'__socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12521,7 +12665,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 12525 "configure" +#line 12669 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -12532,7 +12676,7 @@ int main() { __socket() ; return 0; } EOF -if { (eval echo configure:12536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12564,11 +12708,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 12568 "configure" +#line 12712 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:12572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -12619,12 +12763,12 @@ EOF unset found echo $ac_n "checking for socketpair""... $ac_c" 1>&6 -echo "configure:12623: checking for socketpair" >&5 +echo "configure:12767: checking for socketpair" >&5 if eval "test \"`echo '$''{'ac_cv_func_socketpair'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12628 "configure" +#line 12772 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socketpair(); below. */ @@ -12647,7 +12791,7 @@ socketpair(); ; return 0; } EOF -if { (eval echo configure:12651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socketpair=yes" else @@ -12665,12 +12809,12 @@ if eval "test \"`echo '$ac_cv_func_'socketpair`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socketpair""... $ac_c" 1>&6 -echo "configure:12669: checking for __socketpair" >&5 +echo "configure:12813: checking for __socketpair" >&5 if eval "test \"`echo '$''{'ac_cv_func___socketpair'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12674 "configure" +#line 12818 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __socketpair(); below. */ @@ -12693,7 +12837,7 @@ __socketpair(); ; return 0; } EOF -if { (eval echo configure:12697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___socketpair=yes" else @@ -12731,7 +12875,7 @@ EOF unset ac_cv_lib_socket___socketpair unset found echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6 -echo "configure:12735: checking for socketpair in -lsocket" >&5 +echo "configure:12879: checking for socketpair in -lsocket" >&5 ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12739,7 +12883,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 12743 "configure" +#line 12887 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -12750,7 +12894,7 @@ int main() { socketpair() ; return 0; } EOF -if { (eval echo configure:12754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12770,7 +12914,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6 -echo "configure:12774: checking for __socketpair in -lsocket" >&5 +echo "configure:12918: checking for __socketpair in -lsocket" >&5 ac_lib_var=`echo socket'_'__socketpair | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12778,7 +12922,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 12782 "configure" +#line 12926 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -12789,7 +12933,7 @@ int main() { __socketpair() ; return 0; } EOF -if { (eval echo configure:12793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12821,11 +12965,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 12825 "configure" +#line 12969 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:12829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -12876,12 +13020,12 @@ EOF unset found echo $ac_n "checking for htonl""... $ac_c" 1>&6 -echo "configure:12880: checking for htonl" >&5 +echo "configure:13024: checking for htonl" >&5 if eval "test \"`echo '$''{'ac_cv_func_htonl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12885 "configure" +#line 13029 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char htonl(); below. */ @@ -12904,7 +13048,7 @@ htonl(); ; return 0; } EOF -if { (eval echo configure:12908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_htonl=yes" else @@ -12922,12 +13066,12 @@ if eval "test \"`echo '$ac_cv_func_'htonl`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __htonl""... $ac_c" 1>&6 -echo "configure:12926: checking for __htonl" >&5 +echo "configure:13070: checking for __htonl" >&5 if eval "test \"`echo '$''{'ac_cv_func___htonl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12931 "configure" +#line 13075 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __htonl(); below. */ @@ -12950,7 +13094,7 @@ __htonl(); ; return 0; } EOF -if { (eval echo configure:12954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___htonl=yes" else @@ -12988,7 +13132,7 @@ EOF unset ac_cv_lib_socket___htonl unset found echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6 -echo "configure:12992: checking for htonl in -lsocket" >&5 +echo "configure:13136: checking for htonl in -lsocket" >&5 ac_lib_var=`echo socket'_'htonl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12996,7 +13140,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 13000 "configure" +#line 13144 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13007,7 +13151,7 @@ int main() { htonl() ; return 0; } EOF -if { (eval echo configure:13011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13027,7 +13171,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6 -echo "configure:13031: checking for __htonl in -lsocket" >&5 +echo "configure:13175: checking for __htonl in -lsocket" >&5 ac_lib_var=`echo socket'_'__htonl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13035,7 +13179,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 13039 "configure" +#line 13183 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13046,7 +13190,7 @@ int main() { __htonl() ; return 0; } EOF -if { (eval echo configure:13050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13078,11 +13222,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 13082 "configure" +#line 13226 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:13086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -13133,12 +13277,12 @@ EOF unset found echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:13137: checking for gethostname" >&5 +echo "configure:13281: checking for gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13142 "configure" +#line 13286 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostname(); below. */ @@ -13161,7 +13305,7 @@ gethostname(); ; return 0; } EOF -if { (eval echo configure:13165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostname=yes" else @@ -13179,12 +13323,12 @@ if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostname""... $ac_c" 1>&6 -echo "configure:13183: checking for __gethostname" >&5 +echo "configure:13327: checking for __gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13188 "configure" +#line 13332 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __gethostname(); below. */ @@ -13207,7 +13351,7 @@ __gethostname(); ; return 0; } EOF -if { (eval echo configure:13211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___gethostname=yes" else @@ -13245,7 +13389,7 @@ EOF unset ac_cv_lib_nsl___gethostname unset found echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:13249: checking for gethostname in -lnsl" >&5 +echo "configure:13393: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13253,7 +13397,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 13257 "configure" +#line 13401 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13264,7 +13408,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:13268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13284,7 +13428,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:13288: checking for __gethostname in -lnsl" >&5 +echo "configure:13432: checking for __gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13292,7 +13436,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 13296 "configure" +#line 13440 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13303,7 +13447,7 @@ int main() { __gethostname() ; return 0; } EOF -if { (eval echo configure:13307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13335,11 +13479,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 13339 "configure" +#line 13483 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:13343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -13390,12 +13534,12 @@ EOF unset found echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6 -echo "configure:13394: checking for gethostbyaddr" >&5 +echo "configure:13538: checking for gethostbyaddr" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13399 "configure" +#line 13543 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyaddr(); below. */ @@ -13418,7 +13562,7 @@ gethostbyaddr(); ; return 0; } EOF -if { (eval echo configure:13422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyaddr=yes" else @@ -13436,12 +13580,12 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyaddr`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6 -echo "configure:13440: checking for __gethostbyaddr" >&5 +echo "configure:13584: checking for __gethostbyaddr" >&5 if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13445 "configure" +#line 13589 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __gethostbyaddr(); below. */ @@ -13464,7 +13608,7 @@ __gethostbyaddr(); ; return 0; } EOF -if { (eval echo configure:13468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___gethostbyaddr=yes" else @@ -13502,7 +13646,7 @@ EOF unset ac_cv_lib_nsl___gethostbyaddr unset found echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6 -echo "configure:13506: checking for gethostbyaddr in -lnsl" >&5 +echo "configure:13650: checking for gethostbyaddr in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13510,7 +13654,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 13514 "configure" +#line 13658 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13521,7 +13665,7 @@ int main() { gethostbyaddr() ; return 0; } EOF -if { (eval echo configure:13525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13541,7 +13685,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6 -echo "configure:13545: checking for __gethostbyaddr in -lnsl" >&5 +echo "configure:13689: checking for __gethostbyaddr in -lnsl" >&5 ac_lib_var=`echo nsl'_'__gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13549,7 +13693,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 13553 "configure" +#line 13697 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13560,7 +13704,7 @@ int main() { __gethostbyaddr() ; return 0; } EOF -if { (eval echo configure:13564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13592,11 +13736,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 13596 "configure" +#line 13740 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:13600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -13647,12 +13791,12 @@ EOF unset found echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6 -echo "configure:13651: checking for yp_get_default_domain" >&5 +echo "configure:13795: checking for yp_get_default_domain" >&5 if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13656 "configure" +#line 13800 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char yp_get_default_domain(); below. */ @@ -13675,7 +13819,7 @@ yp_get_default_domain(); ; return 0; } EOF -if { (eval echo configure:13679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_yp_get_default_domain=yes" else @@ -13693,12 +13837,12 @@ if eval "test \"`echo '$ac_cv_func_'yp_get_default_domain`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6 -echo "configure:13697: checking for __yp_get_default_domain" >&5 +echo "configure:13841: checking for __yp_get_default_domain" >&5 if eval "test \"`echo '$''{'ac_cv_func___yp_get_default_domain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13702 "configure" +#line 13846 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __yp_get_default_domain(); below. */ @@ -13721,7 +13865,7 @@ __yp_get_default_domain(); ; return 0; } EOF -if { (eval echo configure:13725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___yp_get_default_domain=yes" else @@ -13759,7 +13903,7 @@ EOF unset ac_cv_lib_nsl___yp_get_default_domain unset found echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6 -echo "configure:13763: checking for yp_get_default_domain in -lnsl" >&5 +echo "configure:13907: checking for yp_get_default_domain in -lnsl" >&5 ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13767,7 +13911,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 13771 "configure" +#line 13915 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13778,7 +13922,7 @@ int main() { yp_get_default_domain() ; return 0; } EOF -if { (eval echo configure:13782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13798,7 +13942,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6 -echo "configure:13802: checking for __yp_get_default_domain in -lnsl" >&5 +echo "configure:13946: checking for __yp_get_default_domain in -lnsl" >&5 ac_lib_var=`echo nsl'_'__yp_get_default_domain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13806,7 +13950,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 13810 "configure" +#line 13954 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13817,7 +13961,7 @@ int main() { __yp_get_default_domain() ; return 0; } EOF -if { (eval echo configure:13821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13849,11 +13993,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 13853 "configure" +#line 13997 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:13857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -13905,12 +14049,12 @@ EOF unset found echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:13909: checking for dlopen" >&5 +echo "configure:14053: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13914 "configure" +#line 14058 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -13933,7 +14077,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo configure:13937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -13951,12 +14095,12 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dlopen""... $ac_c" 1>&6 -echo "configure:13955: checking for __dlopen" >&5 +echo "configure:14099: checking for __dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func___dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13960 "configure" +#line 14104 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __dlopen(); below. */ @@ -13979,7 +14123,7 @@ __dlopen(); ; return 0; } EOF -if { (eval echo configure:13983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___dlopen=yes" else @@ -14017,7 +14161,7 @@ EOF unset ac_cv_lib_dl___dlopen unset found echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:14021: checking for dlopen in -ldl" >&5 +echo "configure:14165: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14025,7 +14169,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 14029 "configure" +#line 14173 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14036,7 +14180,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:14040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14056,7 +14200,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:14060: checking for __dlopen in -ldl" >&5 +echo "configure:14204: checking for __dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'__dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14064,7 +14208,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 14068 "configure" +#line 14212 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14075,7 +14219,7 @@ int main() { __dlopen() ; return 0; } EOF -if { (eval echo configure:14079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14107,11 +14251,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 14111 "configure" +#line 14255 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:14115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -14163,7 +14307,7 @@ EOF fi echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:14167: checking for sin in -lm" >&5 +echo "configure:14311: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14171,7 +14315,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 14175 "configure" +#line 14319 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14182,7 +14326,7 @@ int main() { sin() ; return 0; } EOF -if { (eval echo configure:14186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14216,12 +14360,12 @@ fi unset found echo $ac_n "checking for res_search""... $ac_c" 1>&6 -echo "configure:14220: checking for res_search" >&5 +echo "configure:14364: checking for res_search" >&5 if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14225 "configure" +#line 14369 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char res_search(); below. */ @@ -14244,7 +14388,7 @@ res_search(); ; return 0; } EOF -if { (eval echo configure:14248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_res_search=yes" else @@ -14262,12 +14406,12 @@ if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_search""... $ac_c" 1>&6 -echo "configure:14266: checking for __res_search" >&5 +echo "configure:14410: checking for __res_search" >&5 if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14271 "configure" +#line 14415 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __res_search(); below. */ @@ -14290,7 +14434,7 @@ __res_search(); ; return 0; } EOF -if { (eval echo configure:14294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___res_search=yes" else @@ -14328,7 +14472,7 @@ EOF unset ac_cv_lib_resolv___res_search unset found echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:14332: checking for res_search in -lresolv" >&5 +echo "configure:14476: checking for res_search in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14336,7 +14480,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 14340 "configure" +#line 14484 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14347,7 +14491,7 @@ int main() { res_search() ; return 0; } EOF -if { (eval echo configure:14351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14367,7 +14511,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:14371: checking for __res_search in -lresolv" >&5 +echo "configure:14515: checking for __res_search in -lresolv" >&5 ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14375,7 +14519,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 14379 "configure" +#line 14523 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14386,7 +14530,7 @@ int main() { __res_search() ; return 0; } EOF -if { (eval echo configure:14390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14418,11 +14562,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 14422 "configure" +#line 14566 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:14426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -14464,7 +14608,7 @@ EOF unset ac_cv_lib_bind___res_search unset found echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 -echo "configure:14468: checking for res_search in -lbind" >&5 +echo "configure:14612: checking for res_search in -lbind" >&5 ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14472,7 +14616,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 14476 "configure" +#line 14620 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14483,7 +14627,7 @@ int main() { res_search() ; return 0; } EOF -if { (eval echo configure:14487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14503,7 +14647,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 -echo "configure:14507: checking for __res_search in -lbind" >&5 +echo "configure:14651: checking for __res_search in -lbind" >&5 ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14511,7 +14655,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 14515 "configure" +#line 14659 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14522,7 +14666,7 @@ int main() { __res_search() ; return 0; } EOF -if { (eval echo configure:14526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14554,11 +14698,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 14558 "configure" +#line 14702 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:14562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -14600,7 +14744,7 @@ EOF unset ac_cv_lib_socket___res_search unset found echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6 -echo "configure:14604: checking for res_search in -lsocket" >&5 +echo "configure:14748: checking for res_search in -lsocket" >&5 ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14608,7 +14752,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 14612 "configure" +#line 14756 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14619,7 +14763,7 @@ int main() { res_search() ; return 0; } EOF -if { (eval echo configure:14623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14639,7 +14783,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 -echo "configure:14643: checking for __res_search in -lsocket" >&5 +echo "configure:14787: checking for __res_search in -lsocket" >&5 ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14647,7 +14791,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 14651 "configure" +#line 14795 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14658,7 +14802,7 @@ int main() { __res_search() ; return 0; } EOF -if { (eval echo configure:14662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14690,11 +14834,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 14694 "configure" +#line 14838 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:14698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -14752,12 +14896,12 @@ EOF unset found echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:14756: checking for inet_aton" >&5 +echo "configure:14900: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14761 "configure" +#line 14905 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char inet_aton(); below. */ @@ -14780,7 +14924,7 @@ inet_aton(); ; return 0; } EOF -if { (eval echo configure:14784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else @@ -14798,12 +14942,12 @@ if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6 -echo "configure:14802: checking for __inet_aton" >&5 +echo "configure:14946: checking for __inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14807 "configure" +#line 14951 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __inet_aton(); below. */ @@ -14826,7 +14970,7 @@ __inet_aton(); ; return 0; } EOF -if { (eval echo configure:14830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___inet_aton=yes" else @@ -14864,7 +15008,7 @@ EOF unset ac_cv_lib_resolv___inet_aton unset found echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:14868: checking for inet_aton in -lresolv" >&5 +echo "configure:15012: checking for inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14872,7 +15016,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 14876 "configure" +#line 15020 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14883,7 +15027,7 @@ int main() { inet_aton() ; return 0; } EOF -if { (eval echo configure:14887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14903,7 +15047,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:14907: checking for __inet_aton in -lresolv" >&5 +echo "configure:15051: checking for __inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'__inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14911,7 +15055,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 14915 "configure" +#line 15059 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14922,7 +15066,7 @@ int main() { __inet_aton() ; return 0; } EOF -if { (eval echo configure:14926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14954,11 +15098,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 14958 "configure" +#line 15102 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:14962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -15000,7 +15144,7 @@ EOF unset ac_cv_lib_bind___inet_aton unset found echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6 -echo "configure:15004: checking for inet_aton in -lbind" >&5 +echo "configure:15148: checking for inet_aton in -lbind" >&5 ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15008,7 +15152,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 15012 "configure" +#line 15156 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -15019,7 +15163,7 @@ int main() { inet_aton() ; return 0; } EOF -if { (eval echo configure:15023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15039,7 +15183,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6 -echo "configure:15043: checking for __inet_aton in -lbind" >&5 +echo "configure:15187: checking for __inet_aton in -lbind" >&5 ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15047,7 +15191,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 15051 "configure" +#line 15195 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -15058,7 +15202,7 @@ int main() { __inet_aton() ; return 0; } EOF -if { (eval echo configure:15062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15090,11 +15234,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 15094 "configure" +#line 15238 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:15098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -15148,12 +15292,12 @@ EOF unset found echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6 -echo "configure:15152: checking for dn_skipname" >&5 +echo "configure:15296: checking for dn_skipname" >&5 if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15157 "configure" +#line 15301 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dn_skipname(); below. */ @@ -15176,7 +15320,7 @@ dn_skipname(); ; return 0; } EOF -if { (eval echo configure:15180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dn_skipname=yes" else @@ -15194,12 +15338,12 @@ if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 -echo "configure:15198: checking for __dn_skipname" >&5 +echo "configure:15342: checking for __dn_skipname" >&5 if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15203 "configure" +#line 15347 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __dn_skipname(); below. */ @@ -15222,7 +15366,7 @@ __dn_skipname(); ; return 0; } EOF -if { (eval echo configure:15226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___dn_skipname=yes" else @@ -15260,7 +15404,7 @@ EOF unset ac_cv_lib_resolv___dn_skipname unset found echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 -echo "configure:15264: checking for dn_skipname in -lresolv" >&5 +echo "configure:15408: checking for dn_skipname in -lresolv" >&5 ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15268,7 +15412,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 15272 "configure" +#line 15416 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -15279,7 +15423,7 @@ int main() { dn_skipname() ; return 0; } EOF -if { (eval echo configure:15283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15299,7 +15443,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 -echo "configure:15303: checking for __dn_skipname in -lresolv" >&5 +echo "configure:15447: checking for __dn_skipname in -lresolv" >&5 ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15307,7 +15451,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 15311 "configure" +#line 15455 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -15318,7 +15462,7 @@ int main() { __dn_skipname() ; return 0; } EOF -if { (eval echo configure:15322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15350,11 +15494,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 15354 "configure" +#line 15498 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:15358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -15396,7 +15540,7 @@ EOF unset ac_cv_lib_bind___dn_skipname unset found echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6 -echo "configure:15400: checking for dn_skipname in -lbind" >&5 +echo "configure:15544: checking for dn_skipname in -lbind" >&5 ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15404,7 +15548,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 15408 "configure" +#line 15552 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -15415,7 +15559,7 @@ int main() { dn_skipname() ; return 0; } EOF -if { (eval echo configure:15419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15435,7 +15579,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 -echo "configure:15439: checking for __dn_skipname in -lbind" >&5 +echo "configure:15583: checking for __dn_skipname in -lbind" >&5 ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15443,7 +15587,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 15447 "configure" +#line 15591 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -15454,7 +15598,7 @@ int main() { __dn_skipname() ; return 0; } EOF -if { (eval echo configure:15458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15486,11 +15630,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 15490 "configure" +#line 15634 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:15494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -15542,12 +15686,12 @@ EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:15546: checking for ANSI C header files" >&5 +echo "configure:15690: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15551 "configure" +#line 15695 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -15555,7 +15699,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -15572,7 +15716,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 15576 "configure" +#line 15720 "configure" #include "confdefs.h" #include <string.h> EOF @@ -15590,7 +15734,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 15594 "configure" +#line 15738 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -15611,7 +15755,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 15615 "configure" +#line 15759 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -15622,7 +15766,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:15626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -15650,12 +15794,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:15654: checking for $ac_hdr that defines DIR" >&5 +echo "configure:15798: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15659 "configure" +#line 15803 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -15663,7 +15807,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:15667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -15688,7 +15832,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:15692: checking for opendir in -ldir" >&5 +echo "configure:15836: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15696,7 +15840,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 15700 "configure" +#line 15844 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -15707,7 +15851,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:15711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15729,7 +15873,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:15733: checking for opendir in -lx" >&5 +echo "configure:15877: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15737,7 +15881,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 15741 "configure" +#line 15885 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -15748,7 +15892,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:15752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15829,17 +15973,17 @@ assert.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:15833: checking for $ac_hdr" >&5 +echo "configure:15977: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15838 "configure" +#line 15982 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -15868,12 +16012,12 @@ done echo $ac_n "checking for fopencookie""... $ac_c" 1>&6 -echo "configure:15872: checking for fopencookie" >&5 +echo "configure:16016: checking for fopencookie" >&5 if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15877 "configure" +#line 16021 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char fopencookie(); below. */ @@ -15896,7 +16040,7 @@ fopencookie(); ; return 0; } EOF -if { (eval echo configure:15900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fopencookie=yes" else @@ -15918,7 +16062,7 @@ fi if test "$have_glibc_fopencookie" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 15922 "configure" +#line 16066 "configure" #include "confdefs.h" #define _GNU_SOURCE @@ -15928,7 +16072,7 @@ int main() { cookie_io_functions_t cookie; ; return 0; } EOF -if { (eval echo configure:15932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_cookie_io_functions_t=yes else @@ -15947,7 +16091,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 15951 "configure" +#line 16095 "configure" #include "confdefs.h" #define _GNU_SOURCE @@ -15979,7 +16123,7 @@ main() { EOF -if { (eval echo configure:15983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cookie_io_functions_use_off64_t=yes @@ -15999,7 +16143,7 @@ fi else cat > conftest.$ac_ext <<EOF -#line 16003 "configure" +#line 16147 "configure" #include "confdefs.h" #define _GNU_SOURCE @@ -16009,7 +16153,7 @@ int main() { _IO_cookie_io_functions_t cookie; ; return 0; } EOF -if { (eval echo configure:16013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_IO_cookie_io_functions_t=yes else @@ -16043,7 +16187,7 @@ EOF echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6 -echo "configure:16047: checking for broken getcwd" >&5 +echo "configure:16191: checking for broken getcwd" >&5 os=`uname -sr 2>/dev/null` case $os in SunOS*) @@ -16058,14 +16202,14 @@ EOF echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6 -echo "configure:16062: checking for broken libc stdio" >&5 +echo "configure:16206: checking for broken libc stdio" >&5 if eval "test \"`echo '$''{'have_broken_glibc_fopen_append'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext <<EOF -#line 16069 "configure" +#line 16213 "configure" #include "confdefs.h" #include <features.h> @@ -16078,7 +16222,7 @@ choke me ; return 0; } EOF -if { (eval echo configure:16082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_broken_glibc_fopen_append=yes else @@ -16091,7 +16235,7 @@ rm -f conftest* else cat > conftest.$ac_ext <<EOF -#line 16095 "configure" +#line 16239 "configure" #include "confdefs.h" #include <stdio.h> @@ -16119,7 +16263,7 @@ int main(int argc, char *argv[]) } EOF -if { (eval echo configure:16123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then have_broken_glibc_fopen_append=no else @@ -16147,12 +16291,12 @@ EOF echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:16151: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:16295: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16156 "configure" +#line 16300 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -16160,7 +16304,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:16164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -16181,12 +16325,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:16185: checking for tm_zone in struct tm" >&5 +echo "configure:16329: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16190 "configure" +#line 16334 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -16194,7 +16338,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:16198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -16214,12 +16358,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:16218: checking for tzname" >&5 +echo "configure:16362: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16223 "configure" +#line 16367 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -16229,7 +16373,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:16233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -16253,16 +16397,16 @@ fi echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6 -echo "configure:16257: checking for missing declarations of reentrant functions" >&5 +echo "configure:16401: checking for missing declarations of reentrant functions" >&5 cat > conftest.$ac_ext <<EOF -#line 16259 "configure" +#line 16403 "configure" #include "confdefs.h" #include <time.h> int main() { struct tm *(*func)() = localtime_r ; return 0; } EOF -if { (eval echo configure:16266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : @@ -16280,14 +16424,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 16284 "configure" +#line 16428 "configure" #include "confdefs.h" #include <time.h> int main() { struct tm *(*func)() = gmtime_r ; return 0; } EOF -if { (eval echo configure:16291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : @@ -16305,14 +16449,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 16309 "configure" +#line 16453 "configure" #include "confdefs.h" #include <time.h> int main() { char *(*func)() = asctime_r ; return 0; } EOF -if { (eval echo configure:16316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : @@ -16330,14 +16474,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 16334 "configure" +#line 16478 "configure" #include "confdefs.h" #include <time.h> int main() { char *(*func)() = ctime_r ; return 0; } EOF -if { (eval echo configure:16341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : @@ -16355,14 +16499,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 16359 "configure" +#line 16503 "configure" #include "confdefs.h" #include <string.h> int main() { char *(*func)() = strtok_r ; return 0; } EOF -if { (eval echo configure:16366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : @@ -16383,16 +16527,16 @@ rm -f conftest* echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6 -echo "configure:16387: checking for fclose declaration" >&5 +echo "configure:16531: checking for fclose declaration" >&5 cat > conftest.$ac_ext <<EOF -#line 16389 "configure" +#line 16533 "configure" #include "confdefs.h" #include <stdio.h> int main() { int (*func)() = fclose ; return 0; } EOF -if { (eval echo configure:16396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -16418,12 +16562,12 @@ rm -f conftest* echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:16422: checking for tm_gmtoff in struct tm" >&5 +echo "configure:16566: checking for tm_gmtoff in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16427 "configure" +#line 16571 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -16431,7 +16575,7 @@ int main() { struct tm tm; tm.tm_gmtoff; ; return 0; } EOF -if { (eval echo configure:16435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_gmtoff=yes else @@ -16454,12 +16598,12 @@ fi echo $ac_n "checking for struct flock""... $ac_c" 1>&6 -echo "configure:16458: checking for struct flock" >&5 +echo "configure:16602: checking for struct flock" >&5 if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16463 "configure" +#line 16607 "configure" #include "confdefs.h" #include <unistd.h> @@ -16469,7 +16613,7 @@ int main() { struct flock x; ; return 0; } EOF -if { (eval echo configure:16473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_flock=yes @@ -16496,12 +16640,12 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:16500: checking for socklen_t" >&5 +echo "configure:16644: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16505 "configure" +#line 16649 "configure" #include "confdefs.h" #include <sys/types.h> @@ -16513,7 +16657,7 @@ socklen_t x; ; return 0; } EOF -if { (eval echo configure:16517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_socklen_t=yes @@ -16539,7 +16683,7 @@ fi echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6 -echo "configure:16543: checking size of intmax_t" >&5 +echo "configure:16687: checking size of intmax_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_intmax_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16547,7 +16691,7 @@ else ac_cv_sizeof_intmax_t=0 else cat > conftest.$ac_ext <<EOF -#line 16551 "configure" +#line 16695 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -16558,7 +16702,7 @@ int main() return(0); } EOF -if { (eval echo configure:16562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_intmax_t=`cat conftestval` else @@ -16578,7 +16722,7 @@ EOF echo $ac_n "checking size of size_t""... $ac_c" 1>&6 -echo "configure:16582: checking size of size_t" >&5 +echo "configure:16726: checking size of size_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16586,7 +16730,7 @@ else ac_cv_sizeof_size_t=8 else cat > conftest.$ac_ext <<EOF -#line 16590 "configure" +#line 16734 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -16597,7 +16741,7 @@ int main() return(0); } EOF -if { (eval echo configure:16601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_size_t=`cat conftestval` else @@ -16617,7 +16761,7 @@ EOF echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6 -echo "configure:16621: checking size of ssize_t" >&5 +echo "configure:16765: checking size of ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16625,7 +16769,7 @@ else ac_cv_sizeof_ssize_t=8 else cat > conftest.$ac_ext <<EOF -#line 16629 "configure" +#line 16773 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -16636,7 +16780,7 @@ int main() return(0); } EOF -if { (eval echo configure:16640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_ssize_t=`cat conftestval` else @@ -16656,7 +16800,7 @@ EOF echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6 -echo "configure:16660: checking size of ptrdiff_t" >&5 +echo "configure:16804: checking size of ptrdiff_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_ptrdiff_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16664,7 +16808,7 @@ else ac_cv_sizeof_ptrdiff_t=8 else cat > conftest.$ac_ext <<EOF -#line 16668 "configure" +#line 16812 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -16675,7 +16819,7 @@ int main() return(0); } EOF -if { (eval echo configure:16679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_ptrdiff_t=`cat conftestval` else @@ -16695,7 +16839,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:16699: checking size of long long" >&5 +echo "configure:16843: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16703,7 +16847,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext <<EOF -#line 16707 "configure" +#line 16851 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -16714,7 +16858,7 @@ int main() return(0); } EOF -if { (eval echo configure:16718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -16734,7 +16878,7 @@ EOF echo $ac_n "checking size of long long int""... $ac_c" 1>&6 -echo "configure:16738: checking size of long long int" >&5 +echo "configure:16882: checking size of long long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16742,7 +16886,7 @@ else ac_cv_sizeof_long_long_int=8 else cat > conftest.$ac_ext <<EOF -#line 16746 "configure" +#line 16890 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -16753,7 +16897,7 @@ int main() return(0); } EOF -if { (eval echo configure:16757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long_int=`cat conftestval` else @@ -16773,7 +16917,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:16777: checking size of long" >&5 +echo "configure:16921: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16781,7 +16925,7 @@ else ac_cv_sizeof_long=8 else cat > conftest.$ac_ext <<EOF -#line 16785 "configure" +#line 16929 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -16792,7 +16936,7 @@ int main() return(0); } EOF -if { (eval echo configure:16796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -16812,7 +16956,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:16816: checking size of int" >&5 +echo "configure:16960: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16820,7 +16964,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext <<EOF -#line 16824 "configure" +#line 16968 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -16831,7 +16975,7 @@ int main() return(0); } EOF -if { (eval echo configure:16835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -16852,12 +16996,12 @@ EOF echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:16856: checking for st_blksize in struct stat" >&5 +echo "configure:17000: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16861 "configure" +#line 17005 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -16865,7 +17009,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:16869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -16887,12 +17031,12 @@ fi if test "`uname -s 2>/dev/null`" != "QNX"; then echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:16891: checking for st_blocks in struct stat" >&5 +echo "configure:17035: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16896 "configure" +#line 17040 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -16900,7 +17044,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:16904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -16927,12 +17071,12 @@ else WARNING_LEVEL=0 fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:16931: checking for st_rdev in struct stat" >&5 +echo "configure:17075: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16936 "configure" +#line 17080 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -16940,7 +17084,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:16944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -16962,12 +17106,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:16966: checking for size_t" >&5 +echo "configure:17110: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16971 "configure" +#line 17115 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -16995,12 +17139,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:16999: checking for uid_t in sys/types.h" >&5 +echo "configure:17143: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17004 "configure" +#line 17148 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -17031,12 +17175,12 @@ fi echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6 -echo "configure:17035: checking for struct sockaddr_storage" >&5 +echo "configure:17179: checking for struct sockaddr_storage" >&5 if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17040 "configure" +#line 17184 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -17044,7 +17188,7 @@ int main() { struct sockaddr_storage s; s ; return 0; } EOF -if { (eval echo configure:17048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sockaddr_storage=yes else @@ -17065,13 +17209,13 @@ EOF fi echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6 -echo "configure:17069: checking for field sa_len in struct sockaddr" >&5 +echo "configure:17213: checking for field sa_len in struct sockaddr" >&5 if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17075 "configure" +#line 17219 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -17079,7 +17223,7 @@ int main() { static struct sockaddr sa; int n = (int) sa.sa_len; return n; ; return 0; } EOF -if { (eval echo configure:17083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sockaddr_sa_len=yes else @@ -17102,12 +17246,12 @@ EOF echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6 -echo "configure:17106: checking for IPv6 support" >&5 +echo "configure:17250: checking for IPv6 support" >&5 if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17111 "configure" +#line 17255 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -17116,7 +17260,7 @@ int main() { struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; ; return 0; } EOF -if { (eval echo configure:17120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ipv6_support=yes else @@ -17132,12 +17276,12 @@ echo "$ac_t""$ac_cv_ipv6_support" 1>&6 echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:17136: checking for vprintf" >&5 +echo "configure:17280: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17141 "configure" +#line 17285 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vprintf(); below. */ @@ -17160,7 +17304,7 @@ vprintf(); ; return 0; } EOF -if { (eval echo configure:17164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -17184,12 +17328,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:17188: checking for _doprnt" >&5 +echo "configure:17332: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17193 "configure" +#line 17337 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt(); below. */ @@ -17212,7 +17356,7 @@ _doprnt(); ; return 0; } EOF -if { (eval echo configure:17216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -17256,6 +17400,9 @@ getservbyport \ getrusage \ gettimeofday \ gmtime_r \ +getpwnam_r \ +getgrnam_r \ +getpwuid_r \ grantpt \ inet_ntoa \ inet_ntop \ @@ -17316,12 +17463,12 @@ vsnprintf \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17320: checking for $ac_func" >&5 +echo "configure:17467: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17325 "configure" +#line 17472 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17344,7 +17491,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17370,25 +17517,25 @@ done echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:17374: checking for getaddrinfo" >&5 +echo "configure:17521: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17379 "configure" +#line 17526 "configure" #include "confdefs.h" #include <netdb.h> int main() { struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g); ; return 0; } EOF -if { (eval echo configure:17386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test "$cross_compiling" = yes; then ac_cv_func_getaddrinfo=no else cat > conftest.$ac_ext <<EOF -#line 17392 "configure" +#line 17539 "configure" #include "confdefs.h" #include <netdb.h> @@ -17428,7 +17575,7 @@ int main(void) { } EOF -if { (eval echo configure:17432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getaddrinfo=yes else @@ -17460,12 +17607,12 @@ fi for ac_func in strlcat strlcpy getopt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17464: checking for $ac_func" >&5 +echo "configure:17611: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17469 "configure" +#line 17616 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17488,7 +17635,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17515,7 +17662,7 @@ done echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:17519: checking whether utime accepts a null argument" >&5 +echo "configure:17666: checking whether utime accepts a null argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17525,7 +17672,7 @@ if test "$cross_compiling" = yes; then ac_cv_func_utime_null=no else cat > conftest.$ac_ext <<EOF -#line 17529 "configure" +#line 17676 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -17536,7 +17683,7 @@ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0 && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:17540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_utime_null=yes else @@ -17562,19 +17709,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:17566: checking for working alloca.h" >&5 +echo "configure:17713: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17571 "configure" +#line 17718 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:17578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -17595,12 +17742,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:17599: checking for alloca" >&5 +echo "configure:17746: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17604 "configure" +#line 17751 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -17628,7 +17775,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:17632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -17660,12 +17807,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:17664: checking whether alloca needs Cray hooks" >&5 +echo "configure:17811: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17669 "configure" +#line 17816 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -17690,12 +17837,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17694: checking for $ac_func" >&5 +echo "configure:17841: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17699 "configure" +#line 17846 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17718,7 +17865,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17745,7 +17892,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:17749: checking stack direction for C alloca" >&5 +echo "configure:17896: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17753,7 +17900,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 17757 "configure" +#line 17904 "configure" #include "confdefs.h" find_stack_direction () { @@ -17772,7 +17919,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:17776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -17795,13 +17942,13 @@ fi echo $ac_n "checking for declared timezone""... $ac_c" 1>&6 -echo "configure:17799: checking for declared timezone" >&5 +echo "configure:17946: checking for declared timezone" >&5 if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17805 "configure" +#line 17952 "configure" #include "confdefs.h" #include <sys/types.h> @@ -17816,7 +17963,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_declared_timezone=yes @@ -17842,7 +17989,7 @@ EOF echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6 -echo "configure:17846: checking for type of reentrant time-related functions" >&5 +echo "configure:17993: checking for type of reentrant time-related functions" >&5 if eval "test \"`echo '$''{'ac_cv_time_r_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17853,7 +18000,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 17857 "configure" +#line 18004 "configure" #include "confdefs.h" #include <time.h> @@ -17871,7 +18018,7 @@ return (1); } EOF -if { (eval echo configure:17875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_time_r_type=hpux @@ -17887,7 +18034,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 17891 "configure" +#line 18038 "configure" #include "confdefs.h" #include <time.h> @@ -17903,7 +18050,7 @@ main() { } EOF -if { (eval echo configure:17907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_time_r_type=irix @@ -17941,12 +18088,12 @@ EOF echo $ac_n "checking for readdir_r""... $ac_c" 1>&6 -echo "configure:17945: checking for readdir_r" >&5 +echo "configure:18092: checking for readdir_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17950 "configure" +#line 18097 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char readdir_r(); below. */ @@ -17969,7 +18116,7 @@ readdir_r(); ; return 0; } EOF -if { (eval echo configure:17973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_readdir_r=yes" else @@ -17991,7 +18138,7 @@ fi if test "$ac_cv_func_readdir_r" = "yes"; then echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6 -echo "configure:17995: checking for type of readdir_r" >&5 +echo "configure:18142: checking for type of readdir_r" >&5 if eval "test \"`echo '$''{'ac_cv_what_readdir_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18002,7 +18149,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 18006 "configure" +#line 18153 "configure" #include "confdefs.h" #define _REENTRANT @@ -18027,7 +18174,7 @@ main() { } EOF -if { (eval echo configure:18031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_what_readdir_r=POSIX @@ -18038,7 +18185,7 @@ else rm -fr conftest* cat > conftest.$ac_ext <<EOF -#line 18042 "configure" +#line 18189 "configure" #include "confdefs.h" #define _REENTRANT @@ -18048,7 +18195,7 @@ int readdir_r(DIR *, struct dirent *); EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18090,12 +18237,12 @@ EOF echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 -echo "configure:18094: checking for in_addr_t" >&5 +echo "configure:18241: checking for in_addr_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18099 "configure" +#line 18246 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -18126,6 +18273,173 @@ EOF fi +for ac_func in crypt_r +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:18280: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 18285 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:18308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_func 1 +EOF + php_crypt_r="1" +else + echo "$ac_t""no" 1>&6 +php_crypt_r="0" +fi +done + +if test "x$php_crypt_r" = "x1"; then + + echo $ac_n "checking which data struct is used by crypt_r""... $ac_c" 1>&6 +echo "configure:18336: checking which data struct is used by crypt_r" >&5 +if eval "test \"`echo '$''{'php_cv_crypt_r_style'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + php_cv_crypt_r_style=none + cat > conftest.$ac_ext <<EOF +#line 18343 "configure" +#include "confdefs.h" + +#define _REENTRANT 1 +#include <crypt.h> + +int main() { + +CRYPTD buffer; +crypt_r("passwd", "hash", &buffer); + +; return 0; } +EOF +if { (eval echo configure:18356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + php_cv_crypt_r_style=cryptd +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + + if test "$php_cv_crypt_r_style" = "none"; then + cat > conftest.$ac_ext <<EOF +#line 18367 "configure" +#include "confdefs.h" + +#define _REENTRANT 1 +#include <crypt.h> + +int main() { + +struct crypt_data buffer; +crypt_r("passwd", "hash", &buffer); + +; return 0; } +EOF +if { (eval echo configure:18380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + php_cv_crypt_r_style=struct_crypt_data +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + fi + + if test "$php_cv_crypt_r_style" = "none"; then + cat > conftest.$ac_ext <<EOF +#line 18392 "configure" +#include "confdefs.h" + +#define _REENTRANT 1 +#define _GNU_SOURCE +#include <crypt.h> + +int main() { + +struct crypt_data buffer; +crypt_r("passwd", "hash", &buffer); + +; return 0; } +EOF +if { (eval echo configure:18406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + php_cv_crypt_r_style=struct_crypt_data_gnu_source +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + fi + +fi + +echo "$ac_t""$php_cv_crypt_r_style" 1>&6 + + if test "$php_cv_crypt_r_style" = "cryptd"; then + cat >> confdefs.h <<\EOF +#define CRYPT_R_CRYPTD 1 +EOF + + fi + if test "$php_cv_crypt_r_style" = "struct_crypt_data" -o "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then + cat >> confdefs.h <<\EOF +#define CRYPT_R_STRUCT_CRYPT_DATA 1 +EOF + + fi + if test "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then + cat >> confdefs.h <<\EOF +#define CRYPT_R_GNU_SOURCE 1 +EOF + + fi + if test "$php_cv_crypt_r_style" = "none"; then + { echo "configure: error: Unable to detect data struct used by crypt_r" 1>&2; exit 1; } + fi + +fi + @@ -18146,7 +18460,7 @@ fi echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6 -echo "configure:18150: checking whether to include gcov symbols" >&5 +echo "configure:18464: checking whether to include gcov symbols" >&5 # Check whether --enable-gcov or --disable-gcov was given. if test "${enable_gcov+set}" = set; then enableval="$enable_gcov" @@ -18188,7 +18502,7 @@ if test "$PHP_GCOV" = "yes"; then # Extract the first word of "lcov", so it can be a program name with args. set dummy lcov; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18192: checking for $ac_word" >&5 +echo "configure:18506: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LTP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18217,7 +18531,7 @@ fi # Extract the first word of "genhtml", so it can be a program name with args. set dummy genhtml; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18221: checking for $ac_word" >&5 +echo "configure:18535: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LTP_GENHTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18252,7 +18566,7 @@ fi if test "$LTP"; then echo $ac_n "checking for ltp version""... $ac_c" 1>&6 -echo "configure:18256: checking for ltp version" >&5 +echo "configure:18570: checking for ltp version" >&5 if eval "test \"`echo '$''{'php_cv_ltp_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18293,7 +18607,7 @@ EOF src=$abs_srcdir/Makefile.gcov ac_srcdir=$abs_srcdir ac_builddir=$ext_builddir - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments @@ -18308,7 +18622,7 @@ fi echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6 -echo "configure:18312: checking whether to include debugging symbols" >&5 +echo "configure:18626: checking whether to include debugging symbols" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -18337,8 +18651,10 @@ if test "$PHP_DEBUG" = "yes"; then CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'` CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'` - CFLAGS="$CFLAGS -O0" - CXXFLAGS="$CXXFLAGS -O0" + if test "$GCC" = "yes" || test "$ICC" = "yes"; then + CFLAGS="$CFLAGS -O0" + CXXFLAGS="$CXXFLAGS -O0" + fi else PHP_DEBUG=0 ZEND_DEBUG=no @@ -18347,7 +18663,7 @@ fi echo $ac_n "checking layout of installed files""... $ac_c" 1>&6 -echo "configure:18351: checking layout of installed files" >&5 +echo "configure:18667: checking layout of installed files" >&5 # Check whether --with-layout or --without-layout was given. if test "${with_layout+set}" = set; then withval="$with_layout" @@ -18381,7 +18697,7 @@ esac echo $ac_n "checking path to configuration file""... $ac_c" 1>&6 -echo "configure:18385: checking path to configuration file" >&5 +echo "configure:18701: checking path to configuration file" >&5 # Check whether --with-config-file-path or --without-config-file-path was given. if test "${with_config_file_path+set}" = set; then withval="$with_config_file_path" @@ -18417,7 +18733,7 @@ fi echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6 -echo "configure:18421: checking where to scan for configuration files" >&5 +echo "configure:18737: checking where to scan for configuration files" >&5 # Check whether --with-config-file-scan-dir or --without-config-file-scan-dir was given. if test "${with_config_file_scan_dir+set}" = set; then withval="$with_config_file_scan_dir" @@ -18447,7 +18763,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6 -echo "configure:18451: checking whether to enable safe mode by default" >&5 +echo "configure:18767: checking whether to enable safe mode by default" >&5 # Check whether --enable-safe-mode or --disable-safe-mode was given. if test "${enable_safe_mode+set}" = set; then enableval="$enable_safe_mode" @@ -18482,7 +18798,7 @@ EOF fi echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6 -echo "configure:18486: checking for safe mode exec dir" >&5 +echo "configure:18802: checking for safe mode exec dir" >&5 # Check whether --with-exec-dir or --without-exec-dir was given. if test "${with_exec_dir+set}" = set; then withval="$with_exec_dir" @@ -18523,7 +18839,7 @@ fi echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6 -echo "configure:18527: checking whether to enable PHP's own SIGCHLD handler" >&5 +echo "configure:18843: checking whether to enable PHP's own SIGCHLD handler" >&5 # Check whether --enable-sigchild or --disable-sigchild was given. if test "${enable_sigchild+set}" = set; then enableval="$enable_sigchild" @@ -18560,7 +18876,7 @@ fi echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6 -echo "configure:18564: checking whether to enable magic quotes by default" >&5 +echo "configure:18880: checking whether to enable magic quotes by default" >&5 # Check whether --enable-magic-quotes or --disable-magic-quotes was given. if test "${enable_magic_quotes+set}" = set; then enableval="$enable_magic_quotes" @@ -18597,7 +18913,7 @@ fi echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6 -echo "configure:18601: checking whether to enable runpaths" >&5 +echo "configure:18917: checking whether to enable runpaths" >&5 # Check whether --enable-rpath or --disable-rpath was given. if test "${enable_rpath+set}" = set; then enableval="$enable_rpath" @@ -18622,7 +18938,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6 -echo "configure:18626: checking whether to explicitly link against libgcc" >&5 +echo "configure:18942: checking whether to explicitly link against libgcc" >&5 # Check whether --enable-libgcc or --disable-libgcc was given. if test "${enable_libgcc+set}" = set; then enableval="$enable_libgcc" @@ -18701,7 +19017,7 @@ fi echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6 -echo "configure:18705: checking whether to enable short tags by default" >&5 +echo "configure:19021: checking whether to enable short tags by default" >&5 # Check whether --enable-short-tags or --disable-short-tags was given. if test "${enable_short_tags+set}" = set; then enableval="$enable_short_tags" @@ -18738,7 +19054,7 @@ fi echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6 -echo "configure:18742: checking whether to enable dmalloc" >&5 +echo "configure:19058: checking whether to enable dmalloc" >&5 # Check whether --enable-dmalloc or --disable-dmalloc was given. if test "${enable_dmalloc+set}" = set; then enableval="$enable_dmalloc" @@ -18763,7 +19079,7 @@ echo "$ac_t""$ext_output" 1>&6 if test "$PHP_DMALLOC" = "yes"; then echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6 -echo "configure:18767: checking for dmalloc_error in -ldmalloc" >&5 +echo "configure:19083: checking for dmalloc_error in -ldmalloc" >&5 ac_lib_var=`echo dmalloc'_'dmalloc_error | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18771,7 +19087,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <<EOF -#line 18775 "configure" +#line 19091 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -18782,7 +19098,7 @@ int main() { dmalloc_error() ; return 0; } EOF -if { (eval echo configure:18786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -18826,7 +19142,7 @@ fi echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6 -echo "configure:18830: checking whether to enable IPv6 support" >&5 +echo "configure:19146: checking whether to enable IPv6 support" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then enableval="$enable_ipv6" @@ -18856,7 +19172,7 @@ EOF fi echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6 -echo "configure:18860: checking how big to make fd sets" >&5 +echo "configure:19176: checking how big to make fd sets" >&5 # Check whether --enable-fd-setsize or --disable-fd-setsize was given. if test "${enable_fd_setsize+set}" = set; then enableval="$enable_fd_setsize" @@ -18876,7 +19192,7 @@ fi echo $ac_n "checking whether to enable versioning""... $ac_c" 1>&6 -echo "configure:18880: checking whether to enable versioning" >&5 +echo "configure:19196: checking whether to enable versioning" >&5 # Check whether --enable-versioning or --disable-versioning was given. if test "${enable_versioning+set}" = set; then enableval="$enable_versioning" @@ -18924,7 +19240,7 @@ fi echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6 -echo "configure:18928: checking whether to enable LIBXML support" >&5 +echo "configure:19244: checking whether to enable LIBXML support" >&5 # Check whether --enable-libxml or --disable-libxml was given. if test "${enable_libxml+set}" = set; then enableval="$enable_libxml" @@ -18971,7 +19287,7 @@ if test -z "$PHP_LIBXML_DIR"; then echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:18975: checking libxml2 install dir" >&5 +echo "configure:19291: checking libxml2 install dir" >&5 # Check whether --with-libxml-dir or --without-libxml-dir was given. if test "${with_libxml_dir+set}" = set; then withval="$with_libxml_dir" @@ -19000,7 +19316,7 @@ if test "$PHP_LIBXML" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:19004: checking for xml2-config path" >&5 +echo "configure:19320: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19157,7 +19473,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:19161: checking whether libxml build works" >&5 +echo "configure:19477: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19173,7 +19489,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 19177 "configure" +#line 19493 "configure" #include "confdefs.h" @@ -19184,7 +19500,7 @@ else } EOF -if { (eval echo configure:19188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -19537,7 +19853,7 @@ fi echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6 -echo "configure:19541: checking for OpenSSL support" >&5 +echo "configure:19857: checking for OpenSSL support" >&5 # Check whether --with-openssl or --without-openssl was given. if test "${with_openssl+set}" = set; then withval="$with_openssl" @@ -19583,7 +19899,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6 -echo "configure:19587: checking for Kerberos support" >&5 +echo "configure:19903: checking for Kerberos support" >&5 # Check whether --with-kerberos or --without-kerberos was given. if test "${with_kerberos+set}" = set; then withval="$with_kerberos" @@ -19901,7 +20217,7 @@ EOF # Extract the first word of "krb5-config", so it can be a program name with args. set dummy krb5-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19905: checking for $ac_word" >&5 +echo "configure:20221: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20258,6 +20574,50 @@ fi fi + echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6 +echo "configure:20579: checking for DSA_get_default_method in -lssl" >&5 +ac_lib_var=`echo ssl'_'DSA_get_default_method | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lssl $LIBS" +cat > conftest.$ac_ext <<EOF +#line 20587 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char DSA_get_default_method(); + +int main() { +DSA_get_default_method() +; return 0; } +EOF +if { (eval echo configure:20598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_DSA_DEFAULT_METHOD 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + + found_openssl=no unset OPENSSL_INCDIR @@ -20276,7 +20636,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20280: checking for $ac_word" >&5 +echo "configure:20640: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20480,9 +20840,9 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:20484: checking for OpenSSL version" >&5 +echo "configure:20844: checking for OpenSSL version" >&5 cat > conftest.$ac_ext <<EOF -#line 20486 "configure" +#line 20846 "configure" #include "confdefs.h" #include <openssl/opensslv.h> @@ -20636,7 +20996,7 @@ rm -f conftest* done echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:20640: checking for CRYPTO_free in -lcrypto" >&5 +echo "configure:21000: checking for CRYPTO_free in -lcrypto" >&5 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20644,7 +21004,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 20648 "configure" +#line 21008 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -20655,7 +21015,7 @@ int main() { CRYPTO_free() ; return 0; } EOF -if { (eval echo configure:20659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -20811,7 +21171,7 @@ fi done echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:20815: checking for SSL_CTX_set_ssl_version in -lssl" >&5 +echo "configure:21175: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20819,7 +21179,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF -#line 20823 "configure" +#line 21183 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -20830,7 +21190,7 @@ int main() { SSL_CTX_set_ssl_version() ; return 0; } EOF -if { (eval echo configure:20834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -20950,7 +21310,7 @@ fi echo $ac_n "checking for PCRE support""... $ac_c" 1>&6 -echo "configure:20954: checking for PCRE support" >&5 +echo "configure:21314: checking for PCRE support" >&5 # Check whether --with-pcre-regex or --without-pcre-regex was given. if test "${with_pcre_regex+set}" = set; then withval="$with_pcre_regex" @@ -20999,7 +21359,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then ext_builddir=ext/pcre ext_srcdir=$abs_srcdir/ext/pcre - ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -DMATCH_LIMIT_RECURSION=10000000 -DMAX_NAME_SIZE=32 -DMAX_NAME_COUNT=10000 -DMAX_DUPLENGTH=30000 -I@ext_srcdir@/pcrelib"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` + ac_extra=`echo "-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000 -DMATCH_LIMIT_RECURSION=10000000 -DMAX_NAME_SIZE=32 -DMAX_NAME_COUNT=10000 -DMAX_DUPLENGTH=30000 -DEBCDIC=0 -I@ext_srcdir@/pcrelib"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PCRE_SHARED=no @@ -21023,7 +21383,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then old_IFS=$IFS - for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do + for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do IFS=. set $ac_src @@ -21072,7 +21432,7 @@ EOF old_IFS=$IFS - for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do + for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do IFS=. set $ac_src @@ -21192,7 +21552,7 @@ EOF old_IFS=$IFS - for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do + for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do IFS=. set $ac_src @@ -21237,7 +21597,7 @@ EOF old_IFS=$IFS - for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do + for ac_src in pcrelib/pcre_chartables.c pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c; do IFS=. set $ac_src @@ -21748,17 +22108,39 @@ EOF fi + + + header_path=ext/pcre + for header_file in php_pcre.h; do + hp_hf="$header_path/$header_file" + + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INSTALLHEADERS$unique=set" + + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" + fi + + done + + PHP_VAR_SUBST="$PHP_VAR_SUBST PCRE_SHARED_LIBADD" + fi +else + PHP_PCRE=no fi echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6 -echo "configure:21762: checking for ZLIB support" >&5 +echo "configure:22144: checking for ZLIB support" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" @@ -21804,7 +22186,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6 -echo "configure:21808: checking if the location of ZLIB install directory is defined" >&5 +echo "configure:22190: checking if the location of ZLIB install directory is defined" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" @@ -22238,7 +22620,7 @@ EOF done echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6 -echo "configure:22242: checking for gzgets in -lz" >&5 +echo "configure:22624: checking for gzgets in -lz" >&5 ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -22246,7 +22628,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 22250 "configure" +#line 22632 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -22257,7 +22639,7 @@ int main() { gzgets() ; return 0; } EOF -if { (eval echo configure:22261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -22395,7 +22777,7 @@ fi echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6 -echo "configure:22399: checking whether to enable bc style precision math functions" >&5 +echo "configure:22781: checking whether to enable bc style precision math functions" >&5 # Check whether --enable-bcmath or --disable-bcmath was given. if test "${enable_bcmath+set}" = set; then enableval="$enable_bcmath" @@ -22751,7 +23133,7 @@ fi echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6 -echo "configure:22755: checking for BZip2 support" >&5 +echo "configure:23137: checking for BZip2 support" >&5 # Check whether --with-bz2 or --without-bz2 was given. if test "${with_bz2+set}" = set; then withval="$with_bz2" @@ -22799,7 +23181,7 @@ if test "$PHP_BZ2" != "no"; then BZIP_DIR=$PHP_BZ2 else echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6 -echo "configure:22803: checking for BZip2 in default path" >&5 +echo "configure:23185: checking for BZip2 in default path" >&5 for i in /usr/local /usr; do if test -r $i/include/bzlib.h; then BZIP_DIR=$i @@ -22911,7 +23293,7 @@ echo "configure:22803: checking for BZip2 in default path" >&5 done echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6 -echo "configure:22915: checking for BZ2_bzerror in -lbz2" >&5 +echo "configure:23297: checking for BZ2_bzerror in -lbz2" >&5 ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -22919,7 +23301,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbz2 $LIBS" cat > conftest.$ac_ext <<EOF -#line 22923 "configure" +#line 23305 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -22930,7 +23312,7 @@ int main() { BZ2_bzerror() ; return 0; } EOF -if { (eval echo configure:22934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23385,7 +23767,7 @@ fi echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6 -echo "configure:23389: checking whether to enable calendar conversion support" >&5 +echo "configure:23771: checking whether to enable calendar conversion support" >&5 # Check whether --enable-calendar or --disable-calendar was given. if test "${enable_calendar+set}" = set; then enableval="$enable_calendar" @@ -23720,7 +24102,7 @@ fi echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6 -echo "configure:23724: checking whether to enable ctype functions" >&5 +echo "configure:24106: checking whether to enable ctype functions" >&5 # Check whether --enable-ctype or --disable-ctype was given. if test "${enable_ctype+set}" = set; then enableval="$enable_ctype" @@ -24055,7 +24437,7 @@ fi echo $ac_n "checking for cURL support""... $ac_c" 1>&6 -echo "configure:24059: checking for cURL support" >&5 +echo "configure:24441: checking for cURL support" >&5 # Check whether --with-curl or --without-curl was given. if test "${with_curl+set}" = set; then withval="$with_curl" @@ -24101,7 +24483,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6 -echo "configure:24105: checking if we should use cURL for url streams" >&5 +echo "configure:24487: checking if we should use cURL for url streams" >&5 # Check whether --with-curlwrappers or --without-curlwrappers was given. if test "${with_curlwrappers+set}" = set; then withval="$with_curlwrappers" @@ -24128,7 +24510,7 @@ if test "$PHP_CURL" != "no"; then CURL_DIR=$PHP_CURL else echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6 -echo "configure:24132: checking for cURL in default path" >&5 +echo "configure:24514: checking for cURL in default path" >&5 for i in /usr/local /usr; do if test -r $i/include/curl/easy.h; then CURL_DIR=$i @@ -24146,7 +24528,7 @@ echo "configure:24132: checking for cURL in default path" >&5 CURL_CONFIG="curl-config" echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6 -echo "configure:24150: checking for cURL 7.10.5 or greater" >&5 +echo "configure:24532: checking for cURL 7.10.5 or greater" >&5 if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then CURL_CONFIG=${CURL_DIR}/bin/curl-config @@ -24166,7 +24548,7 @@ echo "configure:24150: checking for cURL 7.10.5 or greater" >&5 fi echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 -echo "configure:24170: checking for SSL support in libcurl" >&5 +echo "configure:24552: checking for SSL support in libcurl" >&5 CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` if test "$CURL_SSL" = "SSL"; then echo "$ac_t""yes" 1>&6 @@ -24176,7 +24558,7 @@ EOF echo $ac_n "checking for SSL library used""... $ac_c" 1>&6 -echo "configure:24180: checking for SSL library used" >&5 +echo "configure:24562: checking for SSL library used" >&5 CURL_SSL_FLAVOUR= for i in $CURL_LIBS; do if test "$i" = "-lssl"; then @@ -24190,17 +24572,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:24194: checking for $ac_hdr" >&5 +echo "configure:24576: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 24199 "configure" +#line 24581 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:24204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:24586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -24238,17 +24620,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:24242: checking for $ac_hdr" >&5 +echo "configure:24624: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 24247 "configure" +#line 24629 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:24252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:24634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -24599,7 +24981,7 @@ done done echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6 -echo "configure:24603: checking for curl_easy_perform in -lcurl" >&5 +echo "configure:24985: checking for curl_easy_perform in -lcurl" >&5 ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -24607,7 +24989,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurl $LIBS" cat > conftest.$ac_ext <<EOF -#line 24611 "configure" +#line 24993 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -24618,7 +25000,7 @@ int main() { curl_easy_perform() ; return 0; } EOF -if { (eval echo configure:24622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -24753,7 +25135,7 @@ fi done echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6 -echo "configure:24757: checking for curl_version_info in -lcurl" >&5 +echo "configure:25139: checking for curl_version_info in -lcurl" >&5 ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -24761,7 +25143,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurl $LIBS" cat > conftest.$ac_ext <<EOF -#line 24765 "configure" +#line 25147 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -24772,7 +25154,7 @@ int main() { curl_version_info() ; return 0; } EOF -if { (eval echo configure:24776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -24905,7 +25287,7 @@ fi done echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6 -echo "configure:24909: checking for curl_easy_strerror in -lcurl" >&5 +echo "configure:25291: checking for curl_easy_strerror in -lcurl" >&5 ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -24913,7 +25295,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurl $LIBS" cat > conftest.$ac_ext <<EOF -#line 24917 "configure" +#line 25299 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -24924,7 +25306,7 @@ int main() { curl_easy_strerror() ; return 0; } EOF -if { (eval echo configure:24928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -25057,7 +25439,7 @@ fi done echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 -echo "configure:25061: checking for curl_multi_strerror in -lcurl" >&5 +echo "configure:25443: checking for curl_multi_strerror in -lcurl" >&5 ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -25065,7 +25447,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurl $LIBS" cat > conftest.$ac_ext <<EOF -#line 25069 "configure" +#line 25451 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -25076,7 +25458,7 @@ int main() { curl_multi_strerror() ; return 0; } EOF -if { (eval echo configure:25080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -25410,7 +25792,7 @@ fi echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:25414: checking size of long" >&5 +echo "configure:25796: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -25418,7 +25800,7 @@ else ac_cv_sizeof_long=8 else cat > conftest.$ac_ext <<EOF -#line 25422 "configure" +#line 25804 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -25429,7 +25811,7 @@ int main() return(0); } EOF -if { (eval echo configure:25433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:25815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -25449,7 +25831,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:25453: checking size of int" >&5 +echo "configure:25835: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -25457,7 +25839,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext <<EOF -#line 25461 "configure" +#line 25843 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -25468,7 +25850,7 @@ int main() return(0); } EOF -if { (eval echo configure:25472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:25854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -25489,13 +25871,13 @@ EOF echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:25493: checking for int32_t" >&5 +echo "configure:25875: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 25499 "configure" +#line 25881 "configure" #include "confdefs.h" #if HAVE_SYS_TYPES_H @@ -25514,7 +25896,7 @@ if (sizeof (int32_t)) ; return 0; } EOF -if { (eval echo configure:25518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:25900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int_type_int32_t=yes else @@ -25537,13 +25919,13 @@ fi echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:25541: checking for uint32_t" >&5 +echo "configure:25923: checking for uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 25547 "configure" +#line 25929 "configure" #include "confdefs.h" #if HAVE_SYS_TYPES_H @@ -25562,7 +25944,7 @@ if (sizeof (uint32_t)) ; return 0; } EOF -if { (eval echo configure:25566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:25948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int_type_uint32_t=yes else @@ -25594,17 +25976,17 @@ stdlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:25598: checking for $ac_hdr" >&5 +echo "configure:25980: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 25603 "configure" +#line 25985 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:25608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:25990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -25634,12 +26016,12 @@ done for ac_func in strtoll atoll strftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:25638: checking for $ac_func" >&5 +echo "configure:26020: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 25643 "configure" +#line 26025 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -25662,7 +26044,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:25666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:26048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -26089,7 +26471,7 @@ EOF echo $ac_n "checking whether to enable DBA""... $ac_c" 1>&6 -echo "configure:26093: checking whether to enable DBA" >&5 +echo "configure:26475: checking whether to enable DBA" >&5 # Check whether --enable-dba or --disable-dba was given. if test "${enable_dba+set}" = set; then enableval="$enable_dba" @@ -26245,7 +26627,7 @@ if test "${with_qdbm+set}" = set; then done echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6 -echo "configure:26249: checking for dpopen in -l$LIB" >&5 +echo "configure:26631: checking for dpopen in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'dpopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -26253,7 +26635,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 26257 "configure" +#line 26639 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -26264,7 +26646,7 @@ int main() { dpopen() ; return 0; } EOF -if { (eval echo configure:26268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:26650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -26435,7 +26817,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:26439: checking for $THIS_FULL_NAME support" >&5 +echo "configure:26821: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi @@ -26466,7 +26848,7 @@ if test "${with_gdbm+set}" = set; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:26470: checking for $THIS_FULL_NAME support" >&5 +echo "configure:26852: checking for $THIS_FULL_NAME support" >&5 if test -n "You cannot combine --with-gdbm with --with-qdbm"; then { echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; } fi @@ -26584,7 +26966,7 @@ echo "configure:26470: checking for $THIS_FULL_NAME support" >&5 done echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:26588: checking for gdbm_open in -lgdbm" >&5 +echo "configure:26970: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -26592,7 +26974,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <<EOF -#line 26596 "configure" +#line 26978 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -26603,7 +26985,7 @@ int main() { gdbm_open() ; return 0; } EOF -if { (eval echo configure:26607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:26989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -26770,7 +27152,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:26774: checking for $THIS_FULL_NAME support" >&5 +echo "configure:27156: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi @@ -26901,7 +27283,7 @@ if test "${with_ndbm+set}" = set; then done echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6 -echo "configure:26905: checking for dbm_open in -l$LIB" >&5 +echo "configure:27287: checking for dbm_open in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -26909,7 +27291,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 26913 "configure" +#line 27295 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -26920,7 +27302,7 @@ int main() { dbm_open() ; return 0; } EOF -if { (eval echo configure:26924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:27306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -27091,7 +27473,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:27095: checking for $THIS_FULL_NAME support" >&5 +echo "configure:27477: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi @@ -27139,7 +27521,7 @@ if test "${with_db4+set}" = set; then fi done - for LIB in db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db; do + for LIB in db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db; do if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then old_LDFLAGS=$LDFLAGS @@ -27148,7 +27530,7 @@ if test "${with_db4+set}" = set; then LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 27152 "configure" +#line 27534 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -27159,11 +27541,11 @@ int main() { ; return 0; } EOF -if { (eval echo configure:27163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:27545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 27167 "configure" +#line 27549 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -27196,14 +27578,14 @@ rm -f conftest* done if test -z "$THIS_LIBS"; then echo $ac_n "checking for db4 major version""... $ac_c" 1>&6 -echo "configure:27200: checking for db4 major version" >&5 +echo "configure:27582: checking for db4 major version" >&5 { echo "configure: error: Header contains different version" 1>&2; exit 1; } fi if test "4" = "4"; then echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6 -echo "configure:27205: checking for db4 minor version and patch level" >&5 +echo "configure:27587: checking for db4 minor version and patch level" >&5 cat > conftest.$ac_ext <<EOF -#line 27207 "configure" +#line 27589 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -27229,9 +27611,9 @@ rm -f conftest* fi if test "$ext_shared" = "yes"; then echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6 -echo "configure:27233: checking if dba can be used as shared extension" >&5 +echo "configure:27615: checking if dba can be used as shared extension" >&5 cat > conftest.$ac_ext <<EOF -#line 27235 "configure" +#line 27617 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -27396,7 +27778,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:27400: checking for $THIS_FULL_NAME support" >&5 +echo "configure:27782: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi @@ -27427,7 +27809,7 @@ if test "${with_db3+set}" = set; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:27431: checking for $THIS_FULL_NAME support" >&5 +echo "configure:27813: checking for $THIS_FULL_NAME support" >&5 if test -n "You cannot combine --with-db3 with --with-db4"; then { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; } fi @@ -27474,7 +27856,7 @@ echo "configure:27431: checking for $THIS_FULL_NAME support" >&5 LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 27478 "configure" +#line 27860 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -27485,11 +27867,11 @@ int main() { ; return 0; } EOF -if { (eval echo configure:27489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:27871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 27493 "configure" +#line 27875 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -27522,14 +27904,14 @@ rm -f conftest* done if test -z "$THIS_LIBS"; then echo $ac_n "checking for db3 major version""... $ac_c" 1>&6 -echo "configure:27526: checking for db3 major version" >&5 +echo "configure:27908: checking for db3 major version" >&5 { echo "configure: error: Header contains different version" 1>&2; exit 1; } fi if test "3" = "4"; then echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6 -echo "configure:27531: checking for db4 minor version and patch level" >&5 +echo "configure:27913: checking for db4 minor version and patch level" >&5 cat > conftest.$ac_ext <<EOF -#line 27533 "configure" +#line 27915 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -27555,9 +27937,9 @@ rm -f conftest* fi if test "$ext_shared" = "yes"; then echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6 -echo "configure:27559: checking if dba can be used as shared extension" >&5 +echo "configure:27941: checking if dba can be used as shared extension" >&5 cat > conftest.$ac_ext <<EOF -#line 27561 "configure" +#line 27943 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -27722,7 +28104,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:27726: checking for $THIS_FULL_NAME support" >&5 +echo "configure:28108: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi @@ -27753,7 +28135,7 @@ if test "${with_db2+set}" = set; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:27757: checking for $THIS_FULL_NAME support" >&5 +echo "configure:28139: checking for $THIS_FULL_NAME support" >&5 if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; } fi @@ -27800,7 +28182,7 @@ echo "configure:27757: checking for $THIS_FULL_NAME support" >&5 LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 27804 "configure" +#line 28186 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -27811,11 +28193,11 @@ int main() { ; return 0; } EOF -if { (eval echo configure:27815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:28197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 27819 "configure" +#line 28201 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -27848,14 +28230,14 @@ rm -f conftest* done if test -z "$THIS_LIBS"; then echo $ac_n "checking for db2 major version""... $ac_c" 1>&6 -echo "configure:27852: checking for db2 major version" >&5 +echo "configure:28234: checking for db2 major version" >&5 { echo "configure: error: Header contains different version" 1>&2; exit 1; } fi if test "2" = "4"; then echo $ac_n "checking for db4 minor version and patch level""... $ac_c" 1>&6 -echo "configure:27857: checking for db4 minor version and patch level" >&5 +echo "configure:28239: checking for db4 minor version and patch level" >&5 cat > conftest.$ac_ext <<EOF -#line 27859 "configure" +#line 28241 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -27881,9 +28263,9 @@ rm -f conftest* fi if test "$ext_shared" = "yes"; then echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6 -echo "configure:27885: checking if dba can be used as shared extension" >&5 +echo "configure:28267: checking if dba can be used as shared extension" >&5 cat > conftest.$ac_ext <<EOF -#line 27887 "configure" +#line 28269 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -28048,7 +28430,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:28052: checking for $THIS_FULL_NAME support" >&5 +echo "configure:28434: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi @@ -28071,7 +28453,7 @@ if test "${with_db1+set}" = set; then unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6 -echo "configure:28075: checking for DB1 in library" >&5 +echo "configure:28457: checking for DB1 in library" >&5 if test "$HAVE_DB4" = "1"; then THIS_VERSION=4 THIS_LIBS=$DB4_LIBS @@ -28119,7 +28501,7 @@ EOF fi echo "$ac_t""$THIS_LIBS" 1>&6 echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6 -echo "configure:28123: checking for DB1 in header" >&5 +echo "configure:28505: checking for DB1 in header" >&5 echo "$ac_t""$THIS_INCLUDE" 1>&6 if test -n "$THIS_INCLUDE"; then @@ -28129,7 +28511,7 @@ echo "configure:28123: checking for DB1 in header" >&5 LIBS="-l$THIS_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 28133 "configure" +#line 28515 "configure" #include "confdefs.h" #include "$THIS_INCLUDE" @@ -28140,7 +28522,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:28144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:28526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<EOF @@ -28292,7 +28674,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:28296: checking for $THIS_FULL_NAME support" >&5 +echo "configure:28678: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi @@ -28323,7 +28705,7 @@ if test "${with_dbm+set}" = set; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:28327: checking for $THIS_FULL_NAME support" >&5 +echo "configure:28709: checking for $THIS_FULL_NAME support" >&5 if test -n "You cannot combine --with-dbm with --with-qdbm"; then { echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; } fi @@ -28446,7 +28828,7 @@ echo "configure:28327: checking for $THIS_FULL_NAME support" >&5 done echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6 -echo "configure:28450: checking for dbminit in -l$LIB" >&5 +echo "configure:28832: checking for dbminit in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -28454,7 +28836,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 28458 "configure" +#line 28840 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -28465,7 +28847,7 @@ int main() { dbminit() ; return 0; } EOF -if { (eval echo configure:28469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:28851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -28485,7 +28867,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ext_shared=$save_ext_shared echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6 -echo "configure:28489: checking for DBM using GDBM" >&5 +echo "configure:28871: checking for DBM using GDBM" >&5 cat >> confdefs.h <<EOF #define DBM_INCLUDE_FILE "$THIS_INCLUDE" EOF @@ -28651,7 +29033,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:28655: checking for $THIS_FULL_NAME support" >&5 +echo "configure:29037: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi @@ -28797,7 +29179,7 @@ EOF done echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6 -echo "configure:28801: checking for cdb_read in -l$LIB" >&5 +echo "configure:29183: checking for cdb_read in -l$LIB" >&5 ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -28805,7 +29187,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 28809 "configure" +#line 29191 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -28816,7 +29198,7 @@ int main() { cdb_read() ; return 0; } EOF -if { (eval echo configure:28820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:29202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -29008,7 +29390,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:29012: checking for $THIS_FULL_NAME support" >&5 +echo "configure:29394: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi @@ -29062,7 +29444,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:29066: checking for $THIS_FULL_NAME support" >&5 +echo "configure:29448: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi @@ -29116,7 +29498,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 -echo "configure:29120: checking for $THIS_FULL_NAME support" >&5 +echo "configure:29502: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi @@ -29131,7 +29513,7 @@ echo "configure:29120: checking for $THIS_FULL_NAME support" >&5 echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6 -echo "configure:29135: checking whether to enable DBA interface" >&5 +echo "configure:29517: checking whether to enable DBA interface" >&5 if test "$HAVE_DBA" = "1"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -29445,7 +29827,7 @@ fi echo $ac_n "checking whether to enable dbase support""... $ac_c" 1>&6 -echo "configure:29449: checking whether to enable dbase support" >&5 +echo "configure:29831: checking whether to enable dbase support" >&5 # Check whether --enable-dbase or --disable-dbase was given. if test "${enable_dbase+set}" = set; then enableval="$enable_dbase" @@ -29780,7 +30162,7 @@ fi echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6 -echo "configure:29784: checking whether to enable DOM support" >&5 +echo "configure:30166: checking whether to enable DOM support" >&5 # Check whether --enable-dom or --disable-dom was given. if test "${enable_dom+set}" = set; then enableval="$enable_dom" @@ -29827,7 +30209,7 @@ if test -z "$PHP_LIBXML_DIR"; then echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:29831: checking libxml2 install dir" >&5 +echo "configure:30213: checking libxml2 install dir" >&5 # Check whether --with-libxml-dir or --without-libxml-dir was given. if test "${with_libxml_dir+set}" = set; then withval="$with_libxml_dir" @@ -29858,7 +30240,7 @@ if test "$PHP_DOM" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:29862: checking for xml2-config path" >&5 +echo "configure:30244: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -30015,7 +30397,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:30019: checking whether libxml build works" >&5 +echo "configure:30401: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -30031,7 +30413,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 30035 "configure" +#line 30417 "configure" #include "confdefs.h" @@ -30042,7 +30424,7 @@ else } EOF -if { (eval echo configure:30046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:30428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -30453,7 +30835,7 @@ fi echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6 -echo "configure:30457: checking whether to enable EXIF (metadata from images) support" >&5 +echo "configure:30839: checking whether to enable EXIF (metadata from images) support" >&5 # Check whether --enable-exif or --disable-exif was given. if test "${enable_exif+set}" = set; then enableval="$enable_exif" @@ -30788,7 +31170,7 @@ fi echo $ac_n "checking for FrontBase SQL92 (fbsql) support""... $ac_c" 1>&6 -echo "configure:30792: checking for FrontBase SQL92 (fbsql) support" >&5 +echo "configure:31174: checking for FrontBase SQL92 (fbsql) support" >&5 # Check whether --with-fbsql or --without-fbsql was given. if test "${with_fbsql+set}" = set; then withval="$with_fbsql" @@ -31282,7 +31664,7 @@ fi echo $ac_n "checking for FDF support""... $ac_c" 1>&6 -echo "configure:31286: checking for FDF support" >&5 +echo "configure:31668: checking for FDF support" >&5 # Check whether --with-fdftk or --without-fdftk was given. if test "${with_fdftk+set}" = set; then withval="$with_fdftk" @@ -31499,7 +31881,7 @@ EOF done echo $ac_n "checking for FDFOpen in -l$file""... $ac_c" 1>&6 -echo "configure:31503: checking for FDFOpen in -l$file" >&5 +echo "configure:31885: checking for FDFOpen in -l$file" >&5 ac_lib_var=`echo $file'_'FDFOpen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -31507,7 +31889,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$file $LIBS" cat > conftest.$ac_ext <<EOF -#line 31511 "configure" +#line 31893 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -31518,7 +31900,7 @@ int main() { FDFOpen() ; return 0; } EOF -if { (eval echo configure:31522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:31904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -31644,7 +32026,7 @@ fi done echo $ac_n "checking for FDFGetFDFVersion in -l$file""... $ac_c" 1>&6 -echo "configure:31648: checking for FDFGetFDFVersion in -l$file" >&5 +echo "configure:32030: checking for FDFGetFDFVersion in -l$file" >&5 ac_lib_var=`echo $file'_'FDFGetFDFVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -31652,7 +32034,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$file $LIBS" cat > conftest.$ac_ext <<EOF -#line 31656 "configure" +#line 32038 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -31663,7 +32045,7 @@ int main() { FDFGetFDFVersion() ; return 0; } EOF -if { (eval echo configure:31667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:32049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -32098,7 +32480,7 @@ fi echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6 -echo "configure:32102: checking whether to enable input filter support" >&5 +echo "configure:32484: checking whether to enable input filter support" >&5 # Check whether --enable-filter or --disable-filter was given. if test "${enable_filter+set}" = set; then enableval="$enable_filter" @@ -32144,7 +32526,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 -echo "configure:32148: checking pcre install prefix" >&5 +echo "configure:32530: checking pcre install prefix" >&5 # Check whether --with-pcre-dir or --without-pcre-dir was given. if test "${with_pcre_dir+set}" = set; then withval="$with_pcre_dir" @@ -32174,7 +32556,7 @@ if test "$PHP_FILTER" != "no"; then old_CPPFLAGS=$CPPFLAGS CPPFLAGS=$INCLUDES cat > conftest.$ac_ext <<EOF -#line 32178 "configure" +#line 32560 "configure" #include "confdefs.h" #include <main/php_config.h> @@ -32193,7 +32575,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 32197 "configure" +#line 32579 "configure" #include "confdefs.h" #include <main/php_config.h> @@ -32223,175 +32605,6 @@ rm -f conftest* CPPFLAGS=$old_CPPFLAGS fi - if test "$PHP_PCRE_REGEX" != "yes"; then - if test "$PHP_PCRE_REGEX" = "no" || test "$PHP_PCRE_REGEX" = "pecl"; then - case "$PHP_PCRE_DIR" in - yes|no) - PCRE_SEARCH_DIR="/usr/local /usr" - ;; - *) - PCRE_SEARCH_DIR="$PHP_PCRE_DIR" - ;; - esac - - for i in $PCRE_SEARCH_DIR; do - if test -f $i/include/pcre/pcre.h; then - PCRE_INCDIR=$i/include/pcre - break - elif test -f $i/include/pcre.h; then - PCRE_INCDIR=$i/include - break - elif test -f $i/pcre.h; then - PCRE_INCDIR=$i - break - fi - done - - if test -z "$PCRE_INCDIR"; then - { echo "configure: error: Could not find pcre.h anywhere under $PCRE_SEARCH_DIR" 1>&2; exit 1; } - fi - - for j in $PCRE_SEARCH_DIR/$PHP_LIBDIR $PCRE_SEARCH_DIR; do - if test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME; then - PCRE_LIBDIR=$j - break - fi - done - - if test -z "$PCRE_LIBDIR" ; then - { echo "configure: error: Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) anywhere under $PCRE_SEARCH_DIR" 1>&2; exit 1; } - fi - fi - - - - if test "$ext_shared" = "yes"; then - FILTER_SHARED_LIBADD="-lpcre $FILTER_SHARED_LIBADD" - if test -n "$PCRE_LIBDIR"; then - - if test "$PCRE_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PCRE_LIBDIR" != "/usr/lib"; then - - if test -z "$PCRE_LIBDIR" || echo "$PCRE_LIBDIR" | grep '^/' >/dev/null ; then - ai_p=$PCRE_LIBDIR - else - - ep_dir="`echo $PCRE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$PCRE_LIBDIR\"`" - fi - - - if test "$ext_shared" = "yes"; then - FILTER_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $FILTER_SHARED_LIBADD" - else - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" - - fi - - - fi - - fi - - fi - else - - - if test -n "$PCRE_LIBDIR"; then - - if test "$PCRE_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PCRE_LIBDIR" != "/usr/lib"; then - - if test -z "$PCRE_LIBDIR" || echo "$PCRE_LIBDIR" | grep '^/' >/dev/null ; then - ai_p=$PCRE_LIBDIR - else - - ep_dir="`echo $PCRE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$PCRE_LIBDIR\"`" - fi - - - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" - - fi - - - - fi - - fi - - - case pcre in - c|c_r|pthread*) ;; - *) - LIBS="-lpcre $LIBS" - ;; - esac - - - - - fi - - - - if test "$PCRE_INCDIR" != "/usr/include"; then - - if test -z "$PCRE_INCDIR" || echo "$PCRE_INCDIR" | grep '^/' >/dev/null ; then - ai_p=$PCRE_INCDIR - else - - ep_dir="`echo $PCRE_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$PCRE_INCDIR\"`" - fi - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "INCLUDEPATH$unique=set" - - if test ""; then - INCLUDES="-I$ai_p $INCLUDES" - else - INCLUDES="$INCLUDES -I$ai_p" - fi - - fi - - fi - - fi - ext_builddir=ext/filter ext_srcdir=$abs_srcdir/ext/filter @@ -32679,7 +32892,7 @@ EOF - for header_file in $ext_srcdir/php_filter.h; do + for header_file in ext/filter/php_filter.h; do unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` @@ -32695,13 +32908,32 @@ EOF done + + am_i_shared=$PHP_FILTER_SHARED + is_it_shared=$PHP_PCRE_SHARED + is_it_enabled=$PHP_PCRE + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then + { echo "configure: error: +You've configured extension filter to build statically, but it +depends on extension pcre, which you've configured to build shared. +You either need to build filter shared or build pcre statically for the +build to be successful. +" 1>&2; exit 1; } + fi + if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then + { echo "configure: error: +You've configured extension filter, which depends on extension pcre, +but you've either not enabled pcre, or have disabled it. +" 1>&2; exit 1; } + fi + fi echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6 -echo "configure:32705: checking whether to enable FTP support" >&5 +echo "configure:32937: checking whether to enable FTP support" >&5 # Check whether --enable-ftp or --disable-ftp was given. if test "${enable_ftp+set}" = set; then enableval="$enable_ftp" @@ -32747,7 +32979,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6 -echo "configure:32751: checking OpenSSL dir for FTP" >&5 +echo "configure:32983: checking OpenSSL dir for FTP" >&5 # Check whether --with-openssl-dir or --without-openssl-dir was given. if test "${with_openssl_dir+set}" = set; then withval="$with_openssl_dir" @@ -33077,7 +33309,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:33081: checking for $ac_word" >&5 +echo "configure:33313: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -33281,9 +33513,9 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:33285: checking for OpenSSL version" >&5 +echo "configure:33517: checking for OpenSSL version" >&5 cat > conftest.$ac_ext <<EOF -#line 33287 "configure" +#line 33519 "configure" #include "confdefs.h" #include <openssl/opensslv.h> @@ -33437,7 +33669,7 @@ rm -f conftest* done echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:33441: checking for CRYPTO_free in -lcrypto" >&5 +echo "configure:33673: checking for CRYPTO_free in -lcrypto" >&5 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -33445,7 +33677,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 33449 "configure" +#line 33681 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -33456,7 +33688,7 @@ int main() { CRYPTO_free() ; return 0; } EOF -if { (eval echo configure:33460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:33692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -33612,7 +33844,7 @@ fi done echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:33616: checking for SSL_CTX_set_ssl_version in -lssl" >&5 +echo "configure:33848: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -33620,7 +33852,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF -#line 33624 "configure" +#line 33856 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -33631,7 +33863,7 @@ int main() { SSL_CTX_set_ssl_version() ; return 0; } EOF -if { (eval echo configure:33635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:33867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -33748,7 +33980,7 @@ fi echo $ac_n "checking for GD support""... $ac_c" 1>&6 -echo "configure:33752: checking for GD support" >&5 +echo "configure:33984: checking for GD support" >&5 # Check whether --with-gd or --without-gd was given. if test "${with_gd+set}" = set; then withval="$with_gd" @@ -33795,7 +34027,7 @@ if test -z "$PHP_JPEG_DIR"; then echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6 -echo "configure:33799: checking for the location of libjpeg" >&5 +echo "configure:34031: checking for the location of libjpeg" >&5 # Check whether --with-jpeg-dir or --without-jpeg-dir was given. if test "${with_jpeg_dir+set}" = set; then withval="$with_jpeg_dir" @@ -33822,7 +34054,7 @@ if test -z "$PHP_PNG_DIR"; then echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6 -echo "configure:33826: checking for the location of libpng" >&5 +echo "configure:34058: checking for the location of libpng" >&5 # Check whether --with-png-dir or --without-png-dir was given. if test "${with_png_dir+set}" = set; then withval="$with_png_dir" @@ -33849,7 +34081,7 @@ if test -z "$PHP_ZLIB_DIR"; then echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:33853: checking for the location of libz" >&5 +echo "configure:34085: checking for the location of libz" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" @@ -33875,7 +34107,7 @@ fi echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6 -echo "configure:33879: checking for the location of libXpm" >&5 +echo "configure:34111: checking for the location of libXpm" >&5 # Check whether --with-xpm-dir or --without-xpm-dir was given. if test "${with_xpm_dir+set}" = set; then withval="$with_xpm_dir" @@ -33900,7 +34132,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking for FreeType 1.x support""... $ac_c" 1>&6 -echo "configure:33904: checking for FreeType 1.x support" >&5 +echo "configure:34136: checking for FreeType 1.x support" >&5 # Check whether --with-ttf or --without-ttf was given. if test "${with_ttf+set}" = set; then withval="$with_ttf" @@ -33921,11 +34153,11 @@ echo "$ac_t""$ext_output" 1>&6 - + echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6 -echo "configure:33929: checking for FreeType 2" >&5 +echo "configure:34161: checking for FreeType 2" >&5 # Check whether --with-freetype-dir or --without-freetype-dir was given. if test "${with_freetype_dir+set}" = set; then withval="$with_freetype_dir" @@ -33950,7 +34182,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking for T1lib support""... $ac_c" 1>&6 -echo "configure:33954: checking for T1lib support" >&5 +echo "configure:34186: checking for T1lib support" >&5 # Check whether --with-t1lib or --without-t1lib was given. if test "${with_t1lib+set}" = set; then withval="$with_t1lib" @@ -33975,7 +34207,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6 -echo "configure:33979: checking whether to enable truetype string function in GD" >&5 +echo "configure:34211: checking whether to enable truetype string function in GD" >&5 # Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given. if test "${enable_gd_native_ttf+set}" = set; then enableval="$enable_gd_native_ttf" @@ -34000,7 +34232,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6 -echo "configure:34004: checking whether to enable JIS-mapped Japanese font support in GD" >&5 +echo "configure:34236: checking whether to enable JIS-mapped Japanese font support in GD" >&5 # Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given. if test "${enable_gd_jis_conv+set}" = set; then enableval="$enable_gd_jis_conv" @@ -34042,6 +34274,8 @@ echo "$ac_t""$ext_output" 1>&6 + + if test "$PHP_GD" = "yes"; then GD_MODULE_TYPE=builtin extra_sources="libgd/gd.c libgd/gd_gd.c libgd/gd_gd2.c libgd/gd_io.c libgd/gd_io_dp.c \ @@ -34049,17 +34283,17 @@ if test "$PHP_GD" = "yes"; then libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \ libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \ libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c libgd/gd_gif_in.c \ - libgd/xbm.c libgd/gd_gif_out.c " + libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c" for ac_func in fabsf floorf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:34058: checking for $ac_func" >&5 +echo "configure:34292: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 34063 "configure" +#line 34297 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -34082,7 +34316,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:34086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:34320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -34108,7 +34342,30 @@ done test "$PHP_PNG_DIR" = "no" && PHP_PNG_DIR=yes - + + + if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then + if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then + PHP_ZLIB_DIR="$PHP_ZLIB_DIR" + PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" + elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then + PHP_ZLIB_DIR="$PHP_ZLIB_DIR" + PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" + else + { echo "configure: error: Can't find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } + fi + else + for i in /usr/local /usr; do + if test -f "$i/include/zlib/zlib.h"; then + PHP_ZLIB_DIR="$i" + PHP_ZLIB_INCDIR="$i/include/zlib" + elif test -f "$i/include/zlib.h"; then + PHP_ZLIB_DIR="$i" + PHP_ZLIB_INCDIR="$i/include" + fi + done + fi + if test "$PHP_GD_NATIVE_TTF" = "yes"; then cat >> confdefs.h <<\EOF @@ -34230,7 +34487,7 @@ EOF done echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:34234: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:34491: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -34238,7 +34495,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <<EOF -#line 34242 "configure" +#line 34499 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -34249,7 +34506,7 @@ int main() { jpeg_read_header() ; return 0; } EOF -if { (eval echo configure:34253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:34510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -34404,12 +34661,12 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_jpeg_jpeg_read_header - { echo "configure: error: Problem with libjpeg.(a|so). Please check config.log for more information." 1>&2; exit 1; } + { echo "configure: error: Problem with libjpeg.(a|so). Please check config.log for more information." 1>&2; exit 1; } fi - else + else echo "$ac_t""If configure fails try --with-jpeg-dir=<DIR>" 1>&6 fi @@ -34529,7 +34786,7 @@ fi done echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 -echo "configure:34533: checking for png_write_image in -lpng" >&5 +echo "configure:34790: checking for png_write_image in -lpng" >&5 ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -34537,7 +34794,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <<EOF -#line 34541 "configure" +#line 34798 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -34548,7 +34805,7 @@ int main() { png_write_image() ; return 0; } EOF -if { (eval echo configure:34552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:34809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -34799,13 +35056,13 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_png_png_write_image - { echo "configure: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." 1>&2; exit 1; } + { echo "configure: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." 1>&2; exit 1; } fi - else + else echo "$ac_t""If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" 1>&6 fi @@ -34925,7 +35182,7 @@ fi done echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 -echo "configure:34929: checking for XpmFreeXpmImage in -lXpm" >&5 +echo "configure:35186: checking for XpmFreeXpmImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -34933,7 +35190,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 34937 "configure" +#line 35194 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -34944,7 +35201,7 @@ int main() { XpmFreeXpmImage() ; return 0; } EOF -if { (eval echo configure:34948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:35205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -35195,12 +35452,12 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_Xpm_XpmFreeXpmImage - { echo "configure: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." 1>&2; exit 1; } + { echo "configure: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." 1>&2; exit 1; } fi - else + else echo "$ac_t""If configure fails try --with-xpm-dir=<DIR>" 1>&6 fi @@ -35214,7 +35471,7 @@ fi break fi done - + if test -n "$FREETYPE2_DIR" ; then @@ -35385,7 +35642,7 @@ EOF else { echo "configure: error: freetype2 not found!" 1>&2; exit 1; } fi - else + else echo "$ac_t""If configure fails try --with-freetype-dir=<DIR>" 1>&6 fi @@ -35547,7 +35804,7 @@ EOF else echo $ac_n "checking for FreeType 1 support""... $ac_c" 1>&6 -echo "configure:35551: checking for FreeType 1 support" >&5 +echo "configure:35808: checking for FreeType 1 support" >&5 echo "$ac_t""no - FreeType 2.x is to be used instead" 1>&6 fi fi @@ -35560,7 +35817,7 @@ echo "configure:35551: checking for FreeType 1 support" >&5 done if test -z "$GD_T1_DIR"; then - { echo "configure: error: Your t1lib distribution is not installed correctly. Please reinstall it." 1>&2; exit 1; } + { echo "configure: error: Your t1lib distribution is not installed correctly. Please reinstall it." 1>&2; exit 1; } fi @@ -35660,7 +35917,7 @@ echo "configure:35551: checking for FreeType 1 support" >&5 done echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 -echo "configure:35664: checking for T1_StrError in -lt1" >&5 +echo "configure:35921: checking for T1_StrError in -lt1" >&5 ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -35668,7 +35925,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lt1 $LIBS" cat > conftest.$ac_ext <<EOF -#line 35672 "configure" +#line 35929 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -35679,7 +35936,7 @@ int main() { T1_StrError() ; return 0; } EOF -if { (eval echo configure:35683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:35940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -35838,7 +36095,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_t1_T1_StrError - { echo "configure: error: Problem with libt1.(a|so). Please check config.log for more information." 1>&2; exit 1; } + { echo "configure: error: Problem with libt1.(a|so). Please check config.log for more information." 1>&2; exit 1; } fi @@ -35865,7 +36122,7 @@ EOF cat >> confdefs.h <<\EOF #define HAVE_LIBGD204 1 EOF - + cat >> confdefs.h <<\EOF #define HAVE_GD_IMAGESETTILE 1 EOF @@ -35919,6 +36176,10 @@ EOF EOF cat >> confdefs.h <<\EOF +#define HAVE_GD_FONTMUTEX 1 +EOF + + cat >> confdefs.h <<\EOF #define HAVE_GD_DYNAMIC_CTX_EX 1 EOF @@ -35945,7 +36206,7 @@ EOF GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" fi - + if test -n "$FREETYPE2_DIR"; then cat >> confdefs.h <<\EOF #define HAVE_GD_STRINGFT 1 @@ -35977,6 +36238,29 @@ else extra_sources="gdcache.c" + if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then + if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then + PHP_ZLIB_DIR="$PHP_ZLIB_DIR" + PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" + elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then + PHP_ZLIB_DIR="$PHP_ZLIB_DIR" + PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" + else + { echo "configure: error: Can't find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } + fi + else + for i in /usr/local /usr; do + if test -f "$i/include/zlib/zlib.h"; then + PHP_ZLIB_DIR="$i" + PHP_ZLIB_INCDIR="$i/include/zlib" + elif test -f "$i/include/zlib.h"; then + PHP_ZLIB_DIR="$i" + PHP_ZLIB_INCDIR="$i/include" + fi + done + fi + + if test "$PHP_GD_NATIVE_TTF" = "yes"; then cat >> confdefs.h <<\EOF #define USE_GD_IMGSTRTTF 1 @@ -36092,7 +36376,7 @@ EOF done echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:36096: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:36380: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36100,7 +36384,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <<EOF -#line 36104 "configure" +#line 36388 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -36111,7 +36395,7 @@ int main() { jpeg_read_header() ; return 0; } EOF -if { (eval echo configure:36115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:36399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -36266,12 +36550,12 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_jpeg_jpeg_read_header - { echo "configure: error: Problem with libjpeg.(a|so). Please check config.log for more information." 1>&2; exit 1; } + { echo "configure: error: Problem with libjpeg.(a|so). Please check config.log for more information." 1>&2; exit 1; } fi - else + else echo "$ac_t""If configure fails try --with-jpeg-dir=<DIR>" 1>&6 fi @@ -36391,7 +36675,7 @@ fi done echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 -echo "configure:36395: checking for png_write_image in -lpng" >&5 +echo "configure:36679: checking for png_write_image in -lpng" >&5 ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36399,7 +36683,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <<EOF -#line 36403 "configure" +#line 36687 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -36410,7 +36694,7 @@ int main() { png_write_image() ; return 0; } EOF -if { (eval echo configure:36414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:36698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -36661,13 +36945,13 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_png_png_write_image - { echo "configure: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." 1>&2; exit 1; } + { echo "configure: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." 1>&2; exit 1; } fi - else + else echo "$ac_t""If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" 1>&6 fi @@ -36787,7 +37071,7 @@ fi done echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 -echo "configure:36791: checking for XpmFreeXpmImage in -lXpm" >&5 +echo "configure:37075: checking for XpmFreeXpmImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -36795,7 +37079,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 36799 "configure" +#line 37083 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -36806,7 +37090,7 @@ int main() { XpmFreeXpmImage() ; return 0; } EOF -if { (eval echo configure:36810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:37094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -37057,12 +37341,12 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_Xpm_XpmFreeXpmImage - { echo "configure: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." 1>&2; exit 1; } + { echo "configure: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." 1>&2; exit 1; } fi - else + else echo "$ac_t""If configure fails try --with-xpm-dir=<DIR>" 1>&6 fi @@ -37076,7 +37360,7 @@ fi break fi done - + if test -n "$FREETYPE2_DIR" ; then @@ -37247,7 +37531,7 @@ EOF else { echo "configure: error: freetype2 not found!" 1>&2; exit 1; } fi - else + else echo "$ac_t""If configure fails try --with-freetype-dir=<DIR>" 1>&6 fi @@ -37409,7 +37693,7 @@ EOF else echo $ac_n "checking for FreeType 1 support""... $ac_c" 1>&6 -echo "configure:37413: checking for FreeType 1 support" >&5 +echo "configure:37697: checking for FreeType 1 support" >&5 echo "$ac_t""no - FreeType 2.x is to be used instead" 1>&6 fi fi @@ -37422,7 +37706,7 @@ echo "configure:37413: checking for FreeType 1 support" >&5 done if test -z "$GD_T1_DIR"; then - { echo "configure: error: Your t1lib distribution is not installed correctly. Please reinstall it." 1>&2; exit 1; } + { echo "configure: error: Your t1lib distribution is not installed correctly. Please reinstall it." 1>&2; exit 1; } fi @@ -37522,7 +37806,7 @@ echo "configure:37413: checking for FreeType 1 support" >&5 done echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 -echo "configure:37526: checking for T1_StrError in -lt1" >&5 +echo "configure:37810: checking for T1_StrError in -lt1" >&5 ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -37530,7 +37814,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lt1 $LIBS" cat > conftest.$ac_ext <<EOF -#line 37534 "configure" +#line 37818 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -37541,7 +37825,7 @@ int main() { T1_StrError() ; return 0; } EOF -if { (eval echo configure:37545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:37829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -37700,7 +37984,7 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_t1_T1_StrError - { echo "configure: error: Problem with libt1.(a|so). Please check config.log for more information." 1>&2; exit 1; } + { echo "configure: error: Problem with libt1.(a|so). Please check config.log for more information." 1>&2; exit 1; } fi @@ -37913,7 +38197,7 @@ EOF done echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6 -echo "configure:37917: checking for gdImageString16 in -lgd" >&5 +echo "configure:38201: checking for gdImageString16 in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -37921,7 +38205,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 37925 "configure" +#line 38209 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -37932,7 +38216,7 @@ int main() { gdImageString16() ; return 0; } EOF -if { (eval echo configure:37936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:38220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -38060,7 +38344,7 @@ fi done echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6 -echo "configure:38064: checking for gdImagePaletteCopy in -lgd" >&5 +echo "configure:38348: checking for gdImagePaletteCopy in -lgd" >&5 ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -38068,7 +38352,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 38072 "configure" +#line 38356 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -38079,7 +38363,7 @@ int main() { gdImagePaletteCopy() ; return 0; } EOF -if { (eval echo configure:38083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:38367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -38207,7 +38491,7 @@ fi done echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6 -echo "configure:38211: checking for gdImageCreateFromPng in -lgd" >&5 +echo "configure:38495: checking for gdImageCreateFromPng in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -38215,7 +38499,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 38219 "configure" +#line 38503 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -38226,7 +38510,7 @@ int main() { gdImageCreateFromPng() ; return 0; } EOF -if { (eval echo configure:38230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:38514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -38354,7 +38638,7 @@ fi done echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6 -echo "configure:38358: checking for gdImageCreateFromGif in -lgd" >&5 +echo "configure:38642: checking for gdImageCreateFromGif in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -38362,7 +38646,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 38366 "configure" +#line 38650 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -38373,7 +38657,7 @@ int main() { gdImageCreateFromGif() ; return 0; } EOF -if { (eval echo configure:38377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:38661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -38501,7 +38785,7 @@ fi done echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6 -echo "configure:38505: checking for gdImageGif in -lgd" >&5 +echo "configure:38789: checking for gdImageGif in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -38509,7 +38793,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 38513 "configure" +#line 38797 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -38520,7 +38804,7 @@ int main() { gdImageGif() ; return 0; } EOF -if { (eval echo configure:38524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:38808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -38648,7 +38932,7 @@ fi done echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6 -echo "configure:38652: checking for gdImageWBMP in -lgd" >&5 +echo "configure:38936: checking for gdImageWBMP in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -38656,7 +38940,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 38660 "configure" +#line 38944 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -38667,7 +38951,7 @@ int main() { gdImageWBMP() ; return 0; } EOF -if { (eval echo configure:38671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:38955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -38795,7 +39079,7 @@ fi done echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6 -echo "configure:38799: checking for gdImageCreateFromJpeg in -lgd" >&5 +echo "configure:39083: checking for gdImageCreateFromJpeg in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -38803,7 +39087,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 38807 "configure" +#line 39091 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -38814,7 +39098,7 @@ int main() { gdImageCreateFromJpeg() ; return 0; } EOF -if { (eval echo configure:38818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:39102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -38942,7 +39226,7 @@ fi done echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6 -echo "configure:38946: checking for gdImageCreateFromXpm in -lgd" >&5 +echo "configure:39230: checking for gdImageCreateFromXpm in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -38950,7 +39234,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 38954 "configure" +#line 39238 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -38961,7 +39245,7 @@ int main() { gdImageCreateFromXpm() ; return 0; } EOF -if { (eval echo configure:38965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:39249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -39089,7 +39373,7 @@ fi done echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6 -echo "configure:39093: checking for gdImageCreateFromGd2 in -lgd" >&5 +echo "configure:39377: checking for gdImageCreateFromGd2 in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39097,7 +39381,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 39101 "configure" +#line 39385 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -39108,7 +39392,7 @@ int main() { gdImageCreateFromGd2() ; return 0; } EOF -if { (eval echo configure:39112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:39396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -39236,7 +39520,7 @@ fi done echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6 -echo "configure:39240: checking for gdImageCreateTrueColor in -lgd" >&5 +echo "configure:39524: checking for gdImageCreateTrueColor in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39244,7 +39528,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 39248 "configure" +#line 39532 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -39255,7 +39539,7 @@ int main() { gdImageCreateTrueColor() ; return 0; } EOF -if { (eval echo configure:39259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:39543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -39383,7 +39667,7 @@ fi done echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6 -echo "configure:39387: checking for gdImageSetTile in -lgd" >&5 +echo "configure:39671: checking for gdImageSetTile in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39391,7 +39675,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 39395 "configure" +#line 39679 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -39402,7 +39686,7 @@ int main() { gdImageSetTile() ; return 0; } EOF -if { (eval echo configure:39406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:39690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -39530,7 +39814,7 @@ fi done echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6 -echo "configure:39534: checking for gdImageEllipse in -lgd" >&5 +echo "configure:39818: checking for gdImageEllipse in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39538,7 +39822,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 39542 "configure" +#line 39826 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -39549,7 +39833,7 @@ int main() { gdImageEllipse() ; return 0; } EOF -if { (eval echo configure:39553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:39837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -39677,7 +39961,7 @@ fi done echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6 -echo "configure:39681: checking for gdImageSetBrush in -lgd" >&5 +echo "configure:39965: checking for gdImageSetBrush in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39685,7 +39969,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 39689 "configure" +#line 39973 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -39696,7 +39980,7 @@ int main() { gdImageSetBrush() ; return 0; } EOF -if { (eval echo configure:39700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:39984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -39824,7 +40108,7 @@ fi done echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6 -echo "configure:39828: checking for gdImageStringTTF in -lgd" >&5 +echo "configure:40112: checking for gdImageStringTTF in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39832,7 +40116,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 39836 "configure" +#line 40120 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -39843,7 +40127,7 @@ int main() { gdImageStringTTF() ; return 0; } EOF -if { (eval echo configure:39847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:40131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -39971,7 +40255,7 @@ fi done echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6 -echo "configure:39975: checking for gdImageStringFT in -lgd" >&5 +echo "configure:40259: checking for gdImageStringFT in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -39979,7 +40263,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 39983 "configure" +#line 40267 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -39990,7 +40274,7 @@ int main() { gdImageStringFT() ; return 0; } EOF -if { (eval echo configure:39994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:40278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -40118,7 +40402,7 @@ fi done echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6 -echo "configure:40122: checking for gdImageStringFTEx in -lgd" >&5 +echo "configure:40406: checking for gdImageStringFTEx in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -40126,7 +40410,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 40130 "configure" +#line 40414 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -40137,7 +40421,7 @@ int main() { gdImageStringFTEx() ; return 0; } EOF -if { (eval echo configure:40141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:40425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -40265,7 +40549,7 @@ fi done echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6 -echo "configure:40269: checking for gdImageColorClosestHWB in -lgd" >&5 +echo "configure:40553: checking for gdImageColorClosestHWB in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -40273,7 +40557,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 40277 "configure" +#line 40561 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -40284,7 +40568,7 @@ int main() { gdImageColorClosestHWB() ; return 0; } EOF -if { (eval echo configure:40288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:40572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -40412,7 +40696,7 @@ fi done echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6 -echo "configure:40416: checking for gdImageColorResolve in -lgd" >&5 +echo "configure:40700: checking for gdImageColorResolve in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -40420,7 +40704,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 40424 "configure" +#line 40708 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -40431,7 +40715,7 @@ int main() { gdImageColorResolve() ; return 0; } EOF -if { (eval echo configure:40435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:40719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -40559,7 +40843,7 @@ fi done echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6 -echo "configure:40563: checking for gdImageGifCtx in -lgd" >&5 +echo "configure:40847: checking for gdImageGifCtx in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -40567,7 +40851,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 40571 "configure" +#line 40855 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -40578,7 +40862,7 @@ int main() { gdImageGifCtx() ; return 0; } EOF -if { (eval echo configure:40582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:40866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -40706,7 +40990,7 @@ fi done echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6 -echo "configure:40710: checking for gdCacheCreate in -lgd" >&5 +echo "configure:40994: checking for gdCacheCreate in -lgd" >&5 ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -40714,7 +40998,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 40718 "configure" +#line 41002 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -40725,7 +41009,7 @@ int main() { gdCacheCreate() ; return 0; } EOF -if { (eval echo configure:40729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:41013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -40853,7 +41137,7 @@ fi done echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6 -echo "configure:40857: checking for gdFontCacheShutdown in -lgd" >&5 +echo "configure:41141: checking for gdFontCacheShutdown in -lgd" >&5 ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -40861,7 +41145,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 40865 "configure" +#line 41149 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -40872,7 +41156,7 @@ int main() { gdFontCacheShutdown() ; return 0; } EOF -if { (eval echo configure:40876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:41160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -41000,7 +41284,7 @@ fi done echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6 -echo "configure:41004: checking for gdFreeFontCache in -lgd" >&5 +echo "configure:41288: checking for gdFreeFontCache in -lgd" >&5 ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -41008,7 +41292,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 41012 "configure" +#line 41296 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -41019,7 +41303,7 @@ int main() { gdFreeFontCache() ; return 0; } EOF -if { (eval echo configure:41023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:41307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -41146,8 +41430,155 @@ fi esac done + echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6 +echo "configure:41435: checking for gdFontCacheMutexSetup in -lgd" >&5 +ac_lib_var=`echo gd'_'gdFontCacheMutexSetup | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lgd $LIBS" +cat > conftest.$ac_ext <<EOF +#line 41443 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gdFontCacheMutexSetup(); + +int main() { +gdFontCacheMutexSetup() +; return 0; } +EOF +if { (eval echo configure:41454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF +#define HAVE_GD_FONTMUTEX 1 +EOF + + +else + echo "$ac_t""no" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_gd_gdFontCacheMutexSetup + + +fi + + + save_old_LDFLAGS=$LDFLAGS + ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " + + save_ext_shared=$ext_shared + ext_shared=yes + + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -pthread" + else + + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi + + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" + ;; + esac + + + fi + ;; + esac + + + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` + + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii + else + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi + + + if test "$ext_shared" = "yes"; then + LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS" + else + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + + fi + + fi + + ;; + esac + done + echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6 -echo "configure:41151: checking for gdNewDynamicCtxEx in -lgd" >&5 +echo "configure:41582: checking for gdNewDynamicCtxEx in -lgd" >&5 ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -41155,7 +41586,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 41159 "configure" +#line 41590 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -41166,7 +41597,7 @@ int main() { gdNewDynamicCtxEx() ; return 0; } EOF -if { (eval echo configure:41170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:41601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -41204,7 +41635,7 @@ fi { echo "configure: error: Unable to find gd.h anywhere under $PHP_GD" 1>&2; exit 1; } else { echo "configure: error: Unable to find libgd.(a|so) anywhere under $PHP_GD" 1>&2; exit 1; } - fi + fi if test -z "$GD_INCLUDE" || echo "$GD_INCLUDE" | grep '^/' >/dev/null ; then @@ -41221,7 +41652,7 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$GD_INCLUDE cat > conftest.$ac_ext <<EOF -#line 41225 "configure" +#line 41656 "configure" #include "confdefs.h" #include <gd.h> @@ -41235,7 +41666,7 @@ ctx->gd_free = 1; ; return 0; } EOF -if { (eval echo configure:41239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:41670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -41578,7 +42009,7 @@ EOF fi - + save_old_LDFLAGS=$LDFLAGS ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD " @@ -41674,7 +42105,7 @@ EOF done echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6 -echo "configure:41678: checking for gdImageCreate in -lgd" >&5 +echo "configure:42109: checking for gdImageCreate in -lgd" >&5 ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -41682,7 +42113,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <<EOF -#line 41686 "configure" +#line 42117 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -41693,7 +42124,7 @@ int main() { gdImageCreate() ; return 0; } EOF -if { (eval echo configure:41697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:42128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -41757,7 +42188,7 @@ fi echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6 -echo "configure:41761: checking for GNU gettext support" >&5 +echo "configure:42192: checking for GNU gettext support" >&5 # Check whether --with-gettext or --without-gettext was given. if test "${with_gettext+set}" = set; then withval="$with_gettext" @@ -41815,7 +42246,7 @@ if test "$PHP_GETTEXT" != "no"; then O_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:41819: checking for bindtextdomain in -lintl" >&5 +echo "configure:42250: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -41823,7 +42254,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 41827 "configure" +#line 42258 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -41834,7 +42265,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:41838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:42269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -41856,7 +42287,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6 -echo "configure:41860: checking for bindtextdomain in -lc" >&5 +echo "configure:42291: checking for bindtextdomain in -lc" >&5 ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -41864,7 +42295,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <<EOF -#line 41868 "configure" +#line 42299 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -41875,7 +42306,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:41879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:42310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -42327,7 +42758,7 @@ EOF echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:42331: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 +echo "configure:42762: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -42335,7 +42766,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 42339 "configure" +#line 42770 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -42346,7 +42777,7 @@ int main() { ngettext() ; return 0; } EOF -if { (eval echo configure:42350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:42781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -42370,7 +42801,7 @@ else fi echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:42374: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 +echo "configure:42805: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -42378,7 +42809,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 42382 "configure" +#line 42813 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -42389,7 +42820,7 @@ int main() { dngettext() ; return 0; } EOF -if { (eval echo configure:42393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:42824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -42413,7 +42844,7 @@ else fi echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:42417: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 +echo "configure:42848: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -42421,7 +42852,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 42425 "configure" +#line 42856 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -42432,7 +42863,7 @@ int main() { dcngettext() ; return 0; } EOF -if { (eval echo configure:42436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:42867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -42456,7 +42887,7 @@ else fi echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 -echo "configure:42460: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 +echo "configure:42891: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -42464,7 +42895,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 42468 "configure" +#line 42899 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -42475,7 +42906,7 @@ int main() { bind_textdomain_codeset() ; return 0; } EOF -if { (eval echo configure:42479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:42910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -42505,7 +42936,7 @@ fi echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6 -echo "configure:42509: checking for GNU MP support" >&5 +echo "configure:42940: checking for GNU MP support" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -42655,7 +43086,7 @@ if test "$PHP_GMP" != "no"; then done echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 -echo "configure:42659: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 +echo "configure:43090: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -42663,7 +43094,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <<EOF -#line 42667 "configure" +#line 43098 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -42674,7 +43105,7 @@ int main() { __gmp_randinit_lc_2exp_size() ; return 0; } EOF -if { (eval echo configure:42678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:43109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -42798,7 +43229,7 @@ else done echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 -echo "configure:42802: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 +echo "configure:43233: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -42806,7 +43237,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <<EOF -#line 42810 "configure" +#line 43241 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -42817,7 +43248,7 @@ int main() { gmp_randinit_lc_2exp_size() ; return 0; } EOF -if { (eval echo configure:42821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:43252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -43276,7 +43707,7 @@ fi echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6 -echo "configure:43280: checking whether to enable hash support" >&5 +echo "configure:43711: checking whether to enable hash support" >&5 # Check whether --enable-hash or --disable-hash was given. if test "${enable_hash+set}" = set; then enableval="$enable_hash" @@ -43326,7 +43757,7 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:43330: checking whether byte ordering is bigendian" >&5 +echo "configure:43761: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -43336,7 +43767,7 @@ else ac_cv_c_bigendian_php=unknown else cat > conftest.$ac_ext <<EOF -#line 43340 "configure" +#line 43771 "configure" #include "confdefs.h" int main(void) @@ -43352,7 +43783,7 @@ int main(void) } EOF -if { (eval echo configure:43356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:43787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian_php=yes else @@ -43377,7 +43808,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:43381: checking size of short" >&5 +echo "configure:43812: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -43385,7 +43816,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext <<EOF -#line 43389 "configure" +#line 43820 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -43396,7 +43827,7 @@ int main() return(0); } EOF -if { (eval echo configure:43400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:43831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -43416,7 +43847,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:43420: checking size of int" >&5 +echo "configure:43851: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -43424,7 +43855,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext <<EOF -#line 43428 "configure" +#line 43859 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -43435,7 +43866,7 @@ int main() return(0); } EOF -if { (eval echo configure:43439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:43870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -43455,7 +43886,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:43459: checking size of long" >&5 +echo "configure:43890: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -43463,7 +43894,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext <<EOF -#line 43467 "configure" +#line 43898 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -43474,7 +43905,7 @@ int main() return(0); } EOF -if { (eval echo configure:43478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:43909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -43494,7 +43925,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:43498: checking size of long long" >&5 +echo "configure:43929: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -43502,7 +43933,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext <<EOF -#line 43506 "configure" +#line 43937 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -43513,7 +43944,7 @@ int main() return(0); } EOF -if { (eval echo configure:43517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:43948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -43849,7 +44280,7 @@ fi echo $ac_n "checking for iconv support""... $ac_c" 1>&6 -echo "configure:43853: checking for iconv support" >&5 +echo "configure:44284: checking for iconv support" >&5 # Check whether --with-iconv or --without-iconv was given. if test "${with_iconv+set}" = set; then withval="$with_iconv" @@ -43911,12 +44342,12 @@ if test "$PHP_ICONV" != "no"; then if test "$PHP_ICONV" = "yes"; then echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:43915: checking for iconv" >&5 +echo "configure:44346: checking for iconv" >&5 if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 43920 "configure" +#line 44351 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char iconv(); below. */ @@ -43939,7 +44370,7 @@ iconv(); ; return 0; } EOF -if { (eval echo configure:43943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:44374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_iconv=yes" else @@ -43960,12 +44391,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv""... $ac_c" 1>&6 -echo "configure:43964: checking for libiconv" >&5 +echo "configure:44395: checking for libiconv" >&5 if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 43969 "configure" +#line 44400 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char libiconv(); below. */ @@ -43988,7 +44419,7 @@ libiconv(); ; return 0; } EOF -if { (eval echo configure:43992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:44423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_libiconv=yes" else @@ -44143,7 +44574,7 @@ EOF done echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 -echo "configure:44147: checking for libiconv in -l$iconv_lib_name" >&5 +echo "configure:44578: checking for libiconv in -l$iconv_lib_name" >&5 ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -44151,7 +44582,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$iconv_lib_name $LIBS" cat > conftest.$ac_ext <<EOF -#line 44155 "configure" +#line 44586 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -44162,7 +44593,7 @@ int main() { libiconv() ; return 0; } EOF -if { (eval echo configure:44166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:44597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -44295,7 +44726,7 @@ else done echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 -echo "configure:44299: checking for iconv in -l$iconv_lib_name" >&5 +echo "configure:44730: checking for iconv in -l$iconv_lib_name" >&5 ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -44303,7 +44734,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$iconv_lib_name $LIBS" cat > conftest.$ac_ext <<EOF -#line 44307 "configure" +#line 44738 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -44314,7 +44745,7 @@ int main() { iconv() ; return 0; } EOF -if { (eval echo configure:44318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:44749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -44524,16 +44955,16 @@ else fi echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6 -echo "configure:44528: checking if iconv is glibc's" >&5 +echo "configure:44959: checking if iconv is glibc's" >&5 cat > conftest.$ac_ext <<EOF -#line 44530 "configure" +#line 44961 "configure" #include "confdefs.h" #include <gnu/libc-version.h> int main() { gnu_get_libc_version(); ; return 0; } EOF -if { (eval echo configure:44537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:44968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -44551,14 +44982,17 @@ rm -f conftest* if test -z "$iconv_impl_name"; then echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6 -echo "configure:44555: checking if using GNU libiconv" >&5 +echo "configure:44986: checking if using GNU libiconv" >&5 php_iconv_old_ld="$LDFLAGS" LDFLAGS="-liconv $LDFLAGS" if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + + echo "$ac_t""no" 1>&6 + LDFLAGS="$php_iconv_old_ld" + else cat > conftest.$ac_ext <<EOF -#line 44562 "configure" +#line 44996 "configure" #include "confdefs.h" #include <$PHP_ICONV_H_PATH> @@ -44568,7 +45002,7 @@ int main() { } EOF -if { (eval echo configure:44572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:45006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -44590,16 +45024,16 @@ fi if test -z "$iconv_impl_name"; then echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6 -echo "configure:44594: checking if iconv is Konstantin Chuguev's" >&5 +echo "configure:45028: checking if iconv is Konstantin Chuguev's" >&5 cat > conftest.$ac_ext <<EOF -#line 44596 "configure" +#line 45030 "configure" #include "confdefs.h" #include <iconv.h> int main() { iconv_ccs_init(NULL, NULL); ; return 0; } EOF -if { (eval echo configure:44603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:45037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -44766,7 +45200,7 @@ EOF esac echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6 -echo "configure:44770: checking if iconv supports errno" >&5 +echo "configure:45204: checking if iconv supports errno" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""no" 1>&6 @@ -44780,7 +45214,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 44784 "configure" +#line 45218 "configure" #include "confdefs.h" #include <$PHP_ICONV_H_PATH> @@ -44801,7 +45235,7 @@ int main() { } EOF -if { (eval echo configure:44805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:45239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -44833,9 +45267,9 @@ fi echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6 -echo "configure:44837: checking if your cpp allows macro usage in include lines" >&5 +echo "configure:45271: checking if your cpp allows macro usage in include lines" >&5 cat > conftest.$ac_ext <<EOF -#line 44839 "configure" +#line 45273 "configure" #include "confdefs.h" #define FOO <$PHP_ICONV_H_PATH> @@ -44845,7 +45279,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:44849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:45283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -45189,7 +45623,7 @@ fi echo $ac_n "checking for IMAP support""... $ac_c" 1>&6 -echo "configure:45193: checking for IMAP support" >&5 +echo "configure:45627: checking for IMAP support" >&5 # Check whether --with-imap or --without-imap was given. if test "${with_imap+set}" = set; then withval="$with_imap" @@ -45235,7 +45669,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6 -echo "configure:45239: checking for IMAP Kerberos support" >&5 +echo "configure:45673: checking for IMAP Kerberos support" >&5 # Check whether --with-kerberos or --without-kerberos was given. if test "${with_kerberos+set}" = set; then withval="$with_kerberos" @@ -45260,7 +45694,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6 -echo "configure:45264: checking for IMAP SSL support" >&5 +echo "configure:45698: checking for IMAP SSL support" >&5 # Check whether --with-imap-ssl or --without-imap-ssl was given. if test "${with_imap_ssl+set}" = set; then withval="$with_imap_ssl" @@ -45656,7 +46090,7 @@ EOF done cat > conftest.$ac_ext <<EOF -#line 45660 "configure" +#line 46094 "configure" #include "confdefs.h" #include <$IMAP_INC_DIR/mail.h> EOF @@ -45672,29 +46106,104 @@ EOF fi rm -f conftest* - - cat > conftest.$ac_ext <<EOF -#line 45678 "configure" + + old_CFLAGS=$CFLAGS + CFLAGS="-I$IMAP_INC_DIR" + echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6 +echo "configure:46114: checking for utf8_mime2text signature" >&5 +if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 46119 "configure" #include "confdefs.h" -#include <$IMAP_INC_DIR/mail.h> + +#include <stdio.h> +#include <c-client.h> + +int main() { + + SIZEDTEXT *src, *dst; + utf8_mime2text(src, dst); + +; return 0; } EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "mail_append_set" >/dev/null 2>&1; then +if { (eval echo configure:46132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* + ac_cv_utf8_mime2text=old + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + ac_cv_utf8_mime2text=new + +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_utf8_mime2text" 1>&6 + if test "$ac_cv_utf8_mime2text" = "new"; then cat >> confdefs.h <<\EOF #define HAVE_NEW_MIME2TEXT 1 EOF - + fi + CFLAGS=$old_CFLAGS + + old_CFLAGS=$CFLAGS + CFLAGS="-I$IMAP_INC_DIR" + echo $ac_n "checking for U8T_CANONICAL""... $ac_c" 1>&6 +echo "configure:46161: checking for U8T_CANONICAL" >&5 +if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 46166 "configure" +#include "confdefs.h" + +#include <c-client.h> + +int main() { + + int i = U8T_CANONICAL; + +; return 0; } +EOF +if { (eval echo configure:46177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + ac_cv_u8t_canonical=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + ac_cv_u8t_canonical=no + fi rm -f conftest* + +fi +echo "$ac_t""$ac_cv_u8t_canonical" 1>&6 + CFLAGS=$old_CFLAGS + + if test "$ac_cv_u8t_canonical" = "no" && test "$ac_cv_utf8_mime2text" = "new"; then + { echo "configure: error: utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." 1>&2; exit 1; } + fi + if test "$ac_cv_u8t_canonical" = "yes" && test "$ac_cv_utf8_mime2text" = "old"; then + { echo "configure: error: utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." 1>&2; exit 1; } + fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$IMAP_INC_DIR cat > conftest.$ac_ext <<EOF -#line 45698 "configure" +#line 46207 "configure" #include "confdefs.h" #include "imap4r1.h" @@ -45812,7 +46321,7 @@ rm -f conftest* done echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 -echo "configure:45816: checking for pam_start in -lpam" >&5 +echo "configure:46325: checking for pam_start in -lpam" >&5 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -45820,7 +46329,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpam $LIBS" cat > conftest.$ac_ext <<EOF -#line 45824 "configure" +#line 46333 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -45831,7 +46340,7 @@ int main() { pam_start() ; return 0; } EOF -if { (eval echo configure:45835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:46344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -45985,7 +46494,7 @@ fi done echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:45989: checking for crypt in -lcrypt" >&5 +echo "configure:46498: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -45993,7 +46502,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 45997 "configure" +#line 46506 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -46004,7 +46513,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:46008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:46517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -46207,7 +46716,7 @@ fi # Extract the first word of "krb5-config", so it can be a program name with args. set dummy krb5-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:46211: checking for $ac_word" >&5 +echo "configure:46720: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -46574,7 +47083,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 46578 "configure" +#line 47087 "configure" #include "confdefs.h" #include <$IMAP_INC_DIR/linkage.h> EOF @@ -46594,6 +47103,9 @@ rm -f conftest* if test "$PHP_IMAP_SSL" != "no"; then + if test "$PHP_OPENSSL" = ""; then + PHP_OPENSSL='no' + fi found_openssl=no unset OPENSSL_INCDIR @@ -46612,7 +47124,7 @@ rm -f conftest* # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:46616: checking for $ac_word" >&5 +echo "configure:47128: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -46816,9 +47328,9 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:46820: checking for OpenSSL version" >&5 +echo "configure:47332: checking for OpenSSL version" >&5 cat > conftest.$ac_ext <<EOF -#line 46822 "configure" +#line 47334 "configure" #include "confdefs.h" #include <openssl/opensslv.h> @@ -46972,7 +47484,7 @@ rm -f conftest* done echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:46976: checking for CRYPTO_free in -lcrypto" >&5 +echo "configure:47488: checking for CRYPTO_free in -lcrypto" >&5 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -46980,7 +47492,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 46984 "configure" +#line 47496 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -46991,7 +47503,7 @@ int main() { CRYPTO_free() ; return 0; } EOF -if { (eval echo configure:46995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:47507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -47147,7 +47659,7 @@ fi done echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:47151: checking for SSL_CTX_set_ssl_version in -lssl" >&5 +echo "configure:47663: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -47155,7 +47667,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF -#line 47159 "configure" +#line 47671 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -47166,7 +47678,7 @@ int main() { SSL_CTX_set_ssl_version() ; return 0; } EOF -if { (eval echo configure:47170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:47682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -47284,7 +47796,7 @@ else elif test -f "$IMAP_INC_DIR/linkage.c"; then cat > conftest.$ac_ext <<EOF -#line 47288 "configure" +#line 47800 "configure" #include "confdefs.h" #include <$IMAP_INC_DIR/linkage.c> EOF @@ -47315,7 +47827,7 @@ rm -f conftest* else cat > conftest.$ac_ext <<EOF -#line 47319 "configure" +#line 47831 "configure" #include "confdefs.h" @@ -47342,7 +47854,7 @@ else } EOF -if { (eval echo configure:47346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:47858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -47369,7 +47881,7 @@ fi echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6 -echo "configure:47373: checking whether build with IMAP works" >&5 +echo "configure:47885: checking whether build with IMAP works" >&5 old_LIBS=$LIBS @@ -47380,7 +47892,7 @@ echo "configure:47373: checking whether build with IMAP works" >&5 else cat > conftest.$ac_ext <<EOF -#line 47384 "configure" +#line 47896 "configure" #include "confdefs.h" @@ -47407,7 +47919,7 @@ else } EOF -if { (eval echo configure:47411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:47923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -47437,621 +47949,8 @@ fi -echo $ac_n "checking for Informix support""... $ac_c" 1>&6 -echo "configure:47442: checking for Informix support" >&5 -# Check whether --with-informix or --without-informix was given. -if test "${with_informix+set}" = set; then - withval="$with_informix" - PHP_INFORMIX=$withval -else - - PHP_INFORMIX=no - - if test "$PHP_ENABLE_ALL" && test "yes" = "yes"; then - PHP_INFORMIX=$PHP_ENABLE_ALL - fi - -fi - - - -ext_output="yes, shared" -ext_shared=yes -case $PHP_INFORMIX in -shared,*) - PHP_INFORMIX=`echo "$PHP_INFORMIX"|$SED 's/^shared,//'` - ;; -shared) - PHP_INFORMIX=yes - ;; -no) - ext_output=no - ext_shared=no - ;; -*) - ext_output=yes - ext_shared=no - ;; -esac - - - -echo "$ac_t""$ext_output" 1>&6 - - - - -if test "$PHP_INFORMIX" != "no"; then - - if test "$INFORMIXDIR" = ""; then - { echo "configure: error: INFORMIXDIR environment variable is not set." 1>&2; exit 1; } - fi - - if test "$PHP_INFORMIX" = "yes"; then - IFX_INCLUDE=-I$INFORMIXDIR/incl/esql - - if test "$INFORMIXDIR/lib" != "/usr/$PHP_LIBDIR" && test "$INFORMIXDIR/lib" != "/usr/lib"; then - - if test -z "$INFORMIXDIR/lib" || echo "$INFORMIXDIR/lib" | grep '^/' >/dev/null ; then - ai_p=$INFORMIXDIR/lib - else - - ep_dir="`echo $INFORMIXDIR/lib|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$INFORMIXDIR/lib\"`" - fi - - - if test "$ext_shared" = "yes"; then - INFORMIX_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $INFORMIX_SHARED_LIBADD" - else - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" - - fi - - - fi - - fi - - - if test "$INFORMIXDIR/lib/esql" != "/usr/$PHP_LIBDIR" && test "$INFORMIXDIR/lib/esql" != "/usr/lib"; then - - if test -z "$INFORMIXDIR/lib/esql" || echo "$INFORMIXDIR/lib/esql" | grep '^/' >/dev/null ; then - ai_p=$INFORMIXDIR/lib/esql - else - - ep_dir="`echo $INFORMIXDIR/lib/esql|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$INFORMIXDIR/lib/esql\"`" - fi - - - if test "$ext_shared" = "yes"; then - INFORMIX_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $INFORMIX_SHARED_LIBADD" - else - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" - - fi - - - fi - - fi - - else - if test "$PHP_INFORMIX" != "$INFORMIXDIR"; then - { echo "configure: error: Specified Informix base install directory is different than your INFORMIXDIR environment variable." 1>&2; exit 1; } - fi - IFX_INCLUDE=-I$PHP_INFORMIX/incl/esql - - if test "$PHP_INFORMIX/lib" != "/usr/$PHP_LIBDIR" && test "$PHP_INFORMIX/lib" != "/usr/lib"; then - - if test -z "$PHP_INFORMIX/lib" || echo "$PHP_INFORMIX/lib" | grep '^/' >/dev/null ; then - ai_p=$PHP_INFORMIX/lib - else - - ep_dir="`echo $PHP_INFORMIX/lib|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$PHP_INFORMIX/lib\"`" - fi - - - if test "$ext_shared" = "yes"; then - INFORMIX_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $INFORMIX_SHARED_LIBADD" - else - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" - - fi - - - fi - - fi - - - if test "$PHP_INFORMIX/lib/esql" != "/usr/$PHP_LIBDIR" && test "$PHP_INFORMIX/lib/esql" != "/usr/lib"; then - - if test -z "$PHP_INFORMIX/lib/esql" || echo "$PHP_INFORMIX/lib/esql" | grep '^/' >/dev/null ; then - ai_p=$PHP_INFORMIX/lib/esql - else - - ep_dir="`echo $PHP_INFORMIX/lib/esql|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$PHP_INFORMIX/lib/esql\"`" - fi - - - if test "$ext_shared" = "yes"; then - INFORMIX_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $INFORMIX_SHARED_LIBADD" - else - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" - - fi - - - fi - - fi - - fi - - if test "$enable_experimental_zts" = "yes"; then - IFX_ESQL_FLAGS="-thread" - CPPFLAGS="$CPPFLAGS -DIFX_THREAD" - else - IFX_ESQL_FLAGS="" - fi - - IFX_LIBS=`THREADLIB=POSIX $INFORMIXDIR/bin/esql $IFX_ESQL_FLAGS -libs` - IFX_LIBS=`echo $IFX_LIBS | sed -e 's/Libraries to be used://g' -e 's/esql: error -55923: No source or object file\.//g'` - - case "$host_alias" in - *aix*) - CPPFLAGS="$CPPFLAGS -D__H_LOCALEDEF";; - esac - - echo $ac_n "checking Informix version""... $ac_c" 1>&6 -echo "configure:47664: checking Informix version" >&5 - IFX_IBM_VERSION=`$INFORMIXDIR/bin/esql -V | grep "IBM Informix-ESQL Version" | sed -ne '1 s/\(.*\)ESQL Version \([0-9]*\)\.\([0-9]*\).*/\2\3/p'` - IFX_VERSION=`$INFORMIXDIR/bin/esql -V | grep "ESQL Version" | sed -ne '1 s/\(.*\)ESQL Version \([0-9]*\)\.\([0-9]*\).*/\2\3/p'` - - if test "$IFX_IBM_VERSION"; then - if test $IFX_IBM_VERSION -ge "290" && test $IFX_IBM_VERSION -lt "300"; then - IFX_VERSION=960 - else - IFX_VERSION=$IFX_IBM_VERSION - fi - echo "$ac_t""IBM: $IFX_VERSION" 1>&6 - else - echo "$ac_t""$IFX_VERSION" 1>&6 - fi - - cat >> confdefs.h <<EOF -#define IFX_VERSION $IFX_VERSION -EOF - - - if test $IFX_VERSION -ge 900; then - cat >> confdefs.h <<\EOF -#define HAVE_IFX_IUS 1 -EOF - - IFX_ESQL_FLAGS="$IFX_ESQL_FLAGS -EDHAVE_IFX_IUS" - else - IFX_ESQL_FLAGS="$IFX_ESQL_FLAGS -EUHAVE_IFX_IUS" - fi - - - ext_builddir=ext/informix - ext_srcdir=$abs_srcdir/ext/informix - - ac_extra=`echo "$IFX_INCLUDE"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_INFORMIX_SHARED=no - - - case ext/informix in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/informix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/informix/"; ac_bdir="ext/informix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - - - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta - b_cxx_meta=$php_cxx_meta - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo - - - old_IFS=$IFS - for ac_src in ifx.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - cat >>Makefile.objects<<EOF -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src - $ac_comp -EOF - done - - - EXT_STATIC="$EXT_STATIC informix" - if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC informix" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_INFORMIX_SHARED=yes - - case ext/informix in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/informix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/informix/"; ac_bdir="ext/informix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - - - b_c_pre=$shared_c_pre - b_cxx_pre=$shared_cxx_pre - b_c_meta=$shared_c_meta - b_cxx_meta=$shared_cxx_meta - b_c_post=$shared_c_post - b_cxx_post=$shared_cxx_post - b_lo=$shared_lo - - - old_IFS=$IFS - for ac_src in ifx.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - shared_objects_informix="$shared_objects_informix $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - cat >>Makefile.objects<<EOF -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src - $ac_comp -EOF - done - - case $host_alias in - *netware*) - - install_modules="install-modules" - - case $host_alias in - *aix*) - suffix=so - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpinformix.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_informix) $(PHPINFORMIX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpinformix.so '$ext_builddir'/phpinformix.so' - ;; - *netware*) - suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_informix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPINFORMIX, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_informix) $(PHPINFORMIX_SHARED_LIBADD)' - ;; - esac - - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpinformix.$suffix" - - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_informix" - - cat >>Makefile.objects<<EOF -\$(phplibdir)/phpinformix.$suffix: $ext_builddir/phpinformix.$suffix - \$(LIBTOOL) --mode=install cp $ext_builddir/phpinformix.$suffix \$(phplibdir) - -$ext_builddir/phpinformix.$suffix: \$(shared_objects_informix) \$(PHPINFORMIX_SHARED_DEPENDENCIES) - $link_cmd - -EOF - - ;; - *) - - install_modules="install-modules" - - case $host_alias in - *aix*) - suffix=so - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/informix.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_informix) $(INFORMIX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/informix.so '$ext_builddir'/informix.so' - ;; - *netware*) - suffix=nlm - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_informix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(INFORMIX, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_informix) $(INFORMIX_SHARED_LIBADD)' - ;; - esac - - PHP_MODULES="$PHP_MODULES \$(phplibdir)/informix.$suffix" - - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_informix" - - cat >>Makefile.objects<<EOF -\$(phplibdir)/informix.$suffix: $ext_builddir/informix.$suffix - \$(LIBTOOL) --mode=install cp $ext_builddir/informix.$suffix \$(phplibdir) - -$ext_builddir/informix.$suffix: \$(shared_objects_informix) \$(INFORMIX_SHARED_DEPENDENCIES) - $link_cmd - -EOF - - ;; - esac - cat >> confdefs.h <<EOF -#define COMPILE_DL_INFORMIX 1 -EOF - - fi - fi - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then - PHP_INFORMIX_SHARED=no - if test "$PHP_SAPI" = "cgi"; then - - - case ext/informix in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/informix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/informix/"; ac_bdir="ext/informix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - - - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta - b_cxx_meta=$php_cxx_meta - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo - - - old_IFS=$IFS - for ac_src in ifx.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - cat >>Makefile.objects<<EOF -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src - $ac_comp -EOF - done - - - EXT_STATIC="$EXT_STATIC informix" - else - - - case ext/informix in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/informix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/informix/"; ac_bdir="ext/informix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - - - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta - b_cxx_meta=$php_cxx_meta - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo - - - old_IFS=$IFS - for ac_src in ifx.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - cat >>Makefile.objects<<EOF -$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src - $ac_comp -EOF - done - - - fi - EXT_CLI_STATIC="$EXT_CLI_STATIC informix" - fi - - - BUILD_DIR="$BUILD_DIR $ext_builddir" - - - - if test "$ext_builddir" = "."; then - PHP_PECL_EXTENSION=informix - - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - - fi - - - src=$ext_srcdir/Makefile.frag - ac_srcdir=$ext_srcdir - ac_builddir=$ext_builddir - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments - - - for i in $IFX_LIBS; do - case "$i" in - *.o) - DLIBS="$DLIBS $i" - ;; - -lm) - ;; - -lc) - ;; - -l*) - lib=`echo $i | cut -c 3-` - - - case $lib in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then - INFORMIX_SHARED_LIBADD="$INFORMIX_SHARED_LIBADD -l$lib" - else - - - case $lib in - c|c_r|pthread*) ;; - *) - DLIBS="$DLIBS -l$lib" - ;; - esac - - - fi - ;; - esac - - - ;; - *.a) - case "`uname -s 2>/dev/null`" in - UnixWare | SCO_SV | UNIX_SV) - DLIBS="$DLIBS $i" - ;; - *) - ac_dir="`echo $i|sed 's#[^/]*$##;s#\/$##'`" - ac_lib="`echo $i|sed 's#^/.*/lib##g;s#\.a##g'`" - DLIBS="$DLIBS -L$ac_dir -l$ac_lib" - ;; - esac - ;; - esac - done - - - PHP_VAR_SUBST="$PHP_VAR_SUBST INFORMIX_SHARED_LIBADD" - - - PHP_VAR_SUBST="$PHP_VAR_SUBST INFORMIXDIR" - - - PHP_VAR_SUBST="$PHP_VAR_SUBST IFX_ESQL_FLAGS" - - cat >> confdefs.h <<\EOF -#define HAVE_IFX 1 -EOF - - - if test "$ext_shared" = "yes"; then - with_tags= - fi -fi - - - - echo $ac_n "checking for InterBase support""... $ac_c" 1>&6 -echo "configure:48055: checking for InterBase support" >&5 +echo "configure:47954: checking for InterBase support" >&5 # Check whether --with-interbase or --without-interbase was given. if test "${with_interbase+set}" = set; then withval="$with_interbase" @@ -48200,7 +48099,7 @@ if test "$PHP_INTERBASE" != "no"; then done echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 -echo "configure:48204: checking for isc_detach_database in -lfbclient" >&5 +echo "configure:48103: checking for isc_detach_database in -lfbclient" >&5 ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -48208,7 +48107,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfbclient $LIBS" cat > conftest.$ac_ext <<EOF -#line 48212 "configure" +#line 48111 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -48219,7 +48118,7 @@ int main() { isc_detach_database() ; return 0; } EOF -if { (eval echo configure:48223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:48122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -48345,7 +48244,7 @@ else done echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 -echo "configure:48349: checking for isc_detach_database in -lgds" >&5 +echo "configure:48248: checking for isc_detach_database in -lgds" >&5 ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -48353,7 +48252,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgds $LIBS" cat > conftest.$ac_ext <<EOF -#line 48357 "configure" +#line 48256 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -48364,7 +48263,7 @@ int main() { isc_detach_database() ; return 0; } EOF -if { (eval echo configure:48368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:48267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -48490,7 +48389,7 @@ else done echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 -echo "configure:48494: checking for isc_detach_database in -lib_util" >&5 +echo "configure:48393: checking for isc_detach_database in -lib_util" >&5 ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -48498,7 +48397,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lib_util $LIBS" cat > conftest.$ac_ext <<EOF -#line 48502 "configure" +#line 48401 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -48509,7 +48408,7 @@ int main() { isc_detach_database() ; return 0; } EOF -if { (eval echo configure:48513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:48412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -48973,7 +48872,7 @@ fi echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6 -echo "configure:48977: checking whether to enable JavaScript Object Serialization support" >&5 +echo "configure:48876: checking whether to enable JavaScript Object Serialization support" >&5 # Check whether --enable-json or --disable-json was given. if test "${enable_json+set}" = set; then enableval="$enable_json" @@ -49022,12 +48921,12 @@ if test "$PHP_JSON" != "no"; then EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:49026: checking for ANSI C header files" >&5 +echo "configure:48925: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 49031 "configure" +#line 48930 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -49035,7 +48934,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:49039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:48938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -49052,7 +48951,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 49056 "configure" +#line 48955 "configure" #include "confdefs.h" #include <string.h> EOF @@ -49070,7 +48969,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 49074 "configure" +#line 48973 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -49091,7 +48990,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 49095 "configure" +#line 48994 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -49102,7 +49001,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:49106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:49005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -49422,7 +49321,7 @@ fi echo $ac_n "checking for LDAP support""... $ac_c" 1>&6 -echo "configure:49426: checking for LDAP support" >&5 +echo "configure:49325: checking for LDAP support" >&5 # Check whether --with-ldap or --without-ldap was given. if test "${with_ldap+set}" = set; then withval="$with_ldap" @@ -49468,7 +49367,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6 -echo "configure:49472: checking for LDAP Cyrus SASL support" >&5 +echo "configure:49371: checking for LDAP Cyrus SASL support" >&5 # Check whether --with-ldap-sasl or --without-ldap-sasl was given. if test "${with_ldap_sasl+set}" = set; then withval="$with_ldap_sasl" @@ -51783,19 +51682,19 @@ EOF LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD" echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6 -echo "configure:51787: checking for 3 arg ldap_set_rebind_proc" >&5 +echo "configure:51686: checking for 3 arg ldap_set_rebind_proc" >&5 if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 51792 "configure" +#line 51691 "configure" #include "confdefs.h" #include <ldap.h> int main() { ldap_set_rebind_proc(0,0,0) ; return 0; } EOF -if { (eval echo configure:51799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:51698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_3arg_setrebindproc=yes else @@ -51818,12 +51717,12 @@ EOF for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:51822: checking for $ac_func" >&5 +echo "configure:51721: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 51827 "configure" +#line 51726 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -51846,7 +51745,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:51850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:51749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -52007,7 +51906,7 @@ EOF done echo $ac_n "checking for sasl_version in -lldap""... $ac_c" 1>&6 -echo "configure:52011: checking for sasl_version in -lldap" >&5 +echo "configure:51910: checking for sasl_version in -lldap" >&5 ac_lib_var=`echo ldap'_'sasl_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -52015,7 +51914,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lldap $LIBS" cat > conftest.$ac_ext <<EOF -#line 52019 "configure" +#line 51918 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -52026,7 +51925,7 @@ int main() { sasl_version() ; return 0; } EOF -if { (eval echo configure:52030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:51929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -52194,12 +52093,12 @@ fi fi echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6 -echo "configure:52198: checking for ldap_bind_s" >&5 +echo "configure:52097: checking for ldap_bind_s" >&5 if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 52203 "configure" +#line 52102 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char ldap_bind_s(); below. */ @@ -52222,7 +52121,7 @@ ldap_bind_s(); ; return 0; } EOF -if { (eval echo configure:52226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:52125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_ldap_bind_s=yes" else @@ -52272,7 +52171,7 @@ fi echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6 -echo "configure:52276: checking whether to enable multibyte string support" >&5 +echo "configure:52175: checking whether to enable multibyte string support" >&5 # Check whether --enable-mbstring or --disable-mbstring was given. if test "${enable_mbstring+set}" = set; then enableval="$enable_mbstring" @@ -52318,7 +52217,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6 -echo "configure:52322: checking whether to enable multibyte regex support" >&5 +echo "configure:52221: checking whether to enable multibyte regex support" >&5 # Check whether --enable-mbregex or --disable-mbregex was given. if test "${enable_mbregex+set}" = set; then enableval="$enable_mbregex" @@ -52343,7 +52242,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6 -echo "configure:52347: checking whether to check multibyte regex backtrack" >&5 +echo "configure:52246: checking whether to check multibyte regex backtrack" >&5 # Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given. if test "${enable_mbregex_backtrack+set}" = set; then enableval="$enable_mbregex_backtrack" @@ -52368,7 +52267,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6 -echo "configure:52372: checking for external libmbfl" >&5 +echo "configure:52271: checking for external libmbfl" >&5 # Check whether --with-libmbfl or --without-libmbfl was given. if test "${with_libmbfl+set}" = set; then withval="$with_libmbfl" @@ -52404,7 +52303,7 @@ EOF if test "$PHP_MBREGEX" = "yes"; then echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 -echo "configure:52408: checking for variable length prototypes and stdarg.h" >&5 +echo "configure:52307: checking for variable length prototypes and stdarg.h" >&5 if eval "test \"`echo '$''{'cv_php_mbstring_stdarg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -52423,7 +52322,7 @@ esac else cat > conftest.$ac_ext <<EOF -#line 52427 "configure" +#line 52326 "configure" #include "confdefs.h" #include <stdarg.h> @@ -52438,7 +52337,7 @@ int foo(int x, ...) { int main() { return foo(10, "", 3.14); } EOF -if { (eval echo configure:52442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:52341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cv_php_mbstring_stdarg=yes else @@ -52459,17 +52358,17 @@ echo "$ac_t""$cv_php_mbstring_stdarg" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:52463: checking for $ac_hdr" >&5 +echo "configure:52362: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 52468 "configure" +#line 52367 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:52473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:52372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -52496,7 +52395,7 @@ fi done echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:52500: checking size of int" >&5 +echo "configure:52399: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -52504,7 +52403,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext <<EOF -#line 52508 "configure" +#line 52407 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -52515,7 +52414,7 @@ int main() return(0); } EOF -if { (eval echo configure:52519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:52418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -52535,7 +52434,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:52539: checking size of short" >&5 +echo "configure:52438: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -52543,7 +52442,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext <<EOF -#line 52547 "configure" +#line 52446 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -52554,7 +52453,7 @@ int main() return(0); } EOF -if { (eval echo configure:52558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:52457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -52574,7 +52473,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:52578: checking size of long" >&5 +echo "configure:52477: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -52582,7 +52481,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext <<EOF -#line 52586 "configure" +#line 52485 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -52593,7 +52492,7 @@ int main() return(0); } EOF -if { (eval echo configure:52597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:52496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -52613,12 +52512,12 @@ EOF echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:52617: checking for working const" >&5 +echo "configure:52516: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 52622 "configure" +#line 52521 "configure" #include "confdefs.h" int main() { @@ -52667,7 +52566,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:52671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:52570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -52688,12 +52587,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:52692: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:52591: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 52697 "configure" +#line 52596 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -52702,7 +52601,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:52706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:52605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -52725,19 +52624,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:52729: checking for working alloca.h" >&5 +echo "configure:52628: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 52734 "configure" +#line 52633 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:52741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:52640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -52758,12 +52657,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:52762: checking for alloca" >&5 +echo "configure:52661: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 52767 "configure" +#line 52666 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -52791,7 +52690,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:52795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:52694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -52823,12 +52722,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:52827: checking whether alloca needs Cray hooks" >&5 +echo "configure:52726: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 52832 "configure" +#line 52731 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -52853,12 +52752,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:52857: checking for $ac_func" >&5 +echo "configure:52756: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 52862 "configure" +#line 52761 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -52881,7 +52780,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:52885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:52784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -52908,7 +52807,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:52912: checking stack direction for C alloca" >&5 +echo "configure:52811: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -52916,7 +52815,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 52920 "configure" +#line 52819 "configure" #include "confdefs.h" find_stack_direction () { @@ -52935,7 +52834,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:52939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:52838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -52957,7 +52856,7 @@ EOF fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:52961: checking for 8-bit clean memcmp" >&5 +echo "configure:52860: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -52965,7 +52864,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <<EOF -#line 52969 "configure" +#line 52868 "configure" #include "confdefs.h" main() @@ -52975,7 +52874,7 @@ main() } EOF -if { (eval echo configure:52979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:52878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -53121,6 +53020,7 @@ EOF libmbfl/filters/mbfilter_euc_cn.c libmbfl/filters/mbfilter_euc_jp.c libmbfl/filters/mbfilter_euc_jp_win.c + libmbfl/filters/mbfilter_cp51932.c libmbfl/filters/mbfilter_euc_kr.c libmbfl/filters/mbfilter_euc_tw.c libmbfl/filters/mbfilter_htmlent.c @@ -53141,6 +53041,7 @@ EOF libmbfl/filters/mbfilter_iso8859_8.c libmbfl/filters/mbfilter_iso8859_9.c libmbfl/filters/mbfilter_jis.c + libmbfl/filters/mbfilter_iso2022_jp_ms.c libmbfl/filters/mbfilter_koi8r.c libmbfl/filters/mbfilter_armscii8.c libmbfl/filters/mbfilter_qprint.c @@ -53322,7 +53223,7 @@ EOF done echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6 -echo "configure:53326: checking for mbfl_buffer_converter_new in -lmbfl" >&5 +echo "configure:53227: checking for mbfl_buffer_converter_new in -lmbfl" >&5 ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -53330,7 +53231,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmbfl $LIBS" cat > conftest.$ac_ext <<EOF -#line 53334 "configure" +#line 53235 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -53341,7 +53242,7 @@ int main() { mbfl_buffer_converter_new() ; return 0; } EOF -if { (eval echo configure:53345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:53246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -53962,7 +53863,7 @@ fi echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6 -echo "configure:53966: checking for mcrypt support" >&5 +echo "configure:53867: checking for mcrypt support" >&5 # Check whether --with-mcrypt or --without-mcrypt was given. if test "${with_mcrypt+set}" = set; then withval="$with_mcrypt" @@ -54018,9 +53919,9 @@ if test "$PHP_MCRYPT" != "no"; then old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$MCRYPT_DIR/include echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6 -echo "configure:54022: checking for libmcrypt version" >&5 +echo "configure:53923: checking for libmcrypt version" >&5 cat > conftest.$ac_ext <<EOF -#line 54024 "configure" +#line 53925 "configure" #include "confdefs.h" #include <mcrypt.h> @@ -54049,7 +53950,7 @@ rm -f conftest* save_old_LDFLAGS=$LDFLAGS ac_stuff=" - -L$MCRYPT_DIR/lib -lltdl + -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl " save_ext_shared=$ext_shared @@ -54143,7 +54044,7 @@ rm -f conftest* done echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 -echo "configure:54147: checking for mcrypt_module_open in -lmcrypt" >&5 +echo "configure:54048: checking for mcrypt_module_open in -lmcrypt" >&5 ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -54151,7 +54052,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 54155 "configure" +#line 54056 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -54162,7 +54063,7 @@ int main() { mcrypt_module_open() ; return 0; } EOF -if { (eval echo configure:54166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:54067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -54220,7 +54121,7 @@ else save_old_LDFLAGS=$LDFLAGS ac_stuff=" - -L$MCRYPT_DIR/lib + -L$MCRYPT_DIR/$PHP_LIBDIR " save_ext_shared=$ext_shared @@ -54314,7 +54215,7 @@ else done echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 -echo "configure:54318: checking for mcrypt_module_open in -lmcrypt" >&5 +echo "configure:54219: checking for mcrypt_module_open in -lmcrypt" >&5 ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -54322,7 +54223,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 54326 "configure" +#line 54227 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -54333,7 +54234,7 @@ int main() { mcrypt_module_open() ; return 0; } EOF -if { (eval echo configure:54337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:54238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -54379,18 +54280,18 @@ fi if test "$ext_shared" = "yes"; then MCRYPT_SHARED_LIBADD="-lmcrypt $MCRYPT_SHARED_LIBADD" - if test -n "$MCRYPT_DIR/lib"; then + if test -n "$MCRYPT_DIR/$PHP_LIBDIR"; then - if test "$MCRYPT_DIR/lib" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/lib" != "/usr/lib"; then + if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - if test -z "$MCRYPT_DIR/lib" || echo "$MCRYPT_DIR/lib" | grep '^/' >/dev/null ; then - ai_p=$MCRYPT_DIR/lib + if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$MCRYPT_DIR/$PHP_LIBDIR else - ep_dir="`echo $MCRYPT_DIR/lib|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/lib\"`" + ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`" fi @@ -54421,18 +54322,18 @@ fi else - if test -n "$MCRYPT_DIR/lib"; then + if test -n "$MCRYPT_DIR/$PHP_LIBDIR"; then - if test "$MCRYPT_DIR/lib" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/lib" != "/usr/lib"; then + if test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MCRYPT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - if test -z "$MCRYPT_DIR/lib" || echo "$MCRYPT_DIR/lib" | grep '^/' >/dev/null ; then - ai_p=$MCRYPT_DIR/lib + if test -z "$MCRYPT_DIR/$PHP_LIBDIR" || echo "$MCRYPT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$MCRYPT_DIR/$PHP_LIBDIR else - ep_dir="`echo $MCRYPT_DIR/lib|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/lib\"`" + ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`" fi @@ -54793,7 +54694,7 @@ fi echo $ac_n "checking for mhash support""... $ac_c" 1>&6 -echo "configure:54797: checking for mhash support" >&5 +echo "configure:54698: checking for mhash support" >&5 # Check whether --with-mhash or --without-mhash was given. if test "${with_mhash+set}" = set; then withval="$with_mhash" @@ -54880,18 +54781,18 @@ if test "$PHP_MHASH" != "no"; then if test "$ext_shared" = "yes"; then MHASH_SHARED_LIBADD="-lmhash $MHASH_SHARED_LIBADD" - if test -n "$MHASH_DIR/lib"; then + if test -n "$MHASH_DIR/$PHP_LIBDIR"; then - if test "$MHASH_DIR/lib" != "/usr/$PHP_LIBDIR" && test "$MHASH_DIR/lib" != "/usr/lib"; then + if test "$MHASH_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MHASH_DIR/$PHP_LIBDIR" != "/usr/lib"; then - if test -z "$MHASH_DIR/lib" || echo "$MHASH_DIR/lib" | grep '^/' >/dev/null ; then - ai_p=$MHASH_DIR/lib + if test -z "$MHASH_DIR/$PHP_LIBDIR" || echo "$MHASH_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$MHASH_DIR/$PHP_LIBDIR else - ep_dir="`echo $MHASH_DIR/lib|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir="`echo $MHASH_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$MHASH_DIR/lib\"`" + ai_p="$ep_realdir/`basename \"$MHASH_DIR/$PHP_LIBDIR\"`" fi @@ -54922,18 +54823,18 @@ if test "$PHP_MHASH" != "no"; then else - if test -n "$MHASH_DIR/lib"; then + if test -n "$MHASH_DIR/$PHP_LIBDIR"; then - if test "$MHASH_DIR/lib" != "/usr/$PHP_LIBDIR" && test "$MHASH_DIR/lib" != "/usr/lib"; then + if test "$MHASH_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MHASH_DIR/$PHP_LIBDIR" != "/usr/lib"; then - if test -z "$MHASH_DIR/lib" || echo "$MHASH_DIR/lib" | grep '^/' >/dev/null ; then - ai_p=$MHASH_DIR/lib + if test -z "$MHASH_DIR/$PHP_LIBDIR" || echo "$MHASH_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$MHASH_DIR/$PHP_LIBDIR else - ep_dir="`echo $MHASH_DIR/lib|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir="`echo $MHASH_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$MHASH_DIR/lib\"`" + ai_p="$ep_realdir/`basename \"$MHASH_DIR/$PHP_LIBDIR\"`" fi @@ -55267,7 +55168,7 @@ fi echo $ac_n "checking whether to include mime_magic support""... $ac_c" 1>&6 -echo "configure:55271: checking whether to include mime_magic support" >&5 +echo "configure:55172: checking whether to include mime_magic support" >&5 # Check whether --with-mime-magic or --without-mime-magic was given. if test "${with_mime_magic+set}" = set; then withval="$with_mime_magic" @@ -55624,7 +55525,7 @@ fi echo $ac_n "checking for MING support""... $ac_c" 1>&6 -echo "configure:55628: checking for MING support" >&5 +echo "configure:55529: checking for MING support" >&5 # Check whether --with-ming or --without-ming was given. if test "${with_ming+set}" = set; then withval="$with_ming" @@ -55669,7 +55570,7 @@ echo "$ac_t""$ext_output" 1>&6 if test "$PHP_MING" != "no"; then echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:55673: checking for sin in -lm" >&5 +echo "configure:55574: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -55677,7 +55578,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 55681 "configure" +#line 55582 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -55688,7 +55589,7 @@ int main() { sin() ; return 0; } EOF -if { (eval echo configure:55692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:55593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -55834,7 +55735,7 @@ fi done echo $ac_n "checking for Ming_useSWFVersion in -lming""... $ac_c" 1>&6 -echo "configure:55838: checking for Ming_useSWFVersion in -lming" >&5 +echo "configure:55739: checking for Ming_useSWFVersion in -lming" >&5 ac_lib_var=`echo ming'_'Ming_useSWFVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -55842,7 +55743,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lming $LIBS" cat > conftest.$ac_ext <<EOF -#line 55846 "configure" +#line 55747 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -55853,7 +55754,7 @@ int main() { Ming_useSWFVersion() ; return 0; } EOF -if { (eval echo configure:55857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:55758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -56114,7 +56015,7 @@ fi done echo $ac_n "checking for SWFPrebuiltClip in -lming""... $ac_c" 1>&6 -echo "configure:56118: checking for SWFPrebuiltClip in -lming" >&5 +echo "configure:56019: checking for SWFPrebuiltClip in -lming" >&5 ac_lib_var=`echo ming'_'SWFPrebuiltClip | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -56122,7 +56023,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lming $LIBS" cat > conftest.$ac_ext <<EOF -#line 56126 "configure" +#line 56027 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -56133,7 +56034,7 @@ int main() { SWFPrebuiltClip() ; return 0; } EOF -if { (eval echo configure:56137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:56038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -56166,18 +56067,312 @@ else fi + + save_old_LDFLAGS=$LDFLAGS + ac_stuff="" + + save_ext_shared=$ext_shared + ext_shared=yes + + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -pthread" + else + + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi + + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" + ;; + esac + + + fi + ;; + esac + + + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` + + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii + else + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi + + + if test "$ext_shared" = "yes"; then + LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS" + else + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + + fi + + fi + + ;; + esac + done + + echo $ac_n "checking for SWFMovie_namedAnchor in -lming""... $ac_c" 1>&6 +echo "configure:56166: checking for SWFMovie_namedAnchor in -lming" >&5 +ac_lib_var=`echo ming'_'SWFMovie_namedAnchor | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lming $LIBS" +cat > conftest.$ac_ext <<EOF +#line 56174 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char SWFMovie_namedAnchor(); + +int main() { +SWFMovie_namedAnchor() +; return 0; } +EOF +if { (eval echo configure:56185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF +#define HAVE_SWFMOVIE_NAMEDANCHOR 1 +EOF + + +else + echo "$ac_t""no" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_ming_SWFMovie_namedAnchor + + +fi + + + save_old_LDFLAGS=$LDFLAGS + ac_stuff="" + + save_ext_shared=$ext_shared + ext_shared=yes + + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -pthread" + else + + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi + + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" + ;; + esac + + + fi + ;; + esac + + + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` + + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii + else + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi + + + if test "$ext_shared" = "yes"; then + LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS" + else + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + + fi + + fi + + ;; + esac + done + + echo $ac_n "checking for Ming_setSWFCompression in -lming""... $ac_c" 1>&6 +echo "configure:56313: checking for Ming_setSWFCompression in -lming" >&5 +ac_lib_var=`echo ming'_'Ming_setSWFCompression | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lming $LIBS" +cat > conftest.$ac_ext <<EOF +#line 56321 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char Ming_setSWFCompression(); + +int main() { +Ming_setSWFCompression() +; return 0; } +EOF +if { (eval echo configure:56332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF +#define HAVE_MING_SETSWFCOMPRESSION 1 +EOF + + +else + echo "$ac_t""no" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_ming_Ming_setSWFCompression + + +fi + old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$MING_INC_DIR echo $ac_n "checking for destroySWFBlock""... $ac_c" 1>&6 -echo "configure:56174: checking for destroySWFBlock" >&5 +echo "configure:56369: checking for destroySWFBlock" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""unknown" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 56181 "configure" +#line 56376 "configure" #include "confdefs.h" #include "ming.h" @@ -56189,7 +56384,7 @@ int main() { } EOF -if { (eval echo configure:56193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:56388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""missing" 1>&6 @@ -56211,7 +56406,7 @@ fi cat > conftest.$ac_ext <<EOF -#line 56215 "configure" +#line 56410 "configure" #include "confdefs.h" #include <ming.h> @@ -56238,18 +56433,18 @@ rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 56242 "configure" +#line 56437 "configure" #include "confdefs.h" #include <ming.h> int main() { -int main(void) { SWFMovie_output(NULL, NULL, NULL, 0); return 0; } +SWFMovie_output(NULL, NULL, NULL, 0); ; return 0; } EOF -if { (eval echo configure:56253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:56448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -56556,7 +56751,7 @@ fi echo $ac_n "checking for mSQL support""... $ac_c" 1>&6 -echo "configure:56560: checking for mSQL support" >&5 +echo "configure:56755: checking for mSQL support" >&5 # Check whether --with-msql or --without-msql was given. if test "${with_msql+set}" = set; then withval="$with_msql" @@ -57024,11 +57219,11 @@ EOF echo $ac_n "checking mSQL version""... $ac_c" 1>&6 -echo "configure:57028: checking mSQL version" >&5 +echo "configure:57223: checking mSQL version" >&5 ac_php_oldcppflags=$CPPFLAGS CPPFLAGS="$INCLUDES $CPPFLAGS" cat > conftest.$ac_ext <<EOF -#line 57032 "configure" +#line 57227 "configure" #include "confdefs.h" #include <sys/types.h> #include "msql.h" @@ -57036,7 +57231,7 @@ int main() { int i = IDX_TYPE ; return 0; } EOF -if { (eval echo configure:57040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:57235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -57067,7 +57262,7 @@ rm -f conftest* echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6 -echo "configure:57071: checking for MSSQL support via FreeTDS" >&5 +echo "configure:57266: checking for MSSQL support via FreeTDS" >&5 # Check whether --with-mssql or --without-mssql was given. if test "${with_mssql+set}" = set; then withval="$with_mssql" @@ -57556,7 +57751,7 @@ EOF fi echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:57560: checking for dnet_addr in -ldnet_stub" >&5 +echo "configure:57755: checking for dnet_addr in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -57564,7 +57759,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 57568 "configure" +#line 57763 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -57575,7 +57770,7 @@ int main() { dnet_addr() ; return 0; } EOF -if { (eval echo configure:57579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:57774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -57717,7 +57912,7 @@ fi echo $ac_n "checking for MySQL support""... $ac_c" 1>&6 -echo "configure:57721: checking for MySQL support" >&5 +echo "configure:57916: checking for MySQL support" >&5 # Check whether --with-mysql or --without-mysql was given. if test "${with_mysql+set}" = set; then withval="$with_mysql" @@ -57763,7 +57958,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6 -echo "configure:57767: checking for specified location of the MySQL UNIX socket" >&5 +echo "configure:57962: checking for specified location of the MySQL UNIX socket" >&5 # Check whether --with-mysql-sock or --without-mysql-sock was given. if test "${with_mysql_sock+set}" = set; then withval="$with_mysql_sock" @@ -57789,7 +57984,7 @@ if test -z "$PHP_ZLIB_DIR"; then echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:57793: checking for the location of libz" >&5 +echo "configure:57988: checking for the location of libz" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" @@ -57820,7 +58015,7 @@ EOF echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6 -echo "configure:57824: checking for MySQL UNIX socket location" >&5 +echo "configure:58019: checking for MySQL UNIX socket location" >&5 if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then MYSQL_SOCK=$PHP_MYSQL_SOCK cat >> confdefs.h <<EOF @@ -58010,7 +58205,7 @@ Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; } done echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:58014: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 +echo "configure:58209: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -58018,7 +58213,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 58022 "configure" +#line 58217 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -58029,7 +58224,7 @@ int main() { mysql_close() ; return 0; } EOF -if { (eval echo configure:58033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:58228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -58250,7 +58445,7 @@ else done echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:58254: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 +echo "configure:58449: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -58258,7 +58453,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 58262 "configure" +#line 58457 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -58269,7 +58464,7 @@ int main() { mysql_error() ; return 0; } EOF -if { (eval echo configure:58273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:58468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -58423,7 +58618,7 @@ fi done echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:58427: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 +echo "configure:58622: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -58431,7 +58626,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 58435 "configure" +#line 58630 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -58442,7 +58637,7 @@ int main() { mysql_errno() ; return 0; } EOF -if { (eval echo configure:58446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:58641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -58922,7 +59117,7 @@ fi echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6 -echo "configure:58926: checking for MySQLi support" >&5 +echo "configure:59121: checking for MySQLi support" >&5 # Check whether --with-mysqli or --without-mysqli was given. if test "${with_mysqli+set}" = set; then withval="$with_mysqli" @@ -58968,7 +59163,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6 -echo "configure:58972: checking whether to enable embedded MySQLi support" >&5 +echo "configure:59167: checking whether to enable embedded MySQLi support" >&5 # Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given. if test "${enable_embedded_mysqli+set}" = set; then enableval="$enable_embedded_mysqli" @@ -59118,7 +59313,7 @@ EOF done echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 -echo "configure:59122: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 +echo "configure:59317: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -59126,7 +59321,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIB_NAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 59130 "configure" +#line 59325 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -59137,7 +59332,7 @@ int main() { mysql_set_server_option() ; return 0; } EOF -if { (eval echo configure:59141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:59336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -59383,7 +59578,7 @@ EOF done echo $ac_n "checking for mysql_stmt_field_count in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 -echo "configure:59387: checking for mysql_stmt_field_count in -l$MYSQL_LIB_NAME" >&5 +echo "configure:59582: checking for mysql_stmt_field_count in -l$MYSQL_LIB_NAME" >&5 ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_field_count | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -59391,7 +59586,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIB_NAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 59395 "configure" +#line 59590 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -59402,7 +59597,7 @@ int main() { mysql_stmt_field_count() ; return 0; } EOF -if { (eval echo configure:59406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:59601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -59739,7 +59934,7 @@ fi echo $ac_n "checking for ncurses support""... $ac_c" 1>&6 -echo "configure:59743: checking for ncurses support" >&5 +echo "configure:59938: checking for ncurses support" >&5 # Check whether --with-ncurses or --without-ncurses was given. if test "${with_ncurses+set}" = set; then withval="$with_ncurses" @@ -59945,7 +60140,7 @@ EOF done echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6 -echo "configure:59949: checking for $LIBSYMBOL in -l$LIBNAME" >&5 +echo "configure:60144: checking for $LIBSYMBOL in -l$LIBNAME" >&5 ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -59953,7 +60148,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 59957 "configure" +#line 60152 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -59964,7 +60159,7 @@ int main() { $LIBSYMBOL() ; return 0; } EOF -if { (eval echo configure:59968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:60163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -60181,7 +60376,7 @@ EOF done echo $ac_n "checking for new_panel in -lpanel""... $ac_c" 1>&6 -echo "configure:60185: checking for new_panel in -lpanel" >&5 +echo "configure:60380: checking for new_panel in -lpanel" >&5 ac_lib_var=`echo panel'_'new_panel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -60189,7 +60384,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpanel $LIBS" cat > conftest.$ac_ext <<EOF -#line 60193 "configure" +#line 60388 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -60200,7 +60395,7 @@ int main() { new_panel() ; return 0; } EOF -if { (eval echo configure:60204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:60399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -60347,7 +60542,7 @@ fi echo $ac_n "checking for color_set in -l$LIBNAME""... $ac_c" 1>&6 -echo "configure:60351: checking for color_set in -l$LIBNAME" >&5 +echo "configure:60546: checking for color_set in -l$LIBNAME" >&5 ac_lib_var=`echo $LIBNAME'_'color_set | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -60355,7 +60550,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 60359 "configure" +#line 60554 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -60366,7 +60561,7 @@ int main() { color_set() ; return 0; } EOF -if { (eval echo configure:60370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:60565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -60390,7 +60585,7 @@ else fi echo $ac_n "checking for slk_color in -l$LIBNAME""... $ac_c" 1>&6 -echo "configure:60394: checking for slk_color in -l$LIBNAME" >&5 +echo "configure:60589: checking for slk_color in -l$LIBNAME" >&5 ac_lib_var=`echo $LIBNAME'_'slk_color | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -60398,7 +60593,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 60402 "configure" +#line 60597 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -60409,7 +60604,7 @@ int main() { slk_color() ; return 0; } EOF -if { (eval echo configure:60413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:60608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -60433,7 +60628,7 @@ else fi echo $ac_n "checking for assume_default_colors in -l$LIBNAME""... $ac_c" 1>&6 -echo "configure:60437: checking for assume_default_colors in -l$LIBNAME" >&5 +echo "configure:60632: checking for assume_default_colors in -l$LIBNAME" >&5 ac_lib_var=`echo $LIBNAME'_'assume_default_colors | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -60441,7 +60636,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 60445 "configure" +#line 60640 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -60452,7 +60647,7 @@ int main() { assume_default_colors() ; return 0; } EOF -if { (eval echo configure:60456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:60651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -60476,7 +60671,7 @@ else fi echo $ac_n "checking for use_extended_names in -l$LIBNAME""... $ac_c" 1>&6 -echo "configure:60480: checking for use_extended_names in -l$LIBNAME" >&5 +echo "configure:60675: checking for use_extended_names in -l$LIBNAME" >&5 ac_lib_var=`echo $LIBNAME'_'use_extended_names | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -60484,7 +60679,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 60488 "configure" +#line 60683 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -60495,7 +60690,7 @@ int main() { use_extended_names() ; return 0; } EOF -if { (eval echo configure:60499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:60694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -60826,7 +61021,7 @@ fi echo $ac_n "checking for Oracle (OCI8) support""... $ac_c" 1>&6 -echo "configure:60830: checking for Oracle (OCI8) support" >&5 +echo "configure:61025: checking for Oracle (OCI8) support" >&5 # Check whether --with-oci8 or --without-oci8 was given. if test "${with_oci8+set}" = set; then withval="$with_oci8" @@ -60870,7 +61065,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking checking PHP version""... $ac_c" 1>&6 -echo "configure:60874: checking checking PHP version" >&5 +echo "configure:61069: checking checking PHP version" >&5 tmp_version=$PHP_VERSION if test -z "$tmp_version"; then @@ -60918,7 +61113,7 @@ fi if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then echo $ac_n "checking Oracle Install Directory""... $ac_c" 1>&6 -echo "configure:60922: checking Oracle Install Directory" >&5 +echo "configure:61117: checking Oracle Install Directory" >&5 if test "$PHP_OCI8" = "yes"; then OCI8_DIR=$ORACLE_HOME else @@ -60928,7 +61123,7 @@ echo "configure:60922: checking Oracle Install Directory" >&5 echo $ac_n "checking size of long int""... $ac_c" 1>&6 -echo "configure:60932: checking size of long int" >&5 +echo "configure:61127: checking size of long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -60936,7 +61131,7 @@ else ac_cv_sizeof_long_int=4 else cat > conftest.$ac_ext <<EOF -#line 60940 "configure" +#line 61135 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -60947,7 +61142,7 @@ int main() return(0); } EOF -if { (eval echo configure:60951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:61146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_int=`cat conftestval` else @@ -60967,7 +61162,7 @@ EOF echo $ac_n "checking checking if we're at 64-bit platform""... $ac_c" 1>&6 -echo "configure:60971: checking checking if we're at 64-bit platform" >&5 +echo "configure:61166: checking checking if we're at 64-bit platform" >&5 if test "$ac_cv_sizeof_long_int" = "4" ; then echo "$ac_t""no" 1>&6 TMP_OCI8_LIB_DIR=lib32 @@ -60977,7 +61172,7 @@ echo "configure:60971: checking checking if we're at 64-bit platform" >&5 fi echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6 -echo "configure:60981: checking OCI8 libraries dir" >&5 +echo "configure:61176: checking OCI8 libraries dir" >&5 if test -d "$OCI8_DIR/lib" -a ! -d "$OCI8_DIR/lib32"; then OCI8_LIB_DIR=lib elif ! test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then @@ -61309,7 +61504,7 @@ echo "configure:60981: checking OCI8 libraries dir" >&5 echo $ac_n "checking Oracle version""... $ac_c" 1>&6 -echo "configure:61313: checking Oracle version" >&5 +echo "configure:61508: checking Oracle version" >&5 if test -s "$OCI8_DIR/orainst/unix.rgs"; then OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$OCI8_VERSION" && OCI8_VERSION=7.3 @@ -61817,7 +62012,7 @@ echo "configure:61313: checking Oracle version" >&5 done echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:61821: checking for OCIEnvCreate in -lclntsh" >&5 +echo "configure:62016: checking for OCIEnvCreate in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -61825,7 +62020,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 61829 "configure" +#line 62024 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -61836,7 +62031,7 @@ int main() { OCIEnvCreate() ; return 0; } EOF -if { (eval echo configure:61840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:62035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -61969,7 +62164,7 @@ fi done echo $ac_n "checking for OCIStmtPrepare2 in -lclntsh""... $ac_c" 1>&6 -echo "configure:61973: checking for OCIStmtPrepare2 in -lclntsh" >&5 +echo "configure:62168: checking for OCIStmtPrepare2 in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIStmtPrepare2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -61977,7 +62172,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 61981 "configure" +#line 62176 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -61988,7 +62183,7 @@ int main() { OCIStmtPrepare2() ; return 0; } EOF -if { (eval echo configure:61992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:62187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -62184,7 +62379,7 @@ fi done echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:62188: checking for OCIEnvCreate in -lclntsh" >&5 +echo "configure:62383: checking for OCIEnvCreate in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -62192,7 +62387,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 62196 "configure" +#line 62391 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -62203,7 +62398,7 @@ int main() { OCIEnvCreate() ; return 0; } EOF -if { (eval echo configure:62207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:62402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -62336,7 +62531,7 @@ fi done echo $ac_n "checking for OCIStmtPrepare2 in -lclntsh""... $ac_c" 1>&6 -echo "configure:62340: checking for OCIStmtPrepare2 in -lclntsh" >&5 +echo "configure:62535: checking for OCIStmtPrepare2 in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIStmtPrepare2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -62344,7 +62539,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 62348 "configure" +#line 62543 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -62355,7 +62550,7 @@ int main() { OCIStmtPrepare2() ; return 0; } EOF -if { (eval echo configure:62359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:62554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -62395,7 +62590,7 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=$OCI8_INCLUDES cat > conftest.$ac_ext <<EOF -#line 62399 "configure" +#line 62594 "configure" #include "confdefs.h" #include <oci.h> @@ -62588,7 +62783,7 @@ EOF done echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:62592: checking for OCIEnvNlsCreate in -lclntsh" >&5 +echo "configure:62787: checking for OCIEnvNlsCreate in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -62596,7 +62791,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 62600 "configure" +#line 62795 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -62607,7 +62802,7 @@ int main() { OCIEnvNlsCreate() ; return 0; } EOF -if { (eval echo configure:62611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:62806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -62723,7 +62918,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then done echo $ac_n "checking for OCINlsCharSetNameToId in -lclntsh""... $ac_c" 1>&6 -echo "configure:62727: checking for OCINlsCharSetNameToId in -lclntsh" >&5 +echo "configure:62922: checking for OCINlsCharSetNameToId in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCINlsCharSetNameToId | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -62731,7 +62926,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 62735 "configure" +#line 62930 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -62742,7 +62937,7 @@ int main() { OCINlsCharSetNameToId() ; return 0; } EOF -if { (eval echo configure:62746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:62941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -62888,7 +63083,7 @@ fi done echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:62892: checking for OCIEnvCreate in -lclntsh" >&5 +echo "configure:63087: checking for OCIEnvCreate in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -62896,7 +63091,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 62900 "configure" +#line 63095 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -62907,7 +63102,7 @@ int main() { OCIEnvCreate() ; return 0; } EOF -if { (eval echo configure:62911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:63106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -63040,7 +63235,7 @@ fi done echo $ac_n "checking for OCIStmtPrepare2 in -lclntsh""... $ac_c" 1>&6 -echo "configure:63044: checking for OCIStmtPrepare2 in -lclntsh" >&5 +echo "configure:63239: checking for OCIStmtPrepare2 in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIStmtPrepare2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -63048,7 +63243,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 63052 "configure" +#line 63247 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -63059,7 +63254,7 @@ int main() { OCIStmtPrepare2() ; return 0; } EOF -if { (eval echo configure:63063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:63258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -63192,7 +63387,7 @@ fi done echo $ac_n "checking for OCILobRead2 in -lclntsh""... $ac_c" 1>&6 -echo "configure:63196: checking for OCILobRead2 in -lclntsh" >&5 +echo "configure:63391: checking for OCILobRead2 in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCILobRead2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -63200,7 +63395,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 63204 "configure" +#line 63399 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -63211,7 +63406,7 @@ int main() { OCILobRead2() ; return 0; } EOF -if { (eval echo configure:63215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:63410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -63441,7 +63636,7 @@ EOF done echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6 -echo "configure:63445: checking for OCILobIsTemporary in -lclntsh" >&5 +echo "configure:63640: checking for OCILobIsTemporary in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -63449,7 +63644,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 63453 "configure" +#line 63648 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -63460,7 +63655,7 @@ int main() { OCILobIsTemporary() ; return 0; } EOF -if { (eval echo configure:63464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:63659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -63589,7 +63784,7 @@ else done echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6 -echo "configure:63593: checking for OCILobIsTemporary in -locijdbc8" >&5 +echo "configure:63788: checking for OCILobIsTemporary in -locijdbc8" >&5 ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -63597,7 +63792,7 @@ else ac_save_LIBS="$LIBS" LIBS="-locijdbc8 $LIBS" cat > conftest.$ac_ext <<EOF -#line 63601 "configure" +#line 63796 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -63608,7 +63803,7 @@ int main() { OCILobIsTemporary() ; return 0; } EOF -if { (eval echo configure:63612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:63807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -63768,7 +63963,7 @@ fi done echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6 -echo "configure:63772: checking for OCICollAssign in -lclntsh" >&5 +echo "configure:63967: checking for OCICollAssign in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -63776,7 +63971,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 63780 "configure" +#line 63975 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -63787,7 +63982,7 @@ int main() { OCICollAssign() ; return 0; } EOF -if { (eval echo configure:63791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:63986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -64413,7 +64608,7 @@ EOF elif test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6 -echo "configure:64417: checking Oracle Instant Client directory" >&5 +echo "configure:64612: checking Oracle Instant Client directory" >&5 if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client/lib 2> /dev/null | tail -1` if test -z "$PHP_OCI8_INSTANT_CLIENT"; then @@ -64425,7 +64620,7 @@ echo "configure:64417: checking Oracle Instant Client directory" >&5 OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6 -echo "configure:64429: checking Oracle Instant Client SDK header directory" >&5 +echo "configure:64624: checking Oracle Instant Client SDK header directory" >&5 OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client/lib/*$!/usr/include/oracle/\1/client!'` @@ -64633,7 +64828,7 @@ echo "configure:64429: checking Oracle Instant Client SDK header directory" >&5 echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6 -echo "configure:64637: checking Oracle Instant Client version" >&5 +echo "configure:64832: checking Oracle Instant Client version" >&5 if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz10.$SHLIB_SUFFIX_NAME; then if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then @@ -65070,7 +65265,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for Adabas support""... $ac_c" 1>&6 -echo "configure:65074: checking for Adabas support" >&5 +echo "configure:65269: checking for Adabas support" >&5 # Check whether --with-adabas or --without-adabas was given. if test "${with_adabas+set}" = set; then withval="$with_adabas" @@ -65268,7 +65463,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6 -echo "configure:65272: checking for SAP DB support" >&5 +echo "configure:65467: checking for SAP DB support" >&5 # Check whether --with-sapdb or --without-sapdb was given. if test "${with_sapdb+set}" = set; then withval="$with_sapdb" @@ -65398,7 +65593,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for Solid support""... $ac_c" 1>&6 -echo "configure:65402: checking for Solid support" >&5 +echo "configure:65597: checking for Solid support" >&5 # Check whether --with-solid or --without-solid was given. if test "${with_solid+set}" = set; then withval="$with_solid" @@ -65456,7 +65651,7 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking Solid library file""... $ac_c" 1>&6 -echo "configure:65460: checking Solid library file" >&5 +echo "configure:65655: checking Solid library file" >&5 ac_solid_uname_r=`uname -r 2>/dev/null` ac_solid_uname_s=`uname -s 2>/dev/null` case $ac_solid_uname_s in @@ -65542,7 +65737,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6 -echo "configure:65546: checking for IBM DB2 support" >&5 +echo "configure:65741: checking for IBM DB2 support" >&5 # Check whether --with-ibm-db2 or --without-ibm-db2 was given. if test "${with_ibm_db2+set}" = set; then withval="$with_ibm_db2" @@ -65604,7 +65799,7 @@ fi else cat > conftest.$ac_ext <<EOF -#line 65608 "configure" +#line 65803 "configure" #include "confdefs.h" @@ -65615,7 +65810,7 @@ else } EOF -if { (eval echo configure:65619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:65814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -65661,7 +65856,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6 -echo "configure:65665: checking for ODBCRouter.com support" >&5 +echo "configure:65860: checking for ODBCRouter.com support" >&5 # Check whether --with-ODBCRouter or --without-ODBCRouter was given. if test "${with_ODBCRouter+set}" = set; then withval="$with_ODBCRouter" @@ -65721,7 +65916,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for Empress support""... $ac_c" 1>&6 -echo "configure:65725: checking for Empress support" >&5 +echo "configure:65920: checking for Empress support" >&5 # Check whether --with-empress or --without-empress was given. if test "${with_empress+set}" = set; then withval="$with_empress" @@ -65770,7 +65965,7 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking Empress library file""... $ac_c" 1>&6 -echo "configure:65774: checking Empress library file" >&5 +echo "configure:65969: checking Empress library file" >&5 ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` if test ! -f $ODBC_LIBS; then ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` @@ -65791,7 +65986,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6 -echo "configure:65795: checking for Empress local access support" >&5 +echo "configure:65990: checking for Empress local access support" >&5 # Check whether --with-empress-bcs or --without-empress-bcs was given. if test "${with_empress_bcs+set}" = set; then withval="$with_empress_bcs" @@ -65856,7 +66051,7 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6 -echo "configure:65860: checking Empress local access library file" >&5 +echo "configure:66055: checking Empress local access library file" >&5 ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` if test ! -f $ODBCBCS_LIBS; then ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` @@ -65877,7 +66072,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6 -echo "configure:65881: checking for Birdstep support" >&5 +echo "configure:66076: checking for Birdstep support" >&5 # Check whether --with-birdstep or --without-birdstep was given. if test "${with_birdstep+set}" = set; then withval="$with_birdstep" @@ -65987,7 +66182,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6 -echo "configure:65991: checking for a custom ODBC support" >&5 +echo "configure:66186: checking for a custom ODBC support" >&5 # Check whether --with-custom-odbc or --without-custom-odbc was given. if test "${with_custom_odbc+set}" = set; then withval="$with_custom_odbc" @@ -66021,7 +66216,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for iODBC support""... $ac_c" 1>&6 -echo "configure:66025: checking for iODBC support" >&5 +echo "configure:66220: checking for iODBC support" >&5 # Check whether --with-iodbc or --without-iodbc was given. if test "${with_iodbc+set}" = set; then withval="$with_iodbc" @@ -66163,7 +66358,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6 -echo "configure:66167: checking for Easysoft ODBC-ODBC Bridge support" >&5 +echo "configure:66362: checking for Easysoft ODBC-ODBC Bridge support" >&5 # Check whether --with-esoob or --without-esoob was given. if test "${with_esoob+set}" = set; then withval="$with_esoob" @@ -66223,7 +66418,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6 -echo "configure:66227: checking for unixODBC support" >&5 +echo "configure:66422: checking for unixODBC support" >&5 # Check whether --with-unixODBC or --without-unixODBC was given. if test "${with_unixODBC+set}" = set; then withval="$with_unixODBC" @@ -66288,7 +66483,7 @@ fi if test -z "$ODBC_TYPE"; then echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6 -echo "configure:66292: checking for DBMaker support" >&5 +echo "configure:66487: checking for DBMaker support" >&5 # Check whether --with-dbmaker or --without-dbmaker was given. if test "${with_dbmaker+set}" = set; then withval="$with_dbmaker" @@ -66883,7 +67078,7 @@ fi echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6 -echo "configure:66887: checking whether to enable pcntl support" >&5 +echo "configure:67082: checking whether to enable pcntl support" >&5 # Check whether --enable-pcntl or --disable-pcntl was given. if test "${enable_pcntl+set}" = set; then enableval="$enable_pcntl" @@ -66931,12 +67126,12 @@ if test "$PHP_PCNTL" != "no"; then for ac_func in fork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:66935: checking for $ac_func" >&5 +echo "configure:67130: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 66940 "configure" +#line 67135 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -66959,7 +67154,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:66963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:67158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -66990,12 +67185,12 @@ done for ac_func in waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:66994: checking for $ac_func" >&5 +echo "configure:67189: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 66999 "configure" +#line 67194 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -67018,7 +67213,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:67022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:67217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -67049,12 +67244,12 @@ done for ac_func in sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:67053: checking for $ac_func" >&5 +echo "configure:67248: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 67058 "configure" +#line 67253 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -67077,7 +67272,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:67081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:67276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -67108,12 +67303,12 @@ done for ac_func in getpriority setpriority wait3 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:67112: checking for $ac_func" >&5 +echo "configure:67307: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 67117 "configure" +#line 67312 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -67136,7 +67331,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:67140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:67335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -67450,7 +67645,7 @@ fi echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6 -echo "configure:67454: checking whether to enable PDO support" >&5 +echo "configure:67649: checking whether to enable PDO support" >&5 # Check whether --enable-pdo or --disable-pdo was given. if test "${enable_pdo+set}" = set; then enableval="$enable_pdo" @@ -67864,7 +68059,7 @@ but you've either not enabled spl, or have disabled it. src=$ext_srcdir/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments fi @@ -67874,7 +68069,7 @@ if test "$PHP_PDO" != "no"; then echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6 -echo "configure:67878: checking for PDO_DBLIB support via FreeTDS" >&5 +echo "configure:68073: checking for PDO_DBLIB support via FreeTDS" >&5 # Check whether --with-pdo-dblib or --without-pdo-dblib was given. if test "${with_pdo_dblib+set}" = set; then withval="$with_pdo_dblib" @@ -68090,13 +68285,13 @@ if test "$PHP_PDO_DBLIB" != "no"; then echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:68094: checking for PDO includes" >&5 +echo "configure:68289: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:68100: checking for PDO includes" >&5 +echo "configure:68295: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -68399,7 +68594,7 @@ EOF fi echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:68403: checking for dnet_addr in -ldnet_stub" >&5 +echo "configure:68598: checking for dnet_addr in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -68407,7 +68602,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 68411 "configure" +#line 68606 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -68418,7 +68613,7 @@ int main() { dnet_addr() ; return 0; } EOF -if { (eval echo configure:68422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:68617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -68581,7 +68776,7 @@ if test "$PHP_PDO" != "no"; then echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6 -echo "configure:68585: checking for Firebird support for PDO" >&5 +echo "configure:68780: checking for Firebird support for PDO" >&5 # Check whether --with-pdo-firebird or --without-pdo-firebird was given. if test "${with_pdo_firebird+set}" = set; then withval="$with_pdo_firebird" @@ -68730,7 +68925,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then done echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 -echo "configure:68734: checking for isc_detach_database in -lfbclient" >&5 +echo "configure:68929: checking for isc_detach_database in -lfbclient" >&5 ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -68738,7 +68933,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfbclient $LIBS" cat > conftest.$ac_ext <<EOF -#line 68742 "configure" +#line 68937 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -68749,7 +68944,7 @@ int main() { isc_detach_database() ; return 0; } EOF -if { (eval echo configure:68753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:68948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -68875,7 +69070,7 @@ else done echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 -echo "configure:68879: checking for isc_detach_database in -lgds" >&5 +echo "configure:69074: checking for isc_detach_database in -lgds" >&5 ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -68883,7 +69078,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgds $LIBS" cat > conftest.$ac_ext <<EOF -#line 68887 "configure" +#line 69082 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -68894,7 +69089,7 @@ int main() { isc_detach_database() ; return 0; } EOF -if { (eval echo configure:68898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:69093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -69020,7 +69215,7 @@ else done echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 -echo "configure:69024: checking for isc_detach_database in -lib_util" >&5 +echo "configure:69219: checking for isc_detach_database in -lib_util" >&5 ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -69028,7 +69223,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lib_util $LIBS" cat > conftest.$ac_ext <<EOF -#line 69032 "configure" +#line 69227 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -69039,7 +69234,7 @@ int main() { isc_detach_database() ; return 0; } EOF -if { (eval echo configure:69043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:69238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -69084,13 +69279,13 @@ fi echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:69088: checking for PDO includes" >&5 +echo "configure:69283: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:69094: checking for PDO includes" >&5 +echo "configure:69289: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -69555,7 +69750,7 @@ if test "$PHP_PDO" != "no"; then echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6 -echo "configure:69559: checking for MySQL support for PDO" >&5 +echo "configure:69754: checking for MySQL support for PDO" >&5 # Check whether --with-pdo-mysql or --without-pdo-mysql was given. if test "${with_pdo_mysql+set}" = set; then withval="$with_pdo_mysql" @@ -69598,6 +69793,33 @@ echo "$ac_t""$ext_output" 1>&6 +if test -z "$PHP_ZLIB_DIR"; then + + +echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 +echo "configure:69801: checking for the location of libz" >&5 +# Check whether --with-zlib-dir or --without-zlib-dir was given. +if test "${with_zlib_dir+set}" = set; then + withval="$with_zlib_dir" + PHP_ZLIB_DIR=$withval +else + + PHP_ZLIB_DIR=no + + if test "$PHP_ENABLE_ALL" && test "no" = "yes"; then + PHP_ZLIB_DIR=$PHP_ENABLE_ALL + fi + +fi + + +ext_output=$PHP_ZLIB_DIR +echo "$ac_t""$ext_output" 1>&6 + + + +fi + if test "$PHP_PDO_MYSQL" != "no"; then cat >> confdefs.h <<\EOF #define HAVE_MYSQL 1 @@ -69605,7 +69827,7 @@ EOF echo $ac_n "checking for mysql_config""... $ac_c" 1>&6 -echo "configure:69609: checking for mysql_config" >&5 +echo "configure:69831: checking for mysql_config" >&5 if test -f $PHP_PDO_MYSQL && test -x $PHP_PDO_MYSQL ; then PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL @@ -69639,7 +69861,7 @@ echo "configure:69609: checking for mysql_config" >&5 # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:69643: checking for $ac_word" >&5 +echo "configure:69865: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -69687,7 +69909,7 @@ fi else echo "$ac_t""not found" 1>&6 echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6 -echo "configure:69691: checking for mysql install under $PDO_MYSQL_DIR" >&5 +echo "configure:69913: checking for mysql install under $PDO_MYSQL_DIR" >&5 if test -r $PDO_MYSQL_DIR/include/mysql; then PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql else @@ -69939,7 +70161,7 @@ EOF done echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 -echo "configure:69943: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 +echo "configure:70165: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -69947,7 +70169,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 69951 "configure" +#line 70173 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -69958,7 +70180,7 @@ int main() { mysql_query() ; return 0; } EOF -if { (eval echo configure:69962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:70184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -70114,7 +70336,555 @@ else ext_shared=$save_ext_shared unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query - { echo "configure: error: mysql_query missing!?" 1>&2; exit 1; } + if test "$PHP_ZLIB_DIR" != "no"; then + + + if test "$ext_shared" = "yes"; then + PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD" + if test -n "$PHP_ZLIB_DIR"; then + + if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then + + if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then + ai_p=$PHP_ZLIB_DIR + else + + ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" + fi + + + if test "$ext_shared" = "yes"; then + PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $PDO_MYSQL_SHARED_LIBADD" + else + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + + fi + + fi + + fi + else + + + if test -n "$PHP_ZLIB_DIR"; then + + if test "$PHP_ZLIB_DIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR" != "/usr/lib"; then + + if test -z "$PHP_ZLIB_DIR" || echo "$PHP_ZLIB_DIR" | grep '^/' >/dev/null ; then + ai_p=$PHP_ZLIB_DIR + else + + ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`" + fi + + + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + + + fi + + fi + + + case z in + c|c_r|pthread*) ;; + *) + LIBS="-lz $LIBS" + ;; + esac + + + + + fi + + + + save_old_LDFLAGS=$LDFLAGS + ac_stuff=" + -L$PHP_ZLIB_DIR/$PHP_LIBDIR -L$PDO_MYSQL_LIB_DIR + " + + save_ext_shared=$ext_shared + ext_shared=yes + + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -pthread" + else + + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi + + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" + ;; + esac + + + fi + ;; + esac + + + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` + + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii + else + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi + + + if test "$ext_shared" = "yes"; then + LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS" + else + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + + fi + + fi + + ;; + esac + done + + echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 +echo "configure:70534: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 +ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" +cat > conftest.$ac_ext <<EOF +#line 70542 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char mysql_query(); + +int main() { +mysql_query() +; return 0; } +EOF +if { (eval echo configure:70553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + + +else + echo "$ac_t""no" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query + + { echo "configure: error: PDO_MYSQL configure failed. Please check config.log for more information." 1>&2; exit 1; } + + +fi + + PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz" + else + + + case z in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + PDO_MYSQL_SHARED_LIBADD="-lz $PDO_MYSQL_SHARED_LIBADD" + else + + + case z in + c|c_r|pthread*) ;; + *) + LIBS="-lz $LIBS" + ;; + esac + + + fi + ;; + esac + + + + save_old_LDFLAGS=$LDFLAGS + ac_stuff=" + -L$PDO_MYSQL_LIB_DIR + " + + save_ext_shared=$ext_shared + ext_shared=yes + + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -pthread" + else + + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi + + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" + ;; + esac + + + fi + ;; + esac + + + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` + + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii + else + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi + + + if test "$ext_shared" = "yes"; then + LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS" + else + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + + fi + + fi + + ;; + esac + done + + echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 +echo "configure:70707: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 +ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" +cat > conftest.$ac_ext <<EOF +#line 70715 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char mysql_query(); + +int main() { +mysql_query() +; return 0; } +EOF +if { (eval echo configure:70726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + + +else + echo "$ac_t""no" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query + + { echo "configure: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." 1>&2; exit 1; } + + +fi + + PDO_MYSQL_LIBS="$PDO_MYSQL_LIBS -lz" + fi + + + for ac_i in $PDO_MYSQL_INCLUDE; do + case $ac_i in + -I*) + ac_ii=`echo $ac_i|cut -c 3-` + + if test "$ac_ii" != "/usr/include"; then + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii + else + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INCLUDEPATH$unique=set" + + if test ""; then + INCLUDES="-I$ai_p $INCLUDES" + else + INCLUDES="$INCLUDES -I$ai_p" + fi + + fi + + fi + + ;; + esac + done + + + for ac_i in $PDO_MYSQL_LIBS; do + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then + PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -pthread" + else + + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi + + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -l$ac_ii" + else + + + case $ac_ii in + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" + ;; + esac + + + fi + ;; + esac + + + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` + + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii + else + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi + + + if test "$ext_shared" = "yes"; then + PDO_MYSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $PDO_MYSQL_SHARED_LIBADD" + else + + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi + + + fi + + fi + + ;; + esac + done + fi @@ -70124,12 +70894,12 @@ fi for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:70128: checking for $ac_func" >&5 +echo "configure:70898: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 70133 "configure" +#line 70903 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -70152,7 +70922,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:70156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:70926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -70181,13 +70951,13 @@ done echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:70185: checking for PDO includes" >&5 +echo "configure:70955: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:70191: checking for PDO includes" >&5 +echo "configure:70961: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -70534,7 +71304,7 @@ if test "$PHP_PDO" != "no"; then echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6 -echo "configure:70538: checking Oracle OCI support for PDO" >&5 +echo "configure:71308: checking Oracle OCI support for PDO" >&5 # Check whether --with-pdo-oci or --without-pdo-oci was given. if test "${with_pdo_oci+set}" = set; then withval="$with_pdo_oci" @@ -70579,7 +71349,7 @@ echo "$ac_t""$ext_output" 1>&6 if test "$PHP_PDO_OCI" != "no"; then echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6 -echo "configure:70583: checking Oracle Install-Dir" >&5 +echo "configure:71353: checking Oracle Install-Dir" >&5 if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then PDO_OCI_DIR=$ORACLE_HOME else @@ -70588,7 +71358,7 @@ echo "configure:70583: checking Oracle Install-Dir" >&5 echo "$ac_t""$PDO_OCI_DIR :$PHP_PDO_OCI:" 1>&6 echo $ac_n "checking if that is sane""... $ac_c" 1>&6 -echo "configure:70592: checking if that is sane" >&5 +echo "configure:71362: checking if that is sane" >&5 if test -z "$PDO_OCI_DIR"; then { echo "configure: error: You need to tell me where to find your oracle SDK, or set ORACLE_HOME. @@ -70599,7 +71369,7 @@ You need to tell me where to find your oracle SDK, or set ORACLE_HOME. echo $ac_n "checking size of long int""... $ac_c" 1>&6 -echo "configure:70603: checking size of long int" >&5 +echo "configure:71373: checking size of long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -70607,7 +71377,7 @@ else ac_cv_sizeof_long_int=4 else cat > conftest.$ac_ext <<EOF -#line 70611 "configure" +#line 71381 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -70618,7 +71388,7 @@ int main() return(0); } EOF -if { (eval echo configure:70622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:71392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_int=`cat conftestval` else @@ -70638,7 +71408,7 @@ EOF echo $ac_n "checking checking if we're at 64-bit platform""... $ac_c" 1>&6 -echo "configure:70642: checking checking if we're at 64-bit platform" >&5 +echo "configure:71412: checking checking if we're at 64-bit platform" >&5 if test "$ac_cv_sizeof_long_int" = "4" ; then echo "$ac_t""no" 1>&6 TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32" @@ -70648,7 +71418,7 @@ echo "configure:70642: checking checking if we're at 64-bit platform" >&5 fi echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6 -echo "configure:70652: checking OCI8 libraries dir" >&5 +echo "configure:71422: checking OCI8 libraries dir" >&5 if test -d "$PDO_OCI_DIR/lib" -a ! -d "$PDO_OCI_DIR/lib32"; then PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib" elif ! test -d "$PDO_OCI_DIR/lib" -a -d "$PDO_OCI_DIR/lib32"; then @@ -70665,7 +71435,7 @@ echo "configure:70652: checking OCI8 libraries dir" >&5 PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`" PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`" echo $ac_n "checking for oci.h""... $ac_c" 1>&6 -echo "configure:70669: checking for oci.h" >&5 +echo "configure:71439: checking for oci.h" >&5 if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" != "/usr/include"; then @@ -71164,7 +71934,7 @@ echo "configure:70669: checking for oci.h" >&5 fi echo $ac_n "checking Oracle version""... $ac_c" 1>&6 -echo "configure:71168: checking Oracle version" >&5 +echo "configure:71938: checking Oracle version" >&5 if test -s "$PDO_OCI_DIR/orainst/unix.rgs"; then PDO_OCI_VERSION=`grep '"ocommon"' $PDO_OCI_DIR/orainst/unix.rgs | sed 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$PDO_OCI_VERSION" && PDO_OCI_VERSION=7.3 @@ -71819,7 +72589,7 @@ echo "configure:71168: checking Oracle version" >&5 done echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:71823: checking for OCIEnvCreate in -lclntsh" >&5 +echo "configure:72593: checking for OCIEnvCreate in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -71827,7 +72597,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 71831 "configure" +#line 72601 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -71838,7 +72608,7 @@ int main() { OCIEnvCreate() ; return 0; } EOF -if { (eval echo configure:71842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:72612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -71971,7 +72741,7 @@ fi done echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 -echo "configure:71975: checking for OCIEnvNlsCreate in -lclntsh" >&5 +echo "configure:72745: checking for OCIEnvNlsCreate in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -71979,7 +72749,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 71983 "configure" +#line 72753 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -71990,7 +72760,7 @@ int main() { OCIEnvNlsCreate() ; return 0; } EOF -if { (eval echo configure:71994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:72764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -72123,7 +72893,7 @@ fi done echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6 -echo "configure:72127: checking for OCILobIsTemporary in -lclntsh" >&5 +echo "configure:72897: checking for OCILobIsTemporary in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -72131,7 +72901,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 72135 "configure" +#line 72905 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -72142,7 +72912,7 @@ int main() { OCILobIsTemporary() ; return 0; } EOF -if { (eval echo configure:72146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:72916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -72271,7 +73041,7 @@ else done echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6 -echo "configure:72275: checking for OCILobIsTemporary in -locijdbc8" >&5 +echo "configure:73045: checking for OCILobIsTemporary in -locijdbc8" >&5 ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -72279,7 +73049,7 @@ else ac_save_LIBS="$LIBS" LIBS="-locijdbc8 $LIBS" cat > conftest.$ac_ext <<EOF -#line 72283 "configure" +#line 73053 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -72290,7 +73060,7 @@ int main() { OCILobIsTemporary() ; return 0; } EOF -if { (eval echo configure:72294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:73064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -72450,7 +73220,7 @@ fi done echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6 -echo "configure:72454: checking for OCICollAssign in -lclntsh" >&5 +echo "configure:73224: checking for OCICollAssign in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -72458,7 +73228,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 72462 "configure" +#line 73232 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -72469,7 +73239,7 @@ int main() { OCICollAssign() ; return 0; } EOF -if { (eval echo configure:72473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:73243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -72602,7 +73372,7 @@ fi done echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6 -echo "configure:72606: checking for OCIStmtFetch2 in -lclntsh" >&5 +echo "configure:73376: checking for OCIStmtFetch2 in -lclntsh" >&5 ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -72610,7 +73380,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <<EOF -#line 72614 "configure" +#line 73384 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -72621,7 +73391,7 @@ int main() { OCIStmtFetch2() ; return 0; } EOF -if { (eval echo configure:72625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:73395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -72660,13 +73430,13 @@ fi echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:72664: checking for PDO includes" >&5 +echo "configure:73434: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:72670: checking for PDO includes" >&5 +echo "configure:73440: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -73021,7 +73791,7 @@ if test "$PHP_PDO" != "no"; then echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6 -echo "configure:73025: checking for ODBC v3 support for PDO" >&5 +echo "configure:73795: checking for ODBC v3 support for PDO" >&5 # Check whether --with-pdo-odbc or --without-pdo-odbc was given. if test "${with_pdo_odbc+set}" = set; then withval="$with_pdo_odbc" @@ -73072,13 +73842,13 @@ if test "$PHP_PDO_ODBC" != "no"; then echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:73076: checking for PDO includes" >&5 +echo "configure:73846: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:73082: checking for PDO includes" >&5 +echo "configure:73852: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -73099,7 +73869,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6 echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6 -echo "configure:73103: checking for selected PDO ODBC flavour" >&5 +echo "configure:73873: checking for selected PDO ODBC flavour" >&5 pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`" pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`" @@ -73173,7 +73943,7 @@ echo "configure:73103: checking for selected PDO ODBC flavour" >&5 echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73177: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:73947: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/odbc.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73187,7 +73957,7 @@ EOF echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73191: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:73961: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73201,7 +73971,7 @@ EOF echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73205: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:73975: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73215,7 +73985,7 @@ EOF echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73219: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:73989: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73229,7 +73999,7 @@ EOF echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73233: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74003: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73243,7 +74013,7 @@ EOF echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73247: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74017: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73257,7 +74027,7 @@ EOF echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73261: checking for sql.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74031: checking for sql.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sql.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73271,7 +74041,7 @@ EOF echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73275: checking for isql.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74045: checking for isql.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/isql.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73285,7 +74055,7 @@ EOF echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73289: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74059: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73299,7 +74069,7 @@ EOF echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73303: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74073: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73313,7 +74083,7 @@ EOF echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73317: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74087: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73327,7 +74097,7 @@ EOF echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73331: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74101: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73341,7 +74111,7 @@ EOF echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73345: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74115: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73355,7 +74125,7 @@ EOF echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73359: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74129: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73369,7 +74139,7 @@ EOF echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73373: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74143: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73383,7 +74153,7 @@ EOF echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73387: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74157: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73397,7 +74167,7 @@ EOF echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73401: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74171: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73411,7 +74181,7 @@ EOF echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 -echo "configure:73415: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 +echo "configure:74185: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then php_pdo_have_header=yes cat >> confdefs.h <<\EOF @@ -73615,7 +74385,7 @@ EOF done echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 -echo "configure:73619: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 +echo "configure:74389: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -73623,7 +74393,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$pdo_odbc_def_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 73627 "configure" +#line 74397 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -73634,7 +74404,7 @@ int main() { SQLBindCol() ; return 0; } EOF -if { (eval echo configure:73638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:74408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -73748,7 +74518,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then done echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 -echo "configure:73752: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 +echo "configure:74522: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -73756,7 +74526,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$pdo_odbc_def_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 73760 "configure" +#line 74530 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -73767,7 +74537,7 @@ int main() { SQLAllocHandle() ; return 0; } EOF -if { (eval echo configure:73771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:74541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74135,7 +74905,7 @@ if test "$PHP_PDO" != "no"; then echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6 -echo "configure:74139: checking for PostgreSQL support for PDO" >&5 +echo "configure:74909: checking for PostgreSQL support for PDO" >&5 # Check whether --with-pdo-pgsql or --without-pdo-pgsql was given. if test "${with_pdo_pgsql+set}" = set; then withval="$with_pdo_pgsql" @@ -74192,7 +74962,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then echo $ac_n "checking for pg_config""... $ac_c" 1>&6 -echo "configure:74196: checking for pg_config" >&5 +echo "configure:74966: checking for pg_config" >&5 for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do if test -x $i/pg_config; then PG_CONFIG="$i/pg_config" @@ -74256,7 +75026,7 @@ EOF echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6 -echo "configure:74260: checking for openssl dependencies" >&5 +echo "configure:75030: checking for openssl dependencies" >&5 if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then echo "$ac_t""yes" 1>&6 if pkg-config openssl ; then @@ -74270,7 +75040,7 @@ echo "configure:74260: checking for openssl dependencies" >&5 old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR" echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6 -echo "configure:74274: checking for PQescapeString in -lpq" >&5 +echo "configure:75044: checking for PQescapeString in -lpq" >&5 ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74278,7 +75048,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74282 "configure" +#line 75052 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74289,7 +75059,7 @@ int main() { PQescapeString() ; return 0; } EOF -if { (eval echo configure:74293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74313,7 +75083,7 @@ else fi echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 -echo "configure:74317: checking for PQescapeStringConn in -lpq" >&5 +echo "configure:75087: checking for PQescapeStringConn in -lpq" >&5 ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74321,7 +75091,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74325 "configure" +#line 75095 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74332,7 +75102,7 @@ int main() { PQescapeStringConn() ; return 0; } EOF -if { (eval echo configure:74336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74356,7 +75126,7 @@ else fi echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 -echo "configure:74360: checking for PQescapeByteaConn in -lpq" >&5 +echo "configure:75130: checking for PQescapeByteaConn in -lpq" >&5 ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74364,7 +75134,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74368 "configure" +#line 75138 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74375,7 +75145,7 @@ int main() { PQescapeByteaConn() ; return 0; } EOF -if { (eval echo configure:74379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74399,7 +75169,7 @@ else fi echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6 -echo "configure:74403: checking for PQsetnonblocking in -lpq" >&5 +echo "configure:75173: checking for PQsetnonblocking in -lpq" >&5 ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74407,7 +75177,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74411 "configure" +#line 75181 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74418,7 +75188,7 @@ int main() { PQsetnonblocking() ; return 0; } EOF -if { (eval echo configure:74422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74442,7 +75212,7 @@ else fi echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6 -echo "configure:74446: checking for PQcmdTuples in -lpq" >&5 +echo "configure:75216: checking for PQcmdTuples in -lpq" >&5 ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74450,7 +75220,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74454 "configure" +#line 75224 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74461,7 +75231,7 @@ int main() { PQcmdTuples() ; return 0; } EOF -if { (eval echo configure:74465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74485,7 +75255,7 @@ else fi echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6 -echo "configure:74489: checking for PQoidValue in -lpq" >&5 +echo "configure:75259: checking for PQoidValue in -lpq" >&5 ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74493,7 +75263,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74497 "configure" +#line 75267 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74504,7 +75274,7 @@ int main() { PQoidValue() ; return 0; } EOF -if { (eval echo configure:74508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74528,7 +75298,7 @@ else fi echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6 -echo "configure:74532: checking for PQclientEncoding in -lpq" >&5 +echo "configure:75302: checking for PQclientEncoding in -lpq" >&5 ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74536,7 +75306,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74540 "configure" +#line 75310 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74547,7 +75317,7 @@ int main() { PQclientEncoding() ; return 0; } EOF -if { (eval echo configure:74551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74571,7 +75341,7 @@ else fi echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 -echo "configure:74575: checking for PQparameterStatus in -lpq" >&5 +echo "configure:75345: checking for PQparameterStatus in -lpq" >&5 ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74579,7 +75349,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74583 "configure" +#line 75353 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74590,7 +75360,7 @@ int main() { PQparameterStatus() ; return 0; } EOF -if { (eval echo configure:74594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74614,7 +75384,7 @@ else fi echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6 -echo "configure:74618: checking for PQprotocolVersion in -lpq" >&5 +echo "configure:75388: checking for PQprotocolVersion in -lpq" >&5 ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74622,7 +75392,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74626 "configure" +#line 75396 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74633,7 +75403,7 @@ int main() { PQprotocolVersion() ; return 0; } EOF -if { (eval echo configure:74637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74657,7 +75427,7 @@ else fi echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6 -echo "configure:74661: checking for PQtransactionStatus in -lpq" >&5 +echo "configure:75431: checking for PQtransactionStatus in -lpq" >&5 ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74665,7 +75435,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74669 "configure" +#line 75439 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74676,7 +75446,7 @@ int main() { PQtransactionStatus() ; return 0; } EOF -if { (eval echo configure:74680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74700,7 +75470,7 @@ else fi echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6 -echo "configure:74704: checking for PQunescapeBytea in -lpq" >&5 +echo "configure:75474: checking for PQunescapeBytea in -lpq" >&5 ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74708,7 +75478,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74712 "configure" +#line 75482 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74719,7 +75489,7 @@ int main() { PQunescapeBytea() ; return 0; } EOF -if { (eval echo configure:74723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74743,7 +75513,7 @@ else fi echo $ac_n "checking for PQExecParams in -lpq""... $ac_c" 1>&6 -echo "configure:74747: checking for PQExecParams in -lpq" >&5 +echo "configure:75517: checking for PQExecParams in -lpq" >&5 ac_lib_var=`echo pq'_'PQExecParams | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74751,7 +75521,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74755 "configure" +#line 75525 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74762,7 +75532,7 @@ int main() { PQExecParams() ; return 0; } EOF -if { (eval echo configure:74766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74786,7 +75556,7 @@ else fi echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 -echo "configure:74790: checking for PQresultErrorField in -lpq" >&5 +echo "configure:75560: checking for PQresultErrorField in -lpq" >&5 ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74794,7 +75564,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74798 "configure" +#line 75568 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74805,7 +75575,7 @@ int main() { PQresultErrorField() ; return 0; } EOF -if { (eval echo configure:74809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74829,7 +75599,7 @@ else fi echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 -echo "configure:74833: checking for pg_encoding_to_char in -lpq" >&5 +echo "configure:75603: checking for pg_encoding_to_char in -lpq" >&5 ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74837,7 +75607,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74841 "configure" +#line 75611 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74848,7 +75618,7 @@ int main() { pg_encoding_to_char() ; return 0; } EOF -if { (eval echo configure:74852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -74873,7 +75643,7 @@ fi echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 -echo "configure:74877: checking for PQprepare in -lpq" >&5 +echo "configure:75647: checking for PQprepare in -lpq" >&5 ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -74881,7 +75651,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 74885 "configure" +#line 75655 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -74892,7 +75662,7 @@ int main() { PQprepare() ; return 0; } EOF -if { (eval echo configure:74896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:75666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -75054,13 +75824,13 @@ fi echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:75058: checking for PDO includes" >&5 +echo "configure:75828: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:75064: checking for PDO includes" >&5 +echo "configure:75834: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -75392,7 +76162,7 @@ if test "$PHP_PDO" != "no"; then echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6 -echo "configure:75396: checking for sqlite 3 support for PDO" >&5 +echo "configure:76166: checking for sqlite 3 support for PDO" >&5 # Check whether --with-pdo-sqlite or --without-pdo-sqlite was given. if test "${with_pdo_sqlite+set}" = set; then withval="$with_pdo_sqlite" @@ -75440,13 +76210,13 @@ if test "$PHP_PDO_SQLITE" != "no"; then echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:75444: checking for PDO includes" >&5 +echo "configure:76214: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:75450: checking for PDO includes" >&5 +echo "configure:76220: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -75475,7 +76245,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6 PDO_SQLITE_DIR=$PHP_PDO_SQLITE else # search default path list echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6 -echo "configure:75479: checking for sqlite3 files in default path" >&5 +echo "configure:76249: checking for sqlite3 files in default path" >&5 for i in $SEARCH_PATH ; do if test -r $i/$SEARCH_FOR; then PDO_SQLITE_DIR=$i @@ -75526,7 +76296,7 @@ echo "configure:75479: checking for sqlite3 files in default path" >&5 save_old_LDFLAGS=$LDFLAGS ac_stuff=" - -L$PDO_SQLITE_DIR/lib -lm + -L$PDO_SQLITE_DIR/$PHP_LIBDIR -lm " save_ext_shared=$ext_shared @@ -75620,7 +76390,7 @@ echo "configure:75479: checking for sqlite3 files in default path" >&5 done echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6 -echo "configure:75624: checking for $LIBSYMBOL in -l$LIBNAME" >&5 +echo "configure:76394: checking for $LIBSYMBOL in -l$LIBNAME" >&5 ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -75628,7 +76398,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 75632 "configure" +#line 76402 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -75639,7 +76409,7 @@ int main() { $LIBSYMBOL() ; return 0; } EOF -if { (eval echo configure:75643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:76413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -75662,18 +76432,18 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then if test "$ext_shared" = "yes"; then PDO_SQLITE_SHARED_LIBADD="-l$LIBNAME $PDO_SQLITE_SHARED_LIBADD" - if test -n "$PDO_SQLITE_DIR/lib"; then + if test -n "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then - if test "$PDO_SQLITE_DIR/lib" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/lib" != "/usr/lib"; then + if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then - if test -z "$PDO_SQLITE_DIR/lib" || echo "$PDO_SQLITE_DIR/lib" | grep '^/' >/dev/null ; then - ai_p=$PDO_SQLITE_DIR/lib + if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR else - ep_dir="`echo $PDO_SQLITE_DIR/lib|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/lib\"`" + ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`" fi @@ -75704,18 +76474,18 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else - if test -n "$PDO_SQLITE_DIR/lib"; then + if test -n "$PDO_SQLITE_DIR/$PHP_LIBDIR"; then - if test "$PDO_SQLITE_DIR/lib" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/lib" != "/usr/lib"; then + if test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PDO_SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then - if test -z "$PDO_SQLITE_DIR/lib" || echo "$PDO_SQLITE_DIR/lib" | grep '^/' >/dev/null ; then - ai_p=$PDO_SQLITE_DIR/lib + if test -z "$PDO_SQLITE_DIR/$PHP_LIBDIR" || echo "$PDO_SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR else - ep_dir="`echo $PDO_SQLITE_DIR/lib|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/lib\"`" + ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`" fi @@ -75867,7 +76637,7 @@ fi done echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 -echo "configure:75871: checking for sqlite3_key in -lsqlite3" >&5 +echo "configure:76641: checking for sqlite3_key in -lsqlite3" >&5 ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -75875,7 +76645,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <<EOF -#line 75879 "configure" +#line 76649 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -75886,7 +76656,7 @@ int main() { sqlite3_key() ; return 0; } EOF -if { (eval echo configure:75890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:76660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -76220,11 +76990,17 @@ EOF sqlite/src/vdbemem.c sqlite/src/where.c sqlite/src/parse.c sqlite/src/opcodes.c \ sqlite/src/alter.c sqlite/src/vdbefifo.c sqlite/src/vtab.c sqlite/src/loadext.c" + if test "$enable_maintainer_zts" = "yes"; then + threadsafe_flag="-DTHREADSAFE=1" + else + threadsafe_flag="-DTHREADSAFE=0" + fi + ext_builddir=ext/pdo_sqlite ext_srcdir=$abs_srcdir/ext/pdo_sqlite - ac_extra=`echo "-I$ext_srcdir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR -I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` + ac_extra=`echo "-I$ext_srcdir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR $threadsafe_flag -I$pdo_inc_path"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then PHP_PDO_SQLITE_SHARED=no @@ -76511,7 +77287,7 @@ EOF echo $ac_n "checking size of char *""... $ac_c" 1>&6 -echo "configure:76515: checking size of char *" >&5 +echo "configure:77291: checking size of char *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -76519,7 +77295,7 @@ else ac_cv_sizeof_char_p=4 else cat > conftest.$ac_ext <<EOF -#line 76523 "configure" +#line 77299 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -76530,7 +77306,7 @@ int main() return(0); } EOF -if { (eval echo configure:76534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:77310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char_p=`cat conftestval` else @@ -76553,7 +77329,7 @@ EOF #define SQLITE_PTR_SZ SIZEOF_CHAR_P EOF - PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION` + PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION | sed 's/^0-9.//g'` PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | $AWK -F. '{printf("%d%03d%03d", $1, $2, $3)}'` sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ $ext_srcdir/sqlite/src/sqlite.h.in > $ext_srcdir/sqlite/src/sqlite3.h @@ -76577,12 +77353,12 @@ EOF for ac_func in usleep nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:76581: checking for $ac_func" >&5 +echo "configure:77357: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 76586 "configure" +#line 77362 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -76605,7 +77381,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:76609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:77385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -76633,17 +77409,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:76637: checking for $ac_hdr" >&5 +echo "configure:77413: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 76642 "configure" +#line 77418 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:76647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:77423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -76765,7 +77541,7 @@ done done echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6 -echo "configure:76769: checking for fdatasync in -lrt" >&5 +echo "configure:77545: checking for fdatasync in -lrt" >&5 ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -76773,7 +77549,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <<EOF -#line 76777 "configure" +#line 77553 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -76784,7 +77560,7 @@ int main() { fdatasync() ; return 0; } EOF -if { (eval echo configure:76788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:77564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -76869,7 +77645,7 @@ fi echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6 -echo "configure:76873: checking for PostgreSQL support" >&5 +echo "configure:77649: checking for PostgreSQL support" >&5 # Check whether --with-pgsql or --without-pgsql was given. if test "${with_pgsql+set}" = set; then withval="$with_pgsql" @@ -76926,7 +77702,7 @@ if test "$PHP_PGSQL" != "no"; then echo $ac_n "checking for pg_config""... $ac_c" 1>&6 -echo "configure:76930: checking for pg_config" >&5 +echo "configure:77706: checking for pg_config" >&5 for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do if test -x $i/pg_config; then PG_CONFIG="$i/pg_config" @@ -76994,7 +77770,7 @@ EOF old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR" echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6 -echo "configure:76998: checking for PQescapeString in -lpq" >&5 +echo "configure:77774: checking for PQescapeString in -lpq" >&5 ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77002,7 +77778,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77006 "configure" +#line 77782 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77013,7 +77789,7 @@ int main() { PQescapeString() ; return 0; } EOF -if { (eval echo configure:77017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:77793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77037,7 +77813,7 @@ else fi echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6 -echo "configure:77041: checking for PQunescapeBytea in -lpq" >&5 +echo "configure:77817: checking for PQunescapeBytea in -lpq" >&5 ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77045,7 +77821,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77049 "configure" +#line 77825 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77056,7 +77832,7 @@ int main() { PQunescapeBytea() ; return 0; } EOF -if { (eval echo configure:77060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:77836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77080,7 +77856,7 @@ else fi echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6 -echo "configure:77084: checking for PQsetnonblocking in -lpq" >&5 +echo "configure:77860: checking for PQsetnonblocking in -lpq" >&5 ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77088,7 +77864,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77092 "configure" +#line 77868 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77099,7 +77875,7 @@ int main() { PQsetnonblocking() ; return 0; } EOF -if { (eval echo configure:77103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:77879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77123,7 +77899,7 @@ else fi echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6 -echo "configure:77127: checking for PQcmdTuples in -lpq" >&5 +echo "configure:77903: checking for PQcmdTuples in -lpq" >&5 ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77131,7 +77907,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77135 "configure" +#line 77911 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77142,7 +77918,7 @@ int main() { PQcmdTuples() ; return 0; } EOF -if { (eval echo configure:77146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:77922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77166,7 +77942,7 @@ else fi echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6 -echo "configure:77170: checking for PQoidValue in -lpq" >&5 +echo "configure:77946: checking for PQoidValue in -lpq" >&5 ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77174,7 +77950,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77178 "configure" +#line 77954 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77185,7 +77961,7 @@ int main() { PQoidValue() ; return 0; } EOF -if { (eval echo configure:77189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:77965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77209,7 +77985,7 @@ else fi echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6 -echo "configure:77213: checking for PQclientEncoding in -lpq" >&5 +echo "configure:77989: checking for PQclientEncoding in -lpq" >&5 ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77217,7 +77993,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77221 "configure" +#line 77997 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77228,7 +78004,7 @@ int main() { PQclientEncoding() ; return 0; } EOF -if { (eval echo configure:77232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77252,7 +78028,7 @@ else fi echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 -echo "configure:77256: checking for PQparameterStatus in -lpq" >&5 +echo "configure:78032: checking for PQparameterStatus in -lpq" >&5 ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77260,7 +78036,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77264 "configure" +#line 78040 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77271,7 +78047,7 @@ int main() { PQparameterStatus() ; return 0; } EOF -if { (eval echo configure:77275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77295,7 +78071,7 @@ else fi echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6 -echo "configure:77299: checking for PQprotocolVersion in -lpq" >&5 +echo "configure:78075: checking for PQprotocolVersion in -lpq" >&5 ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77303,7 +78079,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77307 "configure" +#line 78083 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77314,7 +78090,7 @@ int main() { PQprotocolVersion() ; return 0; } EOF -if { (eval echo configure:77318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77338,7 +78114,7 @@ else fi echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6 -echo "configure:77342: checking for PQtransactionStatus in -lpq" >&5 +echo "configure:78118: checking for PQtransactionStatus in -lpq" >&5 ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77346,7 +78122,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77350 "configure" +#line 78126 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77357,7 +78133,7 @@ int main() { PQtransactionStatus() ; return 0; } EOF -if { (eval echo configure:77361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77381,7 +78157,7 @@ else fi echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6 -echo "configure:77385: checking for PQexecParams in -lpq" >&5 +echo "configure:78161: checking for PQexecParams in -lpq" >&5 ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77389,7 +78165,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77393 "configure" +#line 78169 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77400,7 +78176,7 @@ int main() { PQexecParams() ; return 0; } EOF -if { (eval echo configure:77404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77424,7 +78200,7 @@ else fi echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 -echo "configure:77428: checking for PQprepare in -lpq" >&5 +echo "configure:78204: checking for PQprepare in -lpq" >&5 ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77432,7 +78208,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77436 "configure" +#line 78212 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77443,7 +78219,7 @@ int main() { PQprepare() ; return 0; } EOF -if { (eval echo configure:77447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77467,7 +78243,7 @@ else fi echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6 -echo "configure:77471: checking for PQexecPrepared in -lpq" >&5 +echo "configure:78247: checking for PQexecPrepared in -lpq" >&5 ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77475,7 +78251,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77479 "configure" +#line 78255 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77486,7 +78262,7 @@ int main() { PQexecPrepared() ; return 0; } EOF -if { (eval echo configure:77490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77510,7 +78286,7 @@ else fi echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 -echo "configure:77514: checking for PQresultErrorField in -lpq" >&5 +echo "configure:78290: checking for PQresultErrorField in -lpq" >&5 ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77518,7 +78294,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77522 "configure" +#line 78298 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77529,7 +78305,7 @@ int main() { PQresultErrorField() ; return 0; } EOF -if { (eval echo configure:77533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77553,7 +78329,7 @@ else fi echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6 -echo "configure:77557: checking for PQsendQueryParams in -lpq" >&5 +echo "configure:78333: checking for PQsendQueryParams in -lpq" >&5 ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77561,7 +78337,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77565 "configure" +#line 78341 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77572,7 +78348,7 @@ int main() { PQsendQueryParams() ; return 0; } EOF -if { (eval echo configure:77576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77596,7 +78372,7 @@ else fi echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6 -echo "configure:77600: checking for PQsendPrepare in -lpq" >&5 +echo "configure:78376: checking for PQsendPrepare in -lpq" >&5 ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77604,7 +78380,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77608 "configure" +#line 78384 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77615,7 +78391,7 @@ int main() { PQsendPrepare() ; return 0; } EOF -if { (eval echo configure:77619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77639,7 +78415,7 @@ else fi echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6 -echo "configure:77643: checking for PQsendQueryPrepared in -lpq" >&5 +echo "configure:78419: checking for PQsendQueryPrepared in -lpq" >&5 ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77647,7 +78423,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77651 "configure" +#line 78427 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77658,7 +78434,7 @@ int main() { PQsendQueryPrepared() ; return 0; } EOF -if { (eval echo configure:77662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77682,7 +78458,7 @@ else fi echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6 -echo "configure:77686: checking for PQputCopyData in -lpq" >&5 +echo "configure:78462: checking for PQputCopyData in -lpq" >&5 ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77690,7 +78466,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77694 "configure" +#line 78470 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77701,7 +78477,7 @@ int main() { PQputCopyData() ; return 0; } EOF -if { (eval echo configure:77705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77725,7 +78501,7 @@ else fi echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6 -echo "configure:77729: checking for PQputCopyEnd in -lpq" >&5 +echo "configure:78505: checking for PQputCopyEnd in -lpq" >&5 ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77733,7 +78509,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77737 "configure" +#line 78513 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77744,7 +78520,7 @@ int main() { PQputCopyEnd() ; return 0; } EOF -if { (eval echo configure:77748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77768,7 +78544,7 @@ else fi echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6 -echo "configure:77772: checking for PQgetCopyData in -lpq" >&5 +echo "configure:78548: checking for PQgetCopyData in -lpq" >&5 ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77776,7 +78552,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77780 "configure" +#line 78556 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77787,7 +78563,7 @@ int main() { PQgetCopyData() ; return 0; } EOF -if { (eval echo configure:77791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77810,8 +78586,51 @@ else echo "$ac_t""no" 1>&6 fi + echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6 +echo "configure:78591: checking for PQfreemem in -lpq" >&5 +ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <<EOF +#line 78599 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char PQfreemem(); + +int main() { +PQfreemem() +; return 0; } +EOF +if { (eval echo configure:78610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_PQFREEMEM 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6 -echo "configure:77815: checking for PQsetErrorVerbosity in -lpq" >&5 +echo "configure:78634: checking for PQsetErrorVerbosity in -lpq" >&5 ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77819,7 +78638,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77823 "configure" +#line 78642 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77830,7 +78649,7 @@ int main() { PQsetErrorVerbosity() ; return 0; } EOF -if { (eval echo configure:77834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77854,7 +78673,7 @@ else fi echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 -echo "configure:77858: checking for PQftable in -lpq" >&5 +echo "configure:78677: checking for PQftable in -lpq" >&5 ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77862,7 +78681,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77866 "configure" +#line 78685 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77873,7 +78692,7 @@ int main() { PQftable() ; return 0; } EOF -if { (eval echo configure:77877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77897,7 +78716,7 @@ else fi echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 -echo "configure:77901: checking for PQescapeStringConn in -lpq" >&5 +echo "configure:78720: checking for PQescapeStringConn in -lpq" >&5 ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77905,7 +78724,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77909 "configure" +#line 78728 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77916,7 +78735,7 @@ int main() { PQescapeStringConn() ; return 0; } EOF -if { (eval echo configure:77920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77940,7 +78759,7 @@ else fi echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 -echo "configure:77944: checking for PQescapeByteaConn in -lpq" >&5 +echo "configure:78763: checking for PQescapeByteaConn in -lpq" >&5 ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77948,7 +78767,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77952 "configure" +#line 78771 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -77959,7 +78778,7 @@ int main() { PQescapeByteaConn() ; return 0; } EOF -if { (eval echo configure:77963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -77983,7 +78802,7 @@ else fi echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 -echo "configure:77987: checking for pg_encoding_to_char in -lpq" >&5 +echo "configure:78806: checking for pg_encoding_to_char in -lpq" >&5 ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -77991,7 +78810,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <<EOF -#line 77995 "configure" +#line 78814 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -78002,7 +78821,7 @@ int main() { pg_encoding_to_char() ; return 0; } EOF -if { (eval echo configure:78006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:78825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -78449,7 +79268,7 @@ fi echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6 -echo "configure:78453: checking whether to enable POSIX-like functions" >&5 +echo "configure:79272: checking whether to enable POSIX-like functions" >&5 # Check whether --enable-posix or --disable-posix was given. if test "${enable_posix+set}" = set; then enableval="$enable_posix" @@ -78783,17 +79602,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:78787: checking for $ac_hdr" >&5 +echo "configure:79606: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 78792 "configure" +#line 79611 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:78797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:79616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -78820,15 +79639,15 @@ fi done - for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups + for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:78827: checking for $ac_func" >&5 +echo "configure:79646: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 78832 "configure" +#line 79651 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -78851,7 +79670,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:78855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:79674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -78875,13 +79694,55 @@ else fi done + + echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6 +echo "configure:79700: checking for working ttyname_r() implementation" >&5 + if test "$cross_compiling" = yes; then + + echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6 + +else + cat > conftest.$ac_ext <<EOF +#line 79707 "configure" +#include "confdefs.h" + +#include <unistd.h> + +int main(int argc, char *argv[]) +{ + char buf[64]; + + return ttyname_r(0, buf, 64) ? 1 : 0; +} + +EOF +if { (eval echo configure:79720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_TTYNAME_R 1 +EOF + + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + + echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6 + +fi +rm -fr conftest* +fi + fi echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6 -echo "configure:78885: checking for PSPELL support" >&5 +echo "configure:79746: checking for PSPELL support" >&5 # Check whether --with-pspell or --without-pspell was given. if test "${with_pspell+set}" = set; then withval="$with_pspell" @@ -79421,7 +80282,7 @@ EOF done echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6 -echo "configure:79425: checking for new_aspell_config in -laspell" >&5 +echo "configure:80286: checking for new_aspell_config in -laspell" >&5 ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -79429,7 +80290,7 @@ else ac_save_LIBS="$LIBS" LIBS="-laspell $LIBS" cat > conftest.$ac_ext <<EOF -#line 79433 "configure" +#line 80294 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -79440,7 +80301,7 @@ int main() { new_aspell_config() ; return 0; } EOF -if { (eval echo configure:79444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:80305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -79612,7 +80473,7 @@ fi echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6 -echo "configure:79616: checking for libedit readline replacement" >&5 +echo "configure:80477: checking for libedit readline replacement" >&5 # Check whether --with-libedit or --without-libedit was given. if test "${with_libedit+set}" = set; then withval="$with_libedit" @@ -79659,7 +80520,7 @@ if test "$PHP_LIBEDIT" = "no"; then echo $ac_n "checking for readline support""... $ac_c" 1>&6 -echo "configure:79663: checking for readline support" >&5 +echo "configure:80524: checking for readline support" >&5 # Check whether --with-readline or --without-readline was given. if test "${with_readline+set}" = set; then withval="$with_readline" @@ -79746,7 +80607,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then PHP_READLINE_LIBS="" echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:79750: checking for tgetent in -lncurses" >&5 +echo "configure:80611: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -79754,7 +80615,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 79758 "configure" +#line 80619 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -79765,7 +80626,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:79769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:80630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -79810,7 +80671,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:79814: checking for tgetent in -ltermcap" >&5 +echo "configure:80675: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -79818,7 +80679,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 79822 "configure" +#line 80683 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -79829,7 +80690,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:79833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:80694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -79975,7 +80836,7 @@ fi done echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:79979: checking for readline in -lreadline" >&5 +echo "configure:80840: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -79983,7 +80844,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <<EOF -#line 79987 "configure" +#line 80848 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -79994,7 +80855,7 @@ int main() { readline() ; return 0; } EOF -if { (eval echo configure:79998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:80859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -80221,7 +81082,7 @@ fi done echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6 -echo "configure:80225: checking for rl_callback_read_char in -lreadline" >&5 +echo "configure:81086: checking for rl_callback_read_char in -lreadline" >&5 ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -80229,7 +81090,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <<EOF -#line 80233 "configure" +#line 81094 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -80240,7 +81101,7 @@ int main() { rl_callback_read_char() ; return 0; } EOF -if { (eval echo configure:80244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:81105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -80373,7 +81234,7 @@ fi done echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6 -echo "configure:80377: checking for add_history in -lhistory" >&5 +echo "configure:81238: checking for add_history in -lhistory" >&5 ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -80381,7 +81242,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lhistory $LIBS" cat > conftest.$ac_ext <<EOF -#line 80385 "configure" +#line 81246 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -80392,7 +81253,7 @@ int main() { add_history() ; return 0; } EOF -if { (eval echo configure:80396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:81257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -80570,7 +81431,7 @@ elif test "$PHP_LIBEDIT" != "no"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:80574: checking for tgetent in -lncurses" >&5 +echo "configure:81435: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -80578,7 +81439,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 80582 "configure" +#line 81443 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -80589,7 +81450,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:80593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:81454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -80633,7 +81494,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:80637: checking for tgetent in -ltermcap" >&5 +echo "configure:81498: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -80641,7 +81502,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 80645 "configure" +#line 81506 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -80652,7 +81513,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:80656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:81517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -80797,7 +81658,7 @@ fi done echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6 -echo "configure:80801: checking for readline in -ledit" >&5 +echo "configure:81662: checking for readline in -ledit" >&5 ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -80805,7 +81666,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ledit $LIBS" cat > conftest.$ac_ext <<EOF -#line 80809 "configure" +#line 81670 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -80816,7 +81677,7 @@ int main() { readline() ; return 0; } EOF -if { (eval echo configure:80820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:81681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -80956,12 +81817,12 @@ if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then for ac_func in rl_completion_matches do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:80960: checking for $ac_func" >&5 +echo "configure:81821: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 80965 "configure" +#line 81826 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -80984,7 +81845,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:80988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:81849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -81298,7 +82159,7 @@ fi echo $ac_n "checking for recode support""... $ac_c" 1>&6 -echo "configure:81302: checking for recode support" >&5 +echo "configure:82163: checking for recode support" >&5 # Check whether --with-recode or --without-recode was given. if test "${with_recode+set}" = set; then withval="$with_recode" @@ -81464,7 +82325,7 @@ if test "$PHP_RECODE" != "no"; then done echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6 -echo "configure:81468: checking for recode_format_table in -lrecode" >&5 +echo "configure:82329: checking for recode_format_table in -lrecode" >&5 ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -81472,7 +82333,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrecode $LIBS" cat > conftest.$ac_ext <<EOF -#line 81476 "configure" +#line 82337 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -81483,7 +82344,7 @@ int main() { recode_format_table() ; return 0; } EOF -if { (eval echo configure:81487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:82348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -81612,7 +82473,7 @@ else LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB" LIBS="$LIBS -lrecode" cat > conftest.$ac_ext <<EOF -#line 81616 "configure" +#line 82477 "configure" #include "confdefs.h" char *program_name; @@ -81623,7 +82484,7 @@ recode_format_table(); ; return 0; } EOF -if { (eval echo configure:81627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:82488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* @@ -81785,17 +82646,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:81789: checking for $ac_hdr" >&5 +echo "configure:82650: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 81794 "configure" +#line 82655 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:81799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:82660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -82108,7 +82969,7 @@ fi echo $ac_n "checking whether to enable reflection support""... $ac_c" 1>&6 -echo "configure:82112: checking whether to enable reflection support" >&5 +echo "configure:82973: checking whether to enable reflection support" >&5 # Check whether --enable-reflection or --disable-reflection was given. if test "${enable_reflection+set}" = set; then enableval="$enable_reflection" @@ -82422,7 +83283,7 @@ fi echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6 -echo "configure:82426: checking whether to enable PHP sessions" >&5 +echo "configure:83287: checking whether to enable PHP sessions" >&5 # Check whether --enable-session or --disable-session was given. if test "${enable_session+set}" = set; then enableval="$enable_session" @@ -82468,7 +83329,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking for mm support""... $ac_c" 1>&6 -echo "configure:82472: checking for mm support" >&5 +echo "configure:83333: checking for mm support" >&5 # Check whether --with-mm or --without-mm was given. if test "${with_mm+set}" = set; then withval="$with_mm" @@ -82493,7 +83354,7 @@ echo "$ac_t""$ext_output" 1>&6 if test "$PHP_SESSION" != "no"; then echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6 -echo "configure:82497: checking whether pwrite works" >&5 +echo "configure:83358: checking whether pwrite works" >&5 if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -82505,7 +83366,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 82509 "configure" +#line 83370 "configure" #include "confdefs.h" #include <sys/types.h> @@ -82526,7 +83387,7 @@ else EOF -if { (eval echo configure:82530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:83391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_pwrite=yes @@ -82551,7 +83412,7 @@ fi else cat > conftest.$ac_ext <<EOF -#line 82555 "configure" +#line 83416 "configure" #include "confdefs.h" #include <sys/types.h> @@ -82572,7 +83433,7 @@ ssize_t pwrite(int, void *, size_t, off64_t); EOF -if { (eval echo configure:82576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:83437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_pwrite=yes @@ -82613,7 +83474,7 @@ EOF echo $ac_n "checking whether pread works""... $ac_c" 1>&6 -echo "configure:82617: checking whether pread works" >&5 +echo "configure:83478: checking whether pread works" >&5 if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -82626,7 +83487,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 82630 "configure" +#line 83491 "configure" #include "confdefs.h" #include <sys/types.h> @@ -82646,7 +83507,7 @@ else } EOF -if { (eval echo configure:82650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:83511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_pread=yes @@ -82673,7 +83534,7 @@ fi else cat > conftest.$ac_ext <<EOF -#line 82677 "configure" +#line 83538 "configure" #include "confdefs.h" #include <sys/types.h> @@ -82693,7 +83554,7 @@ ssize_t pread(int, void *, size_t, off64_t); } EOF -if { (eval echo configure:82697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:83558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_pread=yes @@ -83206,7 +84067,7 @@ fi echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 -echo "configure:83210: checking whether to enable shmop support" >&5 +echo "configure:84071: checking whether to enable shmop support" >&5 # Check whether --enable-shmop or --disable-shmop was given. if test "${enable_shmop+set}" = set; then enableval="$enable_shmop" @@ -83541,7 +84402,7 @@ fi echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6 -echo "configure:83545: checking whether to enable SimpleXML support" >&5 +echo "configure:84406: checking whether to enable SimpleXML support" >&5 # Check whether --enable-simplexml or --disable-simplexml was given. if test "${enable_simplexml+set}" = set; then enableval="$enable_simplexml" @@ -83588,7 +84449,7 @@ if test -z "$PHP_LIBXML_DIR"; then echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:83592: checking libxml2 install dir" >&5 +echo "configure:84453: checking libxml2 install dir" >&5 # Check whether --with-libxml-dir or --without-libxml-dir was given. if test "${with_libxml_dir+set}" = set; then withval="$with_libxml_dir" @@ -83619,7 +84480,7 @@ if test "$PHP_SIMPLEXML" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:83623: checking for xml2-config path" >&5 +echo "configure:84484: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -83776,7 +84637,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:83780: checking whether libxml build works" >&5 +echo "configure:84641: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -83792,7 +84653,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 83796 "configure" +#line 84657 "configure" #include "confdefs.h" @@ -83803,7 +84664,7 @@ else } EOF -if { (eval echo configure:83807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:84668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -84179,7 +85040,7 @@ fi echo $ac_n "checking for SNMP support""... $ac_c" 1>&6 -echo "configure:84183: checking for SNMP support" >&5 +echo "configure:85044: checking for SNMP support" >&5 # Check whether --with-snmp or --without-snmp was given. if test "${with_snmp+set}" = set; then withval="$with_snmp" @@ -84225,7 +85086,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6 -echo "configure:84229: checking OpenSSL dir for SNMP" >&5 +echo "configure:85090: checking OpenSSL dir for SNMP" >&5 # Check whether --with-openssl-dir or --without-openssl-dir was given. if test "${with_openssl_dir+set}" = set; then withval="$with_openssl_dir" @@ -84253,7 +85114,7 @@ if test "$PHP_SNMP" != "no"; then # Extract the first word of "net-snmp-config", so it can be a program name with args. set dummy net-snmp-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:84257: checking for $ac_word" >&5 +echo "configure:85118: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -84453,17 +85314,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:84457: checking for $ac_hdr" >&5 +echo "configure:85318: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 84462 "configure" +#line 85323 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:84467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:85328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -84491,9 +85352,9 @@ done if test "$ac_cv_header_default_store_h" = "yes"; then echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6 -echo "configure:84495: checking for OpenSSL support in SNMP libraries" >&5 +echo "configure:85356: checking for OpenSSL support in SNMP libraries" >&5 cat > conftest.$ac_ext <<EOF -#line 84497 "configure" +#line 85358 "configure" #include "confdefs.h" #include <ucd-snmp-config.h> @@ -84548,7 +85409,7 @@ rm -f conftest* # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:84552: checking for $ac_word" >&5 +echo "configure:85413: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -84752,9 +85613,9 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -echo "configure:84756: checking for OpenSSL version" >&5 +echo "configure:85617: checking for OpenSSL version" >&5 cat > conftest.$ac_ext <<EOF -#line 84758 "configure" +#line 85619 "configure" #include "confdefs.h" #include <openssl/opensslv.h> @@ -84908,7 +85769,7 @@ rm -f conftest* done echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -echo "configure:84912: checking for CRYPTO_free in -lcrypto" >&5 +echo "configure:85773: checking for CRYPTO_free in -lcrypto" >&5 ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -84916,7 +85777,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <<EOF -#line 84920 "configure" +#line 85781 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -84927,7 +85788,7 @@ int main() { CRYPTO_free() ; return 0; } EOF -if { (eval echo configure:84931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:85792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -85083,7 +85944,7 @@ fi done echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 -echo "configure:85087: checking for SSL_CTX_set_ssl_version in -lssl" >&5 +echo "configure:85948: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -85091,7 +85952,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <<EOF -#line 85095 "configure" +#line 85956 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -85102,7 +85963,7 @@ int main() { SSL_CTX_set_ssl_version() ; return 0; } EOF -if { (eval echo configure:85106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:85967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -85214,7 +86075,7 @@ else fi echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 -echo "configure:85218: checking for kstat_read in -lkstat" >&5 +echo "configure:86079: checking for kstat_read in -lkstat" >&5 ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -85222,7 +86083,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkstat $LIBS" cat > conftest.$ac_ext <<EOF -#line 85226 "configure" +#line 86087 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -85233,7 +86094,7 @@ int main() { kstat_read() ; return 0; } EOF -if { (eval echo configure:85237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:86098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -85502,7 +86363,7 @@ fi done echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -echo "configure:85506: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 +echo "configure:86367: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -85510,7 +86371,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$SNMP_LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 85514 "configure" +#line 86375 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -85521,7 +86382,7 @@ int main() { snmp_parse_oid() ; return 0; } EOF -if { (eval echo configure:85525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:86386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -85654,7 +86515,7 @@ fi done echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -echo "configure:85658: checking for init_snmp in -l$SNMP_LIBNAME" >&5 +echo "configure:86519: checking for init_snmp in -l$SNMP_LIBNAME" >&5 ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -85662,7 +86523,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$SNMP_LIBNAME $LIBS" cat > conftest.$ac_ext <<EOF -#line 85666 "configure" +#line 86527 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -85673,7 +86534,7 @@ int main() { init_snmp() ; return 0; } EOF -if { (eval echo configure:85677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:86538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -85998,7 +86859,7 @@ EOF fi echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6 -echo "configure:86002: checking whether to enable UCD SNMP hack" >&5 +echo "configure:86863: checking whether to enable UCD SNMP hack" >&5 # Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given. if test "${enable_ucd_snmp_hack+set}" = set; then enableval="$enable_ucd_snmp_hack" @@ -86024,7 +86885,7 @@ fi echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 -echo "configure:86028: checking whether to enable SOAP support" >&5 +echo "configure:86889: checking whether to enable SOAP support" >&5 # Check whether --enable-soap or --disable-soap was given. if test "${enable_soap+set}" = set; then enableval="$enable_soap" @@ -86071,7 +86932,7 @@ if test -z "$PHP_LIBXML_DIR"; then echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:86075: checking libxml2 install dir" >&5 +echo "configure:86936: checking libxml2 install dir" >&5 # Check whether --with-libxml-dir or --without-libxml-dir was given. if test "${with_libxml_dir+set}" = set; then withval="$with_libxml_dir" @@ -86102,7 +86963,7 @@ if test "$PHP_SOAP" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:86106: checking for xml2-config path" >&5 +echo "configure:86967: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -86259,7 +87120,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:86263: checking whether libxml build works" >&5 +echo "configure:87124: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -86275,7 +87136,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 86279 "configure" +#line 87140 "configure" #include "confdefs.h" @@ -86286,7 +87147,7 @@ else } EOF -if { (eval echo configure:86290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:87151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -86624,7 +87485,7 @@ fi echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 -echo "configure:86628: checking whether to enable sockets support" >&5 +echo "configure:87489: checking whether to enable sockets support" >&5 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then enableval="$enable_sockets" @@ -86669,13 +87530,13 @@ echo "$ac_t""$ext_output" 1>&6 if test "$PHP_SOCKETS" != "no"; then echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 -echo "configure:86673: checking for struct cmsghdr" >&5 +echo "configure:87534: checking for struct cmsghdr" >&5 if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 86679 "configure" +#line 87540 "configure" #include "confdefs.h" #include <sys/types.h> @@ -86684,7 +87545,7 @@ int main() { struct cmsghdr s; s ; return 0; } EOF -if { (eval echo configure:86688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:87549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cmsghdr=yes else @@ -86709,12 +87570,12 @@ EOF for ac_func in hstrerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:86713: checking for $ac_func" >&5 +echo "configure:87574: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 86718 "configure" +#line 87579 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -86737,7 +87598,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:86741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:87602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -86765,17 +87626,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:86769: checking for $ac_hdr" >&5 +echo "configure:87630: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 86774 "configure" +#line 87635 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:86779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:87640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -86802,7 +87663,7 @@ fi done cat > conftest.$ac_ext <<EOF -#line 86806 "configure" +#line 87667 "configure" #include "confdefs.h" #include <sys/types.h> @@ -86812,7 +87673,7 @@ int main() { static struct msghdr tp; int n = (int) tp.msg_flags; return n ; return 0; } EOF -if { (eval echo configure:86816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:87677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -87119,12 +87980,12 @@ fi unset found echo $ac_n "checking for socketpair""... $ac_c" 1>&6 -echo "configure:87123: checking for socketpair" >&5 +echo "configure:87984: checking for socketpair" >&5 if eval "test \"`echo '$''{'ac_cv_func_socketpair'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 87128 "configure" +#line 87989 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socketpair(); below. */ @@ -87147,7 +88008,7 @@ socketpair(); ; return 0; } EOF -if { (eval echo configure:87151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:88012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socketpair=yes" else @@ -87165,12 +88026,12 @@ if eval "test \"`echo '$ac_cv_func_'socketpair`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socketpair""... $ac_c" 1>&6 -echo "configure:87169: checking for __socketpair" >&5 +echo "configure:88030: checking for __socketpair" >&5 if eval "test \"`echo '$''{'ac_cv_func___socketpair'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 87174 "configure" +#line 88035 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __socketpair(); below. */ @@ -87193,7 +88054,7 @@ __socketpair(); ; return 0; } EOF -if { (eval echo configure:87197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:88058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___socketpair=yes" else @@ -87233,12 +88094,12 @@ EOF unset found echo $ac_n "checking for gethostbyname2""... $ac_c" 1>&6 -echo "configure:87237: checking for gethostbyname2" >&5 +echo "configure:88098: checking for gethostbyname2" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 87242 "configure" +#line 88103 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname2(); below. */ @@ -87261,7 +88122,7 @@ gethostbyname2(); ; return 0; } EOF -if { (eval echo configure:87265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:88126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname2=yes" else @@ -87279,12 +88140,12 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname2`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostbyname2""... $ac_c" 1>&6 -echo "configure:87283: checking for __gethostbyname2" >&5 +echo "configure:88144: checking for __gethostbyname2" >&5 if eval "test \"`echo '$''{'ac_cv_func___gethostbyname2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 87288 "configure" +#line 88149 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __gethostbyname2(); below. */ @@ -87307,7 +88168,7 @@ __gethostbyname2(); ; return 0; } EOF -if { (eval echo configure:87311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:88172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___gethostbyname2=yes" else @@ -87347,7 +88208,7 @@ EOF echo $ac_n "checking enable SPL suppport""... $ac_c" 1>&6 -echo "configure:87351: checking enable SPL suppport" >&5 +echo "configure:88212: checking enable SPL suppport" >&5 # Check whether --enable-spl or --disable-spl was given. if test "${enable_spl+set}" = set; then enableval="$enable_spl" @@ -87392,7 +88253,7 @@ echo "$ac_t""$ext_output" 1>&6 if test "$PHP_SPL" != "no"; then echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6 -echo "configure:87396: checking whether zend_object_value is packed" >&5 +echo "configure:88257: checking whether zend_object_value is packed" >&5 old_CPPFLAGS=$CPPFLAGS CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" if test "$cross_compiling" = yes; then @@ -87402,7 +88263,7 @@ echo "configure:87396: checking whether zend_object_value is packed" >&5 else cat > conftest.$ac_ext <<EOF -#line 87406 "configure" +#line 88267 "configure" #include "confdefs.h" #include "Zend/zend_types.h" @@ -87411,7 +88272,7 @@ int main(int argc, char **argv) { } EOF -if { (eval echo configure:87415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:88276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_result=1 @@ -87719,13 +88580,52 @@ EOF fi + + + header_path=ext/spl + 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_sxe.h; do + hp_hf="$header_path/$header_file" + + + unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INSTALLHEADERS$unique=set" + + INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" + + fi + + done + + + + am_i_shared=$PHP_SPL_SHARED + is_it_shared=$PHP_PCRE_SHARED + is_it_enabled=$PHP_PCRE + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then + { echo "configure: error: +You've configured extension spl to build statically, but it +depends on extension pcre, which you've configured to build shared. +You either need to build spl shared or build pcre statically for the +build to be successful. +" 1>&2; exit 1; } + fi + if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then + { echo "configure: error: +You've configured extension spl, which depends on extension pcre, +but you've either not enabled pcre, or have disabled it. +" 1>&2; exit 1; } + fi + fi echo $ac_n "checking for sqlite support""... $ac_c" 1>&6 -echo "configure:87729: checking for sqlite support" >&5 +echo "configure:88629: checking for sqlite support" >&5 # Check whether --with-sqlite or --without-sqlite was given. if test "${with_sqlite+set}" = set; then withval="$with_sqlite" @@ -87771,7 +88671,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 -echo "configure:87775: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 +echo "configure:88675: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 # Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given. if test "${enable_sqlite_utf8+set}" = set; then enableval="$enable_sqlite_utf8" @@ -87802,13 +88702,13 @@ if test "$PHP_SQLITE" != "no"; then if test "$PHP_PDO" != "no"; then echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:87806: checking for PDO includes" >&5 +echo "configure:88706: checking for PDO includes" >&5 if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -echo "configure:87812: checking for PDO includes" >&5 +echo "configure:88712: checking for PDO includes" >&5 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then pdo_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then @@ -87842,7 +88742,7 @@ EOF SQLITE_DIR=$PHP_SQLITE else # search default path list echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6 -echo "configure:87846: checking for sqlite files in default path" >&5 +echo "configure:88746: checking for sqlite files in default path" >&5 for i in $SEARCH_PATH ; do if test -r $i/$SEARCH_FOR; then SQLITE_DIR=$i @@ -87953,7 +88853,7 @@ echo "configure:87846: checking for sqlite files in default path" >&5 done echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 -echo "configure:87957: checking for sqlite_open in -lsqlite" >&5 +echo "configure:88857: checking for sqlite_open in -lsqlite" >&5 ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -87961,7 +88861,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsqlite $LIBS" cat > conftest.$ac_ext <<EOF -#line 87965 "configure" +#line 88865 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -87972,7 +88872,7 @@ int main() { sqlite_open() ; return 0; } EOF -if { (eval echo configure:87976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:88876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -88144,7 +89044,7 @@ fi # Extract the first word of "lemon", so it can be a program name with args. set dummy lemon; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:88148: checking for $ac_word" >&5 +echo "configure:89048: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -88172,7 +89072,7 @@ fi if test "$LEMON"; then echo $ac_n "checking for lemon version""... $ac_c" 1>&6 -echo "configure:88176: checking for lemon version" >&5 +echo "configure:89076: checking for lemon version" >&5 if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -88203,7 +89103,7 @@ echo "$ac_t""$php_cv_lemon_version" 1>&6 SQLITE_MODULE_TYPE=builtin - PHP_SQLITE_CFLAGS="-I@ext_builddir@/libsqlite/src $pdo_inc_path" + PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path" sqlite_extra_sources="libsqlite/src/opcodes.c \ libsqlite/src/parse.c libsqlite/src/encode.c \ libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ @@ -88543,7 +89443,7 @@ but you've either not enabled pdo, or have disabled it. src=$ext_srcdir/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD" @@ -88574,7 +89474,7 @@ but you've either not enabled pdo, or have disabled it. echo $ac_n "checking size of char *""... $ac_c" 1>&6 -echo "configure:88578: checking size of char *" >&5 +echo "configure:89478: checking size of char *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -88582,7 +89482,7 @@ else ac_cv_sizeof_char_p=4 else cat > conftest.$ac_ext <<EOF -#line 88586 "configure" +#line 89486 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -88593,7 +89493,7 @@ int main() return(0); } EOF -if { (eval echo configure:88597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:89497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char_p=`cat conftestval` else @@ -88655,12 +89555,12 @@ EOF for ac_func in usleep nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:88659: checking for $ac_func" >&5 +echo "configure:89559: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 88664 "configure" +#line 89564 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -88683,7 +89583,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:88687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:89587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -88711,17 +89611,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:88715: checking for $ac_hdr" >&5 +echo "configure:89615: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 88720 "configure" +#line 89620 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:88725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:89625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -88758,12 +89658,12 @@ fi for ac_func in getcwd getwd asinh acosh atanh log1p hypot do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:88762: checking for $ac_func" >&5 +echo "configure:89662: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 88767 "configure" +#line 89667 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -88786,7 +89686,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:88790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:89690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -88815,7 +89715,7 @@ done if test "$ac_cv_func_crypt" = "no"; then echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:88819: checking for crypt in -lcrypt" >&5 +echo "configure:89719: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -88823,7 +89723,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 88827 "configure" +#line 89727 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -88834,7 +89734,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:88838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:89738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -88863,7 +89763,7 @@ fi fi echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 -echo "configure:88867: checking for standard DES crypt" >&5 +echo "configure:89767: checking for standard DES crypt" >&5 if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -88874,7 +89774,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 88878 "configure" +#line 89778 "configure" #include "confdefs.h" #if HAVE_UNISTD_H @@ -88893,7 +89793,7 @@ main() { #endif } EOF -if { (eval echo configure:88897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:89797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_crypt_des=yes @@ -88924,7 +89824,7 @@ EOF echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 -echo "configure:88928: checking for extended DES crypt" >&5 +echo "configure:89828: checking for extended DES crypt" >&5 if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -88935,7 +89835,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 88939 "configure" +#line 89839 "configure" #include "confdefs.h" #if HAVE_UNISTD_H @@ -88954,7 +89854,7 @@ main() { #endif } EOF -if { (eval echo configure:88958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:89858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_crypt_ext_des=yes @@ -88985,7 +89885,7 @@ EOF echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 -echo "configure:88989: checking for MD5 crypt" >&5 +echo "configure:89889: checking for MD5 crypt" >&5 if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -88996,7 +89896,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 89000 "configure" +#line 89900 "configure" #include "confdefs.h" #if HAVE_UNISTD_H @@ -89024,7 +89924,7 @@ main() { #endif } EOF -if { (eval echo configure:89028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:89928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_crypt_md5=yes @@ -89084,7 +89984,7 @@ EOF echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 -echo "configure:89088: checking for Blowfish crypt" >&5 +echo "configure:89988: checking for Blowfish crypt" >&5 if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -89095,7 +89995,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 89099 "configure" +#line 89999 "configure" #include "confdefs.h" #if HAVE_UNISTD_H @@ -89120,7 +90020,7 @@ main() { #endif } EOF -if { (eval echo configure:89124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:90024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_crypt_blowfish=yes @@ -89152,7 +90052,7 @@ EOF echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 -echo "configure:89156: checking whether flush should be called explicitly after a buffered io" >&5 +echo "configure:90056: checking whether flush should be called explicitly after a buffered io" >&5 if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -89163,7 +90063,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 89167 "configure" +#line 90067 "configure" #include "confdefs.h" #include <stdio.h> @@ -89201,7 +90101,7 @@ int main(int argc, char **argv) } EOF -if { (eval echo configure:89205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:90105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_flush_io=no @@ -89323,13 +90223,13 @@ EOF EOF echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6 -echo "configure:89327: checking whether field re_magic exists in struct regex_t" >&5 +echo "configure:90227: checking whether field re_magic exists in struct regex_t" >&5 if eval "test \"`echo '$''{'ac_cv_regex_t_re_magic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 89333 "configure" +#line 90233 "configure" #include "confdefs.h" #include <sys/types.h> #include <regex.h> @@ -89337,7 +90237,7 @@ int main() { regex_t rt; rt.re_magic; ; return 0; } EOF -if { (eval echo configure:89341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:90241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_regex_t_re_magic=yes else @@ -89359,12 +90259,12 @@ EOF fi fi echo $ac_n "checking which regex library to use""... $ac_c" 1>&6 -echo "configure:89363: checking which regex library to use" >&5 +echo "configure:90263: checking which regex library to use" >&5 echo "$ac_t""$REGEX_TYPE" 1>&6 echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 -echo "configure:89368: checking for working fnmatch" >&5 +echo "configure:90268: checking for working fnmatch" >&5 if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -89375,11 +90275,11 @@ if test "$cross_compiling" = yes; then ac_cv_func_fnmatch_works=no else cat > conftest.$ac_ext <<EOF -#line 89379 "configure" +#line 90279 "configure" #include "confdefs.h" main() { exit (fnmatch ("a*", "abc", 0) != 0); } EOF -if { (eval echo configure:89383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:90283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_fnmatch_works=yes else @@ -89405,7 +90305,7 @@ fi echo $ac_n "checking whether rounding works as expected""... $ac_c" 1>&6 -echo "configure:89409: checking whether rounding works as expected" >&5 +echo "configure:90309: checking whether rounding works as expected" >&5 if test "$cross_compiling" = yes; then PHP_ROUND_FUZZ=0.50000000001 @@ -89413,7 +90313,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 89417 "configure" +#line 90317 "configure" #include "confdefs.h" #include <math.h> @@ -89426,7 +90326,7 @@ else } EOF -if { (eval echo configure:89430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:90330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then PHP_ROUND_FUZZ=0.5 @@ -89458,12 +90358,12 @@ else for ac_func in fork CreateProcess do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:89462: checking for $ac_func" >&5 +echo "configure:90362: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 89467 "configure" +#line 90367 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -89486,7 +90386,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:89490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:90390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -89520,7 +90420,7 @@ fi echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6 -echo "configure:89524: checking if your OS can spawn processes with inherited handles" >&5 +echo "configure:90424: checking if your OS can spawn processes with inherited handles" >&5 if test "$php_can_support_proc_open" = "yes"; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -89537,12 +90437,12 @@ EOF for ac_func in glob strfmon nice do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:89541: checking for $ac_func" >&5 +echo "configure:90441: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 89546 "configure" +#line 90446 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -89565,7 +90465,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:89569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:90469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -89603,12 +90503,12 @@ fi unset found echo $ac_n "checking for res_nmkquery""... $ac_c" 1>&6 -echo "configure:89607: checking for res_nmkquery" >&5 +echo "configure:90507: checking for res_nmkquery" >&5 if eval "test \"`echo '$''{'ac_cv_func_res_nmkquery'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 89612 "configure" +#line 90512 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char res_nmkquery(); below. */ @@ -89631,7 +90531,7 @@ res_nmkquery(); ; return 0; } EOF -if { (eval echo configure:89635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:90535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_res_nmkquery=yes" else @@ -89649,12 +90549,12 @@ if eval "test \"`echo '$ac_cv_func_'res_nmkquery`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_nmkquery""... $ac_c" 1>&6 -echo "configure:89653: checking for __res_nmkquery" >&5 +echo "configure:90553: checking for __res_nmkquery" >&5 if eval "test \"`echo '$''{'ac_cv_func___res_nmkquery'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 89658 "configure" +#line 90558 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __res_nmkquery(); below. */ @@ -89677,7 +90577,7 @@ __res_nmkquery(); ; return 0; } EOF -if { (eval echo configure:89681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:90581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___res_nmkquery=yes" else @@ -89715,7 +90615,7 @@ EOF unset ac_cv_lib_resolv___res_nmkquery unset found echo $ac_n "checking for res_nmkquery in -lresolv""... $ac_c" 1>&6 -echo "configure:89719: checking for res_nmkquery in -lresolv" >&5 +echo "configure:90619: checking for res_nmkquery in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_nmkquery | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -89723,7 +90623,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 89727 "configure" +#line 90627 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -89734,7 +90634,7 @@ int main() { res_nmkquery() ; return 0; } EOF -if { (eval echo configure:89738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:90638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -89754,7 +90654,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_nmkquery in -lresolv""... $ac_c" 1>&6 -echo "configure:89758: checking for __res_nmkquery in -lresolv" >&5 +echo "configure:90658: checking for __res_nmkquery in -lresolv" >&5 ac_lib_var=`echo resolv'_'__res_nmkquery | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -89762,7 +90662,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 89766 "configure" +#line 90666 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -89773,7 +90673,7 @@ int main() { __res_nmkquery() ; return 0; } EOF -if { (eval echo configure:89777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:90677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -89805,11 +90705,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 89809 "configure" +#line 90709 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:89813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:90713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -89851,7 +90751,7 @@ EOF unset ac_cv_lib_bind___res_nmkquery unset found echo $ac_n "checking for res_nmkquery in -lbind""... $ac_c" 1>&6 -echo "configure:89855: checking for res_nmkquery in -lbind" >&5 +echo "configure:90755: checking for res_nmkquery in -lbind" >&5 ac_lib_var=`echo bind'_'res_nmkquery | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -89859,7 +90759,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 89863 "configure" +#line 90763 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -89870,7 +90770,7 @@ int main() { res_nmkquery() ; return 0; } EOF -if { (eval echo configure:89874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:90774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -89890,7 +90790,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_nmkquery in -lbind""... $ac_c" 1>&6 -echo "configure:89894: checking for __res_nmkquery in -lbind" >&5 +echo "configure:90794: checking for __res_nmkquery in -lbind" >&5 ac_lib_var=`echo bind'_'__res_nmkquery | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -89898,7 +90798,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 89902 "configure" +#line 90802 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -89909,7 +90809,7 @@ int main() { __res_nmkquery() ; return 0; } EOF -if { (eval echo configure:89913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:90813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -89941,11 +90841,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 89945 "configure" +#line 90845 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:89949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:90849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -89987,7 +90887,7 @@ EOF unset ac_cv_lib_socket___res_nmkquery unset found echo $ac_n "checking for res_nmkquery in -lsocket""... $ac_c" 1>&6 -echo "configure:89991: checking for res_nmkquery in -lsocket" >&5 +echo "configure:90891: checking for res_nmkquery in -lsocket" >&5 ac_lib_var=`echo socket'_'res_nmkquery | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -89995,7 +90895,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 89999 "configure" +#line 90899 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90006,7 +90906,7 @@ int main() { res_nmkquery() ; return 0; } EOF -if { (eval echo configure:90010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:90910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -90026,7 +90926,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_nmkquery in -lsocket""... $ac_c" 1>&6 -echo "configure:90030: checking for __res_nmkquery in -lsocket" >&5 +echo "configure:90930: checking for __res_nmkquery in -lsocket" >&5 ac_lib_var=`echo socket'_'__res_nmkquery | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -90034,7 +90934,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 90038 "configure" +#line 90938 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90045,7 +90945,7 @@ int main() { __res_nmkquery() ; return 0; } EOF -if { (eval echo configure:90049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:90949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -90077,11 +90977,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 90081 "configure" +#line 90981 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:90085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:90985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -90138,12 +91038,12 @@ EOF unset found echo $ac_n "checking for res_nsend""... $ac_c" 1>&6 -echo "configure:90142: checking for res_nsend" >&5 +echo "configure:91042: checking for res_nsend" >&5 if eval "test \"`echo '$''{'ac_cv_func_res_nsend'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 90147 "configure" +#line 91047 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char res_nsend(); below. */ @@ -90166,7 +91066,7 @@ res_nsend(); ; return 0; } EOF -if { (eval echo configure:90170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_res_nsend=yes" else @@ -90184,12 +91084,12 @@ if eval "test \"`echo '$ac_cv_func_'res_nsend`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_nsend""... $ac_c" 1>&6 -echo "configure:90188: checking for __res_nsend" >&5 +echo "configure:91088: checking for __res_nsend" >&5 if eval "test \"`echo '$''{'ac_cv_func___res_nsend'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 90193 "configure" +#line 91093 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __res_nsend(); below. */ @@ -90212,7 +91112,7 @@ __res_nsend(); ; return 0; } EOF -if { (eval echo configure:90216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___res_nsend=yes" else @@ -90250,7 +91150,7 @@ EOF unset ac_cv_lib_resolv___res_nsend unset found echo $ac_n "checking for res_nsend in -lresolv""... $ac_c" 1>&6 -echo "configure:90254: checking for res_nsend in -lresolv" >&5 +echo "configure:91154: checking for res_nsend in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_nsend | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -90258,7 +91158,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 90262 "configure" +#line 91162 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90269,7 +91169,7 @@ int main() { res_nsend() ; return 0; } EOF -if { (eval echo configure:90273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -90289,7 +91189,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_nsend in -lresolv""... $ac_c" 1>&6 -echo "configure:90293: checking for __res_nsend in -lresolv" >&5 +echo "configure:91193: checking for __res_nsend in -lresolv" >&5 ac_lib_var=`echo resolv'_'__res_nsend | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -90297,7 +91197,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 90301 "configure" +#line 91201 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90308,7 +91208,7 @@ int main() { __res_nsend() ; return 0; } EOF -if { (eval echo configure:90312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -90340,11 +91240,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 90344 "configure" +#line 91244 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:90348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:91248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -90386,7 +91286,7 @@ EOF unset ac_cv_lib_bind___res_nsend unset found echo $ac_n "checking for res_nsend in -lbind""... $ac_c" 1>&6 -echo "configure:90390: checking for res_nsend in -lbind" >&5 +echo "configure:91290: checking for res_nsend in -lbind" >&5 ac_lib_var=`echo bind'_'res_nsend | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -90394,7 +91294,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 90398 "configure" +#line 91298 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90405,7 +91305,7 @@ int main() { res_nsend() ; return 0; } EOF -if { (eval echo configure:90409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -90425,7 +91325,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_nsend in -lbind""... $ac_c" 1>&6 -echo "configure:90429: checking for __res_nsend in -lbind" >&5 +echo "configure:91329: checking for __res_nsend in -lbind" >&5 ac_lib_var=`echo bind'_'__res_nsend | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -90433,7 +91333,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 90437 "configure" +#line 91337 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90444,7 +91344,7 @@ int main() { __res_nsend() ; return 0; } EOF -if { (eval echo configure:90448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -90476,11 +91376,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 90480 "configure" +#line 91380 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:90484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:91384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -90522,7 +91422,7 @@ EOF unset ac_cv_lib_socket___res_nsend unset found echo $ac_n "checking for res_nsend in -lsocket""... $ac_c" 1>&6 -echo "configure:90526: checking for res_nsend in -lsocket" >&5 +echo "configure:91426: checking for res_nsend in -lsocket" >&5 ac_lib_var=`echo socket'_'res_nsend | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -90530,7 +91430,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 90534 "configure" +#line 91434 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90541,7 +91441,7 @@ int main() { res_nsend() ; return 0; } EOF -if { (eval echo configure:90545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -90561,7 +91461,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __res_nsend in -lsocket""... $ac_c" 1>&6 -echo "configure:90565: checking for __res_nsend in -lsocket" >&5 +echo "configure:91465: checking for __res_nsend in -lsocket" >&5 ac_lib_var=`echo socket'_'__res_nsend | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -90569,7 +91469,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 90573 "configure" +#line 91473 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90580,7 +91480,7 @@ int main() { __res_nsend() ; return 0; } EOF -if { (eval echo configure:90584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -90612,11 +91512,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 90616 "configure" +#line 91516 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:90620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:91520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -90673,12 +91573,12 @@ EOF unset found echo $ac_n "checking for dn_expand""... $ac_c" 1>&6 -echo "configure:90677: checking for dn_expand" >&5 +echo "configure:91577: checking for dn_expand" >&5 if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 90682 "configure" +#line 91582 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dn_expand(); below. */ @@ -90701,7 +91601,7 @@ dn_expand(); ; return 0; } EOF -if { (eval echo configure:90705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dn_expand=yes" else @@ -90719,12 +91619,12 @@ if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 -echo "configure:90723: checking for __dn_expand" >&5 +echo "configure:91623: checking for __dn_expand" >&5 if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 90728 "configure" +#line 91628 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __dn_expand(); below. */ @@ -90747,7 +91647,7 @@ __dn_expand(); ; return 0; } EOF -if { (eval echo configure:90751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___dn_expand=yes" else @@ -90785,7 +91685,7 @@ EOF unset ac_cv_lib_resolv___dn_expand unset found echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 -echo "configure:90789: checking for dn_expand in -lresolv" >&5 +echo "configure:91689: checking for dn_expand in -lresolv" >&5 ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -90793,7 +91693,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 90797 "configure" +#line 91697 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90804,7 +91704,7 @@ int main() { dn_expand() ; return 0; } EOF -if { (eval echo configure:90808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -90824,7 +91724,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 -echo "configure:90828: checking for __dn_expand in -lresolv" >&5 +echo "configure:91728: checking for __dn_expand in -lresolv" >&5 ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -90832,7 +91732,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 90836 "configure" +#line 91736 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90843,7 +91743,7 @@ int main() { __dn_expand() ; return 0; } EOF -if { (eval echo configure:90847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -90875,11 +91775,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 90879 "configure" +#line 91779 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:90883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:91783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -90921,7 +91821,7 @@ EOF unset ac_cv_lib_bind___dn_expand unset found echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 -echo "configure:90925: checking for dn_expand in -lbind" >&5 +echo "configure:91825: checking for dn_expand in -lbind" >&5 ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -90929,7 +91829,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 90933 "configure" +#line 91833 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90940,7 +91840,7 @@ int main() { dn_expand() ; return 0; } EOF -if { (eval echo configure:90944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -90960,7 +91860,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 -echo "configure:90964: checking for __dn_expand in -lbind" >&5 +echo "configure:91864: checking for __dn_expand in -lbind" >&5 ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -90968,7 +91868,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF -#line 90972 "configure" +#line 91872 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -90979,7 +91879,7 @@ int main() { __dn_expand() ; return 0; } EOF -if { (eval echo configure:90983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -91011,11 +91911,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 91015 "configure" +#line 91915 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:91019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:91919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -91057,7 +91957,7 @@ EOF unset ac_cv_lib_socket___dn_expand unset found echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 -echo "configure:91061: checking for dn_expand in -lsocket" >&5 +echo "configure:91961: checking for dn_expand in -lsocket" >&5 ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -91065,7 +91965,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 91069 "configure" +#line 91969 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -91076,7 +91976,7 @@ int main() { dn_expand() ; return 0; } EOF -if { (eval echo configure:91080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:91980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -91096,7 +91996,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 -echo "configure:91100: checking for __dn_expand in -lsocket" >&5 +echo "configure:92000: checking for __dn_expand in -lsocket" >&5 ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -91104,7 +92004,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 91108 "configure" +#line 92008 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -91115,7 +92015,7 @@ int main() { __dn_expand() ; return 0; } EOF -if { (eval echo configure:91119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:92019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -91147,11 +92047,11 @@ fi found=no else cat > conftest.$ac_ext <<EOF -#line 91151 "configure" +#line 92051 "configure" #include "confdefs.h" main() { return (0); } EOF -if { (eval echo configure:91155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:92055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else @@ -91208,12 +92108,12 @@ EOF for ac_func in fpclass isinf isnan do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:91212: checking for $ac_func" >&5 +echo "configure:92112: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 91217 "configure" +#line 92117 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -91236,7 +92136,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:91240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:92140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -91262,7 +92162,7 @@ done echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 -echo "configure:91266: checking whether atof() accepts NAN" >&5 +echo "configure:92166: checking whether atof() accepts NAN" >&5 if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -91273,7 +92173,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 91277 "configure" +#line 92177 "configure" #include "confdefs.h" #include <math.h> @@ -91293,7 +92193,7 @@ int main(int argc, char** argv) } EOF -if { (eval echo configure:91297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:92197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_atof_accept_nan=yes @@ -91321,7 +92221,7 @@ EOF fi echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 -echo "configure:91325: checking whether atof() accepts INF" >&5 +echo "configure:92225: checking whether atof() accepts INF" >&5 if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -91332,7 +92232,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 91336 "configure" +#line 92236 "configure" #include "confdefs.h" #include <math.h> @@ -91355,7 +92255,7 @@ int main(int argc, char** argv) } EOF -if { (eval echo configure:91359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:92259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_atof_accept_inf=yes @@ -91383,7 +92283,7 @@ EOF fi echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 -echo "configure:91387: checking whether HUGE_VAL == INF" >&5 +echo "configure:92287: checking whether HUGE_VAL == INF" >&5 if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -91394,7 +92294,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 91398 "configure" +#line 92298 "configure" #include "confdefs.h" #include <math.h> @@ -91417,7 +92317,7 @@ int main(int argc, char** argv) } EOF -if { (eval echo configure:91421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:92321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_huge_val_inf=yes @@ -91445,7 +92345,7 @@ EOF fi echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 -echo "configure:91449: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 +echo "configure:92349: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -91456,7 +92356,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 91460 "configure" +#line 92360 "configure" #include "confdefs.h" #include <math.h> @@ -91481,7 +92381,7 @@ int main(int argc, char** argv) } EOF -if { (eval echo configure:91485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:92385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_huge_val_nan=yes @@ -91509,13 +92409,13 @@ EOF fi echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6 -echo "configure:91513: checking whether strptime() declaration fails" >&5 +echo "configure:92413: checking whether strptime() declaration fails" >&5 if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 91519 "configure" +#line 92419 "configure" #include "confdefs.h" #include <time.h> @@ -91531,7 +92431,7 @@ int strptime(const char *s, const char *format, struct tm *tm); ; return 0; } EOF -if { (eval echo configure:91535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:92435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_strptime_decl_fails=no @@ -91561,17 +92461,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:91565: checking for $ac_hdr" >&5 +echo "configure:92465: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 91570 "configure" +#line 92470 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:91575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:92475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -91600,12 +92500,12 @@ done for ac_func in mblen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:91604: checking for $ac_func" >&5 +echo "configure:92504: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 91609 "configure" +#line 92509 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -91628,7 +92528,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:91632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:92532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -91655,12 +92555,12 @@ done for ac_func in mbrlen mbsinit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:91659: checking for $ac_func" >&5 +echo "configure:92559: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 91664 "configure" +#line 92564 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -91683,7 +92583,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:91687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:92587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -91708,13 +92608,13 @@ fi done echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:91712: checking for mbstate_t" >&5 +echo "configure:92612: checking for mbstate_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 91718 "configure" +#line 92618 "configure" #include "confdefs.h" #ifdef HAVE_WCHAR_H @@ -91727,7 +92627,7 @@ int __tmp__() { mbstate_t a; } ; return 0; } EOF -if { (eval echo configure:91731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:92631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_mbstate_t=yes @@ -92079,7 +92979,7 @@ EOF src=$ext_srcdir/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments @@ -92106,7 +93006,7 @@ EOF echo $ac_n "checking for Sybase support""... $ac_c" 1>&6 -echo "configure:92110: checking for Sybase support" >&5 +echo "configure:93010: checking for Sybase support" >&5 # Check whether --with-sybase or --without-sybase was given. if test "${with_sybase+set}" = set; then withval="$with_sybase" @@ -92566,7 +93466,7 @@ EOF fi echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:92570: checking for dnet_addr in -ldnet_stub" >&5 +echo "configure:93470: checking for dnet_addr in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -92574,7 +93474,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 92578 "configure" +#line 93478 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -92585,7 +93485,7 @@ int main() { dnet_addr() ; return 0; } EOF -if { (eval echo configure:92589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:93489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -92710,7 +93610,7 @@ fi EOF echo $ac_n "checking for tdsdbopen in -lsybdb""... $ac_c" 1>&6 -echo "configure:92714: checking for tdsdbopen in -lsybdb" >&5 +echo "configure:93614: checking for tdsdbopen in -lsybdb" >&5 ac_lib_var=`echo sybdb'_'tdsdbopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -92718,7 +93618,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsybdb $LIBS" cat > conftest.$ac_ext <<EOF -#line 92722 "configure" +#line 93622 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -92729,7 +93629,7 @@ int main() { tdsdbopen() ; return 0; } EOF -if { (eval echo configure:92733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:93633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -92770,7 +93670,7 @@ fi echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 -echo "configure:92774: checking for Sybase-CT support" >&5 +echo "configure:93674: checking for Sybase-CT support" >&5 # Check whether --with-sybase-ct or --without-sybase-ct was given. if test "${with_sybase_ct+set}" = set; then withval="$with_sybase_ct" @@ -93407,7 +94307,7 @@ EOF done echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 -echo "configure:93411: checking for netg_errstr in -ltcl" >&5 +echo "configure:94311: checking for netg_errstr in -ltcl" >&5 ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -93415,7 +94315,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltcl $LIBS" cat > conftest.$ac_ext <<EOF -#line 93419 "configure" +#line 94319 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -93426,7 +94326,7 @@ int main() { netg_errstr() ; return 0; } EOF -if { (eval echo configure:93430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:94330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -93600,7 +94500,7 @@ fi done echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 -echo "configure:93604: checking for insck__getVdate in -linsck" >&5 +echo "configure:94504: checking for insck__getVdate in -linsck" >&5 ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -93608,7 +94508,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linsck $LIBS" cat > conftest.$ac_ext <<EOF -#line 93612 "configure" +#line 94512 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -93619,7 +94519,7 @@ int main() { insck__getVdate() ; return 0; } EOF -if { (eval echo configure:93623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:94523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -93766,7 +94666,7 @@ fi done echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 -echo "configure:93770: checking for bsd_tcp in -linsck" >&5 +echo "configure:94670: checking for bsd_tcp in -linsck" >&5 ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -93774,7 +94674,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linsck $LIBS" cat > conftest.$ac_ext <<EOF -#line 93778 "configure" +#line 94678 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -93785,7 +94685,7 @@ int main() { bsd_tcp() ; return 0; } EOF -if { (eval echo configure:93789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:94689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -93844,7 +94744,7 @@ fi echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6 -echo "configure:93848: checking whether to enable System V IPC support" >&5 +echo "configure:94748: checking whether to enable System V IPC support" >&5 # Check whether --enable-sysvmsg or --disable-sysvmsg was given. if test "${enable_sysvmsg+set}" = set; then enableval="$enable_sysvmsg" @@ -93890,17 +94790,17 @@ echo "$ac_t""$ext_output" 1>&6 if test "$PHP_SYSVMSG" != "no"; then ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:93894: checking for sys/msg.h" >&5 +echo "configure:94794: checking for sys/msg.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 93899 "configure" +#line 94799 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:93904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:94804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -94215,7 +95115,7 @@ fi echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 -echo "configure:94219: checking whether to enable System V semaphore support" >&5 +echo "configure:95119: checking whether to enable System V semaphore support" >&5 # Check whether --enable-sysvsem or --disable-sysvsem was given. if test "${enable_sysvsem+set}" = set; then enableval="$enable_sysvsem" @@ -94545,12 +95445,12 @@ EOF EOF echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:94549: checking for union semun" >&5 +echo "configure:95449: checking for union semun" >&5 if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 94554 "configure" +#line 95454 "configure" #include "confdefs.h" #include <sys/types.h> @@ -94561,7 +95461,7 @@ int main() { union semun x; ; return 0; } EOF -if { (eval echo configure:94565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:95465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* php_cv_semun=yes @@ -94596,7 +95496,7 @@ fi echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 -echo "configure:94600: checking whether to enable System V shared memory support" >&5 +echo "configure:95500: checking whether to enable System V shared memory support" >&5 # Check whether --enable-sysvshm or --disable-sysvshm was given. if test "${enable_sysvshm+set}" = set; then enableval="$enable_sysvshm" @@ -94931,7 +95831,7 @@ fi echo $ac_n "checking for TIDY support""... $ac_c" 1>&6 -echo "configure:94935: checking for TIDY support" >&5 +echo "configure:95835: checking for TIDY support" >&5 # Check whether --with-tidy or --without-tidy was given. if test "${with_tidy+set}" = set; then withval="$with_tidy" @@ -94996,7 +95896,7 @@ if test "$PHP_TIDY" != "no"; then { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; } fi - TIDY_LIBDIR=$TIDY_DIR/lib + TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR @@ -95221,7 +96121,7 @@ if test "$PHP_TIDY" != "no"; then done echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 -echo "configure:95225: checking for tidyOptGetDoc in -ltidy" >&5 +echo "configure:96125: checking for tidyOptGetDoc in -ltidy" >&5 ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -95229,7 +96129,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltidy $LIBS" cat > conftest.$ac_ext <<EOF -#line 95233 "configure" +#line 96133 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -95240,7 +96140,7 @@ int main() { tidyOptGetDoc() ; return 0; } EOF -if { (eval echo configure:95244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:96144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -95572,7 +96472,7 @@ fi echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 -echo "configure:95576: checking whether to enable tokenizer support" >&5 +echo "configure:96476: checking whether to enable tokenizer support" >&5 # Check whether --enable-tokenizer or --disable-tokenizer was given. if test "${enable_tokenizer+set}" = set; then enableval="$enable_tokenizer" @@ -95901,7 +96801,7 @@ EOF src=$ext_srcdir/Makefile.frag ac_srcdir=$ext_srcdir ac_builddir=$ext_builddir - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments fi @@ -95909,7 +96809,7 @@ fi echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 -echo "configure:95913: checking whether to enable WDDX support" >&5 +echo "configure:96813: checking whether to enable WDDX support" >&5 # Check whether --enable-wddx or --disable-wddx was given. if test "${enable_wddx+set}" = set; then enableval="$enable_wddx" @@ -95956,7 +96856,7 @@ if test -z "$PHP_LIBXML_DIR"; then echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:95960: checking libxml2 install dir" >&5 +echo "configure:96860: checking libxml2 install dir" >&5 # Check whether --with-libxml-dir or --without-libxml-dir was given. if test "${with_libxml_dir+set}" = set; then withval="$with_libxml_dir" @@ -95982,7 +96882,7 @@ fi echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 -echo "configure:95986: checking libexpat dir for WDDX" >&5 +echo "configure:96886: checking libexpat dir for WDDX" >&5 # Check whether --with-libexpat-dir or --without-libexpat-dir was given. if test "${with_libexpat_dir+set}" = set; then withval="$with_libexpat_dir" @@ -96013,7 +96913,7 @@ if test "$PHP_WDDX" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:96017: checking for xml2-config path" >&5 +echo "configure:96917: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -96170,7 +97070,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:96174: checking whether libxml build works" >&5 +echo "configure:97074: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -96186,7 +97086,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 96190 "configure" +#line 97090 "configure" #include "confdefs.h" @@ -96197,7 +97097,7 @@ else } EOF -if { (eval echo configure:96201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:97101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -96751,7 +97651,7 @@ fi echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 -echo "configure:96755: checking whether to enable XML support" >&5 +echo "configure:97655: checking whether to enable XML support" >&5 # Check whether --enable-xml or --disable-xml was given. if test "${enable_xml+set}" = set; then enableval="$enable_xml" @@ -96798,7 +97698,7 @@ if test -z "$PHP_LIBXML_DIR"; then echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:96802: checking libxml2 install dir" >&5 +echo "configure:97702: checking libxml2 install dir" >&5 # Check whether --with-libxml-dir or --without-libxml-dir was given. if test "${with_libxml_dir+set}" = set; then withval="$with_libxml_dir" @@ -96824,7 +97724,7 @@ fi echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 -echo "configure:96828: checking libexpat install dir" >&5 +echo "configure:97728: checking libexpat install dir" >&5 # Check whether --with-libexpat-dir or --without-libexpat-dir was given. if test "${with_libexpat_dir+set}" = set; then withval="$with_libexpat_dir" @@ -96856,7 +97756,7 @@ if test "$PHP_XML" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:96860: checking for xml2-config path" >&5 +echo "configure:97760: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -97013,7 +97913,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:97017: checking whether libxml build works" >&5 +echo "configure:97917: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -97029,7 +97929,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 97033 "configure" +#line 97933 "configure" #include "confdefs.h" @@ -97040,7 +97940,7 @@ else } EOF -if { (eval echo configure:97044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:97944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -97563,7 +98463,7 @@ fi echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 -echo "configure:97567: checking whether to enable XMLReader support" >&5 +echo "configure:98467: checking whether to enable XMLReader support" >&5 # Check whether --enable-xmlreader or --disable-xmlreader was given. if test "${enable_xmlreader+set}" = set; then enableval="$enable_xmlreader" @@ -97610,7 +98510,7 @@ if test -z "$PHP_LIBXML_DIR"; then echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:97614: checking libxml2 install dir" >&5 +echo "configure:98514: checking libxml2 install dir" >&5 # Check whether --with-libxml-dir or --without-libxml-dir was given. if test "${with_libxml_dir+set}" = set; then withval="$with_libxml_dir" @@ -97641,7 +98541,7 @@ if test "$PHP_XMLREADER" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:97645: checking for xml2-config path" >&5 +echo "configure:98545: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -97798,7 +98698,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:97802: checking whether libxml build works" >&5 +echo "configure:98702: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -97814,7 +98714,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 97818 "configure" +#line 98718 "configure" #include "confdefs.h" @@ -97825,7 +98725,7 @@ else } EOF -if { (eval echo configure:97829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:98729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -98195,7 +99095,7 @@ fi echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6 -echo "configure:98199: checking for XMLRPC-EPI support" >&5 +echo "configure:99099: checking for XMLRPC-EPI support" >&5 # Check whether --with-xmlrpc or --without-xmlrpc was given. if test "${with_xmlrpc+set}" = set; then withval="$with_xmlrpc" @@ -98242,7 +99142,7 @@ if test -z "$PHP_LIBXML_DIR"; then echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:98246: checking libxml2 install dir" >&5 +echo "configure:99146: checking libxml2 install dir" >&5 # Check whether --with-libxml-dir or --without-libxml-dir was given. if test "${with_libxml_dir+set}" = set; then withval="$with_libxml_dir" @@ -98268,7 +99168,7 @@ fi echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6 -echo "configure:98272: checking libexpat dir for XMLRPC-EPI" >&5 +echo "configure:99172: checking libexpat dir for XMLRPC-EPI" >&5 # Check whether --with-libexpat-dir or --without-libexpat-dir was given. if test "${with_libexpat_dir+set}" = set; then withval="$with_libexpat_dir" @@ -98293,7 +99193,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6 -echo "configure:98297: checking iconv dir for XMLRPC-EPI" >&5 +echo "configure:99197: checking iconv dir for XMLRPC-EPI" >&5 # Check whether --with-iconv-dir or --without-iconv-dir was given. if test "${with_iconv_dir+set}" = set; then withval="$with_iconv_dir" @@ -98352,7 +99252,7 @@ EOF echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:98356: checking for xml2-config path" >&5 +echo "configure:99256: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -98509,7 +99409,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:98513: checking whether libxml build works" >&5 +echo "configure:99413: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -98525,7 +99425,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 98529 "configure" +#line 99429 "configure" #include "confdefs.h" @@ -98536,7 +99436,7 @@ else } EOF -if { (eval echo configure:98540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:99440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -98800,12 +99700,12 @@ EOF if test "$PHP_ICONV" = "yes"; then echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:98804: checking for iconv" >&5 +echo "configure:99704: checking for iconv" >&5 if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 98809 "configure" +#line 99709 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char iconv(); below. */ @@ -98828,7 +99728,7 @@ iconv(); ; return 0; } EOF -if { (eval echo configure:98832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:99732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_iconv=yes" else @@ -98849,12 +99749,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv""... $ac_c" 1>&6 -echo "configure:98853: checking for libiconv" >&5 +echo "configure:99753: checking for libiconv" >&5 if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 98858 "configure" +#line 99758 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char libiconv(); below. */ @@ -98877,7 +99777,7 @@ libiconv(); ; return 0; } EOF -if { (eval echo configure:98881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:99781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_libiconv=yes" else @@ -99032,7 +99932,7 @@ EOF done echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 -echo "configure:99036: checking for libiconv in -l$iconv_lib_name" >&5 +echo "configure:99936: checking for libiconv in -l$iconv_lib_name" >&5 ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -99040,7 +99940,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$iconv_lib_name $LIBS" cat > conftest.$ac_ext <<EOF -#line 99044 "configure" +#line 99944 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -99051,7 +99951,7 @@ int main() { libiconv() ; return 0; } EOF -if { (eval echo configure:99055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:99955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -99184,7 +100084,7 @@ else done echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 -echo "configure:99188: checking for iconv in -l$iconv_lib_name" >&5 +echo "configure:100088: checking for iconv in -l$iconv_lib_name" >&5 ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -99192,7 +100092,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$iconv_lib_name $LIBS" cat > conftest.$ac_ext <<EOF -#line 99196 "configure" +#line 100096 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -99203,7 +100103,7 @@ int main() { iconv() ; return 0; } EOF -if { (eval echo configure:99207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:100107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -99391,7 +100291,7 @@ if test "$PHP_XMLRPC" = "yes"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:99395: checking for $ac_word" >&5 +echo "configure:100295: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -99419,21 +100319,21 @@ else fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:99423: checking for inline" >&5 +echo "configure:100323: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 99430 "configure" +#line 100330 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:99437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:100337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -99471,12 +100371,12 @@ EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:99475: checking for ANSI C header files" >&5 +echo "configure:100375: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 99480 "configure" +#line 100380 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -99484,7 +100384,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:99488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:100388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -99501,7 +100401,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 99505 "configure" +#line 100405 "configure" #include "confdefs.h" #include <string.h> EOF @@ -99519,7 +100419,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 99523 "configure" +#line 100423 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -99540,7 +100440,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 99544 "configure" +#line 100444 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -99551,7 +100451,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:99555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:100455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -99578,17 +100478,17 @@ for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:99582: checking for $ac_hdr" >&5 +echo "configure:100482: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 99587 "configure" +#line 100487 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:99592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:100492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -99620,7 +100520,7 @@ done echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:99624: checking size of char" >&5 +echo "configure:100524: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -99628,7 +100528,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext <<EOF -#line 99632 "configure" +#line 100532 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -99639,7 +100539,7 @@ int main() return(0); } EOF -if { (eval echo configure:99643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:100543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -99660,7 +100560,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:99664: checking size of int" >&5 +echo "configure:100564: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -99668,7 +100568,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext <<EOF -#line 99672 "configure" +#line 100572 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -99679,7 +100579,7 @@ int main() return(0); } EOF -if { (eval echo configure:99683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:100583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -99699,7 +100599,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:99703: checking size of long" >&5 +echo "configure:100603: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -99707,7 +100607,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext <<EOF -#line 99711 "configure" +#line 100611 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -99718,7 +100618,7 @@ int main() return(0); } EOF -if { (eval echo configure:99722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:100622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -99738,7 +100638,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:99742: checking size of long long" >&5 +echo "configure:100642: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -99746,7 +100646,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext <<EOF -#line 99750 "configure" +#line 100650 "configure" #include "confdefs.h" #include <stdio.h> int main() @@ -99757,7 +100657,7 @@ int main() return(0); } EOF -if { (eval echo configure:99761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:100661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -99777,12 +100677,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:99781: checking for size_t" >&5 +echo "configure:100681: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 99786 "configure" +#line 100686 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -99810,12 +100710,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:99814: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:100714: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 99819 "configure" +#line 100719 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -99824,7 +100724,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:99828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:100728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -99845,12 +100745,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:99849: checking for uid_t in sys/types.h" >&5 +echo "configure:100749: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 99854 "configure" +#line 100754 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -99890,12 +100790,12 @@ for ac_func in \ memcpy memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:99894: checking for $ac_func" >&5 +echo "configure:100794: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 99899 "configure" +#line 100799 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -99918,7 +100818,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:99922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:100822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -100261,7 +101161,7 @@ elif test "$PHP_XMLRPC" != "no"; then XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi else echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6 -echo "configure:100265: checking for XMLRPC-EPI in default path" >&5 +echo "configure:101165: checking for XMLRPC-EPI in default path" >&5 for i in /usr/local /usr; do if test -r $i/include/xmlrpc.h; then XMLRPC_DIR=$i/include @@ -100691,7 +101591,7 @@ fi echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6 -echo "configure:100695: checking whether to enable XMLWriter support" >&5 +echo "configure:101595: checking whether to enable XMLWriter support" >&5 # Check whether --enable-xmlwriter or --disable-xmlwriter was given. if test "${enable_xmlwriter+set}" = set; then enableval="$enable_xmlwriter" @@ -100738,7 +101638,7 @@ if test -z "$PHP_LIBXML_DIR"; then echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -echo "configure:100742: checking libxml2 install dir" >&5 +echo "configure:101642: checking libxml2 install dir" >&5 # Check whether --with-libxml-dir or --without-libxml-dir was given. if test "${with_libxml_dir+set}" = set; then withval="$with_libxml_dir" @@ -100769,7 +101669,7 @@ if test "$PHP_XMLWRITER" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -echo "configure:100773: checking for xml2-config path" >&5 +echo "configure:101673: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -100926,7 +101826,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -echo "configure:100930: checking whether libxml build works" >&5 +echo "configure:101830: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -100942,7 +101842,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 100946 "configure" +#line 101846 "configure" #include "confdefs.h" @@ -100953,7 +101853,7 @@ else } EOF -if { (eval echo configure:100957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:101857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS @@ -101291,7 +102191,7 @@ fi echo $ac_n "checking for XSL support""... $ac_c" 1>&6 -echo "configure:101295: checking for XSL support" >&5 +echo "configure:102195: checking for XSL support" >&5 # Check whether --with-xsl or --without-xsl was given. if test "${with_xsl+set}" = set; then withval="$with_xsl" @@ -101493,7 +102393,7 @@ if test "$PHP_XSL" != "no"; then echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6 -echo "configure:101497: checking for EXSLT support" >&5 +echo "configure:102397: checking for EXSLT support" >&5 for i in $PHP_XSL /usr/local /usr; do if test -r "$i/include/libexslt/exslt.h"; then PHP_XSL_EXSL_DIR=$i @@ -101956,7 +102856,7 @@ fi echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6 -echo "configure:101960: checking for zip archive read/writesupport" >&5 +echo "configure:102860: checking for zip archive read/writesupport" >&5 # Check whether --enable-zip or --disable-zip was given. if test "${enable_zip+set}" = set; then enableval="$enable_zip" @@ -102003,7 +102903,7 @@ if test -z "$PHP_ZLIB_DIR"; then echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -echo "configure:102007: checking for the location of libz" >&5 +echo "configure:102907: checking for the location of libz" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" @@ -102051,7 +102951,7 @@ if test "$PHP_ZIP" != "no"; then fi echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6 -echo "configure:102055: checking for the location of zlib" >&5 +echo "configure:102955: checking for the location of zlib" >&5 if test "$PHP_ZLIB_DIR" = "no"; then { 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; } else @@ -102060,18 +102960,18 @@ echo "configure:102055: checking for the location of zlib" >&5 if test "$ext_shared" = "yes"; then ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD" - if test -n "$PHP_ZLIB_DIR/lib"; then + if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then - if test "$PHP_ZLIB_DIR/lib" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/lib" != "/usr/lib"; then + if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then - if test -z "$PHP_ZLIB_DIR/lib" || echo "$PHP_ZLIB_DIR/lib" | grep '^/' >/dev/null ; then - ai_p=$PHP_ZLIB_DIR/lib + if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR else - ep_dir="`echo $PHP_ZLIB_DIR/lib|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/lib\"`" + ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" fi @@ -102102,18 +103002,18 @@ echo "configure:102055: checking for the location of zlib" >&5 else - if test -n "$PHP_ZLIB_DIR/lib"; then + if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then - if test "$PHP_ZLIB_DIR/lib" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/lib" != "/usr/lib"; then + if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then - if test -z "$PHP_ZLIB_DIR/lib" || echo "$PHP_ZLIB_DIR/lib" | grep '^/' >/dev/null ; then - ai_p=$PHP_ZLIB_DIR/lib + if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR else - ep_dir="`echo $PHP_ZLIB_DIR/lib|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/lib\"`" + ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" fi @@ -102200,7 +103100,8 @@ echo "configure:102055: checking for the location of zlib" >&5 lib/zip_entry_new.c lib/zip_err_str.c lib/zip_fopen_index.c \ lib/zip_new.c lib/zip_source_file.c lib/zip_stat_index.c lib/zip_get_archive_comment.c \ lib/zip_get_file_comment.c lib/zip_set_archive_comment.c lib/zip_set_file_comment.c \ - lib/zip_unchange_archive.c lib/zip_memdup.c" + lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \ + lib/zip_error_clear.c lib/zip_file_error_clear.c" cat >> confdefs.h <<\EOF #define HAVE_ZIP 1 @@ -102582,7 +103483,7 @@ fi echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6 -echo "configure:102586: checking whether to install PEAR" >&5 +echo "configure:103487: checking whether to install PEAR" >&5 # Check whether --with-pear or --without-pear was given. if test "${with_pear+set}" = set; then withval="$with_pear" @@ -102655,7 +103556,7 @@ if test "$PHP_PEAR" != "no"; then src=$abs_srcdir/pear/Makefile.frag ac_srcdir=$abs_srcdir/pear ac_builddir=pear - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments fi @@ -102692,7 +103593,7 @@ fi bison_version=none if test "$YACC"; then echo $ac_n "checking for bison version""... $ac_c" 1>&6 -echo "configure:102696: checking for bison version" >&5 +echo "configure:103597: checking for bison version" >&5 if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -102749,17 +103650,17 @@ dlfcn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:102753: checking for $ac_hdr" >&5 +echo "configure:103654: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 102758 "configure" +#line 103659 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:102763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:103664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -102787,12 +103688,12 @@ done echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:102791: checking for size_t" >&5 +echo "configure:103692: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 102796 "configure" +#line 103697 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -102820,12 +103721,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:102824: checking return type of signal handlers" >&5 +echo "configure:103725: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 102829 "configure" +#line 103730 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -102842,7 +103743,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:102846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:103747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -102866,12 +103767,12 @@ EOF echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:102870: checking for uint" >&5 +echo "configure:103771: checking for uint" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 102875 "configure" +#line 103776 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -102899,12 +103800,12 @@ EOF fi echo $ac_n "checking for ulong""... $ac_c" 1>&6 -echo "configure:102903: checking for ulong" >&5 +echo "configure:103804: checking for ulong" >&5 if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 102908 "configure" +#line 103809 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -102934,9 +103835,9 @@ fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:102938: checking for int32_t" >&5 +echo "configure:103839: checking for int32_t" >&5 cat > conftest.$ac_ext <<EOF -#line 102940 "configure" +#line 103841 "configure" #include "confdefs.h" #if HAVE_SYS_TYPES_H @@ -102955,7 +103856,7 @@ if (sizeof (int32_t)) ; return 0; } EOF -if { (eval echo configure:102959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:103860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<EOF @@ -102974,9 +103875,9 @@ fi rm -f conftest* echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:102978: checking for uint32_t" >&5 +echo "configure:103879: checking for uint32_t" >&5 cat > conftest.$ac_ext <<EOF -#line 102980 "configure" +#line 103881 "configure" #include "confdefs.h" #if HAVE_SYS_TYPES_H @@ -102995,7 +103896,7 @@ if (sizeof (uint32_t)) ; return 0; } EOF -if { (eval echo configure:102999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:103900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<EOF @@ -103014,12 +103915,12 @@ fi rm -f conftest* echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:103018: checking for vprintf" >&5 +echo "configure:103919: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 103023 "configure" +#line 103924 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vprintf(); below. */ @@ -103042,7 +103943,7 @@ vprintf(); ; return 0; } EOF -if { (eval echo configure:103046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:103947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -103066,12 +103967,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:103070: checking for _doprnt" >&5 +echo "configure:103971: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 103075 "configure" +#line 103976 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt(); below. */ @@ -103094,7 +103995,7 @@ _doprnt(); ; return 0; } EOF -if { (eval echo configure:103098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:103999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -103119,7 +104020,7 @@ fi fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:103123: checking for 8-bit clean memcmp" >&5 +echo "configure:104024: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -103127,7 +104028,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <<EOF -#line 103131 "configure" +#line 104032 "configure" #include "confdefs.h" main() @@ -103137,7 +104038,7 @@ main() } EOF -if { (eval echo configure:103141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:104042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -103157,19 +104058,19 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:103161: checking for working alloca.h" >&5 +echo "configure:104062: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 103166 "configure" +#line 104067 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:103173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:104074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -103190,12 +104091,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:103194: checking for alloca" >&5 +echo "configure:104095: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 103199 "configure" +#line 104100 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -103223,7 +104124,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:103227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:104128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -103255,12 +104156,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:103259: checking whether alloca needs Cray hooks" >&5 +echo "configure:104160: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 103264 "configure" +#line 104165 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -103285,12 +104186,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:103289: checking for $ac_func" >&5 +echo "configure:104190: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 103294 "configure" +#line 104195 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -103313,7 +104214,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:103317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:104218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -103340,7 +104241,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:103344: checking stack direction for C alloca" >&5 +echo "configure:104245: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -103348,7 +104249,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 103352 "configure" +#line 104253 "configure" #include "confdefs.h" find_stack_direction () { @@ -103367,7 +104268,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:103371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:104272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -103391,12 +104292,12 @@ fi for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:103395: checking for $ac_func" >&5 +echo "configure:104296: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 103400 "configure" +#line 104301 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -103419,7 +104320,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:103423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:104324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -103445,7 +104346,7 @@ done echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6 -echo "configure:103449: checking whether sprintf is broken" >&5 +echo "configure:104350: checking whether sprintf is broken" >&5 if eval "test \"`echo '$''{'ac_cv_broken_sprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -103456,11 +104357,11 @@ else else cat > conftest.$ac_ext <<EOF -#line 103460 "configure" +#line 104361 "configure" #include "confdefs.h" main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); } EOF -if { (eval echo configure:103464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:104365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_broken_sprintf=no @@ -103494,12 +104395,12 @@ EOF for ac_func in finite isfinite isinf isnan do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:103498: checking for $ac_func" >&5 +echo "configure:104399: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 103503 "configure" +#line 104404 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -103522,7 +104423,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:103526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:104427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -103549,13 +104450,13 @@ done echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6 -echo "configure:103553: checking whether fp_except is defined" >&5 +echo "configure:104454: checking whether fp_except is defined" >&5 if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 103559 "configure" +#line 104460 "configure" #include "confdefs.h" #include <floatingpoint.h> @@ -103566,7 +104467,7 @@ fp_except x = (fp_except) 0; ; return 0; } EOF -if { (eval echo configure:103570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:104471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_fp_except=yes @@ -103596,17 +104497,17 @@ for ac_hdr in dlfcn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:103600: checking for $ac_hdr" >&5 +echo "configure:104501: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 103605 "configure" +#line 104506 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:103610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:104511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -103634,14 +104535,14 @@ done echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6 -echo "configure:103638: checking whether dlsym() requires a leading underscore in symbol names" >&5 +echo "configure:104539: checking whether dlsym() requires a leading underscore in symbol names" >&5 if test "$cross_compiling" = yes; then : else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 103645 "configure" +#line 104546 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -103702,7 +104603,7 @@ int main () exit (status); } EOF - if { (eval echo configure:103706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:104607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -103745,15 +104646,6 @@ else fi -# Check whether --enable-malloc-mm or --disable-malloc-mm was given. -if test "${enable_malloc_mm+set}" = set; then - enableval="$enable_malloc_mm" - - ZEND_USE_MALLOC_MM=$enableval - -fi - - # Check whether --enable-maintainer-zts or --disable-maintainer-zts was given. if test "${enable_maintainer_zts+set}" = set; then enableval="$enable_maintainer_zts" @@ -103780,19 +104672,6 @@ else fi -# Check whether --enable-memory-limit or --disable-memory-limit was given. -if test "${enable_memory_limit+set}" = set; then - enableval="$enable_memory_limit" - - ZEND_MEMORY_LIMIT=$enableval - -else - - ZEND_MEMORY_LIMIT=no - -fi - - # Check whether --enable-zend-multibyte or --disable-zend-multibyte was given. if test "${enable_zend_multibyte+set}" = set; then enableval="$enable_zend_multibyte" @@ -103807,27 +104686,23 @@ fi echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6 -echo "configure:103811: checking virtual machine dispatch method" >&5 +echo "configure:104690: checking virtual machine dispatch method" >&5 echo "$ac_t""$PHP_ZEND_VM" 1>&6 echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6 -echo "configure:103815: checking whether to enable thread-safety" >&5 +echo "configure:104694: checking whether to enable thread-safety" >&5 echo "$ac_t""$ZEND_MAINTAINER_ZTS" 1>&6 echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6 -echo "configure:103819: checking whether to enable inline optimization for GCC" >&5 +echo "configure:104698: checking whether to enable inline optimization for GCC" >&5 echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6 -echo $ac_n "checking whether to enable a memory limit""... $ac_c" 1>&6 -echo "configure:103823: checking whether to enable a memory limit" >&5 -echo "$ac_t""$ZEND_MEMORY_LIMIT" 1>&6 - echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6 -echo "configure:103827: checking whether to enable Zend debugging" >&5 +echo "configure:104702: checking whether to enable Zend debugging" >&5 echo "$ac_t""$ZEND_DEBUG" 1>&6 echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6 -echo "configure:103831: checking whether to enable Zend multibyte" >&5 +echo "configure:104706: checking whether to enable Zend multibyte" >&5 echo "$ac_t""$ZEND_MULTIBYTE" 1>&6 case $PHP_ZEND_VM in @@ -103884,18 +104759,6 @@ EOF fi -if test "$ZEND_MEMORY_LIMIT" = "yes"; then - cat >> confdefs.h <<\EOF -#define MEMORY_LIMIT 1 -EOF - -else - cat >> confdefs.h <<\EOF -#define MEMORY_LIMIT 0 -EOF - -fi - if test "$ZEND_MULTIBYTE" = "yes"; then cat >> confdefs.h <<\EOF #define ZEND_MULTIBYTE 1 @@ -103912,21 +104775,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:103916: checking for inline" >&5 +echo "configure:104779: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 103923 "configure" +#line 104786 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:103930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:104793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -103955,7 +104818,7 @@ esac echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6 -echo "configure:103959: checking target system is Darwin" >&5 +echo "configure:104822: checking target system is Darwin" >&5 if echo "$target" | grep "darwin" > /dev/null; then cat >> confdefs.h <<\EOF #define DARWIN 1 @@ -103967,7 +104830,7 @@ else fi echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6 -echo "configure:103971: checking for MM alignment and log values" >&5 +echo "configure:104834: checking for MM alignment and log values" >&5 if test "$cross_compiling" = yes; then @@ -103975,7 +104838,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 103979 "configure" +#line 104842 "configure" #include "confdefs.h" #include <stdio.h> @@ -104011,7 +104874,7 @@ int main() } EOF -if { (eval echo configure:104015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:104878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1` @@ -104036,7 +104899,7 @@ fi echo "$ac_t""done" 1>&6 echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6 -echo "configure:104040: checking for memory allocation using mmap(MAP_ANON)" >&5 +echo "configure:104903: checking for memory allocation using mmap(MAP_ANON)" >&5 if test "$cross_compiling" = yes; then @@ -104044,7 +104907,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 104048 "configure" +#line 104911 "configure" #include "confdefs.h" #include <sys/types.h> @@ -104080,7 +104943,7 @@ int main() } EOF -if { (eval echo configure:104084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:104947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF @@ -104102,7 +104965,7 @@ fi echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6 -echo "configure:104106: checking for memory allocation using mmap("/dev/zero")" >&5 +echo "configure:104969: checking for memory allocation using mmap("/dev/zero")" >&5 if test "$cross_compiling" = yes; then @@ -104110,7 +104973,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 104114 "configure" +#line 104977 "configure" #include "confdefs.h" #include <sys/types.h> @@ -104156,7 +105019,7 @@ int main() } EOF -if { (eval echo configure:104160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:105023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF @@ -104180,12 +105043,12 @@ fi for ac_func in mremap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:104184: checking for $ac_func" >&5 +echo "configure:105047: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 104189 "configure" +#line 105052 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -104208,7 +105071,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:104212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:105075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -104275,17 +105138,17 @@ for ac_hdr in stdarg.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:104279: checking for $ac_hdr" >&5 +echo "configure:105142: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 104284 "configure" +#line 105147 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:104289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:105152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -104362,7 +105225,7 @@ if test "$TSRM_PTH" != "no"; then echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6 -echo "configure:104366: checking for GNU Pth" >&5 +echo "configure:105229: checking for GNU Pth" >&5 PTH_PREFIX="`$TSRM_PTH --prefix`" if test -z "$PTH_PREFIX"; then echo "$ac_t""Please check your Pth installation" 1>&6 @@ -104392,17 +105255,17 @@ elif test "$TSRM_ST" != "no"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:104396: checking for $ac_hdr" >&5 +echo "configure:105259: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 104401 "configure" +#line 105264 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:104406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:105269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -104432,7 +105295,7 @@ done LIBS="$LIBS -lst" echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6 -echo "configure:104436: checking for SGI's State Threads" >&5 +echo "configure:105299: checking for SGI's State Threads" >&5 echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF #define TSRM_ST 1 @@ -104471,7 +105334,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 104475 "configure" +#line 105338 "configure" #include "confdefs.h" #include <pthread.h> @@ -104489,7 +105352,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:104493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:105356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes @@ -104509,7 +105372,7 @@ fi CFLAGS=$save_CFLAGS echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 -echo "configure:104513: checking for pthreads_cflags" >&5 +echo "configure:105376: checking for pthreads_cflags" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -104531,7 +105394,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 104535 "configure" +#line 105398 "configure" #include "confdefs.h" #include <pthread.h> @@ -104549,7 +105412,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:104553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:105416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes @@ -104579,7 +105442,7 @@ fi echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 -echo "configure:104583: checking for pthreads_lib" >&5 +echo "configure:105446: checking for pthreads_lib" >&5 if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -104601,7 +105464,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <<EOF -#line 104605 "configure" +#line 105468 "configure" #include "confdefs.h" #include <pthread.h> @@ -104619,7 +105482,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF -if { (eval echo configure:104623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:105486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes @@ -104670,7 +105533,7 @@ EOF echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6 -echo "configure:104674: checking for POSIX threads" >&5 +echo "configure:105537: checking for POSIX threads" >&5 echo "$ac_t""yes" 1>&6 fi @@ -104742,6 +105605,15 @@ if test -z "$EXTENSION_DIR"; then fi fi +case $PHP_LAYOUT in + GNU) + datarootdir=$prefix/share + ;; + *) + datarootdir=$prefix/php + ;; +esac + EXPANDED_PEAR_INSTALLDIR=`eval echo $PEAR_INSTALLDIR` EXPANDED_EXTENSION_DIR=`eval echo $EXTENSION_DIR` EXPANDED_LOCALSTATEDIR=`eval echo $localstatedir` @@ -104984,6 +105856,9 @@ fi PHP_VAR_SUBST="$PHP_VAR_SUBST datadir" + PHP_VAR_SUBST="$PHP_VAR_SUBST datarootdir" + + PHP_VAR_SUBST="$PHP_VAR_SUBST sysconfdir" @@ -105258,7 +106133,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:105262: checking build system type" >&5 +echo "configure:106137: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -105287,7 +106162,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 -echo "configure:105291: checking for ld used by $CC" >&5 +echo "configure:106166: checking for ld used by $CC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -105317,10 +106192,10 @@ echo "configure:105291: checking for ld used by $CC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:105321: checking for GNU ld" >&5 +echo "configure:106196: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:105324: checking for non-GNU ld" >&5 +echo "configure:106199: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -105359,7 +106234,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:105363: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:106238: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -105379,7 +106254,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:105383: checking for $LD option to reload object files" >&5 +echo "configure:106258: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -105404,7 +106279,7 @@ case $host_os in esac echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:105408: checking for BSD-compatible nm" >&5 +echo "configure:106283: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -105450,7 +106325,7 @@ echo "$ac_t""$lt_cv_path_NM" 1>&6 NM="$lt_cv_path_NM" echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6 -echo "configure:105454: checking how to recognise dependent libraries" >&5 +echo "configure:106329: checking how to recognise dependent libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -105628,13 +106503,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:105632: checking for object suffix" >&5 +echo "configure:106507: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:105638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:106513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -105654,7 +106529,7 @@ ac_objext=$ac_cv_objext echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:105658: checking for executable suffix" >&5 +echo "configure:106533: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -105664,7 +106539,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:105668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:106543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -105707,7 +106582,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:105711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:106586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" @@ -105721,8 +106596,8 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 105725 "configure"' > conftest.$ac_ext - if { (eval echo configure:105726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 106600 "configure"' > conftest.$ac_ext + if { (eval echo configure:106601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -105755,7 +106630,7 @@ ia64-*-hpux*) x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:105759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:106634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in @@ -105799,7 +106674,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:105803: checking whether the C compiler needs -belf" >&5 +echo "configure:106678: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -105812,14 +106687,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 105816 "configure" +#line 106691 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:105823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:106698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -105855,7 +106730,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:105859: checking for $ac_word" >&5 +echo "configure:106734: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -105887,7 +106762,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:105891: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:106766: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -105898,12 +106773,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 105902 "configure" +#line 106777 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:105907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:106782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -105929,12 +106804,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:105933: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:106808: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:105938: checking whether we are using GNU C++" >&5 +echo "configure:106813: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -105943,7 +106818,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:105947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:106822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -105962,7 +106837,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:105966: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:106841: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106003,7 +106878,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext <<EOF -#line 106007 "configure" +#line 106882 "configure" #include "confdefs.h" #include <stdlib.h> $ac_declaration @@ -106011,7 +106886,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:106015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:106890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -106021,14 +106896,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 106025 "configure" +#line 106900 "configure" #include "confdefs.h" $ac_declaration int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:106032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:106907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -106050,7 +106925,7 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:106054: checking how to run the C++ preprocessor" >&5 +echo "configure:106929: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -106063,12 +106938,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext <<EOF -#line 106067 "configure" +#line 106942 "configure" #include "confdefs.h" #include <stdlib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:106072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:106947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -106099,7 +106974,7 @@ fi # find the maximum length of command line arguments echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6 -echo "configure:106103: checking the maximum length of command line arguments" >&5 +echo "configure:106978: checking the maximum length of command line arguments" >&5 if eval "test \"`echo '$''{'lt_cv_sys_max_cmd_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106200,7 +107075,7 @@ fi # Check for command to grab the raw symbol name followed by C symbol from nm. echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6 -echo "configure:106204: checking command to parse $NM output from $compiler object" >&5 +echo "configure:107079: checking command to parse $NM output from $compiler object" >&5 if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106295,10 +107170,10 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo configure:106299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:107174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo configure:106302: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then + if { (eval echo configure:107177: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -106349,7 +107224,7 @@ EOF lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - if { (eval echo configure:106353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + if { (eval echo configure:107228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS="$lt_save_LIBS" @@ -106389,7 +107264,7 @@ else fi echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:106393: checking for objdir" >&5 +echo "configure:107268: checking for objdir" >&5 if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106455,7 +107330,7 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:106459: checking for $ac_word" >&5 +echo "configure:107334: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106487,7 +107362,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:106491: checking for $ac_word" >&5 +echo "configure:107366: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106522,7 +107397,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:106526: checking for $ac_word" >&5 +echo "configure:107401: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106554,7 +107429,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:106558: checking for $ac_word" >&5 +echo "configure:107433: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106589,7 +107464,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:106593: checking for $ac_word" >&5 +echo "configure:107468: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106621,7 +107496,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:106625: checking for $ac_word" >&5 +echo "configure:107500: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106707,7 +107582,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:106711: checking for ${ac_tool_prefix}file" >&5 +echo "configure:107586: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106767,7 +107642,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:106771: checking for file" >&5 +echo "configure:107646: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106926,7 +107801,7 @@ fi # Check to make sure the static flag actually works. # echo $ac_n "checking if $compiler static flag $lt_prog_compiler_static works""... $ac_c" 1>&6 -echo "configure:106930: checking if $compiler static flag $lt_prog_compiler_static works" >&5 +echo "configure:107805: checking if $compiler static flag $lt_prog_compiler_static works" >&5 if eval "test \"`echo '$''{'lt_prog_compiler_static_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106976,7 +107851,7 @@ if test "$GCC" = yes; then echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 -echo "configure:106980: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo "configure:107855: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_rtti_exceptions'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -106993,11 +107868,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:106997: $lt_compile\"" >&5) + (eval echo "\"configure:107872: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:107001: \$? = $ac_status" >&5 + echo "configure:107876: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -107026,7 +107901,7 @@ lt_prog_compiler_pic= lt_prog_compiler_static= echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:107030: checking for $compiler option to produce PIC" >&5 +echo "configure:107905: checking for $compiler option to produce PIC" >&5 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -107237,7 +108112,7 @@ echo "$ac_t""$lt_prog_compiler_pic" 1>&6 if test -n "$lt_prog_compiler_pic"; then echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6 -echo "configure:107241: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo "configure:108116: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 if eval "test \"`echo '$''{'lt_prog_compiler_pic_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -107254,11 +108129,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:107258: $lt_compile\"" >&5) + (eval echo "\"configure:108133: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:107262: \$? = $ac_status" >&5 + echo "configure:108137: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -107296,7 +108171,7 @@ case $host_os in esac echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:107300: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "configure:108175: checking if $compiler supports -c -o file.$ac_objext" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -107316,11 +108191,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:107320: $lt_compile\"" >&5) + (eval echo "\"configure:108195: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:107324: \$? = $ac_status" >&5 + echo "configure:108199: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -107350,7 +108225,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:107354: checking if we can lock with hard links" >&5 +echo "configure:108229: checking if we can lock with hard links" >&5 hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -107367,7 +108242,7 @@ else fi echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:107371: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo "configure:108246: checking whether the $compiler linker ($LD) supports shared libraries" >&5 runpath_var= allow_undefined_flag= @@ -107720,12 +108595,12 @@ EOF # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <<EOF -#line 107724 "configure" +#line 108599 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:107729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:108604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -107751,12 +108626,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <<EOF -#line 107755 "configure" +#line 108630 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:107760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:108635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -108228,11 +109103,11 @@ x|xyes) # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:108232: checking whether -lc should be explicitly linked in" >&5 +echo "configure:109107: checking whether -lc should be explicitly linked in" >&5 $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo configure:108236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then + if { (eval echo configure:109111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -108245,7 +109120,7 @@ echo "configure:108232: checking whether -lc should be explicitly linked in" >&5 libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo configure:108249: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } + if { (eval echo configure:109124: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } then archive_cmds_need_lc=no else @@ -108264,7 +109139,7 @@ echo "configure:108232: checking whether -lc should be explicitly linked in" >&5 esac echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:108268: checking dynamic linker characteristics" >&5 +echo "configure:109143: checking dynamic linker characteristics" >&5 library_names_spec= libname_spec='lib$name' soname_spec= @@ -108638,8 +109513,8 @@ linux*) libsuff= case $host_cpu in x86_64*|s390x*|powerpc64*) - echo '#line 108642 "configure"' > conftest.$ac_ext - if { (eval echo configure:108643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 109517 "configure"' > conftest.$ac_ext + if { (eval echo configure:109518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *64-bit*) libsuff=64 @@ -108838,7 +109713,7 @@ echo "$ac_t""$dynamic_linker" 1>&6 test "$dynamic_linker" = no && can_build_shared=no echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:108842: checking how to hardcode library paths into programs" >&5 +echo "configure:109717: checking how to hardcode library paths into programs" >&5 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ @@ -108876,7 +109751,7 @@ fi striplib= old_striplib= echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 -echo "configure:108880: checking whether stripping libraries is possible" >&5 +echo "configure:109755: checking whether stripping libraries is possible" >&5 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" @@ -108926,7 +109801,7 @@ else darwin*) # if libdl is installed we need to link against it echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:108930: checking for dlopen in -ldl" >&5 +echo "configure:109805: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -108934,7 +109809,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 108938 "configure" +#line 109813 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -108945,7 +109820,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:108949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:109824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -108974,12 +109849,12 @@ fi *) echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:108978: checking for shl_load" >&5 +echo "configure:109853: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 108983 "configure" +#line 109858 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load(); below. */ @@ -109002,7 +109877,7 @@ shl_load(); ; return 0; } EOF -if { (eval echo configure:109006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:109881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -109020,7 +109895,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:109024: checking for shl_load in -ldld" >&5 +echo "configure:109899: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -109028,7 +109903,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 109032 "configure" +#line 109907 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -109039,7 +109914,7 @@ int main() { shl_load() ; return 0; } EOF -if { (eval echo configure:109043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:109918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -109058,12 +109933,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:109062: checking for dlopen" >&5 +echo "configure:109937: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 109067 "configure" +#line 109942 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -109086,7 +109961,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo configure:109090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:109965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -109104,7 +109979,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:109108: checking for dlopen in -ldl" >&5 +echo "configure:109983: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -109112,7 +109987,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 109116 "configure" +#line 109991 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -109123,7 +109998,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:109127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:110002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -109142,7 +110017,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:109146: checking for dlopen in -lsvld" >&5 +echo "configure:110021: checking for dlopen in -lsvld" >&5 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -109150,7 +110025,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsvld $LIBS" cat > conftest.$ac_ext <<EOF -#line 109154 "configure" +#line 110029 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -109161,7 +110036,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:109165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:110040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -109180,7 +110055,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "configure:109184: checking for dld_link in -ldld" >&5 +echo "configure:110059: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -109188,7 +110063,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 109192 "configure" +#line 110067 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -109199,7 +110074,7 @@ int main() { dld_link() ; return 0; } EOF -if { (eval echo configure:109203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:110078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -109255,7 +110130,7 @@ fi LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "configure:109259: checking whether a program can dlopen itself" >&5 +echo "configure:110134: checking whether a program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -109265,7 +110140,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 109269 "configure" +#line 110144 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -109326,7 +110201,7 @@ int main () exit (status); } EOF - if { (eval echo configure:109330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:110205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -109349,7 +110224,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "configure:109353: checking whether a statically linked program can dlopen itself" >&5 +echo "configure:110228: checking whether a statically linked program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -109359,7 +110234,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 109363 "configure" +#line 110238 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -109420,7 +110295,7 @@ int main () exit (status); } EOF - if { (eval echo configure:109424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:110299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -109461,11 +110336,11 @@ fi # Report which librarie types wil actually be built echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 -echo "configure:109465: checking if libtool supports shared libraries" >&5 +echo "configure:110340: checking if libtool supports shared libraries" >&5 echo "$ac_t""$can_build_shared" 1>&6 echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 -echo "configure:109469: checking whether to build shared libraries" >&5 +echo "configure:110344: checking whether to build shared libraries" >&5 test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -109488,7 +110363,7 @@ esac echo "$ac_t""$enable_shared" 1>&6 echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 -echo "configure:109492: checking whether to build static libraries" >&5 +echo "configure:110367: checking whether to build static libraries" >&5 # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes echo "$ac_t""$enable_static" 1>&6 @@ -110157,7 +111032,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 -echo "configure:110161: checking for ld used by $CC" >&5 +echo "configure:111036: checking for ld used by $CC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -110187,10 +111062,10 @@ echo "configure:110161: checking for ld used by $CC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:110191: checking for GNU ld" >&5 +echo "configure:111066: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:110194: checking for non-GNU ld" >&5 +echo "configure:111069: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -110229,7 +111104,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:110233: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:111108: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -110295,7 +111170,7 @@ fi # PORTME: fill in a description of your system's C++ link characteristics echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:110299: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo "configure:111174: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ld_shlibs_CXX=yes case $host_os in aix3*) @@ -110391,12 +111266,12 @@ case $host_os in # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <<EOF -#line 110395 "configure" +#line 111270 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:110400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:111275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -110423,12 +111298,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <<EOF -#line 110427 "configure" +#line 111302 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:110432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:111307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -111135,7 +112010,7 @@ private: }; EOF -if { (eval echo configure:111139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:112014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. @@ -111245,7 +112120,7 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:111249: checking for $compiler option to produce PIC" >&5 +echo "configure:112124: checking for $compiler option to produce PIC" >&5 # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -111520,7 +112395,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX" 1>&6 if test -n "$lt_prog_compiler_pic_CXX"; then echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6 -echo "configure:111524: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +echo "configure:112399: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 if eval "test \"`echo '$''{'lt_prog_compiler_pic_works_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -111537,11 +112412,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:111541: $lt_compile\"" >&5) + (eval echo "\"configure:112416: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "configure:111545: \$? = $ac_status" >&5 + echo "configure:112420: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -111579,7 +112454,7 @@ case $host_os in esac echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:111583: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "configure:112458: checking if $compiler supports -c -o file.$ac_objext" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -111599,11 +112474,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"configure:111603: $lt_compile\"" >&5) + (eval echo "\"configure:112478: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "configure:111607: \$? = $ac_status" >&5 + echo "configure:112482: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -111633,7 +112508,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:111637: checking if we can lock with hard links" >&5 +echo "configure:112512: checking if we can lock with hard links" >&5 hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -111650,7 +112525,7 @@ else fi echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:111654: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo "configure:112529: checking whether the $compiler linker ($LD) supports shared libraries" >&5 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -111700,11 +112575,11 @@ x|xyes) # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:111704: checking whether -lc should be explicitly linked in" >&5 +echo "configure:112579: checking whether -lc should be explicitly linked in" >&5 $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext - if { (eval echo configure:111708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then + if { (eval echo configure:112583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -111717,7 +112592,7 @@ echo "configure:111704: checking whether -lc should be explicitly linked in" >&5 libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag_CXX allow_undefined_flag_CXX= - if { (eval echo configure:111721: \"$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; } + if { (eval echo configure:112596: \"$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; } then archive_cmds_need_lc_CXX=no else @@ -111736,7 +112611,7 @@ echo "configure:111704: checking whether -lc should be explicitly linked in" >&5 esac echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:111740: checking dynamic linker characteristics" >&5 +echo "configure:112615: checking dynamic linker characteristics" >&5 library_names_spec= libname_spec='lib$name' soname_spec= @@ -112110,8 +112985,8 @@ linux*) libsuff= case $host_cpu in x86_64*|s390x*|powerpc64*) - echo '#line 112114 "configure"' > conftest.$ac_ext - if { (eval echo configure:112115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 112989 "configure"' > conftest.$ac_ext + if { (eval echo configure:112990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *64-bit*) libsuff=64 @@ -112310,7 +113185,7 @@ echo "$ac_t""$dynamic_linker" 1>&6 test "$dynamic_linker" = no && can_build_shared=no echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:112314: checking how to hardcode library paths into programs" >&5 +echo "configure:113189: checking how to hardcode library paths into programs" >&5 hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ @@ -112348,7 +113223,7 @@ fi striplib= old_striplib= echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 -echo "configure:112352: checking whether stripping libraries is possible" >&5 +echo "configure:113227: checking whether stripping libraries is possible" >&5 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" @@ -112398,7 +113273,7 @@ else darwin*) # if libdl is installed we need to link against it echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:112402: checking for dlopen in -ldl" >&5 +echo "configure:113277: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -112406,7 +113281,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 112410 "configure" +#line 113285 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -112420,7 +113295,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:112424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:113299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -112449,12 +113324,12 @@ fi *) echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:112453: checking for shl_load" >&5 +echo "configure:113328: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 112458 "configure" +#line 113333 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load(); below. */ @@ -112480,7 +113355,7 @@ shl_load(); ; return 0; } EOF -if { (eval echo configure:112484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:113359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -112498,7 +113373,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:112502: checking for shl_load in -ldld" >&5 +echo "configure:113377: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -112506,7 +113381,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 112510 "configure" +#line 113385 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -112520,7 +113395,7 @@ int main() { shl_load() ; return 0; } EOF -if { (eval echo configure:112524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:113399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -112539,12 +113414,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:112543: checking for dlopen" >&5 +echo "configure:113418: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 112548 "configure" +#line 113423 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -112570,7 +113445,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo configure:112574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:113449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -112588,7 +113463,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:112592: checking for dlopen in -ldl" >&5 +echo "configure:113467: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -112596,7 +113471,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 112600 "configure" +#line 113475 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -112610,7 +113485,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:112614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:113489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -112629,7 +113504,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:112633: checking for dlopen in -lsvld" >&5 +echo "configure:113508: checking for dlopen in -lsvld" >&5 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -112637,7 +113512,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsvld $LIBS" cat > conftest.$ac_ext <<EOF -#line 112641 "configure" +#line 113516 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -112651,7 +113526,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:112655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:113530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -112670,7 +113545,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "configure:112674: checking for dld_link in -ldld" >&5 +echo "configure:113549: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -112678,7 +113553,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 112682 "configure" +#line 113557 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -112692,7 +113567,7 @@ int main() { dld_link() ; return 0; } EOF -if { (eval echo configure:112696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:113571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -112748,7 +113623,7 @@ fi LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "configure:112752: checking whether a program can dlopen itself" >&5 +echo "configure:113627: checking whether a program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -112758,7 +113633,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 112762 "configure" +#line 113637 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -112819,7 +113694,7 @@ int main () exit (status); } EOF - if { (eval echo configure:112823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:113698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -112842,7 +113717,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "configure:112846: checking whether a statically linked program can dlopen itself" >&5 +echo "configure:113721: checking whether a statically linked program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -112852,7 +113727,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 112856 "configure" +#line 113731 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -112913,7 +113788,7 @@ int main () exit (status); } EOF - if { (eval echo configure:112917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:113792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -113879,7 +114754,7 @@ if test -r "$abs_srcdir/Zend/zend_objects.c"; then old_IFS=$IFS - for ac_src in zend_objects.c zend_object_handlers.c zend_objects_API.c zend_mm.c \ + for ac_src in zend_objects.c zend_object_handlers.c zend_objects_API.c \ zend_default_classes.c; do IFS=. @@ -113983,19 +114858,19 @@ EOF src=$abs_srcdir/scripts/Makefile.frag ac_srcdir=$abs_srcdir/scripts ac_builddir=scripts - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments src=$abs_srcdir/Makefile.frag ac_srcdir=$abs_srcdir/Zend ac_builddir=Zend - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments src=$abs_srcdir/Zend/Makefile.frag ac_srcdir=$abs_srcdir/Zend ac_builddir=Zend - $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments |