From: Michael Heimpold Date: Sat, 14 Jan 2012 23:00:00 +0000 (+0000) Subject: [packages] php5: update to 5.3.9 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=951f678b7390aa64d73b06561d8985c48f9e00fd;p=openwrt%2Fsvn-archive%2Farchive.git [packages] php5: update to 5.3.9 Refresh patches accordingly. SVN-Revision: 29752 --- diff --git a/lang/php5/Makefile b/lang/php5/Makefile index b715185eec..dde151d35e 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=5.3.8 -PKG_RELEASE:=9 +PKG_VERSION:=5.3.9 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_MD5SUM:=704cd414a0565d905e1074ffdc1fadfb +PKG_MD5SUM:=dd3288ed5c08cd61ac5bf619cb357521 PKG_FIXUP:=libtool no-autoreconf PKG_BUILD_PARALLEL:=1 diff --git a/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch b/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch index 8e458ee09c..3e81dd6b92 100644 --- a/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch +++ b/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch @@ -1,8 +1,8 @@ --- a/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c -@@ -97,6 +97,8 @@ void _crypt_extended_init_r(void) - #elif (defined(__GNUC__) && !defined(__hpux) && (__GNUC__ > 4 || \ - (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 || (__GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ > 1))))) +@@ -96,6 +96,8 @@ void _crypt_extended_init_r(void) + InterlockedIncrement(&initialized); + #elif defined(HAVE_SYNC_FETCH_AND_ADD) __sync_fetch_and_add(&initialized, 1); +#elif (defined(__GNUC__) && (__GNUC__ == 3)) + initialized = 1; diff --git a/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch b/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch index fa4c0d1929..8180f60582 100644 --- a/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch +++ b/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch @@ -7,7 +7,7 @@ Description: Silence warnings about using the default system timezone info Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c -@@ -878,7 +878,7 @@ static char* guess_timezone(const timeli +@@ -886,7 +886,7 @@ static char* guess_timezone(const timeli tzid = "UTC"; } @@ -52,7 +52,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762 -UTC --- a/ext/date/tests/date_default_timezone_set-1.phpt +++ b/ext/date/tests/date_default_timezone_set-1.phpt -@@ -18,9 +18,6 @@ date.timezone= +@@ -22,9 +22,6 @@ date.timezone= echo date(DATE_ISO8601, $date4), "\n"; ?> --EXPECTF-- diff --git a/lang/php5/patches/900-prevent_buildconf_force.patch b/lang/php5/patches/900-prevent_buildconf_force.patch index a5bc22cb94..3dd0503e6f 100644 --- a/lang/php5/patches/900-prevent_buildconf_force.patch +++ b/lang/php5/patches/900-prevent_buildconf_force.patch @@ -80,4495 +80,4671 @@ + --with-http-magic-mime[=LIBMAGICDIR] + HTTP: with magic mime response content type guessing" +ac_help="$ac_help - --disable-mysqlnd-compression-support - Disable support for the MySQL compressed protocol in mysqlnd" + --enable-mysqlnd Enable mysqlnd expliciely, will be done implicitly + when required by other extensions" ac_help="$ac_help -@@ -1890,12 +1938,12 @@ fi +@@ -1893,12 +1941,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 --echo "configure:1894: checking for Cygwin environment" >&5 -+echo "configure:1942: checking for Cygwin environment" >&5 +-echo "configure:1897: checking for Cygwin environment" >&5 ++echo "configure:1945: 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 <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else -@@ -1923,19 +1971,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 +@@ -1926,19 +1974,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:1927: checking for mingw32 environment" >&5 -+echo "configure:1975: checking for mingw32 environment" >&5 +-echo "configure:1930: checking for mingw32 environment" >&5 ++echo "configure:1978: 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 <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:1942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else -@@ -1954,7 +2002,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y +@@ -1957,7 +2005,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y echo $ac_n "checking for egrep""... $ac_c" 1>&6 --echo "configure:1958: checking for egrep" >&5 -+echo "configure:2006: checking for egrep" >&5 +-echo "configure:1961: checking for egrep" >&5 ++echo "configure:2009: checking for egrep" >&5 if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1969,7 +2017,7 @@ echo "$ac_t""$ac_cv_prog_egrep" 1>&6 +@@ -1972,7 +2020,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:1973: checking for a sed that does not truncate output" >&5 -+echo "configure:2021: checking for a sed that does not truncate output" >&5 +-echo "configure:1976: checking for a sed that does not truncate output" >&5 ++echo "configure:2024: 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 -@@ -2119,7 +2167,7 @@ else { echo "configure: error: can not r +@@ -2122,7 +2170,7 @@ else { echo "configure: error: can not r fi echo $ac_n "checking host system type""... $ac_c" 1>&6 --echo "configure:2123: checking host system type" >&5 -+echo "configure:2171: checking host system type" >&5 +-echo "configure:2126: checking host system type" >&5 ++echo "configure:2174: checking host system type" >&5 host_alias=$host case "$host_alias" in -@@ -2140,7 +2188,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- +@@ -2143,7 +2191,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 --echo "configure:2144: checking target system type" >&5 -+echo "configure:2192: checking target system type" >&5 +-echo "configure:2147: checking target system type" >&5 ++echo "configure:2195: checking target system type" >&5 target_alias=$target case "$target_alias" in -@@ -2252,7 +2300,7 @@ rm -f libs/* +@@ -2255,7 +2303,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:2256: checking for $ac_word" >&5 -+echo "configure:2304: checking for $ac_word" >&5 +-echo "configure:2259: checking for $ac_word" >&5 ++echo "configure:2307: 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 -@@ -2282,7 +2330,7 @@ if test -z "$CC"; then +@@ -2285,7 +2333,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:2286: checking for $ac_word" >&5 -+echo "configure:2334: checking for $ac_word" >&5 +-echo "configure:2289: checking for $ac_word" >&5 ++echo "configure:2337: 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 -@@ -2333,7 +2381,7 @@ fi +@@ -2336,7 +2384,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:2337: checking for $ac_word" >&5 -+echo "configure:2385: checking for $ac_word" >&5 +-echo "configure:2340: checking for $ac_word" >&5 ++echo "configure:2388: 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 -@@ -2365,7 +2413,7 @@ fi +@@ -2368,7 +2416,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2369: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:2417: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +-echo "configure:2372: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2420: 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. -@@ -2376,12 +2424,12 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -2379,12 +2427,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF --#line 2380 "configure" -+#line 2428 "configure" +-#line 2383 "configure" ++#line 2431 "configure" #include "confdefs.h" main(){return(0);} EOF --if { (eval echo configure:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:2388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2436: \"$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 -@@ -2407,12 +2455,12 @@ if test $ac_cv_prog_cc_works = no; then +@@ -2410,12 +2458,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:2411: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2459: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "configure:2414: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2462: 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:2416: checking whether we are using GNU C" >&5 -+echo "configure:2464: checking whether we are using GNU C" >&5 +-echo "configure:2419: checking whether we are using GNU C" >&5 ++echo "configure:2467: 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 -@@ -2421,7 +2469,7 @@ else +@@ -2424,7 +2472,7 @@ else yes; #endif EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2473: \"$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:2428: \"$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:2476: \"$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 -@@ -2440,7 +2488,7 @@ ac_test_CFLAGS="${CFLAGS+set}" +@@ -2443,7 +2491,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:2444: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:2492: checking whether ${CC-cc} accepts -g" >&5 +-echo "configure:2447: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2495: 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 -@@ -2472,7 +2520,7 @@ else +@@ -2475,7 +2523,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:2476: checking how to run the C preprocessor" >&5 -+echo "configure:2524: checking how to run the C preprocessor" >&5 +-echo "configure:2479: checking how to run the C preprocessor" >&5 ++echo "configure:2527: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= -@@ -2487,13 +2535,13 @@ else +@@ -2490,13 +2538,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2548: \"$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 : -@@ -2504,13 +2552,13 @@ else +@@ -2507,13 +2555,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2565: \"$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 : -@@ -2521,13 +2569,13 @@ else +@@ -2524,13 +2572,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2582: \"$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 : -@@ -2554,9 +2602,9 @@ echo "$ac_t""$CPP" 1>&6 +@@ -2557,9 +2605,9 @@ echo "$ac_t""$CPP" 1>&6 ICC="no" echo $ac_n "checking for icc""... $ac_c" 1>&6 --echo "configure:2558: checking for icc" >&5 -+echo "configure:2606: checking for icc" >&5 +-echo "configure:2561: checking for icc" >&5 ++echo "configure:2609: checking for icc" >&5 cat > conftest.$ac_ext <&6 --echo "configure:2582: checking for suncc" >&5 -+echo "configure:2630: checking for suncc" >&5 +-echo "configure:2585: checking for suncc" >&5 ++echo "configure:2633: checking for suncc" >&5 cat > conftest.$ac_ext <&6 --echo "configure:2607: checking whether $CC and cc understand -c and -o together" >&5 -+echo "configure:2655: checking whether $CC and cc understand -c and -o together" >&5 +-echo "configure:2610: checking whether $CC and cc understand -c and -o together" >&5 ++echo "configure:2658: 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:2610: checking whether cc understands -c and -o together" >&5 -+echo "configure:2658: checking whether cc understands -c and -o together" >&5 +-echo "configure:2613: checking whether cc understands -c and -o together" >&5 ++echo "configure:2661: 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]/_/'`" -@@ -2618,16 +2666,16 @@ else +@@ -2621,16 +2669,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:2622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:2623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+if { (eval echo configure:2670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:2671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +-if { (eval echo configure:2625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++if { (eval echo configure:2673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:2674: \"$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:2628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then -+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then +- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2679: \"$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:2630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:2631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+ if { (eval echo configure:2678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +- if { (eval echo configure:2633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:2634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++ if { (eval echo configure:2681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:2682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : -@@ -2654,7 +2702,7 @@ EOF +@@ -2657,7 +2705,7 @@ EOF fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:2658: checking how to run the C preprocessor" >&5 -+echo "configure:2706: checking how to run the C preprocessor" >&5 +-echo "configure:2661: checking how to run the C preprocessor" >&5 ++echo "configure:2709: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= -@@ -2669,13 +2717,13 @@ else +@@ -2672,13 +2720,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2730: \"$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 : -@@ -2686,13 +2734,13 @@ else +@@ -2689,13 +2737,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2747: \"$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 : -@@ -2703,13 +2751,13 @@ else +@@ -2706,13 +2754,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2764: \"$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 : -@@ -2734,9 +2782,9 @@ fi +@@ -2737,9 +2785,9 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 --echo "configure:2738: checking for AIX" >&5 -+echo "configure:2786: checking for AIX" >&5 +-echo "configure:2741: checking for AIX" >&5 ++echo "configure:2789: checking for AIX" >&5 cat > conftest.$ac_ext <&6 --echo "configure:2762: checking whether ln -s works" >&5 -+echo "configure:2810: checking whether ln -s works" >&5 +-echo "configure:2765: checking whether ln -s works" >&5 ++echo "configure:2813: 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 -@@ -2783,7 +2831,7 @@ fi +@@ -2786,7 +2834,7 @@ fi php_with_libdir=lib echo $ac_n "checking for system library directory""... $ac_c" 1>&6 --echo "configure:2787: checking for system library directory" >&5 -+echo "configure:2835: checking for system library directory" >&5 +-echo "configure:2790: checking for system library directory" >&5 ++echo "configure:2838: checking for system library directory" >&5 # Check whether --with-libdir or --without-libdir was given. if test "${with_libdir+set}" = set; then withval="$with_libdir" -@@ -2806,7 +2854,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -2809,7 +2857,7 @@ echo "$ac_t""$ext_output" 1>&6 php_enable_rpath=yes echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6 --echo "configure:2810: checking whether to enable runpaths" >&5 -+echo "configure:2858: checking whether to enable runpaths" >&5 +-echo "configure:2813: checking whether to enable runpaths" >&5 ++echo "configure:2861: 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" -@@ -2827,7 +2875,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -2830,7 +2878,7 @@ echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6 --echo "configure:2831: checking if compiler supports -R" >&5 -+echo "configure:2879: checking if compiler supports -R" >&5 +-echo "configure:2834: checking if compiler supports -R" >&5 ++echo "configure:2882: 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 -@@ -2835,14 +2883,14 @@ else +@@ -2838,14 +2886,14 @@ else SAVE_LIBS=$LIBS LIBS="-R /usr/$PHP_LIBDIR $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* php_cv_cc_dashr=yes else -@@ -2860,7 +2908,7 @@ if test $php_cv_cc_dashr = "yes"; then +@@ -2863,7 +2911,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:2864: checking if compiler supports -Wl,-rpath," >&5 -+echo "configure:2912: checking if compiler supports -Wl,-rpath," >&5 +-echo "configure:2867: checking if compiler supports -Wl,-rpath," >&5 ++echo "configure:2915: 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 -@@ -2868,14 +2916,14 @@ else +@@ -2871,14 +2919,14 @@ else SAVE_LIBS=$LIBS LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* php_cv_cc_rpath=yes else -@@ -2906,7 +2954,7 @@ do +@@ -2909,7 +2957,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:2910: checking for $ac_word" >&5 -+echo "configure:2958: checking for $ac_word" >&5 +-echo "configure:2913: checking for $ac_word" >&5 ++echo "configure:2961: 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 -@@ -2947,7 +2995,7 @@ test -n "$AWK" || AWK="bork" +@@ -2950,7 +2998,7 @@ test -n "$AWK" || AWK="bork" ;; *) echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6 --echo "configure:2951: checking if $AWK is broken" >&5 -+echo "configure:2999: checking if $AWK is broken" >&5 +-echo "configure:2954: checking if $AWK is broken" >&5 ++echo "configure:3002: 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; } -@@ -2966,7 +3014,7 @@ do +@@ -2969,7 +3017,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:2970: checking for $ac_word" >&5 -+echo "configure:3018: checking for $ac_word" >&5 +-echo "configure:2973: checking for $ac_word" >&5 ++echo "configure:3021: 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 -@@ -3006,7 +3054,7 @@ test -n "$YACC" || YACC="yacc" +@@ -3009,7 +3057,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:3010: checking for bison version" >&5 -+echo "configure:3058: checking for bison version" >&5 +-echo "configure:3013: checking for bison version" >&5 ++echo "configure:3061: 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 -@@ -3044,7 +3092,7 @@ echo "$ac_t""$php_cv_bison_version" 1>&6 +@@ -3047,7 +3095,7 @@ echo "$ac_t""$php_cv_bison_version" 1>&6 # 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:3048: checking for $ac_word" >&5 -+echo "configure:3096: checking for $ac_word" >&5 +-echo "configure:3051: checking for $ac_word" >&5 ++echo "configure:3099: 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 -@@ -3072,7 +3120,7 @@ fi +@@ -3075,7 +3123,7 @@ fi if test -n "$RE2C"; then echo $ac_n "checking for re2c version""... $ac_c" 1>&6 --echo "configure:3076: checking for re2c version" >&5 -+echo "configure:3124: checking for re2c version" >&5 +-echo "configure:3079: checking for re2c version" >&5 ++echo "configure:3127: 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 -@@ -3111,7 +3159,7 @@ esac +@@ -3114,7 +3162,7 @@ esac php_enable_re2c_cgoto=no echo $ac_n "checking whether to enable computed goto gcc extension with re2c""... $ac_c" 1>&6 --echo "configure:3115: checking whether to enable computed goto gcc extension with re2c" >&5 -+echo "configure:3163: checking whether to enable computed goto gcc extension with re2c" >&5 +-echo "configure:3118: checking whether to enable computed goto gcc extension with re2c" >&5 ++echo "configure:3166: checking whether to enable computed goto gcc extension with re2c" >&5 # Check whether --enable-re2c-cgoto or --disable-re2c-cgoto was given. if test "${enable_re2c_cgoto+set}" = set; then enableval="$enable_re2c_cgoto" -@@ -3134,9 +3182,9 @@ if test "$PHP_RE2C_CGOTO" = "no"; then +@@ -3137,9 +3185,9 @@ if test "$PHP_RE2C_CGOTO" = "no"; then RE2C_FLAGS="" else echo $ac_n "checking whether re2c -g works""... $ac_c" 1>&6 --echo "configure:3138: checking whether re2c -g works" >&5 -+echo "configure:3186: checking whether re2c -g works" >&5 +-echo "configure:3141: checking whether re2c -g works" >&5 ++echo "configure:3189: checking whether re2c -g works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:3161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* RE2C_FLAGS="" -@@ -3220,7 +3268,7 @@ case $host_alias in +@@ -3223,7 +3271,7 @@ case $host_alias in 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:3224: checking whether $CC supports -no-cpp-precomp" >&5 -+echo "configure:3272: checking whether $CC supports -no-cpp-precomp" >&5 +-echo "configure:3227: checking whether $CC supports -no-cpp-precomp" >&5 ++echo "configure:3275: 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 -@@ -3421,7 +3469,7 @@ esac +@@ -3424,7 +3472,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:3425: checking whether to force non-PIC code in shared modules" >&5 -+echo "configure:3473: checking whether to force non-PIC code in shared modules" >&5 +-echo "configure:3428: checking whether to force non-PIC code in shared modules" >&5 ++echo "configure:3476: 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 -@@ -3451,7 +3499,7 @@ esac +@@ -3454,7 +3502,7 @@ esac echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6 --echo "configure:3455: checking whether /dev/urandom exists" >&5 -+echo "configure:3503: checking whether /dev/urandom exists" >&5 +-echo "configure:3458: checking whether /dev/urandom exists" >&5 ++echo "configure:3506: 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 -@@ -3512,7 +3560,7 @@ if test "$cross_compiling" = yes; then +@@ -3515,7 +3563,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -3530,7 +3578,7 @@ int main() { +@@ -3533,7 +3581,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF --if { (eval echo configure:3534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -3550,7 +3598,7 @@ fi +@@ -3553,7 +3601,7 @@ fi CFLAGS=$save_CFLAGS echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 --echo "configure:3554: checking for pthreads_cflags" >&5 -+echo "configure:3602: checking for pthreads_cflags" >&5 +-echo "configure:3557: checking for pthreads_cflags" >&5 ++echo "configure:3605: 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 -@@ -3572,7 +3620,7 @@ if test "$cross_compiling" = yes; then +@@ -3575,7 +3623,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -3590,7 +3638,7 @@ int main() { +@@ -3593,7 +3641,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF --if { (eval echo configure:3594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -3620,7 +3668,7 @@ fi +@@ -3623,7 +3671,7 @@ fi echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 --echo "configure:3624: checking for pthreads_lib" >&5 -+echo "configure:3672: checking for pthreads_lib" >&5 +-echo "configure:3627: checking for pthreads_lib" >&5 ++echo "configure:3675: 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 -@@ -3642,7 +3690,7 @@ if test "$cross_compiling" = yes; then +@@ -3645,7 +3693,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -3660,7 +3708,7 @@ int main() { +@@ -3663,7 +3711,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF --if { (eval echo configure:3664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -3791,7 +3839,7 @@ ext_output=$PHP_AOLSERVER +@@ -3794,7 +3842,7 @@ ext_output=$PHP_AOLSERVER echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6 --echo "configure:3795: checking for AOLserver support" >&5 -+echo "configure:3843: checking for AOLserver support" >&5 +-echo "configure:3798: checking for AOLserver support" >&5 ++echo "configure:3846: checking for AOLserver support" >&5 if test "$PHP_AOLSERVER" != "no"; then if test -d "$PHP_AOLSERVER/include"; then -@@ -4056,7 +4104,7 @@ ext_output=$PHP_APXS +@@ -4059,7 +4107,7 @@ ext_output=$PHP_APXS echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6 --echo "configure:4060: checking for Apache 1.x module support via DSO through APXS" >&5 -+echo "configure:4108: checking for Apache 1.x module support via DSO through APXS" >&5 +-echo "configure:4063: checking for Apache 1.x module support via DSO through APXS" >&5 ++echo "configure:4111: checking for Apache 1.x module support via DSO through APXS" >&5 if test "$PHP_APXS" != "no"; then if test "$PHP_APXS" = "yes"; then -@@ -4387,7 +4435,7 @@ ext_output=$PHP_APACHE +@@ -4390,7 +4438,7 @@ ext_output=$PHP_APACHE echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6 --echo "configure:4391: checking for Apache 1.x module support" >&5 -+echo "configure:4439: checking for Apache 1.x module support" >&5 +-echo "configure:4394: checking for Apache 1.x module support" >&5 ++echo "configure:4442: checking for Apache 1.x module support" >&5 if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then -@@ -5264,7 +5312,7 @@ fi +@@ -5267,7 +5315,7 @@ fi php_enable_mod_charset=no echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6 --echo "configure:5268: checking whether to enable Apache charset compatibility option" >&5 -+echo "configure:5316: checking whether to enable Apache charset compatibility option" >&5 +-echo "configure:5271: checking whether to enable Apache charset compatibility option" >&5 ++echo "configure:5319: checking whether to enable Apache charset compatibility option" >&5 # Check whether --enable-mod-charset or --disable-mod-charset was given. if test "${enable_mod_charset+set}" = set; then enableval="$enable_mod_charset" -@@ -5296,7 +5344,7 @@ if test "$APACHE_MODULE" = "yes"; then +@@ -5299,7 +5347,7 @@ if test "$APACHE_MODULE" = "yes"; then gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 --echo "configure:5300: checking whether $CC supports -rdynamic" >&5 -+echo "configure:5348: checking whether $CC supports -rdynamic" >&5 +-echo "configure:5303: checking whether $CC supports -rdynamic" >&5 ++echo "configure:5351: 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 -@@ -5339,7 +5387,7 @@ if test -n "$APACHE_INSTALL"; then +@@ -5342,7 +5390,7 @@ if test -n "$APACHE_INSTALL"; then echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 --echo "configure:5343: checking for member fd in BUFF *" >&5 -+echo "configure:5391: checking for member fd in BUFF *" >&5 +-echo "configure:5346: checking for member fd in BUFF *" >&5 ++echo "configure:5394: 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 -@@ -5351,14 +5399,14 @@ else +@@ -5354,14 +5402,14 @@ else CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" fi cat > conftest.$ac_ext < int main() { conn_rec *c; int fd = c->client->fd; ; return 0; } EOF --if { (eval echo configure:5362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:5365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_php_fd_in_buff=yes -@@ -5431,7 +5479,7 @@ ext_output=$PHP_APXS2FILTER +@@ -5434,7 +5482,7 @@ ext_output=$PHP_APXS2FILTER echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6 --echo "configure:5435: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 -+echo "configure:5483: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 +-echo "configure:5438: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 ++echo "configure:5486: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 if test "$PHP_APXS2FILTER" != "no"; then if test "$PHP_APXS2FILTER" = "yes"; then -@@ -6320,7 +6368,7 @@ ext_output=$PHP_APXS2 +@@ -6323,7 +6371,7 @@ ext_output=$PHP_APXS2 echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6 --echo "configure:6324: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 -+echo "configure:6372: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 +-echo "configure:6327: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 ++echo "configure:6375: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 if test "$PHP_APXS2" != "no"; then if test "$PHP_APXS2" = "yes"; then -@@ -7210,7 +7258,7 @@ ext_output=$PHP_APACHE_HOOKS +@@ -7213,7 +7261,7 @@ ext_output=$PHP_APACHE_HOOKS echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6 --echo "configure:7214: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 -+echo "configure:7262: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 +-echo "configure:7217: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 ++echo "configure:7265: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 if test "$PHP_APACHE_HOOKS" != "no"; then if test "$PHP_APACHE_HOOKS" = "yes"; then -@@ -7541,7 +7589,7 @@ ext_output=$PHP_APACHE_HOOKS_STATIC +@@ -7544,7 +7592,7 @@ ext_output=$PHP_APACHE_HOOKS_STATIC echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6 --echo "configure:7545: checking for Apache 1.x (hooks) module support" >&5 -+echo "configure:7593: checking for Apache 1.x (hooks) module support" >&5 +-echo "configure:7548: checking for Apache 1.x (hooks) module support" >&5 ++echo "configure:7596: checking for Apache 1.x (hooks) module support" >&5 if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS_STATIC" != "no"; then -@@ -8418,7 +8466,7 @@ fi +@@ -8421,7 +8469,7 @@ fi php_enable_mod_charset=no echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6 --echo "configure:8422: checking whether to enable Apache charset compatibility option" >&5 -+echo "configure:8470: checking whether to enable Apache charset compatibility option" >&5 +-echo "configure:8425: checking whether to enable Apache charset compatibility option" >&5 ++echo "configure:8473: checking whether to enable Apache charset compatibility option" >&5 # Check whether --enable-mod-charset or --disable-mod-charset was given. if test "${enable_mod_charset+set}" = set; then enableval="$enable_mod_charset" -@@ -8450,7 +8498,7 @@ if test "$APACHE_HOOKS_MODULE" = "yes"; +@@ -8453,7 +8501,7 @@ if test "$APACHE_HOOKS_MODULE" = "yes"; gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 --echo "configure:8454: checking whether $CC supports -rdynamic" >&5 -+echo "configure:8502: checking whether $CC supports -rdynamic" >&5 +-echo "configure:8457: checking whether $CC supports -rdynamic" >&5 ++echo "configure:8505: 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 -@@ -8493,7 +8541,7 @@ if test -n "$APACHE_HOOKS_INSTALL"; then +@@ -8496,7 +8544,7 @@ if test -n "$APACHE_HOOKS_INSTALL"; then echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 --echo "configure:8497: checking for member fd in BUFF *" >&5 -+echo "configure:8545: checking for member fd in BUFF *" >&5 +-echo "configure:8500: checking for member fd in BUFF *" >&5 ++echo "configure:8548: 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 -@@ -8505,14 +8553,14 @@ else +@@ -8508,14 +8556,14 @@ else CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" fi cat > conftest.$ac_ext < int main() { conn_rec *c; int fd = c->client->fd; ; return 0; } EOF --if { (eval echo configure:8516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:8519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_php_fd_in_buff=yes -@@ -8586,7 +8634,7 @@ ext_output=$PHP_CAUDIUM +@@ -8589,7 +8637,7 @@ ext_output=$PHP_CAUDIUM echo $ac_n "checking for Caudium support""... $ac_c" 1>&6 --echo "configure:8590: checking for Caudium support" >&5 -+echo "configure:8638: checking for Caudium support" >&5 +-echo "configure:8593: checking for Caudium support" >&5 ++echo "configure:8641: checking for Caudium support" >&5 if test "$PHP_CAUDIUM" != "no"; then if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi -@@ -8656,7 +8704,7 @@ if test "$PHP_CAUDIUM" != "no"; then +@@ -8659,7 +8707,7 @@ if test "$PHP_CAUDIUM" != "no"; 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:8660: checking for C includes in $PIKE_C_INCLUDE" >&5 -+echo "configure:8708: checking for C includes in $PIKE_C_INCLUDE" >&5 +-echo "configure:8663: checking for C includes in $PIKE_C_INCLUDE" >&5 ++echo "configure:8711: 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 ####### -@@ -8945,7 +8993,7 @@ ext_output=$PHP_CLI +@@ -8948,7 +8996,7 @@ ext_output=$PHP_CLI echo $ac_n "checking for CLI build""... $ac_c" 1>&6 --echo "configure:8949: checking for CLI build" >&5 -+echo "configure:8997: checking for CLI build" >&5 +-echo "configure:8952: checking for CLI build" >&5 ++echo "configure:9000: checking for CLI build" >&5 if test "$PHP_CLI" != "no"; then src=$abs_srcdir/sapi/cli/Makefile.frag -@@ -8995,7 +9043,7 @@ echo "$ac_t""$PHP_CLI" 1>&6 +@@ -8998,7 +9046,7 @@ echo "$ac_t""$PHP_CLI" 1>&6 php_with_continuity=no echo $ac_n "checking for Continuity support""... $ac_c" 1>&6 --echo "configure:8999: checking for Continuity support" >&5 -+echo "configure:9047: checking for Continuity support" >&5 +-echo "configure:9002: checking for Continuity support" >&5 ++echo "configure:9050: checking for Continuity support" >&5 # Check whether --with-continuity or --without-continuity was given. if test "${with_continuity+set}" = set; then withval="$with_continuity" -@@ -9019,7 +9067,7 @@ if test "$PHP_CONTINUITY" != "no"; then +@@ -9022,7 +9070,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:9023: checking for Continuity include files" >&5 -+echo "configure:9071: checking for Continuity include files" >&5 +-echo "configure:9026: checking for Continuity include files" >&5 ++echo "configure:9074: 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 -@@ -9277,7 +9325,7 @@ ext_output=$PHP_EMBED +@@ -9280,7 +9328,7 @@ ext_output=$PHP_EMBED echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6 --echo "configure:9281: checking for embedded SAPI library support" >&5 -+echo "configure:9329: checking for embedded SAPI library support" >&5 +-echo "configure:9284: checking for embedded SAPI library support" >&5 ++echo "configure:9332: checking for embedded SAPI library support" >&5 if test "$PHP_EMBED" != "no"; then case "$PHP_EMBED" in -@@ -9541,7 +9589,7 @@ ext_output=$PHP_FPM +@@ -9556,7 +9604,7 @@ ext_output=$PHP_FPM echo $ac_n "checking for FPM build""... $ac_c" 1>&6 --echo "configure:9545: checking for FPM build" >&5 -+echo "configure:9593: checking for FPM build" >&5 +-echo "configure:9560: checking for FPM build" >&5 ++echo "configure:9608: checking for FPM build" >&5 if test "$PHP_FPM" != "no"; then echo "$ac_t""$PHP_FPM" 1>&6 -@@ -9549,12 +9597,12 @@ if test "$PHP_FPM" != "no"; then +@@ -9564,12 +9612,12 @@ if test "$PHP_FPM" != "no"; then for ac_func in setenv clearenv setproctitle do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9553: checking for $ac_func" >&5 -+echo "configure:9601: checking for $ac_func" >&5 +-echo "configure:9568: checking for $ac_func" >&5 ++echo "configure:9616: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9644: \"$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 -@@ -9604,14 +9652,14 @@ done +@@ -9619,14 +9667,14 @@ done echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 --echo "configure:9608: checking for library containing socket" >&5 -+echo "configure:9656: checking for library containing socket" >&5 +-echo "configure:9623: checking for library containing socket" >&5 ++echo "configure:9671: checking for library containing socket" >&5 if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_socket="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_socket="none required" else -@@ -9633,7 +9681,7 @@ rm -f conftest* +@@ -9648,7 +9696,7 @@ rm -f conftest* test "$ac_cv_search_socket" = "no" && for i in socket; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_socket="-l$i" break -@@ -9666,14 +9714,14 @@ else : +@@ -9681,14 +9729,14 @@ else : fi echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6 --echo "configure:9670: checking for library containing inet_addr" >&5 -+echo "configure:9718: checking for library containing inet_addr" >&5 +-echo "configure:9685: checking for library containing inet_addr" >&5 ++echo "configure:9733: checking for library containing inet_addr" >&5 if eval "test \"`echo '$''{'ac_cv_search_inet_addr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_inet_addr="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_inet_addr="none required" else -@@ -9695,7 +9743,7 @@ rm -f conftest* +@@ -9710,7 +9758,7 @@ rm -f conftest* test "$ac_cv_search_inet_addr" = "no" && for i in nsl; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_inet_addr="-l$i" break -@@ -9731,17 +9779,17 @@ fi +@@ -9746,17 +9794,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9735: checking for $ac_hdr" >&5 -+echo "configure:9783: checking for $ac_hdr" >&5 +-echo "configure:9750: checking for $ac_hdr" >&5 ++echo "configure:9798: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:9745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:9760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9808: \"$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* -@@ -9771,17 +9819,17 @@ done +@@ -9786,17 +9834,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9775: checking for $ac_hdr" >&5 -+echo "configure:9823: checking for $ac_hdr" >&5 +-echo "configure:9790: checking for $ac_hdr" >&5 ++echo "configure:9838: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:9785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:9800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9848: \"$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* -@@ -9811,17 +9859,17 @@ done +@@ -9826,17 +9874,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9815: checking for $ac_hdr" >&5 -+echo "configure:9863: checking for $ac_hdr" >&5 +-echo "configure:9830: checking for $ac_hdr" >&5 ++echo "configure:9878: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:9825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:9840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9888: \"$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* -@@ -9850,17 +9898,17 @@ done +@@ -9865,17 +9913,17 @@ done echo $ac_n "checking for prctl""... $ac_c" 1>&6 --echo "configure:9854: checking for prctl" >&5 -+echo "configure:9902: checking for prctl" >&5 +-echo "configure:9869: checking for prctl" >&5 ++echo "configure:9917: checking for prctl" >&5 cat > conftest.$ac_ext < int main() { prctl(0, 0, 0, 0, 0); ; return 0; } EOF --if { (eval echo configure:9864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:9879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -9883,17 +9931,17 @@ rm -f conftest* +@@ -9898,17 +9946,17 @@ rm -f conftest* have_clock_gettime=no echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6 --echo "configure:9887: checking for clock_gettime" >&5 -+echo "configure:9935: checking for clock_gettime" >&5 +-echo "configure:9902: checking for clock_gettime" >&5 ++echo "configure:9950: checking for clock_gettime" >&5 cat > conftest.$ac_ext < int main() { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); ; return 0; } EOF --if { (eval echo configure:9897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_clock_gettime=yes -@@ -9911,20 +9959,20 @@ rm -f conftest* +@@ -9926,20 +9974,20 @@ rm -f conftest* if test "$have_clock_gettime" = "no"; then echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6 --echo "configure:9915: checking for clock_gettime in -lrt" >&5 -+echo "configure:9963: checking for clock_gettime in -lrt" >&5 +-echo "configure:9930: checking for clock_gettime in -lrt" >&5 ++echo "configure:9978: checking for clock_gettime in -lrt" >&5 SAVED_LIBS="$LIBS" LIBS="$LIBS -lrt" cat > conftest.$ac_ext < int main() { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); ; return 0; } EOF --if { (eval echo configure:9928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_clock_gettime=yes -@@ -9953,13 +10001,13 @@ EOF +@@ -9968,13 +10016,13 @@ EOF if test "$have_clock_gettime" = "no"; then echo $ac_n "checking for clock_get_time""... $ac_c" 1>&6 --echo "configure:9957: checking for clock_get_time" >&5 -+echo "configure:10005: checking for clock_get_time" >&5 +-echo "configure:9972: checking for clock_get_time" >&5 ++echo "configure:10020: checking for clock_get_time" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include -@@ -9983,7 +10031,7 @@ else +@@ -9998,7 +10046,7 @@ else } EOF --if { (eval echo configure:9987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:10002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then have_clock_get_time=yes -@@ -10014,10 +10062,10 @@ EOF +@@ -10029,10 +10077,10 @@ EOF have_broken_ptrace=no echo $ac_n "checking for ptrace""... $ac_c" 1>&6 --echo "configure:10018: checking for ptrace" >&5 -+echo "configure:10066: checking for ptrace" >&5 +-echo "configure:10033: checking for ptrace" >&5 ++echo "configure:10081: checking for ptrace" >&5 cat > conftest.$ac_ext < -@@ -10026,7 +10074,7 @@ int main() { +@@ -10041,7 +10089,7 @@ int main() { ptrace(0, 0, (void *) 0, 0); ; return 0; } EOF --if { (eval echo configure:10030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_ptrace=yes -@@ -10044,13 +10092,13 @@ rm -f conftest* +@@ -10059,13 +10107,13 @@ rm -f conftest* if test "$have_ptrace" = "yes"; then echo $ac_n "checking whether ptrace works""... $ac_c" 1>&6 --echo "configure:10048: checking whether ptrace works" >&5 -+echo "configure:10096: checking whether ptrace works" >&5 +-echo "configure:10063: checking whether ptrace works" >&5 ++echo "configure:10111: checking whether ptrace works" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < -@@ -10121,7 +10169,7 @@ else +@@ -10136,7 +10184,7 @@ else } EOF --if { (eval echo configure:10125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:10140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10188: \"$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 -@@ -10152,10 +10200,10 @@ EOF +@@ -10167,10 +10215,10 @@ EOF if test "$have_broken_ptrace" = "yes"; then echo $ac_n "checking for mach_vm_read""... $ac_c" 1>&6 --echo "configure:10156: checking for mach_vm_read" >&5 -+echo "configure:10204: checking for mach_vm_read" >&5 +-echo "configure:10171: checking for mach_vm_read" >&5 ++echo "configure:10219: checking for mach_vm_read" >&5 cat > conftest.$ac_ext < #include -@@ -10166,7 +10214,7 @@ int main() { +@@ -10181,7 +10229,7 @@ int main() { ; return 0; } EOF --if { (eval echo configure:10170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mach_vm_read=yes -@@ -10202,13 +10250,13 @@ EOF +@@ -10217,13 +10265,13 @@ EOF if test -n "$proc_mem_file" ; then echo $ac_n "checking for proc mem file""... $ac_c" 1>&6 --echo "configure:10206: checking for proc mem file" >&5 -+echo "configure:10254: checking for proc mem file" >&5 +-echo "configure:10221: checking for proc mem file" >&5 ++echo "configure:10269: checking for proc mem file" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:10257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""$proc_mem_file" 1>&6 -@@ -10282,9 +10330,9 @@ EOF +@@ -10297,9 +10345,9 @@ EOF echo $ac_n "checking if gcc supports __sync_bool_compare_and_swap""... $ac_c" 1>&6 --echo "configure:10286: checking if gcc supports __sync_bool_compare_and_swap" >&5 -+echo "configure:10334: checking if gcc supports __sync_bool_compare_and_swap" >&5 +-echo "configure:10301: checking if gcc supports __sync_bool_compare_and_swap" >&5 ++echo "configure:10349: checking if gcc supports __sync_bool_compare_and_swap" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -10318,17 +10366,17 @@ rm -f conftest* +@@ -10333,17 +10381,17 @@ rm -f conftest* have_lq=no echo $ac_n "checking for TCP_INFO""... $ac_c" 1>&6 --echo "configure:10322: checking for TCP_INFO" >&5 -+echo "configure:10370: checking for TCP_INFO" >&5 +-echo "configure:10337: checking for TCP_INFO" >&5 ++echo "configure:10385: checking for TCP_INFO" >&5 cat > conftest.$ac_ext < int main() { struct tcp_info ti; int x = TCP_INFO; ; return 0; } EOF --if { (eval echo configure:10332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_lq=tcp_info -@@ -10353,17 +10401,17 @@ EOF +@@ -10368,17 +10416,17 @@ EOF if test "$have_lq" = "no" ; then echo $ac_n "checking for SO_LISTENQLEN""... $ac_c" 1>&6 --echo "configure:10357: checking for SO_LISTENQLEN" >&5 -+echo "configure:10405: checking for SO_LISTENQLEN" >&5 +-echo "configure:10372: checking for SO_LISTENQLEN" >&5 ++echo "configure:10420: checking for SO_LISTENQLEN" >&5 cat > conftest.$ac_ext < int main() { int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN; ; return 0; } EOF --if { (eval echo configure:10367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_lq=so_listenq -@@ -10389,17 +10437,17 @@ EOF +@@ -10404,17 +10452,17 @@ EOF echo $ac_n "checking for sysconf""... $ac_c" 1>&6 --echo "configure:10393: checking for sysconf" >&5 -+echo "configure:10441: checking for sysconf" >&5 +-echo "configure:10408: checking for sysconf" >&5 ++echo "configure:10456: checking for sysconf" >&5 cat > conftest.$ac_ext < int main() { sysconf(_SC_CLK_TCK); ; return 0; } EOF --if { (eval echo configure:10403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -10420,17 +10468,17 @@ rm -f conftest* +@@ -10435,17 +10483,17 @@ rm -f conftest* echo $ac_n "checking for times""... $ac_c" 1>&6 --echo "configure:10424: checking for times" >&5 -+echo "configure:10472: checking for times" >&5 +-echo "configure:10439: checking for times" >&5 ++echo "configure:10487: checking for times" >&5 cat > conftest.$ac_ext < int main() { struct tms t; times(&t); ; return 0; } EOF --if { (eval echo configure:10434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -10802,7 +10850,7 @@ fi +@@ -10466,10 +10514,10 @@ rm -f conftest* + + + echo $ac_n "checking for kqueue""... $ac_c" 1>&6 +-echo "configure:10470: checking for kqueue" >&5 ++echo "configure:10518: checking for kqueue" >&5 + + cat > conftest.$ac_ext < +@@ -10486,7 +10534,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -10507,10 +10555,10 @@ rm -f conftest* + + + echo $ac_n "checking for port framework""... $ac_c" 1>&6 +-echo "configure:10511: checking for port framework" >&5 ++echo "configure:10559: checking for port framework" >&5 + + cat > conftest.$ac_ext < +@@ -10526,7 +10574,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -10547,10 +10595,10 @@ rm -f conftest* + + + echo $ac_n "checking for /dev/poll""... $ac_c" 1>&6 +-echo "configure:10551: checking for /dev/poll" >&5 ++echo "configure:10599: checking for /dev/poll" >&5 + + cat > conftest.$ac_ext < +@@ -10568,7 +10616,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -10589,10 +10637,10 @@ rm -f conftest* + + + echo $ac_n "checking for epoll""... $ac_c" 1>&6 +-echo "configure:10593: checking for epoll" >&5 ++echo "configure:10641: checking for epoll" >&5 + + cat > conftest.$ac_ext < +@@ -10621,7 +10669,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -10642,10 +10690,10 @@ rm -f conftest* + + + echo $ac_n "checking for poll""... $ac_c" 1>&6 +-echo "configure:10646: checking for poll" >&5 ++echo "configure:10694: checking for poll" >&5 + + cat > conftest.$ac_ext < +@@ -10664,7 +10712,7 @@ int main() { + + ; return 0; } + EOF +-if { (eval echo configure:10668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -10685,10 +10733,10 @@ rm -f conftest* + + + echo $ac_n "checking for select""... $ac_c" 1>&6 +-echo "configure:10689: checking for select" >&5 ++echo "configure:10737: checking for select" >&5 + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +@@ -11090,7 +11138,7 @@ fi php_with_isapi=no echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6 --echo "configure:10806: checking for Zeus ISAPI support" >&5 -+echo "configure:10854: checking for Zeus ISAPI support" >&5 +-echo "configure:11094: checking for Zeus ISAPI support" >&5 ++echo "configure:11142: 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" -@@ -11056,7 +11104,7 @@ fi +@@ -11344,7 +11392,7 @@ fi echo $ac_n "checking for LiteSpeed support""... $ac_c" 1>&6 --echo "configure:11060: checking for LiteSpeed support" >&5 -+echo "configure:11108: checking for LiteSpeed support" >&5 +-echo "configure:11348: checking for LiteSpeed support" >&5 ++echo "configure:11396: checking for LiteSpeed support" >&5 php_with_litespeed=no -@@ -11319,7 +11367,7 @@ echo "$ac_t""$PHP_LITESPEED" 1>&6 +@@ -11607,7 +11655,7 @@ echo "$ac_t""$PHP_LITESPEED" 1>&6 php_with_milter=no echo $ac_n "checking for Milter support""... $ac_c" 1>&6 --echo "configure:11323: checking for Milter support" >&5 -+echo "configure:11371: checking for Milter support" >&5 +-echo "configure:11611: checking for Milter support" >&5 ++echo "configure:11659: checking for Milter support" >&5 # Check whether --with-milter or --without-milter was given. if test "${with_milter+set}" = set; then withval="$with_milter" -@@ -11611,7 +11659,7 @@ fi +@@ -11899,7 +11947,7 @@ fi php_with_nsapi=no echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6 --echo "configure:11615: checking for NSAPI support" >&5 -+echo "configure:11663: checking for NSAPI support" >&5 +-echo "configure:11903: checking for NSAPI support" >&5 ++echo "configure:11951: checking for NSAPI support" >&5 # Check whether --with-nsapi or --without-nsapi was given. if test "${with_nsapi+set}" = set; then withval="$with_nsapi" -@@ -11635,7 +11683,7 @@ if test "$PHP_NSAPI" != "no"; then +@@ -11923,7 +11971,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:11639: checking for NSAPI include files" >&5 -+echo "configure:11687: checking for NSAPI include files" >&5 +-echo "configure:11927: checking for NSAPI include files" >&5 ++echo "configure:11975: 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 -@@ -11643,17 +11691,17 @@ echo "configure:11639: checking for NSAP +@@ -11931,17 +11979,17 @@ echo "configure:11927: checking for NSAP do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:11647: checking for $ac_hdr" >&5 -+echo "configure:11695: checking for $ac_hdr" >&5 +-echo "configure:11935: checking for $ac_hdr" >&5 ++echo "configure:11983: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:11657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:11705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:11945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:11993: \"$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* -@@ -11688,17 +11736,17 @@ done +@@ -11976,17 +12024,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:11692: checking for $ac_hdr" >&5 -+echo "configure:11740: checking for $ac_hdr" >&5 +-echo "configure:11980: checking for $ac_hdr" >&5 ++echo "configure:12028: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:11702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:11750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:11990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:12038: \"$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* -@@ -11971,7 +12019,7 @@ fi +@@ -12259,7 +12307,7 @@ fi php_with_phttpd=no echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6 --echo "configure:11975: checking for PHTTPD support" >&5 -+echo "configure:12023: checking for PHTTPD support" >&5 +-echo "configure:12263: checking for PHTTPD support" >&5 ++echo "configure:12311: checking for PHTTPD support" >&5 # Check whether --with-phttpd or --without-phttpd was given. if test "${with_phttpd+set}" = set; then withval="$with_phttpd" -@@ -12225,7 +12273,7 @@ fi +@@ -12513,7 +12561,7 @@ fi php_with_pi3web=no echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6 --echo "configure:12229: checking for Pi3Web support" >&5 -+echo "configure:12277: checking for Pi3Web support" >&5 +-echo "configure:12517: checking for Pi3Web support" >&5 ++echo "configure:12565: checking for Pi3Web support" >&5 # Check whether --with-pi3web or --without-pi3web was given. if test "${with_pi3web+set}" = set; then withval="$with_pi3web" -@@ -12597,7 +12645,7 @@ ext_output=$PHP_ROXEN +@@ -12885,7 +12933,7 @@ ext_output=$PHP_ROXEN php_enable_roxen_zts=no echo $ac_n "checking whether Roxen module is build using ZTS""... $ac_c" 1>&6 --echo "configure:12601: checking whether Roxen module is build using ZTS" >&5 -+echo "configure:12649: checking whether Roxen module is build using ZTS" >&5 +-echo "configure:12889: checking whether Roxen module is build using ZTS" >&5 ++echo "configure:12937: checking whether Roxen module is build using 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" -@@ -12618,7 +12666,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -12906,7 +12954,7 @@ echo "$ac_t""$ext_output" 1>&6 RESULT= echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6 --echo "configure:12622: checking for Roxen/Pike support" >&5 -+echo "configure:12670: checking for Roxen/Pike support" >&5 +-echo "configure:12910: checking for Roxen/Pike support" >&5 ++echo "configure:12958: checking for Roxen/Pike support" >&5 if test "$PHP_ROXEN" != "no"; then if test ! -d $PHP_ROXEN ; then { echo "configure: error: You did not specify a directory" 1>&2; exit 1; } -@@ -12904,7 +12952,7 @@ ext_output=$PHP_THTTPD +@@ -13192,7 +13240,7 @@ ext_output=$PHP_THTTPD echo $ac_n "checking for thttpd""... $ac_c" 1>&6 --echo "configure:12908: checking for thttpd" >&5 -+echo "configure:12956: checking for thttpd" >&5 +-echo "configure:13196: checking for thttpd" >&5 ++echo "configure:13244: checking for thttpd" >&5 if test "$PHP_THTTPD" != "no"; then if test ! -d $PHP_THTTPD; then -@@ -12937,7 +12985,7 @@ if test "$PHP_THTTPD" != "no"; then +@@ -13225,7 +13273,7 @@ if test "$PHP_THTTPD" != "no"; then gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 --echo "configure:12941: checking whether $CC supports -rdynamic" >&5 -+echo "configure:12989: checking whether $CC supports -rdynamic" >&5 +-echo "configure:13229: checking whether $CC supports -rdynamic" >&5 ++echo "configure:13277: 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 -@@ -13173,24 +13221,24 @@ ext_output=$PHP_TUX +@@ -13461,24 +13509,24 @@ ext_output=$PHP_TUX echo $ac_n "checking for TUX""... $ac_c" 1>&6 --echo "configure:13177: checking for TUX" >&5 -+echo "configure:13225: checking for TUX" >&5 +-echo "configure:13465: checking for TUX" >&5 ++echo "configure:13513: checking for TUX" >&5 if test "$PHP_TUX" != "no"; then INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so" for ac_hdr in tuxmodule.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:13184: checking for $ac_hdr" >&5 -+echo "configure:13232: checking for $ac_hdr" >&5 +-echo "configure:13472: checking for $ac_hdr" >&5 ++echo "configure:13520: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:13194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:13242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:13482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:13530: \"$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* -@@ -13427,7 +13475,7 @@ ext_output=$PHP_WEBJAMES +@@ -13715,7 +13763,7 @@ ext_output=$PHP_WEBJAMES echo $ac_n "checking for webjames""... $ac_c" 1>&6 --echo "configure:13431: checking for webjames" >&5 -+echo "configure:13479: checking for webjames" >&5 +-echo "configure:13719: checking for webjames" >&5 ++echo "configure:13767: checking for webjames" >&5 if test "$PHP_WEBJAMES" != "no"; then -@@ -13687,14 +13735,14 @@ ext_output=$PHP_CGI +@@ -13975,14 +14023,14 @@ ext_output=$PHP_CGI if test "$PHP_SAPI" = "default"; then echo $ac_n "checking whether to build CGI binary""... $ac_c" 1>&6 --echo "configure:13691: checking whether to build CGI binary" >&5 -+echo "configure:13739: checking whether to build CGI binary" >&5 +-echo "configure:13979: checking whether to build CGI binary" >&5 ++echo "configure:14027: checking whether to build CGI binary" >&5 if test "$PHP_CGI" != "no"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6 --echo "configure:13696: checking for socklen_t in sys/socket.h" >&5 -+echo "configure:13744: checking for socklen_t in sys/socket.h" >&5 +-echo "configure:13984: checking for socklen_t in sys/socket.h" >&5 ++echo "configure:14032: checking for socklen_t in sys/socket.h" >&5 cat > conftest.$ac_ext < EOF -@@ -13714,9 +13762,9 @@ rm -f conftest* +@@ -14002,9 +14050,9 @@ rm -f conftest* echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6 --echo "configure:13718: checking for sun_len in sys/un.h" >&5 -+echo "configure:13766: checking for sun_len in sys/un.h" >&5 +-echo "configure:14006: checking for sun_len in sys/un.h" >&5 ++echo "configure:14054: checking for sun_len in sys/un.h" >&5 cat > conftest.$ac_ext < EOF -@@ -13736,7 +13784,7 @@ rm -f conftest* +@@ -14024,7 +14072,7 @@ rm -f conftest* echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6 --echo "configure:13740: checking whether cross-process locking is required by accept()" >&5 -+echo "configure:13788: checking whether cross-process locking is required by accept()" >&5 +-echo "configure:14028: checking whether cross-process locking is required by accept()" >&5 ++echo "configure:14076: checking whether cross-process locking is required by accept()" >&5 case "`uname -sr`" in IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) echo "$ac_t""yes" 1>&6 -@@ -13980,7 +14028,7 @@ fi +@@ -14268,7 +14316,7 @@ fi echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6 --echo "configure:13984: checking for chosen SAPI module" >&5 -+echo "configure:14032: checking for chosen SAPI module" >&5 +-echo "configure:14272: checking for chosen SAPI module" >&5 ++echo "configure:14320: checking for chosen SAPI module" >&5 echo "$ac_t""$PHP_SAPI" 1>&6 if test "$enable_maintainer_zts" = "yes"; then -@@ -14037,7 +14085,7 @@ fi +@@ -14325,7 +14373,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:14041: checking for $ac_word" >&5 -+echo "configure:14089: checking for $ac_word" >&5 +-echo "configure:14329: checking for $ac_word" >&5 ++echo "configure:14377: 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 -@@ -14076,7 +14124,7 @@ fi +@@ -14364,7 +14412,7 @@ fi echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6 --echo "configure:14080: checking whether system uses EBCDIC" >&5 -+echo "configure:14128: checking whether system uses EBCDIC" >&5 +-echo "configure:14368: checking whether system uses EBCDIC" >&5 ++echo "configure:14416: 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 -@@ -14087,7 +14135,7 @@ else +@@ -14375,7 +14423,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:14147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:14387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_ebcdic=yes -@@ -14123,7 +14171,7 @@ EOF +@@ -14411,7 +14459,7 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 --echo "configure:14127: checking whether byte ordering is bigendian" >&5 -+echo "configure:14175: checking whether byte ordering is bigendian" >&5 +-echo "configure:14415: checking whether byte ordering is bigendian" >&5 ++echo "configure:14463: 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 -@@ -14133,7 +14181,7 @@ else +@@ -14421,7 +14469,7 @@ else ac_cv_c_bigendian_php=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:14201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:14441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14489: \"$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 -@@ -14175,7 +14223,7 @@ EOF +@@ -14463,7 +14511,7 @@ EOF echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6 --echo "configure:14179: checking whether writing to stdout works" >&5 -+echo "configure:14227: checking whether writing to stdout works" >&5 +-echo "configure:14467: checking whether writing to stdout works" >&5 ++echo "configure:14515: 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 -@@ -14186,7 +14234,7 @@ else +@@ -14474,7 +14522,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:14256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:14496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14544: \"$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 -@@ -14279,12 +14327,12 @@ test -d /usr/ucblib && +@@ -14567,12 +14615,12 @@ test -d /usr/ucblib && unset found echo $ac_n "checking for socket""... $ac_c" 1>&6 --echo "configure:14283: checking for socket" >&5 -+echo "configure:14331: checking for socket" >&5 +-echo "configure:14571: checking for socket" >&5 ++echo "configure:14619: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14647: \"$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 -@@ -14325,12 +14373,12 @@ if eval "test \"`echo '$ac_cv_func_'sock +@@ -14613,12 +14661,12 @@ if eval "test \"`echo '$ac_cv_func_'sock else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socket""... $ac_c" 1>&6 --echo "configure:14329: checking for __socket" >&5 -+echo "configure:14377: checking for __socket" >&5 +-echo "configure:14617: checking for __socket" >&5 ++echo "configure:14665: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14693: \"$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 -@@ -14391,7 +14439,7 @@ EOF +@@ -14679,7 +14727,7 @@ EOF unset ac_cv_lib_socket___socket unset found echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:14395: checking for socket in -lsocket" >&5 -+echo "configure:14443: checking for socket in -lsocket" >&5 +-echo "configure:14683: checking for socket in -lsocket" >&5 ++echo "configure:14731: 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 -@@ -14399,7 +14447,7 @@ else +@@ -14687,7 +14735,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14430,7 +14478,7 @@ else +@@ -14718,7 +14766,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6 --echo "configure:14434: checking for __socket in -lsocket" >&5 -+echo "configure:14482: checking for __socket in -lsocket" >&5 +-echo "configure:14722: checking for __socket in -lsocket" >&5 ++echo "configure:14770: 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 -@@ -14438,7 +14486,7 @@ else +@@ -14726,7 +14774,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14481,11 +14529,11 @@ fi +@@ -14769,11 +14817,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:14537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:14777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -14536,12 +14584,12 @@ EOF +@@ -14824,12 +14872,12 @@ EOF unset found echo $ac_n "checking for socketpair""... $ac_c" 1>&6 --echo "configure:14540: checking for socketpair" >&5 -+echo "configure:14588: checking for socketpair" >&5 +-echo "configure:14828: checking for socketpair" >&5 ++echo "configure:14876: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14904: \"$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 -@@ -14582,12 +14630,12 @@ if eval "test \"`echo '$ac_cv_func_'sock +@@ -14870,12 +14918,12 @@ if eval "test \"`echo '$ac_cv_func_'sock else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socketpair""... $ac_c" 1>&6 --echo "configure:14586: checking for __socketpair" >&5 -+echo "configure:14634: checking for __socketpair" >&5 +-echo "configure:14874: checking for __socketpair" >&5 ++echo "configure:14922: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14950: \"$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 -@@ -14648,7 +14696,7 @@ EOF +@@ -14936,7 +14984,7 @@ EOF unset ac_cv_lib_socket___socketpair unset found echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6 --echo "configure:14652: checking for socketpair in -lsocket" >&5 -+echo "configure:14700: checking for socketpair in -lsocket" >&5 +-echo "configure:14940: checking for socketpair in -lsocket" >&5 ++echo "configure:14988: 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 -@@ -14656,7 +14704,7 @@ else +@@ -14944,7 +14992,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14687,7 +14735,7 @@ else +@@ -14975,7 +15023,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6 --echo "configure:14691: checking for __socketpair in -lsocket" >&5 -+echo "configure:14739: checking for __socketpair in -lsocket" >&5 +-echo "configure:14979: checking for __socketpair in -lsocket" >&5 ++echo "configure:15027: 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 -@@ -14695,7 +14743,7 @@ else +@@ -14983,7 +15031,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14738,11 +14786,11 @@ fi +@@ -15026,11 +15074,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:14794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:15034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -14793,12 +14841,12 @@ EOF +@@ -15081,12 +15129,12 @@ EOF unset found echo $ac_n "checking for htonl""... $ac_c" 1>&6 --echo "configure:14797: checking for htonl" >&5 -+echo "configure:14845: checking for htonl" >&5 +-echo "configure:15085: checking for htonl" >&5 ++echo "configure:15133: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15161: \"$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 -@@ -14839,12 +14887,12 @@ if eval "test \"`echo '$ac_cv_func_'hton +@@ -15127,12 +15175,12 @@ if eval "test \"`echo '$ac_cv_func_'hton else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __htonl""... $ac_c" 1>&6 --echo "configure:14843: checking for __htonl" >&5 -+echo "configure:14891: checking for __htonl" >&5 +-echo "configure:15131: checking for __htonl" >&5 ++echo "configure:15179: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15207: \"$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 -@@ -14905,7 +14953,7 @@ EOF +@@ -15193,7 +15241,7 @@ EOF unset ac_cv_lib_socket___htonl unset found echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6 --echo "configure:14909: checking for htonl in -lsocket" >&5 -+echo "configure:14957: checking for htonl in -lsocket" >&5 +-echo "configure:15197: checking for htonl in -lsocket" >&5 ++echo "configure:15245: 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 -@@ -14913,7 +14961,7 @@ else +@@ -15201,7 +15249,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:14976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14944,7 +14992,7 @@ else +@@ -15232,7 +15280,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6 --echo "configure:14948: checking for __htonl in -lsocket" >&5 -+echo "configure:14996: checking for __htonl in -lsocket" >&5 +-echo "configure:15236: checking for __htonl in -lsocket" >&5 ++echo "configure:15284: 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 -@@ -14952,7 +15000,7 @@ else +@@ -15240,7 +15288,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -14995,11 +15043,11 @@ fi +@@ -15283,11 +15331,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:15051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:15291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15050,12 +15098,12 @@ EOF +@@ -15338,12 +15386,12 @@ EOF unset found echo $ac_n "checking for gethostname""... $ac_c" 1>&6 --echo "configure:15054: checking for gethostname" >&5 -+echo "configure:15102: checking for gethostname" >&5 +-echo "configure:15342: checking for gethostname" >&5 ++echo "configure:15390: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15130: \"$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 ++if { (eval echo configure:15418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostname=yes" else -@@ -15096,12 +15144,12 @@ if eval "test \"`echo '$ac_cv_func_'geth +@@ -15384,12 +15432,12 @@ if eval "test \"`echo '$ac_cv_func_'geth else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostname""... $ac_c" 1>&6 --echo "configure:15100: checking for __gethostname" >&5 -+echo "configure:15148: checking for __gethostname" >&5 +-echo "configure:15388: checking for __gethostname" >&5 ++echo "configure:15436: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15464: \"$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 -@@ -15162,7 +15210,7 @@ EOF +@@ -15450,7 +15498,7 @@ EOF unset ac_cv_lib_nsl___gethostname unset found echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 --echo "configure:15166: checking for gethostname in -lnsl" >&5 -+echo "configure:15214: checking for gethostname in -lnsl" >&5 +-echo "configure:15454: checking for gethostname in -lnsl" >&5 ++echo "configure:15502: 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 -@@ -15170,7 +15218,7 @@ else +@@ -15458,7 +15506,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15201,7 +15249,7 @@ else +@@ -15489,7 +15537,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6 --echo "configure:15205: checking for __gethostname in -lnsl" >&5 -+echo "configure:15253: checking for __gethostname in -lnsl" >&5 +-echo "configure:15493: checking for __gethostname in -lnsl" >&5 ++echo "configure:15541: 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 -@@ -15209,7 +15257,7 @@ else +@@ -15497,7 +15545,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15252,11 +15300,11 @@ fi +@@ -15540,11 +15588,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:15308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:15548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15307,12 +15355,12 @@ EOF +@@ -15595,12 +15643,12 @@ EOF unset found echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6 --echo "configure:15311: checking for gethostbyaddr" >&5 -+echo "configure:15359: checking for gethostbyaddr" >&5 +-echo "configure:15599: checking for gethostbyaddr" >&5 ++echo "configure:15647: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15675: \"$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 -@@ -15353,12 +15401,12 @@ if eval "test \"`echo '$ac_cv_func_'geth +@@ -15641,12 +15689,12 @@ if eval "test \"`echo '$ac_cv_func_'geth else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6 --echo "configure:15357: checking for __gethostbyaddr" >&5 -+echo "configure:15405: checking for __gethostbyaddr" >&5 +-echo "configure:15645: checking for __gethostbyaddr" >&5 ++echo "configure:15693: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15721: \"$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 -@@ -15419,7 +15467,7 @@ EOF +@@ -15707,7 +15755,7 @@ EOF unset ac_cv_lib_nsl___gethostbyaddr unset found echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6 --echo "configure:15423: checking for gethostbyaddr in -lnsl" >&5 -+echo "configure:15471: checking for gethostbyaddr in -lnsl" >&5 +-echo "configure:15711: checking for gethostbyaddr in -lnsl" >&5 ++echo "configure:15759: 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 -@@ -15427,7 +15475,7 @@ else +@@ -15715,7 +15763,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15458,7 +15506,7 @@ else +@@ -15746,7 +15794,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6 --echo "configure:15462: checking for __gethostbyaddr in -lnsl" >&5 -+echo "configure:15510: checking for __gethostbyaddr in -lnsl" >&5 +-echo "configure:15750: checking for __gethostbyaddr in -lnsl" >&5 ++echo "configure:15798: 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 -@@ -15466,7 +15514,7 @@ else +@@ -15754,7 +15802,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15509,11 +15557,11 @@ fi +@@ -15797,11 +15845,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:15565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:15805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15564,12 +15612,12 @@ EOF +@@ -15852,12 +15900,12 @@ EOF unset found echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6 --echo "configure:15568: checking for yp_get_default_domain" >&5 -+echo "configure:15616: checking for yp_get_default_domain" >&5 +-echo "configure:15856: checking for yp_get_default_domain" >&5 ++echo "configure:15904: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15932: \"$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 -@@ -15610,12 +15658,12 @@ if eval "test \"`echo '$ac_cv_func_'yp_g +@@ -15898,12 +15946,12 @@ if eval "test \"`echo '$ac_cv_func_'yp_g else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6 --echo "configure:15614: checking for __yp_get_default_domain" >&5 -+echo "configure:15662: checking for __yp_get_default_domain" >&5 +-echo "configure:15902: checking for __yp_get_default_domain" >&5 ++echo "configure:15950: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15978: \"$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 -@@ -15676,7 +15724,7 @@ EOF +@@ -15964,7 +16012,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:15680: checking for yp_get_default_domain in -lnsl" >&5 -+echo "configure:15728: checking for yp_get_default_domain in -lnsl" >&5 +-echo "configure:15968: checking for yp_get_default_domain in -lnsl" >&5 ++echo "configure:16016: 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 -@@ -15684,7 +15732,7 @@ else +@@ -15972,7 +16020,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15715,7 +15763,7 @@ else +@@ -16003,7 +16051,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:15719: checking for __yp_get_default_domain in -lnsl" >&5 -+echo "configure:15767: checking for __yp_get_default_domain in -lnsl" >&5 +-echo "configure:16007: checking for __yp_get_default_domain in -lnsl" >&5 ++echo "configure:16055: 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 -@@ -15723,7 +15771,7 @@ else +@@ -16011,7 +16059,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15766,11 +15814,11 @@ fi +@@ -16054,11 +16102,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:15822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:16062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15822,12 +15870,12 @@ EOF +@@ -16110,12 +16158,12 @@ EOF unset found echo $ac_n "checking for dlopen""... $ac_c" 1>&6 --echo "configure:15826: checking for dlopen" >&5 -+echo "configure:15874: checking for dlopen" >&5 +-echo "configure:16114: checking for dlopen" >&5 ++echo "configure:16162: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16190: \"$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 -@@ -15868,12 +15916,12 @@ if eval "test \"`echo '$ac_cv_func_'dlop +@@ -16156,12 +16204,12 @@ if eval "test \"`echo '$ac_cv_func_'dlop else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dlopen""... $ac_c" 1>&6 --echo "configure:15872: checking for __dlopen" >&5 -+echo "configure:15920: checking for __dlopen" >&5 +-echo "configure:16160: checking for __dlopen" >&5 ++echo "configure:16208: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:15948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16236: \"$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 -@@ -15934,7 +15982,7 @@ EOF +@@ -16222,7 +16270,7 @@ EOF unset ac_cv_lib_dl___dlopen unset found echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:15938: checking for dlopen in -ldl" >&5 -+echo "configure:15986: checking for dlopen in -ldl" >&5 +-echo "configure:16226: checking for dlopen in -ldl" >&5 ++echo "configure:16274: 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 -@@ -15942,7 +15990,7 @@ else +@@ -16230,7 +16278,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -15973,7 +16021,7 @@ else +@@ -16261,7 +16309,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:15977: checking for __dlopen in -ldl" >&5 -+echo "configure:16025: checking for __dlopen in -ldl" >&5 +-echo "configure:16265: checking for __dlopen in -ldl" >&5 ++echo "configure:16313: 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 -@@ -15981,7 +16029,7 @@ else +@@ -16269,7 +16317,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&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 +-if { (eval echo configure:16284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16024,11 +16072,11 @@ fi +@@ -16312,11 +16360,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:16320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -16080,7 +16128,7 @@ EOF +@@ -16368,7 +16416,7 @@ EOF fi echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 --echo "configure:16084: checking for sin in -lm" >&5 -+echo "configure:16132: checking for sin in -lm" >&5 +-echo "configure:16372: checking for sin in -lm" >&5 ++echo "configure:16420: 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 -@@ -16088,7 +16136,7 @@ else +@@ -16376,7 +16424,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16133,12 +16181,12 @@ fi +@@ -16421,12 +16469,12 @@ fi unset found echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 --echo "configure:16137: checking for inet_aton" >&5 -+echo "configure:16185: checking for inet_aton" >&5 +-echo "configure:16425: checking for inet_aton" >&5 ++echo "configure:16473: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16501: \"$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 -@@ -16179,12 +16227,12 @@ if eval "test \"`echo '$ac_cv_func_'inet +@@ -16467,12 +16515,12 @@ if eval "test \"`echo '$ac_cv_func_'inet else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6 --echo "configure:16183: checking for __inet_aton" >&5 -+echo "configure:16231: checking for __inet_aton" >&5 +-echo "configure:16471: checking for __inet_aton" >&5 ++echo "configure:16519: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16547: \"$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 -@@ -16245,7 +16293,7 @@ EOF +@@ -16533,7 +16581,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:16249: checking for inet_aton in -lresolv" >&5 -+echo "configure:16297: checking for inet_aton in -lresolv" >&5 +-echo "configure:16537: checking for inet_aton in -lresolv" >&5 ++echo "configure:16585: 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 -@@ -16253,7 +16301,7 @@ else +@@ -16541,7 +16589,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16284,7 +16332,7 @@ else +@@ -16572,7 +16620,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6 --echo "configure:16288: checking for __inet_aton in -lresolv" >&5 -+echo "configure:16336: checking for __inet_aton in -lresolv" >&5 +-echo "configure:16576: checking for __inet_aton in -lresolv" >&5 ++echo "configure:16624: 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 -@@ -16292,7 +16340,7 @@ else +@@ -16580,7 +16628,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16335,11 +16383,11 @@ fi +@@ -16623,11 +16671,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:16631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -16381,7 +16429,7 @@ EOF +@@ -16669,7 +16717,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:16385: checking for inet_aton in -lbind" >&5 -+echo "configure:16433: checking for inet_aton in -lbind" >&5 +-echo "configure:16673: checking for inet_aton in -lbind" >&5 ++echo "configure:16721: 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 -@@ -16389,7 +16437,7 @@ else +@@ -16677,7 +16725,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16420,7 +16468,7 @@ else +@@ -16708,7 +16756,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6 --echo "configure:16424: checking for __inet_aton in -lbind" >&5 -+echo "configure:16472: checking for __inet_aton in -lbind" >&5 +-echo "configure:16712: checking for __inet_aton in -lbind" >&5 ++echo "configure:16760: 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 -@@ -16428,7 +16476,7 @@ else +@@ -16716,7 +16764,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16471,11 +16519,11 @@ fi +@@ -16759,11 +16807,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:16767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -16526,12 +16574,12 @@ EOF +@@ -16814,12 +16862,12 @@ EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:16530: checking for ANSI C header files" >&5 -+echo "configure:16578: checking for ANSI C header files" >&5 +-echo "configure:16818: checking for ANSI C header files" >&5 ++echo "configure:16866: 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 < #include -@@ -16539,7 +16587,7 @@ else +@@ -16827,7 +16875,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:16543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:16591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:16831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:16879: \"$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* -@@ -16556,7 +16604,7 @@ rm -f conftest* +@@ -16844,7 +16892,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 -@@ -16574,7 +16622,7 @@ fi +@@ -16862,7 +16910,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 -@@ -16595,7 +16643,7 @@ if test "$cross_compiling" = yes; then +@@ -16883,7 +16931,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -16606,7 +16654,7 @@ if (XOR (islower (i), ISLOWER (i)) || to +@@ -16894,7 +16942,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF --if { (eval echo configure:16610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:16898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -16634,12 +16682,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di +@@ -16922,12 +16970,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di 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:16638: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:16686: checking for $ac_hdr that defines DIR" >&5 +-echo "configure:16926: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:16974: 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 < #include <$ac_hdr> -@@ -16647,7 +16695,7 @@ int main() { +@@ -16935,7 +16983,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF --if { (eval echo configure:16651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else -@@ -16672,7 +16720,7 @@ done +@@ -16960,7 +17008,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:16676: checking for opendir in -ldir" >&5 -+echo "configure:16724: checking for opendir in -ldir" >&5 +-echo "configure:16964: checking for opendir in -ldir" >&5 ++echo "configure:17012: 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 -@@ -16680,7 +16728,7 @@ else +@@ -16968,7 +17016,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16713,7 +16761,7 @@ fi +@@ -17001,7 +17049,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:16717: checking for opendir in -lx" >&5 -+echo "configure:16765: checking for opendir in -lx" >&5 +-echo "configure:17005: checking for opendir in -lx" >&5 ++echo "configure:17053: 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 -@@ -16721,7 +16769,7 @@ else +@@ -17009,7 +17057,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:17024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -16814,17 +16862,17 @@ assert.h +@@ -17102,17 +17150,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:16818: checking for $ac_hdr" >&5 -+echo "configure:16866: checking for $ac_hdr" >&5 +-echo "configure:17106: checking for $ac_hdr" >&5 ++echo "configure:17154: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:16828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:16876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:17116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:17164: \"$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* -@@ -16853,12 +16901,12 @@ done +@@ -17141,12 +17189,12 @@ done echo $ac_n "checking for fopencookie""... $ac_c" 1>&6 --echo "configure:16857: checking for fopencookie" >&5 -+echo "configure:16905: checking for fopencookie" >&5 +-echo "configure:17145: checking for fopencookie" >&5 ++echo "configure:17193: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:16933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:17173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17221: \"$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 -@@ -16903,7 +16951,7 @@ fi +@@ -17191,7 +17239,7 @@ fi if test "$have_glibc_fopencookie" = "yes"; then cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_cookie_io_functions_t=yes else -@@ -16932,7 +16980,7 @@ if test "$cross_compiling" = yes; then +@@ -17220,7 +17268,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17304: \"$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 -@@ -16984,7 +17032,7 @@ fi +@@ -17272,7 +17320,7 @@ fi else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_IO_cookie_io_functions_t=yes else -@@ -17028,7 +17076,7 @@ EOF +@@ -17316,7 +17364,7 @@ EOF echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6 --echo "configure:17032: checking for broken getcwd" >&5 -+echo "configure:17080: checking for broken getcwd" >&5 +-echo "configure:17320: checking for broken getcwd" >&5 ++echo "configure:17368: checking for broken getcwd" >&5 os=`uname -sr 2>/dev/null` case $os in SunOS*) -@@ -17043,14 +17091,14 @@ EOF +@@ -17331,14 +17379,14 @@ EOF echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6 --echo "configure:17047: checking for broken libc stdio" >&5 -+echo "configure:17095: checking for broken libc stdio" >&5 +-echo "configure:17335: checking for broken libc stdio" >&5 ++echo "configure:17383: checking for broken libc stdio" >&5 if eval "test \"`echo '$''{'_cv_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 < -@@ -17063,7 +17111,7 @@ choke me +@@ -17351,7 +17399,7 @@ choke me ; return 0; } EOF --if { (eval echo configure:17067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _cv_have_broken_glibc_fopen_append=yes else -@@ -17076,7 +17124,7 @@ rm -f conftest* +@@ -17364,7 +17412,7 @@ rm -f conftest* else cat > conftest.$ac_ext < -@@ -17104,7 +17152,7 @@ int main(int argc, char *argv[]) +@@ -17392,7 +17440,7 @@ int main(int argc, char *argv[]) } EOF --if { (eval echo configure:17108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then _cv_have_broken_glibc_fopen_append=no else -@@ -17132,12 +17180,12 @@ EOF +@@ -17420,12 +17468,12 @@ EOF echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 --echo "configure:17136: checking whether struct tm is in sys/time.h or time.h" >&5 -+echo "configure:17184: checking whether struct tm is in sys/time.h or time.h" >&5 +-echo "configure:17424: checking whether struct tm is in sys/time.h or time.h" >&5 ++echo "configure:17472: 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 < #include -@@ -17145,7 +17193,7 @@ int main() { +@@ -17433,7 +17481,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF --if { (eval echo configure:17149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else -@@ -17166,12 +17214,12 @@ EOF +@@ -17454,12 +17502,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 --echo "configure:17170: checking for tm_zone in struct tm" >&5 -+echo "configure:17218: checking for tm_zone in struct tm" >&5 +-echo "configure:17458: checking for tm_zone in struct tm" >&5 ++echo "configure:17506: 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 < #include <$ac_cv_struct_tm> -@@ -17179,7 +17227,7 @@ int main() { +@@ -17467,7 +17515,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF --if { (eval echo configure:17183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else -@@ -17199,12 +17247,12 @@ EOF +@@ -17487,12 +17535,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 --echo "configure:17203: checking for tzname" >&5 -+echo "configure:17251: checking for tzname" >&5 +-echo "configure:17491: checking for tzname" >&5 ++echo "configure:17539: 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 < #ifndef tzname /* For SGI. */ -@@ -17214,7 +17262,7 @@ int main() { +@@ -17502,7 +17550,7 @@ int main() { atoi(*tzname); ; return 0; } EOF --if { (eval echo configure:17218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:17506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else -@@ -17238,16 +17286,16 @@ fi +@@ -17526,16 +17574,16 @@ fi echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6 --echo "configure:17242: checking for missing declarations of reentrant functions" >&5 -+echo "configure:17290: checking for missing declarations of reentrant functions" >&5 +-echo "configure:17530: checking for missing declarations of reentrant functions" >&5 ++echo "configure:17578: checking for missing declarations of reentrant functions" >&5 cat > conftest.$ac_ext < int main() { struct tm *(*func)() = localtime_r ; return 0; } EOF --if { (eval echo configure:17251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17265,14 +17313,14 @@ EOF +@@ -17553,14 +17601,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext < int main() { struct tm *(*func)() = gmtime_r ; return 0; } EOF --if { (eval echo configure:17276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17290,14 +17338,14 @@ EOF +@@ -17578,14 +17626,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext < int main() { char *(*func)() = asctime_r ; return 0; } EOF --if { (eval echo configure:17301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17315,14 +17363,14 @@ EOF +@@ -17603,14 +17651,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext < int main() { char *(*func)() = ctime_r ; return 0; } EOF --if { (eval echo configure:17326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17340,14 +17388,14 @@ EOF +@@ -17628,14 +17676,14 @@ EOF fi rm -f conftest* cat > conftest.$ac_ext < int main() { char *(*func)() = strtok_r ; return 0; } EOF --if { (eval echo configure:17351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17368,16 +17416,16 @@ rm -f conftest* +@@ -17656,16 +17704,16 @@ rm -f conftest* echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6 --echo "configure:17372: checking for fclose declaration" >&5 -+echo "configure:17420: checking for fclose declaration" >&5 +-echo "configure:17660: checking for fclose declaration" >&5 ++echo "configure:17708: checking for fclose declaration" >&5 cat > conftest.$ac_ext < int main() { int (*func)() = fclose ; return 0; } EOF --if { (eval echo configure:17381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -17403,12 +17451,12 @@ rm -f conftest* +@@ -17691,12 +17739,12 @@ rm -f conftest* echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 --echo "configure:17407: checking for tm_gmtoff in struct tm" >&5 -+echo "configure:17455: checking for tm_gmtoff in struct tm" >&5 +-echo "configure:17695: checking for tm_gmtoff in struct tm" >&5 ++echo "configure:17743: 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 < #include <$ac_cv_struct_tm> -@@ -17416,7 +17464,7 @@ int main() { +@@ -17704,7 +17752,7 @@ int main() { struct tm tm; tm.tm_gmtoff; ; return 0; } EOF --if { (eval echo configure:17420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_gmtoff=yes else -@@ -17439,12 +17487,12 @@ fi +@@ -17727,12 +17775,12 @@ fi echo $ac_n "checking for struct flock""... $ac_c" 1>&6 --echo "configure:17443: checking for struct flock" >&5 -+echo "configure:17491: checking for struct flock" >&5 +-echo "configure:17731: checking for struct flock" >&5 ++echo "configure:17779: 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 < -@@ -17454,7 +17502,7 @@ int main() { +@@ -17742,7 +17790,7 @@ int main() { struct flock x; ; return 0; } EOF --if { (eval echo configure:17458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_flock=yes -@@ -17481,12 +17529,12 @@ fi +@@ -17769,12 +17817,12 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 --echo "configure:17485: checking for socklen_t" >&5 -+echo "configure:17533: checking for socklen_t" >&5 +-echo "configure:17773: checking for socklen_t" >&5 ++echo "configure:17821: 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 < -@@ -17498,7 +17546,7 @@ socklen_t x; +@@ -17786,7 +17834,7 @@ socklen_t x; ; return 0; } EOF --if { (eval echo configure:17502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_socklen_t=yes -@@ -17524,7 +17572,7 @@ fi +@@ -17812,7 +17860,7 @@ fi echo $ac_n "checking size of size_t""... $ac_c" 1>&6 --echo "configure:17528: checking size of size_t" >&5 -+echo "configure:17576: checking size of size_t" >&5 +-echo "configure:17816: checking size of size_t" >&5 ++echo "configure:17864: 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 -@@ -17532,7 +17580,7 @@ else +@@ -17820,9 +17868,10 @@ else ac_cv_sizeof_size_t=8 else cat > conftest.$ac_ext < - #include -@@ -17544,7 +17592,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -17831,7 +17880,7 @@ main() exit(0); } EOF --if { (eval echo configure:17548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17884: \"$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 -@@ -17564,7 +17612,7 @@ EOF +@@ -17851,7 +17900,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 --echo "configure:17568: checking size of long long" >&5 -+echo "configure:17616: checking size of long long" >&5 +-echo "configure:17855: checking size of long long" >&5 ++echo "configure:17904: 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 -@@ -17572,7 +17620,7 @@ else +@@ -17859,9 +17908,10 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < - #include -@@ -17584,7 +17632,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -17870,7 +17920,7 @@ main() exit(0); } EOF --if { (eval echo configure:17588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17924: \"$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 -@@ -17604,7 +17652,7 @@ EOF +@@ -17890,7 +17940,7 @@ EOF echo $ac_n "checking size of long long int""... $ac_c" 1>&6 --echo "configure:17608: checking size of long long int" >&5 -+echo "configure:17656: checking size of long long int" >&5 +-echo "configure:17894: checking size of long long int" >&5 ++echo "configure:17944: 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 -@@ -17612,7 +17660,7 @@ else +@@ -17898,9 +17948,10 @@ else ac_cv_sizeof_long_long_int=8 else cat > conftest.$ac_ext < - #include -@@ -17624,7 +17672,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -17909,7 +17960,7 @@ main() exit(0); } EOF --if { (eval echo configure:17628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17964: \"$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 -@@ -17644,7 +17692,7 @@ EOF +@@ -17929,7 +17980,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 --echo "configure:17648: checking size of long" >&5 -+echo "configure:17696: checking size of long" >&5 +-echo "configure:17933: checking size of long" >&5 ++echo "configure:17984: 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 -@@ -17652,7 +17700,7 @@ else +@@ -17937,9 +17988,10 @@ else ac_cv_sizeof_long=8 else cat > conftest.$ac_ext < - #include -@@ -17664,7 +17712,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -17948,7 +18000,7 @@ main() exit(0); } EOF --if { (eval echo configure:17668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18004: \"$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 -@@ -17684,7 +17732,7 @@ EOF +@@ -17968,7 +18020,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 --echo "configure:17688: checking size of int" >&5 -+echo "configure:17736: checking size of int" >&5 +-echo "configure:17972: checking size of int" >&5 ++echo "configure:18024: 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 -@@ -17692,7 +17740,7 @@ else +@@ -17976,9 +18028,10 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < - #include -@@ -17704,7 +17752,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -17987,7 +18040,7 @@ main() exit(0); } EOF --if { (eval echo configure:17708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18044: \"$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 -@@ -17726,7 +17774,7 @@ EOF +@@ -18009,7 +18062,7 @@ EOF echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6 --echo "configure:17730: checking size of intmax_t" >&5 -+echo "configure:17778: checking size of intmax_t" >&5 +-echo "configure:18013: checking size of intmax_t" >&5 ++echo "configure:18066: checking size of intmax_t" >&5 php_cache_value=php_cv_sizeof_intmax_t if eval "test \"`echo '$''{'php_cv_sizeof_intmax_t'+set}'`\" = set"; then -@@ -17743,7 +17791,7 @@ else +@@ -18026,7 +18079,7 @@ else else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -17767,7 +17815,7 @@ int main() +@@ -18050,7 +18103,7 @@ int main() } EOF --if { (eval echo configure:17771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17819: \"$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 ++if { (eval echo configure:18107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then eval $php_cache_value=`cat conftestval` -@@ -17806,7 +17854,7 @@ EOF +@@ -18089,7 +18142,7 @@ EOF echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6 --echo "configure:17810: checking size of ssize_t" >&5 -+echo "configure:17858: checking size of ssize_t" >&5 +-echo "configure:18093: checking size of ssize_t" >&5 ++echo "configure:18146: checking size of ssize_t" >&5 php_cache_value=php_cv_sizeof_ssize_t if eval "test \"`echo '$''{'php_cv_sizeof_ssize_t'+set}'`\" = set"; then -@@ -17823,7 +17871,7 @@ else +@@ -18106,7 +18159,7 @@ else else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -17847,7 +17895,7 @@ int main() +@@ -18130,7 +18183,7 @@ int main() } EOF --if { (eval echo configure:17851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:18134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then eval $php_cache_value=`cat conftestval` -@@ -17886,7 +17934,7 @@ EOF +@@ -18169,7 +18222,7 @@ EOF echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6 --echo "configure:17890: checking size of ptrdiff_t" >&5 -+echo "configure:17938: checking size of ptrdiff_t" >&5 +-echo "configure:18173: checking size of ptrdiff_t" >&5 ++echo "configure:18226: checking size of ptrdiff_t" >&5 php_cache_value=php_cv_sizeof_ptrdiff_t if eval "test \"`echo '$''{'php_cv_sizeof_ptrdiff_t'+set}'`\" = set"; then -@@ -17903,7 +17951,7 @@ else +@@ -18186,7 +18239,7 @@ else else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -17927,7 +17975,7 @@ int main() +@@ -18210,7 +18263,7 @@ int main() } EOF --if { (eval echo configure:17931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:18214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then eval $php_cache_value=`cat conftestval` -@@ -17966,12 +18014,12 @@ EOF +@@ -18249,12 +18302,12 @@ EOF echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 --echo "configure:17970: checking for st_blksize in struct stat" >&5 -+echo "configure:18018: checking for st_blksize in struct stat" >&5 +-echo "configure:18253: checking for st_blksize in struct stat" >&5 ++echo "configure:18306: 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 < #include -@@ -17979,7 +18027,7 @@ int main() { +@@ -18262,7 +18315,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF --if { (eval echo configure:17983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:18266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else -@@ -18001,12 +18049,12 @@ fi +@@ -18284,12 +18337,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:18005: checking for st_blocks in struct stat" >&5 -+echo "configure:18053: checking for st_blocks in struct stat" >&5 +-echo "configure:18288: checking for st_blocks in struct stat" >&5 ++echo "configure:18341: 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 < #include -@@ -18014,7 +18062,7 @@ int main() { +@@ -18297,7 +18350,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF --if { (eval echo configure:18018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:18301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else -@@ -18041,12 +18089,12 @@ else +@@ -18324,12 +18377,12 @@ else WARNING_LEVEL=0 fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 --echo "configure:18045: checking for st_rdev in struct stat" >&5 -+echo "configure:18093: checking for st_rdev in struct stat" >&5 +-echo "configure:18328: checking for st_rdev in struct stat" >&5 ++echo "configure:18381: 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 < #include -@@ -18054,7 +18102,7 @@ int main() { +@@ -18337,7 +18390,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF --if { (eval echo configure:18058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:18341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else -@@ -18076,12 +18124,12 @@ fi +@@ -18359,12 +18412,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:18080: checking for size_t" >&5 -+echo "configure:18128: checking for size_t" >&5 +-echo "configure:18363: checking for size_t" >&5 ++echo "configure:18416: 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 < #if STDC_HEADERS -@@ -18109,12 +18157,12 @@ EOF +@@ -18392,12 +18445,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 --echo "configure:18113: checking for uid_t in sys/types.h" >&5 -+echo "configure:18161: checking for uid_t in sys/types.h" >&5 +-echo "configure:18396: checking for uid_t in sys/types.h" >&5 ++echo "configure:18449: 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 -@@ -18145,12 +18193,12 @@ fi +@@ -18428,12 +18481,12 @@ fi echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6 --echo "configure:18149: checking for struct sockaddr_storage" >&5 -+echo "configure:18197: checking for struct sockaddr_storage" >&5 +-echo "configure:18432: checking for struct sockaddr_storage" >&5 ++echo "configure:18485: 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 < #include -@@ -18158,7 +18206,7 @@ int main() { +@@ -18441,7 +18494,7 @@ int main() { struct sockaddr_storage s; s ; return 0; } EOF --if { (eval echo configure:18162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:18445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sockaddr_storage=yes else -@@ -18179,13 +18227,13 @@ EOF +@@ -18462,13 +18515,13 @@ EOF fi echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6 --echo "configure:18183: checking for field sa_len in struct sockaddr" >&5 -+echo "configure:18231: checking for field sa_len in struct sockaddr" >&5 +-echo "configure:18466: checking for field sa_len in struct sockaddr" >&5 ++echo "configure:18519: 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 < #include -@@ -18193,7 +18241,7 @@ int main() { +@@ -18476,7 +18529,7 @@ int main() { static struct sockaddr sa; int n = (int) sa.sa_len; return n; ; return 0; } EOF --if { (eval echo configure:18197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:18480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sockaddr_sa_len=yes else -@@ -18216,12 +18264,12 @@ EOF +@@ -18499,12 +18552,12 @@ EOF echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6 --echo "configure:18220: checking for IPv6 support" >&5 -+echo "configure:18268: checking for IPv6 support" >&5 +-echo "configure:18503: checking for IPv6 support" >&5 ++echo "configure:18556: 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 < #include -@@ -18230,7 +18278,7 @@ int main() { +@@ -18513,7 +18566,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:18234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ipv6_support=yes else -@@ -18246,12 +18294,12 @@ echo "$ac_t""$ac_cv_ipv6_support" 1>&6 +@@ -18529,12 +18582,12 @@ echo "$ac_t""$ac_cv_ipv6_support" 1>&6 echo $ac_n "checking for vprintf""... $ac_c" 1>&6 --echo "configure:18250: checking for vprintf" >&5 -+echo "configure:18298: checking for vprintf" >&5 +-echo "configure:18533: checking for vprintf" >&5 ++echo "configure:18586: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18614: \"$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 -@@ -18298,12 +18346,12 @@ fi +@@ -18581,12 +18634,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 --echo "configure:18302: checking for _doprnt" >&5 -+echo "configure:18350: checking for _doprnt" >&5 +-echo "configure:18585: checking for _doprnt" >&5 ++echo "configure:18638: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18666: \"$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 -@@ -18434,12 +18482,12 @@ asprintf \ +@@ -18718,12 +18771,12 @@ nanosleep \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:18438: checking for $ac_func" >&5 -+echo "configure:18486: checking for $ac_func" >&5 +-echo "configure:18722: checking for $ac_func" >&5 ++echo "configure:18775: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18803: \"$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 -@@ -18493,7 +18541,7 @@ done +@@ -18777,7 +18830,7 @@ done unset ac_cv_lib_rt___nanosleep unset found echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 --echo "configure:18497: checking for nanosleep in -lrt" >&5 -+echo "configure:18545: checking for nanosleep in -lrt" >&5 +-echo "configure:18781: checking for nanosleep in -lrt" >&5 ++echo "configure:18834: checking for nanosleep in -lrt" >&5 ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -18501,7 +18549,7 @@ else +@@ -18785,7 +18838,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -18532,7 +18580,7 @@ else +@@ -18816,7 +18869,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __nanosleep in -lrt""... $ac_c" 1>&6 --echo "configure:18536: checking for __nanosleep in -lrt" >&5 -+echo "configure:18584: checking for __nanosleep in -lrt" >&5 +-echo "configure:18820: checking for __nanosleep in -lrt" >&5 ++echo "configure:18873: checking for __nanosleep in -lrt" >&5 ac_lib_var=`echo rt'_'__nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -18540,7 +18588,7 @@ else +@@ -18824,7 +18877,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -18583,11 +18631,11 @@ fi +@@ -18867,11 +18920,11 @@ fi found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:18875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -18631,25 +18679,25 @@ EOF +@@ -18915,25 +18968,25 @@ EOF echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 --echo "configure:18635: checking for getaddrinfo" >&5 -+echo "configure:18683: checking for getaddrinfo" >&5 +-echo "configure:18919: checking for getaddrinfo" >&5 ++echo "configure:18972: 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 < int main() { struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g); ; return 0; } EOF --if { (eval echo configure:18647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18984: \"$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 < -@@ -18689,7 +18737,7 @@ int main(void) { +@@ -18973,7 +19026,7 @@ int main(void) { } EOF --if { (eval echo configure:18693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:18977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19030: \"$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 -@@ -18721,12 +18769,12 @@ fi +@@ -19003,19 +19056,19 @@ EOF + fi + + echo $ac_n "checking for __sync_fetch_and_add""... $ac_c" 1>&6 +-echo "configure:19007: checking for __sync_fetch_and_add" >&5 ++echo "configure:19060: checking for __sync_fetch_and_add" >&5 + if eval "test \"`echo '$''{'ac_cv_func_sync_fetch_and_add'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_sync_fetch_and_add=yes + else +@@ -19038,12 +19091,12 @@ fi for ac_func in strlcat strlcpy getopt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:18725: checking for $ac_func" >&5 -+echo "configure:18773: checking for $ac_func" >&5 +-echo "configure:19042: checking for $ac_func" >&5 ++echo "configure:19095: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:19070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19123: \"$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 -@@ -18776,7 +18824,7 @@ done +@@ -19093,7 +19146,7 @@ done echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 --echo "configure:18780: checking whether utime accepts a null argument" >&5 -+echo "configure:18828: checking whether utime accepts a null argument" >&5 +-echo "configure:19097: checking whether utime accepts a null argument" >&5 ++echo "configure:19150: 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 -@@ -18786,7 +18834,7 @@ if test "$cross_compiling" = yes; then +@@ -19103,7 +19156,7 @@ if test "$cross_compiling" = yes; then ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include -@@ -18797,7 +18845,7 @@ exit(!(stat ("conftestdata", &s) == 0 && +@@ -19114,7 +19167,7 @@ exit(!(stat ("conftestdata", &s) == 0 && && t.st_mtime - s.st_mtime < 120)); } EOF --if { (eval echo configure:18801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:19118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19171: \"$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 -@@ -18823,19 +18871,19 @@ fi +@@ -19140,19 +19193,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:18827: checking for working alloca.h" >&5 -+echo "configure:18875: checking for working alloca.h" >&5 +-echo "configure:19144: checking for working alloca.h" >&5 ++echo "configure:19197: 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 < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF --if { (eval echo configure:18839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:19156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19209: \"$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 -@@ -18856,12 +18904,12 @@ EOF +@@ -19173,12 +19226,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:18860: checking for alloca" >&5 -+echo "configure:18908: checking for alloca" >&5 +-echo "configure:19177: checking for alloca" >&5 ++echo "configure:19230: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:19210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19263: \"$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 -@@ -18921,12 +18969,12 @@ EOF +@@ -19238,12 +19291,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:18925: checking whether alloca needs Cray hooks" >&5 -+echo "configure:18973: checking whether alloca needs Cray hooks" >&5 +-echo "configure:19242: checking whether alloca needs Cray hooks" >&5 ++echo "configure:19295: 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 <&6 +@@ -19268,12 +19321,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:18955: checking for $ac_func" >&5 -+echo "configure:19003: checking for $ac_func" >&5 +-echo "configure:19272: checking for $ac_func" >&5 ++echo "configure:19325: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:19300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19353: \"$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 -@@ -19006,7 +19054,7 @@ done +@@ -19323,7 +19376,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:19010: checking stack direction for C alloca" >&5 -+echo "configure:19058: checking stack direction for C alloca" >&5 +-echo "configure:19327: checking stack direction for C alloca" >&5 ++echo "configure:19380: 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 -@@ -19014,7 +19062,7 @@ else +@@ -19331,7 +19384,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:19354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19407: \"$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 -@@ -19056,13 +19104,13 @@ fi +@@ -19373,13 +19426,13 @@ fi echo $ac_n "checking for declared timezone""... $ac_c" 1>&6 --echo "configure:19060: checking for declared timezone" >&5 -+echo "configure:19108: checking for declared timezone" >&5 +-echo "configure:19377: checking for declared timezone" >&5 ++echo "configure:19430: 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 < -@@ -19077,7 +19125,7 @@ int main() { +@@ -19394,7 +19447,7 @@ int main() { ; return 0; } EOF --if { (eval echo configure:19081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:19398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_declared_timezone=yes -@@ -19103,7 +19151,7 @@ EOF +@@ -19420,7 +19473,7 @@ EOF echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6 --echo "configure:19107: checking for type of reentrant time-related functions" >&5 -+echo "configure:19155: checking for type of reentrant time-related functions" >&5 +-echo "configure:19424: checking for type of reentrant time-related functions" >&5 ++echo "configure:19477: 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 -@@ -19114,7 +19162,7 @@ if test "$cross_compiling" = yes; then +@@ -19431,7 +19484,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -19132,7 +19180,7 @@ return (1); +@@ -19449,7 +19502,7 @@ return (1); } EOF --if { (eval echo configure:19136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:19453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19506: \"$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 -@@ -19148,7 +19196,7 @@ else +@@ -19465,7 +19518,7 @@ else else cat > conftest.$ac_ext < -@@ -19164,7 +19212,7 @@ main() { +@@ -19481,7 +19534,7 @@ main() { } EOF --if { (eval echo configure:19168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:19485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19538: \"$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 -@@ -19202,12 +19250,12 @@ EOF +@@ -19519,12 +19572,12 @@ EOF echo $ac_n "checking for readdir_r""... $ac_c" 1>&6 --echo "configure:19206: checking for readdir_r" >&5 -+echo "configure:19254: checking for readdir_r" >&5 +-echo "configure:19523: checking for readdir_r" >&5 ++echo "configure:19576: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:19551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19604: \"$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 -@@ -19252,7 +19300,7 @@ fi +@@ -19569,7 +19622,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:19256: checking for type of readdir_r" >&5 -+echo "configure:19304: checking for type of readdir_r" >&5 +-echo "configure:19573: checking for type of readdir_r" >&5 ++echo "configure:19626: 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 -@@ -19263,7 +19311,7 @@ else +@@ -19580,7 +19633,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:19609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19662: \"$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 -@@ -19299,7 +19347,7 @@ else +@@ -19616,7 +19669,7 @@ else rm -fr conftest* cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:19361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:19630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19683: \"$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* -@@ -19351,12 +19399,12 @@ EOF +@@ -19668,12 +19721,12 @@ EOF echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 --echo "configure:19355: checking for in_addr_t" >&5 -+echo "configure:19403: checking for in_addr_t" >&5 +-echo "configure:19672: checking for in_addr_t" >&5 ++echo "configure:19725: 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 < #if STDC_HEADERS -@@ -19390,12 +19438,12 @@ fi +@@ -19707,12 +19760,12 @@ fi for ac_func in crypt_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:19394: checking for $ac_func" >&5 -+echo "configure:19442: checking for $ac_func" >&5 +-echo "configure:19711: checking for $ac_func" >&5 ++echo "configure:19764: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:19739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19792: \"$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 -@@ -19446,14 +19494,14 @@ done +@@ -19763,14 +19816,14 @@ 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:19450: checking which data struct is used by crypt_r" >&5 -+echo "configure:19498: checking which data struct is used by crypt_r" >&5 +-echo "configure:19767: checking which data struct is used by crypt_r" >&5 ++echo "configure:19820: 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 <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:19787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* php_cv_crypt_r_style=cryptd else -@@ -19477,7 +19525,7 @@ rm -f conftest* +@@ -19794,7 +19847,7 @@ rm -f conftest* if test "$php_cv_crypt_r_style" = "none"; then cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:19811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* php_cv_crypt_r_style=struct_crypt_data else -@@ -19502,7 +19550,7 @@ rm -f conftest* +@@ -19819,7 +19872,7 @@ rm -f conftest* if test "$php_cv_crypt_r_style" = "none"; then cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:19837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* php_cv_crypt_r_style=struct_crypt_data_gnu_source else -@@ -19575,7 +19623,7 @@ fi +@@ -19892,7 +19945,7 @@ fi php_enable_gcov=no echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6 --echo "configure:19579: checking whether to include gcov symbols" >&5 -+echo "configure:19627: checking whether to include gcov symbols" >&5 +-echo "configure:19896: checking whether to include gcov symbols" >&5 ++echo "configure:19949: 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" -@@ -19614,7 +19662,7 @@ if test "$PHP_GCOV" = "yes"; then +@@ -19931,7 +19984,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:19618: checking for $ac_word" >&5 -+echo "configure:19666: checking for $ac_word" >&5 +-echo "configure:19935: checking for $ac_word" >&5 ++echo "configure:19988: 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 -@@ -19643,7 +19691,7 @@ fi +@@ -19960,7 +20013,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:19647: checking for $ac_word" >&5 -+echo "configure:19695: checking for $ac_word" >&5 +-echo "configure:19964: checking for $ac_word" >&5 ++echo "configure:20017: 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 -@@ -19678,7 +19726,7 @@ fi +@@ -19995,7 +20048,7 @@ fi if test "$LTP"; then echo $ac_n "checking for ltp version""... $ac_c" 1>&6 --echo "configure:19682: checking for ltp version" >&5 -+echo "configure:19730: checking for ltp version" >&5 +-echo "configure:19999: checking for ltp version" >&5 ++echo "configure:20052: 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 -@@ -19735,7 +19783,7 @@ fi +@@ -20052,7 +20105,7 @@ fi php_enable_debug=no echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6 --echo "configure:19739: checking whether to include debugging symbols" >&5 -+echo "configure:19787: checking whether to include debugging symbols" >&5 +-echo "configure:20056: checking whether to include debugging symbols" >&5 ++echo "configure:20109: 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" -@@ -19783,7 +19831,7 @@ fi +@@ -20100,7 +20153,7 @@ fi php_with_layout=PHP echo $ac_n "checking layout of installed files""... $ac_c" 1>&6 --echo "configure:19787: checking layout of installed files" >&5 -+echo "configure:19835: checking layout of installed files" >&5 +-echo "configure:20104: checking layout of installed files" >&5 ++echo "configure:20157: 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" -@@ -19815,7 +19863,7 @@ esac +@@ -20132,7 +20185,7 @@ esac php_with_config_file_path=DEFAULT echo $ac_n "checking path to configuration file""... $ac_c" 1>&6 --echo "configure:19819: checking path to configuration file" >&5 -+echo "configure:19867: checking path to configuration file" >&5 +-echo "configure:20136: checking path to configuration file" >&5 ++echo "configure:20189: 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" -@@ -19846,7 +19894,7 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAU +@@ -20163,7 +20216,7 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAU fi echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6 --echo "configure:19850: checking where to scan for configuration files" >&5 -+echo "configure:19898: checking where to scan for configuration files" >&5 +-echo "configure:20167: checking where to scan for configuration files" >&5 ++echo "configure:20220: checking where to scan for configuration files" >&5 php_with_config_file_scan_dir=DEFAULT -@@ -19879,7 +19927,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLA +@@ -20196,7 +20249,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLA php_enable_safe_mode=no echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6 --echo "configure:19883: checking whether to enable safe mode by default" >&5 -+echo "configure:19931: checking whether to enable safe mode by default" >&5 +-echo "configure:20200: checking whether to enable safe mode by default" >&5 ++echo "configure:20253: 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" -@@ -19911,7 +19959,7 @@ EOF +@@ -20228,7 +20281,7 @@ EOF fi echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6 --echo "configure:19915: checking for safe mode exec dir" >&5 -+echo "configure:19963: checking for safe mode exec dir" >&5 +-echo "configure:20232: checking for safe mode exec dir" >&5 ++echo "configure:20285: checking for safe mode exec dir" >&5 php_with_exec_dir=no -@@ -19952,7 +20000,7 @@ fi +@@ -20269,7 +20322,7 @@ fi php_enable_sigchild=no echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6 --echo "configure:19956: checking whether to enable PHP's own SIGCHLD handler" >&5 -+echo "configure:20004: checking whether to enable PHP's own SIGCHLD handler" >&5 +-echo "configure:20273: checking whether to enable PHP's own SIGCHLD handler" >&5 ++echo "configure:20326: 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" -@@ -19987,7 +20035,7 @@ fi +@@ -20304,7 +20357,7 @@ fi php_enable_magic_quotes=no echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6 --echo "configure:19991: checking whether to enable magic quotes by default" >&5 -+echo "configure:20039: checking whether to enable magic quotes by default" >&5 +-echo "configure:20308: checking whether to enable magic quotes by default" >&5 ++echo "configure:20361: 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" -@@ -20022,7 +20070,7 @@ fi +@@ -20339,7 +20392,7 @@ fi php_enable_libgcc=no echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6 --echo "configure:20026: checking whether to explicitly link against libgcc" >&5 -+echo "configure:20074: checking whether to explicitly link against libgcc" >&5 +-echo "configure:20343: checking whether to explicitly link against libgcc" >&5 ++echo "configure:20396: 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" -@@ -20099,7 +20147,7 @@ fi +@@ -20416,7 +20469,7 @@ fi php_enable_short_tags=yes echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6 --echo "configure:20103: checking whether to enable short tags by default" >&5 -+echo "configure:20151: checking whether to enable short tags by default" >&5 +-echo "configure:20420: checking whether to enable short tags by default" >&5 ++echo "configure:20473: 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" -@@ -20134,7 +20182,7 @@ fi +@@ -20451,7 +20504,7 @@ fi php_enable_dmalloc=no echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6 --echo "configure:20138: checking whether to enable dmalloc" >&5 -+echo "configure:20186: checking whether to enable dmalloc" >&5 +-echo "configure:20455: checking whether to enable dmalloc" >&5 ++echo "configure:20508: 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" -@@ -20155,7 +20203,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -20472,7 +20525,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:20159: checking for dmalloc_error in -ldmalloc" >&5 -+echo "configure:20207: checking for dmalloc_error in -ldmalloc" >&5 +-echo "configure:20476: checking for dmalloc_error in -ldmalloc" >&5 ++echo "configure:20529: 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 -@@ -20163,7 +20211,7 @@ else +@@ -20480,7 +20533,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:20226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:20495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:20548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -20219,7 +20267,7 @@ fi +@@ -20536,7 +20589,7 @@ fi php_enable_ipv6=yes echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6 --echo "configure:20223: checking whether to enable IPv6 support" >&5 -+echo "configure:20271: checking whether to enable IPv6 support" >&5 +-echo "configure:20540: checking whether to enable IPv6 support" >&5 ++echo "configure:20593: 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" -@@ -20246,7 +20294,7 @@ EOF +@@ -20563,7 +20616,7 @@ EOF fi echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6 --echo "configure:20250: checking how big to make fd sets" >&5 -+echo "configure:20298: checking how big to make fd sets" >&5 +-echo "configure:20567: checking how big to make fd sets" >&5 ++echo "configure:20620: checking how big to make fd sets" >&5 php_enable_fd_setsize=no -@@ -20314,7 +20362,7 @@ fi +@@ -20631,7 +20684,7 @@ fi echo $ac_n "checking size of long""... $ac_c" 1>&6 --echo "configure:20318: checking size of long" >&5 -+echo "configure:20366: checking size of long" >&5 +-echo "configure:20635: checking size of long" >&5 ++echo "configure:20688: 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 -@@ -20322,7 +20370,7 @@ else +@@ -20639,9 +20692,10 @@ else ac_cv_sizeof_long=8 else cat > conftest.$ac_ext < - #include -@@ -20334,7 +20382,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -20650,7 +20704,7 @@ main() exit(0); } EOF --if { (eval echo configure:20338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:20386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:20654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:20708: \"$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 -@@ -20354,7 +20402,7 @@ EOF +@@ -20670,7 +20724,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 --echo "configure:20358: checking size of int" >&5 -+echo "configure:20406: checking size of int" >&5 +-echo "configure:20674: checking size of int" >&5 ++echo "configure:20728: 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 -@@ -20362,7 +20410,7 @@ else +@@ -20678,9 +20732,10 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < - #include -@@ -20374,7 +20422,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -20689,7 +20744,7 @@ main() exit(0); } EOF --if { (eval echo configure:20378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:20426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:20693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:20748: \"$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 -@@ -20395,13 +20443,13 @@ EOF +@@ -20710,13 +20765,13 @@ EOF echo $ac_n "checking for int32_t""... $ac_c" 1>&6 --echo "configure:20399: checking for int32_t" >&5 -+echo "configure:20447: checking for int32_t" >&5 +-echo "configure:20714: checking for int32_t" >&5 ++echo "configure:20769: 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 <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:20739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int_type_int32_t=yes else -@@ -20443,13 +20491,13 @@ fi +@@ -20758,13 +20813,13 @@ fi echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 --echo "configure:20447: checking for uint32_t" >&5 -+echo "configure:20495: checking for uint32_t" >&5 +-echo "configure:20762: checking for uint32_t" >&5 ++echo "configure:20817: 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 <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:20520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:20787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int_type_uint32_t=yes else -@@ -20500,17 +20548,17 @@ stdlib.h +@@ -20815,17 +20870,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:20504: checking for $ac_hdr" >&5 -+echo "configure:20552: checking for $ac_hdr" >&5 +-echo "configure:20819: checking for $ac_hdr" >&5 ++echo "configure:20874: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:20514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:20562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:20829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:20884: \"$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* -@@ -20540,12 +20588,12 @@ done +@@ -20855,12 +20910,12 @@ done for ac_func in strtoll atoll strftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:20544: checking for $ac_func" >&5 -+echo "configure:20592: checking for $ac_func" >&5 +-echo "configure:20859: checking for $ac_func" >&5 ++echo "configure:20914: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:20620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:20887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:20942: \"$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 -@@ -20594,6 +20642,44 @@ done +@@ -20909,6 +20964,44 @@ done +php_with_system_tzdata=no + +echo $ac_n "checking for use of system timezone data""... $ac_c" 1>&6 -+echo "configure:20649: checking for use of system timezone data" >&5 ++echo "configure:20971: checking for use of system timezone data" >&5 +# Check whether --with-system-tzdata or --without-system-tzdata was given. +if test "${with_system_tzdata+set}" = set; then + withval="$with_system_tzdata" @@ -4606,440 +4782,440 @@ PHP_DATE_CFLAGS="-I@ext_builddir@/lib" timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c -@@ -21030,7 +21116,7 @@ case $PHP_REGEX in +@@ -21345,7 +21438,7 @@ case $PHP_REGEX in esac echo $ac_n "checking which regex library to use""... $ac_c" 1>&6 --echo "configure:21034: checking which regex library to use" >&5 -+echo "configure:21120: checking which regex library to use" >&5 +-echo "configure:21349: checking which regex library to use" >&5 ++echo "configure:21442: checking which regex library to use" >&5 echo "$ac_t""$REGEX_TYPE" 1>&6 if test "$REGEX_TYPE" = "php"; then -@@ -21407,13 +21493,13 @@ elif test "$REGEX_TYPE" = "system"; then +@@ -21722,13 +21815,13 @@ elif test "$REGEX_TYPE" = "system"; then EOF echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6 --echo "configure:21411: checking whether field re_magic exists in struct regex_t" >&5 -+echo "configure:21497: checking whether field re_magic exists in struct regex_t" >&5 +-echo "configure:21726: checking whether field re_magic exists in struct regex_t" >&5 ++echo "configure:21819: 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 < #include -@@ -21421,7 +21507,7 @@ int main() { +@@ -21736,7 +21829,7 @@ int main() { regex_t rt; rt.re_magic; ; return 0; } EOF --if { (eval echo configure:21425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:21511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:21740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:21833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_regex_t_re_magic=yes else -@@ -21447,7 +21533,7 @@ fi +@@ -21762,7 +21855,7 @@ fi php_enable_libxml=yes echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6 --echo "configure:21451: checking whether to enable LIBXML support" >&5 -+echo "configure:21537: checking whether to enable LIBXML support" >&5 +-echo "configure:21766: checking whether to enable LIBXML support" >&5 ++echo "configure:21859: 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" -@@ -21492,7 +21578,7 @@ if test -z "$PHP_LIBXML_DIR"; then +@@ -21807,7 +21900,7 @@ if test -z "$PHP_LIBXML_DIR"; then php_with_libxml_dir=no echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:21496: checking libxml2 install dir" >&5 -+echo "configure:21582: checking libxml2 install dir" >&5 +-echo "configure:21811: checking libxml2 install dir" >&5 ++echo "configure:21904: 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" -@@ -21518,7 +21604,7 @@ if test "$PHP_LIBXML" != "no"; then +@@ -21833,7 +21926,7 @@ if test "$PHP_LIBXML" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:21522: checking for xml2-config path" >&5 -+echo "configure:21608: checking for xml2-config path" >&5 +-echo "configure:21837: checking for xml2-config path" >&5 ++echo "configure:21930: 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 -@@ -21676,7 +21762,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -21991,7 +22084,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:21680: checking whether libxml build works" >&5 -+echo "configure:21766: checking whether libxml build works" >&5 +-echo "configure:21995: checking whether libxml build works" >&5 ++echo "configure:22088: 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 -@@ -21692,7 +21778,7 @@ else +@@ -22007,7 +22100,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:21793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:22022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:22115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -22068,7 +22154,7 @@ fi +@@ -22383,7 +22476,7 @@ fi php_with_openssl=no echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6 --echo "configure:22072: checking for OpenSSL support" >&5 -+echo "configure:22158: checking for OpenSSL support" >&5 +-echo "configure:22387: checking for OpenSSL support" >&5 ++echo "configure:22480: checking for OpenSSL support" >&5 # Check whether --with-openssl or --without-openssl was given. if test "${with_openssl+set}" = set; then withval="$with_openssl" -@@ -22112,7 +22198,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -22427,7 +22520,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_kerberos=no echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6 --echo "configure:22116: checking for Kerberos support" >&5 -+echo "configure:22202: checking for Kerberos support" >&5 +-echo "configure:22431: checking for Kerberos support" >&5 ++echo "configure:22524: checking for Kerberos support" >&5 # Check whether --with-kerberos or --without-kerberos was given. if test "${with_kerberos+set}" = set; then withval="$with_kerberos" -@@ -22438,7 +22524,7 @@ EOF +@@ -22753,7 +22846,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:22442: checking for $ac_word" >&5 -+echo "configure:22528: checking for $ac_word" >&5 +-echo "configure:22757: checking for $ac_word" >&5 ++echo "configure:22850: 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 -@@ -22798,7 +22884,7 @@ fi +@@ -23113,7 +23206,7 @@ fi fi echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6 --echo "configure:22802: checking for DSA_get_default_method in -lssl" >&5 -+echo "configure:22888: checking for DSA_get_default_method in -lssl" >&5 +-echo "configure:23117: checking for DSA_get_default_method in -lssl" >&5 ++echo "configure:23210: 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 -@@ -22806,7 +22892,7 @@ else +@@ -23121,7 +23214,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:22907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:23136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:23229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -22841,7 +22927,7 @@ else +@@ -23156,7 +23249,7 @@ else fi echo $ac_n "checking for X509_free in -lcrypto""... $ac_c" 1>&6 --echo "configure:22845: checking for X509_free in -lcrypto" >&5 -+echo "configure:22931: checking for X509_free in -lcrypto" >&5 +-echo "configure:23160: checking for X509_free in -lcrypto" >&5 ++echo "configure:23253: checking for X509_free in -lcrypto" >&5 ac_lib_var=`echo crypto'_'X509_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 -@@ -22849,7 +22935,7 @@ else +@@ -23164,7 +23257,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:22950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:23179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:23272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -22902,7 +22988,7 @@ fi +@@ -23217,7 +23310,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:22906: checking for $ac_word" >&5 -+echo "configure:22992: checking for $ac_word" >&5 +-echo "configure:23221: checking for $ac_word" >&5 ++echo "configure:23314: 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 -@@ -23107,9 +23193,9 @@ fi +@@ -23422,9 +23515,9 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 --echo "configure:23111: checking for OpenSSL version" >&5 -+echo "configure:23197: checking for OpenSSL version" >&5 +-echo "configure:23426: checking for OpenSSL version" >&5 ++echo "configure:23519: checking for OpenSSL version" >&5 cat > conftest.$ac_ext < -@@ -23264,7 +23350,7 @@ rm -f conftest* +@@ -23579,7 +23672,7 @@ rm -f conftest* done echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 --echo "configure:23268: checking for CRYPTO_free in -lcrypto" >&5 -+echo "configure:23354: checking for CRYPTO_free in -lcrypto" >&5 +-echo "configure:23583: checking for CRYPTO_free in -lcrypto" >&5 ++echo "configure:23676: 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 -@@ -23272,7 +23358,7 @@ else +@@ -23587,7 +23680,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:23373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:23602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:23695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -23440,7 +23526,7 @@ fi +@@ -23755,7 +23848,7 @@ fi done echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 --echo "configure:23444: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -+echo "configure:23530: checking for SSL_CTX_set_ssl_version in -lssl" >&5 +-echo "configure:23759: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++echo "configure:23852: 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 -@@ -23448,7 +23534,7 @@ else +@@ -23763,7 +23856,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:23549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:23778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:23871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -23624,7 +23710,7 @@ ext_output=$PHP_PCRE_REGEX +@@ -23939,7 +24032,7 @@ ext_output=$PHP_PCRE_REGEX if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then echo $ac_n "checking for PCRE headers location""... $ac_c" 1>&6 --echo "configure:23628: checking for PCRE headers location" >&5 -+echo "configure:23714: checking for PCRE headers location" >&5 +-echo "configure:23943: checking for PCRE headers location" >&5 ++echo "configure:24036: checking for PCRE headers location" >&5 for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do test -f $i/pcre.h && PCRE_INCDIR=$i done -@@ -23635,7 +23721,7 @@ echo "configure:23628: checking for PCRE +@@ -23950,7 +24043,7 @@ echo "configure:23943: checking for PCRE echo "$ac_t""$PCRE_INCDIR" 1>&6 echo $ac_n "checking for PCRE library location""... $ac_c" 1>&6 --echo "configure:23639: checking for PCRE library location" >&5 -+echo "configure:23725: checking for PCRE library location" >&5 +-echo "configure:23954: checking for PCRE library location" >&5 ++echo "configure:24047: checking for PCRE library location" >&5 for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j done -@@ -24057,7 +24143,7 @@ EOF +@@ -24372,7 +24465,7 @@ EOF else echo $ac_n "checking for PCRE library to use""... $ac_c" 1>&6 --echo "configure:24061: checking for PCRE library to use" >&5 -+echo "configure:24147: checking for PCRE library to use" >&5 +-echo "configure:24376: checking for PCRE library to use" >&5 ++echo "configure:24469: checking for PCRE library to use" >&5 echo "$ac_t""bundled" 1>&6 pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.c \ pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \ -@@ -24394,7 +24480,7 @@ EOF +@@ -24709,7 +24802,7 @@ EOF php_with_sqlite3=yes echo $ac_n "checking whether to enable the SQLite3 extension""... $ac_c" 1>&6 --echo "configure:24398: checking whether to enable the SQLite3 extension" >&5 -+echo "configure:24484: checking whether to enable the SQLite3 extension" >&5 +-echo "configure:24713: checking whether to enable the SQLite3 extension" >&5 ++echo "configure:24806: checking whether to enable the SQLite3 extension" >&5 # Check whether --with-sqlite3 or --without-sqlite3 was given. if test "${with_sqlite3+set}" = set; then withval="$with_sqlite3" -@@ -24449,7 +24535,7 @@ if test $PHP_SQLITE3 != "no"; then +@@ -24764,7 +24857,7 @@ if test $PHP_SQLITE3 != "no"; then if test $PHP_SQLITE3 != "yes"; then echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6 --echo "configure:24453: checking for sqlite3 files in default path" >&5 -+echo "configure:24539: checking for sqlite3 files in default path" >&5 +-echo "configure:24768: checking for sqlite3 files in default path" >&5 ++echo "configure:24861: checking for sqlite3 files in default path" >&5 for i in $PHP_SQLITE3 /usr/local /usr; do if test -r $i/include/sqlite3.h; then SQLITE3_DIR=$i -@@ -24464,7 +24550,7 @@ echo "configure:24453: checking for sqli +@@ -24779,7 +24872,7 @@ echo "configure:24768: checking for sqli fi echo $ac_n "checking for SQLite 3.3.9+""... $ac_c" 1>&6 --echo "configure:24468: checking for SQLite 3.3.9+" >&5 -+echo "configure:24554: checking for SQLite 3.3.9+" >&5 +-echo "configure:24783: checking for SQLite 3.3.9+" >&5 ++echo "configure:24876: checking for SQLite 3.3.9+" >&5 save_old_LDFLAGS=$LDFLAGS ac_stuff=" -@@ -24563,7 +24649,7 @@ echo "configure:24468: checking for SQLi +@@ -24878,7 +24971,7 @@ echo "configure:24783: checking for SQLi done echo $ac_n "checking for sqlite3_prepare_v2 in -lsqlite3""... $ac_c" 1>&6 --echo "configure:24567: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 -+echo "configure:24653: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 +-echo "configure:24882: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 ++echo "configure:24975: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 ac_lib_var=`echo sqlite3'_'sqlite3_prepare_v2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -24571,7 +24657,7 @@ else +@@ -24886,7 +24979,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:24672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:24901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:24994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -24842,7 +24928,7 @@ fi +@@ -25157,7 +25250,7 @@ fi done echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 --echo "configure:24846: checking for sqlite3_key in -lsqlite3" >&5 -+echo "configure:24932: checking for sqlite3_key in -lsqlite3" >&5 +-echo "configure:25161: checking for sqlite3_key in -lsqlite3" >&5 ++echo "configure:25254: 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 -@@ -24850,7 +24936,7 @@ else +@@ -25165,7 +25258,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:24951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:25180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:25273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -24993,7 +25079,7 @@ fi +@@ -25308,7 +25401,7 @@ fi done echo $ac_n "checking for sqlite3_load_extension in -lsqlite3""... $ac_c" 1>&6 --echo "configure:24997: checking for sqlite3_load_extension in -lsqlite3" >&5 -+echo "configure:25083: checking for sqlite3_load_extension in -lsqlite3" >&5 +-echo "configure:25312: checking for sqlite3_load_extension in -lsqlite3" >&5 ++echo "configure:25405: checking for sqlite3_load_extension in -lsqlite3" >&5 ac_lib_var=`echo sqlite3'_'sqlite3_load_extension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -25001,7 +25087,7 @@ else +@@ -25316,7 +25409,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:25102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:25331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:25424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -25049,7 +25135,7 @@ fi +@@ -25364,7 +25457,7 @@ fi else echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6 --echo "configure:25053: checking bundled sqlite3 library" >&5 -+echo "configure:25139: checking bundled sqlite3 library" >&5 +-echo "configure:25368: checking bundled sqlite3 library" >&5 ++echo "configure:25461: checking bundled sqlite3 library" >&5 echo "$ac_t""yes" 1>&6 sqlite3_extra_sources="libsqlite/sqlite3.c" -@@ -25405,7 +25491,7 @@ fi +@@ -25720,7 +25813,7 @@ fi php_with_zlib=no echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6 --echo "configure:25409: checking for ZLIB support" >&5 -+echo "configure:25495: checking for ZLIB support" >&5 +-echo "configure:25724: checking for ZLIB support" >&5 ++echo "configure:25817: checking for ZLIB support" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" -@@ -25449,7 +25535,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -25764,7 +25857,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_zlib_dir=no echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6 --echo "configure:25453: checking if the location of ZLIB install directory is defined" >&5 -+echo "configure:25539: checking if the location of ZLIB install directory is defined" >&5 +-echo "configure:25768: checking if the location of ZLIB install directory is defined" >&5 ++echo "configure:25861: 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" -@@ -25892,7 +25978,7 @@ EOF +@@ -26207,7 +26300,7 @@ EOF done echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6 --echo "configure:25896: checking for gzgets in -lz" >&5 -+echo "configure:25982: checking for gzgets in -lz" >&5 +-echo "configure:26211: checking for gzgets in -lz" >&5 ++echo "configure:26304: 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 -@@ -25900,7 +25986,7 @@ else +@@ -26215,7 +26308,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:26001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:26230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:26323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -26048,18 +26134,18 @@ fi +@@ -26363,18 +26456,18 @@ fi @@ -5047,13 +5223,13 @@ +php_enable_apc=no -echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6 --echo "configure:26055: checking whether to enable bc style precision math functions" >&5 +-echo "configure:26370: 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" - PHP_BCMATH=$enableval +echo $ac_n "checking whether to enable APC support""... $ac_c" 1>&6 -+echo "configure:26141: checking whether to enable APC support" >&5 ++echo "configure:26463: checking whether to enable APC support" >&5 +# Check whether --enable-apc or --disable-apc was given. +if test "${enable_apc+set}" = set; then + enableval="$enable_apc" @@ -5067,7 +5243,7 @@ fi -@@ -26067,12 +26153,12 @@ fi +@@ -26382,12 +26475,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -5083,7 +5259,7 @@ ;; no) ext_output=no -@@ -26091,396 +26177,481 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -26406,396 +26499,481 @@ echo "$ac_t""$ext_output" 1>&6 @@ -5094,38 +5270,23 @@ - ext_builddir=ext/bcmath - ext_srcdir=$abs_srcdir/ext/bcmath -- -- ac_extra=`echo "-I@ext_srcdir@/libbcmath/src"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` + PHP_APC_DEBUG=yes +- ac_extra=`echo "-I@ext_srcdir@/libbcmath/src"|$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_BCMATH_SHARED=no - -+else - +- - case ext/bcmath in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ PHP_APC_DEBUG=no -+ -+fi -+ -+ -+echo $ac_n "checking whether we should enable cache request file info""... $ac_c" 1>&6 -+echo "configure:26195: checking whether we should enable cache request file info" >&5 -+# Check whether --enable-apc-filehits or --disable-apc-filehits was given. -+if test "${enable_apc_filehits+set}" = set; then -+ enableval="$enable_apc_filehits" - -+ PHP_APC_FILEHITS=$enableval -+ echo "$ac_t""$enableval" 1>&6 -+ +- +else -+ PHP_APC_FILEHITS=no -+ echo "$ac_t""no" 1>&6 ++ PHP_APC_DEBUG=no - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre @@ -5143,11 +5304,11 @@ -libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ -libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do -+echo $ac_n "checking whether we should use mmap""... $ac_c" 1>&6 -+echo "configure:26212: checking whether we should use mmap" >&5 -+# Check whether --enable-apc-mmap or --disable-apc-mmap was given. -+if test "${enable_apc_mmap+set}" = set; then -+ enableval="$enable_apc_mmap" ++echo $ac_n "checking whether we should enable cache request file info""... $ac_c" 1>&6 ++echo "configure:26517: checking whether we should enable cache request file info" >&5 ++# Check whether --enable-apc-filehits or --disable-apc-filehits was given. ++if test "${enable_apc_filehits+set}" = set; then ++ enableval="$enable_apc_filehits" - IFS=. - set $ac_src @@ -5155,8 +5316,8 @@ - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ PHP_APC_MMAP=$enableval -+ echo "$ac_t""$enableval" 1>&6 ++ PHP_APC_FILEHITS=$enableval ++ echo "$ac_t""$enableval" 1>&6 - 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" ;; @@ -5166,8 +5327,8 @@ - esac +else + -+ PHP_APC_MMAP=yes -+ echo "$ac_t""yes" 1>&6 ++ PHP_APC_FILEHITS=no ++ echo "$ac_t""no" 1>&6 - cat >>Makefile.objects<&6 -+echo "configure:26229: checking whether we should use semaphore locking instead of fcntl" >&5 -+# Check whether --enable-apc-sem or --disable-apc-sem was given. -+if test "${enable_apc_sem+set}" = set; then -+ enableval="$enable_apc_sem" ++echo $ac_n "checking whether we should use mmap""... $ac_c" 1>&6 ++echo "configure:26534: checking whether we should use mmap" >&5 ++# Check whether --enable-apc-mmap or --disable-apc-mmap was given. ++if test "${enable_apc_mmap+set}" = set; then ++ enableval="$enable_apc_mmap" -+ PHP_APC_SEM=$enableval ++ PHP_APC_MMAP=$enableval + echo "$ac_t""$enableval" 1>&6 + +else -+ PHP_APC_SEM=no -+ echo "$ac_t""no" 1>&6 ++ PHP_APC_MMAP=yes ++ echo "$ac_t""yes" 1>&6 - b_c_pre=$shared_c_pre - b_cxx_pre=$shared_cxx_pre @@ -5220,11 +5381,11 @@ -libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ -libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ -libbcmath/src/rmzero.c libbcmath/src/str2num.c; do -+echo $ac_n "checking whether we should use pthread mutex locking""... $ac_c" 1>&6 -+echo "configure:26246: checking whether we should use pthread mutex locking" >&5 -+# Check whether --enable-apc-pthreadmutex or --disable-apc-pthreadmutex was given. -+if test "${enable_apc_pthreadmutex+set}" = set; then -+ enableval="$enable_apc_pthreadmutex" ++echo $ac_n "checking whether we should use semaphore locking instead of fcntl""... $ac_c" 1>&6 ++echo "configure:26551: checking whether we should use semaphore locking instead of fcntl" >&5 ++# Check whether --enable-apc-sem or --disable-apc-sem was given. ++if test "${enable_apc_sem+set}" = set; then ++ enableval="$enable_apc_sem" - IFS=. - set $ac_src @@ -5232,31 +5393,31 @@ - IFS=$old_IFS - - shared_objects_bcmath="$shared_objects_bcmath $ac_bdir$ac_obj.lo" -+ PHP_APC_PTHREADMUTEX=$enableval -+ echo "$ac_t""$enableval" 1>&6 - +- - 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 -+else -+ -+ PHP_APC_PTHREADMUTEX=yes -+ echo "$ac_t""yes" 1>&6 ++ PHP_APC_SEM=$enableval ++ echo "$ac_t""$enableval" 1>&6 - cat >>Makefile.objects<&6 - case $host_alias in - *netware*) - - install_modules="install-modules" ++fi - case $host_alias in - *aix*) @@ -5271,11 +5432,68 @@ - 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_bcmath) $(PHPBCMATH_SHARED_LIBADD)' - ;; +- esac + +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbcmath.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix" +- fi ++echo $ac_n "checking whether we should use pthread mutex locking""... $ac_c" 1>&6 ++echo "configure:26568: checking whether we should use pthread mutex locking" >&5 ++# Check whether --enable-apc-pthreadmutex or --disable-apc-pthreadmutex was given. ++if test "${enable_apc_pthreadmutex+set}" = set; then ++ enableval="$enable_apc_pthreadmutex" + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath" +- +- cat >>Makefile.objects<&6 + +-EOF ++else ++ ++ PHP_APC_PTHREADMUTEX=yes ++ echo "$ac_t""yes" 1>&6 + +- ;; +- *) +- +- install_modules="install-modules" ++fi + +- 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'/bcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(BCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/bcmath.so '$ext_builddir'/bcmath.so' +- ;; +- *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_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BCMATH, 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_bcmath) $(BCMATH_SHARED_LIBADD)' +- ;; +- esac + +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bcmath.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix" +- fi +if test "$PHP_APC_PTHREADMUTEX" != "no"; then + orig_LIBS="$LIBS" + LIBS="$LIBS -lpthread" + if test "$cross_compiling" = yes; then -+ + +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath" + + + case pthread in @@ -5283,21 +5501,21 @@ + *) + LIBS="-lpthread $LIBS" + ;; - esac ++ esac -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbcmath.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix" -- fi -+ +- cat >>Makefile.objects< conftest.$ac_ext < + #include + main() { @@ -5329,12 +5547,11 @@ + return 0; + } + -+EOF -+if { (eval echo configure:26316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + EOF ++if { (eval echo configure:26638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath" ++ + case pthread in + c|c_r|pthread*) ;; + *) @@ -5342,12 +5559,14 @@ + ;; + esac -- cat >>Makefile.objects<> confdefs.h <&5 @@ -5360,93 +5579,87 @@ +rm -fr conftest* +fi --EOF +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then +- PHP_BCMATH_SHARED=no +- case "$PHP_SAPI" in +- cgi|embed) +- +- +- case ext/bcmath in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac + LIBS="$orig_LIBS" +fi - -- ;; -- *) -- -- install_modules="install-modules" ++ +echo $ac_n "checking whether we should use spin locks""... $ac_c" 1>&6 -+echo "configure:26344: checking whether we should use spin locks" >&5 ++echo "configure:26666: checking whether we should use spin locks" >&5 +# Check whether --enable-apc-spinlocks or --disable-apc-spinlocks was given. +if test "${enable_apc_spinlocks+set}" = set; then + enableval="$enable_apc_spinlocks" -+ + + PHP_APC_SPINLOCKS=$enableval + echo "$ac_t""$enableval" 1>&6 - -- 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'/bcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(BCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/bcmath.so '$ext_builddir'/bcmath.so' -- ;; -- *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_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BCMATH, 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_bcmath) $(BCMATH_SHARED_LIBADD)' -- ;; -- esac ++ +else -+ + + PHP_APC_SPINLOCKS=no + echo "$ac_t""no" 1>&6 -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bcmath.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix" -- fi +- 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 +fi -+ -+ + + +- old_IFS=$IFS +- for ac_src in bcmath.c \ +-libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ +-libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ +-libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ +-libbcmath/src/rmzero.c libbcmath/src/str2num.c; do +echo $ac_n "checking whether we should enable memory protection""... $ac_c" 1>&6 -+echo "configure:26361: checking whether we should enable memory protection" >&5 ++echo "configure:26683: checking whether we should enable memory protection" >&5 +# Check whether --enable-apc-memprotect or --disable-apc-memprotect was given. +if test "${enable_apc_memprotect+set}" = set; then + enableval="$enable_apc_memprotect" -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath" +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + PHP_APC_MEMPROTECT=$enableval + echo "$ac_t""$enableval" 1>&6 -- cat >>Makefile.objects<&6 --$ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES) -- $link_cmd +- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define APC_MMAP 1 - EOF - -- ;; -- esac -- cat >> confdefs.h <> confdefs.h <<\EOF -+#define APC_FILEHITS 1 - EOF - -- fi -- fi -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_BCMATH_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) +- EXT_STATIC="$EXT_STATIC bcmath" +- ;; +- *) - - - case ext/bcmath in @@ -5456,9 +5669,9 @@ - esac - - -+ if test "$PHP_APC_DEBUG" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define __DEBUG_APC__ 1 ++if test "$PHP_APC" != "no"; then ++ test "$PHP_APC_MMAP" != "no" && cat >> confdefs.h <<\EOF ++#define APC_MMAP 1 +EOF - b_c_pre=$php_c_pre @@ -5468,13 +5681,11 @@ - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo -+ fi - -+ if test "$PHP_APC_SEM" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define APC_SEM_LOCKS 1 ++ test "$PHP_APC_FILEHITS" != "no" && cat >> confdefs.h <<\EOF ++#define APC_FILEHITS 1 +EOF + - old_IFS=$IFS - for ac_src in bcmath.c \ -libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ @@ -5487,7 +5698,29 @@ - ac_obj=$1 - IFS=$old_IFS - -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ if test "$PHP_APC_DEBUG" != "no"; then ++ cat >> confdefs.h <<\EOF ++#define __DEBUG_APC__ 1 ++EOF + +- 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 ++ fi + +- cat >>Makefile.objects<> confdefs.h <<\EOF ++#define APC_SEM_LOCKS 1 + EOF +- done + + elif test "$PHP_APC_SPINLOCKS" != "no"; then + cat >> confdefs.h <<\EOF +#define APC_SPIN_LOCKS 1 @@ -5498,51 +5731,45 @@ +#define APC_PTHREADMUTEX_LOCKS 1 +EOF -- 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 +- ;; +- esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath" +- fi +- +- +- BUILD_DIR="$BUILD_DIR $ext_builddir" +- + else + cat >> confdefs.h <<\EOF +#define APC_FCNTL_LOCKS 1 +EOF -- cat >>Makefile.objects<> confdefs.h <<\EOF +#define APC_MEMPROTECT 1 - EOF -- done ++EOF +- if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=bcmath +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + fi -- EXT_STATIC="$EXT_STATIC bcmath" -- ;; -- *) -- +- fi + echo $ac_n "checking for zend_set_lookup_function_hook""... $ac_c" 1>&6 -+echo "configure:26424: checking for zend_set_lookup_function_hook" >&5 ++echo "configure:26746: checking for zend_set_lookup_function_hook" >&5 +if eval "test \"`echo '$''{'php_cv_zend_set_lookup_function_hook'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else - -- case ext/bcmath in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac ++ + orig_cflags=$CFLAGS + CFLAGS="$INCLUDES $EXTRA_INCLUDES" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:26766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* -+ + + php_cv_zend_set_lookup_function_hook=yes + +else @@ -5562,6 +5789,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* +- BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src" + php_cv_zend_set_lookup_function_hook=no + +fi @@ -5570,54 +5798,31 @@ +fi -- 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 +- cat >> confdefs.h <<\EOF +-#define HAVE_BCMATH 1 +echo "$ac_t""$php_cv_zend_set_lookup_function_hook" 1>&6 + if test "$php_cv_zend_set_lookup_function_hook" = "yes"; then + cat >> confdefs.h <<\EOF +#define APC_HAVE_LOOKUP_HOOKS 1 -+EOF + EOF +-fi + else + cat >> confdefs.h <<\EOF +#define APC_HAVE_LOOKUP_HOOKS 0 +EOF - -- old_IFS=$IFS -- for ac_src in bcmath.c \ --libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ --libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ --libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ --libbcmath/src/rmzero.c libbcmath/src/str2num.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ + fi -- 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 + for ac_func in sigaction +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:26478: checking for $ac_func" >&5 ++echo "configure:26800: 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 <>Makefile.objects<&6 +-echo "configure:26735: checking for BZip2 support" >&5 +-# Check whether --with-bz2 or --without-bz2 was given. +-if test "${with_bz2+set}" = set; then +- withval="$with_bz2" +- PHP_BZ2=$withval +; return 0; } - EOF -- done -+if { (eval echo configure:26506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++EOF ++if { (eval echo configure:26828: \"$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 @@ -5655,7 +5863,7 @@ +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'` @@ -5667,21 +5875,19 @@ + echo "$ac_t""no" 1>&6 +fi +done - -- ;; -- esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath" -- fi ++ + echo $ac_n "checking for union semun""... $ac_c" 1>&6 -+echo "configure:26531: checking for union semun" >&5 ++echo "configure:26853: checking for union semun" >&5 +if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ + else + +- PHP_BZ2=no +- test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL + cat > conftest.$ac_ext < +#include +#include @@ -5690,23 +5896,22 @@ +union semun x; x.val=1 +; return 0; } +EOF -+if { (eval echo configure:26548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:26870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* - ++ + php_cv_semun=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* - -- BUILD_DIR="$BUILD_DIR $ext_builddir" ++ + php_cv_semun=no + +fi +rm -f conftest* - -+fi ++ + fi +echo "$ac_t""$php_cv_semun" 1>&6 + if test "$php_cv_semun" = "yes"; then @@ -5714,45 +5919,61 @@ +#define HAVE_SEMUN 1 +EOF -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=bcmath -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + else + cat >> confdefs.h <<\EOF +#define HAVE_SEMUN 0 +EOF - fi +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_BZ2 in +-shared,*) +- PHP_BZ2=`echo "$PHP_BZ2"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_BZ2=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac +- +- +- +-echo "$ac_t""$ext_output" 1>&6 ++ fi + echo $ac_n "checking whether we should enable valgrind support""... $ac_c" 1>&6 -+echo "configure:26579: checking whether we should enable valgrind support" >&5 ++echo "configure:26901: checking whether we should enable valgrind support" >&5 + # Check whether --enable-valgrind-checks or --disable-valgrind-checks was given. +if test "${enable_valgrind_checks+set}" = set; then + enableval="$enable_valgrind_checks" - ++ + PHP_APC_VALGRIND=$enableval + echo "$ac_t""$enableval" 1>&6 - -- BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src" ++ +else - -- ++ + PHP_APC_VALGRIND=yes + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "valgrind/memcheck.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for valgrind/memcheck.h""... $ac_c" 1>&6 -+echo "configure:26593: checking for valgrind/memcheck.h" >&5 ++echo "configure:26915: checking for valgrind/memcheck.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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:26603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:26925: \"$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* @@ -5768,68 +5989,23 @@ +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF --#define HAVE_BCMATH 1 ++ cat >> confdefs.h <<\EOF +#define HAVE_VALGRIND_MEMCHECK_H 1 - EOF ++EOF +else + echo "$ac_t""no" 1>&6 - fi ++fi + +fi - --php_with_bz2=no -- --echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6 --echo "configure:26420: checking for BZip2 support" >&5 --# Check whether --with-bz2 or --without-bz2 was given. --if test "${with_bz2+set}" = set; then -- withval="$with_bz2" -- PHP_BZ2=$withval --else -- -- PHP_BZ2=no -- test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_BZ2 in --shared,*) -- PHP_BZ2=`echo "$PHP_BZ2"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_BZ2=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_BZ2" != "no"; then - if test -r $PHP_BZ2/include/bzlib.h; then - BZIP_DIR=$PHP_BZ2 - else - echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6 --echo "configure:26465: checking for BZip2 in default path" >&5 +-echo "configure:26780: 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 @@ -5838,7 +6014,7 @@ - fi - done - fi -- + - if test -z "$BZIP_DIR"; then - echo "$ac_t""not found" 1>&6 - { echo "configure: error: Please reinstall the BZip2 distribution" 1>&2; exit 1; } @@ -5874,15 +6050,15 @@ save_ext_shared=$ext_shared ext_shared=yes -@@ -26573,27 +26744,27 @@ echo "configure:26465: checking for BZip +@@ -26888,27 +27066,27 @@ echo "configure:26780: checking for BZip esac done - echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6 --echo "configure:26578: checking for BZ2_bzerror in -lbz2" >&5 +-echo "configure:26893: checking for BZ2_bzerror in -lbz2" >&5 -ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'` + echo $ac_n "checking for shm_open in -lrt""... $ac_c" 1>&6 -+echo "configure:26749: checking for shm_open in -lrt" >&5 ++echo "configure:27071: checking for shm_open in -lrt" >&5 +ac_lib_var=`echo rt'_'shm_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 @@ -5891,8 +6067,8 @@ -LIBS="-lbz2 $LIBS" +LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:26768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:26912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:27090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -26612,167 +26783,53 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -26927,167 +27105,53 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -6097,7 +6273,7 @@ esac -@@ -26787,7 +26844,7 @@ fi +@@ -27102,7 +27166,7 @@ fi old_IFS=$IFS @@ -6106,7 +6282,7 @@ IFS=. set $ac_src -@@ -26810,18 +26867,18 @@ EOF +@@ -27125,18 +27189,18 @@ EOF done @@ -6131,7 +6307,7 @@ esac -@@ -26836,14 +26893,14 @@ EOF +@@ -27151,14 +27215,14 @@ EOF old_IFS=$IFS @@ -6148,7 +6324,7 @@ 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" ;; -@@ -26866,31 +26923,31 @@ EOF +@@ -27181,31 +27245,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -6189,7 +6365,7 @@ $link_cmd EOF -@@ -26903,31 +26960,31 @@ EOF +@@ -27218,31 +27282,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -6230,7 +6406,7 @@ $link_cmd EOF -@@ -26935,22 +26992,22 @@ EOF +@@ -27250,22 +27314,22 @@ EOF ;; esac cat >> confdefs.h <&6 --echo "configure:27065: checking whether to enable calendar conversion support" >&5 +-echo "configure:27380: 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" @@ -6342,7 +6518,7 @@ +php_enable_bcmath=no + +echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6 -+echo "configure:27130: checking whether to enable bc style precision math functions" >&5 ++echo "configure:27452: 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" @@ -6356,7 +6532,7 @@ fi -@@ -27077,12 +27142,12 @@ fi +@@ -27392,12 +27464,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -6372,7 +6548,7 @@ ;; no) ext_output=no -@@ -27101,25 +27166,21 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -27416,25 +27488,21 @@ echo "$ac_t""$ext_output" 1>&6 @@ -6406,7 +6582,7 @@ esac -@@ -27134,7 +27195,11 @@ EOF +@@ -27449,7 +27517,11 @@ EOF old_IFS=$IFS @@ -6419,7 +6595,7 @@ IFS=. set $ac_src -@@ -27157,18 +27222,18 @@ EOF +@@ -27472,18 +27544,18 @@ EOF done @@ -6444,7 +6620,7 @@ esac -@@ -27183,14 +27248,18 @@ EOF +@@ -27498,14 +27570,18 @@ EOF old_IFS=$IFS @@ -6465,7 +6641,7 @@ 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" ;; -@@ -27213,31 +27282,31 @@ EOF +@@ -27528,31 +27604,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -6506,7 +6682,7 @@ $link_cmd EOF -@@ -27250,31 +27319,31 @@ EOF +@@ -27565,31 +27641,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -6547,7 +6723,7 @@ $link_cmd EOF -@@ -27282,22 +27351,22 @@ EOF +@@ -27597,22 +27673,22 @@ EOF ;; esac cat >> confdefs.h <&6 --echo "configure:27409: checking whether to enable ctype functions" >&5 +-echo "configure:27724: 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" - PHP_CTYPE=$enableval +echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6 -+echo "configure:27495: checking for BZip2 support" >&5 ++echo "configure:27817: checking for BZip2 support" >&5 +# Check whether --with-bz2 or --without-bz2 was given. +if test "${with_bz2+set}" = set; then + withval="$with_bz2" @@ -6678,7 +6854,7 @@ fi -@@ -27421,12 +27507,12 @@ fi +@@ -27736,12 +27829,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -6694,7 +6870,7 @@ ;; no) ext_output=no -@@ -27445,48 +27531,346 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -27760,54 +27853,352 @@ echo "$ac_t""$ext_output" 1>&6 @@ -6711,7 +6887,7 @@ + BZIP_DIR=$PHP_BZ2 + else + echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6 -+echo "configure:27540: checking for BZip2 in default path" >&5 ++echo "configure:27862: 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 @@ -6744,6 +6920,18 @@ + save_ext_shared=$ext_shared + ext_shared=yes +- +- 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 ctype.c; do + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) @@ -6751,7 +6939,13 @@ + LDFLAGS="$LDFLAGS -pthread" + else + -+ + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" @@ -6760,36 +6954,25 @@ + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi -- 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 ctype.c; do +- 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 + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS ++ + case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else - -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- ++ + + case $ac_ii in + c|c_r|pthread*) ;; @@ -6850,7 +7033,7 @@ + done + + echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6 -+echo "configure:27653: checking for BZ2_bzerror in -lbz2" >&5 ++echo "configure:27975: 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 @@ -6858,7 +7041,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lbz2 $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:27994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -7072,10 +7255,16 @@ + + 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" ;; -@@ -27501,18 +27885,18 @@ EOF ++ 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<> confdefs.h <&6 --echo "configure:27753: checking for cURL support" >&5 +-echo "configure:28068: checking for cURL support" >&5 -# Check whether --with-curl or --without-curl was given. -if test "${with_curl+set}" = set; then - withval="$with_curl" - PHP_CURL=$withval +echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6 -+echo "configure:28140: checking whether to enable calendar conversion support" >&5 ++echo "configure:28462: 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" @@ -7316,7 +7505,7 @@ fi -@@ -27765,12 +28152,12 @@ fi +@@ -28080,12 +28474,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -7332,7 +7521,7 @@ ;; no) ext_output=no -@@ -27789,572 +28176,796 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -28104,572 +28498,796 @@ echo "$ac_t""$ext_output" 1>&6 @@ -7340,21 +7529,21 @@ + cat >> confdefs.h <<\EOF +#define HAVE_CALENDAR 1 +EOF -+ + +-php_with_curlwrappers=no + + ext_builddir=ext/calendar + ext_srcdir=$abs_srcdir/ext/calendar --php_with_curlwrappers=no -+ ac_extra= - -echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6 --echo "configure:27797: checking if we should use cURL for url streams" >&5 +-echo "configure:28112: 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" - PHP_CURLWRAPPERS=$withval -else ++ ac_extra= ++ + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_CALENDAR_SHARED=no + @@ -7413,7 +7602,7 @@ + fi else - echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6 --echo "configure:27821: checking for cURL in default path" >&5 +-echo "configure:28136: 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 @@ -7422,6 +7611,12 @@ - fi - done - fi +- +- if test -z "$CURL_DIR"; then +- echo "$ac_t""not found" 1>&6 +- { echo "configure: error: Please reinstall the libcurl distribution - +- easy.h should be in /include/curl/" 1>&2; exit 1; } +- fi + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then + PHP_CALENDAR_SHARED=yes + @@ -7433,11 +7628,9 @@ + + -- if test -z "$CURL_DIR"; then -- echo "$ac_t""not found" 1>&6 -- { echo "configure: error: Please reinstall the libcurl distribution - -- easy.h should be in /include/curl/" 1>&2; exit 1; } -- fi +- CURL_CONFIG="curl-config" +- echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6 +-echo "configure:28154: checking for cURL 7.10.5 or greater" >&5 + b_c_pre=$shared_c_pre + b_cxx_pre=$shared_cxx_pre + b_c_meta=$shared_c_meta @@ -7446,10 +7639,6 @@ + b_cxx_post=$shared_cxx_post + b_lo=$shared_lo -- CURL_CONFIG="curl-config" -- echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6 --echo "configure:27839: 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 - else @@ -7457,16 +7646,7 @@ - CURL_CONFIG=${CURL_DIR}/curl-config - fi - fi -+ old_IFS=$IFS -+ for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ shared_objects_calendar="$shared_objects_calendar $ac_bdir$ac_obj.lo" - +- - curl_version_full=`$CURL_CONFIG --version` - curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test "$curl_version" -ge 7010005; then @@ -7475,18 +7655,28 @@ - else - { echo "configure: error: cURL version 7.10.5 or later is required to compile php with cURL support" 1>&2; exit 1; } - fi + ++ old_IFS=$IFS ++ for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do + +- if test "$CURL_DIR/include" != "/usr/include"; then +- +- if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then +- ai_p=$CURL_DIR/include ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ shared_objects_calendar="$shared_objects_calendar $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 - -- -- if test "$CURL_DIR/include" != "/usr/include"; then -- -- if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$CURL_DIR/include ++ + cat >>Makefile.objects<&6 -+echo "configure:28484: checking whether to enable ctype functions" >&5 ++echo "configure:28806: 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" @@ -7867,7 +8057,7 @@ +else - echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 --echo "configure:28077: checking for SSL support in libcurl" >&5 +-echo "configure:28392: 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 @@ -7882,11 +8072,11 @@ - CFLAGS="`$CURL_CONFIG --cflags`" - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:28090: checking how to run the C preprocessor" >&5 +-echo "configure:28405: 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 + 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 @@ -7897,13 +8087,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:28111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:28426: \"$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 - : @@ -7914,13 +8104,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:28128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:28443: \"$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 - : @@ -7931,52 +8121,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < -Syntax Error --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:28145: \"$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 - -- echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 --echo "configure:28170: checking for openssl support in libcurl" >&5 -- if test "$cross_compiling" = yes; then -- -- echo "$ac_t""no" 1>&6 -- --else -- cat > conftest.$ac_ext < - --int main(int argc, char *argv[]) --{ -- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); ++ ++ ++ +ext_output="yes, shared" +ext_shared=yes +case $PHP_CTYPE in @@ -7995,16 +8146,8 @@ + ext_shared=no + ;; +esac - -- if (data && data->ssl_version && *data->ssl_version) { -- const char *ptr = data->ssl_version; - -- while(*ptr == ' ') ++ptr; -- return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1); -- } -- return 1; --} -- ++ ++ + +echo "$ac_t""$ext_output" 1>&6 + @@ -8015,72 +8158,49 @@ + cat >> confdefs.h <<\EOF +#define HAVE_CTYPE 1 EOF --if { (eval echo configure:28196: \"$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 -- for ac_hdr in openssl/crypto.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:28204: 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 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:28214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:28460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" +- : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" +- CPP=/lib/cpp -fi -rm -f conftest* -fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <> confdefs.h <<\EOF --#define HAVE_CURL_OPENSSL 1 --EOF -+ ext_builddir=ext/ctype -+ ext_srcdir=$abs_srcdir/ext/ctype - -- +-rm -f conftest* +-fi +-rm -f conftest* +- ac_cv_prog_CPP="$CPP" +-fi +- CPP="$ac_cv_prog_CPP" -else -- echo "$ac_t""no" 1>&6 +- ac_cv_prog_CPP="$CPP" -fi --done -+ ac_extra= +-echo "$ac_t""$CPP" 1>&6 +- echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 +-echo "configure:28485: checking for openssl support in libcurl" >&5 +- if test "$cross_compiling" = yes; then + +- echo "$ac_t""no" 1>&6 ++ ext_builddir=ext/ctype ++ ext_srcdir=$abs_srcdir/ext/ctype ++ ++ ac_extra= ++ + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_CTYPE_SHARED=no -else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* - -- echo "$ac_t""no" 1>&6 -- --fi --rm -fr conftest* --fi +- cat > conftest.$ac_ext <&6 --echo "configure:28259: checking for gnutls support in libcurl" >&5 -- if test "$cross_compiling" = yes; then +-#include + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta @@ -8100,17 +8217,16 @@ + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo -+ -+ + +-int main(int argc, char *argv[]) +-{ +- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); + +- if (data && data->ssl_version && *data->ssl_version) { +- const char *ptr = data->ssl_version; + old_IFS=$IFS + for ac_src in ctype.c; do - -- echo "$ac_t""no" 1>&6 -- --else -- cat > conftest.$ac_ext < +- while(*ptr == ' ') ++ptr; +- return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1); +- } +- return 1; +-} +- + 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 - --int main(int argc, char *argv[]) --{ -- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); ++ + cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then + done + + @@ -8149,16 +8269,43 @@ + /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac -+ -- if (data && data->ssl_version && *data->ssl_version) { -- const char *ptr = data->ssl_version; - -- while(*ptr == ' ') ++ptr; -- return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1); -- } -- return 1; --} +- echo "$ac_t""yes" 1>&6 +- for ac_hdr in openssl/crypto.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:28519: 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 +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:28529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then +- +- cat >> confdefs.h <<\EOF +-#define HAVE_CURL_OPENSSL 1 + done + + case $host_alias in @@ -8218,18 +8366,7 @@ + else + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpctype.$suffix" + fi - -- echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 --echo "configure:28291: checking for gcrypt.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 < ++ + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype" + + cat >>Makefile.objects<&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" + +- -else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* +- echo "$ac_t""no" 1>&6 -fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+ +-done + ;; + *) + + install_modules="install-modules" -+ + +- +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* + case $host_alias in + *aix*) + suffix=so @@ -8284,10 +8414,17 @@ + PHP_MODULES="$PHP_MODULES \$(phplibdir)/ctype.$suffix" + fi -- cat >> confdefs.h <<\EOF --#define HAVE_CURL_GNUTLS 1 +- echo "$ac_t""no" 1>&6 +- +-fi +-rm -fr conftest* +-fi + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype" -+ + +- +- echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 +-echo "configure:28574: checking for gnutls support in libcurl" >&5 +- if test "$cross_compiling" = yes; then + cat >>Makefile.objects<> confdefs.h <&6 +- +-else +- cat > conftest.$ac_ext < + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta @@ -8327,32 +8471,41 @@ + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo -+ + +-int main(int argc, char *argv[]) +-{ +- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); + + old_IFS=$IFS + for ac_src in ctype.c; do -+ + +- if (data && data->ssl_version && *data->ssl_version) { +- const char *ptr = data->ssl_version; + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS - --else -- echo "$ac_t""no" 1>&6 --fi ++ + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ + +- while(*ptr == ' ') ++ptr; +- return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1); +- } +- return 1; +-} + 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<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then + done + + @@ -8360,13 +8513,45 @@ + ;; + *) + -+ + +- echo "$ac_t""yes" 1>&6 +- ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 +-echo "configure:28606: checking for gcrypt.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 +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:28616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 + case ext/ctype in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac -+ + +- cat >> confdefs.h <<\EOF +-#define HAVE_CURL_GNUTLS 1 +-EOF + + + b_c_pre=$php_c_pre @@ -8377,7 +8562,7 @@ + b_cxx_post=$php_cxx_post + b_lo=$php_lo + -+ + + old_IFS=$IFS + for ac_src in ctype.c; do + @@ -8385,7 +8570,10 @@ + set $ac_src + ac_obj=$1 + IFS=$old_IFS -+ + +-else +- echo "$ac_t""no" 1>&6 +-fi + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" + + case $ac_src in @@ -8410,8 +8598,8 @@ + + BUILD_DIR="$BUILD_DIR $ext_builddir" + -+ ++ + if test "$ext_builddir" = "."; then + PHP_PECL_EXTENSION=ctype @@ -8426,7 +8614,7 @@ +php_with_curl=no + +echo $ac_n "checking for cURL support""... $ac_c" 1>&6 -+echo "configure:28828: checking for cURL support" >&5 ++echo "configure:29150: checking for cURL support" >&5 +# Check whether --with-curl or --without-curl was given. +if test "${with_curl+set}" = set; then + withval="$with_curl" @@ -8476,7 +8664,7 @@ +php_with_curlwrappers=no + +echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6 -+echo "configure:28872: checking if we should use cURL for url streams" >&5 ++echo "configure:29194: 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" @@ -8503,7 +8691,7 @@ else - echo "$ac_t""no" 1>&6 + echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6 -+echo "configure:28896: checking for cURL in default path" >&5 ++echo "configure:29218: 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 @@ -8521,7 +8709,7 @@ + + CURL_CONFIG="curl-config" + echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6 -+echo "configure:28914: checking for cURL 7.10.5 or greater" >&5 ++echo "configure:29236: 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 @@ -8588,7 +8776,7 @@ else -@@ -28376,7 +28987,7 @@ fi +@@ -28691,7 +29309,7 @@ fi c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then @@ -8597,7 +8785,7 @@ else -@@ -28411,8 +29022,8 @@ fi +@@ -28726,8 +29344,8 @@ fi if test "$ext_shared" = "yes"; then @@ -8608,12 +8796,12 @@ else -@@ -28438,44 +29049,508 @@ fi +@@ -28753,27 +29371,491 @@ fi esac done - echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6 --echo "configure:28443: checking for curl_easy_perform in -lcurl" >&5 +-echo "configure:28758: 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 @@ -8621,36 +8809,17 @@ - ac_save_LIBS="$LIBS" -LIBS="-lcurl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -+ + if test "$ext_shared" = "yes"; then + CURL_SHARED_LIBADD="-lcurl $CURL_SHARED_LIBADD" + if test -n "$CURL_DIR/$PHP_LIBDIR"; then @@ -8748,7 +8917,7 @@ + + + echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 -+echo "configure:29152: checking for SSL support in libcurl" >&5 ++echo "configure:29474: 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 @@ -8761,7 +8930,7 @@ + CFLAGS="`$CURL_CONFIG --cflags`" + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:29165: checking how to run the C preprocessor" >&5 ++echo "configure:29487: checking how to run the C preprocessor" >&5 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= @@ -8776,13 +8945,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:29186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29508: \"$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 + : @@ -8793,13 +8962,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:29203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29525: \"$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 + : @@ -8810,13 +8979,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:29220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29542: \"$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 + : @@ -8841,14 +9010,14 @@ +echo "$ac_t""$CPP" 1>&6 + + echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 -+echo "configure:29245: checking for openssl support in libcurl" >&5 ++echo "configure:29567: checking for openssl support in libcurl" >&5 + if test "$cross_compiling" = yes; then + + echo "$ac_t""no" 1>&6 + +else + cat > conftest.$ac_ext < @@ -8867,7 +9036,7 @@ +} + +EOF -+if { (eval echo configure:29271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:29593: \"$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 @@ -8875,17 +9044,17 @@ +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:29279: checking for $ac_hdr" >&5 ++echo "configure:29601: 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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:29289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29611: \"$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* @@ -8930,14 +9099,14 @@ + + + echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 -+echo "configure:29334: checking for gnutls support in libcurl" >&5 ++echo "configure:29656: checking for gnutls support in libcurl" >&5 + if test "$cross_compiling" = yes; then + + echo "$ac_t""no" 1>&6 + +else + cat > conftest.$ac_ext < @@ -8956,23 +9125,23 @@ +} + +EOF -+if { (eval echo configure:29360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:29682: \"$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 + ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 -+echo "configure:29366: checking for gcrypt.h" >&5 ++echo "configure:29688: checking for gcrypt.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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:29376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29698: \"$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* @@ -9114,7 +9283,7 @@ + done + + echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6 -+echo "configure:29518: checking for curl_easy_perform in -lcurl" >&5 ++echo "configure:29840: 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 @@ -9122,7 +9291,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&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_CURL 1 -@@ -28594,7 +29669,7 @@ fi + EOF +-if { (eval echo configure:28777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:29859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -28909,7 +29991,7 @@ fi done echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6 --echo "configure:28598: checking for curl_version_info in -lcurl" >&5 -+echo "configure:29673: checking for curl_version_info in -lcurl" >&5 +-echo "configure:28913: checking for curl_version_info in -lcurl" >&5 ++echo "configure:29995: 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 -@@ -28602,7 +29677,7 @@ else +@@ -28917,7 +29999,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:29692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:28932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:30014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -28747,7 +29822,7 @@ fi +@@ -29062,7 +30144,7 @@ fi done echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6 --echo "configure:28751: checking for curl_easy_strerror in -lcurl" >&5 -+echo "configure:29826: checking for curl_easy_strerror in -lcurl" >&5 +-echo "configure:29066: checking for curl_easy_strerror in -lcurl" >&5 ++echo "configure:30148: 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 -@@ -28755,7 +29830,7 @@ else +@@ -29070,7 +30152,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:29845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:29085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:30167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -28900,7 +29975,7 @@ fi +@@ -29215,7 +30297,7 @@ fi done echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 --echo "configure:28904: checking for curl_multi_strerror in -lcurl" >&5 -+echo "configure:29979: checking for curl_multi_strerror in -lcurl" >&5 +-echo "configure:29219: checking for curl_multi_strerror in -lcurl" >&5 ++echo "configure:30301: 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 -@@ -28908,7 +29983,7 @@ else +@@ -29223,7 +30305,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:29998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:29238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:30320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -29605,7 +30680,7 @@ if test "$PHP_QDBM" != "no"; then +@@ -29920,7 +31002,7 @@ if test "$PHP_QDBM" != "no"; then done echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6 --echo "configure:29609: checking for dpopen in -l$LIB" >&5 -+echo "configure:30684: checking for dpopen in -l$LIB" >&5 +-echo "configure:29924: checking for dpopen in -l$LIB" >&5 ++echo "configure:31006: 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 -@@ -29613,7 +30688,7 @@ else +@@ -29928,7 +31010,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:30703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:29943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:31025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -29793,7 +30868,7 @@ fi +@@ -30108,7 +31190,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:29797: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:30872: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:30112: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31194: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -29821,7 +30896,7 @@ if test "$PHP_GDBM" != "no"; then +@@ -30136,7 +31218,7 @@ if test "$PHP_GDBM" != "no"; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:29825: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:30900: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:30140: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31222: 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 -@@ -29940,7 +31015,7 @@ echo "configure:29825: checking for $THI +@@ -30255,7 +31337,7 @@ echo "configure:30140: checking for $THI done echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 --echo "configure:29944: checking for gdbm_open in -lgdbm" >&5 -+echo "configure:31019: checking for gdbm_open in -lgdbm" >&5 +-echo "configure:30259: checking for gdbm_open in -lgdbm" >&5 ++echo "configure:31341: 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 -@@ -29948,7 +31023,7 @@ else +@@ -30263,7 +31345,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:31038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:30278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:31360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -30124,7 +31199,7 @@ fi +@@ -30439,7 +31521,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:30128: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31203: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:30443: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31525: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -30253,7 +31328,7 @@ if test "$PHP_NDBM" != "no"; then +@@ -30568,7 +31650,7 @@ if test "$PHP_NDBM" != "no"; then done echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6 --echo "configure:30257: checking for dbm_open in -l$LIB" >&5 -+echo "configure:31332: checking for dbm_open in -l$LIB" >&5 +-echo "configure:30572: checking for dbm_open in -l$LIB" >&5 ++echo "configure:31654: 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 -@@ -30261,7 +31336,7 @@ else +@@ -30576,7 +31658,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:31351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:30591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:31673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -30441,7 +31516,7 @@ fi +@@ -30756,7 +31838,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:30445: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31520: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:30760: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31842: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -30529,7 +31604,7 @@ if test "$PHP_DB4" != "no"; then +@@ -30844,7 +31926,7 @@ if test "$PHP_DB4" != "no"; then LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:31619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:30859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:31941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <&6 --echo "configure:30585: checking for DB4 major version" >&5 -+echo "configure:31660: checking for DB4 major version" >&5 +-echo "configure:30900: checking for DB4 major version" >&5 ++echo "configure:31982: 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:30590: checking for DB4 minor version and patch level" >&5 -+echo "configure:31665: checking for DB4 minor version and patch level" >&5 +-echo "configure:30905: checking for DB4 minor version and patch level" >&5 ++echo "configure:31987: checking for DB4 minor version and patch level" >&5 cat > conftest.$ac_ext <&6 --echo "configure:30618: checking if dba can be used as shared extension" >&5 -+echo "configure:31693: checking if dba can be used as shared extension" >&5 +-echo "configure:30933: checking if dba can be used as shared extension" >&5 ++echo "configure:32015: checking if dba can be used as shared extension" >&5 cat > conftest.$ac_ext <&6 --echo "configure:30777: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31852: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:31092: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32174: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -30801,7 +31876,7 @@ if test "$PHP_DB3" != "no"; then +@@ -31116,7 +32198,7 @@ if test "$PHP_DB3" != "no"; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:30805: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31880: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:31120: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32202: 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 -@@ -30852,7 +31927,7 @@ echo "configure:30805: checking for $THI +@@ -31167,7 +32249,7 @@ echo "configure:31120: checking for $THI LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:31942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:31182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:32264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <&6 --echo "configure:30908: checking for DB3 major version" >&5 -+echo "configure:31983: checking for DB3 major version" >&5 +-echo "configure:31223: checking for DB3 major version" >&5 ++echo "configure:32305: 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:30913: checking for DB4 minor version and patch level" >&5 -+echo "configure:31988: checking for DB4 minor version and patch level" >&5 +-echo "configure:31228: checking for DB4 minor version and patch level" >&5 ++echo "configure:32310: checking for DB4 minor version and patch level" >&5 cat > conftest.$ac_ext <&6 --echo "configure:30941: checking if dba can be used as shared extension" >&5 -+echo "configure:32016: checking if dba can be used as shared extension" >&5 +-echo "configure:31256: checking if dba can be used as shared extension" >&5 ++echo "configure:32338: checking if dba can be used as shared extension" >&5 cat > conftest.$ac_ext <&6 --echo "configure:31100: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32175: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:31415: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32497: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -31124,7 +32199,7 @@ if test "$PHP_DB2" != "no"; then +@@ -31439,7 +32521,7 @@ if test "$PHP_DB2" != "no"; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:31128: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32203: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:31443: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32525: 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 -@@ -31175,7 +32250,7 @@ echo "configure:31128: checking for $THI +@@ -31490,7 +32572,7 @@ echo "configure:31443: checking for $THI LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:32265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:31505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:32587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat > conftest.$ac_ext <&6 --echo "configure:31231: checking for DB2 major version" >&5 -+echo "configure:32306: checking for DB2 major version" >&5 +-echo "configure:31546: checking for DB2 major version" >&5 ++echo "configure:32628: 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:31236: checking for DB4 minor version and patch level" >&5 -+echo "configure:32311: checking for DB4 minor version and patch level" >&5 +-echo "configure:31551: checking for DB4 minor version and patch level" >&5 ++echo "configure:32633: checking for DB4 minor version and patch level" >&5 cat > conftest.$ac_ext <&6 --echo "configure:31264: checking if dba can be used as shared extension" >&5 -+echo "configure:32339: checking if dba can be used as shared extension" >&5 +-echo "configure:31579: checking if dba can be used as shared extension" >&5 ++echo "configure:32661: checking if dba can be used as shared extension" >&5 cat > conftest.$ac_ext <&6 --echo "configure:31423: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32498: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:31738: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32820: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -31439,7 +32514,7 @@ if test "$PHP_DB1" != "no"; then +@@ -31754,7 +32836,7 @@ if test "$PHP_DB1" != "no"; 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:31443: checking for DB1 in library" >&5 -+echo "configure:32518: checking for DB1 in library" >&5 +-echo "configure:31758: checking for DB1 in library" >&5 ++echo "configure:32840: checking for DB1 in library" >&5 if test "$HAVE_DB4" = "1"; then THIS_VERSION=4 THIS_LIBS=$DB4_LIBS -@@ -31487,7 +32562,7 @@ EOF +@@ -31802,7 +32884,7 @@ EOF fi echo "$ac_t""$THIS_LIBS" 1>&6 echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6 --echo "configure:31491: checking for DB1 in header" >&5 -+echo "configure:32566: checking for DB1 in header" >&5 +-echo "configure:31806: checking for DB1 in header" >&5 ++echo "configure:32888: checking for DB1 in header" >&5 echo "$ac_t""$THIS_INCLUDE" 1>&6 if test -n "$THIS_INCLUDE"; then -@@ -31497,7 +32572,7 @@ echo "configure:31491: checking for DB1 +@@ -31812,7 +32894,7 @@ echo "configure:31806: checking for DB1 LIBS="-l$THIS_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:32587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:31827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:32909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <&6 --echo "configure:31662: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32737: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:31977: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33059: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -31686,7 +32761,7 @@ if test "$PHP_DBM" != "no"; then +@@ -32001,7 +33083,7 @@ if test "$PHP_DBM" != "no"; then THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:31690: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32765: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:32005: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33087: 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 -@@ -31810,7 +32885,7 @@ echo "configure:31690: checking for $THI +@@ -32125,7 +33207,7 @@ echo "configure:32005: checking for $THI done echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6 --echo "configure:31814: checking for dbminit in -l$LIB" >&5 -+echo "configure:32889: checking for dbminit in -l$LIB" >&5 +-echo "configure:32129: checking for dbminit in -l$LIB" >&5 ++echo "configure:33211: 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 -@@ -31818,7 +32893,7 @@ else +@@ -32133,7 +33215,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:32908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:32148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:33230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -31849,7 +32924,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -32164,7 +33246,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l ext_shared=$save_ext_shared echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6 --echo "configure:31853: checking for DBM using GDBM" >&5 -+echo "configure:32928: checking for DBM using GDBM" >&5 +-echo "configure:32168: checking for DBM using GDBM" >&5 ++echo "configure:33250: checking for DBM using GDBM" >&5 cat >> confdefs.h <&6 --echo "configure:32017: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33092: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:32332: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33414: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -32225,7 +33300,7 @@ elif test "$PHP_CDB" != "no"; then +@@ -32540,7 +33622,7 @@ elif test "$PHP_CDB" != "no"; then done echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6 --echo "configure:32229: checking for cdb_read in -l$LIB" >&5 -+echo "configure:33304: checking for cdb_read in -l$LIB" >&5 +-echo "configure:32544: checking for cdb_read in -l$LIB" >&5 ++echo "configure:33626: 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 -@@ -32233,7 +33308,7 @@ else +@@ -32548,7 +33630,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:33323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:32563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:33645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -32413,7 +33488,7 @@ fi +@@ -32728,7 +33810,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:32417: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33492: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:32732: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33814: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -32444,7 +33519,7 @@ fi +@@ -32759,7 +33841,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:32448: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33523: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:32763: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33845: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -32475,7 +33550,7 @@ fi +@@ -32790,7 +33872,7 @@ fi THIS_FULL_NAME="$THIS_NAME" fi echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:32479: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33554: checking for $THIS_FULL_NAME support" >&5 +-echo "configure:32794: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33876: checking for $THIS_FULL_NAME support" >&5 if test -n ""; then { echo "configure: error: " 1>&2; exit 1; } fi -@@ -32490,7 +33565,7 @@ echo "configure:32479: checking for $THI +@@ -32805,7 +33887,7 @@ echo "configure:32794: checking for $THI echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6 --echo "configure:32494: checking whether to enable DBA interface" >&5 -+echo "configure:33569: checking whether to enable DBA interface" >&5 +-echo "configure:32809: checking whether to enable DBA interface" >&5 ++echo "configure:33891: checking whether to enable DBA interface" >&5 if test "$HAVE_DBA" = "1"; then if test "$ext_shared" = "yes"; then echo "$ac_t""yes, shared" 1>&6 -@@ -32817,18 +33892,18 @@ fi +@@ -33132,18 +34214,18 @@ fi @@ -9726,13 +9879,13 @@ +php_enable_dio=no -echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6 --echo "configure:32824: checking whether to enable DOM support" >&5 +-echo "configure:33139: 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" - PHP_DOM=$enableval +echo $ac_n "checking whether to enable direct I/O support""... $ac_c" 1>&6 -+echo "configure:33899: checking whether to enable direct I/O support" >&5 ++echo "configure:34221: checking whether to enable direct I/O support" >&5 +# Check whether --enable-dio or --disable-dio was given. +if test "${enable_dio+set}" = set; then + enableval="$enable_dio" @@ -9746,7 +9899,7 @@ fi -@@ -32836,12 +33911,12 @@ fi +@@ -33151,12 +34233,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -9762,7 +9915,7 @@ ;; no) ext_output=no -@@ -32860,28 +33935,368 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -33175,30 +34257,370 @@ echo "$ac_t""$ext_output" 1>&6 @@ -9774,7 +9927,7 @@ + ext_srcdir=$abs_srcdir/ext/dio -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:32869: checking libxml2 install dir" >&5 +-echo "configure:33184: 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" @@ -9797,11 +9950,6 @@ -fi - -- --ext_output=$PHP_LIBXML_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta @@ -9809,8 +9957,10 @@ + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo -+ -+ + +-ext_output=$PHP_LIBXML_DIR +-echo "$ac_t""$ext_output" 1>&6 + + old_IFS=$IFS + for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do + @@ -10083,7 +10233,7 @@ +php_enable_dom=yes + +echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6 -+echo "configure:34239: checking whether to enable DOM support" >&5 ++echo "configure:34561: 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" @@ -10128,7 +10278,7 @@ +php_with_libxml_dir=no + +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:34284: checking libxml2 install dir" >&5 ++echo "configure:34606: 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" @@ -10143,1728 +10293,1743 @@ + +ext_output=$PHP_LIBXML_DIR +echo "$ac_t""$ext_output" 1>&6 + + +-fi + -+ ++fi - fi + if test "$PHP_DOM" != "no"; then -@@ -32893,7 +34308,7 @@ if test "$PHP_DOM" != "no"; then +@@ -33208,7 +34630,7 @@ if test "$PHP_DOM" != "no"; then echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:32897: checking for xml2-config path" >&5 -+echo "configure:34312: checking for xml2-config path" >&5 +-echo "configure:33212: checking for xml2-config path" >&5 ++echo "configure:34634: 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 -@@ -33051,7 +34466,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -33366,7 +34788,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:33055: checking whether libxml build works" >&5 -+echo "configure:34470: checking whether libxml build works" >&5 +-echo "configure:33370: checking whether libxml build works" >&5 ++echo "configure:34792: 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 -@@ -33067,7 +34482,7 @@ else +@@ -33382,7 +34804,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:34497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:33397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:34819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -33501,7 +34916,7 @@ fi +@@ -33816,7 +35238,7 @@ fi php_with_enchant=no echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6 --echo "configure:33505: checking for ENCHANT support" >&5 -+echo "configure:34920: checking for ENCHANT support" >&5 +-echo "configure:33820: checking for ENCHANT support" >&5 ++echo "configure:35242: checking for ENCHANT support" >&5 # Check whether --with-enchant or --without-enchant was given. if test "${with_enchant+set}" = set; then withval="$with_enchant" -@@ -34086,7 +35501,7 @@ EOF +@@ -34401,7 +35823,7 @@ EOF done echo $ac_n "checking for enchant_broker_set_param in -lenchant""... $ac_c" 1>&6 --echo "configure:34090: checking for enchant_broker_set_param in -lenchant" >&5 -+echo "configure:35505: checking for enchant_broker_set_param in -lenchant" >&5 +-echo "configure:34405: checking for enchant_broker_set_param in -lenchant" >&5 ++echo "configure:35827: checking for enchant_broker_set_param in -lenchant" >&5 ac_lib_var=`echo enchant'_'enchant_broker_set_param | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -34094,7 +35509,7 @@ else +@@ -34409,7 +35831,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lenchant $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:35524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:34424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:35846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -34152,7 +35567,7 @@ fi +@@ -34467,7 +35889,7 @@ fi php_enable_exif=no echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6 --echo "configure:34156: checking whether to enable EXIF (metadata from images) support" >&5 -+echo "configure:35571: checking whether to enable EXIF (metadata from images) support" >&5 +-echo "configure:34471: checking whether to enable EXIF (metadata from images) support" >&5 ++echo "configure:35893: 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" -@@ -34496,7 +35911,7 @@ fi +@@ -34811,7 +36233,7 @@ fi php_enable_fileinfo=yes echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6 --echo "configure:34500: checking for fileinfo support" >&5 -+echo "configure:35915: checking for fileinfo support" >&5 +-echo "configure:34815: checking for fileinfo support" >&5 ++echo "configure:36237: checking for fileinfo support" >&5 # Check whether --enable-fileinfo or --disable-fileinfo was given. if test "${enable_fileinfo+set}" = set; then enableval="$enable_fileinfo" -@@ -34846,12 +36261,12 @@ EOF +@@ -35161,12 +36583,12 @@ EOF for ac_func in utimes strndup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:34850: checking for $ac_func" >&5 -+echo "configure:36265: checking for $ac_func" >&5 +-echo "configure:35165: checking for $ac_func" >&5 ++echo "configure:36587: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:36293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:35193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:36615: \"$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 -@@ -34912,7 +36327,7 @@ fi +@@ -35227,7 +36649,7 @@ fi php_enable_filter=yes echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6 --echo "configure:34916: checking whether to enable input filter support" >&5 -+echo "configure:36331: checking whether to enable input filter support" >&5 +-echo "configure:35231: checking whether to enable input filter support" >&5 ++echo "configure:36653: 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" -@@ -34956,7 +36371,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -35271,7 +36693,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_pcre_dir=no echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 --echo "configure:34960: checking pcre install prefix" >&5 -+echo "configure:36375: checking pcre install prefix" >&5 +-echo "configure:35275: checking pcre install prefix" >&5 ++echo "configure:36697: 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" -@@ -34983,7 +36398,7 @@ if test "$PHP_FILTER" != "no"; then +@@ -35298,7 +36720,7 @@ if test "$PHP_FILTER" != "no"; then old_CPPFLAGS=$CPPFLAGS CPPFLAGS=$INCLUDES cat > conftest.$ac_ext < -@@ -35002,7 +36417,7 @@ else +@@ -35317,7 +36739,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < -@@ -35372,7 +36787,7 @@ fi +@@ -35687,7 +37109,7 @@ fi php_enable_ftp=no echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6 --echo "configure:35376: checking whether to enable FTP support" >&5 -+echo "configure:36791: checking whether to enable FTP support" >&5 +-echo "configure:35691: checking whether to enable FTP support" >&5 ++echo "configure:37113: 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" -@@ -35416,7 +36831,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -35731,7 +37153,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_openssl_dir=no echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6 --echo "configure:35420: checking OpenSSL dir for FTP" >&5 -+echo "configure:36835: checking OpenSSL dir for FTP" >&5 +-echo "configure:35735: checking OpenSSL dir for FTP" >&5 ++echo "configure:37157: 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" -@@ -35754,7 +37169,7 @@ EOF +@@ -36069,7 +37491,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:35758: checking for $ac_word" >&5 -+echo "configure:37173: checking for $ac_word" >&5 +-echo "configure:36073: checking for $ac_word" >&5 ++echo "configure:37495: 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 -@@ -35959,9 +37374,9 @@ fi +@@ -36274,9 +37696,9 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 --echo "configure:35963: checking for OpenSSL version" >&5 -+echo "configure:37378: checking for OpenSSL version" >&5 +-echo "configure:36278: checking for OpenSSL version" >&5 ++echo "configure:37700: checking for OpenSSL version" >&5 cat > conftest.$ac_ext < -@@ -36116,7 +37531,7 @@ rm -f conftest* +@@ -36431,7 +37853,7 @@ rm -f conftest* done echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 --echo "configure:36120: checking for CRYPTO_free in -lcrypto" >&5 -+echo "configure:37535: checking for CRYPTO_free in -lcrypto" >&5 +-echo "configure:36435: checking for CRYPTO_free in -lcrypto" >&5 ++echo "configure:37857: 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 -@@ -36124,7 +37539,7 @@ else +@@ -36439,7 +37861,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:37554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:36454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:37876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -36292,7 +37707,7 @@ fi +@@ -36607,7 +38029,7 @@ fi done echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 --echo "configure:36296: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -+echo "configure:37711: checking for SSL_CTX_set_ssl_version in -lssl" >&5 +-echo "configure:36611: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++echo "configure:38033: 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 -@@ -36300,7 +37715,7 @@ else +@@ -36615,7 +38037,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:37730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:36630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:38052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -36453,7 +37868,7 @@ fi +@@ -36768,7 +38190,7 @@ fi php_with_gd=no echo $ac_n "checking for GD support""... $ac_c" 1>&6 --echo "configure:36457: checking for GD support" >&5 -+echo "configure:37872: checking for GD support" >&5 +-echo "configure:36772: checking for GD support" >&5 ++echo "configure:38194: checking for GD support" >&5 # Check whether --with-gd or --without-gd was given. if test "${with_gd+set}" = set; then withval="$with_gd" -@@ -36498,7 +37913,7 @@ if test -z "$PHP_JPEG_DIR"; then +@@ -36813,7 +38235,7 @@ if test -z "$PHP_JPEG_DIR"; then php_with_jpeg_dir=no echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6 --echo "configure:36502: checking for the location of libjpeg" >&5 -+echo "configure:37917: checking for the location of libjpeg" >&5 +-echo "configure:36817: checking for the location of libjpeg" >&5 ++echo "configure:38239: 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" -@@ -36523,7 +37938,7 @@ if test -z "$PHP_PNG_DIR"; then +@@ -36838,7 +38260,7 @@ if test -z "$PHP_PNG_DIR"; then php_with_png_dir=no echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6 --echo "configure:36527: checking for the location of libpng" >&5 -+echo "configure:37942: checking for the location of libpng" >&5 +-echo "configure:36842: checking for the location of libpng" >&5 ++echo "configure:38264: 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" -@@ -36548,7 +37963,7 @@ if test -z "$PHP_ZLIB_DIR"; then +@@ -36863,7 +38285,7 @@ if test -z "$PHP_ZLIB_DIR"; then php_with_zlib_dir=no echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 --echo "configure:36552: checking for the location of libz" >&5 -+echo "configure:37967: checking for the location of libz" >&5 +-echo "configure:36867: checking for the location of libz" >&5 ++echo "configure:38289: 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" -@@ -36572,7 +37987,7 @@ fi +@@ -36887,7 +38309,7 @@ fi php_with_xpm_dir=no echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6 --echo "configure:36576: checking for the location of libXpm" >&5 -+echo "configure:37991: checking for the location of libXpm" >&5 +-echo "configure:36891: checking for the location of libXpm" >&5 ++echo "configure:38313: 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" -@@ -36595,7 +38010,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -36910,7 +38332,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_freetype_dir=no echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6 --echo "configure:36599: checking for FreeType 2" >&5 -+echo "configure:38014: checking for FreeType 2" >&5 +-echo "configure:36914: checking for FreeType 2" >&5 ++echo "configure:38336: 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" -@@ -36618,7 +38033,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -36933,7 +38355,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_t1lib=no echo $ac_n "checking for T1lib support""... $ac_c" 1>&6 --echo "configure:36622: checking for T1lib support" >&5 -+echo "configure:38037: checking for T1lib support" >&5 +-echo "configure:36937: checking for T1lib support" >&5 ++echo "configure:38359: checking for T1lib support" >&5 # Check whether --with-t1lib or --without-t1lib was given. if test "${with_t1lib+set}" = set; then withval="$with_t1lib" -@@ -36641,7 +38056,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -36956,7 +38378,7 @@ echo "$ac_t""$ext_output" 1>&6 php_enable_gd_native_ttf=no echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6 --echo "configure:36645: checking whether to enable truetype string function in GD" >&5 -+echo "configure:38060: checking whether to enable truetype string function in GD" >&5 +-echo "configure:36960: checking whether to enable truetype string function in GD" >&5 ++echo "configure:38382: 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" -@@ -36664,7 +38079,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -36979,7 +38401,7 @@ echo "$ac_t""$ext_output" 1>&6 php_enable_gd_jis_conv=no echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6 --echo "configure:36668: checking whether to enable JIS-mapped Japanese font support in GD" >&5 -+echo "configure:38083: checking whether to enable JIS-mapped Japanese font support in GD" >&5 +-echo "configure:36983: checking whether to enable JIS-mapped Japanese font support in GD" >&5 ++echo "configure:38405: 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" -@@ -36716,12 +38131,12 @@ if test "$PHP_GD" = "yes"; then +@@ -37031,12 +38453,12 @@ if test "$PHP_GD" = "yes"; then for ac_func in fabsf floorf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:36720: checking for $ac_func" >&5 -+echo "configure:38135: checking for $ac_func" >&5 +-echo "configure:37035: checking for $ac_func" >&5 ++echo "configure:38457: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:38163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:37063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:38485: \"$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 -@@ -36916,7 +38331,7 @@ EOF +@@ -37231,7 +38653,7 @@ EOF done echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 --echo "configure:36920: checking for jpeg_read_header in -ljpeg" >&5 -+echo "configure:38335: checking for jpeg_read_header in -ljpeg" >&5 +-echo "configure:37235: checking for jpeg_read_header in -ljpeg" >&5 ++echo "configure:38657: 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 -@@ -36924,7 +38339,7 @@ else +@@ -37239,7 +38661,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:38354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:37254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:38676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -37213,7 +38628,7 @@ fi +@@ -37528,7 +38950,7 @@ fi done echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 --echo "configure:37217: checking for png_write_image in -lpng" >&5 -+echo "configure:38632: checking for png_write_image in -lpng" >&5 +-echo "configure:37532: checking for png_write_image in -lpng" >&5 ++echo "configure:38954: 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 -@@ -37221,7 +38636,7 @@ else +@@ -37536,7 +38958,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:38651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:37551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:38973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -37612,7 +39027,7 @@ fi +@@ -37927,7 +39349,7 @@ fi done echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 --echo "configure:37616: checking for XpmFreeXpmImage in -lXpm" >&5 -+echo "configure:39031: checking for XpmFreeXpmImage in -lXpm" >&5 +-echo "configure:37931: checking for XpmFreeXpmImage in -lXpm" >&5 ++echo "configure:39353: 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 -@@ -37620,7 +39035,7 @@ else +@@ -37935,7 +39357,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:39050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:37950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:39372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -38006,7 +39421,7 @@ fi +@@ -38321,7 +39743,7 @@ fi done echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6 --echo "configure:38010: checking for FT_New_Face in -lfreetype" >&5 -+echo "configure:39425: checking for FT_New_Face in -lfreetype" >&5 +-echo "configure:38325: checking for FT_New_Face in -lfreetype" >&5 ++echo "configure:39747: checking for FT_New_Face in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -38014,7 +39429,7 @@ else +@@ -38329,7 +39751,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfreetype $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:39444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:38344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:39766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -38342,7 +39757,7 @@ fi +@@ -38657,7 +40079,7 @@ fi done echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 --echo "configure:38346: checking for T1_StrError in -lt1" >&5 -+echo "configure:39761: checking for T1_StrError in -lt1" >&5 +-echo "configure:38661: checking for T1_StrError in -lt1" >&5 ++echo "configure:40083: 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 -@@ -38350,7 +39765,7 @@ else +@@ -38665,7 +40087,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lt1 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:39780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:38680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:40102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -38804,7 +40219,7 @@ EOF +@@ -39119,7 +40541,7 @@ EOF done echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 --echo "configure:38808: checking for jpeg_read_header in -ljpeg" >&5 -+echo "configure:40223: checking for jpeg_read_header in -ljpeg" >&5 +-echo "configure:39123: checking for jpeg_read_header in -ljpeg" >&5 ++echo "configure:40545: 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 -@@ -38812,7 +40227,7 @@ else +@@ -39127,7 +40549,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:40242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:39142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:40564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -39101,7 +40516,7 @@ fi +@@ -39416,7 +40838,7 @@ fi done echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 --echo "configure:39105: checking for png_write_image in -lpng" >&5 -+echo "configure:40520: checking for png_write_image in -lpng" >&5 +-echo "configure:39420: checking for png_write_image in -lpng" >&5 ++echo "configure:40842: 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 -@@ -39109,7 +40524,7 @@ else +@@ -39424,7 +40846,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:40539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:39439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:40861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -39500,7 +40915,7 @@ fi +@@ -39815,7 +41237,7 @@ fi done echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 --echo "configure:39504: checking for XpmFreeXpmImage in -lXpm" >&5 -+echo "configure:40919: checking for XpmFreeXpmImage in -lXpm" >&5 +-echo "configure:39819: checking for XpmFreeXpmImage in -lXpm" >&5 ++echo "configure:41241: 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 -@@ -39508,7 +40923,7 @@ else +@@ -39823,7 +41245,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:40938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:39838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:41260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -39894,7 +41309,7 @@ fi +@@ -40209,7 +41631,7 @@ fi done echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6 --echo "configure:39898: checking for FT_New_Face in -lfreetype" >&5 -+echo "configure:41313: checking for FT_New_Face in -lfreetype" >&5 +-echo "configure:40213: checking for FT_New_Face in -lfreetype" >&5 ++echo "configure:41635: checking for FT_New_Face in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -39902,7 +41317,7 @@ else +@@ -40217,7 +41639,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfreetype $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:41332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:40232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:41654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -40230,7 +41645,7 @@ fi +@@ -40545,7 +41967,7 @@ fi done echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 --echo "configure:40234: checking for T1_StrError in -lt1" >&5 -+echo "configure:41649: checking for T1_StrError in -lt1" >&5 +-echo "configure:40549: checking for T1_StrError in -lt1" >&5 ++echo "configure:41971: 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 -@@ -40238,7 +41653,7 @@ else +@@ -40553,7 +41975,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lt1 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:41668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:40568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:41990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -40624,7 +42039,7 @@ EOF +@@ -40939,7 +42361,7 @@ EOF done echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6 --echo "configure:40628: checking for gdImageString16 in -lgd" >&5 -+echo "configure:42043: checking for gdImageString16 in -lgd" >&5 +-echo "configure:40943: checking for gdImageString16 in -lgd" >&5 ++echo "configure:42365: 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 -@@ -40632,7 +42047,7 @@ else +@@ -40947,7 +42369,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:40962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -40772,7 +42187,7 @@ fi +@@ -41087,7 +42509,7 @@ fi done echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6 --echo "configure:40776: checking for gdImagePaletteCopy in -lgd" >&5 -+echo "configure:42191: checking for gdImagePaletteCopy in -lgd" >&5 +-echo "configure:41091: checking for gdImagePaletteCopy in -lgd" >&5 ++echo "configure:42513: 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 -@@ -40780,7 +42195,7 @@ else +@@ -41095,7 +42517,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:41110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -40920,7 +42335,7 @@ fi +@@ -41235,7 +42657,7 @@ fi done echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6 --echo "configure:40924: checking for gdImageCreateFromPng in -lgd" >&5 -+echo "configure:42339: checking for gdImageCreateFromPng in -lgd" >&5 +-echo "configure:41239: checking for gdImageCreateFromPng in -lgd" >&5 ++echo "configure:42661: 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 -@@ -40928,7 +42343,7 @@ else +@@ -41243,7 +42665,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:41258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41068,7 +42483,7 @@ fi +@@ -41383,7 +42805,7 @@ fi done echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6 --echo "configure:41072: checking for gdImageCreateFromGif in -lgd" >&5 -+echo "configure:42487: checking for gdImageCreateFromGif in -lgd" >&5 +-echo "configure:41387: checking for gdImageCreateFromGif in -lgd" >&5 ++echo "configure:42809: 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 -@@ -41076,7 +42491,7 @@ else +@@ -41391,7 +42813,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:41406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41216,7 +42631,7 @@ fi +@@ -41531,7 +42953,7 @@ fi done echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6 --echo "configure:41220: checking for gdImageGif in -lgd" >&5 -+echo "configure:42635: checking for gdImageGif in -lgd" >&5 +-echo "configure:41535: checking for gdImageGif in -lgd" >&5 ++echo "configure:42957: 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 -@@ -41224,7 +42639,7 @@ else +@@ -41539,7 +42961,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:41554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41364,7 +42779,7 @@ fi +@@ -41679,7 +43101,7 @@ fi done echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6 --echo "configure:41368: checking for gdImageWBMP in -lgd" >&5 -+echo "configure:42783: checking for gdImageWBMP in -lgd" >&5 +-echo "configure:41683: checking for gdImageWBMP in -lgd" >&5 ++echo "configure:43105: 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 -@@ -41372,7 +42787,7 @@ else +@@ -41687,7 +43109,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:41702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41512,7 +42927,7 @@ fi +@@ -41827,7 +43249,7 @@ fi done echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6 --echo "configure:41516: checking for gdImageCreateFromJpeg in -lgd" >&5 -+echo "configure:42931: checking for gdImageCreateFromJpeg in -lgd" >&5 +-echo "configure:41831: checking for gdImageCreateFromJpeg in -lgd" >&5 ++echo "configure:43253: 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 -@@ -41520,7 +42935,7 @@ else +@@ -41835,7 +43257,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:42950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:41850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41660,7 +43075,7 @@ fi +@@ -41975,7 +43397,7 @@ fi done echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6 --echo "configure:41664: checking for gdImageCreateFromXpm in -lgd" >&5 -+echo "configure:43079: checking for gdImageCreateFromXpm in -lgd" >&5 +-echo "configure:41979: checking for gdImageCreateFromXpm in -lgd" >&5 ++echo "configure:43401: 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 -@@ -41668,7 +43083,7 @@ else +@@ -41983,7 +43405,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:41998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41808,7 +43223,7 @@ fi +@@ -42123,7 +43545,7 @@ fi done echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6 --echo "configure:41812: checking for gdImageCreateFromGd2 in -lgd" >&5 -+echo "configure:43227: checking for gdImageCreateFromGd2 in -lgd" >&5 +-echo "configure:42127: checking for gdImageCreateFromGd2 in -lgd" >&5 ++echo "configure:43549: 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 -@@ -41816,7 +43231,7 @@ else +@@ -42131,7 +43553,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -41956,7 +43371,7 @@ fi +@@ -42271,7 +43693,7 @@ fi done echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6 --echo "configure:41960: checking for gdImageCreateTrueColor in -lgd" >&5 -+echo "configure:43375: checking for gdImageCreateTrueColor in -lgd" >&5 +-echo "configure:42275: checking for gdImageCreateTrueColor in -lgd" >&5 ++echo "configure:43697: 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 -@@ -41964,7 +43379,7 @@ else +@@ -42279,7 +43701,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42104,7 +43519,7 @@ fi +@@ -42419,7 +43841,7 @@ fi done echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6 --echo "configure:42108: checking for gdImageSetTile in -lgd" >&5 -+echo "configure:43523: checking for gdImageSetTile in -lgd" >&5 +-echo "configure:42423: checking for gdImageSetTile in -lgd" >&5 ++echo "configure:43845: 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 -@@ -42112,7 +43527,7 @@ else +@@ -42427,7 +43849,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42252,7 +43667,7 @@ fi +@@ -42567,7 +43989,7 @@ fi done echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6 --echo "configure:42256: checking for gdImageEllipse in -lgd" >&5 -+echo "configure:43671: checking for gdImageEllipse in -lgd" >&5 +-echo "configure:42571: checking for gdImageEllipse in -lgd" >&5 ++echo "configure:43993: 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 -@@ -42260,7 +43675,7 @@ else +@@ -42575,7 +43997,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42400,7 +43815,7 @@ fi +@@ -42715,7 +44137,7 @@ fi done echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6 --echo "configure:42404: checking for gdImageSetBrush in -lgd" >&5 -+echo "configure:43819: checking for gdImageSetBrush in -lgd" >&5 +-echo "configure:42719: checking for gdImageSetBrush in -lgd" >&5 ++echo "configure:44141: 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 -@@ -42408,7 +43823,7 @@ else +@@ -42723,7 +44145,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42548,7 +43963,7 @@ fi +@@ -42863,7 +44285,7 @@ fi done echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6 --echo "configure:42552: checking for gdImageStringTTF in -lgd" >&5 -+echo "configure:43967: checking for gdImageStringTTF in -lgd" >&5 +-echo "configure:42867: checking for gdImageStringTTF in -lgd" >&5 ++echo "configure:44289: 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 -@@ -42556,7 +43971,7 @@ else +@@ -42871,7 +44293,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:43986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42696,7 +44111,7 @@ fi +@@ -43011,7 +44433,7 @@ fi done echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6 --echo "configure:42700: checking for gdImageStringFT in -lgd" >&5 -+echo "configure:44115: checking for gdImageStringFT in -lgd" >&5 +-echo "configure:43015: checking for gdImageStringFT in -lgd" >&5 ++echo "configure:44437: 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 -@@ -42704,7 +44119,7 @@ else +@@ -43019,7 +44441,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:43034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42844,7 +44259,7 @@ fi +@@ -43159,7 +44581,7 @@ fi done echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6 --echo "configure:42848: checking for gdImageStringFTEx in -lgd" >&5 -+echo "configure:44263: checking for gdImageStringFTEx in -lgd" >&5 +-echo "configure:43163: checking for gdImageStringFTEx in -lgd" >&5 ++echo "configure:44585: 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 -@@ -42852,7 +44267,7 @@ else +@@ -43167,7 +44589,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:43182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -42992,7 +44407,7 @@ fi +@@ -43307,7 +44729,7 @@ fi done echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6 --echo "configure:42996: checking for gdImageColorClosestHWB in -lgd" >&5 -+echo "configure:44411: checking for gdImageColorClosestHWB in -lgd" >&5 +-echo "configure:43311: checking for gdImageColorClosestHWB in -lgd" >&5 ++echo "configure:44733: 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 -@@ -43000,7 +44415,7 @@ else +@@ -43315,7 +44737,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:43330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43140,7 +44555,7 @@ fi +@@ -43455,7 +44877,7 @@ fi done echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6 --echo "configure:43144: checking for gdImageColorResolve in -lgd" >&5 -+echo "configure:44559: checking for gdImageColorResolve in -lgd" >&5 +-echo "configure:43459: checking for gdImageColorResolve in -lgd" >&5 ++echo "configure:44881: 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 -@@ -43148,7 +44563,7 @@ else +@@ -43463,7 +44885,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:43478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43288,7 +44703,7 @@ fi +@@ -43603,7 +45025,7 @@ fi done echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6 --echo "configure:43292: checking for gdImageGifCtx in -lgd" >&5 -+echo "configure:44707: checking for gdImageGifCtx in -lgd" >&5 +-echo "configure:43607: checking for gdImageGifCtx in -lgd" >&5 ++echo "configure:45029: 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 -@@ -43296,7 +44711,7 @@ else +@@ -43611,7 +45033,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:43626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43436,7 +44851,7 @@ fi +@@ -43751,7 +45173,7 @@ fi done echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6 --echo "configure:43440: checking for gdCacheCreate in -lgd" >&5 -+echo "configure:44855: checking for gdCacheCreate in -lgd" >&5 +-echo "configure:43755: checking for gdCacheCreate in -lgd" >&5 ++echo "configure:45177: 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 -@@ -43444,7 +44859,7 @@ else +@@ -43759,7 +45181,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:44874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:43774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43584,7 +44999,7 @@ fi +@@ -43899,7 +45321,7 @@ fi done echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6 --echo "configure:43588: checking for gdFontCacheShutdown in -lgd" >&5 -+echo "configure:45003: checking for gdFontCacheShutdown in -lgd" >&5 +-echo "configure:43903: checking for gdFontCacheShutdown in -lgd" >&5 ++echo "configure:45325: 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 -@@ -43592,7 +45007,7 @@ else +@@ -43907,7 +45329,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:45022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:43922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43732,7 +45147,7 @@ fi +@@ -44047,7 +45469,7 @@ fi done echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6 --echo "configure:43736: checking for gdFreeFontCache in -lgd" >&5 -+echo "configure:45151: checking for gdFreeFontCache in -lgd" >&5 +-echo "configure:44051: checking for gdFreeFontCache in -lgd" >&5 ++echo "configure:45473: 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 -@@ -43740,7 +45155,7 @@ else +@@ -44055,7 +45477,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:45170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:44070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -43880,7 +45295,7 @@ fi +@@ -44195,7 +45617,7 @@ fi done echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6 --echo "configure:43884: checking for gdFontCacheMutexSetup in -lgd" >&5 -+echo "configure:45299: checking for gdFontCacheMutexSetup in -lgd" >&5 +-echo "configure:44199: checking for gdFontCacheMutexSetup in -lgd" >&5 ++echo "configure:45621: 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 -@@ -43888,7 +45303,7 @@ else +@@ -44203,7 +45625,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:45318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:44218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -44028,7 +45443,7 @@ fi +@@ -44343,7 +45765,7 @@ fi done echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6 --echo "configure:44032: checking for gdNewDynamicCtxEx in -lgd" >&5 -+echo "configure:45447: checking for gdNewDynamicCtxEx in -lgd" >&5 +-echo "configure:44347: checking for gdNewDynamicCtxEx in -lgd" >&5 ++echo "configure:45769: 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 -@@ -44036,7 +45451,7 @@ else +@@ -44351,7 +45773,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:45466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:44366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -44102,7 +45517,7 @@ fi +@@ -44417,7 +45839,7 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$GD_INCLUDE cat > conftest.$ac_ext < -@@ -44116,7 +45531,7 @@ ctx->gd_free = 1; +@@ -44431,7 +45853,7 @@ ctx->gd_free = 1; ; return 0; } EOF --if { (eval echo configure:44120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:45535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:44435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:45857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -44447,7 +45862,7 @@ EOF +@@ -44762,7 +46184,7 @@ EOF else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:45877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:44777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:46199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -44609,7 +46024,7 @@ fi +@@ -44924,7 +46346,7 @@ fi done echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6 --echo "configure:44613: checking for gdImageCreate in -lgd" >&5 -+echo "configure:46028: checking for gdImageCreate in -lgd" >&5 +-echo "configure:44928: checking for gdImageCreate in -lgd" >&5 ++echo "configure:46350: 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 -@@ -44617,7 +46032,7 @@ else +@@ -44932,7 +46354,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:44947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -44693,7 +46108,7 @@ fi +@@ -45008,7 +46430,7 @@ fi php_with_gettext=no echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6 --echo "configure:44697: checking for GNU gettext support" >&5 -+echo "configure:46112: checking for GNU gettext support" >&5 +-echo "configure:45012: checking for GNU gettext support" >&5 ++echo "configure:46434: 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" -@@ -44748,7 +46163,7 @@ if test "$PHP_GETTEXT" != "no"; then +@@ -45063,7 +46485,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:44752: checking for bindtextdomain in -lintl" >&5 -+echo "configure:46167: checking for bindtextdomain in -lintl" >&5 +-echo "configure:45067: checking for bindtextdomain in -lintl" >&5 ++echo "configure:46489: 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 -@@ -44756,7 +46171,7 @@ else +@@ -45071,7 +46493,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:45086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -44789,7 +46204,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -45104,7 +46526,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6 --echo "configure:44793: checking for bindtextdomain in -lc" >&5 -+echo "configure:46208: checking for bindtextdomain in -lc" >&5 +-echo "configure:45108: checking for bindtextdomain in -lc" >&5 ++echo "configure:46530: 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 -@@ -44797,7 +46212,7 @@ else +@@ -45112,7 +46534,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:45127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45272,7 +46687,7 @@ EOF +@@ -45587,7 +47009,7 @@ EOF echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 --echo "configure:45276: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:46691: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 +-echo "configure:45591: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:47013: 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 -@@ -45280,7 +46695,7 @@ else +@@ -45595,7 +47017,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:45610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:47032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45315,7 +46730,7 @@ else +@@ -45630,7 +47052,7 @@ else fi echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 --echo "configure:45319: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:46734: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 +-echo "configure:45634: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:47056: 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 -@@ -45323,7 +46738,7 @@ else +@@ -45638,7 +47060,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:45653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:47075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45358,7 +46773,7 @@ else +@@ -45673,7 +47095,7 @@ else fi echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 --echo "configure:45362: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:46777: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 +-echo "configure:45677: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:47099: 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 -@@ -45366,7 +46781,7 @@ else +@@ -45681,7 +47103,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:45696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:47118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45401,7 +46816,7 @@ else +@@ -45716,7 +47138,7 @@ else fi echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 --echo "configure:45405: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:46820: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 +-echo "configure:45720: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:47142: 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 -@@ -45409,7 +46824,7 @@ else +@@ -45724,7 +47146,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:46839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:45739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:47161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45451,7 +46866,7 @@ fi +@@ -45766,7 +47188,7 @@ fi php_with_gmp=no echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6 --echo "configure:45455: checking for GNU MP support" >&5 -+echo "configure:46870: checking for GNU MP support" >&5 +-echo "configure:45770: checking for GNU MP support" >&5 ++echo "configure:47192: 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" -@@ -45599,7 +47014,7 @@ if test "$PHP_GMP" != "no"; then +@@ -45914,7 +47336,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:45603: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 -+echo "configure:47018: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 +-echo "configure:45918: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 ++echo "configure:47340: 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 -@@ -45607,7 +47022,7 @@ else +@@ -45922,7 +47344,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:47037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:45937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:47359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -45743,7 +47158,7 @@ else +@@ -46058,7 +47480,7 @@ else done echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 --echo "configure:45747: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 -+echo "configure:47162: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 +-echo "configure:46062: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 ++echo "configure:47484: 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 -@@ -45751,7 +47166,7 @@ else +@@ -46066,7 +47488,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:47181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:46081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:47503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -46234,7 +47649,7 @@ fi +@@ -46549,7 +47971,7 @@ fi php_with_mhash=no echo $ac_n "checking for mhash support""... $ac_c" 1>&6 --echo "configure:46238: checking for mhash support" >&5 -+echo "configure:47653: checking for mhash support" >&5 +-echo "configure:46553: checking for mhash support" >&5 ++echo "configure:47975: checking for mhash support" >&5 # Check whether --with-mhash or --without-mhash was given. if test "${with_mhash+set}" = set; then withval="$with_mhash" -@@ -46278,7 +47693,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -46593,7 +48015,7 @@ echo "$ac_t""$ext_output" 1>&6 php_enable_hash=yes echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6 --echo "configure:46282: checking whether to enable hash support" >&5 -+echo "configure:47697: checking whether to enable hash support" >&5 +-echo "configure:46597: checking whether to enable hash support" >&5 ++echo "configure:48019: 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" -@@ -46336,7 +47751,7 @@ EOF +@@ -46651,7 +48073,7 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 --echo "configure:46340: checking whether byte ordering is bigendian" >&5 -+echo "configure:47755: checking whether byte ordering is bigendian" >&5 +-echo "configure:46655: checking whether byte ordering is bigendian" >&5 ++echo "configure:48077: 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 -@@ -46346,7 +47761,7 @@ else +@@ -46661,7 +48083,7 @@ else ac_cv_c_bigendian_php=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:47781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:46681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:48103: \"$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 -@@ -46387,7 +47802,7 @@ EOF +@@ -46702,7 +48124,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 --echo "configure:46391: checking size of short" >&5 -+echo "configure:47806: checking size of short" >&5 +-echo "configure:46706: checking size of short" >&5 ++echo "configure:48128: 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 -@@ -46395,7 +47810,7 @@ else +@@ -46710,9 +48132,10 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < - #include -@@ -46407,7 +47822,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -46721,7 +48144,7 @@ main() exit(0); } EOF --if { (eval echo configure:46411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:47826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:46725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:48148: \"$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 -@@ -46427,7 +47842,7 @@ EOF +@@ -46741,7 +48164,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 --echo "configure:46431: checking size of int" >&5 -+echo "configure:47846: checking size of int" >&5 +-echo "configure:46745: checking size of int" >&5 ++echo "configure:48168: 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 -@@ -46435,7 +47850,7 @@ else +@@ -46749,9 +48172,10 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < - #include -@@ -46447,7 +47862,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -46760,7 +48184,7 @@ main() exit(0); } EOF --if { (eval echo configure:46451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:47866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:46764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:48188: \"$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 -@@ -46467,7 +47882,7 @@ EOF +@@ -46780,7 +48204,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 --echo "configure:46471: checking size of long" >&5 -+echo "configure:47886: checking size of long" >&5 +-echo "configure:46784: checking size of long" >&5 ++echo "configure:48208: 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 -@@ -46475,7 +47890,7 @@ else +@@ -46788,9 +48212,10 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < - #include -@@ -46487,7 +47902,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -46799,7 +48224,7 @@ main() exit(0); } EOF --if { (eval echo configure:46491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:47906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:46803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:48228: \"$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 -@@ -46507,7 +47922,7 @@ EOF +@@ -46819,7 +48244,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 --echo "configure:46511: checking size of long long" >&5 -+echo "configure:47926: checking size of long long" >&5 +-echo "configure:46823: checking size of long long" >&5 ++echo "configure:48248: 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 -@@ -46515,7 +47930,7 @@ else +@@ -46827,9 +48252,10 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < - #include -@@ -46527,7 +47942,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -46838,7 +48264,7 @@ main() exit(0); } EOF --if { (eval echo configure:46531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:47946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:46842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:48268: \"$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 -@@ -46873,10 +48288,13 @@ fi +@@ -47184,10 +48610,13 @@ fi @@ -11874,991 +12039,991 @@ php_with_iconv=yes echo $ac_n "checking for iconv support""... $ac_c" 1>&6 --echo "configure:46880: checking for iconv support" >&5 -+echo "configure:48298: checking for iconv support" >&5 +-echo "configure:47191: checking for iconv support" >&5 ++echo "configure:48620: checking for iconv support" >&5 # Check whether --with-iconv or --without-iconv was given. if test "${with_iconv+set}" = set; then withval="$with_iconv" -@@ -46937,12 +48355,12 @@ if test "$PHP_ICONV" != "no"; then +@@ -47248,12 +48677,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:46941: checking for iconv" >&5 -+echo "configure:48359: checking for iconv" >&5 +-echo "configure:47252: checking for iconv" >&5 ++echo "configure:48681: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:48387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:47280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48709: \"$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 -@@ -46986,12 +48404,12 @@ else +@@ -47297,12 +48726,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv""... $ac_c" 1>&6 --echo "configure:46990: checking for libiconv" >&5 -+echo "configure:48408: checking for libiconv" >&5 +-echo "configure:47301: checking for libiconv" >&5 ++echo "configure:48730: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:48436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:47329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48758: \"$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 -@@ -47170,7 +48588,7 @@ EOF +@@ -47481,7 +48910,7 @@ EOF done echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 --echo "configure:47174: checking for libiconv in -l$iconv_lib_name" >&5 -+echo "configure:48592: checking for libiconv in -l$iconv_lib_name" >&5 +-echo "configure:47485: checking for libiconv in -l$iconv_lib_name" >&5 ++echo "configure:48914: 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 -@@ -47178,7 +48596,7 @@ else +@@ -47489,7 +48918,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$iconv_lib_name $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:48611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:47504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -47330,7 +48748,7 @@ else +@@ -47641,7 +49070,7 @@ else done echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 --echo "configure:47334: checking for iconv in -l$iconv_lib_name" >&5 -+echo "configure:48752: checking for iconv in -l$iconv_lib_name" >&5 +-echo "configure:47645: checking for iconv in -l$iconv_lib_name" >&5 ++echo "configure:49074: 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 -@@ -47338,7 +48756,7 @@ else +@@ -47649,7 +49078,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$iconv_lib_name $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:48771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:47664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:49093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -47560,16 +48978,16 @@ else +@@ -47871,16 +49300,16 @@ else fi echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6 --echo "configure:47564: checking if iconv is glibc's" >&5 -+echo "configure:48982: checking if iconv is glibc's" >&5 +-echo "configure:47875: checking if iconv is glibc's" >&5 ++echo "configure:49304: checking if iconv is glibc's" >&5 cat > conftest.$ac_ext < int main() { gnu_get_libc_version(); ; return 0; } EOF --if { (eval echo configure:47573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:48991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:47884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:49313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -47587,7 +49005,7 @@ rm -f conftest* +@@ -47898,7 +49327,7 @@ rm -f conftest* if test -z "$iconv_impl_name"; then echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6 --echo "configure:47591: checking if using GNU libiconv" >&5 -+echo "configure:49009: checking if using GNU libiconv" >&5 +-echo "configure:47902: checking if using GNU libiconv" >&5 ++echo "configure:49331: checking if using GNU libiconv" >&5 php_iconv_old_ld="$LDFLAGS" LDFLAGS="-liconv $LDFLAGS" if test "$cross_compiling" = yes; then -@@ -47597,7 +49015,7 @@ echo "configure:47591: checking if using +@@ -47908,7 +49337,7 @@ echo "configure:47902: checking if using else cat > conftest.$ac_ext < -@@ -47607,7 +49025,7 @@ int main() { +@@ -47918,7 +49347,7 @@ int main() { } EOF --if { (eval echo configure:47611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:49029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:47922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:49351: \"$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 -@@ -47629,16 +49047,16 @@ fi +@@ -47940,16 +49369,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:47633: checking if iconv is Konstantin Chuguev's" >&5 -+echo "configure:49051: checking if iconv is Konstantin Chuguev's" >&5 +-echo "configure:47944: checking if iconv is Konstantin Chuguev's" >&5 ++echo "configure:49373: checking if iconv is Konstantin Chuguev's" >&5 cat > conftest.$ac_ext < int main() { iconv_ccs_init(NULL, NULL); ; return 0; } EOF --if { (eval echo configure:47642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:49060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:47953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:49382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -47657,18 +49075,18 @@ rm -f conftest* +@@ -47968,18 +49397,18 @@ rm -f conftest* if test -z "$iconv_impl_name"; then echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6 --echo "configure:47661: checking if using IBM iconv" >&5 -+echo "configure:49079: checking if using IBM iconv" >&5 +-echo "configure:47972: checking if using IBM iconv" >&5 ++echo "configure:49401: checking if using IBM iconv" >&5 php_iconv_old_ld="$LDFLAGS" LDFLAGS="-liconv $LDFLAGS" cat > conftest.$ac_ext < int main() { cstoccsid(""); ; return 0; } EOF --if { (eval echo configure:47672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:49090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:47983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:49412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -47854,7 +49272,7 @@ EOF +@@ -48165,7 +49594,7 @@ EOF esac echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6 --echo "configure:47858: checking if iconv supports errno" >&5 -+echo "configure:49276: checking if iconv supports errno" >&5 +-echo "configure:48169: checking if iconv supports errno" >&5 ++echo "configure:49598: checking if iconv supports errno" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""no" 1>&6 -@@ -47868,7 +49286,7 @@ EOF +@@ -48179,7 +49608,7 @@ EOF else cat > conftest.$ac_ext < -@@ -47889,7 +49307,7 @@ int main() { +@@ -48200,7 +49629,7 @@ int main() { } EOF --if { (eval echo configure:47893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:49311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:48204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:49633: \"$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 -@@ -47921,9 +49339,9 @@ fi +@@ -48232,9 +49661,9 @@ fi echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6 --echo "configure:47925: checking if your cpp allows macro usage in include lines" >&5 -+echo "configure:49343: checking if your cpp allows macro usage in include lines" >&5 +-echo "configure:48236: checking if your cpp allows macro usage in include lines" >&5 ++echo "configure:49665: checking if your cpp allows macro usage in include lines" >&5 cat > conftest.$ac_ext < -@@ -47933,7 +49351,7 @@ int main() { +@@ -48244,7 +49673,7 @@ int main() { ; return 0; } EOF --if { (eval echo configure:47937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:49355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:48248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:49677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -48289,7 +49707,7 @@ fi +@@ -48600,7 +50029,7 @@ fi php_with_imap=no echo $ac_n "checking for IMAP support""... $ac_c" 1>&6 --echo "configure:48293: checking for IMAP support" >&5 -+echo "configure:49711: checking for IMAP support" >&5 +-echo "configure:48604: checking for IMAP support" >&5 ++echo "configure:50033: checking for IMAP support" >&5 # Check whether --with-imap or --without-imap was given. if test "${with_imap+set}" = set; then withval="$with_imap" -@@ -48333,7 +49751,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -48644,7 +50073,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_kerberos=no echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6 --echo "configure:48337: checking for IMAP Kerberos support" >&5 -+echo "configure:49755: checking for IMAP Kerberos support" >&5 +-echo "configure:48648: checking for IMAP Kerberos support" >&5 ++echo "configure:50077: 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" -@@ -48356,7 +49774,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -48667,7 +50096,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_imap_ssl=no echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6 --echo "configure:48360: checking for IMAP SSL support" >&5 -+echo "configure:49778: checking for IMAP SSL support" >&5 +-echo "configure:48671: checking for IMAP SSL support" >&5 ++echo "configure:50100: 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" -@@ -48760,7 +50178,7 @@ EOF +@@ -49071,7 +50500,7 @@ EOF done cat > conftest.$ac_ext < EOF -@@ -48780,12 +50198,12 @@ rm -f conftest* +@@ -49091,12 +50520,12 @@ rm -f conftest* old_CFLAGS=$CFLAGS CFLAGS="-I$IMAP_INC_DIR" echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6 --echo "configure:48784: checking for utf8_mime2text signature" >&5 -+echo "configure:50202: checking for utf8_mime2text signature" >&5 +-echo "configure:49095: checking for utf8_mime2text signature" >&5 ++echo "configure:50524: 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 < -@@ -48798,7 +50216,7 @@ int main() { +@@ -49109,7 +50538,7 @@ int main() { ; return 0; } EOF --if { (eval echo configure:48802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:50220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:49113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:50542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_utf8_mime2text=old -@@ -48827,12 +50245,12 @@ EOF +@@ -49138,12 +50567,12 @@ EOF old_CFLAGS=$CFLAGS CFLAGS="-I$IMAP_INC_DIR" echo $ac_n "checking for U8T_DECOMPOSE""... $ac_c" 1>&6 --echo "configure:48831: checking for U8T_DECOMPOSE" >&5 -+echo "configure:50249: checking for U8T_DECOMPOSE" >&5 +-echo "configure:49142: checking for U8T_DECOMPOSE" >&5 ++echo "configure:50571: checking for U8T_DECOMPOSE" >&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 < -@@ -48843,7 +50261,7 @@ int main() { +@@ -49154,7 +50583,7 @@ int main() { ; return 0; } EOF --if { (eval echo configure:48847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:50265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:49158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:50587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_u8t_decompose=yes -@@ -48873,7 +50291,7 @@ echo "$ac_t""$ac_cv_u8t_canonical" 1>&6 +@@ -49184,7 +50613,7 @@ echo "$ac_t""$ac_cv_u8t_canonical" 1>&6 old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$IMAP_INC_DIR cat > conftest.$ac_ext <&6 --echo "configure:48996: checking for pam_start in -lpam" >&5 -+echo "configure:50414: checking for pam_start in -lpam" >&5 +-echo "configure:49307: checking for pam_start in -lpam" >&5 ++echo "configure:50736: 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 -@@ -49000,7 +50418,7 @@ else +@@ -49311,7 +50740,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpam $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:50433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:49326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:50755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -49166,7 +50584,7 @@ fi +@@ -49477,7 +50906,7 @@ fi done echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 --echo "configure:49170: checking for crypt in -lcrypt" >&5 -+echo "configure:50588: checking for crypt in -lcrypt" >&5 +-echo "configure:49481: checking for crypt in -lcrypt" >&5 ++echo "configure:50910: 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 -@@ -49174,7 +50592,7 @@ else +@@ -49485,7 +50914,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:50607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:49500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:50929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -49389,7 +50807,7 @@ fi +@@ -49700,7 +51129,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:49393: checking for $ac_word" >&5 -+echo "configure:50811: checking for $ac_word" >&5 +-echo "configure:49704: checking for $ac_word" >&5 ++echo "configure:51133: 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 -@@ -49758,7 +51176,7 @@ else +@@ -50069,7 +51498,7 @@ else else cat > conftest.$ac_ext < EOF -@@ -49799,7 +51217,7 @@ rm -f conftest* +@@ -50110,7 +51539,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:49803: checking for $ac_word" >&5 -+echo "configure:51221: checking for $ac_word" >&5 +-echo "configure:50114: checking for $ac_word" >&5 ++echo "configure:51543: 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 -@@ -50004,9 +51422,9 @@ fi +@@ -50315,9 +51744,9 @@ fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 --echo "configure:50008: checking for OpenSSL version" >&5 -+echo "configure:51426: checking for OpenSSL version" >&5 +-echo "configure:50319: checking for OpenSSL version" >&5 ++echo "configure:51748: checking for OpenSSL version" >&5 cat > conftest.$ac_ext < -@@ -50161,7 +51579,7 @@ rm -f conftest* +@@ -50472,7 +51901,7 @@ rm -f conftest* done echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 --echo "configure:50165: checking for CRYPTO_free in -lcrypto" >&5 -+echo "configure:51583: checking for CRYPTO_free in -lcrypto" >&5 +-echo "configure:50476: checking for CRYPTO_free in -lcrypto" >&5 ++echo "configure:51905: 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 -@@ -50169,7 +51587,7 @@ else +@@ -50480,7 +51909,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:51602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:50495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:51924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -50337,7 +51755,7 @@ fi +@@ -50648,7 +52077,7 @@ fi done echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 --echo "configure:50341: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -+echo "configure:51759: checking for SSL_CTX_set_ssl_version in -lssl" >&5 +-echo "configure:50652: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++echo "configure:52081: 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 -@@ -50345,7 +51763,7 @@ else +@@ -50656,7 +52085,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:51778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:50671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:52100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -50498,7 +51916,7 @@ else +@@ -50809,7 +52238,7 @@ else elif test -f "$IMAP_INC_DIR/linkage.c"; then cat > conftest.$ac_ext < EOF -@@ -50529,7 +51947,7 @@ rm -f conftest* +@@ -50840,7 +52269,7 @@ rm -f conftest* else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:51984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:50877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:52306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -50598,7 +52016,7 @@ fi +@@ -50909,7 +52338,7 @@ fi else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:52053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:50946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:52375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -50658,7 +52076,7 @@ fi +@@ -50969,7 +52398,7 @@ fi echo $ac_n "checking whether rfc822_output_address_list function present""... $ac_c" 1>&6 --echo "configure:50662: checking whether rfc822_output_address_list function present" >&5 -+echo "configure:52080: checking whether rfc822_output_address_list function present" >&5 +-echo "configure:50973: checking whether rfc822_output_address_list function present" >&5 ++echo "configure:52402: checking whether rfc822_output_address_list function present" >&5 old_LIBS=$LIBS LIBS=" -@@ -50670,7 +52088,7 @@ echo "configure:50662: checking whether +@@ -50981,7 +52410,7 @@ echo "configure:50973: checking whether else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:52128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:51021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:52450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -50735,7 +52153,7 @@ fi +@@ -51046,7 +52475,7 @@ fi echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6 --echo "configure:50739: checking whether build with IMAP works" >&5 -+echo "configure:52157: checking whether build with IMAP works" >&5 +-echo "configure:51050: checking whether build with IMAP works" >&5 ++echo "configure:52479: checking whether build with IMAP works" >&5 old_LIBS=$LIBS -@@ -50746,7 +52164,7 @@ echo "configure:50739: checking whether +@@ -51057,7 +52486,7 @@ echo "configure:51050: checking whether else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:52201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:51094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:52523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -50811,7 +52229,7 @@ fi +@@ -51122,7 +52551,7 @@ fi php_with_interbase=no echo $ac_n "checking for InterBase support""... $ac_c" 1>&6 --echo "configure:50815: checking for InterBase support" >&5 -+echo "configure:52233: checking for InterBase support" >&5 +-echo "configure:51126: checking for InterBase support" >&5 ++echo "configure:52555: checking for InterBase support" >&5 # Check whether --with-interbase or --without-interbase was given. if test "${with_interbase+set}" = set; then withval="$with_interbase" -@@ -50958,7 +52376,7 @@ if test "$PHP_INTERBASE" != "no"; then +@@ -51269,7 +52698,7 @@ if test "$PHP_INTERBASE" != "no"; then done echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 --echo "configure:50962: checking for isc_detach_database in -lfbclient" >&5 -+echo "configure:52380: checking for isc_detach_database in -lfbclient" >&5 +-echo "configure:51273: checking for isc_detach_database in -lfbclient" >&5 ++echo "configure:52702: 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 -@@ -50966,7 +52384,7 @@ else +@@ -51277,7 +52706,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfbclient $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:52399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:51292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:52721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -51104,7 +52522,7 @@ else +@@ -51415,7 +52844,7 @@ else done echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 --echo "configure:51108: checking for isc_detach_database in -lgds" >&5 -+echo "configure:52526: checking for isc_detach_database in -lgds" >&5 +-echo "configure:51419: checking for isc_detach_database in -lgds" >&5 ++echo "configure:52848: 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 -@@ -51112,7 +52530,7 @@ else +@@ -51423,7 +52852,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgds $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:52545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:51438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:52867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -51250,7 +52668,7 @@ else +@@ -51561,7 +52990,7 @@ else done echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 --echo "configure:51254: checking for isc_detach_database in -lib_util" >&5 -+echo "configure:52672: checking for isc_detach_database in -lib_util" >&5 +-echo "configure:51565: checking for isc_detach_database in -lib_util" >&5 ++echo "configure:52994: 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 -@@ -51258,7 +52676,7 @@ else +@@ -51569,7 +52998,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lib_util $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:52691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:51584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:53013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -51746,7 +53164,7 @@ fi +@@ -52057,7 +53486,7 @@ fi php_enable_intl=no echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6 --echo "configure:51750: checking whether to enable internationalization support" >&5 -+echo "configure:53168: checking whether to enable internationalization support" >&5 +-echo "configure:52061: checking whether to enable internationalization support" >&5 ++echo "configure:53490: checking whether to enable internationalization support" >&5 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then enableval="$enable_intl" -@@ -51818,7 +53236,7 @@ ext_output=$PHP_ICU_DIR +@@ -52129,7 +53558,7 @@ ext_output=$PHP_ICU_DIR # Extract the first word of "icu-config", so it can be a program name with args. set dummy icu-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:51822: checking for $ac_word" >&5 -+echo "configure:53240: checking for $ac_word" >&5 +-echo "configure:52133: checking for $ac_word" >&5 ++echo "configure:53562: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ICU_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -51856,7 +53274,7 @@ fi +@@ -52167,7 +53596,7 @@ fi fi echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6 --echo "configure:51860: checking for location of ICU headers and libraries" >&5 -+echo "configure:53278: checking for location of ICU headers and libraries" >&5 +-echo "configure:52171: checking for location of ICU headers and libraries" >&5 ++echo "configure:53600: checking for location of ICU headers and libraries" >&5 icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` if test "$?" != "0" || test -z "$icu_install_prefix"; then -@@ -51866,7 +53284,7 @@ echo "configure:51860: checking for loca +@@ -52177,7 +53606,7 @@ echo "configure:52171: checking for loca echo "$ac_t""$icu_install_prefix" 1>&6 echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6 --echo "configure:51870: checking for ICU 3.4 or greater" >&5 -+echo "configure:53288: checking for ICU 3.4 or greater" >&5 +-echo "configure:52181: checking for ICU 3.4 or greater" >&5 ++echo "configure:53610: checking for ICU 3.4 or greater" >&5 icu_version_full=`$ICU_CONFIG --version` ac_IFS=$IFS IFS="." -@@ -52023,7 +53441,7 @@ do +@@ -52334,7 +53763,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:52027: checking for $ac_word" >&5 -+echo "configure:53445: checking for $ac_word" >&5 +-echo "configure:52338: checking for $ac_word" >&5 ++echo "configure:53767: 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 -@@ -52055,7 +53473,7 @@ test -n "$CXX" || CXX="gcc" +@@ -52366,7 +53795,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:52059: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:53477: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +-echo "configure:52370: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:53799: 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. -@@ -52066,12 +53484,12 @@ cross_compiling=$ac_cv_prog_cxx_cross +@@ -52377,12 +53806,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF --#line 52070 "configure" -+#line 53488 "configure" +-#line 52381 "configure" ++#line 53810 "configure" #include "confdefs.h" int main(){return(0);} EOF --if { (eval echo configure:52075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:53493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:52386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:53815: \"$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 -@@ -52097,12 +53515,12 @@ if test $ac_cv_prog_cxx_works = no; then +@@ -52408,12 +53837,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:52101: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:53519: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "configure:52412: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:53841: 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:52106: checking whether we are using GNU C++" >&5 -+echo "configure:53524: checking whether we are using GNU C++" >&5 +-echo "configure:52417: checking whether we are using GNU C++" >&5 ++echo "configure:53846: 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 -@@ -52111,7 +53529,7 @@ else +@@ -52422,7 +53851,7 @@ else yes; #endif EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:52115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:53533: \"$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:52426: \"$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:53855: \"$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 -@@ -52130,7 +53548,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" +@@ -52441,7 +53870,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:52134: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:53552: checking whether ${CXX-g++} accepts -g" >&5 +-echo "configure:52445: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:53874: 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 -@@ -52162,7 +53580,7 @@ else +@@ -52473,7 +53902,7 @@ else fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:52166: checking how to run the C++ preprocessor" >&5 -+echo "configure:53584: checking how to run the C++ preprocessor" >&5 +-echo "configure:52477: checking how to run the C++ preprocessor" >&5 ++echo "configure:53906: 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 -@@ -52175,12 +53593,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee +@@ -52486,12 +53915,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:52184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:53602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:52495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:53924: \"$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 : -@@ -52738,7 +54156,7 @@ fi +@@ -53049,7 +54478,7 @@ fi php_enable_json=yes echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6 --echo "configure:52742: checking whether to enable JavaScript Object Serialization support" >&5 -+echo "configure:54160: checking whether to enable JavaScript Object Serialization support" >&5 +-echo "configure:53053: checking whether to enable JavaScript Object Serialization support" >&5 ++echo "configure:54482: 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" -@@ -52784,12 +54202,12 @@ if test "$PHP_JSON" != "no"; then +@@ -53095,12 +54524,12 @@ if test "$PHP_JSON" != "no"; then EOF echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:52788: checking for ANSI C header files" >&5 -+echo "configure:54206: checking for ANSI C header files" >&5 +-echo "configure:53099: checking for ANSI C header files" >&5 ++echo "configure:54528: 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 < #include -@@ -52797,7 +54215,7 @@ else +@@ -53108,7 +54537,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:52801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:54219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:53112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:54541: \"$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* -@@ -52814,7 +54232,7 @@ rm -f conftest* +@@ -53125,7 +54554,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 -@@ -52832,7 +54250,7 @@ fi +@@ -53143,7 +54572,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 -@@ -52853,7 +54271,7 @@ if test "$cross_compiling" = yes; then +@@ -53164,7 +54593,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -52864,7 +54282,7 @@ if (XOR (islower (i), ISLOWER (i)) || to +@@ -53175,7 +54604,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF --if { (eval echo configure:52868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:54286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:53179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:54608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -53214,7 +54632,7 @@ fi +@@ -53525,7 +54954,7 @@ fi php_with_ldap=no echo $ac_n "checking for LDAP support""... $ac_c" 1>&6 --echo "configure:53218: checking for LDAP support" >&5 -+echo "configure:54636: checking for LDAP support" >&5 +-echo "configure:53529: checking for LDAP support" >&5 ++echo "configure:54958: checking for LDAP support" >&5 # Check whether --with-ldap or --without-ldap was given. if test "${with_ldap+set}" = set; then withval="$with_ldap" -@@ -53258,7 +54676,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -53569,7 +54998,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_ldap_sasl=no echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6 --echo "configure:53262: checking for LDAP Cyrus SASL support" >&5 -+echo "configure:54680: checking for LDAP Cyrus SASL support" >&5 +-echo "configure:53573: checking for LDAP Cyrus SASL support" >&5 ++echo "configure:55002: 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" -@@ -55600,19 +57018,19 @@ EOF +@@ -55911,19 +57340,19 @@ EOF LIBS="$LIBS $LDAP_SHARED_LIBADD" echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6 --echo "configure:55604: checking for 3 arg ldap_set_rebind_proc" >&5 -+echo "configure:57022: checking for 3 arg ldap_set_rebind_proc" >&5 +-echo "configure:55915: checking for 3 arg ldap_set_rebind_proc" >&5 ++echo "configure:57344: 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 < int main() { ldap_set_rebind_proc(0,0,0) ; return 0; } EOF --if { (eval echo configure:55616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:57034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:55927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:57356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_3arg_setrebindproc=yes else -@@ -55635,12 +57053,12 @@ EOF +@@ -55946,12 +57375,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:55639: checking for $ac_func" >&5 -+echo "configure:57057: checking for $ac_func" >&5 +-echo "configure:55950: checking for $ac_func" >&5 ++echo "configure:57379: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:57085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:55978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:57407: \"$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 -@@ -55825,7 +57243,7 @@ EOF +@@ -56136,7 +57565,7 @@ EOF done echo $ac_n "checking for sasl_version in -lsasl2""... $ac_c" 1>&6 --echo "configure:55829: checking for sasl_version in -lsasl2" >&5 -+echo "configure:57247: checking for sasl_version in -lsasl2" >&5 +-echo "configure:56140: checking for sasl_version in -lsasl2" >&5 ++echo "configure:57569: checking for sasl_version in -lsasl2" >&5 ac_lib_var=`echo sasl2'_'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 -@@ -55833,7 +57251,7 @@ else +@@ -56144,7 +57573,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsasl2 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:57266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:56159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:57588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -56013,12 +57431,12 @@ fi +@@ -56324,12 +57753,12 @@ fi fi echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6 --echo "configure:56017: checking for ldap_bind_s" >&5 -+echo "configure:57435: checking for ldap_bind_s" >&5 +-echo "configure:56328: checking for ldap_bind_s" >&5 ++echo "configure:57757: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:57463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:56356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:57785: \"$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 -@@ -56070,39 +57488,18 @@ fi +@@ -56381,39 +57810,18 @@ fi @@ -12887,13 +13052,13 @@ -php_enable_mbstring=no - -echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6 --echo "configure:56098: checking whether to enable multibyte string support" >&5 +-echo "configure:56409: 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" - PHP_MBSTRING=$enableval +echo $ac_n "checking for libevent support""... $ac_c" 1>&6 -+echo "configure:57495: checking for libevent support" >&5 ++echo "configure:57817: checking for libevent support" >&5 +# Check whether --with-libevent or --without-libevent was given. +if test "${with_libevent+set}" = set; then + withval="$with_libevent" @@ -12907,7 +13072,7 @@ fi -@@ -56110,12 +57507,12 @@ fi +@@ -56421,12 +57829,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -12923,7 +13088,7 @@ ;; no) ext_output=no -@@ -56134,723 +57531,881 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -56445,720 +57853,881 @@ echo "$ac_t""$ext_output" 1>&6 @@ -12933,7 +13098,7 @@ + + if test "$PHP_LIBEVENT" = "yes"; then + echo $ac_n "checking for libevent headers in default path""... $ac_c" 1>&6 -+echo "configure:57541: checking for libevent headers in default path" >&5 ++echo "configure:57863: checking for libevent headers in default path" >&5 + for i in $SEARCH_PATH ; do + if test -r $i/$SEARCH_FOR; then + LIBEVENT_DIR=$i @@ -12942,7 +13107,7 @@ + done + else + echo $ac_n "checking for libevent headers in $PHP_LIBEVENT""... $ac_c" 1>&6 -+echo "configure:57550: checking for libevent headers in $PHP_LIBEVENT" >&5 ++echo "configure:57872: checking for libevent headers in $PHP_LIBEVENT" >&5 + if test -r $PHP_LIBEVENT/$SEARCH_FOR; then + LIBEVENT_DIR=$PHP_LIBEVENT + echo "$ac_t""found" 1>&6 @@ -12956,27 +13121,15 @@ + fi -echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6 --echo "configure:56142: checking whether to enable multibyte regex support" >&5 +-echo "configure:56453: 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" - PHP_MBREGEX=$enableval -else - -- PHP_MBREGEX=yes - -- --fi -- -- --ext_output=$PHP_MBREGEX --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- -- --php_enable_mbregex_backtrack=yes +- PHP_MBREGEX=yes + + if test "$LIBEVENT_DIR/include" != "/usr/include"; then + + if test -z "$LIBEVENT_DIR/include" || echo "$LIBEVENT_DIR/include" | grep '^/' >/dev/null ; then @@ -12989,8 +13142,20 @@ + ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/include\"`" + fi +-fi +- +- +-ext_output=$PHP_MBREGEX +-echo "$ac_t""$ext_output" 1>&6 +- +- +- +- +- +-php_enable_mbregex_backtrack=yes +- -echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6 --echo "configure:56165: checking whether to check multibyte regex backtrack" >&5 +-echo "configure:56476: 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" @@ -13032,7 +13197,7 @@ + fi -echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6 --echo "configure:56188: checking for external libmbfl" >&5 +-echo "configure:56499: checking for external libmbfl" >&5 -# Check whether --with-libmbfl or --without-libmbfl was given. -if test "${with_libmbfl+set}" = set; then - withval="$with_libmbfl" @@ -13045,9 +13210,30 @@ + -L$LIBEVENT_DIR/$PHP_LIBDIR + " +- +-fi +- +- +-ext_output=$PHP_LIBMBFL +-echo "$ac_t""$ext_output" 1>&6 +- +- +- +- +- +-php_with_onig=no +- +-echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6 +-echo "configure:56522: checking for external oniguruma" >&5 +-# Check whether --with-onig or --without-onig was given. +-if test "${with_onig+set}" = set; then +- withval="$with_onig" +- PHP_ONIG=$withval +-else + save_ext_shared=$ext_shared + ext_shared=yes -+ + +- PHP_ONIG=no + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) @@ -13055,7 +13241,7 @@ + LDFLAGS="$LDFLAGS -pthread" + else + -+ + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" @@ -13067,7 +13253,7 @@ -fi - - --ext_output=$PHP_LIBMBFL +-ext_output=$PHP_ONIG -echo "$ac_t""$ext_output" 1>&6 - + fi @@ -13096,8 +13282,11 @@ + ;; + esac +-if test "$PHP_MBSTRING" != "no"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_MBSTRING 1 +-EOF --php_with_onig=no + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -13114,13 +13303,6 @@ + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi --echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6 --echo "configure:56211: checking for external oniguruma" >&5 --# Check whether --with-onig or --without-onig was given. --if test "${with_onig+set}" = set; then -- withval="$with_onig" -- PHP_ONIG=$withval --else + + if test "$ext_shared" = "yes"; then + LDFLAGS="-L$ai_p $LDFLAGS" @@ -13128,14 +13310,8 @@ + else + -- PHP_ONIG=no - -- --fi -- -- --ext_output=$PHP_ONIG --echo "$ac_t""$ext_output" 1>&6 +- PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c" ++ + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" @@ -13149,40 +13325,27 @@ + fi -+ fi -+ -+ fi - -+ ;; -+ esac -+ done - --if test "$PHP_MBSTRING" != "no"; then -- cat >> confdefs.h <<\EOF --#define HAVE_MBSTRING 1 --EOF -- -- -- -- PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c" -- -- - if test "$PHP_MBREGEX" != "no"; then -- ++ fi + - if test "$PHP_MBREGEX" = "yes"; then - if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then - if test "$PHP_MBREGEX_BACKTRACK" != "no"; then - cat >> confdefs.h <<\EOF -#define USE_COMBINATION_EXPLOSION_CHECK 1 -EOF -- ++ fi + - fi -- ++ ;; ++ esac ++ done + - echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 --echo "configure:56252: checking for variable length prototypes and stdarg.h" >&5 +-echo "configure:56563: checking for variable length prototypes and stdarg.h" >&5 -if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then + echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6 -+echo "configure:57699: checking for $LIBSYMBOL in -l$LIBNAME" >&5 ++echo "configure:58021: 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 @@ -13201,11 +13364,11 @@ - -else - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:56596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - php_cv_mbstring_stdarg=yes -else @@ -13245,12 +13408,12 @@ -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:56306: checking for $ac_hdr" >&5 +-echo "configure:56617: 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 < +int main() { @@ -13258,10 +13421,10 @@ +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:56316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:56627: \"$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 -+if { (eval echo configure:57718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:58040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_lib_$ac_lib_var=yes" @@ -13289,7 +13452,7 @@ +LIBS="$ac_save_LIBS" - echo $ac_n "checking size of int""... $ac_c" 1>&6 --echo "configure:56343: checking size of int" >&5 +-echo "configure:56654: 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 @@ -13297,10 +13460,9 @@ - ac_cv_sizeof_int=4 -else - cat > conftest.$ac_ext < --#include -main() -{ - FILE *f=fopen("conftestval", "w"); @@ -13309,7 +13471,7 @@ - exit(0); -} -EOF --if { (eval echo configure:56363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:56673: \"$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 @@ -13370,7 +13532,7 @@ + fi - echo $ac_n "checking size of short""... $ac_c" 1>&6 --echo "configure:56383: checking size of short" >&5 +-echo "configure:56693: 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 @@ -13378,10 +13540,9 @@ - ac_cv_sizeof_short=2 -else - cat > conftest.$ac_ext < --#include -main() -{ - FILE *f=fopen("conftestval", "w"); @@ -13390,7 +13551,7 @@ - exit(0); -} -EOF --if { (eval echo configure:56403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:56712: \"$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 @@ -13416,7 +13577,7 @@ + - echo $ac_n "checking size of long""... $ac_c" 1>&6 --echo "configure:56423: checking size of long" >&5 +-echo "configure:56732: 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 @@ -13424,10 +13585,9 @@ - ac_cv_sizeof_long=4 -else - cat > conftest.$ac_ext < --#include -main() -{ - FILE *f=fopen("conftestval", "w"); @@ -13436,7 +13596,7 @@ - exit(0); -} -EOF --if { (eval echo configure:56443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:56751: \"$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 @@ -13484,12 +13644,12 @@ - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:56463: checking for working const" >&5 +-echo "configure:56771: 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 <&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:56825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes -else @@ -13571,12 +13731,12 @@ -fi - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:56538: checking whether time.h and sys/time.h may both be included" >&5 +-echo "configure:56846: 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 < -#include @@ -13585,7 +13745,7 @@ -struct tm *tp; -; return 0; } -EOF --if { (eval echo configure:56552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:56860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes + @@ -13597,33 +13757,41 @@ - ac_cv_header_time=no -fi -rm -f conftest* --fi -- ++ echo "$ac_t""no" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_$LIBNAME_$LIBSYMBOL ++ ++ { echo "configure: error: wrong libevent version {1.4.+ is required} or lib not found" 1>&2; exit 1; } ++ ++ + fi + -echo "$ac_t""$ac_cv_header_time" 1>&6 -if test $ac_cv_header_time = yes; then - cat >> confdefs.h <<\EOF -#define TIME_WITH_SYS_TIME 1 -EOF -+ echo "$ac_t""no" 1>&6 -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:56575: checking for working alloca.h" >&5 +-echo "configure:56883: 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 < -int main() { -char *p = alloca(2 * sizeof(int)); -; return 0; } -EOF --if { (eval echo configure:56587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:56895: \"$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 @@ -13633,21 +13801,6 @@ - ac_cv_header_alloca_h=no -fi -rm -f conftest* -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_$LIBNAME_$LIBSYMBOL -+ -+ { echo "configure: error: wrong libevent version {1.4.+ is required} or lib not found" 1>&2; exit 1; } -+ -+ - fi - --echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 --if test $ac_cv_header_alloca_h = yes; then -- cat >> confdefs.h <<\EOF --#define HAVE_ALLOCA_H 1 --EOF - -fi + + am_i_shared=$PHP_LIBEVENT_SHARED @@ -13671,17 +13824,37 @@ + + PHP_VAR_SUBST="$PHP_VAR_SUBST LIBEVENT_SHARED_LIBADD" +-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 +-if test $ac_cv_header_alloca_h = yes; then +- cat >> confdefs.h <<\EOF +-#define HAVE_ALLOCA_H 1 +-EOF ++ ++ ext_builddir=ext/libevent ++ ext_srcdir=$abs_srcdir/ext/libevent + +-fi ++ ac_extra= + -echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:56608: checking for alloca" >&5 +-echo "configure:56916: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:56949: \"$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 @@ -13720,42 +13899,12 @@ -fi -rm -f conftest* -fi -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_LIBEVENT_SHARED=no -+ -+ -+ case ext/libevent in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 -if test $ac_cv_func_alloca_works = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_ALLOCA 1 -EOF -+ 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 - --fi - --if test $ac_cv_func_alloca_works = no; then -- # The SVR3 libPW and SVR4 libucb both contain incompatible functions -- # that cause trouble. Some versions do not even contain alloca or -- # contain a buggy version. If you still want to use their alloca, -- # use ar to extract alloca.o from them instead of compiling alloca.c. -- ALLOCA=alloca.${ac_objext} -- cat >> confdefs.h <<\EOF --#define C_ALLOCA 1 --EOF + old_IFS=$IFS + for ac_src in libevent.c; do + @@ -13766,6 +13915,7 @@ + + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +-fi + 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" ;; @@ -13773,26 +13923,34 @@ + *.cpp|*.cc|*.cxx) ac_comp="$b_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 +-if test $ac_cv_func_alloca_works = no; then +- # The SVR3 libPW and SVR4 libucb both contain incompatible functions +- # that cause trouble. Some versions do not even contain alloca or +- # contain a buggy version. If you still want to use their alloca, +- # use ar to extract alloca.o from them instead of compiling alloca.c. +- ALLOCA=alloca.${ac_objext} +- cat >> confdefs.h <<\EOF +-#define C_ALLOCA 1 ++ cat >>Makefile.objects<&6 --echo "configure:56673: checking whether alloca needs Cray hooks" >&5 +-echo "configure:56981: 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 <>Makefile.objects<&5 | +- egrep "webecray" >/dev/null 2>&1; then +- rm -rf conftest* +- ac_cv_os_cray=yes +-else +- rm -rf conftest* +- ac_cv_os_cray=no +-fi +-rm -f conftest* + b_c_pre=$shared_c_pre + b_cxx_pre=$shared_cxx_pre + b_c_meta=$shared_c_meta @@ -13816,8 +13984,27 @@ + b_c_post=$shared_c_post + b_cxx_post=$shared_cxx_post + b_lo=$shared_lo -+ -+ + +-fi + +-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:57011: 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 < +-/* 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(); + old_IFS=$IFS + for ac_src in libevent.c; do + @@ -13827,7 +14014,8 @@ + IFS=$old_IFS + + shared_objects_libevent="$shared_objects_libevent $ac_bdir$ac_obj.lo" -+ + +-int main() { + 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" ;; @@ -13835,45 +14023,25 @@ + *.cpp|*.cc|*.cxx) ac_comp="$b_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 +-/* 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 + cat >>Makefile.objects<&5 | -- egrep "webecray" >/dev/null 2>&1; then -- rm -rf conftest* -- ac_cv_os_cray=yes --else -- rm -rf conftest* -- ac_cv_os_cray=no --fi --rm -f conftest* ++EOF + done - --fi ++ + case $host_alias in + *netware*) + + install_modules="install-modules" - --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:56703: 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 < --/* 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(); ++ + case $host_alias in + *aix*) + suffix=so @@ -13888,8 +14056,7 @@ + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libevent) $(PHPLIBEVENT_SHARED_LIBADD)' + ;; + esac - --int main() { ++ + if test "x" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phplibevent.$suffix" + else @@ -13897,15 +14064,7 @@ + fi + + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libevent" - --/* 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 ++ + cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:57039: \"$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 @@ -14095,7 +14254,7 @@ fi -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:56758: checking stack direction for C alloca" >&5 +-echo "configure:57066: 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 + @@ -14124,7 +14283,7 @@ +php_enable_mbstring=no + +echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6 -+echo "configure:58191: checking whether to enable multibyte string support" >&5 ++echo "configure:58513: 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" @@ -14170,14 +14329,14 @@ +php_enable_mbregex=yes + +echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6 -+echo "configure:58235: checking whether to enable multibyte regex support" >&5 ++echo "configure:58557: 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" + PHP_MBREGEX=$enableval else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:57093: \"$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 + @@ -14216,7 +14375,7 @@ +php_enable_mbregex_backtrack=yes + +echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6 -+echo "configure:58258: checking whether to check multibyte regex backtrack" >&5 ++echo "configure:58580: 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" @@ -14244,7 +14403,7 @@ +php_with_libmbfl=no + +echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6 -+echo "configure:58281: checking for external libmbfl" >&5 ++echo "configure:58603: checking for external libmbfl" >&5 +# Check whether --with-libmbfl or --without-libmbfl was given. +if test "${with_libmbfl+set}" = set; then + withval="$with_libmbfl" @@ -14267,7 +14426,7 @@ +php_with_onig=no + +echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6 -+echo "configure:58304: checking for external oniguruma" >&5 ++echo "configure:58626: checking for external oniguruma" >&5 +# Check whether --with-onig or --without-onig was given. +if test "${with_onig+set}" = set; then + withval="$with_onig" @@ -14297,7 +14456,7 @@ -fi - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:56807: checking for 8-bit clean memcmp" >&5 +-echo "configure:57115: checking for 8-bit clean memcmp" >&5 -if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then + + PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c" @@ -14315,7 +14474,7 @@ + fi + + echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 -+echo "configure:58345: checking for variable length prototypes and stdarg.h" >&5 ++echo "configure:58667: checking for variable length prototypes and stdarg.h" >&5 +if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14335,8 +14494,8 @@ + else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:58378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:57133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:58700: \"$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 + php_cv_mbstring_stdarg=yes @@ -14380,29 +14539,29 @@ - ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6 --echo "configure:56844: checking for stdarg.h" >&5 +-echo "configure:57152: checking for stdarg.h" >&5 + for ac_hdr in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:58399: checking for $ac_hdr" >&5 ++echo "configure:58721: 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 < +#include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:56854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:58409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:57162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:58731: \"$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* -@@ -56866,9 +58421,547 @@ rm -f conftest* +@@ -57174,322 +58743,860 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -14412,15 +14571,36 @@ + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 -+fi + else + echo "$ac_t""no" 1>&6 + fi +done -+ + +- cat >> confdefs.h <<\EOF +-#define PHP_ONIG_BUNDLED 1 +-EOF +- +- cat >> confdefs.h <<\EOF +-#define HAVE_ONIG 1 +-EOF +- +- +- PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DNOT_RUBY" +- +- +- PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma" +- +- +- PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma/enc" +- +- +- PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES oniguruma" + echo $ac_n "checking size of int""... $ac_c" 1>&6 -+echo "configure:58436: checking size of int" >&5 ++echo "configure:58758: 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 @@ -14428,7 +14608,7 @@ + ac_cv_sizeof_int=4 +else + cat > conftest.$ac_ext < +#include @@ -14440,7 +14620,7 @@ + exit(0); +} +EOF -+if { (eval echo configure:58456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:58778: \"$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 @@ -14451,16 +14631,63 @@ +fi +rm -fr conftest* +fi -+ + +- +- PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS oniguruma/config.h" +fi +echo "$ac_t""$ac_cv_sizeof_int" 1>&6 +cat >> confdefs.h <&6 -+echo "configure:58476: checking size of short" >&5 ++echo "configure:58798: 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 @@ -14468,7 +14695,7 @@ + ac_cv_sizeof_short=2 +else + cat > conftest.$ac_ext < +#include @@ -14480,7 +14707,7 @@ + exit(0); +} +EOF -+if { (eval echo configure:58496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:58818: \"$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 @@ -14491,16 +14718,48 @@ +fi +rm -fr conftest* +fi -+ + +- else +- if test ! -f "$PHP_ONIG/include/oniguruma.h"; then +- { echo "configure: error: oniguruma.h not found in $PHP_ONIG/include" 1>&2; exit 1; } +- fi +- +- if test "$PHP_ONIG/include" != "/usr/include"; then +- +- if test -z "$PHP_ONIG/include" || echo "$PHP_ONIG/include" | grep '^/' >/dev/null ; then +- ai_p=$PHP_ONIG/include +- else +- +- ep_dir="`echo $PHP_ONIG/include|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$PHP_ONIG/include\"`" +- fi +fi +echo "$ac_t""$ac_cv_sizeof_short" 1>&6 +cat >> confdefs.h <&6 -+echo "configure:58516: checking size of long" >&5 ++echo "configure:58838: 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 @@ -14508,7 +14767,7 @@ + ac_cv_sizeof_long=4 +else + cat > conftest.$ac_ext < +#include @@ -14520,7 +14779,7 @@ + exit(0); +} +EOF -+if { (eval echo configure:58536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:58858: \"$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 @@ -14531,25 +14790,72 @@ +fi +rm -fr conftest* +fi -+ + +fi +echo "$ac_t""$ac_cv_sizeof_long" 1>&6 +cat >> confdefs.h <&6 -+echo "configure:58556: checking for working const" >&5 ++echo "configure:58878: 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 </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 +; return 0; } +EOF -+if { (eval echo configure:58610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:58932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes +else @@ -14605,22 +14926,44 @@ +fi +rm -f conftest* +fi -+ + +- +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$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 +echo "$ac_t""$ac_cv_c_const" 1>&6 +if test $ac_cv_c_const = no; then + cat >> confdefs.h <<\EOF +#define const +EOF -+ + +fi -+ + +- fi +- +- fi + echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -+echo "configure:58631: checking whether time.h and sys/time.h may both be included" >&5 ++echo "configure:58953: 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 < +#include @@ -14629,7 +14972,7 @@ +struct tm *tp; +; return 0; } +EOF -+if { (eval echo configure:58645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:58967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes +else @@ -14640,40 +14983,61 @@ +fi +rm -f conftest* +fi -+ + +- ;; +- esac +- done +echo "$ac_t""$ac_cv_header_time" 1>&6 +if test $ac_cv_header_time = yes; then + cat >> confdefs.h <<\EOF +#define TIME_WITH_SYS_TIME 1 +EOF -+ + +- echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6 +-echo "configure:57392: checking for onig_init in -lonig" >&5 +-ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +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:58668: checking for working alloca.h" >&5 ++echo "configure:58990: 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 + echo $ac_n "(cached) $ac_c" 1>&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lonig $LIBS" +-cat > conftest.$ac_ext < conftest.$ac_ext < -+int main() { + int main() { +-onig_init() +char *p = alloca(2 * sizeof(int)); -+; return 0; } -+EOF -+if { (eval echo configure:58680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* + ; return 0; } + EOF +-if { (eval echo configure:57411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:59002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" + ac_cv_header_alloca_h=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" + ac_cv_header_alloca_h=no -+fi -+rm -f conftest* + fi + rm -f conftest* +-LIBS="$ac_save_LIBS" +fi + +echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 @@ -14681,18 +15045,59 @@ + cat >> confdefs.h <<\EOF +#define HAVE_ALLOCA_H 1 +EOF -+ -+fi -+ + + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- +- + +- if test "$ext_shared" = "yes"; then +- MBSTRING_SHARED_LIBADD="-lonig $MBSTRING_SHARED_LIBADD" +- if test -n "$PHP_ONIG/$PHP_LIBDIR"; then +- +- if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then +- +- if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$PHP_ONIG/$PHP_LIBDIR +- else +- +- ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`" +- fi +echo $ac_n "checking for alloca""... $ac_c" 1>&6 -+echo "configure:58701: checking for alloca" >&5 ++echo "configure:59023: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:59056: \"$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 @@ -14729,15 +15134,34 @@ +fi +rm -f conftest* +fi -+ + +- fi +- +- fi +echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 +if test $ac_cv_func_alloca_works = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_ALLOCA 1 +EOF -+ + +- fi +- else +- +fi -+ + +- if test -n "$PHP_ONIG/$PHP_LIBDIR"; then +- +- if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then +- +- if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$PHP_ONIG/$PHP_LIBDIR +- else +- +- ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`" +- fi +if test $ac_cv_func_alloca_works = no; then + # The SVR3 libPW and SVR4 libucb both contain incompatible functions + # that cause trouble. Some versions do not even contain alloca or @@ -14747,15 +15171,18 @@ + cat >> confdefs.h <<\EOF +#define C_ALLOCA 1 +EOF -+ + +- +- +- + +echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -+echo "configure:58766: checking whether alloca needs Cray hooks" >&5 ++echo "configure:59088: 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 <&6 -+echo "configure:58796: checking for $ac_func" >&5 ++echo "configure:59118: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:59146: \"$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 @@ -14835,7 +15262,7 @@ +fi + +echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -+echo "configure:58851: checking stack direction for C alloca" >&5 ++echo "configure:59173: 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 @@ -14843,7 +15270,7 @@ + ac_cv_c_stack_direction=0 +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:59200: \"$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 @@ -14884,7 +15311,7 @@ +fi + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -+echo "configure:58900: checking for 8-bit clean memcmp" >&5 ++echo "configure:59222: 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 @@ -14892,7 +15319,7 @@ + ac_cv_func_memcmp_clean=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:59240: \"$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 @@ -14921,17 +15348,17 @@ + + ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6 -+echo "configure:58937: checking for stdarg.h" >&5 ++echo "configure:59259: checking for stdarg.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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:58947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:59269: \"$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* @@ -14950,2325 +15377,2620 @@ + + cat >> confdefs.h <<\EOF +#define HAVE_STDARG_PROTOTYPES 1 - EOF - - -@@ -57080,7 +59173,7 @@ EOF - done - - echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6 --echo "configure:57084: checking for onig_init in -lonig" >&5 -+echo "configure:59177: checking for onig_init in -lonig" >&5 - ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -57088,7 +59181,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lonig $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:59196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -57325,9 +59418,9 @@ fi ++EOF ++ ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ cat >> confdefs.h <<\EOF ++#define PHP_ONIG_BUNDLED 1 ++EOF ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_ONIG 1 ++EOF ++ ++ ++ PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DNOT_RUBY" ++ ++ ++ PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma" ++ ++ ++ PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma/enc" ++ ++ ++ PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES oniguruma" ++ ++ ++ PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS oniguruma/config.h" ++ ++ ++ PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES ++ oniguruma/regcomp.c ++ oniguruma/regerror.c ++ oniguruma/regexec.c ++ oniguruma/reggnu.c ++ oniguruma/regparse.c ++ oniguruma/regenc.c ++ oniguruma/regext.c ++ oniguruma/regsyntax.c ++ oniguruma/regtrav.c ++ oniguruma/regversion.c ++ oniguruma/st.c ++ oniguruma/enc/unicode.c ++ oniguruma/enc/ascii.c ++ oniguruma/enc/utf8.c ++ oniguruma/enc/euc_jp.c ++ oniguruma/enc/euc_tw.c ++ oniguruma/enc/euc_kr.c ++ oniguruma/enc/sjis.c ++ oniguruma/enc/iso8859_1.c ++ oniguruma/enc/iso8859_2.c ++ oniguruma/enc/iso8859_3.c ++ oniguruma/enc/iso8859_4.c ++ oniguruma/enc/iso8859_5.c ++ oniguruma/enc/iso8859_6.c ++ oniguruma/enc/iso8859_7.c ++ oniguruma/enc/iso8859_8.c ++ oniguruma/enc/iso8859_9.c ++ oniguruma/enc/iso8859_10.c ++ oniguruma/enc/iso8859_11.c ++ oniguruma/enc/iso8859_13.c ++ oniguruma/enc/iso8859_14.c ++ oniguruma/enc/iso8859_15.c ++ oniguruma/enc/iso8859_16.c ++ oniguruma/enc/koi8.c ++ oniguruma/enc/koi8_r.c ++ oniguruma/enc/big5.c ++ oniguruma/enc/utf16_be.c ++ oniguruma/enc/utf16_le.c ++ oniguruma/enc/utf32_be.c ++ oniguruma/enc/utf32_le.c ++ " ++ ++ ++ PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS oniguruma/oniguruma.h" ++ ++ else ++ if test ! -f "$PHP_ONIG/include/oniguruma.h"; then ++ { echo "configure: error: oniguruma.h not found in $PHP_ONIG/include" 1>&2; exit 1; } ++ fi ++ ++ if test "$PHP_ONIG/include" != "/usr/include"; then ++ ++ if test -z "$PHP_ONIG/include" || echo "$PHP_ONIG/include" | grep '^/' >/dev/null ; then ++ ai_p=$PHP_ONIG/include ++ else ++ ++ ep_dir="`echo $PHP_ONIG/include|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$PHP_ONIG/include\"`" ++ fi ++ ++ ++ ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "INCLUDEPATH$unique=set" ++ ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" ++ fi ++ ++ fi ++ ++ fi ++ ++ ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff=" ++ -L$PHP_ONIG/$PHP_LIBDIR ++ " ++ ++ 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="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$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 onig_init in -lonig""... $ac_c" 1>&6 ++echo "configure:59499: checking for onig_init in -lonig" >&5 ++ac_lib_var=`echo onig'_'onig_init | 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="-lonig $LIBS" ++cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ ++ ++ ++ if test "$ext_shared" = "yes"; then ++ MBSTRING_SHARED_LIBADD="-lonig $MBSTRING_SHARED_LIBADD" ++ if test -n "$PHP_ONIG/$PHP_LIBDIR"; then ++ ++ if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$PHP_ONIG/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_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_ONIG/$PHP_LIBDIR"; then ++ ++ if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then ++ ++ if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$PHP_ONIG/$PHP_LIBDIR ++ else ++ ++ ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`" ++ fi ++ ++ ++ ++ + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + +@@ -57633,9 +59740,9 @@ fi done echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6 --echo "configure:57329: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 -+echo "configure:59422: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 +-echo "configure:57637: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 ++echo "configure:59744: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 cat > conftest.$ac_ext < -@@ -57338,7 +59431,7 @@ return (int)(ONIG_ENCODING_KOI8 + 1); +@@ -57646,7 +59753,7 @@ return (int)(ONIG_ENCODING_KOI8 + 1); ; return 0; } EOF --if { (eval echo configure:57342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:59435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:57650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:59757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""no" 1>&6 -@@ -57636,7 +59729,7 @@ EOF +@@ -57944,7 +60051,7 @@ EOF done echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6 --echo "configure:57640: checking for mbfl_buffer_converter_new in -lmbfl" >&5 -+echo "configure:59733: checking for mbfl_buffer_converter_new in -lmbfl" >&5 +-echo "configure:57948: checking for mbfl_buffer_converter_new in -lmbfl" >&5 ++echo "configure:60055: 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 -@@ -57644,7 +59737,7 @@ else +@@ -57952,7 +60059,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmbfl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:59752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:57967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:60074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -58292,7 +60385,7 @@ fi +@@ -58600,7 +60707,7 @@ fi php_with_mcrypt=no echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6 --echo "configure:58296: checking for mcrypt support" >&5 -+echo "configure:60389: checking for mcrypt support" >&5 +-echo "configure:58604: checking for mcrypt support" >&5 ++echo "configure:60711: checking for mcrypt support" >&5 # Check whether --with-mcrypt or --without-mcrypt was given. if test "${with_mcrypt+set}" = set; then withval="$with_mcrypt" -@@ -58345,9 +60438,9 @@ if test "$PHP_MCRYPT" != "no"; then +@@ -58653,9 +60760,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:58349: checking for libmcrypt version" >&5 -+echo "configure:60442: checking for libmcrypt version" >&5 +-echo "configure:58657: checking for libmcrypt version" >&5 ++echo "configure:60764: checking for libmcrypt version" >&5 cat > conftest.$ac_ext < -@@ -58471,7 +60564,7 @@ rm -f conftest* +@@ -58779,7 +60886,7 @@ rm -f conftest* done echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 --echo "configure:58475: checking for mcrypt_module_open in -lmcrypt" >&5 -+echo "configure:60568: checking for mcrypt_module_open in -lmcrypt" >&5 +-echo "configure:58783: checking for mcrypt_module_open in -lmcrypt" >&5 ++echo "configure:60890: 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 -@@ -58479,7 +60572,7 @@ else +@@ -58787,7 +60894,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:60587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:58802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:60909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -58643,7 +60736,7 @@ else +@@ -58951,7 +61058,7 @@ else done echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 --echo "configure:58647: checking for mcrypt_module_open in -lmcrypt" >&5 -+echo "configure:60740: checking for mcrypt_module_open in -lmcrypt" >&5 +-echo "configure:58955: checking for mcrypt_module_open in -lmcrypt" >&5 ++echo "configure:61062: 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 -@@ -58651,7 +60744,7 @@ else +@@ -58959,7 +61066,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:60759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:58974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:61081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -59135,7 +61228,7 @@ fi +@@ -59443,7 +61550,7 @@ fi php_with_mssql=no echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6 --echo "configure:59139: checking for MSSQL support via FreeTDS" >&5 -+echo "configure:61232: checking for MSSQL support via FreeTDS" >&5 +-echo "configure:59447: checking for MSSQL support via FreeTDS" >&5 ++echo "configure:61554: 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" -@@ -59633,7 +61726,7 @@ EOF +@@ -59941,7 +62048,7 @@ EOF fi echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:59637: checking for dnet_addr in -ldnet_stub" >&5 -+echo "configure:61730: checking for dnet_addr in -ldnet_stub" >&5 +-echo "configure:59945: checking for dnet_addr in -ldnet_stub" >&5 ++echo "configure:62052: 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 -@@ -59641,7 +61734,7 @@ else +@@ -59949,7 +62056,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:61749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:59964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:62071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -59796,7 +61889,7 @@ fi +@@ -60104,7 +62211,7 @@ fi php_with_mysql=no echo $ac_n "checking for MySQL support""... $ac_c" 1>&6 --echo "configure:59800: checking for MySQL support" >&5 -+echo "configure:61893: checking for MySQL support" >&5 +-echo "configure:60108: checking for MySQL support" >&5 ++echo "configure:62215: checking for MySQL support" >&5 # Check whether --with-mysql or --without-mysql was given. if test "${with_mysql+set}" = set; then withval="$with_mysql" -@@ -59840,7 +61933,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -60148,7 +62255,7 @@ echo "$ac_t""$ext_output" 1>&6 php_with_mysql_sock=no echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6 --echo "configure:59844: checking for specified location of the MySQL UNIX socket" >&5 -+echo "configure:61937: checking for specified location of the MySQL UNIX socket" >&5 +-echo "configure:60152: checking for specified location of the MySQL UNIX socket" >&5 ++echo "configure:62259: 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" -@@ -59864,7 +61957,7 @@ if test -z "$PHP_ZLIB_DIR"; then +@@ -60172,7 +62279,7 @@ if test -z "$PHP_ZLIB_DIR"; then php_with_zlib_dir=no echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 --echo "configure:59868: checking for the location of libz" >&5 -+echo "configure:61961: checking for the location of libz" >&5 +-echo "configure:60176: checking for the location of libz" >&5 ++echo "configure:62283: 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" -@@ -60038,7 +62131,7 @@ Note that the MySQL client library is no +@@ -60346,7 +62453,7 @@ Note that the MySQL client library is no done echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:60042: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 -+echo "configure:62135: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 +-echo "configure:60350: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 ++echo "configure:62457: 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 -@@ -60046,7 +62139,7 @@ else +@@ -60354,7 +62461,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:62154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:60369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:62476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -60280,7 +62373,7 @@ else +@@ -60588,7 +62695,7 @@ else done echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:60284: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 -+echo "configure:62377: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 +-echo "configure:60592: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 ++echo "configure:62699: 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 -@@ -60288,7 +62381,7 @@ else +@@ -60596,7 +62703,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:62396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:60611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:62718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -60454,7 +62547,7 @@ fi +@@ -60762,7 +62869,7 @@ fi done echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:60458: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 -+echo "configure:62551: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 +-echo "configure:60766: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 ++echo "configure:62873: 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 -@@ -60462,7 +62555,7 @@ else +@@ -60770,7 +62877,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:62570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:60785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:62892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -60667,7 +62760,7 @@ fi +@@ -60975,7 +63082,7 @@ fi if test "$PHP_MYSQL" != "no"; then echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6 --echo "configure:60671: checking for MySQL UNIX socket location" >&5 -+echo "configure:62764: checking for MySQL UNIX socket location" >&5 +-echo "configure:60979: checking for MySQL UNIX socket location" >&5 ++echo "configure:63086: 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 <&6 --echo "configure:61044: checking for MySQLi support" >&5 -+echo "configure:63137: checking for MySQLi support" >&5 +-echo "configure:61352: checking for MySQLi support" >&5 ++echo "configure:63459: checking for MySQLi support" >&5 # Check whether --with-mysqli or --without-mysqli was given. if test "${with_mysqli+set}" = set; then withval="$with_mysqli" -@@ -61084,7 +63177,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -61392,7 +63499,7 @@ echo "$ac_t""$ext_output" 1>&6 php_enable_embedded_mysqli=no echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6 --echo "configure:61088: checking whether to enable embedded MySQLi support" >&5 -+echo "configure:63181: checking whether to enable embedded MySQLi support" >&5 +-echo "configure:61396: checking whether to enable embedded MySQLi support" >&5 ++echo "configure:63503: 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" -@@ -61235,7 +63328,7 @@ EOF +@@ -61543,7 +63650,7 @@ EOF done echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 --echo "configure:61239: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 -+echo "configure:63332: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 +-echo "configure:61547: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 ++echo "configure:63654: 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 -@@ -61243,7 +63336,7 @@ else +@@ -61551,7 +63658,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIB_NAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:63351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:61566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:63673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -61502,7 +63595,7 @@ EOF +@@ -61810,7 +63917,7 @@ EOF done echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 --echo "configure:61506: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 -+echo "configure:63599: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 +-echo "configure:61814: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 ++echo "configure:63921: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_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 -@@ -61510,7 +63603,7 @@ else +@@ -61818,7 +63925,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIB_NAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:63618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:61833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:63940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -61665,7 +63758,7 @@ fi +@@ -61973,7 +64080,7 @@ fi done echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 --echo "configure:61669: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 -+echo "configure:63762: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 +-echo "configure:61977: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 ++echo "configure:64084: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -61673,7 +63766,7 @@ else +@@ -61981,7 +64088,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIB_NAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:63781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:61996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:64103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -62087,7 +64180,7 @@ fi +@@ -62395,7 +64502,7 @@ fi php_with_oci8=no echo $ac_n "checking for Oracle Database OCI8 support""... $ac_c" 1>&6 --echo "configure:62091: checking for Oracle Database OCI8 support" >&5 -+echo "configure:64184: checking for Oracle Database OCI8 support" >&5 +-echo "configure:62399: checking for Oracle Database OCI8 support" >&5 ++echo "configure:64506: checking for Oracle Database OCI8 support" >&5 # Check whether --with-oci8 or --without-oci8 was given. if test "${with_oci8+set}" = set; then withval="$with_oci8" -@@ -62135,7 +64228,7 @@ if test "$PHP_OCI8" != "no"; then +@@ -62443,7 +64550,7 @@ if test "$PHP_OCI8" != "no"; then echo $ac_n "checking PHP version""... $ac_c" 1>&6 --echo "configure:62139: checking PHP version" >&5 -+echo "configure:64232: checking PHP version" >&5 +-echo "configure:62447: checking PHP version" >&5 ++echo "configure:64554: checking PHP version" >&5 tmp_version=$PHP_VERSION if test -z "$tmp_version"; then -@@ -62167,7 +64260,7 @@ echo "configure:62139: checking PHP vers +@@ -62475,7 +64582,7 @@ echo "configure:62447: checking PHP vers echo $ac_n "checking size of long int""... $ac_c" 1>&6 --echo "configure:62171: checking size of long int" >&5 -+echo "configure:64264: checking size of long int" >&5 +-echo "configure:62479: checking size of long int" >&5 ++echo "configure:64586: 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 -@@ -62175,7 +64268,7 @@ else +@@ -62483,9 +64590,10 @@ else ac_cv_sizeof_long_int=4 else cat > conftest.$ac_ext < - #include -@@ -62187,7 +64280,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -62494,7 +64602,7 @@ main() exit(0); } EOF --if { (eval echo configure:62191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:64284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:62498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:64606: \"$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 -@@ -62207,7 +64300,7 @@ EOF +@@ -62514,7 +64622,7 @@ EOF echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6 --echo "configure:62211: checking checking if we're on a 64-bit platform" >&5 -+echo "configure:64304: checking checking if we're on a 64-bit platform" >&5 +-echo "configure:62518: checking checking if we're on a 64-bit platform" >&5 ++echo "configure:64626: checking checking if we're on a 64-bit platform" >&5 if test "$ac_cv_sizeof_long_int" = "4"; then echo "$ac_t""no" 1>&6 PHP_OCI8_OH_LIBDIR=lib32 -@@ -62251,7 +64344,7 @@ echo "configure:62211: checking checking +@@ -62558,7 +64666,7 @@ echo "configure:62518: checking checking if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6 --echo "configure:62255: checking Oracle ORACLE_HOME install directory" >&5 -+echo "configure:64348: checking Oracle ORACLE_HOME install directory" >&5 +-echo "configure:62562: checking Oracle ORACLE_HOME install directory" >&5 ++echo "configure:64670: checking Oracle ORACLE_HOME install directory" >&5 if test "$PHP_OCI8" = "yes"; then OCI8_DIR=$ORACLE_HOME -@@ -62262,7 +64355,7 @@ echo "configure:62255: checking Oracle O +@@ -62569,7 +64677,7 @@ echo "configure:62562: checking Oracle O echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6 --echo "configure:62266: checking ORACLE_HOME library validity" >&5 -+echo "configure:64359: checking ORACLE_HOME library validity" >&5 +-echo "configure:62573: checking ORACLE_HOME library validity" >&5 ++echo "configure:64681: checking ORACLE_HOME library validity" >&5 if test ! -d "$OCI8_DIR"; then { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; } fi -@@ -62603,7 +64696,7 @@ echo "configure:62266: checking ORACLE_H +@@ -62910,7 +65018,7 @@ echo "configure:62573: checking ORACLE_H echo $ac_n "checking Oracle library version compatibility""... $ac_c" 1>&6 --echo "configure:62607: checking Oracle library version compatibility" >&5 -+echo "configure:64700: checking Oracle library version compatibility" >&5 +-echo "configure:62914: checking Oracle library version compatibility" >&5 ++echo "configure:65022: checking Oracle library version compatibility" >&5 OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g etc if test -s "$OCI8_DIR/orainst/unix.rgs"; then -@@ -62733,7 +64826,7 @@ echo "configure:62607: checking Oracle l +@@ -63040,7 +65148,7 @@ echo "configure:62914: checking Oracle l done echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 --echo "configure:62737: checking for OCIEnvNlsCreate in -lclntsh" >&5 -+echo "configure:64830: checking for OCIEnvNlsCreate in -lclntsh" >&5 +-echo "configure:63044: checking for OCIEnvNlsCreate in -lclntsh" >&5 ++echo "configure:65152: 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 -@@ -62741,7 +64834,7 @@ else +@@ -63048,7 +65156,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:64849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:63063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:65171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -63185,7 +65278,7 @@ EOF +@@ -63492,7 +65600,7 @@ EOF else echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6 --echo "configure:63189: checking Oracle Instant Client directory" >&5 -+echo "configure:65282: checking Oracle Instant Client directory" >&5 +-echo "configure:63496: checking Oracle Instant Client directory" >&5 ++echo "configure:65604: checking Oracle Instant Client directory" >&5 if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'` -@@ -63198,7 +65291,7 @@ echo "configure:63189: checking Oracle I +@@ -63505,7 +65613,7 @@ echo "configure:63496: checking Oracle I OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6 --echo "configure:63202: checking Oracle Instant Client SDK header directory" >&5 -+echo "configure:65295: checking Oracle Instant Client SDK header directory" >&5 +-echo "configure:63509: checking Oracle Instant Client SDK header directory" >&5 ++echo "configure:65617: checking Oracle Instant Client SDK header directory" >&5 OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'` -@@ -63407,7 +65500,7 @@ echo "configure:63202: checking Oracle I +@@ -63714,7 +65822,7 @@ echo "configure:63509: checking Oracle I echo $ac_n "checking Oracle Instant Client library version compatibility""... $ac_c" 1>&6 --echo "configure:63411: checking Oracle Instant Client library version compatibility" >&5 -+echo "configure:65504: checking Oracle Instant Client library version compatibility" >&5 +-echo "configure:63718: checking Oracle Instant Client library version compatibility" >&5 ++echo "configure:65826: checking Oracle Instant Client library version compatibility" >&5 OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g etc OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | tail -1` -@@ -63868,7 +65961,7 @@ esac +@@ -64175,7 +66283,7 @@ esac if test "$PHP_ADABAS" != "no"; then echo $ac_n "checking for Adabas support""... $ac_c" 1>&6 --echo "configure:63872: checking for Adabas support" >&5 -+echo "configure:65965: checking for Adabas support" >&5 +-echo "configure:64179: checking for Adabas support" >&5 ++echo "configure:66287: checking for Adabas support" >&5 if test "$PHP_ADABAS" = "yes"; then PHP_ADABAS=/usr/local fi -@@ -64071,7 +66164,7 @@ esac +@@ -64378,7 +66486,7 @@ esac if test "$PHP_SAPDB" != "no"; then echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6 --echo "configure:64075: checking for SAP DB support" >&5 -+echo "configure:66168: checking for SAP DB support" >&5 +-echo "configure:64382: checking for SAP DB support" >&5 ++echo "configure:66490: checking for SAP DB support" >&5 if test "$PHP_SAPDB" = "yes"; then PHP_SAPDB=/usr/local fi -@@ -64204,7 +66297,7 @@ esac +@@ -64511,7 +66619,7 @@ esac if test "$PHP_SOLID" != "no"; then echo $ac_n "checking for Solid support""... $ac_c" 1>&6 --echo "configure:64208: checking for Solid support" >&5 -+echo "configure:66301: checking for Solid support" >&5 +-echo "configure:64515: checking for Solid support" >&5 ++echo "configure:66623: checking for Solid support" >&5 if test "$PHP_SOLID" = "yes"; then PHP_SOLID=/usr/local/solid fi -@@ -64231,7 +66324,7 @@ EOF +@@ -64538,7 +66646,7 @@ EOF echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking Solid library file""... $ac_c" 1>&6 --echo "configure:64235: checking Solid library file" >&5 -+echo "configure:66328: checking Solid library file" >&5 +-echo "configure:64542: checking Solid library file" >&5 ++echo "configure:66650: 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 -@@ -64352,7 +66445,7 @@ esac +@@ -64659,7 +66767,7 @@ esac if test "$PHP_IBM_DB2" != "no"; then echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6 --echo "configure:64356: checking for IBM DB2 support" >&5 -+echo "configure:66449: checking for IBM DB2 support" >&5 +-echo "configure:64663: checking for IBM DB2 support" >&5 ++echo "configure:66771: checking for IBM DB2 support" >&5 if test "$PHP_IBM_DB2" = "yes"; then ODBC_INCDIR=/home/db2inst1/sqllib/include ODBC_LIBDIR=/home/db2inst1/sqllib/lib -@@ -64383,7 +66476,7 @@ fi +@@ -64690,7 +66798,7 @@ fi else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:66491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:64705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:66813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -64475,7 +66568,7 @@ esac +@@ -64782,7 +66890,7 @@ esac if test "$PHP_ODBCROUTER" != "no"; then echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6 --echo "configure:64479: checking for ODBCRouter.com support" >&5 -+echo "configure:66572: checking for ODBCRouter.com support" >&5 +-echo "configure:64786: checking for ODBCRouter.com support" >&5 ++echo "configure:66894: checking for ODBCRouter.com support" >&5 if test "$PHP_ODBCROUTER" = "yes"; then PHP_ODBCROUTER=/usr fi -@@ -64539,7 +66632,7 @@ esac +@@ -64846,7 +66954,7 @@ esac if test "$PHP_EMPRESS" != "no"; then echo $ac_n "checking for Empress support""... $ac_c" 1>&6 --echo "configure:64543: checking for Empress support" >&5 -+echo "configure:66636: checking for Empress support" >&5 +-echo "configure:64850: checking for Empress support" >&5 ++echo "configure:66958: checking for Empress support" >&5 if test "$PHP_EMPRESS" = "yes"; then ODBC_INCDIR=$EMPRESSPATH/include/odbc ODBC_LIBDIR=$EMPRESSPATH/shlib -@@ -64557,7 +66650,7 @@ EOF +@@ -64864,7 +66972,7 @@ EOF echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking Empress library file""... $ac_c" 1>&6 --echo "configure:64561: checking Empress library file" >&5 -+echo "configure:66654: checking Empress library file" >&5 +-echo "configure:64868: checking Empress library file" >&5 ++echo "configure:66976: 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` -@@ -64613,7 +66706,7 @@ esac +@@ -64920,7 +67028,7 @@ esac if test "$PHP_EMPRESS_BCS" != "no"; then echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6 --echo "configure:64617: checking for Empress local access support" >&5 -+echo "configure:66710: checking for Empress local access support" >&5 +-echo "configure:64924: checking for Empress local access support" >&5 ++echo "configure:67032: checking for Empress local access support" >&5 if test "$PHP_EMPRESS_BCS" = "yes"; then ODBC_INCDIR=$EMPRESSPATH/include/odbc ODBC_LIBDIR=$EMPRESSPATH/shlib -@@ -64647,7 +66740,7 @@ EOF +@@ -64954,7 +67062,7 @@ EOF echo "$ac_t""$ext_output" 1>&6 echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6 --echo "configure:64651: checking Empress local access library file" >&5 -+echo "configure:66744: checking Empress local access library file" >&5 +-echo "configure:64958: checking Empress local access library file" >&5 ++echo "configure:67066: 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` -@@ -64703,7 +66796,7 @@ esac +@@ -65010,7 +67118,7 @@ esac if test "$PHP_BIRDSTEP" != "no"; then echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6 --echo "configure:64707: checking for Birdstep support" >&5 -+echo "configure:66800: checking for Birdstep support" >&5 +-echo "configure:65014: checking for Birdstep support" >&5 ++echo "configure:67122: checking for Birdstep support" >&5 if test "$PHP_BIRDSTEP" = "yes"; then ODBC_INCDIR=/usr/local/birdstep/include ODBC_LIBDIR=/usr/local/birdstep/lib -@@ -64815,7 +66908,7 @@ esac +@@ -65122,7 +67230,7 @@ esac if test "$PHP_CUSTOM_ODBC" != "no"; then echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6 --echo "configure:64819: checking for a custom ODBC support" >&5 -+echo "configure:66912: checking for a custom ODBC support" >&5 +-echo "configure:65126: checking for a custom ODBC support" >&5 ++echo "configure:67234: checking for a custom ODBC support" >&5 if test "$PHP_CUSTOM_ODBC" = "yes"; then PHP_CUSTOM_ODBC=/usr/local fi -@@ -64879,7 +66972,7 @@ esac +@@ -65186,7 +67294,7 @@ esac if test "$PHP_IODBC" != "no"; then echo $ac_n "checking for iODBC support""... $ac_c" 1>&6 --echo "configure:64883: checking for iODBC support" >&5 -+echo "configure:66976: checking for iODBC support" >&5 +-echo "configure:65190: checking for iODBC support" >&5 ++echo "configure:67298: checking for iODBC support" >&5 if test "$PHP_IODBC" = "yes"; then PHP_IODBC=/usr/local fi -@@ -65025,7 +67118,7 @@ esac +@@ -65332,7 +67440,7 @@ esac if test "$PHP_ESOOB" != "no"; then echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6 --echo "configure:65029: checking for Easysoft ODBC-ODBC Bridge support" >&5 -+echo "configure:67122: checking for Easysoft ODBC-ODBC Bridge support" >&5 +-echo "configure:65336: checking for Easysoft ODBC-ODBC Bridge support" >&5 ++echo "configure:67444: checking for Easysoft ODBC-ODBC Bridge support" >&5 if test "$PHP_ESOOB" = "yes"; then PHP_ESOOB=/usr/local/easysoft/oob/client fi -@@ -65089,7 +67182,7 @@ esac +@@ -65396,7 +67504,7 @@ esac if test "$PHP_UNIXODBC" != "no"; then echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6 --echo "configure:65093: checking for unixODBC support" >&5 -+echo "configure:67186: checking for unixODBC support" >&5 +-echo "configure:65400: checking for unixODBC support" >&5 ++echo "configure:67508: checking for unixODBC support" >&5 if test "$PHP_UNIXODBC" = "yes"; then PHP_UNIXODBC=/usr/local fi -@@ -65158,7 +67251,7 @@ esac +@@ -65465,7 +67573,7 @@ esac if test "$PHP_DBMAKER" != "no"; then echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6 --echo "configure:65162: checking for DBMaker support" >&5 -+echo "configure:67255: checking for DBMaker support" >&5 +-echo "configure:65469: checking for DBMaker support" >&5 ++echo "configure:67577: checking for DBMaker support" >&5 if test "$PHP_DBMAKER" = "yes"; then # find dbmaker's home directory DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'` -@@ -65720,7 +67813,7 @@ fi +@@ -66027,7 +68135,7 @@ fi php_enable_pcntl=no echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6 --echo "configure:65724: checking whether to enable pcntl support" >&5 -+echo "configure:67817: checking whether to enable pcntl support" >&5 +-echo "configure:66031: checking whether to enable pcntl support" >&5 ++echo "configure:68139: 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" -@@ -65764,12 +67857,12 @@ if test "$PHP_PCNTL" != "no"; then +@@ -66071,12 +68179,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:65768: checking for $ac_func" >&5 -+echo "configure:67861: checking for $ac_func" >&5 +-echo "configure:66075: checking for $ac_func" >&5 ++echo "configure:68183: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:67889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:66103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:68211: \"$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 -@@ -65823,12 +67916,12 @@ done +@@ -66130,12 +68238,12 @@ done for ac_func in waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:65827: checking for $ac_func" >&5 -+echo "configure:67920: checking for $ac_func" >&5 +-echo "configure:66134: checking for $ac_func" >&5 ++echo "configure:68242: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:67948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:66162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:68270: \"$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 -@@ -65882,12 +67975,12 @@ done +@@ -66189,12 +68297,12 @@ done for ac_func in sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:65886: checking for $ac_func" >&5 -+echo "configure:67979: checking for $ac_func" >&5 +-echo "configure:66193: checking for $ac_func" >&5 ++echo "configure:68301: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:68007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:66221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:68329: \"$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 -@@ -65941,12 +68034,12 @@ done +@@ -66248,12 +68356,12 @@ done for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:65945: checking for $ac_func" >&5 -+echo "configure:68038: checking for $ac_func" >&5 +-echo "configure:66252: checking for $ac_func" >&5 ++echo "configure:68360: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:68066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:66280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:68388: \"$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 -@@ -66294,7 +68387,7 @@ fi +@@ -66601,7 +68709,7 @@ fi php_enable_pdo=yes echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6 --echo "configure:66298: checking whether to enable PDO support" >&5 -+echo "configure:68391: checking whether to enable PDO support" >&5 +-echo "configure:66605: checking whether to enable PDO support" >&5 ++echo "configure:68713: 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" -@@ -66728,7 +68821,7 @@ fi +@@ -67035,7 +69143,7 @@ fi php_with_pdo_dblib=no echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6 --echo "configure:66732: checking for PDO_DBLIB support via FreeTDS" >&5 -+echo "configure:68825: checking for PDO_DBLIB support via FreeTDS" >&5 +-echo "configure:67039: checking for PDO_DBLIB support via FreeTDS" >&5 ++echo "configure:69147: 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" -@@ -66945,13 +69038,13 @@ if test "$PHP_PDO_DBLIB" != "no"; then +@@ -67252,13 +69360,13 @@ if test "$PHP_PDO_DBLIB" != "no"; then echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:66949: checking for PDO includes" >&5 -+echo "configure:69042: checking for PDO includes" >&5 +-echo "configure:67256: checking for PDO includes" >&5 ++echo "configure:69364: 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:66955: checking for PDO includes" >&5 -+echo "configure:69048: checking for PDO includes" >&5 +-echo "configure:67262: checking for PDO includes" >&5 ++echo "configure:69370: 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 -@@ -67265,7 +69358,7 @@ EOF +@@ -67572,7 +69680,7 @@ EOF fi echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:67269: checking for dnet_addr in -ldnet_stub" >&5 -+echo "configure:69362: checking for dnet_addr in -ldnet_stub" >&5 +-echo "configure:67576: checking for dnet_addr in -ldnet_stub" >&5 ++echo "configure:69684: 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 -@@ -67273,7 +69366,7 @@ else +@@ -67580,7 +69688,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:69381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:67595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:69703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -67445,7 +69538,7 @@ fi +@@ -67752,7 +69860,7 @@ fi php_with_pdo_firebird=no echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6 --echo "configure:67449: checking for Firebird support for PDO" >&5 -+echo "configure:69542: checking for Firebird support for PDO" >&5 +-echo "configure:67756: checking for Firebird support for PDO" >&5 ++echo "configure:69864: 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" -@@ -67599,7 +69692,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; the +@@ -67906,7 +70014,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; the done echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 --echo "configure:67603: checking for isc_detach_database in -lfbclient" >&5 -+echo "configure:69696: checking for isc_detach_database in -lfbclient" >&5 +-echo "configure:67910: checking for isc_detach_database in -lfbclient" >&5 ++echo "configure:70018: 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 -@@ -67607,7 +69700,7 @@ else +@@ -67914,7 +70022,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfbclient $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:69715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:67929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:70037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -67745,7 +69838,7 @@ else +@@ -68052,7 +70160,7 @@ else done echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 --echo "configure:67749: checking for isc_detach_database in -lgds" >&5 -+echo "configure:69842: checking for isc_detach_database in -lgds" >&5 +-echo "configure:68056: checking for isc_detach_database in -lgds" >&5 ++echo "configure:70164: 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 -@@ -67753,7 +69846,7 @@ else +@@ -68060,7 +70168,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgds $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:69861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:68075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:70183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -67891,7 +69984,7 @@ else +@@ -68198,7 +70306,7 @@ else done echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 --echo "configure:67895: checking for isc_detach_database in -lib_util" >&5 -+echo "configure:69988: checking for isc_detach_database in -lib_util" >&5 +-echo "configure:68202: checking for isc_detach_database in -lib_util" >&5 ++echo "configure:70310: 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 -@@ -67899,7 +69992,7 @@ else +@@ -68206,7 +70314,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lib_util $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:70007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:68221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:70329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -67955,13 +70048,13 @@ fi +@@ -68262,13 +70370,13 @@ fi echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:67959: checking for PDO includes" >&5 -+echo "configure:70052: checking for PDO includes" >&5 +-echo "configure:68266: checking for PDO includes" >&5 ++echo "configure:70374: 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:67965: checking for PDO includes" >&5 -+echo "configure:70058: checking for PDO includes" >&5 +-echo "configure:68272: checking for PDO includes" >&5 ++echo "configure:70380: 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 -@@ -68433,7 +70526,7 @@ fi +@@ -68740,7 +70848,7 @@ fi php_with_pdo_mysql=no echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6 --echo "configure:68437: checking for MySQL support for PDO" >&5 -+echo "configure:70530: checking for MySQL support for PDO" >&5 +-echo "configure:68744: checking for MySQL support for PDO" >&5 ++echo "configure:70852: 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" -@@ -68478,7 +70571,7 @@ if test -z "$PHP_ZLIB_DIR"; then +@@ -68785,7 +70893,7 @@ if test -z "$PHP_ZLIB_DIR"; then php_with_zlib_dir=no echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 --echo "configure:68482: checking for the location of libz" >&5 -+echo "configure:70575: checking for the location of libz" >&5 +-echo "configure:68789: checking for the location of libz" >&5 ++echo "configure:70897: 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" -@@ -68542,14 +70635,14 @@ EOF +@@ -68849,14 +70957,14 @@ EOF echo $ac_n "checking for mysql_config""... $ac_c" 1>&6 --echo "configure:68546: checking for mysql_config" >&5 -+echo "configure:70639: checking for mysql_config" >&5 +-echo "configure:68853: checking for mysql_config" >&5 ++echo "configure:70961: checking for mysql_config" >&5 if test -n "$PDO_MYSQL_CONFIG"; then echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6 if test "x$SED" = "x"; then # 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:68553: checking for $ac_word" >&5 -+echo "configure:70646: checking for $ac_word" >&5 +-echo "configure:68860: checking for $ac_word" >&5 ++echo "configure:70968: 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 -@@ -68593,7 +70686,7 @@ fi +@@ -68900,7 +71008,7 @@ fi elif test -n "$PDO_MYSQL_DIR"; then echo "$ac_t""not found" 1>&6 echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6 --echo "configure:68597: checking for mysql install under $PDO_MYSQL_DIR" >&5 -+echo "configure:70690: checking for mysql install under $PDO_MYSQL_DIR" >&5 +-echo "configure:68904: checking for mysql install under $PDO_MYSQL_DIR" >&5 ++echo "configure:71012: 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 -@@ -68747,7 +70840,7 @@ echo "configure:68597: checking for mysq +@@ -69054,7 +71162,7 @@ echo "configure:68904: checking for mysq done echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:68751: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -+echo "configure:70844: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 +-echo "configure:69058: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ++echo "configure:71166: 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 -@@ -68755,7 +70848,7 @@ else +@@ -69062,7 +71170,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:70863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:69077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:71185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -69119,7 +71212,7 @@ else +@@ -69426,7 +71534,7 @@ else done echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:69123: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -+echo "configure:71216: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 +-echo "configure:69430: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ++echo "configure:71538: 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 -@@ -69127,7 +71220,7 @@ else +@@ -69434,7 +71542,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:71235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:69449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:71557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -69293,7 +71386,7 @@ fi +@@ -69600,7 +71708,7 @@ fi done echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:69297: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -+echo "configure:71390: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 +-echo "configure:69604: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ++echo "configure:71712: 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 -@@ -69301,7 +71394,7 @@ else +@@ -69608,7 +71716,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:71409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:69623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:71731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -69486,12 +71579,12 @@ fi +@@ -69793,12 +71901,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:69490: checking for $ac_func" >&5 -+echo "configure:71583: checking for $ac_func" >&5 +-echo "configure:69797: checking for $ac_func" >&5 ++echo "configure:71905: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:71611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:69825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:71933: \"$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 -@@ -69544,13 +71637,13 @@ done +@@ -69851,13 +71959,13 @@ done echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:69548: checking for PDO includes" >&5 -+echo "configure:71641: checking for PDO includes" >&5 +-echo "configure:69855: checking for PDO includes" >&5 ++echo "configure:71963: 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:69554: checking for PDO includes" >&5 -+echo "configure:71647: checking for PDO includes" >&5 +-echo "configure:69861: checking for PDO includes" >&5 ++echo "configure:71969: 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 -@@ -69935,7 +72028,7 @@ SUPPORTED_LIB_VERS="9.0 10.1 11.1" # Th +@@ -70242,7 +72350,7 @@ SUPPORTED_LIB_VERS="9.0 10.1 11.1" # Th php_with_pdo_oci=no echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6 --echo "configure:69939: checking Oracle OCI support for PDO" >&5 -+echo "configure:72032: checking Oracle OCI support for PDO" >&5 +-echo "configure:70246: checking Oracle OCI support for PDO" >&5 ++echo "configure:72354: 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" -@@ -69982,7 +72075,7 @@ if test "$PHP_PDO_OCI" != "no"; then +@@ -70289,7 +72397,7 @@ if test "$PHP_PDO_OCI" != "no"; then fi echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6 --echo "configure:69986: checking Oracle Install-Dir" >&5 -+echo "configure:72079: checking Oracle Install-Dir" >&5 +-echo "configure:70293: checking Oracle Install-Dir" >&5 ++echo "configure:72401: checking Oracle Install-Dir" >&5 if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then PDO_OCI_DIR=$ORACLE_HOME else -@@ -69991,7 +72084,7 @@ echo "configure:69986: checking Oracle I +@@ -70298,7 +72406,7 @@ echo "configure:70293: checking Oracle I echo "$ac_t""$PHP_PDO_OCI" 1>&6 echo $ac_n "checking if that is sane""... $ac_c" 1>&6 --echo "configure:69995: checking if that is sane" >&5 -+echo "configure:72088: checking if that is sane" >&5 +-echo "configure:70302: checking if that is sane" >&5 ++echo "configure:72410: 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 Instant Client SDK, or set ORACLE_HOME. -@@ -70002,7 +72095,7 @@ You need to tell me where to find your O +@@ -70309,7 +72417,7 @@ You need to tell me where to find your O if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then echo $ac_n "checking size of long int""... $ac_c" 1>&6 --echo "configure:70006: checking size of long int" >&5 -+echo "configure:72099: checking size of long int" >&5 +-echo "configure:70313: checking size of long int" >&5 ++echo "configure:72421: 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 -@@ -70010,7 +72103,7 @@ else +@@ -70317,9 +72425,10 @@ else ac_cv_sizeof_long_int=4 else cat > conftest.$ac_ext < - #include -@@ -70022,7 +72115,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -70328,7 +72437,7 @@ main() exit(0); } EOF --if { (eval echo configure:70026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:72119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:70332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:72441: \"$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 -@@ -70056,7 +72149,7 @@ EOF +@@ -70362,7 +72471,7 @@ EOF fi fi echo $ac_n "checking for oci.h""... $ac_c" 1>&6 --echo "configure:70060: checking for oci.h" >&5 -+echo "configure:72153: checking for oci.h" >&5 +-echo "configure:70366: checking for oci.h" >&5 ++echo "configure:72475: checking for oci.h" >&5 if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/oci.h ; then if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" != "/usr/include"; then -@@ -70205,7 +72298,7 @@ echo "configure:70060: checking for oci. +@@ -70511,7 +72620,7 @@ echo "configure:70366: checking for oci. else echo $ac_n "checking size of long int""... $ac_c" 1>&6 --echo "configure:70209: checking size of long int" >&5 -+echo "configure:72302: checking size of long int" >&5 +-echo "configure:70515: checking size of long int" >&5 ++echo "configure:72624: 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 -@@ -70213,7 +72306,7 @@ else +@@ -70519,9 +72628,10 @@ else ac_cv_sizeof_long_int=4 else cat > conftest.$ac_ext < - #include -@@ -70225,7 +72318,7 @@ main() ++#include + main() + { + FILE *f=fopen("conftestval", "w"); +@@ -70530,7 +72640,7 @@ main() exit(0); } EOF --if { (eval echo configure:70229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:72322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:70534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:72644: \"$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 -@@ -70245,7 +72338,7 @@ EOF +@@ -70550,7 +72660,7 @@ EOF echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6 --echo "configure:70249: checking if we're on a 64-bit platform" >&5 -+echo "configure:72342: checking if we're on a 64-bit platform" >&5 +-echo "configure:70554: checking if we're on a 64-bit platform" >&5 ++echo "configure:72664: checking if we're on a 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" -@@ -70255,7 +72348,7 @@ echo "configure:70249: checking if we're +@@ -70560,7 +72670,7 @@ echo "configure:70554: checking if we're fi echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6 --echo "configure:70259: checking OCI8 libraries dir" >&5 -+echo "configure:72352: checking OCI8 libraries dir" >&5 +-echo "configure:70564: checking OCI8 libraries dir" >&5 ++echo "configure:72674: checking OCI8 libraries dir" >&5 if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib" elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then -@@ -70622,7 +72715,7 @@ echo "configure:70259: checking OCI8 lib +@@ -70927,7 +73037,7 @@ echo "configure:70564: checking OCI8 lib fi echo $ac_n "checking Oracle version""... $ac_c" 1>&6 --echo "configure:70626: checking Oracle version" >&5 -+echo "configure:72719: checking Oracle version" >&5 +-echo "configure:70931: checking Oracle version" >&5 ++echo "configure:73041: checking Oracle version" >&5 for OCI_VER in $SUPPORTED_LIB_VERS; do if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then PDO_OCI_VERSION="$OCI_VER" -@@ -70804,7 +72897,7 @@ echo "configure:70626: checking Oracle v +@@ -71109,7 +73219,7 @@ echo "configure:70931: checking Oracle v done echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6 --echo "configure:70808: checking for OCIEnvCreate in -lclntsh" >&5 -+echo "configure:72901: checking for OCIEnvCreate in -lclntsh" >&5 +-echo "configure:71113: checking for OCIEnvCreate in -lclntsh" >&5 ++echo "configure:73223: 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 -@@ -70812,7 +72905,7 @@ else +@@ -71117,7 +73227,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:72920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:71132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:73242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -70957,7 +73050,7 @@ fi +@@ -71262,7 +73372,7 @@ fi done echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 --echo "configure:70961: checking for OCIEnvNlsCreate in -lclntsh" >&5 -+echo "configure:73054: checking for OCIEnvNlsCreate in -lclntsh" >&5 +-echo "configure:71266: checking for OCIEnvNlsCreate in -lclntsh" >&5 ++echo "configure:73376: 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 -@@ -70965,7 +73058,7 @@ else +@@ -71270,7 +73380,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:71285: \"$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 -@@ -71110,7 +73203,7 @@ fi +@@ -71415,7 +73525,7 @@ fi done echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6 --echo "configure:71114: checking for OCILobIsTemporary in -lclntsh" >&5 -+echo "configure:73207: checking for OCILobIsTemporary in -lclntsh" >&5 +-echo "configure:71419: checking for OCILobIsTemporary in -lclntsh" >&5 ++echo "configure:73529: 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 -@@ -71118,7 +73211,7 @@ else +@@ -71423,7 +73533,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:71438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:73548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -71259,7 +73352,7 @@ else +@@ -71564,7 +73674,7 @@ else done echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6 --echo "configure:71263: checking for OCILobIsTemporary in -locijdbc8" >&5 -+echo "configure:73356: checking for OCILobIsTemporary in -locijdbc8" >&5 +-echo "configure:71568: checking for OCILobIsTemporary in -locijdbc8" >&5 ++echo "configure:73678: 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 -@@ -71267,7 +73360,7 @@ else +@@ -71572,7 +73682,7 @@ else ac_save_LIBS="$LIBS" LIBS="-locijdbc8 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:71587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:73697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -71439,7 +73532,7 @@ fi +@@ -71744,7 +73854,7 @@ fi done echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6 --echo "configure:71443: checking for OCICollAssign in -lclntsh" >&5 -+echo "configure:73536: checking for OCICollAssign in -lclntsh" >&5 +-echo "configure:71748: checking for OCICollAssign in -lclntsh" >&5 ++echo "configure:73858: 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 -@@ -71447,7 +73540,7 @@ else +@@ -71752,7 +73862,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:71767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:73877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -71592,7 +73685,7 @@ fi +@@ -71897,7 +74007,7 @@ fi done echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6 --echo "configure:71596: checking for OCIStmtFetch2 in -lclntsh" >&5 -+echo "configure:73689: checking for OCIStmtFetch2 in -lclntsh" >&5 +-echo "configure:71901: checking for OCIStmtFetch2 in -lclntsh" >&5 ++echo "configure:74011: 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 -@@ -71600,7 +73693,7 @@ else +@@ -71905,7 +74015,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lclntsh $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:71920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:74030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -71650,13 +73743,13 @@ fi +@@ -71955,13 +74065,13 @@ fi echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:71654: checking for PDO includes" >&5 -+echo "configure:73747: checking for PDO includes" >&5 +-echo "configure:71959: checking for PDO includes" >&5 ++echo "configure:74069: 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:71660: checking for PDO includes" >&5 -+echo "configure:73753: checking for PDO includes" >&5 +-echo "configure:71965: checking for PDO includes" >&5 ++echo "configure:74075: 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 -@@ -72024,7 +74117,7 @@ fi +@@ -72329,7 +74439,7 @@ fi php_with_pdo_odbc=no echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6 --echo "configure:72028: checking for ODBC v3 support for PDO" >&5 -+echo "configure:74121: checking for ODBC v3 support for PDO" >&5 +-echo "configure:72333: checking for ODBC v3 support for PDO" >&5 ++echo "configure:74443: 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" -@@ -72076,13 +74169,13 @@ if test "$PHP_PDO_ODBC" != "no"; then +@@ -72381,13 +74491,13 @@ if test "$PHP_PDO_ODBC" != "no"; then echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:72080: checking for PDO includes" >&5 -+echo "configure:74173: checking for PDO includes" >&5 +-echo "configure:72385: checking for PDO includes" >&5 ++echo "configure:74495: 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:72086: checking for PDO includes" >&5 -+echo "configure:74179: checking for PDO includes" >&5 +-echo "configure:72391: checking for PDO includes" >&5 ++echo "configure:74501: 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 -@@ -72103,7 +74196,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6 +@@ -72408,7 +74518,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6 echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6 --echo "configure:72107: checking for selected PDO ODBC flavour" >&5 -+echo "configure:74200: checking for selected PDO ODBC flavour" >&5 +-echo "configure:72412: checking for selected PDO ODBC flavour" >&5 ++echo "configure:74522: 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`" -@@ -72182,7 +74275,7 @@ echo "configure:72107: checking for sele +@@ -72487,7 +74597,7 @@ echo "configure:72412: checking for sele echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72186: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74279: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72491: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74601: 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 -@@ -72196,7 +74289,7 @@ EOF +@@ -72501,7 +74611,7 @@ EOF echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72200: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74293: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72505: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74615: 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 -@@ -72210,7 +74303,7 @@ EOF +@@ -72515,7 +74625,7 @@ EOF echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72214: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74307: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72519: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74629: 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 -@@ -72224,7 +74317,7 @@ EOF +@@ -72529,7 +74639,7 @@ EOF echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72228: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74321: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72533: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74643: 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 -@@ -72238,7 +74331,7 @@ EOF +@@ -72543,7 +74653,7 @@ EOF echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72242: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74335: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72547: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74657: 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 -@@ -72252,7 +74345,7 @@ EOF +@@ -72557,7 +74667,7 @@ EOF echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72256: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74349: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72561: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74671: 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 -@@ -72266,7 +74359,7 @@ EOF +@@ -72571,7 +74681,7 @@ EOF echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72270: checking for sql.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74363: checking for sql.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72575: checking for sql.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74685: 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 -@@ -72280,7 +74373,7 @@ EOF +@@ -72585,7 +74695,7 @@ EOF echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72284: checking for isql.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74377: checking for isql.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72589: checking for isql.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74699: 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 -@@ -72294,7 +74387,7 @@ EOF +@@ -72599,7 +74709,7 @@ EOF echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72298: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74391: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72603: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74713: 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 -@@ -72308,7 +74401,7 @@ EOF +@@ -72613,7 +74723,7 @@ EOF echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72312: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74405: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72617: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74727: 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 -@@ -72322,7 +74415,7 @@ EOF +@@ -72627,7 +74737,7 @@ EOF echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72326: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74419: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72631: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74741: 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 -@@ -72336,7 +74429,7 @@ EOF +@@ -72641,7 +74751,7 @@ EOF echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72340: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74433: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72645: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74755: 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 -@@ -72350,7 +74443,7 @@ EOF +@@ -72655,7 +74765,7 @@ EOF echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72354: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74447: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72659: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74769: 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 -@@ -72364,7 +74457,7 @@ EOF +@@ -72669,7 +74779,7 @@ EOF echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72368: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74461: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72673: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74783: 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 -@@ -72378,7 +74471,7 @@ EOF +@@ -72683,7 +74793,7 @@ EOF echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72382: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74475: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72687: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74797: 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 -@@ -72392,7 +74485,7 @@ EOF +@@ -72697,7 +74807,7 @@ EOF echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72396: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74489: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72701: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74811: 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 -@@ -72406,7 +74499,7 @@ EOF +@@ -72711,7 +74821,7 @@ EOF echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72410: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74503: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72715: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74825: 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 -@@ -72420,7 +74513,7 @@ EOF +@@ -72725,7 +74835,7 @@ EOF echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72424: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74517: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 +-echo "configure:72729: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:74839: 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 -@@ -72626,7 +74719,7 @@ EOF +@@ -72931,7 +75041,7 @@ EOF done echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 --echo "configure:72630: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 -+echo "configure:74723: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 +-echo "configure:72935: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 ++echo "configure:75045: 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 -@@ -72634,7 +74727,7 @@ else +@@ -72939,7 +75049,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$pdo_odbc_def_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:74742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:72954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -72760,7 +74853,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -73065,7 +75175,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l done echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 --echo "configure:72764: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 -+echo "configure:74857: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 +-echo "configure:73069: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 ++echo "configure:75179: 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 -@@ -72768,7 +74861,7 @@ else +@@ -73073,7 +75183,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$pdo_odbc_def_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:74876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:73088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73153,7 +75246,7 @@ fi +@@ -73458,7 +75568,7 @@ fi php_with_pdo_pgsql=no echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6 --echo "configure:73157: checking for PostgreSQL support for PDO" >&5 -+echo "configure:75250: checking for PostgreSQL support for PDO" >&5 +-echo "configure:73462: checking for PostgreSQL support for PDO" >&5 ++echo "configure:75572: 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" -@@ -73212,7 +75305,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then +@@ -73517,7 +75627,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then echo $ac_n "checking for pg_config""... $ac_c" 1>&6 --echo "configure:73216: checking for pg_config" >&5 -+echo "configure:75309: checking for pg_config" >&5 +-echo "configure:73521: checking for pg_config" >&5 ++echo "configure:75631: 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" -@@ -73276,14 +75369,14 @@ EOF +@@ -73581,14 +75691,14 @@ EOF echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6 --echo "configure:73280: checking for openssl dependencies" >&5 -+echo "configure:75373: checking for openssl dependencies" >&5 +-echo "configure:73585: checking for openssl dependencies" >&5 ++echo "configure:75695: checking for openssl dependencies" >&5 grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1 if test $? -eq 0 ; then echo "$ac_t""yes" 1>&6 # 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:73287: checking for $ac_word" >&5 -+echo "configure:75380: checking for $ac_word" >&5 +-echo "configure:73592: checking for $ac_word" >&5 ++echo "configure:75702: 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 -@@ -73327,7 +75420,7 @@ fi +@@ -73632,7 +75742,7 @@ fi old_LDFLAGS=$LDFLAGS LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 --echo "configure:73331: checking for PQparameterStatus in -lpq" >&5 -+echo "configure:75424: checking for PQparameterStatus in -lpq" >&5 +-echo "configure:73636: checking for PQparameterStatus in -lpq" >&5 ++echo "configure:75746: 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 -@@ -73335,7 +75428,7 @@ else +@@ -73640,7 +75750,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:73655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73375,7 +75468,7 @@ fi +@@ -73680,7 +75790,7 @@ fi echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 --echo "configure:73379: checking for PQprepare in -lpq" >&5 -+echo "configure:75472: checking for PQprepare in -lpq" >&5 +-echo "configure:73684: checking for PQprepare in -lpq" >&5 ++echo "configure:75794: 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 -@@ -73383,7 +75476,7 @@ else +@@ -73688,7 +75798,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:73703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73418,7 +75511,7 @@ else +@@ -73723,7 +75833,7 @@ else fi echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 --echo "configure:73422: checking for PQescapeStringConn in -lpq" >&5 -+echo "configure:75515: checking for PQescapeStringConn in -lpq" >&5 +-echo "configure:73727: checking for PQescapeStringConn in -lpq" >&5 ++echo "configure:75837: 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 -@@ -73426,7 +75519,7 @@ else +@@ -73731,7 +75841,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:73746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73461,7 +75554,7 @@ else +@@ -73766,7 +75876,7 @@ else fi echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 --echo "configure:73465: checking for PQescapeByteaConn in -lpq" >&5 -+echo "configure:75558: checking for PQescapeByteaConn in -lpq" >&5 +-echo "configure:73770: checking for PQescapeByteaConn in -lpq" >&5 ++echo "configure:75880: 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 -@@ -73469,7 +75562,7 @@ else +@@ -73774,7 +75884,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:73789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73505,7 +75598,7 @@ fi +@@ -73810,7 +75920,7 @@ fi echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 --echo "configure:73509: checking for pg_encoding_to_char in -lpq" >&5 -+echo "configure:75602: checking for pg_encoding_to_char in -lpq" >&5 +-echo "configure:73814: checking for pg_encoding_to_char in -lpq" >&5 ++echo "configure:75924: 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 -@@ -73513,7 +75606,7 @@ else +@@ -73818,7 +75928,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:73833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -73688,13 +75781,13 @@ fi +@@ -73993,13 +76103,13 @@ fi echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:73692: checking for PDO includes" >&5 -+echo "configure:75785: checking for PDO includes" >&5 +-echo "configure:73997: checking for PDO includes" >&5 ++echo "configure:76107: 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:73698: checking for PDO includes" >&5 -+echo "configure:75791: checking for PDO includes" >&5 +-echo "configure:74003: checking for PDO includes" >&5 ++echo "configure:76113: 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 -@@ -74034,7 +76127,7 @@ fi +@@ -74339,7 +76449,7 @@ fi php_with_pdo_sqlite=$PHP_PDO echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6 --echo "configure:74038: checking for sqlite 3 support for PDO" >&5 -+echo "configure:76131: checking for sqlite 3 support for PDO" >&5 +-echo "configure:74343: checking for sqlite 3 support for PDO" >&5 ++echo "configure:76453: 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" -@@ -74083,13 +76176,13 @@ if test "$PHP_PDO_SQLITE" != "no"; then +@@ -74388,13 +76498,13 @@ if test "$PHP_PDO_SQLITE" != "no"; then echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:74087: checking for PDO includes" >&5 -+echo "configure:76180: checking for PDO includes" >&5 +-echo "configure:74392: checking for PDO includes" >&5 ++echo "configure:76502: 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:74093: checking for PDO includes" >&5 -+echo "configure:76186: checking for PDO includes" >&5 +-echo "configure:74398: checking for PDO includes" >&5 ++echo "configure:76508: 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 -@@ -74118,7 +76211,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6 +@@ -74423,7 +76533,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:74122: checking for sqlite3 files in default path" >&5 -+echo "configure:76215: checking for sqlite3 files in default path" >&5 +-echo "configure:74427: checking for sqlite3 files in default path" >&5 ++echo "configure:76537: 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 -@@ -74264,7 +76357,7 @@ echo "configure:74122: checking for sqli +@@ -74569,7 +76679,7 @@ echo "configure:74427: checking for sqli done echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6 --echo "configure:74268: checking for $LIBSYMBOL in -l$LIBNAME" >&5 -+echo "configure:76361: checking for $LIBSYMBOL in -l$LIBNAME" >&5 +-echo "configure:74573: checking for $LIBSYMBOL in -l$LIBNAME" >&5 ++echo "configure:76683: 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 -@@ -74272,7 +76365,7 @@ else +@@ -74577,7 +76687,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:76380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:74592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:76702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -74513,7 +76606,7 @@ fi +@@ -74818,7 +76928,7 @@ fi done echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 --echo "configure:74517: checking for sqlite3_key in -lsqlite3" >&5 -+echo "configure:76610: checking for sqlite3_key in -lsqlite3" >&5 +-echo "configure:74822: checking for sqlite3_key in -lsqlite3" >&5 ++echo "configure:76932: 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 -@@ -74521,7 +76614,7 @@ else +@@ -74826,7 +76936,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:76629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:74841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:76951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75273,12 +77366,12 @@ but you've either not enabled sqlite3, o +@@ -75578,12 +77688,12 @@ but you've either not enabled sqlite3, o for ac_func in usleep nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:75277: checking for $ac_func" >&5 -+echo "configure:77370: checking for $ac_func" >&5 +-echo "configure:75582: checking for $ac_func" >&5 ++echo "configure:77692: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:75610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:77720: \"$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 -@@ -75329,17 +77422,17 @@ done +@@ -75634,17 +77744,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:75333: checking for $ac_hdr" >&5 -+echo "configure:77426: checking for $ac_hdr" >&5 +-echo "configure:75638: checking for $ac_hdr" >&5 ++echo "configure:77748: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:75343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:77436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:75648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:77758: \"$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* -@@ -75463,7 +77556,7 @@ done +@@ -75768,7 +77878,7 @@ done done echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6 --echo "configure:75467: checking for fdatasync in -lrt" >&5 -+echo "configure:77560: checking for fdatasync in -lrt" >&5 +-echo "configure:75772: checking for fdatasync in -lrt" >&5 ++echo "configure:77882: 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 -@@ -75471,7 +77564,7 @@ else +@@ -75776,7 +77886,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:75791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:77901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75563,7 +77656,7 @@ fi +@@ -75868,7 +77978,7 @@ fi php_with_pgsql=no echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6 --echo "configure:75567: checking for PostgreSQL support" >&5 -+echo "configure:77660: checking for PostgreSQL support" >&5 +-echo "configure:75872: checking for PostgreSQL support" >&5 ++echo "configure:77982: checking for PostgreSQL support" >&5 # Check whether --with-pgsql or --without-pgsql was given. if test "${with_pgsql+set}" = set; then withval="$with_pgsql" -@@ -75617,7 +77710,7 @@ if test "$PHP_PGSQL" != "no"; then +@@ -75922,7 +78032,7 @@ if test "$PHP_PGSQL" != "no"; then echo $ac_n "checking for pg_config""... $ac_c" 1>&6 --echo "configure:75621: checking for pg_config" >&5 -+echo "configure:77714: checking for pg_config" >&5 +-echo "configure:75926: checking for pg_config" >&5 ++echo "configure:78036: 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" -@@ -75685,7 +77778,7 @@ EOF +@@ -75990,7 +78100,7 @@ EOF old_LDFLAGS=$LDFLAGS LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6 --echo "configure:75689: checking for PQescapeString in -lpq" >&5 -+echo "configure:77782: checking for PQescapeString in -lpq" >&5 +-echo "configure:75994: checking for PQescapeString in -lpq" >&5 ++echo "configure:78104: 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 -@@ -75693,7 +77786,7 @@ else +@@ -75998,7 +78108,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75728,7 +77821,7 @@ else +@@ -76033,7 +78143,7 @@ else fi echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6 --echo "configure:75732: checking for PQunescapeBytea in -lpq" >&5 -+echo "configure:77825: checking for PQunescapeBytea in -lpq" >&5 +-echo "configure:76037: checking for PQunescapeBytea in -lpq" >&5 ++echo "configure:78147: 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 -@@ -75736,7 +77829,7 @@ else +@@ -76041,7 +78151,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75771,7 +77864,7 @@ else +@@ -76076,7 +78186,7 @@ else fi echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6 --echo "configure:75775: checking for PQsetnonblocking in -lpq" >&5 -+echo "configure:77868: checking for PQsetnonblocking in -lpq" >&5 +-echo "configure:76080: checking for PQsetnonblocking in -lpq" >&5 ++echo "configure:78190: 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 -@@ -75779,7 +77872,7 @@ else +@@ -76084,7 +78194,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75814,7 +77907,7 @@ else +@@ -76119,7 +78229,7 @@ else fi echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6 --echo "configure:75818: checking for PQcmdTuples in -lpq" >&5 -+echo "configure:77911: checking for PQcmdTuples in -lpq" >&5 +-echo "configure:76123: checking for PQcmdTuples in -lpq" >&5 ++echo "configure:78233: 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 -@@ -75822,7 +77915,7 @@ else +@@ -76127,7 +78237,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75857,7 +77950,7 @@ else +@@ -76162,7 +78272,7 @@ else fi echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6 --echo "configure:75861: checking for PQoidValue in -lpq" >&5 -+echo "configure:77954: checking for PQoidValue in -lpq" >&5 +-echo "configure:76166: checking for PQoidValue in -lpq" >&5 ++echo "configure:78276: 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 -@@ -75865,7 +77958,7 @@ else +@@ -76170,7 +78280,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75900,7 +77993,7 @@ else +@@ -76205,7 +78315,7 @@ else fi echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6 --echo "configure:75904: checking for PQclientEncoding in -lpq" >&5 -+echo "configure:77997: checking for PQclientEncoding in -lpq" >&5 +-echo "configure:76209: checking for PQclientEncoding in -lpq" >&5 ++echo "configure:78319: 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 -@@ -75908,7 +78001,7 @@ else +@@ -76213,7 +78323,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75943,7 +78036,7 @@ else +@@ -76248,7 +78358,7 @@ else fi echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 --echo "configure:75947: checking for PQparameterStatus in -lpq" >&5 -+echo "configure:78040: checking for PQparameterStatus in -lpq" >&5 +-echo "configure:76252: checking for PQparameterStatus in -lpq" >&5 ++echo "configure:78362: 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 -@@ -75951,7 +78044,7 @@ else +@@ -76256,7 +78366,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -75986,7 +78079,7 @@ else +@@ -76291,7 +78401,7 @@ else fi echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6 --echo "configure:75990: checking for PQprotocolVersion in -lpq" >&5 -+echo "configure:78083: checking for PQprotocolVersion in -lpq" >&5 +-echo "configure:76295: checking for PQprotocolVersion in -lpq" >&5 ++echo "configure:78405: 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 -@@ -75994,7 +78087,7 @@ else +@@ -76299,7 +78409,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -76029,7 +78122,7 @@ else +@@ -76334,7 +78444,7 @@ else fi echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6 --echo "configure:76033: checking for PQtransactionStatus in -lpq" >&5 -+echo "configure:78126: checking for PQtransactionStatus in -lpq" >&5 +-echo "configure:76338: checking for PQtransactionStatus in -lpq" >&5 ++echo "configure:78448: 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 -@@ -76037,7 +78130,7 @@ else +@@ -76342,7 +78452,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -76072,7 +78165,7 @@ else +@@ -76377,7 +78487,7 @@ else fi echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6 --echo "configure:76076: checking for PQexecParams in -lpq" >&5 -+echo "configure:78169: checking for PQexecParams in -lpq" >&5 +-echo "configure:76381: checking for PQexecParams in -lpq" >&5 ++echo "configure:78491: 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 -@@ -76080,7 +78173,7 @@ else +@@ -76385,7 +78495,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:78188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -76110,891 +78203,2169 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -76415,891 +78525,2169 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l #define HAVE_PQEXECPARAMS 1 EOF @@ -17279,7 +18001,7 @@ +fi + + echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 -+echo "configure:78212: checking for PQprepare in -lpq" >&5 ++echo "configure:78534: 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 @@ -17287,7 +18009,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17322,7 +18044,7 @@ +fi + + echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6 -+echo "configure:78255: checking for PQexecPrepared in -lpq" >&5 ++echo "configure:78577: 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 @@ -17330,7 +18052,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17365,7 +18087,7 @@ +fi + + echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 -+echo "configure:78298: checking for PQresultErrorField in -lpq" >&5 ++echo "configure:78620: 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 @@ -17373,7 +18095,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17408,7 +18130,7 @@ +fi + + echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6 -+echo "configure:78341: checking for PQsendQueryParams in -lpq" >&5 ++echo "configure:78663: 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 @@ -17416,7 +18138,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17451,7 +18173,7 @@ +fi + + echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6 -+echo "configure:78384: checking for PQsendPrepare in -lpq" >&5 ++echo "configure:78706: 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 @@ -17459,7 +18181,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17494,7 +18216,7 @@ +fi + + echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6 -+echo "configure:78427: checking for PQsendQueryPrepared in -lpq" >&5 ++echo "configure:78749: 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 @@ -17502,7 +18224,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17537,7 +18259,7 @@ +fi + + echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6 -+echo "configure:78470: checking for PQputCopyData in -lpq" >&5 ++echo "configure:78792: 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 @@ -17545,7 +18267,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17580,7 +18302,7 @@ +fi + + echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6 -+echo "configure:78513: checking for PQputCopyEnd in -lpq" >&5 ++echo "configure:78835: 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 @@ -17588,7 +18310,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17623,7 +18345,7 @@ +fi + + echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6 -+echo "configure:78556: checking for PQgetCopyData in -lpq" >&5 ++echo "configure:78878: 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 @@ -17631,7 +18353,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17666,7 +18388,7 @@ +fi + + echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6 -+echo "configure:78599: checking for PQfreemem in -lpq" >&5 ++echo "configure:78921: 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 @@ -17674,7 +18396,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17709,7 +18431,7 @@ +fi + + echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6 -+echo "configure:78642: checking for PQsetErrorVerbosity in -lpq" >&5 ++echo "configure:78964: 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 @@ -17717,7 +18439,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:78983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17752,7 +18474,7 @@ +fi + + echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 -+echo "configure:78685: checking for PQftable in -lpq" >&5 ++echo "configure:79007: 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 @@ -17760,7 +18482,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:79026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17795,7 +18517,7 @@ +fi + + echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 -+echo "configure:78728: checking for PQescapeStringConn in -lpq" >&5 ++echo "configure:79050: 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 @@ -17803,7 +18525,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:79069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17838,7 +18560,7 @@ +fi + + echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 -+echo "configure:78771: checking for PQescapeByteaConn in -lpq" >&5 ++echo "configure:79093: 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 @@ -17846,7 +18568,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:79112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17881,7 +18603,7 @@ +fi + + echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 -+echo "configure:78814: checking for pg_encoding_to_char in -lpq" >&5 ++echo "configure:79136: 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 @@ -17889,7 +18611,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:79155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17924,7 +18646,7 @@ +fi + + echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6 -+echo "configure:78857: checking for lo_create in -lpq" >&5 ++echo "configure:79179: checking for lo_create in -lpq" >&5 +ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -17932,7 +18654,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:79198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -17967,7 +18689,7 @@ +fi + + echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6 -+echo "configure:78900: checking for lo_import_with_oid in -lpq" >&5 ++echo "configure:79222: checking for lo_import_with_oid in -lpq" >&5 +ac_lib_var=`echo pq'_'lo_import_with_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 @@ -17975,7 +18697,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lpq $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:79241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -18446,7 +19168,7 @@ +php_enable_phar=yes + +echo $ac_n "checking for phar archive support""... $ac_c" 1>&6 -+echo "configure:79379: checking for phar archive support" >&5 ++echo "configure:79701: checking for phar archive support" >&5 +# Check whether --enable-phar or --disable-phar was given. +if test "${enable_phar+set}" = set; then + enableval="$enable_phar" @@ -18780,7 +19502,7 @@ + fi + + echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6 -+echo "configure:79713: checking for phar openssl support" >&5 ++echo "configure:80035: checking for phar openssl support" >&5 + if test "$PHP_HASH_SHARED" != "yes"; then + if test "$PHP_HASH" != "no"; then + cat >> confdefs.h <<\EOF @@ -18851,7 +19573,7 @@ fi - echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 --echo "configure:76119: checking for PQprepare in -lpq" >&5 +-echo "configure:76424: 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 @@ -18859,7 +19581,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -18891,7 +19613,7 @@ +php_enable_posix=yes +echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6 -+echo "configure:79788: checking whether to enable POSIX-like functions" >&5 ++echo "configure:80110: 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" @@ -18905,7 +19627,7 @@ fi - echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6 --echo "configure:76162: checking for PQexecPrepared in -lpq" >&5 +-echo "configure:76467: 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 @@ -18913,7 +19635,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -18966,7 +19688,7 @@ -fi - echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 --echo "configure:76205: checking for PQresultErrorField in -lpq" >&5 +-echo "configure:76510: 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 @@ -18974,7 +19696,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -19018,7 +19740,7 @@ + ext_srcdir=$abs_srcdir/ext/posix - echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6 --echo "configure:76248: checking for PQsendQueryParams in -lpq" >&5 +-echo "configure:76553: 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 @@ -19026,7 +19748,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -19080,7 +19802,7 @@ -fi - echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6 --echo "configure:76291: checking for PQsendPrepare in -lpq" >&5 +-echo "configure:76596: 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 @@ -19088,7 +19810,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -19142,7 +19864,7 @@ -fi - echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6 --echo "configure:76334: checking for PQsendQueryPrepared in -lpq" >&5 +-echo "configure:76639: 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 @@ -19150,7 +19872,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -19216,7 +19938,7 @@ + shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo" - echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6 --echo "configure:76377: checking for PQputCopyData in -lpq" >&5 +-echo "configure:76682: 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 @@ -19224,7 +19946,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -19287,7 +20009,7 @@ + esac - echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6 --echo "configure:76420: checking for PQputCopyEnd in -lpq" >&5 +-echo "configure:76725: 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 @@ -19295,7 +20017,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -19347,7 +20069,7 @@ + install_modules="install-modules" - echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6 --echo "configure:76463: checking for PQgetCopyData in -lpq" >&5 +-echo "configure:76768: 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 @@ -19355,7 +20077,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -19447,7 +20169,7 @@ + b_lo=$php_lo - echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6 --echo "configure:76506: checking for PQfreemem in -lpq" >&5 +-echo "configure:76811: 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 @@ -19455,7 +20177,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -19510,7 +20232,7 @@ -fi - echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6 --echo "configure:76549: checking for PQsetErrorVerbosity in -lpq" >&5 +-echo "configure:76854: 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 @@ -19518,7 +20240,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -19581,7 +20303,7 @@ + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 --echo "configure:76592: checking for PQftable in -lpq" >&5 +-echo "configure:76897: 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 @@ -19589,7 +20311,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -19642,7 +20364,7 @@ + - echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 --echo "configure:76635: checking for PQescapeStringConn in -lpq" >&5 +-echo "configure:76940: 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 @@ -19650,7 +20372,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:76959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -19690,23 +20412,23 @@ -fi - echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 --echo "configure:76678: checking for PQescapeByteaConn in -lpq" >&5 +-echo "configure:76983: 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 + for ac_hdr in sys/mkdev.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:80130: checking for $ac_hdr" >&5 ++echo "configure:80452: 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 - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < EOF --if { (eval echo configure:76697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:77002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:80140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:80462: \"$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* @@ -19755,23 +20477,23 @@ +done - echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 --echo "configure:76721: checking for pg_encoding_to_char in -lpq" >&5 +-echo "configure:77026: 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 + + 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:80170: checking for $ac_func" >&5 ++echo "configure:80492: 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 - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:80198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:77045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:80520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_$ac_func=yes" @@ -19830,13 +20552,13 @@ +done - echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6 --echo "configure:76764: checking for lo_create in -lpq" >&5 +-echo "configure:77069: checking for lo_create in -lpq" >&5 -ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + + echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6 -+echo "configure:80224: checking for working ttyname_r() implementation" >&5 ++echo "configure:80546: 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 @@ -19845,9 +20567,9 @@ - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:77088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -+if { (eval echo configure:80244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:80566: \"$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 @@ -19905,21 +20627,21 @@ -fi - echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6 --echo "configure:76807: checking for lo_import_with_oid in -lpq" >&5 +-echo "configure:77112: checking for lo_import_with_oid in -lpq" >&5 -ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6 -+echo "configure:80266: checking for utsname.domainname" >&5 ++echo "configure:80588: checking for utsname.domainname" >&5 +if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lpq $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:80284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:77131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:80606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + @@ -20069,7 +20791,7 @@ +php_with_pspell=no +echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6 -+echo "configure:80315: checking for PSPELL support" >&5 ++echo "configure:80637: checking for PSPELL support" >&5 +# Check whether --with-pspell or --without-pspell was given. +if test "${with_pspell+set}" = set; then + withval="$with_pspell" @@ -20165,7 +20887,7 @@ esac -@@ -77009,7 +80380,7 @@ fi +@@ -77314,7 +80702,7 @@ fi old_IFS=$IFS @@ -20174,7 +20896,7 @@ IFS=. set $ac_src -@@ -77032,18 +80403,18 @@ EOF +@@ -77337,18 +80725,18 @@ EOF done @@ -20199,7 +20921,7 @@ esac -@@ -77058,14 +80429,14 @@ EOF +@@ -77363,14 +80751,14 @@ EOF old_IFS=$IFS @@ -20216,7 +20938,7 @@ 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" ;; -@@ -77088,31 +80459,31 @@ EOF +@@ -77393,31 +80781,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -20257,7 +20979,7 @@ $link_cmd EOF -@@ -77125,31 +80496,31 @@ EOF +@@ -77430,31 +80818,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -20298,7 +21020,7 @@ $link_cmd EOF -@@ -77157,22 +80528,22 @@ EOF +@@ -77462,22 +80850,22 @@ EOF ;; esac cat >> confdefs.h <&6 -+echo "configure:80865: checking for new_aspell_config in -laspell" >&5 ++echo "configure:81187: 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 @@ -20631,7 +21353,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-laspell $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:81206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -20850,7 +21572,7 @@ +php_with_libedit=no +echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6 -+echo "configure:81058: checking for libedit readline replacement" >&5 ++echo "configure:81380: 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" @@ -20864,7 +21586,7 @@ +fi -echo $ac_n "checking for phar archive support""... $ac_c" 1>&6 --echo "configure:77286: checking for phar archive support" >&5 +-echo "configure:77591: checking for phar archive support" >&5 -# Check whether --enable-phar or --disable-phar was given. -if test "${enable_phar+set}" = set; then - enableval="$enable_phar" @@ -20902,7 +21624,7 @@ +php_with_readline=no + +echo $ac_n "checking for readline support""... $ac_c" 1>&6 -+echo "configure:81103: checking for readline support" >&5 ++echo "configure:81425: checking for readline support" >&5 +# Check whether --with-readline or --without-readline was given. +if test "${with_readline+set}" = set; then + withval="$with_readline" @@ -20916,7 +21638,7 @@ fi -@@ -77298,12 +81115,12 @@ fi +@@ -77603,12 +81437,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -20932,7 +21654,7 @@ ;; no) ext_output=no -@@ -77321,764 +81138,1178 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -77626,764 +81460,1178 @@ echo "$ac_t""$ext_output" 1>&6 @@ -20989,7 +21711,7 @@ + + PHP_READLINE_LIBS="" + echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -+echo "configure:81189: checking for tgetent in -lncurses" >&5 ++echo "configure:81511: 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 @@ -20997,7 +21719,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lncurses $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:81530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -21057,7 +21779,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -+echo "configure:81253: checking for tgetent in -ltermcap" >&5 ++echo "configure:81575: 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 @@ -21065,7 +21787,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-ltermcap $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:81594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -21248,7 +21970,7 @@ + done + + echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -+echo "configure:81419: checking for readline in -lreadline" >&5 ++echo "configure:81741: 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 @@ -21256,7 +21978,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lreadline $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:81760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -21631,7 +22353,7 @@ - *.cpp|*.cc|*.cxx) ac_comp="$b_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 + echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6 -+echo "configure:81667: checking for rl_pending_input in -lreadline" >&5 ++echo "configure:81989: checking for rl_pending_input in -lreadline" >&5 +ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -21639,7 +22361,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lreadline $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:82008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -21790,7 +22512,7 @@ + esac - echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6 --echo "configure:77620: checking for phar openssl support" >&5 +-echo "configure:77925: checking for phar openssl support" >&5 - if test "$PHP_HASH_SHARED" != "yes"; then - if test "$PHP_HASH" != "no"; then - cat >> confdefs.h <<\EOF @@ -21845,7 +22567,6 @@ -but you've either not enabled hash, or have disabled it. -" 1>&2; exit 1; } - fi -- + + if test "$ext_shared" = "yes"; then + LDFLAGS="-L$ai_p $LDFLAGS" @@ -21853,6 +22574,7 @@ + else + + - am_i_shared=$PHP_PHAR_SHARED - is_it_shared=$PHP_SPL_SHARED - is_it_enabled=$PHP_SPL @@ -21870,15 +22592,8 @@ -but you've either not enabled spl, or have disabled it. -" 1>&2; exit 1; } - fi - + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- src=$ext_srcdir/Makefile.frag -- ac_srcdir=$ext_srcdir -- ac_builddir=$ext_builddir -- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -- --fi + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" @@ -21886,7 +22601,13 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" -+ + +- src=$ext_srcdir/Makefile.frag +- ac_srcdir=$ext_srcdir +- ac_builddir=$ext_builddir +- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments +- +-fi + fi @@ -21900,13 +22621,13 @@ + done -echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6 --echo "configure:77695: checking whether to enable POSIX-like functions" >&5 +-echo "configure:78000: 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" - PHP_POSIX=$enableval + echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6 -+echo "configure:81817: checking for rl_callback_read_char in -lreadline" >&5 ++echo "configure:82139: 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 @@ -21917,7 +22638,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lreadline $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:82158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -22071,7 +22792,7 @@ - *.cpp|*.cc|*.cxx) ac_comp="$b_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 + echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -+echo "configure:81920: checking for tgetent in -lncurses" >&5 ++echo "configure:82242: 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 @@ -22079,7 +22800,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lncurses $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:82261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -22157,7 +22878,7 @@ - b_cxx_post=$shared_cxx_post - b_lo=$shared_lo + echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -+echo "configure:81983: checking for tgetent in -ltermcap" >&5 ++echo "configure:82305: 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 @@ -22165,7 +22886,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-ltermcap $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:82324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -22401,7 +23122,7 @@ - cat >> confdefs.h <&6 -+echo "configure:82148: checking for readline in -ledit" >&5 ++echo "configure:82470: 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 @@ -22409,7 +23130,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-ledit $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:82489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -22462,20 +23183,20 @@ - PHP_POSIX_SHARED=no - case "$PHP_SAPI" in - cgi|embed) -+ -+ if test "$ext_shared" = "yes"; then -+ READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" -+ else - - +- +- - case ext/posix in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac ++ ++ if test "$ext_shared" = "yes"; then ++ READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" ++ else ++ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - - b_c_pre=$php_c_pre @@ -22489,13 +23210,7 @@ - - old_IFS=$IFS - for ac_src in posix.c; do -+ 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" ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - IFS=. - set $ac_src @@ -22503,6 +23218,14 @@ - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ 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 - case $ac_src in @@ -22639,17 +23362,17 @@ -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:78037: checking for $ac_hdr" >&5 +-echo "configure:78342: 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 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:78047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:78352: \"$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* @@ -22684,40 +23407,40 @@ + for ac_func in rl_completion_matches do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:78077: checking for $ac_func" >&5 -+echo "configure:82308: checking for $ac_func" >&5 +-echo "configure:78382: checking for $ac_func" >&5 ++echo "configure:82630: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:82336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:78410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:82658: \"$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 -@@ -78125,154 +82356,20 @@ else +@@ -78430,154 +82678,20 @@ else fi done - - echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6 --echo "configure:78131: checking for working ttyname_r() implementation" >&5 +-echo "configure:78436: 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 < @@ -22730,7 +23453,7 @@ -} - -EOF --if { (eval echo configure:78151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:78456: \"$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 @@ -22752,13 +23475,13 @@ - - - echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6 --echo "configure:78173: checking for utsname.domainname" >&5 +-echo "configure:78478: checking for utsname.domainname" >&5 -if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:78496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - ac_cv_have_utsname_domainname=yes @@ -22801,7 +23524,7 @@ -php_with_pspell=no - -echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6 --echo "configure:78222: checking for PSPELL support" >&5 +-echo "configure:78527: checking for PSPELL support" >&5 -# Check whether --with-pspell or --without-pspell was given. -if test "${with_pspell+set}" = set; then - withval="$with_pspell" @@ -22866,7 +23589,7 @@ esac -@@ -78287,7 +82384,7 @@ if test "$PHP_PSPELL" != "no"; then +@@ -78592,7 +82706,7 @@ if test "$PHP_PSPELL" != "no"; then old_IFS=$IFS @@ -22875,7 +23598,7 @@ IFS=. set $ac_src -@@ -78310,18 +82407,18 @@ EOF +@@ -78615,18 +82729,18 @@ EOF done @@ -22900,7 +23623,7 @@ esac -@@ -78336,14 +82433,14 @@ EOF +@@ -78641,14 +82755,14 @@ EOF old_IFS=$IFS @@ -22917,7 +23640,7 @@ 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" ;; -@@ -78366,31 +82463,31 @@ EOF +@@ -78671,31 +82785,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -22958,7 +23681,7 @@ $link_cmd EOF -@@ -78403,31 +82500,31 @@ EOF +@@ -78708,31 +82822,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -22999,7 +23722,7 @@ $link_cmd EOF -@@ -78435,22 +82532,22 @@ EOF +@@ -78740,22 +82854,22 @@ EOF ;; esac cat >> confdefs.h <&6 -+echo "configure:82662: checking for recode support" >&5 ++echo "configure:82984: checking for recode support" >&5 +# Check whether --with-recode or --without-recode was given. +if test "${with_recode+set}" = set; then + withval="$with_recode" @@ -23272,15 +23995,15 @@ save_ext_shared=$ext_shared ext_shared=yes -@@ -78767,27 +82821,27 @@ EOF +@@ -79072,27 +83143,27 @@ EOF esac done - echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6 --echo "configure:78772: checking for new_aspell_config in -laspell" >&5 +-echo "configure:79077: checking for new_aspell_config in -laspell" >&5 -ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'` + echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6 -+echo "configure:82826: checking for recode_format_table in -lrecode" >&5 ++echo "configure:83148: 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 @@ -23289,8 +24012,8 @@ -LIBS="-laspell $LIBS" +LIBS="-lrecode $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:82845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:79096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:83167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -78806,28 +82860,28 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -79111,28 +83182,28 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -23347,7 +24070,7 @@ else -@@ -78853,451 +82907,22 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -79158,451 +83229,22 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else @@ -23440,7 +24163,8 @@ - else - INCLUDES="$INCLUDES -I$ai_p" - fi -- ++ if test -n "$RECODE_DIR/$RECODE_LIB"; then + - fi - - fi @@ -23459,7 +24183,7 @@ -php_with_libedit=no - -echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6 --echo "configure:78965: checking for libedit readline replacement" >&5 +-echo "configure:79270: 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" @@ -23504,7 +24228,7 @@ -php_with_readline=no - -echo $ac_n "checking for readline support""... $ac_c" 1>&6 --echo "configure:79010: checking for readline support" >&5 +-echo "configure:79315: checking for readline support" >&5 -# Check whether --with-readline or --without-readline was given. -if test "${with_readline+set}" = set; then - withval="$with_readline" @@ -23558,14 +24282,18 @@ - - - if test "$READLINE_DIR/include" != "/usr/include"; then -- ++ if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then + - if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then - ai_p=$READLINE_DIR/include -- else -- ++ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then ++ ai_p=$RECODE_DIR/$RECODE_LIB + else + - ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`" - fi - @@ -23585,12 +24313,13 @@ - - fi - -- fi -- ++ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" + fi + - - PHP_READLINE_LIBS="" - echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 --echo "configure:79096: checking for tgetent in -lncurses" >&5 +-echo "configure:79401: 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 @@ -23598,7 +24327,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lncurses $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:79420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -23654,7 +24383,7 @@ - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 --echo "configure:79160: checking for tgetent in -ltermcap" >&5 +-echo "configure:79465: 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 @@ -23662,7 +24391,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-ltermcap $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:79484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -23713,7 +24442,6 @@ - - - PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap" -+ if test -n "$RECODE_DIR/$RECODE_LIB"; then -else - echo "$ac_t""no" 1>&6 @@ -23778,36 +24506,29 @@ - ;; - -L*) - ac_ii=`echo $ac_i|cut -c 3-` -- + - if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - +- - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then - ai_p=$ac_ii -+ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -+ ai_p=$RECODE_DIR/$RECODE_LIB - else - +- else +- - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" - fi - +- fi +- - - if test "$ext_shared" = "yes"; then - LDFLAGS="-L$ai_p $LDFLAGS" - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" - else - -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -79313,75 +82938,75 @@ fi +@@ -79618,75 +83260,75 @@ fi fi @@ -23829,7 +24550,7 @@ + esac - echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 --echo "configure:79326: checking for readline in -lreadline" >&5 +-echo "configure:79631: 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 @@ -23845,7 +24566,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lreadline $LIBS" -cat > conftest.$ac_ext <&6 + + LDFLAGS=$save_old_LDFLAGS @@ -23857,7 +24578,7 @@ + LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB" + LIBS="$LIBS -lrecode" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:79650: \"$ac_link\") 1>&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 -+if { (eval echo configure:82986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:83308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi @@ -23928,7 +24649,7 @@ else -@@ -79407,18 +83032,18 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -79712,18 +83354,18 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else @@ -23953,7 +24674,7 @@ fi -@@ -79444,10 +83069,10 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -79749,10 +83391,10 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l fi @@ -23966,7 +24687,7 @@ ;; esac -@@ -79457,826 +83082,1022 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -79762,826 +83404,1022 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l fi @@ -24054,17 +24775,17 @@ +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:83149: checking for $ac_hdr" >&5 ++echo "configure:83471: 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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:83159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:83481: \"$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* @@ -24437,7 +25158,7 @@ +fi - echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6 --echo "configure:79574: checking for rl_pending_input in -lreadline" >&5 +-echo "configure:79879: checking for rl_pending_input in -lreadline" >&5 -ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 @@ -24445,7 +25166,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lreadline $LIBS" -cat > conftest.$ac_ext <> confdefs.h <<\EOF +#define HAVE_REFLECTION 1 EOF --if { (eval echo configure:79593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:79898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -24655,7 +25376,7 @@ + shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo" - echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6 --echo "configure:79724: checking for rl_callback_read_char in -lreadline" >&5 +-echo "configure:80029: 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 @@ -24663,7 +25384,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lreadline $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:80048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -24742,25 +25463,25 @@ -fi + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection" -+ + + cat >>Makefile.objects<> confdefs.h <<\EOF +-#define HAVE_LIBREADLINE 1 +-EOF +$ext_builddir/phpreflection.$suffix: \$(shared_objects_reflection) \$(PHPREFLECTION_SHARED_DEPENDENCIES) + $link_cmd -- cat >> confdefs.h <<\EOF --#define HAVE_LIBREADLINE 1 - EOF ++EOF +-elif test "$PHP_LIBEDIT" != "no"; then + ;; + *) + + install_modules="install-modules" --elif test "$PHP_LIBEDIT" != "no"; then -- - for i in $PHP_LIBEDIT /usr/local /usr; do - test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break - done @@ -24856,7 +25577,7 @@ - echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 --echo "configure:79827: checking for tgetent in -lncurses" >&5 +-echo "configure:80132: 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 @@ -24864,7 +25585,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lncurses $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:80151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -24964,7 +25685,7 @@ + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 --echo "configure:79890: checking for tgetent in -ltermcap" >&5 +-echo "configure:80195: 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 @@ -24972,7 +25693,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-ltermcap $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:80214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -25041,20 +25762,20 @@ + PHP_PECL_EXTENSION=reflection + + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ -+ fi ++ fi - -else - echo "$ac_t""no" 1>&6 -fi ++ + +php_enable_session=yes + +echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6 -+echo "configure:83782: checking whether to enable PHP sessions" >&5 ++echo "configure:84104: 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" @@ -25185,12 +25906,12 @@ +php_with_mm=no - echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6 --echo "configure:80055: checking for readline in -ledit" >&5 +-echo "configure:80360: 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 +echo $ac_n "checking for mm support""... $ac_c" 1>&6 -+echo "configure:83826: checking for mm support" >&5 ++echo "configure:84148: checking for mm support" >&5 +# Check whether --with-mm or --without-mm was given. +if test "${with_mm+set}" = set; then + withval="$with_mm" @@ -25199,7 +25920,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-ledit $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:80379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -25266,7 +25987,7 @@ - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6 -+echo "configure:83848: checking whether pwrite works" >&5 ++echo "configure:84170: checking whether pwrite works" >&5 +if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else @@ -25286,7 +26007,7 @@ + +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:84203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` @@ -25374,7 +26095,7 @@ - +else + cat > conftest.$ac_ext < @@ -25396,7 +26117,7 @@ +EOF -+if { (eval echo configure:83927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:84249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_pwrite=yes @@ -25412,25 +26133,25 @@ + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* -+ + + ac_cv_pwrite=no -+fi + fi +rm -fr conftest* +fi -+ -+ + + +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBEDIT 1 + if test "$ac_cv_pwrite" = "yes"; then + ac_cv_pwrite=64 + fi + fi - - fi - ++ ++fi ++ +echo "$ac_t""$ac_cv_pwrite" 1>&6 - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBEDIT 1 ++ + if test "$ac_cv_pwrite" != "no"; then + cat >> confdefs.h <<\EOF +#define HAVE_PWRITE 1 @@ -25446,14 +26167,14 @@ - for ac_func in rl_completion_matches -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:80215: checking for $ac_func" >&5 +-echo "configure:80520: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + fi + fi + + + echo $ac_n "checking whether pread works""... $ac_c" 1>&6 -+echo "configure:83968: checking whether pread works" >&5 ++echo "configure:84290: checking whether pread works" >&5 +if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -25466,8 +26187,8 @@ + +else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:80548: \"$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" -+if { (eval echo configure:84001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:84323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + ac_cv_pread=yes @@ -25543,7 +26264,7 @@ + +else + cat > conftest.$ac_ext < @@ -25564,7 +26285,7 @@ + EOF - -+if { (eval echo configure:84048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:84370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + ac_cv_pread=yes @@ -25577,13 +26298,13 @@ + + ac_cv_pread=no + ++fi ++rm -fr conftest* fi -done -+rm -fr conftest* -+fi -+ -+ rm -f conftest_in ++ rm -f conftest_in ++ + if test "$ac_cv_pread" = "yes"; then + ac_cv_pread=64 + fi @@ -25630,7 +26351,7 @@ esac -@@ -80291,7 +84112,7 @@ done +@@ -80596,7 +84434,7 @@ done old_IFS=$IFS @@ -25639,7 +26360,7 @@ IFS=. set $ac_src -@@ -80314,18 +84135,18 @@ EOF +@@ -80619,18 +84457,18 @@ EOF done @@ -25664,7 +26385,7 @@ esac -@@ -80340,14 +84161,14 @@ EOF +@@ -80645,14 +84483,14 @@ EOF old_IFS=$IFS @@ -25681,7 +26402,7 @@ 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" ;; -@@ -80370,31 +84191,31 @@ EOF +@@ -80675,31 +84513,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -25722,7 +26443,7 @@ $link_cmd EOF -@@ -80407,31 +84228,31 @@ EOF +@@ -80712,31 +84550,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -25763,7 +26484,7 @@ $link_cmd EOF -@@ -80439,22 +84260,22 @@ EOF +@@ -80744,22 +84582,22 @@ EOF ;; esac cat >> confdefs.h <&6 --echo "configure:80569: checking for recode support" >&5 +-echo "configure:80874: checking for recode support" >&5 -# Check whether --with-recode or --without-recode was given. -if test "${with_recode+set}" = set; then - withval="$with_recode" @@ -26016,9 +26737,9 @@ - else - - - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - +- 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" @@ -26049,7 +26770,7 @@ - done - - echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6 --echo "configure:80733: checking for recode_format_table in -lrecode" >&5 +-echo "configure:81038: 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 @@ -26057,7 +26778,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lrecode $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:81057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -26224,7 +26945,7 @@ - LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB" - LIBS="$LIBS -lrecode" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:81198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - @@ -26272,7 +26993,7 @@ else -@@ -80939,18 +84499,18 @@ if { (eval echo configure:80893: \"$ac_l +@@ -81244,18 +84821,18 @@ if { (eval echo configure:81198: \"$ac_l else @@ -26297,10 +27018,14 @@ fi -@@ -80976,55 +84536,30 @@ if { (eval echo configure:80893: \"$ac_l +@@ -81277,59 +84854,34 @@ if { (eval echo configure:81198: \"$ac_l + + fi - - +- +- fi +- +- - case recode in - c|c_r|pthread*) ;; - *) @@ -26330,8 +27055,10 @@ -rm -f conftest* - LIBS=$old_LIBS - LDFLAGS=$old_LDFLAGS -- -- ++ ++ fi + + -fi + case mm in + c|c_r|pthread*) ;; @@ -26368,7 +27095,7 @@ fi -@@ -81046,62 +84581,92 @@ EOF +@@ -81351,62 +84903,92 @@ EOF fi @@ -26391,12 +27118,12 @@ -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:81056: checking for $ac_hdr" >&5 +-echo "configure:81361: 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 < + done @@ -26406,7 +27133,7 @@ +#define HAVE_LIBMM 1 EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:81066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:81371: \"$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* @@ -26433,7 +27160,7 @@ +php_enable_shmop=no + +echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 -+echo "configure:84612: checking whether to enable shmop support" >&5 ++echo "configure:84934: 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" @@ -26503,7 +27230,7 @@ esac -@@ -81116,7 +84681,7 @@ done +@@ -81421,7 +85003,7 @@ done old_IFS=$IFS @@ -26512,7 +27239,7 @@ IFS=. set $ac_src -@@ -81139,18 +84704,18 @@ EOF +@@ -81444,18 +85026,18 @@ EOF done @@ -26537,7 +27264,7 @@ esac -@@ -81165,14 +84730,14 @@ EOF +@@ -81470,14 +85052,14 @@ EOF old_IFS=$IFS @@ -26554,7 +27281,7 @@ 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" ;; -@@ -81195,31 +84760,31 @@ EOF +@@ -81500,31 +85082,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -26595,7 +27322,7 @@ $link_cmd EOF -@@ -81232,31 +84797,31 @@ EOF +@@ -81537,31 +85119,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -26636,7 +27363,7 @@ $link_cmd EOF -@@ -81264,22 +84829,22 @@ EOF +@@ -81569,22 +85151,22 @@ EOF ;; esac cat >> confdefs.h <&6 -+echo "configure:84956: checking whether to enable SimpleXML support" >&5 ++echo "configure:85278: 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" @@ -26775,7 +27502,7 @@ +php_with_libxml_dir=no + +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:85001: checking libxml2 install dir" >&5 ++echo "configure:85323: 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" @@ -26803,7 +27530,7 @@ + + +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:85029: checking for xml2-config path" >&5 ++echo "configure:85351: 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 @@ -26961,7 +27688,7 @@ + + + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:85187: checking whether libxml build works" >&5 ++echo "configure:85509: 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 @@ -26977,7 +27704,7 @@ + +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:85536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + LIBS=$old_LIBS @@ -27051,7 +27778,7 @@ esac -@@ -81415,7 +85277,7 @@ EOF +@@ -81720,7 +85599,7 @@ EOF old_IFS=$IFS @@ -27060,7 +27787,7 @@ IFS=. set $ac_src -@@ -81438,18 +85300,18 @@ EOF +@@ -81743,18 +85622,18 @@ EOF done @@ -27087,7 +27814,7 @@ esac -@@ -81464,14 +85326,14 @@ EOF +@@ -81769,14 +85648,14 @@ EOF old_IFS=$IFS @@ -27104,7 +27831,7 @@ 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" ;; -@@ -81494,31 +85356,31 @@ EOF +@@ -81799,31 +85678,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -27145,7 +27872,7 @@ $link_cmd EOF -@@ -81531,31 +85393,31 @@ EOF +@@ -81836,31 +85715,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -27186,7 +27913,7 @@ $link_cmd EOF -@@ -81563,22 +85425,22 @@ EOF +@@ -81868,22 +85747,22 @@ EOF ;; esac cat >> confdefs.h <&6 -+echo "configure:85602: checking for SNMP support" >&5 ++echo "configure:85924: checking for SNMP support" >&5 +# Check whether --with-snmp or --without-snmp was given. +if test "${with_snmp+set}" = set; then + withval="$with_snmp" @@ -27397,7 +28124,7 @@ +php_with_openssl_dir=no + +echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6 -+echo "configure:85646: checking OpenSSL dir for SNMP" >&5 ++echo "configure:85968: 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" @@ -27420,7 +28147,7 @@ +php_enable_ucd_snmp_hack=no + +echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6 -+echo "configure:85669: checking whether to enable UCD SNMP hack" >&5 ++echo "configure:85991: 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" @@ -27445,7 +28172,7 @@ + # Extract the first word of "net-snmp-config", so it can be a program name with args. +set dummy net-snmp-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:85694: checking for $ac_word" >&5 ++echo "configure:86016: 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 @@ -27646,17 +28373,17 @@ +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:85895: checking for $ac_hdr" >&5 ++echo "configure:86217: 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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:85905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:86227: \"$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* @@ -27684,9 +28411,9 @@ + + if test "$ac_cv_header_default_store_h" = "yes"; then + echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6 -+echo "configure:85933: checking for OpenSSL support in SNMP libraries" >&5 ++echo "configure:86255: checking for OpenSSL support in SNMP libraries" >&5 + cat > conftest.$ac_ext < @@ -27767,7 +28494,7 @@ -php_enable_session=yes - -echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6 --echo "configure:81689: checking whether to enable PHP sessions" >&5 +-echo "configure:81994: 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" @@ -27776,7 +28503,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:85990: checking for $ac_word" >&5 ++echo "configure:86312: 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 @@ -27907,7 +28634,7 @@ + fi -echo $ac_n "checking for mm support""... $ac_c" 1>&6 --echo "configure:81733: checking for mm support" >&5 +-echo "configure:82038: checking for mm support" >&5 -# Check whether --with-mm or --without-mm was given. -if test "${with_mm+set}" = set; then - withval="$with_mm" @@ -27969,7 +28696,7 @@ -if test "$PHP_SESSION" != "no"; then - - echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6 --echo "configure:81755: checking whether pwrite works" >&5 +-echo "configure:82060: checking whether pwrite works" >&5 -if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -27982,7 +28709,7 @@ -else - cat > conftest.$ac_ext <&6 -+echo "configure:86195: checking for OpenSSL version" >&5 ++echo "configure:86517: checking for OpenSSL version" >&5 + cat > conftest.$ac_ext < @@ -28056,7 +28783,7 @@ +#endif + EOF --if { (eval echo configure:81788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:82093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - ac_cv_pwrite=yes @@ -28106,7 +28833,7 @@ -else - cat > conftest.$ac_ext < @@ -28139,7 +28866,7 @@ -EOF --if { (eval echo configure:81834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:82139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then + + save_old_LDFLAGS=$LDFLAGS @@ -28218,7 +28945,7 @@ - - - echo $ac_n "checking whether pread works""... $ac_c" 1>&6 --echo "configure:81875: checking whether pread works" >&5 +-echo "configure:82180: checking whether pread works" >&5 -if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -28231,7 +28958,7 @@ - -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:82213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then + ;; + -L*) @@ -28318,17 +29045,17 @@ + done + + echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -+echo "configure:86352: checking for CRYPTO_free in -lcrypto" >&5 ++echo "configure:86674: 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 else - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:82260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - ac_cv_pread=yes - -+if { (eval echo configure:86371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:86693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else @@ -28621,12 +29348,12 @@ - cat >>Makefile.objects<>Makefile.objects<&6 -+echo "configure:86528: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++echo "configure:86850: 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 @@ -28696,7 +29423,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lssl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:86869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -28971,7 +29698,7 @@ + fi + + echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 -+echo "configure:86683: checking for kstat_read in -lkstat" >&5 ++echo "configure:87005: 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 @@ -28979,7 +29706,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lkstat $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:87024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -29122,7 +29849,7 @@ else -@@ -82406,18 +86818,18 @@ if test "$PHP_MM" != "no"; then +@@ -82711,18 +87140,18 @@ if test "$PHP_MM" != "no"; then else @@ -29147,7 +29874,7 @@ fi -@@ -82443,10 +86855,10 @@ if test "$PHP_MM" != "no"; then +@@ -82748,10 +87177,10 @@ if test "$PHP_MM" != "no"; then fi @@ -29160,7 +29887,7 @@ ;; esac -@@ -82456,124 +86868,338 @@ if test "$PHP_MM" != "no"; then +@@ -82761,124 +87190,338 @@ if test "$PHP_MM" != "no"; then fi @@ -29276,7 +30003,7 @@ + done + + echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -+echo "configure:86973: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 ++echo "configure:87295: 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 @@ -29284,7 +30011,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-l$SNMP_LIBNAME $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:87314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -29416,27 +30143,31 @@ if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "INSTALLHEADERS$unique=set" + eval "LIBPATH$unique=set" -+ + +- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" +- + 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 - -- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -- fi - done +- + +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBMM 1 +-EOF ++ fi ++ ++ fi ++ + ;; + esac + done + + echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -+echo "configure:87126: checking for init_snmp in -l$SNMP_LIBNAME" >&5 ++echo "configure:87448: 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 @@ -29444,18 +30175,18 @@ + ac_save_LIBS="$LIBS" +LIBS="-l$SNMP_LIBNAME $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:87467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -29463,31 +30194,25 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" -+fi + 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_LIBMM 1 ++ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + + cat >> confdefs.h <<\EOF +#define HAVE_SNMP 1 - EOF ++EOF --fi -- -- -php_enable_shmop=no - -echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 --echo "configure:82519: checking whether to enable shmop support" >&5 +-echo "configure:82824: 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" @@ -29570,7 +30295,7 @@ esac -@@ -82588,7 +87214,7 @@ EOF +@@ -82893,7 +87536,7 @@ EOF old_IFS=$IFS @@ -29579,7 +30304,7 @@ IFS=. set $ac_src -@@ -82611,18 +87237,18 @@ EOF +@@ -82916,18 +87559,18 @@ EOF done @@ -29604,7 +30329,7 @@ esac -@@ -82637,14 +87263,14 @@ EOF +@@ -82942,14 +87585,14 @@ EOF old_IFS=$IFS @@ -29621,7 +30346,7 @@ 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" ;; -@@ -82667,31 +87293,31 @@ EOF +@@ -82972,31 +87615,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -29662,7 +30387,7 @@ $link_cmd EOF -@@ -82704,31 +87330,31 @@ EOF +@@ -83009,31 +87652,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -29703,7 +30428,7 @@ $link_cmd EOF -@@ -82736,22 +87362,22 @@ EOF +@@ -83041,22 +87684,22 @@ EOF ;; esac cat >> confdefs.h <&6 --echo "configure:82863: checking whether to enable SimpleXML support" >&5 +-echo "configure:83168: 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" - PHP_SIMPLEXML=$enableval +echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 -+echo "configure:87492: checking whether to enable SOAP support" >&5 ++echo "configure:87814: 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" @@ -29820,7 +30545,7 @@ fi -@@ -82875,12 +87504,12 @@ fi +@@ -83180,12 +87826,12 @@ fi ext_output="yes, shared" ext_shared=yes @@ -29836,16 +30561,16 @@ ;; no) ext_output=no -@@ -82904,7 +87533,7 @@ if test -z "$PHP_LIBXML_DIR"; then +@@ -83209,7 +87855,7 @@ if test -z "$PHP_LIBXML_DIR"; then php_with_libxml_dir=no echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:82908: checking libxml2 install dir" >&5 -+echo "configure:87537: checking libxml2 install dir" >&5 +-echo "configure:83213: checking libxml2 install dir" >&5 ++echo "configure:87859: 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" -@@ -82924,15 +87553,15 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -83229,15 +87875,15 @@ echo "$ac_t""$ext_output" 1>&6 fi @@ -29859,12 +30584,12 @@ echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:82936: checking for xml2-config path" >&5 -+echo "configure:87565: checking for xml2-config path" >&5 +-echo "configure:83241: checking for xml2-config path" >&5 ++echo "configure:87887: 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 -@@ -82964,7 +87593,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -83269,7 +87915,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path case $ac_i in -pthread) if test "$ext_shared" = "yes"; then @@ -29873,7 +30598,7 @@ else -@@ -82986,7 +87615,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -83291,7 +87937,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then @@ -29882,7 +30607,7 @@ else -@@ -83021,8 +87650,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -83326,8 +87972,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path if test "$ext_shared" = "yes"; then @@ -29893,16 +30618,16 @@ else -@@ -83090,7 +87719,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -83395,7 +88041,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:83094: checking whether libxml build works" >&5 -+echo "configure:87723: checking whether libxml build works" >&5 +-echo "configure:83399: checking whether libxml build works" >&5 ++echo "configure:88045: 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 -@@ -83098,7 +87727,7 @@ else +@@ -83403,7 +88049,7 @@ else old_LIBS=$LIBS LIBS=" @@ -29911,25 +30636,25 @@ $LIBS" if test "$cross_compiling" = yes; then -@@ -83106,7 +87735,7 @@ else +@@ -83411,7 +88057,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:87750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:83426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:88072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -83153,23 +87782,23 @@ EOF +@@ -83458,23 +88104,23 @@ EOF fi cat >> confdefs.h <<\EOF @@ -29960,7 +30685,7 @@ esac -@@ -83184,7 +87813,7 @@ EOF +@@ -83489,7 +88135,7 @@ EOF old_IFS=$IFS @@ -29969,7 +30694,7 @@ IFS=. set $ac_src -@@ -83207,18 +87836,18 @@ EOF +@@ -83512,18 +88158,18 @@ EOF done @@ -29994,7 +30719,7 @@ esac -@@ -83233,14 +87862,14 @@ EOF +@@ -83538,14 +88184,14 @@ EOF old_IFS=$IFS @@ -30011,7 +30736,7 @@ 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" ;; -@@ -83263,31 +87892,31 @@ EOF +@@ -83568,31 +88214,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -30052,7 +30777,7 @@ $link_cmd EOF -@@ -83300,31 +87929,31 @@ EOF +@@ -83605,31 +88251,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -30093,7 +30818,7 @@ $link_cmd EOF -@@ -83332,22 +87961,22 @@ EOF +@@ -83637,22 +88283,22 @@ EOF ;; esac cat >> confdefs.h <>Makefile.objects<&6 --echo "configure:83509: checking for SNMP support" >&5 +-echo "configure:83814: checking for SNMP support" >&5 -# Check whether --with-snmp or --without-snmp was given. -if test "${with_snmp+set}" = set; then - withval="$with_snmp" @@ -30286,7 +31005,7 @@ -php_with_openssl_dir=no - -echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6 --echo "configure:83553: checking OpenSSL dir for SNMP" >&5 +-echo "configure:83858: 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" @@ -30309,7 +31028,7 @@ -php_enable_ucd_snmp_hack=no - -echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6 --echo "configure:83576: checking whether to enable UCD SNMP hack" >&5 +-echo "configure:83881: 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" @@ -30334,7 +31053,7 @@ - # Extract the first word of "net-snmp-config", so it can be a program name with args. -set dummy net-snmp-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:83601: checking for $ac_word" >&5 +-echo "configure:83906: 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 @@ -30388,19 +31107,11 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`" - fi -+ $ac_comp -+EOF -+ done - +- - -+ -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC soap" -+ 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" @@ -30410,8 +31121,6 @@ - else - INCLUDES="$INCLUDES -I$ai_p" - fi -+ BUILD_DIR="$BUILD_DIR $ext_builddir" -+ + + + if test "$ext_builddir" = "."; then @@ -30499,7 +31208,7 @@ - - +echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 -+echo "configure:88100: checking whether to enable sockets support" >&5 ++echo "configure:88422: 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" @@ -30542,7 +31251,7 @@ + +if test "$PHP_SOCKETS" != "no"; then + echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 -+echo "configure:88142: checking for struct cmsghdr" >&5 ++echo "configure:88464: checking for struct cmsghdr" >&5 +if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else @@ -30555,7 +31264,7 @@ - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" + cat > conftest.$ac_ext < @@ -30564,7 +31273,7 @@ +struct cmsghdr s; s +; return 0; } +EOF -+if { (eval echo configure:88157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:88479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cmsghdr=yes +else @@ -30599,12 +31308,12 @@ + for ac_func in hstrerror socketpair +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:88182: checking for $ac_func" >&5 ++echo "configure:88504: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:88532: \"$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 @@ -30684,34 +31393,34 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:83802: checking for $ac_hdr" >&5 -+echo "configure:88238: checking for $ac_hdr" >&5 +-echo "configure:84107: checking for $ac_hdr" >&5 ++echo "configure:88560: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:83812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:88248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:84117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:88570: \"$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* -@@ -83834,955 +88270,865 @@ else +@@ -84139,955 +88592,865 @@ else fi 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:83840: checking for OpenSSL support in SNMP libraries" >&5 +-echo "configure:84145: checking for OpenSSL support in SNMP libraries" >&5 - cat > conftest.$ac_ext < conftest.$ac_ext < @@ -30732,7 +31441,7 @@ +static struct msghdr tp; int n = (int) tp.msg_flags; return n +; return 0; } +EOF -+if { (eval echo configure:88285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:88607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : else + echo "configure: failed program was:" >&5 @@ -30751,31 +31460,13 @@ +#define HAVE_SOCKETS 1 +EOF + - -- fi -- CPPFLAGS=$old_CPPFLAGS -- echo "$ac_t""$SNMP_SSL" 1>&6 - -- if test "$SNMP_SSL" = "yes"; then -- if test "$PHP_OPENSSL_DIR" != "no"; then -- PHP_OPENSSL=$PHP_OPENSSL_DIR -- fi -- -- if test "$PHP_OPENSSL" = "no"; then -- { echo "configure: error: The UCD-SNMP in this system is built with SSL support. ++ ++ + ext_builddir=ext/sockets + ext_srcdir=$abs_srcdir/ext/sockets - -- Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; } -- else -- -- found_openssl=no -- unset OPENSSL_INCDIR -- unset OPENSSL_LIBDIR ++ + ac_extra= - -- test -z "$PHP_OPENSSL" && PHP_OPENSSL=no -- test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no ++ + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_SOCKETS_SHARED=no + @@ -30787,12 +31478,7 @@ + esac + + - -- if test "$PHP_OPENSSL" != "no"; then -- PHP_OPENSSL_DIR=$PHP_OPENSSL -- elif test "$PHP_IMAP_SSL" != "no"; then -- PHP_OPENSSL_DIR=$PHP_IMAP_SSL -- fi ++ + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta @@ -30800,31 +31486,7 @@ + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo - -- if test -z "$PKG_CONFIG"; then -- # 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:83897: 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 -- case "$PKG_CONFIG" in -- /*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -- ;; -- ?:/*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" -- break -- fi ++ + + old_IFS=$IFS + for ac_src in sockets.c; do @@ -30847,58 +31509,30 @@ +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src + $ac_comp +EOF - done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -- ;; --esac --fi --PKG_CONFIG="$ac_cv_path_PKG_CONFIG" --if test -n "$PKG_CONFIG"; then -- echo "$ac_t""$PKG_CONFIG" 1>&6 --else -- echo "$ac_t""no" 1>&6 --fi - -- fi ++ done -- if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then -- if $PKG_CONFIG --atleast-version=0.9.6 openssl; then -- found_openssl=yes -- OPENSSL_LIBS=`$PKG_CONFIG --libs openssl` -- OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` -- OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` -- else -- { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } ++ + EXT_STATIC="$EXT_STATIC sockets" + if test "$ext_shared" != "nocli"; then + EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" fi -- -- if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then +- CPPFLAGS=$old_CPPFLAGS +- echo "$ac_t""$SNMP_SSL" 1>&6 + else + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then + PHP_SOCKETS_SHARED=yes - -- for ac_i in $OPENSSL_LIBS; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" -- else -- ++ + case ext/sockets in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac -- 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" +- if test "$SNMP_SSL" = "yes"; then +- if test "$PHP_OPENSSL_DIR" != "no"; then +- PHP_OPENSSL=$PHP_OPENSSL_DIR +- fi ++ + + b_c_pre=$shared_c_pre + b_cxx_pre=$shared_cxx_pre @@ -30916,22 +31550,36 @@ + set $ac_src + ac_obj=$1 + IFS=$old_IFS -+ + +- if test "$PHP_OPENSSL" = "no"; then +- { echo "configure: error: The UCD-SNMP in this system is built with SSL support. + shared_objects_sockets="$shared_objects_sockets $ac_bdir$ac_obj.lo" -+ + +- Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; } +- else +- +- found_openssl=no +- unset OPENSSL_INCDIR +- unset OPENSSL_LIBDIR + 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 -+ + +- test -z "$PHP_OPENSSL" && PHP_OPENSSL=no +- test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no + cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 +-echo "configure:84202: 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 +- case "$PKG_CONFIG" in +- /*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- ?:/*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" +- break + fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" +- ;; +-esac +-fi +-PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +-if test -n "$PKG_CONFIG"; then +- echo "$ac_t""$PKG_CONFIG" 1>&6 +-else +- echo "$ac_t""no" 1>&6 +-fi ++ fi ++ ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then ++ PHP_SOCKETS_SHARED=no ++ case "$PHP_SAPI" in ++ cgi|embed) ++ ++ ++ case ext/sockets in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac ++ ++ + +- fi ++ 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 + +- if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then +- if $PKG_CONFIG --atleast-version=0.9.6 openssl; then +- found_openssl=yes +- OPENSSL_LIBS=`$PKG_CONFIG --libs openssl` +- OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` +- OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` +- else +- { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } +- fi + +- if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then ++ old_IFS=$IFS ++ for ac_src in sockets.c; do ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + +- for ac_i in $OPENSSL_LIBS; do +- case $ac_i in +- -pthread) +- if test "$ext_shared" = "yes"; then +- SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" +- else ++ 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<>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<" 1>&2; exit 1; } - fi ++fi - if test -z "$OPENSSL_LIBDIR"; then - { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } - fi -+ old_IFS=$IFS -+ for ac_src in sockets.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=-I$OPENSSL_INCDIR - echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 --echo "configure:84102: checking for OpenSSL version" >&5 +-echo "configure:84407: checking for OpenSSL version" >&5 - cat > conftest.$ac_ext <&6 ++echo "configure:88941: checking whether zend_object_value is packed" >&5 ++ old_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" ++ if test "$cross_compiling" = yes; then ++ ++ ac_result=0 ++ echo "$ac_t""no" 1>&6 ++ ++else ++ cat > conftest.$ac_ext < -#if OPENSSL_VERSION_NUMBER >= 0x0090600fL - yes -#endif - -+ cat >>Makefile.objects<&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* -+ done -+ -+ -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" -+ fi ++if { (eval echo configure:88960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ++ ac_result=1 ++ echo "$ac_t""yes" 1>&6 - echo "$ac_t"">= 0.9.6" 1>&6 - --else + else - rm -rf conftest* ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ ++ ac_result=0 ++ echo "$ac_t""no" 1>&6 - { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } - --fi + fi -rm -f conftest* -+ BUILD_DIR="$BUILD_DIR $ext_builddir" -+ - +- - CPPFLAGS=$old_CPPFLAGS ++rm -fr conftest* ++fi -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=sockets - +- - if test "$OPENSSL_INCDIR" != "/usr/include"; then - - if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then @@ -31269,24 +32038,22 @@ - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ - fi +- fi ++ CPPFLAGS=$old_CPPFLAGS ++ cat >> confdefs.h <> confdefs.h <<\EOF ++#define HAVE_SPL 1 ++EOF ++ - cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ header_path=ext/sockets/ -+ for header_file in php_sockets.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 +- if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "INCLUDEPATH$unique=set" - - if test ""; then @@ -31294,44 +32061,25 @@ - else - INCLUDES="$INCLUDES -I$ai_p" - fi -+ eval "INSTALLHEADERS$unique=set" - -+ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" -+ - fi +- +- fi ++ ext_builddir=ext/spl ++ ext_srcdir=$abs_srcdir/ext/spl - fi -+ done -+ ++ ac_extra= -+fi -+ -+ -+ echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6 -+echo "configure:88619: checking whether zend_object_value is packed" >&5 -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" -+ if test "$cross_compiling" = yes; then - -- +- ++ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then ++ PHP_SPL_SHARED=no + - save_old_LDFLAGS=$LDFLAGS - ac_stuff=" - -L$OPENSSL_LIBDIR - " -+ ac_result=0 -+ echo "$ac_t""no" 1>&6 - +- - save_ext_shared=$ext_shared - ext_shared=yes -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then ++ case ext/spl in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ esac - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ac_result=1 -+ echo "$ac_t""yes" 1>&6 - 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-` - -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then ++ 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 php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do + +- case $ac_ii in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" - else -- -+ ac_result=0 -+ echo "$ac_t""no" 1>&6 - ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + +- - case $ac_ii in - c|c_r|pthread*) ;; - *) - LIBS="$LIBS -l$ac_ii" - ;; - esac -- -+fi -+rm -fr conftest* -+fi ++ 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 - fi - ;; - esac -+ CPPFLAGS=$old_CPPFLAGS -+ cat >> confdefs.h <>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_SPL 1 -+EOF -+ -+ -+ ext_builddir=ext/spl -+ ext_srcdir=$abs_srcdir/ext/spl - ;; - -L*) @@ -31409,26 +32164,30 @@ - - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then - ai_p=$ac_ii -- else ++ EXT_STATIC="$EXT_STATIC spl" ++ if test "no" != "nocli"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC spl" ++ fi + else - - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -+ ac_extra= - -+ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then -+ PHP_SPL_SHARED=no - +- +- - if test "$ext_shared" = "yes"; then - LDFLAGS="-L$ai_p $LDFLAGS" - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" - else - - - +- - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ if test "no" = "shared" || test "no" = "yes"; then ++ PHP_SPL_SHARED=yes ++ + case ext/spl in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; @@ -31445,13 +32204,13 @@ - fi -+ 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 ++ 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 - fi - @@ -31468,10 +32227,10 @@ + ac_obj=$1 + IFS=$old_IFS + -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo" - echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 --echo "configure:84259: checking for CRYPTO_free in -lcrypto" >&5 +-echo "configure:84564: 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 @@ -31479,7 +32238,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lcrypto $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:84583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -31519,21 +32278,8 @@ - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - -+ -+ EXT_STATIC="$EXT_STATIC spl" -+ if test "no" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC spl" -+ fi -+ else -+ if test "no" = "shared" || test "no" = "yes"; then -+ PHP_SPL_SHARED=yes - -+ case ext/spl in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - +- +- - case crypto in - c|c_r|pthread*) ;; - *) @@ -31541,54 +32287,17 @@ - SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" - else - - +- - case crypto in - c|c_r|pthread*) ;; - *) - LIBS="-lcrypto $LIBS" - ;; -- 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 php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ shared_objects_spl="$shared_objects_spl $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<>Makefile.objects<&6 -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" ++EOF - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared @@ -31623,12 +32345,25 @@ - - -fi -+ cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 --echo "configure:84435: checking for SSL_CTX_set_ssl_version in -lssl" >&5 +-echo "configure:84740: 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 @@ -31803,7 +32516,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lssl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:84759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -32035,7 +32748,7 @@ - fi - echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 --echo "configure:84590: checking for kstat_read in -lkstat" >&5 +-echo "configure:84895: 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 @@ -32043,7 +32756,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-lkstat $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:84914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +echo $ac_n "checking for sqlite support""... $ac_c" 1>&6 -+echo "configure:89002: checking for sqlite support" >&5 ++echo "configure:89324: checking for sqlite support" >&5 +# Check whether --with-sqlite or --without-sqlite was given. +if test "${with_sqlite+set}" = set; then + withval="$with_sqlite" @@ -32072,11 +32785,8 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -+ -+ PHP_SQLITE=yes -+ test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL - - fi +- +-fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - @@ -32088,45 +32798,25 @@ - SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD" - else - -- + - case kstat in - c|c_r|pthread*) ;; - *) - LIBS="-lkstat $LIBS" - ;; - esac - - +- +- - fi - ;; - esac ++ PHP_SQLITE=yes ++ test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL - -else - echo "$ac_t""no" 1>&6 --fi -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SQLITE in -+shared,*) -+ PHP_SQLITE=`echo "$PHP_SQLITE"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SQLITE=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 + fi - - if test "$SNMP_INCDIR" != "/usr/include"; then @@ -32158,6 +32848,24 @@ - fi - fi ++ext_output="yes, shared" ++ext_shared=yes ++case $PHP_SQLITE in ++shared,*) ++ PHP_SQLITE=`echo "$PHP_SQLITE"|$SED 's/^shared,//'` ++ ;; ++shared) ++ PHP_SQLITE=yes ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac - @@ -32176,7 +32884,6 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" - fi -+php_enable_sqlite_utf8=no - - if test "$ext_shared" = "yes"; then @@ -32187,14 +32894,7 @@ - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 -+echo "configure:89046: 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" -+ PHP_SQLITE_UTF8=$enableval -+else - +- - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" @@ -32202,11 +32902,11 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -+ PHP_SQLITE_UTF8=no - +- - fi ++echo "$ac_t""$ext_output" 1>&6 ++ -+fi - fi - @@ -32215,9 +32915,6 @@ - fi - else - -+ext_output=$PHP_SQLITE_UTF8 -+echo "$ac_t""$ext_output" 1>&6 -+ - if test -n "$SNMP_LIBDIR"; then - @@ -32232,13 +32929,21 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" - fi ++php_enable_sqlite_utf8=no - - - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 ++echo "configure:89368: 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" ++ PHP_SQLITE_UTF8=$enableval ++else + - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" @@ -32246,9 +32951,11 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -- ++ PHP_SQLITE_UTF8=no + - fi ++fi - - fi @@ -32262,20 +32969,30 @@ - LIBS="-lsnmp $LIBS" - ;; - esac ++ext_output=$PHP_SQLITE_UTF8 ++echo "$ac_t""$ext_output" 1>&6 + +- fi + + +- SNMP_LIBNAME=snmp ++ ++ ++ +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:89074: checking for PDO includes" >&5 ++echo "configure:89396: 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:89080: checking for PDO includes" >&5 ++echo "configure:89402: 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 @@ -32285,7 +33002,7 @@ + fi + +fi - ++ +echo "$ac_t""$pdo_inc_path" 1>&6 + if test -n "$pdo_inc_path"; then +: @@ -32297,9 +33014,7 @@ + cat >> confdefs.h <<\EOF +#define PHP_SQLITE2_HAVE_PDO 1 +EOF - -- SNMP_LIBNAME=snmp -- fi ++ + pdo_inc_path="-I$pdo_inc_path" + fi + fi @@ -32311,7 +33026,7 @@ + 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:89114: checking for sqlite files in default path" >&5 ++echo "configure:89436: checking for sqlite files in default path" >&5 + for i in $SEARCH_PATH ; do + if test -r $i/$SEARCH_FOR; then + SQLITE_DIR=$i @@ -32324,7 +33039,7 @@ + echo "$ac_t""not found" 1>&6 + { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } + fi - ++ save_old_LDFLAGS=$LDFLAGS ac_stuff=" @@ -32335,15 +33050,15 @@ save_ext_shared=$ext_shared ext_shared=yes -@@ -84875,27 +89221,27 @@ fi +@@ -85180,27 +89543,27 @@ fi esac done - echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6 --echo "configure:84880: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 +-echo "configure:85185: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 -ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'` + echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 -+echo "configure:89226: checking for sqlite_open in -lsqlite" >&5 ++echo "configure:89548: 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 @@ -32352,8 +33067,8 @@ -LIBS="-l$SNMP_LIBNAME $LIBS" +LIBS="-lsqlite $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:89245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:85204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:89567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -84914,97 +89260,69 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -85219,97 +89582,69 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l LDFLAGS=$save_old_LDFLAGS ext_shared=$save_ext_shared @@ -32508,7 +33223,7 @@ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -85020,93 +89338,171 @@ fi +@@ -85325,93 +89660,171 @@ fi fi @@ -32530,7 +33245,7 @@ + esac - echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6 --echo "configure:85033: checking for init_snmp in -l$SNMP_LIBNAME" >&5 +-echo "configure:85338: 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 @@ -32538,7 +33253,7 @@ - ac_save_LIBS="$LIBS" -LIBS="-l$SNMP_LIBNAME $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:85357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -32638,7 +33353,7 @@ + # 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:89418: checking for $ac_word" >&5 ++echo "configure:89740: 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 @@ -32666,7 +33381,7 @@ + + if test "$LEMON"; then + echo $ac_n "checking for lemon version""... $ac_c" 1>&6 -+echo "configure:89446: checking for lemon version" >&5 ++echo "configure:89768: 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 @@ -32737,7 +33452,7 @@ esac -@@ -85121,7 +89517,7 @@ EOF +@@ -85426,7 +89839,7 @@ EOF old_IFS=$IFS @@ -32746,7 +33461,7 @@ IFS=. set $ac_src -@@ -85144,18 +89540,18 @@ EOF +@@ -85449,18 +89862,18 @@ EOF done @@ -32771,7 +33486,7 @@ esac -@@ -85170,14 +89566,14 @@ EOF +@@ -85475,14 +89888,14 @@ EOF old_IFS=$IFS @@ -32788,7 +33503,7 @@ 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" ;; -@@ -85200,31 +89596,31 @@ EOF +@@ -85505,31 +89918,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -32829,7 +33544,7 @@ $link_cmd EOF -@@ -85237,31 +89633,31 @@ EOF +@@ -85542,31 +89955,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -32870,7 +33585,7 @@ $link_cmd EOF -@@ -85269,22 +89665,22 @@ EOF +@@ -85574,22 +89987,22 @@ EOF ;; esac cat >> confdefs.h <&2; exit 1; } + fi + -+ + +-fi + + src=$ext_srcdir/Makefile.frag + ac_srcdir=$ext_srcdir + ac_builddir=$ext_builddir + 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" -+ + + + + for header_file in $ext_builddir/libsqlite/src/sqlite.h; do @@ -33020,11 +33735,21 @@ + INSTALL_HEADERS="$INSTALL_HEADERS $header_file" + + fi -+ + +-php_enable_soap=no + done + -+ -+ + +-echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 +-echo "configure:85704: 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" +- PHP_SOAP=$enableval +-else + +- PHP_SOAP=no +- test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL + if test "$SQLITE_MODULE_TYPE" = "builtin"; then + + @@ -33032,7 +33757,7 @@ + + echo $ac_n "checking size of char *""... $ac_c" 1>&6 -+echo "configure:89859: checking size of char *" >&5 ++echo "configure:90181: 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 @@ -33040,7 +33765,7 @@ + ac_cv_sizeof_char_p=4 +else + cat > conftest.$ac_ext < +#include @@ -33052,7 +33777,7 @@ + exit(0); +} +EOF -+if { (eval echo configure:89879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:90201: \"$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 @@ -33071,37 +33796,50 @@ +EOF --php_enable_soap=no +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_SOAP in +-shared,*) +- PHP_SOAP=`echo "$PHP_SOAP"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_SOAP=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac + cat >> confdefs.h <<\EOF +#define SQLITE_PTR_SZ SIZEOF_CHAR_P +EOF --echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 --echo "configure:85399: 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" -- PHP_SOAP=$enableval + if test "$PHP_SQLITE_UTF8" = "yes"; then + SQLITE_ENCODING="UTF8" + cat >> confdefs.h <<\EOF +#define SQLITE_UTF8 1 +EOF -+ + + else + SQLITE_ENCODING="ISO8859" + fi + + PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING" -+ -+ + +-echo "$ac_t""$ext_output" 1>&6 + + SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION` + + PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION" -+ -+ + + + sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h -+ + +-if test -z "$PHP_LIBXML_DIR"; then + if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then + echo '#include ' > $ext_builddir/libsqlite/src/config.h + else @@ -33117,16 +33855,17 @@ +#endif +EOF + fi -+ + +-php_with_libxml_dir=no + for ac_func in usleep nanosleep +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:89941: checking for $ac_func" >&5 ++echo "configure:90263: 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 <&6 +-echo "configure:85749: 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" +- PHP_LIBXML_DIR=$withval +int main() { + +/* The GNU C library defines this for functions which it implements @@ -33149,7 +33894,7 @@ + +; return 0; } +EOF -+if { (eval echo configure:89969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:90291: \"$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 @@ -33177,17 +33922,17 @@ +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:89997: checking for $ac_hdr" >&5 ++echo "configure:90319: 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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:90007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:90329: \"$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* @@ -33218,20 +33963,19 @@ + + +echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 -+echo "configure:90038: checking whether flush should be called explicitly after a buffered io" >&5 ++echo "configure:90360: 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 -- PHP_SOAP=no -- test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL +- PHP_LIBXML_DIR=no +if test "$cross_compiling" = yes; then + + ac_cv_flush_io=no + +else + cat > conftest.$ac_ext < @@ -33269,7 +34013,7 @@ +} + +EOF -+if { (eval echo configure:90087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:90409: \"$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 @@ -33278,7 +34022,7 @@ + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* -+ + + ac_cv_flush_io=yes fi @@ -33287,35 +34031,19 @@ +fi +-ext_output=$PHP_LIBXML_DIR +-echo "$ac_t""$ext_output" 1>&6 +echo "$ac_t""$ac_cv_flush_io" 1>&6 +if test "$ac_cv_flush_io" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_FLUSHIO 1 +EOF --ext_output="yes, shared" --ext_shared=yes --case $PHP_SOAP in --shared,*) -- PHP_SOAP=`echo "$PHP_SOAP"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SOAP=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac +fi +if test "$ac_cv_func_crypt" = "no"; then + echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -+echo "configure:90115: checking for crypt in -lcrypt" >&5 ++echo "configure:90437: 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 @@ -33323,7 +34051,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lcrypt $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:90456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -33342,11 +34070,11 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" -+fi + fi +rm -f conftest* +LIBS="$ac_save_LIBS" --echo "$ac_t""$ext_output" 1>&6 +-if test "$PHP_SOAP" != "no"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -33356,203 +34084,22 @@ +#define HAVE_CRYPT 1 +EOF +- if test "$PHP_LIBXML" = "no"; then +- { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } +- fi + +else + echo "$ac_t""no" 1>&6 +fi -+ -+fi -+ -+echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 -+echo "configure:90163: 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 -+ -+ if test "$cross_compiling" = yes; then -+ -+ ac_cv_crypt_des=yes -+ -+else -+ cat > conftest.$ac_ext < -+#endif - -+#if HAVE_CRYPT_H -+#include -+#endif - --if test -z "$PHP_LIBXML_DIR"; then -+main() { -+#if HAVE_CRYPT -+ exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); -+#else -+ exit(0); -+#endif -+} -+EOF -+if { (eval echo configure:90193: \"$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 -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ ac_cv_crypt_des=no -+ -+fi -+rm -fr conftest* -+fi -+ -+fi -+ -+echo "$ac_t""$ac_cv_crypt_des" 1>&6 -+ -+echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 -+echo "configure:90214: 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 -+ -+ if test "$cross_compiling" = yes; then -+ -+ ac_cv_crypt_ext_des=no -+ -+else -+ cat > conftest.$ac_ext < -+#endif -+ -+#if HAVE_CRYPT_H -+#include -+#endif -+ -+main() { -+#if HAVE_CRYPT -+ exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); -+#else -+ exit(0); -+#endif -+} -+EOF -+if { (eval echo configure:90244: \"$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 -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ ac_cv_crypt_ext_des=no -+ -+fi -+rm -fr conftest* +fi -+ -+fi -+ -+echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 -+ -+echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 -+echo "configure:90265: 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 -+ -+if test "$cross_compiling" = yes; then -+ -+ ac_cv_crypt_md5=no -+ -+else -+ cat > conftest.$ac_ext < -+#endif -+ -+#if HAVE_CRYPT_H -+#include -+#endif -+ -+main() { -+#if HAVE_CRYPT -+ char salt[15], answer[40]; -+ -+ salt[0]='$'; salt[1]='1'; salt[2]='$'; -+ salt[3]='r'; salt[4]='a'; salt[5]='s'; -+ salt[6]='m'; salt[7]='u'; salt[8]='s'; -+ salt[9]='l'; salt[10]='e'; salt[11]='$'; -+ salt[12]='\0'; -+ strcpy(answer,salt); -+ strcat(answer,"rISCgZzpwk3UhDidwXvin0"); -+ exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); -+#else -+ exit(0); -+#endif -+} -+EOF -+if { (eval echo configure:90304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then --php_with_libxml_dir=no -+ ac_cv_crypt_md5=yes - --echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:85444: 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" -- PHP_LIBXML_DIR=$withval - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -- PHP_LIBXML_DIR=no -- -+ ac_cv_crypt_md5=no - - fi -- -- --ext_output=$PHP_LIBXML_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -- -+rm -fr conftest* - fi - --if test "$PHP_SOAP" != "no"; then -+fi - -- if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi -+echo "$ac_t""$ac_cv_crypt_md5" 1>&6 - -- -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:85472: checking for xml2-config path" >&5 +-echo "configure:85777: checking for xml2-config path" >&5 -if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -+echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 -+echo "configure:90325: checking for Blowfish crypt" >&5 -+if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then ++echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 ++echo "configure:90485: 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 @@ -33562,14 +34109,14 @@ - break - fi - done -+if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then + -+ ac_cv_crypt_blowfish=no ++ ac_cv_crypt_des=yes -fi +else + cat > conftest.$ac_ext <&6 @@ -33596,24 +34143,55 @@ - SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -pthread" - else - -- ++#if HAVE_CRYPT_H ++#include ++#endif ++ ++main() { ++#if HAVE_CRYPT ++ exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); ++#else ++ exit(0); ++#endif ++} ++EOF ++if { (eval echo configure:90515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then + - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- ++ ac_cv_crypt_des=yes ++ ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + - 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 -+#if HAVE_CRYPT_H -+#include -+#endif ++ ac_cv_crypt_des=no - fi - ;; - -l*) - ac_ii=`echo $ac_i|cut -c 3-` - -- ++fi ++rm -fr conftest* ++fi ++ ++fi ++ ++echo "$ac_t""$ac_cv_crypt_des" 1>&6 ++ ++echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 ++echo "configure:90536: 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 + - case $ac_ii in - c|c_r|pthread*) ;; - *) @@ -33621,22 +34199,7 @@ - SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii" - else - -+main() { -+#if HAVE_CRYPT -+ char salt[30], answer[70]; -+ -+ salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; -+ strcat(salt,"rasmuslerd............"); -+ strcpy(answer,salt); -+ strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra"); -+ exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); -+#else -+ exit(0); -+#endif -+} -+EOF -+if { (eval echo configure:90361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then ++ if test "$cross_compiling" = yes; then - case $ac_ii in - c|c_r|pthread*) ;; @@ -33644,23 +34207,20 @@ - LIBS="$LIBS -l$ac_ii" - ;; - esac -+ ac_cv_crypt_blowfish=yes - -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ ac_cv_crypt_blowfish=no +- ++ ac_cv_crypt_ext_des=no - fi - ;; - esac -+fi -+rm -fr conftest* -+fi ++else ++ cat > conftest.$ac_ext < ++#endif - ;; - -L*) @@ -33677,7 +34237,9 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -+echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 ++#if HAVE_CRYPT_H ++#include ++#endif - - if test "$ext_shared" = "yes"; then @@ -33685,12 +34247,38 @@ - test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_SHARED_LIBADD" - else - -- -- ++main() { ++#if HAVE_CRYPT ++ exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); ++#else ++ exit(0); ++#endif ++} ++EOF ++if { (eval echo configure:90566: \"$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 ++ ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 -+echo "configure:90382: checking for SHA512 crypt" >&5 -+if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then ++ ac_cv_crypt_ext_des=no ++ ++fi ++rm -fr conftest* ++fi ++ ++fi ++ ++echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 ++ ++echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 ++echo "configure:90587: 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 @@ -33704,22 +34292,25 @@ +if test "$cross_compiling" = yes; then - fi -- -+ ac_cv_crypt_SHA512=no ++ ac_cv_crypt_md5=no -- fi -- -- fi +else + cat > conftest.$ac_ext < ++#endif + - ;; - esac - done -+#if HAVE_UNISTD_H -+#include ++#if HAVE_CRYPT_H ++#include +#endif - @@ -33739,28 +34330,29 @@ - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -+#if HAVE_CRYPT_H -+#include -+#endif - +main() { +#if HAVE_CRYPT -+ char salt[30], answer[80]; - -+ salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; -+ strcpy(answer, salt); -+ strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu."); -+ exit (strcmp((char *)crypt("foo",salt),answer)); ++ char salt[15], answer[40]; + +- ++ salt[0]='$'; salt[1]='1'; salt[2]='$'; ++ salt[3]='r'; salt[4]='a'; salt[5]='s'; ++ salt[6]='m'; salt[7]='u'; salt[8]='s'; ++ salt[9]='l'; salt[10]='e'; salt[11]='$'; ++ salt[12]='\0'; ++ strcpy(answer,salt); ++ strcat(answer,"rISCgZzpwk3UhDidwXvin0"); ++ exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); +#else + exit(0); +#endif +} +EOF -+if { (eval echo configure:90417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:90626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ac_cv_crypt_SHA512=yes ++ ac_cv_crypt_md5=yes + +else + echo "configure: failed program was:" >&5 @@ -33778,7 +34370,7 @@ - fi - - fi -+ ac_cv_crypt_SHA512=no ++ ac_cv_crypt_md5=no - fi +fi @@ -33790,14 +34382,14 @@ - done +fi -+echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6 ++echo "$ac_t""$ac_cv_crypt_md5" 1>&6 - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:85630: checking whether libxml build works" >&5 +-echo "configure:85935: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -+echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 -+echo "configure:90438: checking for SHA256 crypt" >&5 -+if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then ++echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 ++echo "configure:90647: 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 @@ -33811,21 +34403,14 @@ - LIBS=$old_LIBS +if test "$cross_compiling" = yes; then -+ ac_cv_crypt_SHA256=no ++ ac_cv_crypt_blowfish=no + else cat > conftest.$ac_ext < +#endif @@ -33836,19 +34421,26 @@ + +main() { +#if HAVE_CRYPT -+ char salt[30], answer[80]; -+ salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t'; salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0'; -+ strcat(salt,""); -+ strcpy(answer, salt); -+ strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5"); -+ exit (strcmp((char *)crypt("foo",salt),answer)); ++ char salt[30], answer[70]; + +- char xmlInitParser(); +- int main() { +- xmlInitParser(); +- return 0; +- } +- ++ salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; ++ strcat(salt,"rasmuslerd............"); ++ strcpy(answer,salt); ++ strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra"); ++ exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); +#else + exit(0); +#endif +} EOF --if { (eval echo configure:85657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:90473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:85962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:90683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then - LIBS=$old_LIBS @@ -33856,7 +34448,7 @@ - php_cv_libxml_build_works=yes - - -+ ac_cv_crypt_SHA256=yes ++ ac_cv_crypt_blowfish=yes + else echo "configure: failed program was:" >&5 @@ -33869,7 +34461,7 @@ - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - -+ ac_cv_crypt_SHA256=no ++ ac_cv_crypt_blowfish=no + fi rm -fr conftest* @@ -33884,41 +34476,66 @@ - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -EOF -- ++echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 + - fi - - cat >> confdefs.h <<\EOF -#define HAVE_SOAP 1 -EOF -+echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6 ++echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 ++echo "configure:90704: checking for SHA512 crypt" >&5 ++if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ++if test "$cross_compiling" = yes; then ++ ++ ac_cv_crypt_SHA512=no - - ext_builddir=ext/soap - ext_srcdir=$abs_srcdir/ext/soap ++else ++ cat > conftest.$ac_ext < ++#endif - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_SOAP_SHARED=no -- -- ++#if HAVE_CRYPT_H ++#include ++#endif ++ ++main() { ++#if HAVE_CRYPT ++ char salt[30], answer[80]; + ++ salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; ++ strcpy(answer, salt); ++ strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu."); ++ exit (strcmp((char *)crypt("foo",salt),answer)); ++#else ++ exit(0); ++#endif ++} ++EOF ++if { (eval echo configure:90739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then + - case ext/soap in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - -+ echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6 -+echo "configure:90497: checking whether the compiler supports __alignof__" >&5 -+if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -+ cat > conftest.$ac_ext <&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* - IFS=. - set $ac_src @@ -33937,25 +34559,27 @@ - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- ++ ac_cv_crypt_SHA512=no + - 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 -+int main() { ++fi ++rm -fr conftest* ++fi - cat >>Makefile.objects<&6 + - EXT_STATIC="$EXT_STATIC soap" - if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC soap" @@ -33969,12 +34593,16 @@ - /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+if { (eval echo configure:90513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* ++echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 ++echo "configure:90760: checking for SHA256 crypt" >&5 ++if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else -+ ac_cv_alignof_exists=yes ++if test "$cross_compiling" = yes; then -- ++ ac_cv_crypt_SHA256=no + - b_c_pre=$shared_c_pre - b_cxx_pre=$shared_cxx_pre - b_c_meta=$shared_c_meta @@ -33983,40 +34611,49 @@ - b_cxx_post=$shared_cxx_post - b_lo=$shared_lo - -- ++else ++ cat > conftest.$ac_ext <&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* - +- - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo" -- ++#if HAVE_UNISTD_H ++#include ++#endif + - 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 -+ ac_cv_alignof_exists=no -+ -+fi -+rm -f conftest* -+fi ++#if HAVE_CRYPT_H ++#include ++#endif - cat >>Makefile.objects<&6 -+ if test "$ac_cv_alignof_exists" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ALIGNOF 1 ++main() { ++#if HAVE_CRYPT ++ char salt[30], answer[80]; ++ salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t'; salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0'; ++ strcat(salt,""); ++ strcpy(answer, salt); ++ strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5"); ++ exit (strcmp((char *)crypt("foo",salt),answer)); ++#else ++ exit(0); ++#endif ++} EOF - done - @@ -34039,64 +34676,43 @@ - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(PHPSOAP_SHARED_LIBADD)' - ;; - esac ++if { (eval echo configure:90795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ++ ac_cv_crypt_SHA256=yes - if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsoap.$suffix" - else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix" - fi -- +- fi ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" ++ ac_cv_crypt_SHA256=no - cat >>Makefile.objects<&6 -+echo "configure:90538: checking whether the compiler supports aligned attribute" >&5 -+if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ -+ ac_cv_attribute_aligned=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ -+ ac_cv_attribute_aligned=no -+ -+fi -+rm -f conftest* +fi -+ -+echo "$ac_t""$ac_cv_attribute_aligned" 1>&6 -+ if test "$ac_cv_attribute_aligned" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ATTRIBUTE_ALIGNED 1 - EOF + +-EOF ++echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6 - ;; - *) - - install_modules="install-modules" -- + - case $host_alias in - *aix*) - suffix=so @@ -34111,114 +34727,109 @@ - link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(SOAP_SHARED_LIBADD)' - ;; - esac -- ++if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then + - if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/soap.$suffix" - else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/soap.$suffix" - fi -- +- fi ++ echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6 ++echo "configure:90819: checking whether the compiler supports __alignof__" >&5 ++if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else + - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" -+ - +- - cat >>Makefile.objects<> confdefs.h < conftest.$ac_ext <> confdefs.h <> confdefs.h <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ++ ac_cv_alignof_exists=yes ++ ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ ++ ac_cv_alignof_exists=no ++ ++fi ++rm -f conftest* ++fi - ;; - esac - cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <&6 ++ if test "$ac_cv_alignof_exists" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_ALIGNOF 1 EOF - fi -- fi + fi - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then - PHP_SOAP_SHARED=no - case "$PHP_SAPI" in - cgi|embed) - ++ echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6 ++echo "configure:90860: checking whether the compiler supports aligned attribute" >&5 ++if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else - case ext/soap in -+ -+ case ext/standard in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - +- esac ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ++ ac_cv_attribute_aligned=yes ++ ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* -@@ -85898,7 +90624,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do -+ for ac_src in crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c; do ++ ac_cv_attribute_aligned=no - IFS=. - set $ac_src -@@ -85908,10 +90634,10 @@ EOF - 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" ;; -+ *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - cat >>Makefile.objects<> confdefs.h <&6 ++ if test "$ac_cv_attribute_aligned" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_ATTRIBUTE_ALIGNED 1 +EOF ++ fi ++ - old_IFS=$IFS - for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do @@ -34247,16 +34854,17 @@ - ac_obj=$1 - IFS=$old_IFS - -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+ if test "$ac_cv_crypt_blowfish" = "yes"; then -+ ac_result=1 -+ ac_crypt_blowfish=1 -+ else -+ ac_result=0 -+ ac_crypt_blowfish=0 -+ fi +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <>Makefile.objects<> confdefs.h <> confdefs.h <> confdefs.h <>Makefile.objects<> confdefs.h <> confdefs.h <> confdefs.h <&2; exit 1; } - -- fi ++ if test "$ac_cv_crypt_ext_des" = "yes"; then ++ ac_result=1 ++ ac_crypt_edes=1 ++ else ++ ac_result=0 ++ ac_crypt_edes=0 + fi + cat >> confdefs.h <&6 -+echo "configure:90733: 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 < -+/* 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(); +-echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 +-echo "configure:86312: 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" +- PHP_SOCKETS=$enableval +-else ++ if test "$ac_cv_crypt_md5" = "yes"; then ++ ac_result=1 ++ ac_crypt_md5=1 ++ else ++ ac_result=0 ++ ac_crypt_md5=0 ++ fi ++ cat >> confdefs.h <&6 +- +- +- +- +-if test "$PHP_SOCKETS" != "no"; then +- echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 +-echo "configure:86354: 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 <> confdefs.h < +-#include +-int main() { +-struct cmsghdr s; s +-; return 0; } + -+int main() { ++ if test "$ac_cv_crypt_sha256" = "yes"; then ++ ac_result=1 ++ ac_crypt_sha256=1 ++ else ++ ac_result=0 ++ ac_crypt_sha256=0 ++ fi ++ cat >> confdefs.h <&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_cmsghdr=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_cmsghdr=no +-fi +-rm -f conftest* +- +-fi -+/* 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 +-echo "$ac_t""$ac_cv_cmsghdr" 1>&6 --php_enable_sockets=no -+; return 0; } -+EOF -+if { (eval echo configure:90761: \"$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'` +- if test "$ac_cv_cmsghdr" = yes; then +- cat >> confdefs.h <<\EOF +-#define HAVE_CMSGHDR 1 + cat >> confdefs.h <&6 ++#define PHP_USE_PHP_CRYPT_R 0 + EOF + +- fi +fi -+done -+ + +- for ac_func in hstrerror socketpair ++for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:86394: checking for $ac_func" >&5 ++echo "configure:91055: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91083: \"$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 +@@ -86442,1018 +91103,1372 @@ else + fi + done + +- for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:86450: checking for $ac_hdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 -+echo "configure:90786: checking for working fnmatch" >&5 ++echo "configure:91108: 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 + echo $ac_n "(cached) $ac_c" 1>&6 + else + # Some versions of Solaris or SCO have a broken fnmatch function. +# So we run a test program. If we are cross-compiling, take no chance. +# Thanks to John Oleynick and Franc,ois Pinard for this test. +if test "$cross_compiling" = yes; then + ac_cv_func_fnmatch_works=no +else -+ cat > conftest.$ac_ext < conftest.$ac_ext < +main() { exit (fnmatch ("a*", "abc", 0) != 0); } -+EOF -+if { (eval echo configure:90801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:86460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" ++if { (eval echo configure:91123: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 + else +- echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" + rm -fr conftest* + ac_cv_func_fnmatch_works=no -+fi + fi +-rm -f conftest* +rm -fr conftest* -+fi + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_FNMATCH 1 -+EOF + EOF +- +-else +- echo "$ac_t""no" 1>&6 + -+fi + fi +-done + + -+ + +for ac_func in fork CreateProcess +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:90828: checking for $ac_func" >&5 ++echo "configure:91150: 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 < conftest.$ac_ext < @@ -34457,8 +35230,12 @@ +/* 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() { + +-#include +-#include +- + int main() { +-static struct msghdr tp; int n = (int) tp.msg_flags; return n + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named @@ -34469,76 +35246,281 @@ +$ac_func(); +#endif + -+; return 0; } -+EOF -+if { (eval echo configure:90856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ; return 0; } + EOF +-if { (eval echo configure:86497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : ++if { (eval echo configure:91178: \"$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* + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- cat >> confdefs.h <<\EOF +-#define MISSING_MSGHDR_MSGFLAGS 1 +-EOF +- +- + eval "ac_cv_func_$ac_func=no" + fi + rm -f conftest* +- cat >> confdefs.h <<\EOF +-#define HAVE_SOCKETS 1 +-EOF +- +- +- +- ext_builddir=ext/sockets +- ext_srcdir=$abs_srcdir/ext/sockets +- +- ac_extra= +- +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_SOCKETS_SHARED=no +- +- +- case ext/sockets in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; 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 sockets.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<>Makefile.objects<&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 -+php_can_support_proc_open=no -+ -+fi -+done -+ -+echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6 -+echo "configure:90886: checking if your OS can spawn processes with inherited handles" >&5 + 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'/phpsockets.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(PHPSOCKETS_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsockets.so '$ext_builddir'/phpsockets.so' +- ;; +- *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_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOCKETS, 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_sockets) $(PHPSOCKETS_SHARED_LIBADD)' +- ;; +- esac +- +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsockets.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsockets.$suffix" +- fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets" ++ ++ php_can_support_proc_open=yes ++ break + +- cat >>Makefile.objects<&6 ++php_can_support_proc_open=no + +-$ext_builddir/phpsockets.$suffix: \$(shared_objects_sockets) \$(PHPSOCKETS_SHARED_DEPENDENCIES) +- $link_cmd ++fi ++done + ++echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6 ++echo "configure:91208: 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 +#define PHP_CAN_SUPPORT_PROC_OPEN 1 -+EOF + EOF --echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 --echo "configure:86007: 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" -- PHP_SOCKETS=$enableval - else +- ;; +- *) +- +- 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'/sockets.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(SOCKETS_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sockets.so '$ext_builddir'/sockets.so' +- ;; +- *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_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOCKETS, 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_sockets) $(SOCKETS_SHARED_LIBADD)' +- ;; +- esac +- +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sockets.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/sockets.$suffix" +- fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets" +- +- cat >>Makefile.objects<&6 +fi -+ + +- ;; +- esac +- cat >> confdefs.h <> confdefs.h <<\EOF +#define ENABLE_CHROOT_FUNC 1 -+EOF -+ + EOF + +- fi +- fi +- +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then +- PHP_SOCKETS_SHARED=no +- case "$PHP_SAPI" in +- cgi|embed) +- +- +- case ext/sockets in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; 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 +fi -+ -+ + + +- old_IFS=$IFS +- for ac_src in sockets.c; do + unset ac_cv_func_res_nsearch + unset ac_cv_func___res_nsearch + unset found -- PHP_SOCKETS=no -- test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6 -+echo "configure:90910: checking for res_nsearch" >&5 ++echo "configure:91232: checking for res_nsearch" >&5 +if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF +- done ++if { (eval echo configure:91260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_res_nsearch=yes" +else @@ -34571,7 +35563,7 @@ + eval "ac_cv_func_res_nsearch=no" +fi +rm -f conftest* - fi ++fi +if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -34579,12 +35571,12 @@ +else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 -+echo "configure:90956: checking for __res_nsearch" >&5 ++echo "configure:91278: checking for __res_nsearch" >&5 +if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func___res_nsearch=yes" +else @@ -34637,6 +35630,15 @@ +rm -f conftest* +fi +- old_IFS=$IFS +- for ac_src in sockets.c; do +- +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" +if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes @@ -34647,24 +35649,40 @@ + +fi --echo "$ac_t""$ext_output" 1>&6 +- 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<> confdefs.h <<\EOF +#define HAVE_RES_NSEARCH 1 -+EOF + EOF +- done +- +- ;; +- esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" +- fi +- + ac_cv_func_res_nsearch=yes + ;; -+ + +- BUILD_DIR="$BUILD_DIR $ext_builddir" + *) -+ + + unset ac_cv_lib_resolv_res_nsearch + unset ac_cv_lib_resolv___res_nsearch + unset found + echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6 -+echo "configure:91022: checking for res_nsearch in -lresolv" >&5 ++echo "configure:91344: checking for res_nsearch in -lresolv" >&5 +ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -34672,7 +35690,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -34695,58 +35713,68 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" --if test "$PHP_SOCKETS" != "no"; then -- echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 --echo "configure:86049: checking for struct cmsghdr" >&5 --if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then +- if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=sockets +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else + echo "$ac_t""no" 1>&6 -+ + +- fi + echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6 -+echo "configure:91061: checking for __res_nsearch in -lresolv" >&5 ++echo "configure:91383: checking for __res_nsearch in -lresolv" >&5 +ac_lib_var=`echo resolv'_'__res_nsearch | 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 -- -- cat > conftest.$ac_ext <&6 ++else + ac_save_LIBS="$LIBS" +LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext < --#include - int main() { --struct cmsghdr s; s +- +- +- header_path=ext/sockets/ +- for header_file in php_sockets.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 ++int main() { +__res_nsearch() - ; return 0; } - EOF --if { (eval echo configure:86064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:91080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- ac_cv_cmsghdr=yes ++; return 0; } ++EOF ++if { (eval echo configure:91402: \"$ac_link\") 1>&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* -- ac_cv_cmsghdr=no ++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* ++fi ++rm -f conftest* +LIBS="$ac_save_LIBS" -+ + +- done +- +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -34755,363 +35783,369 @@ + echo "$ac_t""no" 1>&6 +found=no +fi -+ - + ++ fi --echo "$ac_t""$ac_cv_cmsghdr" 1>&6 -- if test "$ac_cv_cmsghdr" = yes; then +- echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6 +-echo "configure:86831: checking whether zend_object_value is packed" >&5 +- old_CPPFLAGS=$CPPFLAGS +- CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" +- if test "$cross_compiling" = yes; then +- +- ac_result=0 +- echo "$ac_t""no" 1>&6 +- + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lresolv" + if test "$cross_compiling" = yes; then + found=no -+else -+ cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then + EOF +-if { (eval echo configure:86850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:91438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then +- +- ac_result=1 +- echo "$ac_t""yes" 1>&6 +- + found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* +- +- ac_result=0 +- echo "$ac_t""no" 1>&6 +- + found=no -+fi -+rm -fr conftest* -+fi -+ + fi + rm -fr conftest* + fi + +- CPPFLAGS=$old_CPPFLAGS +- cat >> confdefs.h <> confdefs.h <<\EOF +-#define HAVE_SPL 1 +-EOF +- +- +- ext_builddir=ext/spl +- ext_srcdir=$abs_srcdir/ext/spl +- +- ac_extra= + LIBS=$ac_libs + fi -+ + +- if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then +- PHP_SPL_SHARED=no + if test "$found" = "yes"; then -+ -+ + + +- case ext/spl in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + case resolv in + c|c_r|pthread*) ;; + *) + LIBS="-lresolv $LIBS" + ;; -+ esac -+ -+ - cat >> confdefs.h <<\EOF --#define HAVE_CMSGHDR 1 -+#define HAVE_RES_NSEARCH 1 - EOF + 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 -- fi ++ cat >> confdefs.h <<\EOF ++#define HAVE_RES_NSEARCH 1 ++EOF ++ + cat >> confdefs.h <<\EOF +#define HAVE_LIBRESOLV 1 +EOF -- for ac_func in hstrerror socketpair --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:86089: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +- old_IFS=$IFS +- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do + ac_cv_func_res_nsearch=yes + else + -+ + +- 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 + unset ac_cv_lib_bind_res_nsearch + unset ac_cv_lib_bind___res_nsearch + unset found + echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 -+echo "configure:91158: checking for res_nsearch in -lbind" >&5 ++echo "configure:91480: checking for res_nsearch in -lbind" >&5 +ac_lib_var=`echo bind'_'res_nsearch | 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 -- cat > conftest.$ac_ext <&6 ++else + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext < - /* 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(); ++#line 91488 "configure" ++#include "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 res_nsearch(); - 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 -- +- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:91177: \"$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" +- done ++if { (eval echo configure:91499: \"$ac_link\") 1>&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_func_$ac_func=no" ++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* --fi ++fi ++rm -f conftest* +LIBS="$ac_save_LIBS" --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <&6 + found=yes - else - echo "$ac_t""no" 1>&6 --fi --done ++else ++ echo "$ac_t""no" 1>&6 -- for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:86145: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- EXT_STATIC="$EXT_STATIC spl" +- if test "no" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC spl" +- fi +- else +- if test "no" = "shared" || test "no" = "yes"; then +- PHP_SPL_SHARED=yes +- +- case ext/spl in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac +- +- + echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6 -+echo "configure:91197: checking for __res_nsearch in -lbind" >&5 ++echo "configure:91519: checking for __res_nsearch in -lbind" >&5 +ac_lib_var=`echo bind'_'__res_nsearch | 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 -- cat > conftest.$ac_ext <&6 ++else + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext < ++#line 91527 "configure" ++#include "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 __res_nsearch(); -+ + +- 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 +int main() { +__res_nsearch() +; return 0; } - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:86155: \"$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 -+if { (eval echo configure:91216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" ++EOF ++if { (eval echo configure:91538: \"$ac_link\") 1>&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 "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" ++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* ++fi ++rm -f conftest* +LIBS="$ac_save_LIBS" -+ - fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + ++fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 + found=yes - else - echo "$ac_t""no" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 +found=no +fi -+ -+ - fi --done -+ +- old_IFS=$IFS +- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo" ++fi + +- 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< conftest.$ac_ext < --#include -- --int main() { --static struct msghdr tp; int n = (int) tp.msg_flags; return n --; return 0; } ++ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -- : -+if { (eval echo configure:91252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +- 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'/phpspl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(PHPSPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpspl.so '$ext_builddir'/phpspl.so' +- ;; +- *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_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSPL, 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_spl) $(PHPSPL_SHARED_LIBADD)' +- ;; +- esac ++if { (eval echo configure:91574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- cat >> confdefs.h <<\EOF --#define MISSING_MSGHDR_MSGFLAGS 1 --EOF -- -- ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -fr conftest* + found=no +fi +rm -fr conftest* - fi --rm -f conftest* -- cat >> confdefs.h <<\EOF --#define HAVE_SOCKETS 1 --EOF -- -- -- -- ext_builddir=ext/sockets -- ext_srcdir=$abs_srcdir/ext/sockets ++fi -- ac_extra= +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpspl.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix" + LIBS=$ac_libs -+ fi + fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SOCKETS_SHARED=no +- cat >>Makefile.objects<>Makefile.objects<> confdefs.h <<\EOF +#define HAVE_RES_NSEARCH 1 EOF -- done +- ;; +- *) +- +- 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'/spl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/spl.so '$ext_builddir'/spl.so' +- ;; +- *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_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SPL, 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_spl) $(SPL_SHARED_LIBADD)' +- ;; +- esac + cat >> confdefs.h <<\EOF +#define HAVE_LIBBIND 1 +EOF -- EXT_STATIC="$EXT_STATIC sockets" -- if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" -- fi +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/spl.$suffix" + ac_cv_func_res_nsearch=yes else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SOCKETS_SHARED=yes -- -- case ext/sockets in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; 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 sockets.c; do +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix" +- fi + -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_sockets="$shared_objects_sockets $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 +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" + unset ac_cv_lib_socket_res_nsearch + unset ac_cv_lib_socket___res_nsearch + unset found + echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6 -+echo "configure:91294: checking for res_nsearch in -lsocket" >&5 ++echo "configure:91616: checking for res_nsearch in -lsocket" >&5 +ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -35119,50 +36153,21 @@ + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++EOF ++if { (eval echo configure:91635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -35174,9 +36179,8 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" -- cat >>Makefile.objects<&6 @@ -35184,10 +36188,9 @@ +else + echo "$ac_t""no" 1>&6 --$ext_builddir/phpsockets.$suffix: \$(shared_objects_sockets) \$(PHPSOCKETS_SHARED_DEPENDENCIES) -- $link_cmd +-EOF + echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6 -+echo "configure:91333: checking for __res_nsearch in -lsocket" >&5 ++echo "configure:91655: checking for __res_nsearch in -lsocket" >&5 +ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -35195,18 +36198,22 @@ + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -35218,25 +36225,8 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" -- ;; -- *) -- -- 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'/sockets.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(SOCKETS_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sockets.so '$ext_builddir'/sockets.so' -- ;; -- *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_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOCKETS, 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_sockets) $(SOCKETS_SHARED_LIBADD)' -- ;; -- esac +- fi +- fi +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -35246,28 +36236,29 @@ +found=no +fi -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sockets.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/sockets.$suffix" -- fi +- if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then +- PHP_SPL_SHARED=no +- case "$PHP_SAPI" in +- cgi|embed) +- +- +- case ext/spl in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac +- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets" -- -- cat >>Makefile.objects<> confdefs.h < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++EOF ++if { (eval echo configure:91710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes +else @@ -35291,64 +36282,42 @@ +rm -fr conftest* +fi -- fi +- old_IFS=$IFS +- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do + LIBS=$ac_libs - fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_SOCKETS_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- ++ fi ++ + if test "$found" = "yes"; then + -- case ext/sockets in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ case socket in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsocket $LIBS" -+ ;; - 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 sockets.c; do -- - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- ++ case socket in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lsocket $LIBS" ++ ;; ++ esac + - 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 >> confdefs.h <<\EOF -+#define HAVE_RES_NSEARCH 1 -+EOF - cat >>Makefile.objects<> confdefs.h <<\EOF ++#define HAVE_RES_NSEARCH 1 ++EOF ++ ++ cat >> confdefs.h <<\EOF +#define HAVE_LIBSOCKET 1 EOF - done @@ -35358,15 +36327,15 @@ + + : -- EXT_STATIC="$EXT_STATIC sockets" +- EXT_STATIC="$EXT_STATIC spl" - ;; - *) - - -- case ext/sockets in +- case ext/spl in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac + fi @@ -35389,7 +36358,7 @@ - old_IFS=$IFS -- for ac_src in sockets.c; do +- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do + unset ac_cv_func_dns_search + unset ac_cv_func___dns_search + unset found @@ -35401,12 +36370,12 @@ - - PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" + echo $ac_n "checking for dns_search""... $ac_c" 1>&6 -+echo "configure:91445: checking for dns_search" >&5 ++echo "configure:91767: checking for dns_search" >&5 +if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dns_search=yes" +else @@ -35457,12 +36426,12 @@ +else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 -+echo "configure:91491: checking for __dns_search" >&5 ++echo "configure:91813: checking for __dns_search" >&5 +if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func___dns_search=yes" +else @@ -35520,20 +36489,10 @@ + +fi -+ -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_DNS_SEARCH 1 -+EOF -+ -+ ac_cv_func_dns_search=yes -+ ;; - -+ *) - -- header_path=ext/sockets/ -- for header_file in php_sockets.h; do +- +- +- 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_dllist.h spl_heap.h spl_fixedarray.h; do - hp_hf="$header_path/$header_file" - - @@ -35546,11 +36505,42 @@ - INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" - - fi + +- done +- ++ case $found in ++ yes) ++ cat >> confdefs.h <<\EOF ++#define HAVE_DNS_SEARCH 1 ++EOF + ++ ac_cv_func_dns_search=yes ++ ;; + +- 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 ++ *) + + unset ac_cv_lib_resolv_dns_search + unset ac_cv_lib_resolv___dns_search + unset found + echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:91557: checking for dns_search in -lresolv" >&5 ++echo "configure:91879: checking for dns_search in -lresolv" >&5 +ac_lib_var=`echo resolv'_'dns_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 @@ -35558,20 +36548,18 @@ + ac_save_LIBS="$LIBS" +LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -35583,15 +36571,16 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" - fi ++fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else + echo "$ac_t""no" 1>&6 +-php_with_sqlite=yes + echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:91596: checking for __dns_search in -lresolv" >&5 ++echo "configure:91918: checking for __dns_search in -lresolv" >&5 +ac_lib_var=`echo resolv'_'__dns_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 @@ -35599,21 +36588,30 @@ + ac_save_LIBS="$LIBS" +LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext <&6 +-echo "configure:87214: checking for sqlite support" >&5 +-# Check whether --with-sqlite or --without-sqlite was given. +-if test "${with_sqlite+set}" = set; then +- withval="$with_sqlite" +- PHP_SQLITE=$withval +int main() { +__dns_search() +; return 0; } +EOF -+if { (eval echo configure:91615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" -+else + else +- +- PHP_SQLITE=yes +- test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* @@ -35621,8 +36619,8 @@ +fi +rm -f conftest* +LIBS="$ac_save_LIBS" -+ -+fi + + fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes @@ -35631,123 +36629,74 @@ +found=no +fi -- echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6 --echo "configure:86526: checking whether zend_object_value is packed" >&5 -- old_CPPFLAGS=$CPPFLAGS -- CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" -- if test "$cross_compiling" = yes; then -- -- ac_result=0 -- echo "$ac_t""no" 1>&6 - ++ +fi -+ -+ -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lresolv" -+ if test "$cross_compiling" = yes; then -+ found=no - else - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:91651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then -- -- ac_result=1 -- echo "$ac_t""yes" 1>&6 -- ++EOF ++if { (eval echo configure:91973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then + found=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- -- ac_result=0 -- echo "$ac_t""no" 1>&6 -- ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + found=no - fi - rm -fr conftest* - fi ++fi ++rm -fr conftest* ++fi -- CPPFLAGS=$old_CPPFLAGS -- cat >> confdefs.h <> confdefs.h <<\EOF --#define HAVE_SPL 1 --EOF -- -- -- ext_builddir=ext/spl -- ext_srcdir=$abs_srcdir/ext/spl -- -- ac_extra= + LIBS=$ac_libs + fi -- if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then -- PHP_SPL_SHARED=no + if test "$found" = "yes"; then - - -- case ext/spl in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ ++ + case resolv in + c|c_r|pthread*) ;; + *) + LIBS="-lresolv $LIBS" + ;; - esac -- -- ++ 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 +-echo "$ac_t""$ext_output" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_DNS_SEARCH 1 +EOF -- old_IFS=$IFS -- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + cat >> confdefs.h <<\EOF +#define HAVE_LIBRESOLV 1 +EOF -- 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 + ac_cv_func_dns_search=yes + else + @@ -35756,7 +36705,7 @@ + unset ac_cv_lib_bind___dns_search + unset found + echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 -+echo "configure:91693: checking for dns_search in -lbind" >&5 ++echo "configure:92015: checking for dns_search in -lbind" >&5 +ac_lib_var=`echo bind'_'dns_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 @@ -35764,22 +36713,18 @@ + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++EOF ++if { (eval echo configure:92034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -35791,6 +36736,7 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" +-php_enable_sqlite_utf8=no +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -35798,49 +36744,36 @@ +else + echo "$ac_t""no" 1>&6 -- EXT_STATIC="$EXT_STATIC spl" -- if test "no" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC spl" -- fi -- else -- if test "no" = "shared" || test "no" = "yes"; then -- PHP_SPL_SHARED=yes -- -- case ext/spl in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- +-echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 +-echo "configure:87258: 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" +- PHP_SQLITE_UTF8=$enableval + echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 -+echo "configure:91732: checking for __dns_search in -lbind" >&5 ++echo "configure:92054: checking for __dns_search in -lbind" >&5 +ac_lib_var=`echo bind'_'__dns_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 -+else + else +- +- PHP_SQLITE_UTF8=no +- + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -35848,7 +36781,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" -+fi + fi +rm -f conftest* +LIBS="$ac_save_LIBS" @@ -35861,27 +36794,13 @@ +found=no +fi -- old_IFS=$IFS -- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo" +-ext_output=$PHP_SQLITE_UTF8 +-echo "$ac_t""$ext_output" 1>&6 +- ++ +fi -- 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< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++EOF ++if { (eval echo configure:92109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes +else @@ -35926,18 +36824,9 @@ +rm -fr conftest* +fi -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpspl.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix" + LIBS=$ac_libs - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" ++ fi -- cat >>Makefile.objects<> confdefs.h <<\EOF +#define HAVE_DNS_SEARCH 1 - EOF ++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'/spl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/spl.so '$ext_builddir'/spl.so' -- ;; -- *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_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SPL, 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_spl) $(SPL_SHARED_LIBADD)' -- ;; -- esac + cat >> confdefs.h <<\EOF +#define HAVE_LIBBIND 1 +EOF -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/spl.$suffix" +-if test "$PHP_SQLITE" != "no"; then +- if test "$PHP_PDO" != "no"; then + ac_cv_func_dns_search=yes - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix" -- fi -+ - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" ++ else + +- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:87286: checking for PDO includes" >&5 +-if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then ++ + unset ac_cv_lib_socket_dns_search + unset ac_cv_lib_socket___dns_search + unset found + echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:91829: checking for dns_search in -lsocket" >&5 ++echo "configure:92151: checking for dns_search in -lsocket" >&5 +ac_lib_var=`echo socket'_'dns_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 -+else + echo $ac_n "(cached) $ac_c" 1>&6 + else +- +- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:87292: 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 +- pdo_inc_path=$abs_srcdir/ext +- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then +- pdo_inc_path=$prefix/include/php/ext +- fi +- + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -36021,12 +36897,16 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" -+fi + fi +rm -f conftest* +LIBS="$ac_save_LIBS" --$ext_builddir/spl.$suffix: \$(shared_objects_spl) \$(SPL_SHARED_DEPENDENCIES) -- $link_cmd +-echo "$ac_t""$pdo_inc_path" 1>&6 +- if test -n "$pdo_inc_path"; then +-: +- else +-echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2 +- fi +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -36034,9 +36914,11 @@ +else + echo "$ac_t""no" 1>&6 --EOF +- if test -n "$pdo_inc_path"; then +- cat >> confdefs.h <<\EOF +-#define PHP_SQLITE2_HAVE_PDO 1 + echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:91868: checking for __dns_search in -lsocket" >&5 ++echo "configure:92190: checking for __dns_search in -lsocket" >&5 +ac_lib_var=`echo socket'_'__dns_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 @@ -36044,22 +36926,18 @@ + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -36071,8 +36949,9 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" +- pdo_inc_path="-I$pdo_inc_path" - fi -- fi +- fi +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -36082,29 +36961,52 @@ +found=no +fi -- if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then -- PHP_SPL_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- -- -- case ext/spl in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- +- if test "$PHP_SQLITE" != "yes"; then +- SEARCH_PATH="/usr/local /usr" +- SEARCH_FOR="/include/sqlite.h" +- if test -r $PHP_SQLITE/; then # path given as parameter +- SQLITE_DIR=$PHP_SQLITE +- else # search default path list +- echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6 +-echo "configure:87326: checking for sqlite files in default path" >&5 +- for i in $SEARCH_PATH ; do +- if test -r $i/$SEARCH_FOR; then +- SQLITE_DIR=$i +- echo "$ac_t""found in $i" 1>&6 +- fi +- done +- fi +- if test -z "$SQLITE_DIR"; then +- echo "$ac_t""not found" 1>&6 +- { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } +- fi +fi -- 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 - +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- -L$SQLITE_DIR/$PHP_LIBDIR -lm +- " +- +- 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" ++ + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lsocket" @@ -36112,11 +37014,11 @@ + found=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:92245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes +else @@ -36127,101 +37029,103 @@ +fi +rm -fr conftest* +fi - -- old_IFS=$IFS -- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do -+ LIBS=$ac_libs -+ fi + ++ LIBS=$ac_libs + 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 +- + if test "$found" = "yes"; then + -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- case $ac_ii in + case socket in -+ c|c_r|pthread*) ;; -+ *) + c|c_r|pthread*) ;; + *) +- LIBS="$LIBS -l$ac_ii" + LIBS="-lsocket $LIBS" -+ ;; -+ esac + ;; + esac -- 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<> confdefs.h <<\EOF +#define HAVE_DNS_SEARCH 1 - EOF -- done ++EOF + cat >> confdefs.h <<\EOF +#define HAVE_LIBSOCKET 1 +EOF -- EXT_STATIC="$EXT_STATIC spl" -- ;; -- *) -- -- -- case ext/spl in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- 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 + ac_cv_func_dns_search=yes -+ else -+ + 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="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else +- + fi + + fi - -- 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 -+ 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" + esac - - -- old_IFS=$IFS -- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do ++ ++ + unset ac_cv_func_dn_expand + unset ac_cv_func___dn_expand + unset found -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" +- fi + echo $ac_n "checking for dn_expand""... $ac_c" 1>&6 -+echo "configure:91980: checking for dn_expand" >&5 ++echo "configure:92302: 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 <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++; return 0; } ++EOF ++if { (eval echo configure:92330: \"$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 @@ -36266,18 +37166,21 @@ +rm -f conftest* +fi +- echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 +-echo "configure:87438: checking for sqlite_open in -lsqlite" >&5 +-ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 -+echo "configure:92026: checking for __dn_expand" >&5 ++echo "configure:92348: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92376: \"$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 @@ -36323,8 +37214,7 @@ +fi +rm -f conftest* +fi - -- fi ++ +if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes @@ -36334,78 +37224,44 @@ +fi + +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_dllist.h spl_heap.h spl_fixedarray.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 -- ++ ++ + case $found in + yes) + cat >> confdefs.h <<\EOF +#define HAVE_DN_EXPAND 1 +EOF - ++ + ac_cv_func_dn_expand=yes + ;; - -- 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 ++ + *) - ++ + unset ac_cv_lib_resolv_dn_expand + unset ac_cv_lib_resolv___dn_expand + unset found + echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 -+echo "configure:92092: checking for dn_expand in -lresolv" >&5 ++echo "configure:92414: 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 -+else -+ ac_save_LIBS="$LIBS" + 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="-lsqlite $LIBS" +LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -36416,87 +37272,116 @@ +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 + found=yes +else + echo "$ac_t""no" 1>&6 - --php_with_sqlite=yes ++ + echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 -+echo "configure:92131: checking for __dn_expand in -lresolv" >&5 ++echo "configure:92453: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lresolv $LIBS" -+cat > conftest.$ac_ext < conftest.$ac_ext <&6 --echo "configure:86909: checking for sqlite support" >&5 --# Check whether --with-sqlite or --without-sqlite was given. --if test "${with_sqlite+set}" = set; then -- withval="$with_sqlite" -- PHP_SQLITE=$withval -+int main() { + int main() { +-sqlite_open() +__dn_expand() -+; return 0; } -+EOF -+if { (eval echo configure:92150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" + ; return 0; } + EOF +-if { (eval echo configure:87457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else -- -- PHP_SQLITE=yes -- test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL -+ 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" - +@@ -87468,880 +92483,1297 @@ LIBS="$ac_save_LIBS" fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- +- +- +- if test "$ext_shared" = "yes"; then +- SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD" +- if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then +- +- if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then +- +- if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$SQLITE_DIR/$PHP_LIBDIR +- else +- +- ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" +- fi + found=yes +else + echo "$ac_t""no" 1>&6 +found=no +fi -+ +- +- if test "$ext_shared" = "yes"; then +- SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_SHARED_LIBADD" +- else +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" +- +- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" +- LDFLAGS="$LDFLAGS -L$ai_p" +- PHP_RPATHS="$PHP_RPATHS $ai_p" + +- fi +- +- +- fi +- +- fi +fi +- fi +- else +- --ext_output="yes, shared" --ext_shared=yes --case $PHP_SQLITE in --shared,*) -- PHP_SQLITE=`echo "$PHP_SQLITE"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SQLITE=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac +- if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then +- +- if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then +- +- if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$SQLITE_DIR/$PHP_LIBDIR +- else +- +- ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" +- fi + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lresolv" @@ -36504,11 +37389,11 @@ + found=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:92508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes +else @@ -36520,20 +37405,40 @@ +rm -fr conftest* +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" +- + LIBS=$ac_libs -+ fi + fi +- + if test "$found" = "yes"; then -+ -+ + +- fi +- +- fi + +- +- case sqlite in + case resolv in -+ c|c_r|pthread*) ;; -+ *) + c|c_r|pthread*) ;; + *) +- LIBS="-lsqlite $LIBS" + LIBS="-lresolv $LIBS" -+ ;; -+ esac + ;; + esac --echo "$ac_t""$ext_output" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_DN_EXPAND 1 @@ -36543,34 +37448,75 @@ +#define HAVE_LIBRESOLV 1 +EOF +- fi +- +- +- +- if test "$SQLITE_DIR/include" != "/usr/include"; then +- +- if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then +- ai_p=$SQLITE_DIR/include + ac_cv_func_dn_expand=yes -+ else -+ -+ + else + +- ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`" +- fi +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" +- +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi +- +- fi +- +- fi +- +- + + unset ac_cv_lib_bind_dn_expand + unset ac_cv_lib_bind___dn_expand + unset found + echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 -+echo "configure:92228: checking for dn_expand in -lbind" >&5 ++echo "configure:92550: 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 -+else + else +- echo "$ac_t""no" 1>&6 + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext <&2; exit 1; } +- +- +int main() { +dn_expand() +; return 0; } +EOF -+if { (eval echo configure:92247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -36578,11 +37524,18 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" -+fi + fi +rm -f conftest* +LIBS="$ac_save_LIBS" --php_enable_sqlite_utf8=no +- SQLITE_MODULE_TYPE=external +- PHP_SQLITE_CFLAGS=$pdo_inc_path +- sqlite_extra_sources="libsqlite/src/encode.c" +- else +- # use bundled library +- +- # we only support certain lemon versions +- lemon_version_list="1.0" +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -36590,39 +37543,47 @@ +else + echo "$ac_t""no" 1>&6 --echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 --echo "configure:86953: 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" -- PHP_SQLITE_UTF8=$enableval +- # 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:87630: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then + echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 -+echo "configure:92267: checking for __dn_expand in -lbind" >&5 ++echo "configure:92589: 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 + echo $ac_n "(cached) $ac_c" 1>&6 else -- -- PHP_SQLITE_UTF8=no -- +- if test -n "$LEMON"; then +- ac_cv_prog_LEMON="$LEMON" # Let the user override the test. + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" -+else + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_LEMON="lemon" +- break +- fi +- done +- IFS="$ac_save_ifs" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* @@ -36630,22 +37591,49 @@ fi +rm -f conftest* +LIBS="$ac_save_LIBS" - -+fi ++ + fi +-LEMON="$ac_cv_prog_LEMON" +-if test -n "$LEMON"; then +- echo "$ac_t""$LEMON" 1>&6 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes -+else -+ echo "$ac_t""no" 1>&6 + else + echo "$ac_t""no" 1>&6 +found=no -+fi + fi --ext_output=$PHP_SQLITE_UTF8 --echo "$ac_t""$ext_output" 1>&6 -- -+ -+fi +- if test "$LEMON"; then +- echo $ac_n "checking for lemon version""... $ac_c" 1>&6 +-echo "configure:87658: 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 + +- lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'` +- php_cv_lemon_version=invalid +- for lemon_check_version in $lemon_version_list; do +- if test "$lemon_version" = "$lemon_check_version"; then +- php_cv_lemon_version="$lemon_check_version (ok)" +- fi +- done +- + fi +-echo "$ac_t""$php_cv_lemon_version" 1>&6 +- else +- lemon_version=none +- fi +- case $php_cv_lemon_version in +- ""|invalid) +- lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)." +- echo "configure: warning: $lemon_msg" 1>&2 +- LEMON="exit 0;" +- ;; +- esac +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON" + if test "$found" = "yes"; then + ac_libs=$LIBS @@ -36654,11 +37642,11 @@ + found=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:92644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes +else @@ -36670,72 +37658,111 @@ +rm -fr conftest* +fi +- SQLITE_MODULE_TYPE=builtin +- 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 \ +- libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \ +- libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \ +- libsqlite/src/os.c libsqlite/src/pager.c \ +- libsqlite/src/printf.c libsqlite/src/random.c \ +- libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \ +- libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \ +- libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \ +- libsqlite/src/vacuum.c libsqlite/src/copy.c \ +- libsqlite/src/vdbeaux.c libsqlite/src/date.c \ +- libsqlite/src/where.c libsqlite/src/trigger.c" + LIBS=$ac_libs -+ fi + fi +- sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" +- +- ext_builddir=ext/sqlite +- ext_srcdir=$abs_srcdir/ext/sqlite +- +- ac_extra=`echo "$PHP_SQLITE_CFLAGS"|$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_SQLITE_SHARED=no + if test "$found" = "yes"; then -+ -+ + + +- case ext/sqlite in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + case bind in + c|c_r|pthread*) ;; + *) + LIBS="-lbind $LIBS" + ;; -+ esac + 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 + cat >> confdefs.h <<\EOF +#define HAVE_DN_EXPAND 1 +EOF +- old_IFS=$IFS +- for ac_src in $sqlite_sources; do +- +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + cat >> confdefs.h <<\EOF +#define HAVE_LIBBIND 1 +EOF --if test "$PHP_SQLITE" != "no"; then -- if test "$PHP_PDO" != "no"; then +- 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 + ac_cv_func_dn_expand=yes + else - -- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:86981: checking for PDO includes" >&5 --if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then ++ + + unset ac_cv_lib_socket_dn_expand + unset ac_cv_lib_socket___dn_expand + unset found + echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 -+echo "configure:92364: checking for dn_expand in -lsocket" >&5 ++echo "configure:92686: 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 - else -- -- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:86987: 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 -- pdo_inc_path=$abs_srcdir/ext -- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then -- pdo_inc_path=$prefix/include/php/ext -- fi -- ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF +- done ++if { (eval echo configure:92705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -36743,16 +37770,10 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" - fi ++fi +rm -f conftest* +LIBS="$ac_save_LIBS" --echo "$ac_t""$pdo_inc_path" 1>&6 -- if test -n "$pdo_inc_path"; then --: -- else --echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2 -- fi +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -36760,11 +37781,23 @@ +else + echo "$ac_t""no" 1>&6 -- if test -n "$pdo_inc_path"; then -- cat >> confdefs.h <<\EOF --#define PHP_SQLITE2_HAVE_PDO 1 +- EXT_STATIC="$EXT_STATIC sqlite" +- if test "$ext_shared" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" +- fi +- else +- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then +- PHP_SQLITE_SHARED=yes +- +- case ext/sqlite in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac +- +- + echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 -+echo "configure:92403: checking for __dn_expand in -lsocket" >&5 ++echo "configure:92725: 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 @@ -36772,18 +37805,25 @@ + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++EOF ++if { (eval echo configure:92744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -36795,9 +37835,6 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" -- pdo_inc_path="-I$pdo_inc_path" -- fi -- fi +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -36807,52 +37844,27 @@ +found=no +fi -- if test "$PHP_SQLITE" != "yes"; then -- SEARCH_PATH="/usr/local /usr" -- SEARCH_FOR="/include/sqlite.h" -- if test -r $PHP_SQLITE/; then # path given as parameter -- SQLITE_DIR=$PHP_SQLITE -- else # search default path list -- echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6 --echo "configure:87021: checking for sqlite files in default path" >&5 -- for i in $SEARCH_PATH ; do -- if test -r $i/$SEARCH_FOR; then -- SQLITE_DIR=$i -- echo "$ac_t""found in $i" 1>&6 -- fi -- done -- fi +- old_IFS=$IFS +- for ac_src in $sqlite_sources; do -- if test -z "$SQLITE_DIR"; then -- echo "$ac_t""not found" 1>&6 -- { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } -- fi +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo" +fi -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$SQLITE_DIR/$PHP_LIBDIR -lm -- " -- -- 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" -+ +- 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< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + 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'/phpsqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsqlite.so '$ext_builddir'/phpsqlite.so' +- ;; +- *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_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE, 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_sqlite) $(PHPSQLITE_SHARED_LIBADD)' +- ;; +- esac ++if { (eval echo configure:92780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes +else @@ -36875,103 +37908,96 @@ +fi +rm -fr conftest* +fi -+ + +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsqlite.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix" + LIBS=$ac_libs 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 -- ++ + if test "$found" = "yes"; then + -- case $ac_ii in +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" + case socket in - c|c_r|pthread*) ;; - *) -- LIBS="$LIBS -l$ac_ii" ++ c|c_r|pthread*) ;; ++ *) + LIBS="-lsocket $LIBS" - ;; - esac ++ ;; ++ esac +- cat >>Makefile.objects<> confdefs.h <<\EOF +#define HAVE_DN_EXPAND 1 +EOF + cat >> confdefs.h <<\EOF +#define HAVE_LIBSOCKET 1 -+EOF + EOF -- ;; -- -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 +- ;; +- *) +- +- install_modules="install-modules" + ac_cv_func_dn_expand=yes - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ else ++ + : -+ - fi -+ -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- +- 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'/sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sqlite.so '$ext_builddir'/sqlite.so' +- ;; +- *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_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SQLITE, 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_sqlite) $(SQLITE_SHARED_LIBADD)' +- ;; +- esac + fi ++ + +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sqlite.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix" + fi -+ +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" + +- cat >>Makefile.objects<&6 -+echo "configure:92515: checking for dn_skipname" >&5 ++echo "configure:92837: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF ++if { (eval echo configure:92865: \"$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 @@ -37012,21 +38032,22 @@ +rm -f conftest* +fi -- echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 --echo "configure:87133: checking for sqlite_open in -lsqlite" >&5 --ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'` +- ;; +- esac +- cat >> confdefs.h <&6 + found=yes +else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 -+echo "configure:92561: checking for __dn_skipname" >&5 ++echo "configure:92883: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF ++if { (eval echo configure:92911: \"$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 @@ -37060,7 +38081,9 @@ +fi +rm -f conftest* +fi -+ + +- fi +- fi +if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes @@ -37070,7 +38093,18 @@ +fi + +fi -+ + +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then +- PHP_SQLITE_SHARED=no +- case "$PHP_SAPI" in +- cgi|embed) +- +- +- case ext/sqlite in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac + + case $found in + yes) @@ -37080,36 +38114,41 @@ + + ac_cv_func_dn_skipname=yes + ;; -+ + + *) -+ + + unset ac_cv_lib_resolv_dn_skipname + unset ac_cv_lib_resolv___dn_skipname + unset found + echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 -+echo "configure:92627: checking for dn_skipname in -lresolv" >&5 ++echo "configure:92949: 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 - else - ac_save_LIBS="$LIBS" --LIBS="-lsqlite $LIBS" ++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="-lresolv $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -37120,16 +38159,31 @@ +fi +rm -f conftest* +LIBS="$ac_save_LIBS" -+ + +- old_IFS=$IFS +- for ac_src in $sqlite_sources; do +- +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else + echo "$ac_t""no" 1>&6 -+ + +- 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 + echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 -+echo "configure:92666: checking for __dn_skipname in -lresolv" >&5 ++echo "configure:92988: 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 @@ -37137,97 +38191,64 @@ + ac_save_LIBS="$LIBS" +LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:92685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -87163,881 +92696,762 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- -- if test "$ext_shared" = "yes"; then -- SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD" -- if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then -- -- if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$SQLITE_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" -- fi +- done ++if { (eval echo configure:93007: \"$ac_link\") 1>&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 + found=yes +else + echo "$ac_t""no" 1>&6 +found=no +fi -- -- if test "$ext_shared" = "yes"; then -- SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_SHARED_LIBADD" -- else +- EXT_STATIC="$EXT_STATIC sqlite" +- ;; +- *) - - +- case ext/sqlite in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac - -- 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 -- fi -- else -- +- 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 -- if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then -- -- if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$SQLITE_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" -- fi + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lresolv" @@ -37235,11 +38256,11 @@ + found=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes +else @@ -37250,119 +38271,82 @@ +fi +rm -fr conftest* +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" -- ++ + LIBS=$ac_libs - fi ++ fi -- +- old_IFS=$IFS +- for ac_src in $sqlite_sources; do + if test "$found" = "yes"; then - -- fi -- -- fi ++ -- -- case sqlite in +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" + case resolv in - c|c_r|pthread*) ;; - *) -- LIBS="-lsqlite $LIBS" ++ c|c_r|pthread*) ;; ++ *) + LIBS="-lresolv $LIBS" - ;; - esac ++ ;; ++ esac +- 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<> confdefs.h <<\EOF +#define HAVE_DN_SKIPNAME 1 -+EOF + EOF +- done + cat >> confdefs.h <<\EOF +#define HAVE_LIBRESOLV 1 +EOF +- ;; +- esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" - fi -- -- -- -- if test "$SQLITE_DIR/include" != "/usr/include"; then -- -- if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$SQLITE_DIR/include -+ ac_cv_func_dn_skipname=yes - else - -- ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`" -- fi -- -- - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -- fi -- -- +- BUILD_DIR="$BUILD_DIR $ext_builddir" ++ ac_cv_func_dn_skipname=yes ++ else ++ + unset ac_cv_lib_bind_dn_skipname + unset ac_cv_lib_bind___dn_skipname + unset found + echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6 -+echo "configure:92763: checking for dn_skipname in -lbind" >&5 ++echo "configure:93085: 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 - else -- echo "$ac_t""no" 1>&6 ++else + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext <&2; exit 1; } -- -- +int main() { +dn_skipname() +; return 0; } +EOF -+if { (eval echo configure:92782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:93104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -37370,18 +38354,14 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" - fi ++fi +rm -f conftest* +LIBS="$ac_save_LIBS" -- SQLITE_MODULE_TYPE=external -- PHP_SQLITE_CFLAGS=$pdo_inc_path -- sqlite_extra_sources="libsqlite/src/encode.c" -- else -- # use bundled library +- if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=sqlite - -- # we only support certain lemon versions -- lemon_version_list="1.0" +- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -37389,98 +38369,96 @@ +else + echo "$ac_t""no" 1>&6 -- # 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:87325: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then +- fi + echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 -+echo "configure:92802: checking for __dn_skipname in -lbind" >&5 ++echo "configure:93124: 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 - else -- if test -n "$LEMON"; then -- ac_cv_prog_LEMON="$LEMON" # Let the user override the test. ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_LEMON="lemon" -- break -- fi -- done -- IFS="$ac_save_ifs" + +- +- am_i_shared=$PHP_SQLITE_SHARED +- is_it_shared=$PHP_SPL_SHARED +- is_it_enabled=$PHP_SPL +- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then +- { echo "configure: error: +-You've configured extension sqlite to build statically, but it +-depends on extension spl, which you've configured to build shared. +-You either need to build sqlite shared or build spl 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 sqlite, which depends on extension spl, +-but you've either not enabled spl, or have disabled it. +-" 1>&2; exit 1; } +- fi +- +- +- am_i_shared=$PHP_SQLITE_SHARED +- is_it_shared=$PHP_PDO_SHARED +- is_it_enabled=$PHP_PDO +- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then +- { echo "configure: error: +-You've configured extension sqlite to build statically, but it +-depends on extension pdo, which you've configured to build shared. +-You either need to build sqlite shared or build pdo 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 sqlite, which depends on extension pdo, +-but you've either not enabled pdo, or have disabled it. +-" 1>&2; exit 1; } +- fi +- ++int main() { ++__dn_skipname() ++; return 0; } ++EOF ++if { (eval echo configure:93143: \"$ac_link\") 1>&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 ++fi +rm -f conftest* +LIBS="$ac_save_LIBS" -+ - fi --LEMON="$ac_cv_prog_LEMON" --if test -n "$LEMON"; then -- echo "$ac_t""$LEMON" 1>&6 + +- +- src=$ext_srcdir/Makefile.frag +- ac_srcdir=$ext_srcdir +- ac_builddir=$ext_builddir +- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments ++fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes - else - echo "$ac_t""no" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 +found=no - fi ++fi -- if test "$LEMON"; then -- echo $ac_n "checking for lemon version""... $ac_c" 1>&6 --echo "configure:87353: 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 -- lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'` -- php_cv_lemon_version=invalid -- for lemon_check_version in $lemon_version_list; do -- if test "$lemon_version" = "$lemon_check_version"; then -- php_cv_lemon_version="$lemon_check_version (ok)" -- fi -- done -- - fi - --echo "$ac_t""$php_cv_lemon_version" 1>&6 -- else -- lemon_version=none -- fi -- case $php_cv_lemon_version in -- ""|invalid) -- lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)." -- echo "configure: warning: $lemon_msg" 1>&2 -- LEMON="exit 0;" -- ;; -- esac -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON" - +- PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD" ++fi ++ ++ + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lbind" @@ -37488,11 +38466,11 @@ + found=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes +else @@ -37504,134 +38482,55 @@ +rm -fr conftest* +fi -- SQLITE_MODULE_TYPE=builtin -- 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 \ -- libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \ -- libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \ -- libsqlite/src/os.c libsqlite/src/pager.c \ -- libsqlite/src/printf.c libsqlite/src/random.c \ -- libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \ -- libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \ -- libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \ -- libsqlite/src/vacuum.c libsqlite/src/copy.c \ -- libsqlite/src/vdbeaux.c libsqlite/src/date.c \ -- libsqlite/src/where.c libsqlite/src/trigger.c" +- +- +- for header_file in $ext_builddir/libsqlite/src/sqlite.h; do +- +- +- unique=`echo $header_file|$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 $header_file" +- + LIBS=$ac_libs fi -- sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" -- -- ext_builddir=ext/sqlite -- ext_srcdir=$abs_srcdir/ext/sqlite -- -- ac_extra=`echo "$PHP_SQLITE_CFLAGS"|$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_SQLITE_SHARED=no +- done + if test "$found" = "yes"; then - ++ -- case ext/sqlite in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + case bind in + c|c_r|pthread*) ;; + *) + LIBS="-lbind $LIBS" + ;; - esac -- -- -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in $sqlite_sources; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_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 ++ esac -- cat >>Makefile.objects<> confdefs.h <<\EOF +#define HAVE_DN_SKIPNAME 1 - EOF -- done - ++EOF ++ + cat >> confdefs.h <<\EOF +#define HAVE_LIBBIND 1 +EOF - -- EXT_STATIC="$EXT_STATIC sqlite" -- if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" -- fi ++ + ac_cv_func_dn_skipname=yes - else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SQLITE_SHARED=yes -- -- case ext/sqlite in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -- -- b_c_pre=$shared_c_pre -- b_cxx_pre=$shared_cxx_pre -- b_c_meta=$shared_c_meta -- b_cxx_meta=$shared_cxx_meta -- b_c_post=$shared_c_post -- b_cxx_post=$shared_cxx_post -- b_lo=$shared_lo -- -- -- old_IFS=$IFS -- for ac_src in $sqlite_sources; do -+ ++ else + -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_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 +- $php_shtool mkdir -p $ext_builddir/libsqlite/src +- + unset ac_cv_lib_socket_dn_skipname + unset ac_cv_lib_socket___dn_skipname + unset found + echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6 -+echo "configure:92899: checking for dn_skipname in -lsocket" >&5 ++echo "configure:93221: checking for dn_skipname in -lsocket" >&5 +ac_lib_var=`echo socket'_'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 @@ -37639,27 +38538,21 @@ + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&6 +-echo "configure:88071: checking size of char *" >&5 +-if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then +int main() { +dn_skipname() +; return 0; } - EOF -- done -- -- case $host_alias in -- *netware*) -- -- install_modules="install-modules" -+if { (eval echo configure:92918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++EOF ++if { (eval echo configure:93240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -37670,59 +38563,37 @@ +fi +rm -f conftest* +LIBS="$ac_save_LIBS" - -- 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'/phpsqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsqlite.so '$ext_builddir'/phpsqlite.so' -- ;; -- *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_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE, 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_sqlite) $(PHPSQLITE_SHARED_LIBADD)' -- ;; -- esac ++ +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else + echo "$ac_t""no" 1>&6 - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsqlite.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix" -- fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" ++ + echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6 -+echo "configure:92938: checking for __dn_skipname in -lsocket" >&5 ++echo "configure:93260: checking for __dn_skipname in -lsocket" >&5 +ac_lib_var=`echo socket'_'__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 -+else + echo $ac_n "(cached) $ac_c" 1>&6 + else +- if test "$cross_compiling" = yes; then +- ac_cv_sizeof_char_p=4 + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:93279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -37733,9 +38604,7 @@ +fi +rm -f conftest* +LIBS="$ac_save_LIBS" - --$ext_builddir/phpsqlite.$suffix: \$(shared_objects_sqlite) \$(PHPSQLITE_SHARED_DEPENDENCIES) -- $link_cmd ++ +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -37744,65 +38613,54 @@ + echo "$ac_t""no" 1>&6 +found=no +fi - --EOF ++ + +fi - -- ;; -- *) -- -- 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'/sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sqlite.so '$ext_builddir'/sqlite.so' -- ;; -- *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_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SQLITE, 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_sqlite) $(SQLITE_SHARED_LIBADD)' -- ;; -- esac ++ ++ + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lsocket" + if test "$cross_compiling" = yes; then + found=no -+else -+ cat > conftest.$ac_ext < conftest.$ac_ext < +-main() +-{ +- FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(char *)); +- exit(0); +-} +main() { return (0); } -+EOF -+if { (eval echo configure:92993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then + EOF +-if { (eval echo configure:88090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93315: \"$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` + found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* +- ac_cv_sizeof_char_p=0 + found=no -+fi -+rm -fr conftest* -+fi + fi + rm -fr conftest* + fi -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sqlite.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix" +-fi +-echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6 +-cat >> confdefs.h <>Makefile.objects<> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF +-#define SQLITE_PTR_SZ SIZEOF_CHAR_P +#define HAVE_DN_SKIPNAME 1 EOF -- ;; -- esac -- cat >> confdefs.h <> confdefs.h <<\EOF +-#define SQLITE_UTF8 1 + cat >> confdefs.h <<\EOF +#define HAVE_LIBSOCKET 1 EOF +- else +- SQLITE_ENCODING="ISO8859" - fi + ac_cv_func_dn_skipname=yes + else -+ + +- PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING" + : -+ - fi + ++ fi + -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_SQLITE_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- +- SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION` +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION" + fi - -- case ext/sqlite in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ ++ + + fi - ++ + ;; - ++ + 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 - +- sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h -- old_IFS=$IFS -- for ac_src in $sqlite_sources; do +- if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then +- echo '#include ' > $ext_builddir/libsqlite/src/config.h +- else +- echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h +- fi +- +- cat >> $ext_builddir/libsqlite/src/config.h <&6 +-echo "configure:88152: checking for $ac_func" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "checking for res_search""... $ac_c" 1>&6 -+echo "configure:93052: checking for res_search" >&5 ++echo "configure:93374: 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 < + /* 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(); ++char res_search(); + + 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) ++#if defined (__stub_res_search) || defined (__stub___res_search) + choke me + #else +-$ac_func(); ++res_search(); + #endif + + ; return 0; } + EOF +-if { (eval echo configure:88180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:93402: \"$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" ++ eval "ac_cv_func_res_search=yes" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_func_$ac_func=no" ++ eval "ac_cv_func_res_search=no" + fi + rm -f conftest* + fi + +-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` +- cat >> confdefs.h <&6 ++ echo $ac_n "checking for __res_search""... $ac_c" 1>&6 ++echo "configure:93420: 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 < +/* 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 res_search(); - -- 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 ++char __res_search(); ++ +int main() { - -- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_res_search=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_res_search=no" -+fi -+rm -f conftest* -+fi - -+if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __res_search""... $ac_c" 1>&6 -+echo "configure:93098: 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 < -+/* 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 __res_search(); - -- EXT_STATIC="$EXT_STATIC sqlite" -- ;; -- *) -- -- -- case ext/sqlite in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -+int main() { - -- 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 -+/* 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___res_search) || defined (__stub_____res_search) -+choke me -+#else -+__res_search(); -+#endif - -+; return 0; } -+EOF -+if { (eval echo configure:93126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- ++if { (eval echo configure:93448: \"$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 @@ -37993,149 +38836,96 @@ +fi +rm -f conftest* +fi - -- old_IFS=$IFS -- for ac_src in $sqlite_sources; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ +if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes -+else -+ echo "$ac_t""no" 1>&6 + else + echo "$ac_t""no" 1>&6 +found=no +fi + -+fi - -- 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 + fi +-done -- cat >>Makefile.objects<&6 +-echo "configure:88208: checking for $ac_hdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ + case $found in + yes) + cat >> confdefs.h <<\EOF +#define HAVE_RES_SEARCH 1 - EOF -- done - -- -- ;; -- esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" -- fi -- ++EOF ++ + ac_cv_func_res_search=yes + ;; - -- BUILD_DIR="$BUILD_DIR $ext_builddir" ++ + *) - ++ + unset ac_cv_lib_resolv_res_search + unset ac_cv_lib_resolv___res_search + unset found + echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:93164: checking for res_search in -lresolv" >&5 ++echo "configure:93486: 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 -+else + echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext < conftest.$ac_ext < +/* 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 res_search(); - ++ +int main() { +res_search() +; return 0; } -+EOF -+if { (eval echo configure:93183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* + EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:88218: \"$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 ++if { (eval echo configure:93505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* + else +- echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" + eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* + fi + rm -f conftest* +LIBS="$ac_save_LIBS" - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=sqlite -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- -- fi -- -- -- am_i_shared=$PHP_SQLITE_SHARED -- is_it_shared=$PHP_SPL_SHARED -- is_it_enabled=$PHP_SPL -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension sqlite to build statically, but it --depends on extension spl, which you've configured to build shared. --You either need to build sqlite shared or build spl 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 sqlite, which depends on extension spl, --but you've either not enabled spl, or have disabled it. --" 1>&2; exit 1; } -- fi -- -- -- am_i_shared=$PHP_SQLITE_SHARED -- is_it_shared=$PHP_PDO_SHARED -- is_it_enabled=$PHP_PDO -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension sqlite to build statically, but it --depends on extension pdo, which you've configured to build shared. --You either need to build sqlite shared or build pdo 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 sqlite, which depends on extension pdo, --but you've either not enabled pdo, or have disabled it. --" 1>&2; exit 1; } -- fi -- -+fi ++ + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 + echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 - -- -- src=$ext_srcdir/Makefile.frag -- ac_srcdir=$ext_srcdir -- ac_builddir=$ext_builddir -- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + else + echo "$ac_t""no" 1>&6 ++ + echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:93203: checking for __res_search in -lresolv" >&5 ++echo "configure:93525: 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 @@ -38143,20 +38933,18 @@ + ac_save_LIBS="$LIBS" +LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:93544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -38164,25 +38952,12 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" -+fi + fi +-done +rm -f conftest* +LIBS="$ac_save_LIBS" -- -- -- for header_file in $ext_builddir/libsqlite/src/sqlite.h; do -- -- -- unique=`echo $header_file|$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 $header_file" -- -- fi -+fi + fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes @@ -38191,295 +38966,143 @@ +found=no +fi -- done - ++ +fi -- -- if test "$SQLITE_MODULE_TYPE" = "builtin"; then -- -- -- $php_shtool mkdir -p $ext_builddir/libsqlite/src -- -- echo $ac_n "checking size of char *""... $ac_c" 1>&6 --echo "configure:87766: checking size of char *" >&5 --if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then +-echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 +-echo "configure:88249: 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 -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_char_p=4 + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lresolv" + if test "$cross_compiling" = yes; then + found=no - else - cat > conftest.$ac_ext < --#include --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(char *)); -- exit(0); --} ++else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93258: \"$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` ++EOF ++if { (eval echo configure:93580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then + found=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- ac_cv_sizeof_char_p=0 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + found=no - fi - rm -fr conftest* - fi - --fi --echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6 --cat >> confdefs.h <> confdefs.h <<\EOF --#define SQLITE_PTR_SZ SIZEOF_CHAR_P ++ ++ ++ cat >> confdefs.h <<\EOF +#define HAVE_RES_SEARCH 1 - EOF - -- if test "$PHP_SQLITE_UTF8" = "yes"; then -- SQLITE_ENCODING="UTF8" -- cat >> confdefs.h <<\EOF --#define SQLITE_UTF8 1 ++EOF ++ + cat >> confdefs.h <<\EOF +#define HAVE_LIBRESOLV 1 - EOF - -- else -- SQLITE_ENCODING="ISO8859" -- fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING" -- -- -- SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION` -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION" -- -- -- sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h -- -- if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then -- echo '#include ' > $ext_builddir/libsqlite/src/config.h -- else -- echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h -- fi ++EOF ++ + ac_cv_func_res_search=yes + else - -- cat >> $ext_builddir/libsqlite/src/config.h <&6 --echo "configure:87848: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +- ac_cv_flush_io=no + unset ac_cv_lib_bind_res_search + unset ac_cv_lib_bind___res_search + unset found + echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 -+echo "configure:93300: checking for res_search in -lbind" >&5 ++echo "configure:93622: 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 - else -- cat > conftest.$ac_ext <&6 ++else + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext < - /* 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 ++#line 93630 "configure" ++#include "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 res_search(); +int main() { +res_search() - ; return 0; } - EOF --if { (eval echo configure:87876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:93319: \"$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" ++; return 0; } ++EOF ++if { (eval echo configure:93641: \"$ac_link\") 1>&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_func_$ac_func=no" +- cat > conftest.$ac_ext <&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* --fi ++fi ++rm -f conftest* +LIBS="$ac_save_LIBS" - --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++ +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <&6 + found=yes - else - echo "$ac_t""no" 1>&6 --fi --done - -- for ac_hdr in time.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:87904: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++else ++ echo "$ac_t""no" 1>&6 ++ + echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 -+echo "configure:93339: checking for __res_search in -lbind" >&5 ++echo "configure:93661: 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 - else -- cat > conftest.$ac_ext <&6 ++else + ac_save_LIBS="$LIBS" +LIBS="-lbind $LIBS" +cat > conftest.$ac_ext < +/* 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 __res_search(); -+ + +-#include +-#include +int main() { +__res_search() +; return 0; } - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:87914: \"$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 -+if { (eval echo configure:93358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" ++EOF ++if { (eval echo configure:93680: \"$ac_link\") 1>&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 "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" ++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* ++fi ++rm -f conftest* +LIBS="$ac_save_LIBS" -+ - fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 -+found=no - fi --done - -+ - fi - -- --echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 --echo "configure:87945: 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 -- --if test "$cross_compiling" = yes; then -- -- ac_cv_flush_io=no -- -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lbind" -+ if test "$cross_compiling" = yes; then -+ found=no - else - cat > conftest.$ac_ext < --#include -- -int main(int argc, char **argv) -{ - char *filename = tmpnam(NULL); @@ -38507,15 +39130,35 @@ - result = 1; - fclose(fp); - unlink(filename); -- ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ found=yes ++else ++ echo "$ac_t""no" 1>&6 ++found=no ++fi ++ ++ ++fi + - exit(result); -} -- -+main() { return (0); } - EOF --if { (eval echo configure:87994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then + ++ if test "$found" = "yes"; then ++ ac_libs=$LIBS ++ LIBS="$LIBS -lbind" ++ if test "$cross_compiling" = yes; then ++ found=no ++else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93716: \"$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 - @@ -38562,7 +39205,7 @@ -if test "$ac_cv_func_crypt" = "no"; then - echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 --echo "configure:88022: checking for crypt in -lcrypt" >&5 +-echo "configure:88326: checking for crypt in -lcrypt" >&5 -ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` + ac_cv_func_res_search=yes + else @@ -38572,7 +39215,7 @@ + unset ac_cv_lib_socket___res_search + unset found + echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:93436: checking for res_search in -lsocket" >&5 ++echo "configure:93758: 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 @@ -38581,8 +39224,8 @@ -LIBS="-lcrypt $LIBS" +LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:93455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:88345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:93777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -88052,172 +93466,161 @@ LIBS="$ac_save_LIBS" +@@ -88356,229 +93788,161 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -38619,10 +39262,10 @@ -fi - -echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 --echo "configure:88070: checking for standard DES crypt" >&5 +-echo "configure:88374: checking for standard DES crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then + echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:93475: checking for __res_search in -lsocket" >&5 ++echo "configure:93797: 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 @@ -38634,11 +39277,11 @@ - -else - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:88404: \"$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 - -+if { (eval echo configure:93494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:93816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else @@ -38700,7 +39343,7 @@ -echo "$ac_t""$ac_cv_crypt_des" 1>&6 - -echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 --echo "configure:88121: checking for extended DES crypt" >&5 +-echo "configure:88425: 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 @@ -38716,8 +39359,8 @@ + found=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:88455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93852: \"$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 @@ -38757,13 +39400,22 @@ fi -fi +- +-echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 + LIBS=$ac_libs + fi --echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 +-echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 +-echo "configure:88476: 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 +- +-if test "$cross_compiling" = yes; then + if test "$found" = "yes"; then + -+ + +- ac_cv_crypt_md5=no + case socket in + c|c_r|pthread*) ;; + *) @@ -38771,66 +39423,32 @@ + ;; + esac --echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 --echo "configure:88172: checking for MD5 crypt" >&5 --if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_RES_SEARCH 1 -+EOF -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBSOCKET 1 -+EOF -+ -+ ac_cv_func_res_search=yes -+ else -+ -+ : -+ -+ fi -+ -+ -+ fi -+ -+ -+ fi -+ -+ ;; -+ -+ esac -+ -+ -+echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 -+echo "configure:93583: 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 - - if test "$cross_compiling" = yes; then - -- ac_cv_crypt_md5=no -+ ac_cv_atof_accept_nan=no - - else - cat > conftest.$ac_ext < conftest.$ac_ext < -#endif -- ++ cat >> confdefs.h <<\EOF ++#define HAVE_RES_SEARCH 1 ++EOF + -#if HAVE_CRYPT_H -#include -#endif -- ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBSOCKET 1 ++EOF + -main() { -#if HAVE_CRYPT - char salt[15], answer[40]; -+#include -+#include ++ ac_cv_func_res_search=yes ++ else ++ ++ : - salt[0]='$'; salt[1]='1'; salt[2]='$'; - salt[3]='r'; salt[4]='a'; salt[5]='s'; @@ -38840,69 +39458,56 @@ - strcpy(answer,salt); - strcat(answer,"rISCgZzpwk3UhDidwXvin0"); - exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); -+#ifdef HAVE_ISNAN -+#define zend_isnan(a) isnan(a) -+#elif defined(HAVE_FPCLASS) -+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) - #else +-#else - exit(0); -+#define zend_isnan(a) 0 - #endif -+ -+int main(int argc, char** argv) -+{ -+ return zend_isnan(atof("NAN")) ? 0 : 1; - } -+ - EOF --if { (eval echo configure:88211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then +-#endif +-} +-EOF +-if { (eval echo configure:88515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++ fi - ac_cv_crypt_md5=yes -+ ac_cv_atof_accept_nan=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* ++ fi - ac_cv_crypt_md5=no -+ ac_cv_atof_accept_nan=no - - fi - rm -fr conftest* -@@ -88225,56 +93628,60 @@ fi +- +-fi +-rm -fr conftest* +-fi - fi +-fi ++ fi ++ ++ ;; ++ ++ esac -echo "$ac_t""$ac_cv_crypt_md5" 1>&6 -+echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6 -+if test "$ac_cv_atof_accept_nan" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ATOF_ACCEPTS_NAN 1 -+EOF -echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 --echo "configure:88232: checking for Blowfish crypt" >&5 +-echo "configure:88536: checking for Blowfish crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then -+fi -+ -+echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 -+echo "configure:93641: checking whether atof() accepts INF" >&5 -+if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then ++echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 ++echo "configure:93905: 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 if test "$cross_compiling" = yes; then - ac_cv_crypt_blowfish=no -+ ac_cv_atof_accept_inf=no ++ ac_cv_atof_accept_nan=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:88572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93936: \"$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 -+ ac_cv_atof_accept_inf=yes ++ ac_cv_atof_accept_nan=yes else echo "configure: failed program was:" >&5 @@ -38955,41 +39557,41 @@ rm -fr conftest* - ac_cv_crypt_blowfish=no -+ ac_cv_atof_accept_inf=no ++ ac_cv_atof_accept_nan=no fi rm -fr conftest* -@@ -88282,55 +93689,60 @@ fi +@@ -88586,55 +93950,60 @@ fi fi -echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 -+echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 -+if test "$ac_cv_atof_accept_inf" = "yes"; then ++echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6 ++if test "$ac_cv_atof_accept_nan" = "yes"; then + cat >> confdefs.h <<\EOF -+#define HAVE_ATOF_ACCEPTS_INF 1 ++#define HAVE_ATOF_ACCEPTS_NAN 1 +EOF -echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 --echo "configure:88289: checking for SHA512 crypt" >&5 +-echo "configure:88593: checking for SHA512 crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then +fi + -+echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 -+echo "configure:93702: checking whether HUGE_VAL == INF" >&5 -+if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then ++echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 ++echo "configure:93963: 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 if test "$cross_compiling" = yes; then - ac_cv_crypt_SHA512=no -+ ac_cv_huge_val_inf=yes ++ ac_cv_atof_accept_inf=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:88628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:93997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then - ac_cv_crypt_SHA512=yes -+ ac_cv_huge_val_inf=yes ++ ac_cv_atof_accept_inf=yes else echo "configure: failed program was:" >&5 @@ -39041,58 +39643,52 @@ rm -fr conftest* - ac_cv_crypt_SHA512=no -+ ac_cv_huge_val_inf=no ++ ac_cv_atof_accept_inf=no fi rm -fr conftest* -@@ -88338,55 +93750,62 @@ fi +@@ -88642,55 +94011,60 @@ fi fi -echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6 -+echo "$ac_t""$ac_cv_huge_val_inf" 1>&6 -+if test "$ac_cv_huge_val_inf" = "yes"; then ++echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 ++if test "$ac_cv_atof_accept_inf" = "yes"; then + cat >> confdefs.h <<\EOF -+#define HAVE_HUGE_VAL_INF 1 ++#define HAVE_ATOF_ACCEPTS_INF 1 +EOF -echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 --echo "configure:88345: checking for SHA256 crypt" >&5 +-echo "configure:88649: checking for SHA256 crypt" >&5 -if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then +fi + -+echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 -+echo "configure:93763: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 -+if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then ++echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 ++echo "configure:94024: 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 if test "$cross_compiling" = yes; then - ac_cv_crypt_SHA256=no -+ ac_cv_huge_val_nan=yes ++ ac_cv_huge_val_inf=yes else cat > conftest.$ac_ext < -#endif -+#include -+#include - +- -#if HAVE_CRYPT_H -#include -+#ifdef HAVE_ISNAN -+#define zend_isnan(a) isnan(a) -+#elif defined(HAVE_FPCLASS) -+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) -+#else -+#define zend_isnan(a) 0 - #endif +-#endif ++#include ++#include -main() { -#if HAVE_CRYPT @@ -39102,24 +39698,30 @@ - strcpy(answer, salt); - strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5"); - exit (strcmp((char *)crypt("foo",salt),answer)); -+int main(int argc, char** argv) -+{ -+#if defined(__sparc__) && !(__GNUC__ >= 3) -+ /* prevent bug #27830 */ -+ return 1; ++#ifdef HAVE_ISINF ++#define zend_isinf(a) isinf(a) ++#elif defined(INFINITY) ++/* Might not work, but is required by ISO C99 */ ++#define zend_isinf(a) (((a)==INFINITY)?1:0) ++#elif defined(HAVE_FPCLASS) ++#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) #else - exit(0); -+ return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1; ++#define zend_isinf(a) 0 #endif ++ ++int main(int argc, char** argv) ++{ ++ return zend_isinf(HUGE_VAL) ? 0 : 1; } + EOF --if { (eval echo configure:88380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:88684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:94058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then - ac_cv_crypt_SHA256=yes -+ ac_cv_huge_val_nan=yes ++ ac_cv_huge_val_inf=yes else echo "configure: failed program was:" >&5 @@ -39127,106 +39729,69 @@ rm -fr conftest* - ac_cv_crypt_SHA256=no -+ ac_cv_huge_val_nan=no ++ ac_cv_huge_val_inf=no fi rm -fr conftest* -@@ -88394,254 +93813,110 @@ fi +@@ -88698,254 +94072,173 @@ fi fi -echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6 - -+echo "$ac_t""$ac_cv_huge_val_nan" 1>&6 -+if test "$ac_cv_huge_val_nan" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_HUGE_VAL_NAN 1 -+EOF - +- -if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then -+fi - +- - echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6 --echo "configure:88404: checking whether the compiler supports __alignof__" >&5 +-echo "configure:88708: checking whether the compiler supports __alignof__" >&5 -if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then -+echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6 -+echo "configure:93826: 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 - +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- - cat > conftest.$ac_ext < conftest.$ac_ext < -+ - int main() { - +-int main() { +- - int align = __alignof__(int); - -+#ifndef HAVE_STRPTIME -+#error no strptime() on this platform -+#else -+/* use invalid strptime() declaration to see if it fails to compile */ -+int strptime(const char *s, const char *format, struct tm *tm); -+#endif -+ - ; return 0; } - EOF --if { (eval echo configure:88420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:93848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - +-; return 0; } +-EOF +-if { (eval echo configure:88724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- - ac_cv_alignof_exists=yes - -+ ac_cv_strptime_decl_fails=no -+ - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- - ac_cv_alignof_exists=no - -+ ac_cv_strptime_decl_fails=yes -+ - fi - rm -f conftest* - fi - +-fi +-rm -f conftest* +-fi +- -echo "$ac_t""$ac_cv_alignof_exists" 1>&6 - if test "$ac_cv_alignof_exists" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_ALIGNOF 1 -+echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6 -+if test "$ac_cv_strptime_decl_fails" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_STRPTIME_DECL_FAILS 1 - EOF - +-EOF +- - fi -+fi - +- - echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6 --echo "configure:88445: checking whether the compiler supports aligned attribute" >&5 +-echo "configure:88749: checking whether the compiler supports aligned attribute" >&5 -if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then -+for ac_hdr in wchar.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:93876: 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 +- echo $ac_n "(cached) $ac_c" 1>&6 +-else - - cat > conftest.$ac_ext < conftest.$ac_ext < - EOF --if { (eval echo configure:88461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:93886: \"$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* +-EOF +-if { (eval echo configure:88765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* - - ac_cv_attribute_aligned=yes - -+ eval "ac_cv_header_$ac_safe=yes" - else -+ echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* - - ac_cv_attribute_aligned=no - -+ eval "ac_cv_header_$ac_safe=no" - fi - rm -f conftest* - fi +-fi +-rm -f conftest* +-fi - -echo "$ac_t""$ac_cv_attribute_aligned" 1>&6 - if test "$ac_cv_attribute_aligned" = "yes"; then @@ -39292,10 +39849,7 @@ -#define PHP_SHA512_CRYPT 1 -EOF - -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <> confdefs.h <&6 ++if test "$ac_cv_huge_val_inf" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_HUGE_VAL_INF 1 ++EOF ++ ++fi ++ ++echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 ++echo "configure:94085: 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 + ++if test "$cross_compiling" = yes; then + ++ ac_cv_huge_val_nan=yes + - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta @@ -39317,8 +39886,14 @@ - b_c_post=$php_c_post - b_cxx_post=$php_cxx_post - b_lo=$php_lo -- -- ++else ++ cat > conftest.$ac_ext < ++#include + - old_IFS=$IFS - for ac_src in crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c; do - @@ -39328,23 +39903,41 @@ - IFS=$old_IFS - - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- ++#ifdef HAVE_ISNAN ++#define zend_isnan(a) isnan(a) ++#elif defined(HAVE_FPCLASS) ++#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) ++#else ++#define zend_isnan(a) 0 ++#endif + - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; - *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac -- ++int main(int argc, char** argv) ++{ ++#if defined(__sparc__) && !(__GNUC__ >= 3) ++ /* prevent bug #27830 */ ++ return 1; ++#else ++ return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1; ++#endif ++} + - cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ++ ac_cv_huge_val_nan=yes + else - if test "$ac_cv_crypt_des" = "yes"; then - ac_result=1 @@ -39356,8 +39949,18 @@ - cat >> confdefs.h <&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* ++ ++ ac_cv_huge_val_nan=no ++ ++fi ++rm -fr conftest* ++fi + ++fi + - if test "$ac_cv_crypt_blowfish" = "yes"; then - ac_result=1 - ac_crypt_blowfish=1 @@ -39367,9 +39970,24 @@ - fi - cat >> confdefs.h <&6 ++if test "$ac_cv_huge_val_nan" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_HUGE_VAL_NAN 1 + EOF + ++fi ++ ++echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6 ++echo "configure:94148: 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 <> confdefs.h < + ++int main() { + - if test "$ac_cv_crypt_md5" = "yes"; then - ac_result=1 - ac_crypt_md5=1 @@ -39391,9 +40011,25 @@ - fi - cat >> confdefs.h <&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* + ++ ac_cv_strptime_decl_fails=no ++ ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* + - if test "$ac_cv_crypt_sha512" = "yes"; then - ac_result=1 - ac_crypt_sha512=1 @@ -39404,8 +40040,12 @@ - cat >> confdefs.h <> confdefs.h <> confdefs.h <&6 - fi -+done - --for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy -+for ac_func in mblen - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:88640: checking for $ac_func" >&5 -+echo "configure:93915: 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 <&6 ++if test "$ac_cv_strptime_decl_fails" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_STRPTIME_DECL_FAILS 1 EOF --if { (eval echo configure:88668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:93943: \"$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 -@@ -88688,55 +93963,15 @@ else - fi - done --echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 --echo "configure:88693: 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 -- # Some versions of Solaris or SCO have a broken fnmatch function. --# So we run a test program. If we are cross-compiling, take no chance. --# Thanks to John Oleynick and Franc,ois Pinard for this test. --if test "$cross_compiling" = yes; then ++fi + ++for ac_hdr in wchar.h ++do ++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++echo "configure:94198: 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 ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:94208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=yes" ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=no" ++fi ++rm -f conftest* ++fi ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 + fi ++done + +-for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy ++for ac_func in mblen + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:88944: checking for $ac_func" >&5 ++echo "configure:94237: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:94265: \"$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 +@@ -88992,55 +94285,15 @@ else + fi + done + +-echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 +-echo "configure:88997: 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 +- # Some versions of Solaris or SCO have a broken fnmatch function. +-# So we run a test program. If we are cross-compiling, take no chance. +-# Thanks to John Oleynick and Franc,ois Pinard for this test. +-if test "$cross_compiling" = yes; then - ac_cv_func_fnmatch_works=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:89012: \"$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 @@ -39498,131 +40177,73 @@ +for ac_func in mbrlen mbsinit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:88735: checking for $ac_func" >&5 -+echo "configure:93970: checking for $ac_func" >&5 +-echo "configure:89039: checking for $ac_func" >&5 ++echo "configure:94292: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:93998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:94320: \"$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 -@@ -88778,1282 +94013,1194 @@ if eval "test \"`echo '$ac_cv_func_'$ac_ +@@ -89082,1243 +94335,1194 @@ if eval "test \"`echo '$ac_cv_func_'$ac_ #define $ac_tr_func 1 EOF - php_can_support_proc_open=yes - break -- - else - echo "$ac_t""no" 1>&6 --php_can_support_proc_open=no -- - fi - done - --echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6 --echo "configure:88793: 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 --#define PHP_CAN_SUPPORT_PROC_OPEN 1 --EOF -- --else -- echo "$ac_t""no" 1>&6 --fi -- --if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then -- cat >> confdefs.h <<\EOF --#define ENABLE_CHROOT_FUNC 1 --EOF -- --fi -- -- -- unset ac_cv_func_res_nsearch -- unset ac_cv_func___res_nsearch -- unset found -- -- echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6 --echo "configure:88817: checking for res_nsearch" >&5 --if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then ++else ++ echo "$ac_t""no" 1>&6 ++fi ++done ++ +echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -+echo "configure:94023: checking for mbstate_t" >&5 ++echo "configure:94345: 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 <&6 ++else + +cat > conftest.$ac_ext < --/* 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 res_nsearch(); ++#line 94351 "configure" ++#include "confdefs.h" + +#ifdef HAVE_WCHAR_H +# include +#endif - - 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_res_nsearch) || defined (__stub___res_nsearch) --choke me --#else --res_nsearch(); --#endif ++ ++int main() { ++ +int __tmp__() { mbstate_t a; } - - ; return 0; } - EOF --if { (eval echo configure:88845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:94042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* -- eval "ac_cv_func_res_nsearch=yes" ++ ++; return 0; } ++EOF ++if { (eval echo configure:94364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* + + ac_cv_type_mbstate_t=yes + - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_res_nsearch=no" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* + + ac_cv_type_mbstate_t=no + - fi - rm -f conftest* - fi - --if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 --echo "configure:88863: checking for __res_nsearch" >&5 --if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then ++fi ++rm -f conftest* ++fi ++ +echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6 +if test "$ac_cv_type_mbstate_t" = "yes"; then + cat >> confdefs.h <<\EOF @@ -39635,70 +40256,40 @@ +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:94070: checking for $ac_hdr" >&5 ++echo "configure:94392: 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 < --/* 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 __res_nsearch(); -- --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___res_nsearch) || defined (__stub_____res_nsearch) --choke me --#else --__res_nsearch(); --#endif -- --; return 0; } ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < - EOF --if { (eval echo configure:88891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:94080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:94402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then - rm -rf conftest* -- eval "ac_cv_func___res_nsearch=yes" ++ rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" - else ++else + echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func___res_nsearch=no" ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" - fi - rm -f conftest* - fi -- --if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then ++fi ++rm -f conftest* ++fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes ++ echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 --found=no --fi -- - fi ++else ++ echo "$ac_t""no" 1>&6 ++fi +done + + @@ -39820,17 +40411,12 @@ + $ac_comp +EOF + done - ++ + case $host_alias in + *netware*) + + install_modules="install-modules" - -- case $found in -- yes) -- cat >> confdefs.h <<\EOF --#define HAVE_RES_NSEARCH 1 --EOF ++ + case $host_alias in + *aix*) + suffix=so @@ -39845,105 +40431,24 @@ + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD)' + ;; + esac - -- ac_cv_func_res_nsearch=yes -- ;; -- -- *) ++ + if test "x" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix" + else + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix" + fi - -- unset ac_cv_lib_resolv_res_nsearch -- unset ac_cv_lib_resolv___res_nsearch -- unset found -- echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6 --echo "configure:88929: checking for res_nsearch in -lresolv" >&5 --ac_lib_var=`echo resolv'_'res_nsearch | 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="-lresolv $LIBS" --cat > conftest.$ac_ext <&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" ++ + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 ++ + cat >>Makefile.objects<&6 --echo "configure:88968: checking for __res_nsearch in -lresolv" >&5 --ac_lib_var=`echo resolv'_'__res_nsearch | 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="-lresolv $LIBS" --cat > conftest.$ac_ext <&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 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi ++ ++EOF ++ + ;; + *) + @@ -39963,77 +40468,86 @@ + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(STANDARD_SHARED_LIBADD)' + ;; + esac - ++ + if test "x" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/standard.$suffix" + else + PHP_MODULES="$PHP_MODULES \$(phplibdir)/standard.$suffix" + fi - --fi ++ + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" +-else +- echo "$ac_t""no" 1>&6 +-php_can_support_proc_open=no + cat >>Makefile.objects< conftest.$ac_ext <&6 +-echo "configure:89097: 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 +-#define PHP_CAN_SUPPORT_PROC_OPEN 1 EOF --if { (eval echo configure:89023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes + -else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* +- echo "$ac_t""no" 1>&6 -fi - -- LIBS=$ac_libs +- +-if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then +- cat >> confdefs.h <<\EOF +-#define ENABLE_CHROOT_FUNC 1 + ;; + esac + cat >> confdefs.h <&6 +-echo "configure:89121: checking for res_nsearch" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-/* 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 res_nsearch(); +-int main() { + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta @@ -40042,17 +40556,16 @@ + b_cxx_post=$php_cxx_post + b_lo=$php_lo -- cat >> confdefs.h <<\EOF --#define HAVE_RES_NSEARCH 1 --EOF -- -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 --EOF +-/* 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_res_nsearch) || defined (__stub___res_nsearch) +-choke me +-#else +-res_nsearch(); +-#endif -- ac_cv_func_res_nsearch=yes -- else -- +-; return 0; } + old_IFS=$IFS + for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ + cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ @@ -40065,35 +40578,14 @@ + http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ + var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ + filters.c proc_open.c streamsfuncs.c http.c; do - -- unset ac_cv_lib_bind_res_nsearch -- unset ac_cv_lib_bind___res_nsearch -- unset found -- echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 --echo "configure:89065: checking for res_nsearch in -lbind" >&5 --ac_lib_var=`echo bind'_'res_nsearch | 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="-lbind $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" +- eval "ac_cv_func_res_nsearch=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" +- eval "ac_cv_func_res_nsearch=no" -fi -rm -f conftest* --LIBS="$ac_save_LIBS" +-fi + done --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +-if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 - -- echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6 --echo "configure:89104: checking for __res_nsearch in -lbind" >&5 --ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 +-echo "configure:89167: checking for __res_nsearch" >&5 +-if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else -- ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < -/* 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 __res_nsearch(); + +-int main() { + EXT_STATIC="$EXT_STATIC standard" + ;; + *) @@ -40153,38 +40645,45 @@ + + --int main() { --__res_nsearch() +-/* 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___res_nsearch) || defined (__stub_____res_nsearch) +-choke me +-#else +-__res_nsearch(); +-#endif ++ 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 + -; return 0; } -EOF --if { (eval echo configure:89123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" +- eval "ac_cv_func___res_nsearch=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" +- eval "ac_cv_func___res_nsearch=no" -fi -rm -f conftest* --LIBS="$ac_save_LIBS" -+ 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 - -fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + +-if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -found=no -fi - +- +-fi + old_IFS=$IFS + for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ + cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ @@ -40197,8 +40696,7 @@ + http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ + var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ + filters.c proc_open.c streamsfuncs.c http.c; do - --fi ++ + IFS=. + set $ac_src + ac_obj=$1 @@ -40213,21 +40711,136 @@ + *.cpp|*.cc|*.cxx) ac_comp="$b_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 +- case $found in +- yes) +- cat >> confdefs.h <<\EOF +-#define HAVE_RES_NSEARCH 1 ++ cat >>Makefile.objects<&6 +-echo "configure:89233: checking for res_nsearch in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'res_nsearch | 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="-lresolv $LIBS" +-cat > conftest.$ac_ext <&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" ++ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 + +- echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6 +-echo "configure:89272: checking for __res_nsearch in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'__res_nsearch | 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="-lresolv $LIBS" +-cat > conftest.$ac_ext <&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 + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi + +- +-fi + ++ src=$ext_srcdir/Makefile.frag ++ ac_srcdir=$ext_srcdir ++ ac_builddir=$ext_builddir ++ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + - if test "$found" = "yes"; then - ac_libs=$LIBS -- LIBS="$LIBS -lbind" +- LIBS="$LIBS -lresolv" - if test "$cross_compiling" = yes; then - found=no -else - cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-EOF +-if { (eval echo configure:89327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -else @@ -40238,94 +40851,80 @@ -fi -rm -fr conftest* -fi -+ done - LIBS=$ac_libs -+ -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC standard" - fi + ++ for header_file in ext/standard/; do ++ + -+ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ unique=`echo $header_file|$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 $header_file" ++ + fi - if test "$found" = "yes"; then -+ -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=standard - -- -- case bind in +- ++ done + +- case resolv in - c|c_r|pthread*) ;; - *) -- LIBS="-lbind $LIBS" +- LIBS="-lresolv $LIBS" - ;; - esac -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ fi - cat >> confdefs.h <<\EOF -#define HAVE_RES_NSEARCH 1 -EOF - cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 +-#define HAVE_LIBRESOLV 1 -EOF - ac_cv_func_res_nsearch=yes - else -+ src=$ext_srcdir/Makefile.frag -+ ac_srcdir=$ext_srcdir -+ ac_builddir=$ext_builddir -+ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -+ -+ -+ -+ for header_file in ext/standard/; do -+ -+ -+ unique=`echo $header_file|$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 $header_file" -+ -+ fi -+ -+ done - -- unset ac_cv_lib_socket_res_nsearch -- unset ac_cv_lib_socket___res_nsearch +- +- +- unset ac_cv_lib_bind_res_nsearch +- unset ac_cv_lib_bind___res_nsearch - unset found -- echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6 --echo "configure:89201: checking for res_nsearch in -lsocket" >&5 --ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 +-echo "configure:89369: checking for res_nsearch in -lbind" >&5 +-ac_lib_var=`echo bind'_'res_nsearch | 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="-lsocket $LIBS" +-LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89388: \"$ac_link\") 1>&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 $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 ++echo "configure:94792: 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" ++ PHP_SYBASE_CT=$withval + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* @@ -40333,24 +40932,27 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" ++ ++ PHP_SYBASE_CT=no ++ test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL --fi + fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6 --echo "configure:89240: checking for __res_nsearch in -lsocket" >&5 --ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6 +-echo "configure:89408: checking for __res_nsearch in -lbind" >&5 +-ac_lib_var=`echo bind'_'__res_nsearch | 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="-lsocket $LIBS" +-LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -+php_with_sybase_ct=no -+ -+echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 -+echo "configure:94470: 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" -+ PHP_SYBASE_CT=$withval - else +-else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -+ -+ PHP_SYBASE_CT=no -+ test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL -+ - fi +-fi -rm -f conftest* -LIBS="$ac_save_LIBS" @@ -40393,10 +40983,6 @@ - echo "$ac_t""no" 1>&6 -found=no -fi - -- --fi - +ext_output="yes, shared" +ext_shared=yes +case $PHP_SYBASE_CT in @@ -40415,23 +41001,36 @@ + ext_shared=no + ;; +esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 + +- +-fi + - if test "$found" = "yes"; then - ac_libs=$LIBS -- LIBS="$LIBS -lsocket" +- LIBS="$LIBS -lbind" - if test "$cross_compiling" = yes; then - found=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ ++if test "$PHP_SYBASE_CT" != "no"; then ++ ++ if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then ++ { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } ++ fi ++ ++ cat >> confdefs.h <<\EOF ++#define HAVE_SYBASE_CT 1 + EOF +-if { (eval echo configure:89463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -else @@ -40445,61 +41044,24 @@ - LIBS=$ac_libs - fi - -- if test "$found" = "yes"; then -- -- -- case socket in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsocket $LIBS" -- ;; -- esac - -+if test "$PHP_SYBASE_CT" != "no"; then - -- cat >> confdefs.h <<\EOF --#define HAVE_RES_NSEARCH 1 --EOF -+ if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then -+ { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } -+ fi - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBSOCKET 1 -+ cat >> confdefs.h <<\EOF -+#define HAVE_SYBASE_CT 1 - EOF - -- ac_cv_func_res_nsearch=yes -- else -- -- : -- -- fi - ++ + ext_builddir=ext/sybase_ct + ext_srcdir=$abs_srcdir/ext/sybase_ct - -- fi -- ++ + ac_extra= - -- fi -- -- ;; ++ + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_SYBASE_CT_SHARED=no + - ++ + case ext/sybase_ct in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac ++ esac + + - ++ + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta @@ -40507,31 +41069,19 @@ + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo ++ -- unset ac_cv_func_dns_search -- unset ac_cv_func___dns_search -- unset found -- -- echo $ac_n "checking for dns_search""... $ac_c" 1>&6 --echo "configure:89352: checking for dns_search" >&5 --if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* 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 dns_search(); - --int main() { +- if test "$found" = "yes"; then +- + old_IFS=$IFS + for ac_src in php_sybase_ct.c; do -+ + +- case bind in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lbind $LIBS" +- ;; +- esac + IFS=. + set $ac_src + ac_obj=$1 @@ -40539,14 +41089,6 @@ + + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" --/* 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_dns_search) || defined (__stub___dns_search) --choke me --#else --dns_search(); --#endif + 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" ;; @@ -40554,51 +41096,25 @@ + *.cpp|*.cc|*.cxx) ac_comp="$b_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 --; return 0; } +- cat >> confdefs.h <<\EOF +-#define HAVE_RES_NSEARCH 1 + cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_dns_search=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_dns_search=no" --fi --rm -f conftest* --fi + done --if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 --echo "configure:89398: checking for __dns_search" >&5 --if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* 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 __dns_search(); +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBBIND 1 +-EOF --int main() { +- ac_cv_func_res_nsearch=yes + EXT_STATIC="$EXT_STATIC sybase_ct" + if test "$ext_shared" != "nocli"; then + EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" + fi -+ else + else +- + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then + PHP_SYBASE_CT_SHARED=yes + @@ -40608,47 +41124,71 @@ + *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + -+ - --/* 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___dns_search) || defined (__stub_____dns_search) --choke me --#else --__dns_search(); --#endif -+ 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 + +- unset ac_cv_lib_socket_res_nsearch +- unset ac_cv_lib_socket___res_nsearch +- unset found +- echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6 +-echo "configure:89505: checking for res_nsearch in -lsocket" >&5 +-ac_lib_var=`echo socket'_'res_nsearch | 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="-lsocket $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_func___dns_search=yes" +- 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_func___dns_search=no" +- eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* --fi +-LIBS="$ac_save_LIBS" ++ 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 --if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 --found=no --fi -- --fi + +- echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6 +-echo "configure:89544: checking for __res_nsearch in -lsocket" >&5 +-ac_lib_var=`echo socket'_'__res_nsearch | 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="-lsocket $LIBS" +-cat > conftest.$ac_ext <> confdefs.h <<\EOF --#define HAVE_DNS_SEARCH 1 ++ + cat >>Makefile.objects<&6 --echo "configure:89464: checking for dns_search in -lresolv" >&5 --ac_lib_var=`echo resolv'_'dns_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -40719,6 +41224,21 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" ++ done + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi ++ case $host_alias in ++ *netware*) ++ ++ install_modules="install-modules" ++ + case $host_alias in + *aix*) + suffix=so @@ -40734,35 +41254,15 @@ + ;; + esac --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 + if test "x" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix" + else + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix" + fi -+ + +-fi + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" -- echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6 --echo "configure:89503: checking for __dns_search in -lresolv" >&5 --ac_lib_var=`echo resolv'_'__dns_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" --cat > conftest.$ac_ext <>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" +-if { (eval echo configure:89599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- found=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" - +- rm -fr conftest* +- found=no -fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no +-rm -fr conftest* -fi + +- LIBS=$ac_libs +- fi + ;; + *) + + install_modules="install-modules" -+ + +- if test "$found" = "yes"; then +- +- +- case socket in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsocket $LIBS" +- ;; + case $host_alias in + *aix*) + suffix=so @@ -40812,77 +41321,62 @@ + 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_sybase_ct) $(SYBASE_CT_SHARED_LIBADD)' + ;; -+ esac + esac + if test "x" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sybase_ct.$suffix" + else + PHP_MODULES="$PHP_MODULES \$(phplibdir)/sybase_ct.$suffix" + fi - --fi ++ + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" -+ + +- cat >> confdefs.h <<\EOF +-#define HAVE_RES_NSEARCH 1 +-EOF + cat >>Makefile.objects< conftest.$ac_ext <> confdefs.h <<\EOF +-#define HAVE_LIBSOCKET 1 EOF --if { (eval echo configure:89558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi -- LIBS=$ac_libs +- ac_cv_func_res_nsearch=yes +- else +- +- : + ;; + esac + cat >> confdefs.h <> confdefs.h <<\EOF --#define HAVE_DNS_SEARCH 1 --EOF +- unset ac_cv_func_dns_search +- unset ac_cv_func___dns_search +- unset found +- +- echo $ac_n "checking for dns_search""... $ac_c" 1>&6 +-echo "configure:89656: checking for dns_search" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-/* 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 dns_search(); -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 +-int main() { + old_IFS=$IFS + for ac_src in php_sybase_ct.c; do + @@ -40907,24 +41416,62 @@ + IFS=$old_IFS + + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ + +-/* 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_dns_search) || defined (__stub___dns_search) +-choke me +-#else +-dns_search(); +-#endif + 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 -+ + +-; return 0; } + cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_dns_search=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_dns_search=no" +-fi +-rm -f conftest* +-fi + done -- ac_cv_func_dns_search=yes -- else -- -+ +-if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +- echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 +-echo "configure:89702: checking for __dns_search" >&5 +-if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-/* 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 __dns_search(); + +-int main() { + EXT_STATIC="$EXT_STATIC sybase_ct" + ;; + *) @@ -40936,29 +41483,16 @@ + *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + - -- unset ac_cv_lib_bind_dns_search -- unset ac_cv_lib_bind___dns_search -- unset found -- echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 --echo "configure:89600: checking for dns_search in -lbind" >&5 --ac_lib_var=`echo bind'_'dns_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func___dns_search=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func___dns_search=no" +-fi +-rm -f conftest* +-fi + +-if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi +- +-fi + old_IFS=$IFS + for ac_src in php_sybase_ct.c; do + @@ -40977,19 +41533,58 @@ + 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 -+ + +- case $found in +- yes) +- cat >> confdefs.h <<\EOF +-#define HAVE_DNS_SEARCH 1 + cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ done + +- ac_cv_func_dns_search=yes +- ;; ++ ++ ;; ++ esac ++ EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" ++ fi + +- *) + +- unset ac_cv_lib_resolv_dns_search +- unset ac_cv_lib_resolv___dns_search +- unset found +- echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6 +-echo "configure:89768: checking for dns_search in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'dns_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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lresolv $LIBS" +-cat > conftest.$ac_ext <&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,44 +41595,35 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -+ done - +- -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 - -- echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 --echo "configure:89639: checking for __dns_search in -lbind" >&5 --ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'` +- +- echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6 +-echo "configure:89807: checking for __dns_search in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'__dns_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 -else - ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" +-LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:89826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -41048,7 +41634,7 @@ -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 @@ -41057,6 +41643,10 @@ - echo "$ac_t""no" 1>&6 -found=no -fi ++ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ ++ ++ + if test "$ext_builddir" = "."; then + PHP_PECL_EXTENSION=sybase_ct + @@ -41079,11 +41669,11 @@ - if test "$found" = "yes"; then - ac_libs=$LIBS -- LIBS="$LIBS -lbind" +- LIBS="$LIBS -lresolv" - if test "$cross_compiling" = yes; then - found=no + echo $ac_n "checking size of long int""... $ac_c" 1>&6 -+echo "configure:94825: checking size of long int" >&5 ++echo "configure:95147: 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 @@ -41091,8 +41681,8 @@ + ac_cv_sizeof_long_int=4 else cat > conftest.$ac_ext < @@ -41105,8 +41695,8 @@ + exit(0); +} EOF --if { (eval echo configure:89694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:94845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:89862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:95167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then - found=yes + ac_cv_sizeof_long_int=`cat conftestval` @@ -41121,37 +41711,89 @@ fi - LIBS=$ac_libs +- fi +- +- if test "$found" = "yes"; then +- +- +- case resolv in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lresolv $LIBS" +- ;; +- esac +- +- +- cat >> confdefs.h <<\EOF +-#define HAVE_DNS_SEARCH 1 +fi +echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 +cat >> confdefs.h <> confdefs.h <<\EOF +-#define HAVE_LIBRESOLV 1 +-EOF + +- ac_cv_func_dns_search=yes + echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6 -+echo "configure:94865: checking checking if we're on a 64-bit platform" >&5 ++echo "configure:95187: checking checking if we're on a 64-bit platform" >&5 + if test "$ac_cv_sizeof_long_int" = "4"; then + echo "$ac_t""no" 1>&6 + PHP_SYBASE_64=no -+ else + else +- +- +- unset ac_cv_lib_bind_dns_search +- unset ac_cv_lib_bind___dns_search +- unset found +- echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 +-echo "configure:89904: checking for dns_search in -lbind" >&5 +-ac_lib_var=`echo bind'_'dns_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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lbind $LIBS" +-cat > conftest.$ac_ext <&6 + PHP_SYBASE_64=yes - fi ++ fi -- if test "$found" = "yes"; then -+ +-int main() { +-dns_search() +-; return 0; } +-EOF +-if { (eval echo configure:89923: \"$ac_link\") 1>&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 +- found=yes +-else +- echo "$ac_t""no" 1>&6 + echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6 -+echo "configure:94876: checking Checking for ctpublic.h" >&5 ++echo "configure:95198: checking Checking for ctpublic.h" >&5 + if test -f $SYBASE_CT_INCDIR/ctpublic.h; then + echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6 - -- -- case bind in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lbind $LIBS" -- ;; -- esac ++ + if test "$SYBASE_CT_INCDIR" != "/usr/include"; then + + if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then @@ -41164,6 +41806,21 @@ + ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`" + fi +- echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 +-echo "configure:89943: checking for __dns_search in -lbind" >&5 +-ac_lib_var=`echo bind'_'__dns_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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lbind $LIBS" +-cat > conftest.$ac_ext <> confdefs.h <<\EOF --#define HAVE_DNS_SEARCH 1 +-int main() { +-__dns_search() +-; return 0; } -EOF +-if { (eval echo configure:89962: \"$ac_link\") 1>&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 -- cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 --EOF +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi + else + { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; } + fi + + echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6 -+echo "configure:94915: checking Checking Sybase libdir" >&5 ++echo "configure:95237: checking Checking Sybase libdir" >&5 + echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6 + + echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6 -+echo "configure:94919: checking Checking for Sybase platform libraries" >&5 ++echo "configure:95241: checking Checking for Sybase platform libraries" >&5 -- ac_cv_func_dns_search=yes -+ + +-fi + if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then + + if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$SYBASE_CT_LIBDIR - else - ++ else ++ + ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`" + fi -+ + + + if test "$ext_shared" = "yes"; then + SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD" + test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_SHARED_LIBADD" + else + - -- unset ac_cv_lib_socket_dns_search -- unset ac_cv_lib_socket___dns_search -- unset found -- echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 --echo "configure:89736: checking for dns_search in -lsocket" >&5 --ac_lib_var=`echo socket'_'dns_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" +-if { (eval echo configure:89998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- found=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" +- rm -fr conftest* +- found=no -fi --rm -f conftest* --LIBS="$ac_save_LIBS" - +-rm -fr conftest* -fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 + +- LIBS=$ac_libs + fi + -+ fi + fi -- echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 --echo "configure:89775: checking for __dns_search in -lsocket" >&5 --ac_lib_var=`echo socket'_'__dns_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" --cat > conftest.$ac_ext <> confdefs.h <<\EOF +-#define HAVE_DNS_SEARCH 1 +-EOF ++ fi + ;; + esac +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBBIND 1 +-EOF + +- ac_cv_func_dns_search=yes +- else ++ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" ++ echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6 ++ elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then + + +- unset ac_cv_lib_socket_dns_search +- unset ac_cv_lib_socket___dns_search +- unset found +- echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 +-echo "configure:90040: checking for dns_search in -lsocket" >&5 +-ac_lib_var=`echo socket'_'dns_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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lsocket $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -41325,38 +42009,87 @@ -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 - found=yes -else - echo "$ac_t""no" 1>&6 --found=no ++ case sybcs64 in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" ++ else ++ ++ ++ case sybcs64 in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lsybcs64 $LIBS" ++ ;; ++ esac + +- echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 +-echo "configure:90079: checking for __dns_search in -lsocket" >&5 +-ac_lib_var=`echo socket'_'__dns_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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lsocket $LIBS" +-cat > conftest.$ac_ext <&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 + ;; + esac -+ -+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" -+ echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6 -+ elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi + + -fi -+ case sybcs64 in ++ case sybct64 in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" + else + + -+ case sybcs64 in ++ case sybct64 in + c|c_r|pthread*) ;; + *) -+ LIBS="-lsybcs64 $LIBS" ++ LIBS="-lsybct64 $LIBS" + ;; + esac @@ -41368,11 +42101,11 @@ - found=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:90134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -else @@ -41394,19 +42127,19 @@ - case socket in -+ case sybct64 in ++ case sybcomn64 in c|c_r|pthread*) ;; *) - LIBS="-lsocket $LIBS" + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" + else + + -+ case sybct64 in ++ case sybcomn64 in + c|c_r|pthread*) ;; + *) -+ LIBS="-lsybct64 $LIBS" ++ LIBS="-lsybcomn64 $LIBS" ;; esac @@ -41431,18 +42164,18 @@ - - fi -+ case sybcomn64 in ++ case sybintl64 in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" + else + -+ case sybcomn64 in ++ case sybintl64 in + c|c_r|pthread*) ;; + *) -+ LIBS="-lsybcomn64 $LIBS" ++ LIBS="-lsybintl64 $LIBS" + ;; + esac @@ -41459,15 +42192,14 @@ - unset ac_cv_func_dn_expand - unset ac_cv_func___dn_expand - unset found -+ - +- - echo $ac_n "checking for dn_expand""... $ac_c" 1>&6 --echo "configure:89887: checking for dn_expand" >&5 +-echo "configure:90191: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_dn_expand=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_dn_expand=no" --fi --rm -f conftest* --fi - --if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 --echo "configure:89933: 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 < --/* 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 __dn_expand(); -int main() { + ac_solid_uname_s=`uname -s 2>/dev/null` @@ -41577,10 +42246,10 @@ -/* 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___dn_expand) || defined (__stub_____dn_expand) +-#if defined (__stub_dn_expand) || defined (__stub___dn_expand) -choke me -#else --__dn_expand(); +-dn_expand(); -#endif + fi + ;; @@ -41605,37 +42274,52 @@ -; return 0; } -EOF --if { (eval echo configure:89961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90219: \"$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" +- eval "ac_cv_func_dn_expand=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func___dn_expand=no" +- eval "ac_cv_func_dn_expand=no" -fi -rm -f conftest* -fi --if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then +-if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 --found=no --fi -- --fi +- echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 +-echo "configure:90237: 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 < +-/* 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 __dn_expand(); + fi + ;; + esac +-int main() { -- case $found in -- yes) -- cat >> confdefs.h <<\EOF --#define HAVE_DN_EXPAND 1 --EOF +-/* 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___dn_expand) || defined (__stub_____dn_expand) +-choke me +-#else +-__dn_expand(); +-#endif + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -41652,35 +42336,27 @@ + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi -- ac_cv_func_dn_expand=yes -- ;; +-; return 0; } +-EOF +-if { (eval echo configure:90265: \"$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 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func___dn_expand=no" +-fi +-rm -f conftest* +-fi + + if test "$ext_shared" = "yes"; then + LDFLAGS="-L$ai_p $LDFLAGS" + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + else + - -- *) - -- unset ac_cv_lib_resolv_dn_expand -- unset ac_cv_lib_resolv___dn_expand -- unset found -- echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 --echo "configure:89999: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" --cat > conftest.$ac_ext <&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 +-if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 +-found=no +-fi +- +-fi + + fi + + fi -- echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 --echo "configure:90038: checking for __dn_expand in -lresolv" >&5 --ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'` +- case $found in +- yes) +- cat >> confdefs.h <<\EOF +-#define HAVE_DN_EXPAND 1 +-EOF + ;; + esac + done -+ + +- ac_cv_func_dn_expand=yes +- ;; +- +- *) +- +- unset ac_cv_lib_resolv_dn_expand +- unset ac_cv_lib_resolv___dn_expand +- unset found +- echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 +-echo "configure:90303: checking for dn_expand in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` + echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 -+echo "configure:95185: checking for netg_errstr in -lsybtcl64" >&5 ++echo "configure:95507: checking for netg_errstr in -lsybtcl64" >&5 +ac_lib_var=`echo sybtcl64'_'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 @@ -41736,30 +42413,32 @@ -LIBS="-lresolv $LIBS" +LIBS="-lsybtcl64 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:95526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -90068,128 +95215,186 @@ LIBS="$ac_save_LIBS" +@@ -90333,167 +95537,186 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes +-else +- echo "$ac_t""no" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared @@ -41780,12 +42459,46 @@ + LIBS="-lsybtcl64 $LIBS" + ;; + esac -+ -+ + +- echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 +-echo "configure:90342: 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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lresolv $LIBS" +-cat > conftest.$ac_ext <&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 + ;; + esac -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes + + + @@ -41824,11 +42537,11 @@ - found=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:90397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -else @@ -41932,12 +42645,23 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$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" - unset ac_cv_lib_bind_dn_expand - unset ac_cv_lib_bind___dn_expand - unset found - echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 --echo "configure:90135: checking for dn_expand in -lbind" >&5 +-echo "configure:90439: 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 @@ -41945,30 +42669,19 @@ - ac_save_LIBS="$LIBS" -LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -41991,14 +42704,14 @@ + fi - echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 --echo "configure:90174: checking for __dn_expand in -lbind" >&5 +-echo "configure:90478: checking for __dn_expand in -lbind" >&5 -ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'` + ;; + esac + done + + echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6 -+echo "configure:95379: checking for insck__getVdate in -linsck64" >&5 ++echo "configure:95701: checking for insck__getVdate in -linsck64" >&5 +ac_lib_var=`echo insck64'_'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 @@ -42007,8 +42720,8 @@ -LIBS="-lbind $LIBS" +LIBS="-linsck64 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:95720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -90204,128 +95409,159 @@ LIBS="$ac_save_LIBS" +@@ -90508,89 +95731,159 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- - --fi ++ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + @@ -42056,22 +42763,8 @@ + LIBS="-linsck64 $LIBS" + ;; + esac - - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lbind" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes ++ ++ + fi + ;; + esac @@ -42079,22 +42772,17 @@ + + else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no + echo "$ac_t""no" 1>&6 +-found=no -fi --rm -fr conftest* -+ echo "$ac_t""no" 1>&6 -+ + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_insck64_insck__getVdate + -+ + fi -- LIBS=$ac_libs + + save_old_LDFLAGS=$LDFLAGS + ac_stuff="-L$SYBASE_CT_LIBDIR" @@ -42116,21 +42804,39 @@ + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi ++ fi - if test "$found" = "yes"; then -- +- ac_libs=$LIBS +- LIBS="$LIBS -lbind" +- if test "$cross_compiling" = yes; then +- found=no +-else +- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- found=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- found=no +-fi +-rm -fr conftest* +-fi + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + - -- case bind in ++ + case $ac_ii in - c|c_r|pthread*) ;; - *) -- LIBS="-lbind $LIBS" ++ c|c_r|pthread*) ;; ++ *) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else @@ -42140,22 +42846,16 @@ + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" - ;; - esac - ++ ;; ++ esac -- cat >> confdefs.h <<\EOF --#define HAVE_DN_EXPAND 1 --EOF +- LIBS=$ac_libs ++ + fi + ;; + esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 --EOF - -- ac_cv_func_dn_expand=yes ++ ++ + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -42164,39 +42864,22 @@ + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii - else - ++ else ++ + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ + fi + +- if test "$found" = "yes"; then + + if test "$ext_shared" = "yes"; then + LDFLAGS="-L$ai_p $LDFLAGS" + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + else + - -- unset ac_cv_lib_socket_dn_expand -- unset ac_cv_lib_socket___dn_expand -- unset found -- echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 --echo "configure:90271: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" --cat > conftest.$ac_ext <> confdefs.h <<\EOF +-#define HAVE_DN_EXPAND 1 -EOF --if { (eval echo configure:90290: \"$ac_link\") 1>&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 ++ ++ fi --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ fi -+ -+ fi - -- echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 --echo "configure:90310: checking for __dn_expand in -lsocket" >&5 --ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'` +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBBIND 1 +-EOF + ;; + esac + done -+ + +- ac_cv_func_dn_expand=yes +- else +- +- +- unset ac_cv_lib_socket_dn_expand +- unset ac_cv_lib_socket___dn_expand +- unset found +- echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 +-echo "configure:90575: checking for dn_expand in -lsocket" >&5 +-ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'` + echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 -+echo "configure:95546: checking for bsd_tcp in -linsck64" >&5 ++echo "configure:95868: checking for bsd_tcp in -linsck64" >&5 +ac_lib_var=`echo insck64'_'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 @@ -42253,30 +42934,32 @@ -LIBS="-lsocket $LIBS" +LIBS="-linsck64 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:95887: \"$ac_link\") 1>&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,255 +95576,258 @@ LIBS="$ac_save_LIBS" +@@ -90605,255 +95898,452 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes +-else +- echo "$ac_t""no" 1>&6 + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared @@ -42296,12 +42979,46 @@ + LIBS="-linsck64 $LIBS" + ;; + esac -+ -+ + +- echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 +-echo "configure:90614: 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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lsocket $LIBS" +-cat > conftest.$ac_ext <&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 + ;; + esac -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes + + else @@ -42333,7 +43050,6 @@ + LIBS="-lsybcs $LIBS" + ;; + esac -+ - if test "$found" = "yes"; then - ac_libs=$LIBS @@ -42342,11 +43058,11 @@ - found=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:90669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -else @@ -42357,12 +43073,13 @@ -fi -rm -fr conftest* -fi -+ fi -+ ;; -+ esac - LIBS=$ac_libs - fi ++ fi ++ ;; ++ esac ++ - if test "$found" = "yes"; then @@ -42403,8 +43120,6 @@ - - fi -- -- fi + case sybcomn in + c|c_r|pthread*) ;; + *) @@ -42412,7 +43127,7 @@ + SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" + else + - ++ + case sybcomn in + c|c_r|pthread*) ;; + *) @@ -42421,37 +43136,14 @@ + esac - fi -- -- ;; -- + + fi + ;; - esac - - -- unset ac_cv_func_dn_skipname -- unset ac_cv_func___dn_skipname -- unset found ++ esac ++ ++ + - -- echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6 --echo "configure:90422: 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 < --/* 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 dn_skipname(); -- --int main() { ++ + case sybintl in + c|c_r|pthread*) ;; + *) @@ -42459,62 +43151,20 @@ + SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" + else + -+ + + case sybintl in + c|c_r|pthread*) ;; + *) + LIBS="-lsybintl $LIBS" + ;; + esac - --/* 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_dn_skipname) || defined (__stub___dn_skipname) --choke me --#else --dn_skipname(); --#endif - --; return 0; } --EOF --if { (eval echo configure:90450: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_dn_skipname=no" --fi --rm -f conftest* --fi ++ ++ + fi + ;; + esac --if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 --echo "configure:90468: 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 < --/* 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 __dn_skipname(); - --int main() { ++ + + SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl" + echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6 @@ -42542,22 +43192,15 @@ + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - --/* 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___dn_skipname) || defined (__stub_____dn_skipname) --choke me --#else --__dn_skipname(); --#endif + fi ++ + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + -+ + +- ;; + case $ac_ii in + c|c_r|pthread*) ;; + *) @@ -42565,47 +43208,23 @@ + LDFLAGS="$LDFLAGS -l$ac_ii" + else + -+ + + case $ac_ii in + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" + ;; -+ esac + esac --; return 0; } --EOF --if { (eval echo configure:90496: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func___dn_skipname=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- --fi +- unset ac_cv_func_dn_skipname +- unset ac_cv_func___dn_skipname +- unset found + fi + ;; + esac - - -- case $found in -- yes) -- cat >> confdefs.h <<\EOF --#define HAVE_DN_SKIPNAME 1 --EOF ++ ++ + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -42621,9 +43240,7 @@ + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi - -- ac_cv_func_dn_skipname=yes -- ;; ++ + + if test "$ext_shared" = "yes"; then + LDFLAGS="-L$ai_p $LDFLAGS" @@ -42631,26 +43248,10 @@ + else + -- *) - -- unset ac_cv_lib_resolv_dn_skipname -- unset ac_cv_lib_resolv___dn_skipname -- unset found -- echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 --echo "configure:90534: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" --cat > conftest.$ac_ext <&6 +-echo "configure:90726: checking for dn_skipname" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then ++ + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" @@ -42662,72 +43263,71 @@ + PHP_RPATHS="$PHP_RPATHS $ai_p" + + fi - --int main() { --dn_skipname() --; return 0; } --EOF --if { (eval echo configure:90553: \"$ac_link\") 1>&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 -- found=yes --else -- echo "$ac_t""no" 1>&6 ++ ++ + fi + + fi - -- echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 --echo "configure:90573: checking for __dn_skipname in -lresolv" >&5 --ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'` ++ + ;; + esac + done + + echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 -+echo "configure:95812: checking for netg_errstr in -lsybtcl" >&5 ++echo "configure:96134: checking for netg_errstr in -lsybtcl" >&5 +ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++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="-lresolv $LIBS" +- cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < /* 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 __dn_skipname(); +-char dn_skipname(); +char netg_errstr(); int main() { --__dn_skipname() +- +-/* 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_dn_skipname) || defined (__stub___dn_skipname) +-choke me +-#else +-dn_skipname(); +-#endif +- +netg_errstr() ; return 0; } EOF --if { (eval echo configure:90592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:96153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +- eval "ac_cv_func_dn_skipname=yes" ++ eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -90603,128 +95842,186 @@ LIBS="$ac_save_LIBS" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_func_dn_skipname=no" ++ eval "ac_cv_lib_$ac_lib_var=no" fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + rm -f conftest* +-fi ++LIBS="$ac_save_LIBS" + +-if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes + @@ -42761,16 +43361,29 @@ + else echo "$ac_t""no" 1>&6 --found=no --fi +- echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 +-echo "configure:90772: 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 < +-/* 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 __dn_skipname(); +-int main() { + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_sybtcl_netg_errstr + + - --fi ++ + case sybtcl in + c|c_r|pthread*) ;; + *) @@ -42786,28 +43399,27 @@ + ;; + esac +-/* 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___dn_skipname) || defined (__stub_____dn_skipname) +-choke me +-#else +-__dn_skipname(); +-#endif -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lresolv" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes +-if { (eval echo configure:90800: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no +- rm -rf conftest* +- eval "ac_cv_func___dn_skipname=no" -fi --rm -fr conftest* +-rm -f conftest* + fi + ;; + esac @@ -42817,7 +43429,15 @@ + fi -- LIBS=$ac_libs +-if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi +- +-fi + + + save_old_LDFLAGS=$LDFLAGS @@ -42840,10 +43460,8 @@ + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -- if test "$found" = "yes"; then -- ++ fi ++ + fi + ;; + -l*) @@ -42857,29 +43475,20 @@ + LDFLAGS="$LDFLAGS -l$ac_ii" + else + - -- case resolv in ++ + case $ac_ii in - c|c_r|pthread*) ;; - *) -- LIBS="-lresolv $LIBS" ++ c|c_r|pthread*) ;; ++ *) + LIBS="$LIBS -l$ac_ii" - ;; - esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_DN_SKIPNAME 1 --EOF ++ ;; ++ esac ++ ++ + fi + ;; + esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 --EOF - -- ac_cv_func_dn_skipname=yes ++ ++ + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -42888,8 +43497,8 @@ + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii - else - ++ else ++ + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" @@ -42913,101 +43522,71 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" - -- unset ac_cv_lib_bind_dn_skipname -- unset ac_cv_lib_bind___dn_skipname -- unset found -- echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6 --echo "configure:90670: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" --cat > conftest.$ac_ext <&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 -- found=yes --else -- echo "$ac_t""no" 1>&6 + fi + + fi -- echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 --echo "configure:90709: checking for __dn_skipname in -lbind" >&5 --ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'` +- case $found in +- yes) +- cat >> confdefs.h <<\EOF +-#define HAVE_DN_SKIPNAME 1 +-EOF + ;; + esac + done -+ + +- ac_cv_func_dn_skipname=yes +- ;; +- +- *) +- +- unset ac_cv_lib_resolv_dn_skipname +- unset ac_cv_lib_resolv___dn_skipname +- unset found +- echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 +-echo "configure:90838: checking for dn_skipname in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'` + echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 -+echo "configure:96006: checking for insck__getVdate in -linsck" >&5 ++echo "configure:96328: 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 else ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" +-LIBS="-lresolv $LIBS" +LIBS="-linsck $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:96347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -90739,128 +96036,159 @@ LIBS="$ac_save_LIBS" +@@ -90868,167 +96358,159 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 --found=no --fi -- - --fi ++ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + @@ -43027,43 +43606,83 @@ + ;; + esac - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lbind" -- if test "$cross_compiling" = yes; then -- found=no +- echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 +-echo "configure:90877: 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 -else -- cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes +-if { (eval echo configure:90896: \"$ac_link\") 1>&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 + ;; + esac -+ + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes + + else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no + echo "$ac_t""no" 1>&6 +-found=no -fi --rm -fr conftest* -+ echo "$ac_t""no" 1>&6 -+ + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_insck_insck__getVdate + -+ + fi +- +- if test "$found" = "yes"; then +- ac_libs=$LIBS +- LIBS="$LIBS -lresolv" +- if test "$cross_compiling" = yes; then +- found=no +-else +- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- found=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- found=no +-fi +-rm -fr conftest* +-fi +- - LIBS=$ac_libs + + save_old_LDFLAGS=$LDFLAGS @@ -43096,11 +43715,11 @@ + ac_ii=`echo $ac_i|cut -c 3-` + -- case bind in +- case resolv in + case $ac_ii in c|c_r|pthread*) ;; *) -- LIBS="-lbind $LIBS" +- LIBS="-lresolv $LIBS" + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else @@ -43122,7 +43741,7 @@ + esac - cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 +-#define HAVE_LIBRESOLV 1 -EOF - ac_cv_func_dn_skipname=yes @@ -43148,43 +43767,43 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$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" -- unset ac_cv_lib_socket_dn_skipname -- unset ac_cv_lib_socket___dn_skipname +- unset ac_cv_lib_bind_dn_skipname +- unset ac_cv_lib_bind___dn_skipname - unset found -- echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6 --echo "configure:90806: checking for dn_skipname in -lsocket" >&5 --ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6 +-echo "configure:90974: 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 -else - ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" +-LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:90993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -43206,25 +43825,25 @@ + + fi -- echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6 --echo "configure:90845: checking for __dn_skipname in -lsocket" >&5 --ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 +-echo "configure:91013: checking for __dn_skipname in -lbind" >&5 +-ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'` + ;; + esac + done + + echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 -+echo "configure:96173: checking for bsd_tcp in -linsck" >&5 ++echo "configure:96495: 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 else ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" +-LIBS="-lbind $LIBS" +LIBS="-linsck $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:91032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:96514: \"$ac_link\") 1>&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,257 +96203,258 @@ LIBS="$ac_save_LIBS" +@@ -91043,128 +96525,258 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- - --fi ++ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + @@ -43272,29 +43885,60 @@ + LIBS="-linsck $LIBS" + ;; + esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ + else + echo "$ac_t""no" 1>&6 +-found=no +-fi + ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_insck_bsd_tcp ++ + + fi ++ else ++ ++ ++ case cs in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" ++ else ++ ++ ++ case cs in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lcs $LIBS" ++ ;; ++ esac ++ - if test "$found" = "yes"; then - ac_libs=$LIBS -- LIBS="$LIBS -lsocket" +- LIBS="$LIBS -lbind" - if test "$cross_compiling" = yes; then - found=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:91068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -+ fi -+ ;; -+ esac -+ -+ -+ - else +-else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* @@ -43302,35 +43946,30 @@ -fi -rm -fr conftest* -fi -+ echo "$ac_t""no" 1>&6 ++ fi ++ ;; ++ esac - LIBS=$ac_libs - fi -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck_bsd_tcp -+ -+ -+fi - if test "$found" = "yes"; then -+ else -- case socket in -+ case cs in +- case bind in ++ case ct in c|c_r|pthread*) ;; *) -- LIBS="-lsocket $LIBS" +- LIBS="-lbind $LIBS" + if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" + else + + -+ case cs in ++ case ct in + c|c_r|pthread*) ;; + *) -+ LIBS="-lcs $LIBS" ++ LIBS="-lct $LIBS" ;; esac @@ -43343,43 +43982,31 @@ + esac - cat >> confdefs.h <<\EOF --#define HAVE_LIBSOCKET 1 +-#define HAVE_LIBBIND 1 -EOF - ac_cv_func_dn_skipname=yes - else -- : -- -- fi - -- -- fi -+ case ct in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" -+ else -+ - -+ case ct in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lct $LIBS" -+ ;; -+ esac - -- fi -+ -+ fi -+ ;; -+ esac -+ -+ -+ -- ;; +- unset ac_cv_lib_socket_dn_skipname +- unset ac_cv_lib_socket___dn_skipname +- unset found +- echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6 +-echo "configure:91110: checking for dn_skipname in -lsocket" >&5 +-ac_lib_var=`echo socket'_'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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lsocket $LIBS" +-cat > conftest.$ac_ext <&6 --echo "configure:90959: 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 < --/* 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 res_search(); -- --int main() { ++ + case intl in + c|c_r|pthread*) ;; + *) @@ -43437,55 +44044,13 @@ + LIBS="-lintl $LIBS" + ;; + esac - --/* 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_res_search) || defined (__stub___res_search) --choke me --#else --res_search(); --#endif - --; return 0; } --EOF --if { (eval echo configure:90987: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_res_search=no" --fi --rm -f conftest* --fi ++ ++ + fi + ;; + esac - --if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __res_search""... $ac_c" 1>&6 --echo "configure:91005: 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 < --/* 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 __res_search(); - --int main() { ++ ++ + + SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" + echo "$ac_t""Sybase32 default: $SYBASE_CT_LIBS" 1>&6 @@ -43514,15 +44079,7 @@ + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi - --/* 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___res_search) || defined (__stub_____res_search) --choke me --#else --__res_search(); --#endif ++ + fi + ;; + -l*) @@ -43543,40 +44100,13 @@ + LIBS="$LIBS -l$ac_ii" + ;; + esac - --; return 0; } --EOF --if { (eval echo configure:91033: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func___res_search=no" --fi --rm -f conftest* --fi - --if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- --fi ++ ++ + fi + ;; + esac - - -- case $found in -- yes) -- cat >> confdefs.h <<\EOF --#define HAVE_RES_SEARCH 1 --EOF ++ ++ + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -43592,36 +44122,15 @@ + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi - -- ac_cv_func_res_search=yes -- ;; ++ + + if test "$ext_shared" = "yes"; then + LDFLAGS="-L$ai_p $LDFLAGS" + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + else + - -- *) - -- unset ac_cv_lib_resolv_res_search -- unset ac_cv_lib_resolv___res_search -- unset found -- echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 --echo "configure:91071: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:91129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -43660,56 +44169,93 @@ + + fi -- echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 --echo "configure:91110: checking for __res_search in -lresolv" >&5 --ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6 +-echo "configure:91149: checking for __dn_skipname in -lsocket" >&5 +-ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'` + ;; + esac + done + + echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 -+echo "configure:96439: checking for netg_errstr in -ltcl" >&5 ++echo "configure:96761: 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 else ac_save_LIBS="$LIBS" --LIBS="-lresolv $LIBS" +-LIBS="-lsocket $LIBS" +LIBS="-ltcl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:91168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:96780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -91140,128 +96469,186 @@ LIBS="$ac_save_LIBS" +@@ -91179,218 +96791,186 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes -+ +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi +- + +-fi +- +- +- if test "$found" = "yes"; then +- ac_libs=$LIBS +- LIBS="$LIBS -lsocket" +- if test "$cross_compiling" = yes; then +- found=no +-else +- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- found=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- found=no +-fi +-rm -fr conftest* +-fi +- +- LIBS=$ac_libs +- fi +- +- if test "$found" = "yes"; then + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ + + -+ + +- case socket in + case tcl in -+ c|c_r|pthread*) ;; -+ *) + c|c_r|pthread*) ;; + *) +- LIBS="-lsocket $LIBS" + if test "$ext_shared" = "yes"; then + SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" + else @@ -43719,29 +44265,42 @@ + c|c_r|pthread*) ;; + *) + LIBS="-ltcl $LIBS" -+ ;; -+ esac -+ -+ + ;; + esac + + +- cat >> confdefs.h <<\EOF +-#define HAVE_DN_SKIPNAME 1 +-EOF + fi + ;; + esac -+ -+ -+ -+ - else - echo "$ac_t""no" 1>&6 --found=no --fi +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBSOCKET 1 +-EOF + +- ac_cv_func_dn_skipname=yes +- else + +- : +- +- fi +- +- +- fi + ++else ++ echo "$ac_t""no" 1>&6 + +- fi + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_tcl_netg_errstr + + --fi +- ;; + case sybtcl in + c|c_r|pthread*) ;; + *) @@ -43749,46 +44308,43 @@ + SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" + else + -+ + + case sybtcl in + c|c_r|pthread*) ;; + *) + LIBS="-lsybtcl $LIBS" + ;; -+ esac + esac -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lresolv" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* + fi + ;; + esac -+ -+ + + +- unset ac_cv_func_res_search +- unset ac_cv_func___res_search +- unset found + -+ - fi + +- echo $ac_n "checking for res_search""... $ac_c" 1>&6 +-echo "configure:91263: 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 < +-/* 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 res_search(); ++fi -- LIBS=$ac_libs +-int main() { + + + save_old_LDFLAGS=$LDFLAGS @@ -43811,21 +44367,25 @@ + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi ++ fi -- if test "$found" = "yes"; then -- +-/* 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_res_search) || defined (__stub___res_search) +-choke me +-#else +-res_search(); +-#endif + fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` + - -- case resolv in ++ + case $ac_ii in - c|c_r|pthread*) ;; - *) -- LIBS="-lresolv $LIBS" ++ c|c_r|pthread*) ;; ++ *) + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else @@ -43835,22 +44395,57 @@ + c|c_r|pthread*) ;; + *) + LIBS="$LIBS -l$ac_ii" - ;; - esac - ++ ;; ++ esac -- cat >> confdefs.h <<\EOF --#define HAVE_RES_SEARCH 1 +-; return 0; } -EOF +-if { (eval echo configure:91291: \"$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 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_res_search=no" +-fi +-rm -f conftest* +-fi + +-if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +- echo $ac_n "checking for __res_search""... $ac_c" 1>&6 +-echo "configure:91309: 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 < +-/* 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 __res_search(); + fi + ;; + esac -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 --EOF +-int main() { -- ac_cv_func_res_search=yes +-/* 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___res_search) || defined (__stub_____res_search) +-choke me +-#else +-__res_search(); +-#endif + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -43859,39 +44454,34 @@ + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii - else - ++ else ++ + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi -+ + +-; return 0; } +-EOF +-if { (eval echo configure:91337: \"$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 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func___res_search=no" +-fi +-rm -f conftest* +-fi + + if test "$ext_shared" = "yes"; then + LDFLAGS="-L$ai_p $LDFLAGS" + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + else + - -- unset ac_cv_lib_bind_res_search -- unset ac_cv_lib_bind___res_search -- unset found -- echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 --echo "configure:91207: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" --cat > conftest.$ac_ext <&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 +-if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then - echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 +-found=no +-fi +- +-fi + + fi + + fi -- echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 --echo "configure:91246: checking for __res_search in -lbind" >&5 --ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'` +- case $found in +- yes) +- cat >> confdefs.h <<\EOF +-#define HAVE_RES_SEARCH 1 +-EOF + ;; + esac + done -+ + +- ac_cv_func_res_search=yes +- ;; +- +- *) +- +- unset ac_cv_lib_resolv_res_search +- unset ac_cv_lib_resolv___res_search +- unset found +- echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 +-echo "configure:91375: checking for res_search in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` + echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 -+echo "configure:96633: checking for insck__getVdate in -linsck" >&5 ++echo "configure:96955: 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 else ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" +-LIBS="-lresolv $LIBS" +LIBS="-linsck $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:91394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:96974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -91276,128 +96663,159 @@ LIBS="$ac_save_LIBS" +@@ -91405,128 +96985,159 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes -else - echo "$ac_t""no" 1>&6 --found=no --fi -- - --fi ++ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + @@ -43998,43 +44585,83 @@ + ;; + esac +- echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 +-echo "configure:91414: 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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lresolv $LIBS" +-cat > conftest.$ac_ext <&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 ++ ;; ++ esac + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes ++ ++ + else + echo "$ac_t""no" 1>&6 +-found=no +-fi + ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_insck_insck__getVdate ++ + + fi +- - if test "$found" = "yes"; then - ac_libs=$LIBS -- LIBS="$LIBS -lbind" +- LIBS="$LIBS -lresolv" - if test "$cross_compiling" = yes; then - found=no -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:91469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - found=yes -+ fi -+ ;; -+ esac -+ -+ -+ - else +-else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - found=no -fi -rm -fr conftest* -+ echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck_insck__getVdate -+ -+ - fi - +-fi +- - LIBS=$ac_libs + + save_old_LDFLAGS=$LDFLAGS @@ -44067,11 +44694,11 @@ + ac_ii=`echo $ac_i|cut -c 3-` + -- case bind in +- case resolv in + case $ac_ii in c|c_r|pthread*) ;; *) -- LIBS="-lbind $LIBS" +- LIBS="-lresolv $LIBS" + if test "$ext_shared" = "yes"; then + LDFLAGS="$LDFLAGS -l$ac_ii" + else @@ -44091,12 +44718,8 @@ + fi + ;; + esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 --EOF - -- ac_cv_func_res_search=yes ++ ++ + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -44105,27 +44728,8 @@ + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii - else - -- -- unset ac_cv_lib_socket_res_search -- unset ac_cv_lib_socket___res_search -- unset found -- echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6 --echo "configure:91343: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" --cat > conftest.$ac_ext <> confdefs.h <<\EOF +-#define HAVE_LIBRESOLV 1 -EOF --if { (eval echo configure:91362: \"$ac_link\") 1>&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 -- found=yes --else -- echo "$ac_t""no" 1>&6 +- ac_cv_func_res_search=yes +- else + fi -+ + +- +- unset ac_cv_lib_bind_res_search +- unset ac_cv_lib_bind___res_search +- unset found +- echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 +-echo "configure:91511: checking for res_search in -lbind" >&5 +-ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'` + fi - -- echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 --echo "configure:91382: checking for __res_search in -lsocket" >&5 --ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'` ++ + ;; + esac + done + + echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 -+echo "configure:96800: checking for bsd_tcp in -linsck" >&5 ++echo "configure:97122: 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 else ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" +-LIBS="-lbind $LIBS" +LIBS="-linsck $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:91530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:97141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -91412,618 +96830,486 @@ LIBS="$ac_save_LIBS" +@@ -91541,793 +97152,880 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- - --fi -- -- -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lsocket" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi -- -- LIBS=$ac_libs -- fi -- -- if test "$found" = "yes"; then ++ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared - - -- case socket in ++ ++ + case insck in - c|c_r|pthread*) ;; - *) -- LIBS="-lsocket $LIBS" ++ c|c_r|pthread*) ;; ++ *) + if test "$ext_shared" = "yes"; then + SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" + else @@ -44273,89 +44828,52 @@ + c|c_r|pthread*) ;; + *) + LIBS="-linsck $LIBS" - ;; - esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_RES_SEARCH 1 --EOF -- -- cat >> confdefs.h <<\EOF --#define HAVE_LIBSOCKET 1 --EOF ++ ;; ++ esac ++ ++ + fi + ;; + esac ++ ++ ++ + else + echo "$ac_t""no" 1>&6 -- ac_cv_func_res_search=yes -- else -- -- : - -- fi - -+else -+ echo "$ac_t""no" 1>&6 - -- fi +- echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 +-echo "configure:91550: 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 + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_insck_bsd_tcp + - ++ +fi - - fi -- -- ;; -- -- esac ++ ++ fi +fi - - --echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 --echo "configure:91490: 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 ++ ++ + +php_enable_sysvmsg=no + +echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6 -+echo "configure:96879: checking whether to enable System V IPC support" >&5 ++echo "configure:97201: 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" + PHP_SYSVMSG=$enableval - else - --if test "$cross_compiling" = yes; then -- -- ac_cv_atof_accept_nan=no ++else ++ + PHP_SYSVMSG=no + test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL - --else -- cat > conftest.$ac_ext < --#include - --#ifdef HAVE_ISNAN --#define zend_isnan(a) isnan(a) --#elif defined(HAVE_FPCLASS) --#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) --#else --#define zend_isnan(a) 0 --#endif - --int main(int argc, char** argv) --{ -- return zend_isnan(atof("NAN")) ? 0 : 1; --} ++ ++ ++ +ext_output="yes, shared" +ext_shared=yes +case $PHP_SYSVMSG in @@ -44374,150 +44892,124 @@ + ext_shared=no + ;; +esac - --EOF --if { (eval echo configure:91521: \"$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 - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- ac_cv_atof_accept_nan=no - --fi --rm -fr conftest* --fi ++ ++ ++ +echo "$ac_t""$ext_output" 1>&6 - --fi - --echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6 --if test "$ac_cv_atof_accept_nan" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_ATOF_ACCEPTS_NAN 1 --EOF - --fi - --echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 --echo "configure:91548: checking whether atof() accepts INF" >&5 --if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then ++ ++ ++ ++ +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:96922: checking for sys/msg.h" >&5 ++echo "configure:97244: 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 -- --if test "$cross_compiling" = yes; then -- -- ac_cv_atof_accept_inf=no -- --else - cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < --#include -- --#ifdef HAVE_ISINF --#define zend_isinf(a) isinf(a) --#elif defined(INFINITY) --/* Might not work, but is required by ISO C99 */ --#define zend_isinf(a) (((a)==INFINITY)?1:0) --#elif defined(HAVE_FPCLASS) --#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) --#else --#define zend_isinf(a) 0 --#endif -- --int main(int argc, char** argv) --{ -- return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1; --} -- +-int main() { +-__res_search() +-; return 0; } +#include EOF --if { (eval echo configure:91582: \"$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 -- +-if { (eval echo configure:91569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:96932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:97254: \"$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* + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_header_$ac_safe=yes" else + echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- ac_cv_atof_accept_inf=no -- -+ rm -rf conftest* + rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_header_$ac_safe=no" fi --rm -fr conftest* -+rm -f conftest* - fi + rm -f conftest* +-LIBS="$ac_save_LIBS" - + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 + echo "$ac_t""yes" 1>&6 +- found=yes + : -+else -+ echo "$ac_t""no" 1>&6 + else + echo "$ac_t""no" 1>&6 +-found=no +-fi +- +{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; } -+ + fi --echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 --if test "$ac_cv_atof_accept_inf" = "yes"; then -+ - cat >> confdefs.h <<\EOF --#define HAVE_ATOF_ACCEPTS_INF 1 + +- if test "$found" = "yes"; then +- ac_libs=$LIBS +- LIBS="$LIBS -lbind" +- if test "$cross_compiling" = yes; then +- found=no +-else +- cat > conftest.$ac_ext <> confdefs.h <<\EOF +#define HAVE_SYSVMSG 1 EOF - +-if { (eval echo configure:91605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- found=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- found=no +-fi +-rm -fr conftest* -fi + +- LIBS=$ac_libs +- fi + + ext_builddir=ext/sysvmsg + ext_srcdir=$abs_srcdir/ext/sysvmsg --echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 --echo "configure:91609: 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 +- if test "$found" = "yes"; then + ac_extra= + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_SYSVMSG_SHARED=no -+ -+ + + +- case bind in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lbind $LIBS" +- ;; + case ext/sysvmsg in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - --if test "$cross_compiling" = yes; then - -- ac_cv_huge_val_inf=yes - --else -- cat > conftest.$ac_ext < --#include --#ifdef HAVE_ISINF --#define zend_isinf(a) isinf(a) --#elif defined(INFINITY) --/* Might not work, but is required by ISO C99 */ --#define zend_isinf(a) (((a)==INFINITY)?1:0) --#elif defined(HAVE_FPCLASS) --#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) --#else --#define zend_isinf(a) 0 --#endif +- cat >> confdefs.h <<\EOF +-#define HAVE_RES_SEARCH 1 +-EOF + old_IFS=$IFS + for ac_src in sysvmsg.c; do + @@ -44549,37 +45032,29 @@ + + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" --int main(int argc, char** argv) --{ -- return zend_isinf(HUGE_VAL) ? 0 : 1; --} +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBBIND 1 + 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<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_huge_val_inf=yes + done --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* +- ac_cv_func_res_search=yes + + EXT_STATIC="$EXT_STATIC sysvmsg" + if test "$ext_shared" != "nocli"; then + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg" + fi -+ else + else +- + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then + PHP_SYSVMSG_SHARED=yes + @@ -44590,11 +45065,28 @@ + esac + -- ac_cv_huge_val_inf=no +- unset ac_cv_lib_socket_res_search +- unset ac_cv_lib_socket___res_search +- unset found +- echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6 +-echo "configure:91647: 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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lsocket $LIBS" +-cat > conftest.$ac_ext <&6 --if test "$ac_cv_huge_val_inf" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_HUGE_VAL_INF 1 ++ ++ + old_IFS=$IFS + for ac_src in sysvmsg.c; do + @@ -44630,21 +45117,45 @@ +$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src + $ac_comp EOF +-if { (eval echo configure:91666: \"$ac_link\") 1>&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" + done -fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 + case $host_alias in + *netware*) + + install_modules="install-modules" --echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 --echo "configure:91670: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 --if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then +- echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 +-echo "configure:91686: 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 -else -- --if test "$cross_compiling" = yes; then +- ac_save_LIBS="$LIBS" +-LIBS="-lsocket $LIBS" +-cat > conftest.$ac_ext < conftest.$ac_ext <>Makefile.objects< --#include ++ +$ext_builddir/phpsysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(PHPSYSVMSG_SHARED_DEPENDENCIES) + $link_cmd --#ifdef HAVE_ISNAN --#define zend_isnan(a) isnan(a) --#elif defined(HAVE_FPCLASS) --#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) --#else --#define zend_isnan(a) 0 --#endif -+EOF +-int main() { +-__res_search() +-; return 0; } + EOF +-if { (eval echo configure:91705: \"$ac_link\") 1>&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" --int main(int argc, char** argv) --{ --#if defined(__sparc__) && !(__GNUC__ >= 3) -- /* prevent bug #27830 */ -- return 1; --#else -- return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1; --#endif --} +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- found=yes +-else +- echo "$ac_t""no" 1>&6 +-found=no +-fi + ;; + *) + @@ -44719,15 +45229,16 @@ + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(SYSVMSG_SHARED_LIBADD)' + ;; + esac -+ + + if test "x" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvmsg.$suffix" + else + PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvmsg.$suffix" + fi -+ + +-fi + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" -+ + + cat >>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:91741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then -+ +- found=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- found=no +-fi +-rm -fr conftest* +-fi + +- LIBS=$ac_libs + ;; + esac + cat >> confdefs.h <&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- ac_cv_huge_val_nan=no --fi --rm -fr conftest* --fi +- cat >> confdefs.h <<\EOF +-#define HAVE_RES_SEARCH 1 + old_IFS=$IFS + for ac_src in sysvmsg.c; do + @@ -44790,32 +45320,21 @@ + IFS=$old_IFS + + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - --fi ++ + 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 - --echo "$ac_t""$ac_cv_huge_val_nan" 1>&6 --if test "$ac_cv_huge_val_nan" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_HUGE_VAL_NAN 1 ++ + cat >>Makefile.objects<&6 --echo "configure:91733: 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 ++ ++ + EXT_STATIC="$EXT_STATIC sysvmsg" + ;; + *) @@ -44827,21 +45346,8 @@ + *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + - --cat > conftest.$ac_ext < -- --int main() { - --#ifndef HAVE_STRPTIME --#error no strptime() on this platform --#else --/* use invalid strptime() declaration to see if it fails to compile */ --int strptime(const char *s, const char *format, struct tm *tm); --#endif ++ ++ + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta @@ -44849,32 +45355,18 @@ + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo - --; return 0; } --EOF --if { (eval echo configure:91755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- -- ac_cv_strptime_decl_fails=no - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* ++ ++ + old_IFS=$IFS + for ac_src in sysvmsg.c; do - -- ac_cv_strptime_decl_fails=yes ++ + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + + PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - --fi --rm -f conftest* --fi ++ + 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" ;; @@ -44882,163 +45374,82 @@ + *.cpp|*.cc|*.cxx) ac_comp="$b_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 --echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6 --if test "$ac_cv_strptime_decl_fails" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_STRPTIME_DECL_FAILS 1 +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBSOCKET 1 + cat >>Makefile.objects<&6 --echo "configure:91783: 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 --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:91793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 --fi --done +- fi +- --for ac_func in mblen --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:91822: 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 < --/* 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(); + ;; + esac + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg" -+ fi -+ -+ + fi + +- +- fi + +- ;; + BUILD_DIR="$BUILD_DIR $ext_builddir" -+ + +- esac --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 +-echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 +-echo "configure:91794: 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 +- +-if test "$cross_compiling" = yes; then +- +- ac_cv_atof_accept_nan=no + if test "$ext_builddir" = "."; then + PHP_PECL_EXTENSION=sysvmsg + + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" --; return 0; } --EOF --if { (eval echo configure:91850: \"$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 -+ 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 <&6 - fi --done - --for ac_func in mbrlen mbsinit --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:91877: 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 < --/* 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(); ++ fi --int main() { +-#include +-#include ++fi --/* 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 +-#ifdef HAVE_ISNAN +-#define zend_isnan(a) isnan(a) +-#elif defined(HAVE_FPCLASS) +-#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) -#else --$ac_func(); +-#define zend_isnan(a) 0 -#endif -+php_enable_sysvsem=no --; return 0; } +-int main(int argc, char** argv) +-{ +- return zend_isnan(atof("NAN")) ? 0 : 1; +-} + -EOF --if { (eval echo configure:91905: \"$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" +-if { (eval echo configure:91825: \"$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 ++php_enable_sysvsem=no + +echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 -+echo "configure:97259: checking whether to enable System V semaphore support" >&5 ++echo "configure:97581: 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" @@ -45046,42 +45457,25 @@ 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 -+ +- rm -fr conftest* + +- ac_cv_atof_accept_nan=no + PHP_SYSVSEM=no + test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL --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 <&6 fi --done +-rm -fr conftest* +-fi --echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 --echo "configure:91930: 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 < --#endif +-echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6 +-if test "$ac_cv_atof_accept_nan" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_ATOF_ACCEPTS_NAN 1 +-EOF --int main() { +-fi +ext_output="yes, shared" +ext_shared=yes +case $PHP_SYSVSEM in @@ -45101,554 +45495,869 @@ + ;; +esac --int __tmp__() { mbstate_t a; } - --; return 0; } --EOF --if { (eval echo configure:91949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* +-echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 +-echo "configure:91852: 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 - -- ac_cv_type_mbstate_t=yes +-if test "$cross_compiling" = yes; then +- +- ac_cv_atof_accept_inf=no -else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- -- ac_cv_type_mbstate_t=no -+echo "$ac_t""$ext_output" 1>&6 +- cat > conftest.$ac_ext < +-#include ++echo "$ac_t""$ext_output" 1>&6 --echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6 --if test "$ac_cv_type_mbstate_t" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_MBSTATE_T 1 --EOF +-#ifdef HAVE_ISINF +-#define zend_isinf(a) isinf(a) +-#elif defined(INFINITY) +-/* Might not work, but is required by ISO C99 */ +-#define zend_isinf(a) (((a)==INFINITY)?1:0) +-#elif defined(HAVE_FPCLASS) +-#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) +-#else +-#define zend_isinf(a) 0 +-#endif --fi +-int main(int argc, char** argv) +-{ +- return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1; +-} --for ac_hdr in atomic.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:91977: 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 --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:91987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" +-if { (eval echo configure:91886: \"$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 + -else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 --fi --done -- -- -- -- ext_builddir=ext/standard -- ext_srcdir=$abs_srcdir/ext/standard ++ + ext_builddir=ext/sysvsem + ext_srcdir=$abs_srcdir/ext/sysvsem - - ac_extra= - -- if test "" != "shared" && test "" != "yes" && test "" != "cli"; then -- PHP_STANDARD_SHARED=no ++ ++ ac_extra= ++ + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_SYSVSEM_SHARED=no - - -- case ext/standard in ++ ++ + case ext/sysvsem in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - ++ esac ++ -@@ -92038,17 +97324,7 @@ done +- ac_cv_atof_accept_inf=no + +-fi +-rm -fr conftest* +-fi ++ 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 +-fi - old_IFS=$IFS -- for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -- cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -- flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -- info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -- microtime.c pack.c pageinfo.c quot_print.c rand.c \ -- soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -- var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -- incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -- http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -- var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -- filters.c proc_open.c streamsfuncs.c http.c; do +-echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 +-if test "$ac_cv_atof_accept_inf" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_ATOF_ACCEPTS_INF 1 ++ old_IFS=$IFS + for ac_src in sysvsem.c; do - - IFS=. - set $ac_src -@@ -92071,18 +97347,18 @@ EOF - done ++ ++ 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<&6 +-echo "configure:91913: 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 + EXT_STATIC="$EXT_STATIC sysvsem" + if test "$ext_shared" != "nocli"; then + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" - fi - else -- if test "" = "shared" || test "" = "yes"; then -- PHP_STANDARD_SHARED=yes ++ fi ++ else + if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then + PHP_SYSVSEM_SHARED=yes - -- case ext/standard in ++ + case ext/sysvsem in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac ++ esac +-if test "$cross_compiling" = yes; then -@@ -92097,24 +97373,14 @@ EOF +- ac_cv_huge_val_inf=yes +-else +- cat > conftest.$ac_ext < +-#include + +-#ifdef HAVE_ISINF +-#define zend_isinf(a) isinf(a) +-#elif defined(INFINITY) +-/* Might not work, but is required by ISO C99 */ +-#define zend_isinf(a) (((a)==INFINITY)?1:0) +-#elif defined(HAVE_FPCLASS) +-#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) +-#else +-#define zend_isinf(a) 0 +-#endif ++ old_IFS=$IFS + for ac_src in sysvsem.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo" ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ + shared_objects_sysvsem="$shared_objects_sysvsem $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" ;; -@@ -92137,31 +97403,31 @@ EOF - 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'/phpstandard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpstandard.so '$ext_builddir'/phpstandard.so' +-int main(int argc, char** argv) +-{ +- return zend_isinf(HUGE_VAL) ? 0 : 1; +-} ++ 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<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- +- ac_cv_huge_val_inf=yes ++ done + +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* ++ 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'/phpsysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvsem.so '$ext_builddir'/phpsysvsem.so' - ;; - *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_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)' ++ ;; ++ *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_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 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_standard) $(PHPSTANDARD_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_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix" ++ ;; ++ esac ++ ++ if test "x" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvsem.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix" ++ else + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix" - fi ++ fi -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" +- ac_cv_huge_val_inf=no + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" - cat >>Makefile.objects<>Makefile.objects<&6 +-if test "$ac_cv_huge_val_inf" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_HUGE_VAL_INF 1 EOF -@@ -92174,31 +97440,31 @@ EOF - 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'/standard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(STANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/standard.so '$ext_builddir'/standard.so' + +-fi +- +-echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 +-echo "configure:91974: 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 +- +-if test "$cross_compiling" = yes; then +- +- ac_cv_huge_val_nan=yes ++ ;; ++ *) ++ ++ install_modules="install-modules" + +-else +- cat > conftest.$ac_ext < +-#include ++ if test "x" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvsem.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/standard.$suffix" ++ else + PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvsem.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" ++ fi ++ + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" - cat >>Makefile.objects<>Makefile.objects<= 3) +- /* prevent bug #27830 */ +- return 1; +-#else +- return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1; +-#endif +-} +$ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES) - $link_cmd ++ $link_cmd EOF -@@ -92206,22 +97472,22 @@ EOF - ;; - esac - cat >> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- +- ac_cv_huge_val_nan=yes + +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- +- ac_cv_huge_val_nan=no ++ ;; ++ esac ++ cat >> confdefs.h <&6 +-if test "$ac_cv_huge_val_nan" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_HUGE_VAL_NAN 1 +-EOF ++ 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 array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -- cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -- flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -- info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -- microtime.c pack.c pageinfo.c quot_print.c rand.c \ -- soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -- var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -- incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -- http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -- var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -- filters.c proc_open.c streamsfuncs.c http.c; do +-fi + +-echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6 +-echo "configure:92037: 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 ++ old_IFS=$IFS + for ac_src in sysvsem.c; do - IFS=. - set $ac_src -@@ -92269,15 +97525,15 @@ EOF - done +-cat > conftest.$ac_ext < ++ 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 -- EXT_STATIC="$EXT_STATIC standard" -+ EXT_STATIC="$EXT_STATIC sysvsem" - ;; - *) - - -- case ext/standard in +-int main() { ++ cat >>Makefile.objects<&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++ EXT_STATIC="$EXT_STATIC sysvsem" ++ ;; ++ *) ++ ++ + case ext/sysvsem in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac ++ esac +- ac_cv_strptime_decl_fails=no +- +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* -@@ -92292,17 +97548,7 @@ EOF +- ac_cv_strptime_decl_fails=yes +- +-fi +-rm -f conftest* +-fi +-echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6 +-if test "$ac_cv_strptime_decl_fails" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_STRPTIME_DECL_FAILS 1 +-EOF ++ 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 array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -- cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -- flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -- info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -- microtime.c pack.c pageinfo.c quot_print.c rand.c \ -- soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -- var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -- incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -- http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -- var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -- filters.c proc_open.c streamsfuncs.c http.c; do +-fi + +-for ac_hdr in wchar.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:92087: 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 +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:92097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <>Makefile.objects<&6 +-fi +-done ++ done - ;; - esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC standard" +-for ac_func in mblen +-do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:92126: 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 < +-/* 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() { ++ ;; ++ esac + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" - fi - - -@@ -92336,52 +97582,78 @@ EOF ++ fi ++ ++ ++ BUILD_DIR="$BUILD_DIR $ext_builddir" ++ +-/* 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 - if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=standard +-; return 0; } +-EOF +-if { (eval echo configure:92154: \"$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 test "$ext_builddir" = "."; then + PHP_PECL_EXTENSION=sysvsem - - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - - fi ++ ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" +-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 <> confdefs.h <<\EOF +#define HAVE_SYSVSEM 1 -+EOF + EOF +- +-else +- echo "$ac_t""no" 1>&6 +-fi +-done +-for ac_func in mbrlen mbsinit +-do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:92181: checking for $ac_func" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "checking for union semun""... $ac_c" 1>&6 -+echo "configure:97597: checking for union semun" >&5 ++echo "configure:97919: 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 <&6 + else + cat > conftest.$ac_ext < +-/* 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(); -- src=$ext_srcdir/Makefile.frag -- ac_srcdir=$ext_srcdir -- ac_builddir=$ext_builddir -- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -- -- -- -- for header_file in ext/standard/; do -- +#include +#include +#include + -+int main() { + 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 +- +union semun x; -+; return 0; } -+EOF -+if { (eval echo configure:97613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - -- unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` + ; return 0; } + EOF +-if { (eval echo configure:92209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:97935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* +- eval "ac_cv_func_$ac_func=yes" ++ + php_cv_semun=yes + -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* - -- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INSTALLHEADERS$unique=set" -- -- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -- -- fi + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_func_$ac_func=no" ++ + php_cv_semun=no + -+fi -+rm -f conftest* + fi + rm -f conftest* + -+fi + fi -- done -- +-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 <&6 + if test "$php_cv_semun" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_SEMUN 1 -+EOF -+ + EOF +- +-else +- echo "$ac_t""no" 1>&6 +-fi +-done + +-echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 +-echo "configure:92234: 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 <> confdefs.h <<\EOF +#define HAVE_SEMUN 0 +EOF +-#ifdef HAVE_WCHAR_H +-# include +-#endif + fi +fi +-int main() { +-int __tmp__() { mbstate_t a; } --php_with_sybase_ct=no +-; return 0; } +-EOF +-if { (eval echo configure:92253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- +- ac_cv_type_mbstate_t=yes +php_enable_sysvshm=no --echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 --echo "configure:92377: 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" -- PHP_SYBASE_CT=$withval +echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 -+echo "configure:97649: checking whether to enable System V shared memory support" >&5 ++echo "configure:97971: 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" + PHP_SYSVSHM=$enableval else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* -- PHP_SYBASE_CT=no -- test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL +- ac_cv_type_mbstate_t=no + PHP_SYSVSHM=no + test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL fi +-rm -f conftest* +-fi -@@ -92389,12 +97661,12 @@ fi +-echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6 +-if test "$ac_cv_type_mbstate_t" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_MBSTATE_T 1 +-EOF - ext_output="yes, shared" - ext_shared=yes --case $PHP_SYBASE_CT in +-fi + +-for ac_hdr in atomic.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:92281: 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 +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:92291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 +-fi +-done ++ext_output="yes, shared" ++ext_shared=yes +case $PHP_SYSVSHM in - shared,*) -- PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|$SED 's/^shared,//'` ++shared,*) + PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'` - ;; - shared) -- PHP_SYBASE_CT=yes ++ ;; ++shared) + PHP_SYSVSHM=yes - ;; - no) - ext_output=no -@@ -92413,30 +97685,25 @@ echo "$ac_t""$ext_output" 1>&6 ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac --if test "$PHP_SYBASE_CT" != "no"; then -- -- if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then -- { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } -- fi -- +- ext_builddir=ext/standard +- ext_srcdir=$abs_srcdir/ext/standard ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ +if test "$PHP_SYSVSHM" != "no"; then - cat >> confdefs.h <<\EOF --#define HAVE_SYBASE_CT 1 ++ cat >> confdefs.h <<\EOF +#define HAVE_SYSVSHM 1 - EOF - - -- ext_builddir=ext/sybase_ct -- ext_srcdir=$abs_srcdir/ext/sybase_ct ++EOF ++ ++ + ext_builddir=ext/sysvshm + ext_srcdir=$abs_srcdir/ext/sysvshm ac_extra= - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYBASE_CT_SHARED=no +- if test "" != "shared" && test "" != "yes" && test "" != "cli"; then +- PHP_STANDARD_SHARED=no ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_SYSVSHM_SHARED=no -- case ext/sybase_ct in +- case ext/standard in + case ext/sysvshm in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -92451,7 +97718,7 @@ EOF +@@ -92342,17 +98040,7 @@ done old_IFS=$IFS -- for ac_src in php_sybase_ct.c; do +- for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ +- cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ +- flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ +- info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ +- microtime.c pack.c pageinfo.c quot_print.c rand.c \ +- soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ +- var.c versioning.c assert.c strnatcmp.c levenshtein.c \ +- incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ +- http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ +- var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ +- filters.c proc_open.c streamsfuncs.c http.c; do + for ac_src in sysvshm.c; do IFS=. set $ac_src -@@ -92474,18 +97741,18 @@ EOF +@@ -92375,18 +98063,18 @@ EOF done -- EXT_STATIC="$EXT_STATIC sybase_ct" +- EXT_STATIC="$EXT_STATIC standard" +- if test "" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC standard" + EXT_STATIC="$EXT_STATIC sysvshm" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" ++ if test "$ext_shared" != "nocli"; then + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" fi else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SYBASE_CT_SHARED=yes +- if test "" = "shared" || test "" = "yes"; then +- PHP_STANDARD_SHARED=yes ++ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then + PHP_SYSVSHM_SHARED=yes -- case ext/sybase_ct in +- case ext/standard in + case ext/sysvshm in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -92500,14 +97767,14 @@ EOF +@@ -92401,24 +98089,14 @@ EOF old_IFS=$IFS -- for ac_src in php_sybase_ct.c; do +- for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ +- cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ +- flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ +- info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ +- microtime.c pack.c pageinfo.c quot_print.c rand.c \ +- soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ +- var.c versioning.c assert.c strnatcmp.c levenshtein.c \ +- incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ +- http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ +- var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ +- filters.c proc_open.c streamsfuncs.c http.c; do + for ac_src in sysvshm.c; do IFS=. @@ -45656,631 +46365,221 @@ ac_obj=$1 IFS=$old_IFS -- shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo" +- shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo" + shared_objects_sysvshm="$shared_objects_sysvshm $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" ;; -@@ -92530,31 +97797,31 @@ EOF +@@ -92441,31 +98119,31 @@ EOF 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'/phpsybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsybase_ct.so '$ext_builddir'/phpsybase_ct.so' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpstandard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpstandard.so '$ext_builddir'/phpstandard.so' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvshm.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvshm.so '$ext_builddir'/phpsysvshm.so' ;; *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_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSHM, 3)_SHARED_LIBADD)' ;; *) 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_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix" +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix" + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvshm.$suffix" else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix" +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix" fi -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 --echo "configure:92732: 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 -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_long_int=4 --else -- cat > conftest.$ac_ext < --#include --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(long int)); -- exit(0); --} --EOF --if { (eval echo configure:92752: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_sizeof_long_int=0 --fi --rm -fr conftest* --fi -- --fi --echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 --cat >> confdefs.h <&6 --echo "configure:92772: checking checking if we're on a 64-bit platform" >&5 -- if test "$ac_cv_sizeof_long_int" = "4"; then -- echo "$ac_t""no" 1>&6 -- PHP_SYBASE_64=no -- else -- echo "$ac_t""yes" 1>&6 -- PHP_SYBASE_64=yes -- fi -- -- -- echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6 --echo "configure:92783: checking Checking for ctpublic.h" >&5 -- if test -f $SYBASE_CT_INCDIR/ctpublic.h; then -- echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6 -- -- if test "$SYBASE_CT_INCDIR" != "/usr/include"; then -- -- if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then -- ai_p=$SYBASE_CT_INCDIR -- else -- -- ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SYBASE_CT_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 -- -- else -- { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; } -- fi -- -- echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6 --echo "configure:92822: checking Checking Sybase libdir" >&5 -- echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6 -- -- echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6 --echo "configure:92826: checking Checking for Sybase platform libraries" >&5 -- -- -- if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then -- -- if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$SYBASE_CT_LIBDIR -- else -- -- ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_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 -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then -- -- -- case ct in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case ct in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lct $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" -- echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6 -- elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then -- -- -- case sybcs64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybcs64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybcs64 $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- -- -- case sybct64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybct64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybct64 $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- -- -- case sybcomn64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybcomn64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybcomn64 $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- -- -- case sybintl64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybintl64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybintl64 $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- -- ac_solid_uname_s=`uname -s 2>/dev/null` -- case $ac_solid_uname_s in -- *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define -- *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # -- esac -- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64" -- echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6 -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $SYBASE_CT_LIBS -- " -- -- 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="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- -- +- EXT_CLI_STATIC="$EXT_CLI_STATIC standard" + EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" + 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" ++ ++ + BUILD_DIR="$BUILD_DIR $ext_builddir" - -- fi - - -- fi ++ ++ ++ + if test "$ext_builddir" = "."; then + PHP_PECL_EXTENSION=sysvshm - ++ + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + - fi - -- ;; -- esac -- done ++ fi ++ +fi - -- echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 --echo "configure:93092: checking for netg_errstr in -lsybtcl64" >&5 --ac_lib_var=`echo sybtcl64'_'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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lsybtcl64 $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" ++ ++ + +php_with_tidy=no + +echo $ac_n "checking for TIDY support""... $ac_c" 1>&6 -+echo "configure:97993: checking for TIDY support" >&5 ++echo "configure:98315: checking for TIDY support" >&5 +# Check whether --with-tidy or --without-tidy was given. +if test "${with_tidy+set}" = set; then + withval="$with_tidy" + PHP_TIDY=$withval - 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" ++else + + PHP_TIDY=no + test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL - - 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 -- -- -- -- case sybtcl64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybtcl64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybtcl64 $LIBS" -- ;; -- esac - - -- fi -- ;; -- esac - ++ ++fi ++ ++ ++ +ext_output="yes, shared" +ext_shared=yes +case $PHP_TIDY in @@ -46299,94 +46598,22 @@ + ext_shared=no + ;; +esac - -- -- --else -- echo "$ac_t""no" 1>&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_sybtcl64_netg_errstr -- -- -- -- case sybtcl64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybtcl64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybtcl64 $LIBS" -- ;; -- esac - ++ ++ ++ +echo "$ac_t""$ext_output" 1>&6 - -- fi -- ;; -- esac - - -- -- --fi - -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- -- 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" ++ ++ ++ ++ +if test "$PHP_TIDY" != "no"; then + + if test "$PHP_TIDY" != "yes"; then + TIDY_SEARCH_DIRS=$PHP_TIDY + else + TIDY_SEARCH_DIRS="/usr/local /usr" - 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 ++ + for i in $TIDY_SEARCH_DIRS; do + if test -f $i/include/tidy/tidy.h; then + TIDY_DIR=$i @@ -46396,401 +46623,121 @@ + TIDY_INCDIR=$i/include + fi + done - ++ + if test -z "$TIDY_DIR"; then + { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; } + fi - -- fi -- ;; -- esac ++ + TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR - ++ + - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` ++ + if test "$ext_shared" = "yes"; then + TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD" + if test -n "$TIDY_LIBDIR"; then - -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ + if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then - -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii ++ + if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$TIDY_LIBDIR - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ else ++ + ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" - fi - - - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then + TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD" + test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD" - else - - -@@ -93277,154 +98096,26 @@ fi - - fi - -- ;; -- esac -- done -- -- echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6 --echo "configure:93286: checking for insck__getVdate in -linsck64" >&5 --ac_lib_var=`echo insck64'_'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 --else -- ac_save_LIBS="$LIBS" --LIBS="-linsck64 $LIBS" --cat > conftest.$ac_ext <&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 -- -- -- case insck64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case insck64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck64 $LIBS" -- ;; -- esac -- -- - fi -- ;; -- esac -- -- -- --else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck64_insck__getVdate ++ 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 - -- --fi - ++ ++ + if test -n "$TIDY_LIBDIR"; then - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- -- 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 "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then - -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii ++ + if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$TIDY_LIBDIR - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ else ++ + ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" fi - - -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- ++ ++ + - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -93440,188 +98131,60 @@ fi - fi +- BUILD_DIR="$BUILD_DIR $ext_builddir" ++ 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 +- if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=standard - fi - -- ;; -- esac -- done -- -- echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 --echo "configure:93453: checking for bsd_tcp in -linsck64" >&5 --ac_lib_var=`echo insck64'_'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 --else -- ac_save_LIBS="$LIBS" --LIBS="-linsck64 $LIBS" --cat > conftest.$ac_ext <&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 -- -- -- case insck64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case insck64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck64 $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- --else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck64_bsd_tcp -- -- --fi -- -- elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then -- -- -- case sybcs in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybcs in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybcs $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- -- -- case sybct in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybct in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybct $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- -- -- case sybcomn in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybcomn in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybcomn $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- -- -- case sybintl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" -- else -- +- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + fi - -- case sybintl in + + fi ++ + + case tidy in - c|c_r|pthread*) ;; - *) -- LIBS="-lsybintl $LIBS" ++ c|c_r|pthread*) ;; ++ *) + LIBS="-ltidy $LIBS" - ;; - esac ++ ;; ++ esac -- fi -- ;; -- esac -+ + +- src=$ext_srcdir/Makefile.frag +- ac_srcdir=$ext_srcdir +- ac_builddir=$ext_builddir +- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments + + fi -- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl" -- echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6 +- for header_file in ext/standard/; do +- + if test "$TIDY_INCDIR" != "/usr/include"; then + + if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then @@ -46804,11 +46751,14 @@ + fi + + -+ + +- unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then + if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INSTALLHEADERS$unique=set" + eval "INCLUDEPATH$unique=set" + + if test ""; then @@ -46817,419 +46767,598 @@ + INCLUDES="$INCLUDES -I$ai_p" + fi +- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" +- + fi + +- done +- + fi -+ -+ fi -+ -+ + + + - save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $SYBASE_CT_LIBS -- " ++ save_old_LDFLAGS=$LDFLAGS + ac_stuff="" - - save_ext_shared=$ext_shared - ext_shared=yes -@@ -93714,27 +98277,27 @@ fi - esac - done ++ ++ 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 -- echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 --echo "configure:93719: checking for netg_errstr in -lsybtcl" >&5 --ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'` ++ 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 + +-php_with_sybase_ct=no + +-echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 +-echo "configure:92681: 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" +- PHP_SYBASE_CT=$withval +-else +- +- PHP_SYBASE_CT=no +- test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL ++ fi ++ ;; ++ esac + +-fi + ++ ;; ++ -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="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$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 + +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_SYBASE_CT in +-shared,*) +- PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_SYBASE_CT=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac + ++ fi ++ ++ fi + ++ ;; ++ esac ++ done + +-echo "$ac_t""$ext_output" 1>&6 + echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 -+echo "configure:98282: checking for tidyOptGetDoc in -ltidy" >&5 ++echo "configure:98604: 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 - else - ac_save_LIBS="$LIBS" --LIBS="-lsybtcl $LIBS" ++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="-ltidy $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:98301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -93753,705 +98316,807 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - -- -- -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybtcl $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- ++; return 0; } ++EOF ++if { (eval echo configure:98623: \"$ac_link\") 1>&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_TIDYOPTGETDOC 1 +EOF -- + - - else - echo "$ac_t""no" 1>&6 ++ ++else ++ echo "$ac_t""no" 1>&6 - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- unset ac_cv_lib_sybtcl_netg_errstr -- -- -- -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" -- else -- +-if test "$PHP_SYBASE_CT" != "no"; then ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared + unset ac_cv_lib_tidy_tidyOptGetDoc + - -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybtcl $LIBS" -- ;; -- esac -- ++ +fi -- fi -- ;; -- esac +- if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then +- { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } +- fi +- cat >> confdefs.h <<\EOF +-#define HAVE_SYBASE_CT 1 +-EOF -- --fi +- ext_builddir=ext/sybase_ct +- ext_srcdir=$abs_srcdir/ext/sybase_ct + ext_builddir=ext/tidy + ext_srcdir=$abs_srcdir/ext/tidy -- -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + ac_extra= + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_SYBASE_CT_SHARED=no + PHP_TIDY_SHARED=no -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- save_ext_shared=$ext_shared -- ext_shared=yes +- case ext/sybase_ct in + case ext/tidy in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac + esac -- 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'` -+ -+ 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 +@@ -92755,7 +98684,7 @@ EOF + + + old_IFS=$IFS +- for ac_src in php_sybase_ct.c; do + for ac_src in tidy.c; do -- 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 -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + IFS=. + set $ac_src +@@ -92778,18 +98707,18 @@ EOF + done -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -+ 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<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <>Makefile.objects</dev/null ; then -- ai_p=$ac_ii +- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" +- +- fi +- +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD" +- +- +- if test "$PHP_SYBASE_CT" = "yes"; then +- SYBASE_CT_INCDIR=/home/sybase/include +- SYBASE_CT_LIBDIR=/home/sybase/lib +- else +- SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include +- SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib +- fi +- +- echo $ac_n "checking size of long int""... $ac_c" 1>&6 +-echo "configure:93036: 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 +- if test "$cross_compiling" = yes; then +- ac_cv_sizeof_long_int=4 +-else +- cat > conftest.$ac_ext < +-main() +-{ +- FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(long int)); +- exit(0); +-} +-EOF +-if { (eval echo configure:93055: \"$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 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_sizeof_long_int=0 +-fi +-rm -fr conftest* +-fi +- +-fi +-echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 +-cat >> confdefs.h <&6 +-echo "configure:93075: checking checking if we're on a 64-bit platform" >&5 +- if test "$ac_cv_sizeof_long_int" = "4"; then +- echo "$ac_t""no" 1>&6 +- PHP_SYBASE_64=no +- else +- echo "$ac_t""yes" 1>&6 +- PHP_SYBASE_64=yes +- fi +- +- +- echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6 +-echo "configure:93086: checking Checking for ctpublic.h" >&5 +- if test -f $SYBASE_CT_INCDIR/ctpublic.h; then +- echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6 +- +- if test "$SYBASE_CT_INCDIR" != "/usr/include"; then +- +- if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then +- ai_p=$SYBASE_CT_INCDIR - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" +- ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`" - fi -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - +- +- +- +- 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 +- +- else +- { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; } +- fi +- +- echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6 +-echo "configure:93125: checking Checking Sybase libdir" >&5 +- echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6 +- +- echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6 +-echo "configure:93129: checking Checking for Sybase platform libraries" >&5 +- +- +- if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then +- +- if test -z "$SYBASE_CT_LIBDIR" || echo "$SYBASE_CT_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$SYBASE_CT_LIBDIR +- else +- +- ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`" +- fi +- - - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_SHARED_LIBADD" - else -+ 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<>Makefile.objects<&6 +- elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then +- + ;; + esac + EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" - fi -+ -+ ++ fi + +- case sybcs64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" +- else +- + +- case sybcs64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybcs64 $LIBS" +- ;; +- esac + BUILD_DIR="$BUILD_DIR $ext_builddir" + -- fi +- fi +- ;; +- esac + if test "$ext_builddir" = "."; then + PHP_PECL_EXTENSION=tidy - -- fi ++ + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- ;; -- esac -- done + fi -- echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 --echo "configure:93913: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-linsck $LIBS" --cat > conftest.$ac_ext <> confdefs.h <<\EOF +#define HAVE_TIDY 1 - EOF --if { (eval echo configure:93932: \"$ac_link\") 1>&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" ++EOF + ++fi - 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 - - -- case insck in +- case sybcomn64 in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" - else - -+ -+ -+ -+ +- +- case sybcomn64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybcomn64 $LIBS" +- ;; +- esac + + +- fi +- ;; +- esac + +php_enable_tokenizer=yes -+ + +- +- +- case sybintl64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" +- else +- +echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 -+echo "configure:98645: checking whether to enable tokenizer support" >&5 ++echo "configure:98967: 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" + PHP_TOKENIZER=$enableval +else -- case insck in +- case sybintl64 in - c|c_r|pthread*) ;; - *) -- LIBS="-linsck $LIBS" +- LIBS="-lsybintl64 $LIBS" - ;; - esac + PHP_TOKENIZER=yes + test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL -+ + +fi -+ -+ -+ + +- fi +- ;; +- esac + + +ext_output="yes, shared" +ext_shared=yes +case $PHP_TOKENIZER in @@ -47390,40 +47568,23 @@ + ;; +esac - -- fi -- ;; -- esac - -+echo "$ac_t""$ext_output" 1>&6 - +- ac_solid_uname_s=`uname -s 2>/dev/null` +- case $ac_solid_uname_s in +- *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define +- *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # +- esac +- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64" +- echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6 - --else -- echo "$ac_t""no" 1>&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck_insck__getVdate - -+ -+ -+if test "$PHP_TOKENIZER" != "no"; then - --fi -+ ext_builddir=ext/tokenizer -+ ext_srcdir=$abs_srcdir/ext/tokenizer - -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_TOKENIZER_SHARED=no - - save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" +- ac_stuff=" +- $SYBASE_CT_LIBS +- " - - save_ext_shared=$ext_shared - ext_shared=yes - +- - for ac_i in $ac_stuff; do - case $ac_i in - -pthread) @@ -47431,14 +47592,9 @@ - LDFLAGS="$LDFLAGS -pthread" - else - -+ case ext/tokenizer in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - +- - 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" @@ -47450,29 +47606,14 @@ - -l*) - ac_ii=`echo $ac_i|cut -c 3-` - -+ 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 tokenizer.c tokenizer_data.c; do - +- - case $ac_ii in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -l$ac_ii" - else -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - +- - - case $ac_ii in - c|c_r|pthread*) ;; @@ -47480,23 +47621,12 @@ - LIBS="$LIBS -l$ac_ii" - ;; - esac -+ 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 ++echo "$ac_t""$ext_output" 1>&6 - fi - ;; - esac -+ cat >>Makefile.objects</dev/null ; then - ai_p=$ac_ii -+ EXT_STATIC="$EXT_STATIC tokenizer" -+ if test "$ext_shared" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" -+ fi - else +- 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="-L$ai_p $LDFLAGS" - test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" - else - -- -- ++if test "$PHP_TOKENIZER" != "no"; then + ++ ext_builddir=ext/tokenizer ++ ext_srcdir=$abs_srcdir/ext/tokenizer ++ ++ ac_extra= ++ ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then ++ PHP_TOKENIZER_SHARED=no ++ + - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_TOKENIZER_SHARED=yes -+ + case ext/tokenizer in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; @@ -47547,13 +47679,13 @@ - fi -+ 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 ++ 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 - fi - @@ -47570,23 +47702,23 @@ + ac_obj=$1 + IFS=$old_IFS + -+ shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo" ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 --echo "configure:94080: checking for bsd_tcp in -linsck" >&5 --ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 +-echo "configure:93395: checking for netg_errstr in -lsybtcl64" >&5 +-ac_lib_var=`echo sybtcl64'_'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 -else - ac_save_LIBS="$LIBS" --LIBS="-linsck $LIBS" +-LIBS="-lsybtcl64 $LIBS" -cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:93414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else @@ -47612,8 +47744,7 @@ -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -+ done - +- -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 @@ -47621,25 +47752,107 @@ - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - +- - -- case insck in +- case sybtcl64 in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" - else - - -- case insck in +- case sybtcl64 in - c|c_r|pthread*) ;; - *) -- LIBS="-linsck $LIBS" +- LIBS="-lsybtcl64 $LIBS" +- ;; +- esac ++ done + + ++ EXT_STATIC="$EXT_STATIC tokenizer" ++ if test "$ext_shared" != "nocli"; then ++ EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" + fi +- ;; ++ else ++ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then ++ PHP_TOKENIZER_SHARED=yes ++ ++ case ext/tokenizer in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; 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 + +- +- +-else +- echo "$ac_t""no" 1>&6 + +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_sybtcl64_netg_errstr +- +- ++ old_IFS=$IFS ++ for ac_src in tokenizer.c tokenizer_data.c; do + +- case sybtcl64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" +- else ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS + +- +- case sybtcl64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybtcl64 $LIBS" +- ;; +- esac ++ shared_objects_tokenizer="$shared_objects_tokenizer $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 + +- fi - ;; +- esac ++ cat >>Makefile.objects<>Makefile.objects<&6 +- fi +- ;; +EOF - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck_bsd_tcp -- -- --fi ++ + ;; + *) + + install_modules="install-modules" - -- else -- -- -- case cs in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case cs in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lcs $LIBS" -- ;; ++ + case $host_alias in + *aix*) + suffix=so @@ -47720,83 +47949,135 @@ + ;; 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 + if test "x" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tokenizer.$suffix" -+ else + else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/tokenizer.$suffix" -+ fi -+ + fi +- +- +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$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 +- + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" -- fi -- ;; -- esac +- fi +- +- fi + cat >>Makefile.objects<&6 +-echo "configure:93589: checking for insck__getVdate in -linsck64" >&5 +-ac_lib_var=`echo insck64'_'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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-linsck64 $LIBS" +-cat > conftest.$ac_ext <> confdefs.h <&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 -- ;; -- esac -- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++ fi + fi - -- -- -- case comn in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" -- else -- ++ + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then + PHP_TOKENIZER_SHARED=no + case "$PHP_SAPI" in + cgi|embed) + -- case comn in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lcomn $LIBS" -- ;; +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- + case ext/tokenizer in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ -+ - ++ esac + +- case insck64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" +- else +- + +- case insck64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-linsck64 $LIBS" +- ;; +- esac - + - fi - ;; - esac @@ -47809,30 +48090,24 @@ + b_lo=$php_lo -- + old_IFS=$IFS + for ac_src in tokenizer.c tokenizer_data.c; do -- case intl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" -- else +-else +- echo "$ac_t""no" 1>&6 + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS - -- -- case intl in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lintl $LIBS" -- ;; -- esac ++ + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_insck64_insck__getVdate +- +- +-fi + 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" ;; @@ -47840,25 +48115,9 @@ + *.cpp|*.cc|*.cxx) ac_comp="$b_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 -- fi -- ;; -- esac -+ cat >>Makefile.objects<&6 -- - - save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $SYBASE_CT_LIBS -- " +- ac_stuff="-L$SYBASE_CT_LIBDIR" - - save_ext_shared=$ext_shared - ext_shared=yes @@ -47869,29 +48128,48 @@ - if test "$ext_shared" = "yes"; then - LDFLAGS="$LDFLAGS -pthread" - else ++ cat >>Makefile.objects<>Makefile.objects</dev/null ; then @@ -47942,22 +48222,11 @@ - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -+ 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<> Makefile.fragments -- echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 --echo "configure:94346: checking for netg_errstr in -ltcl" >&5 --ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 +-echo "configure:93756: checking for bsd_tcp in -linsck64" >&5 +-ac_lib_var=`echo insck64'_'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 -else - ac_save_LIBS="$LIBS" --LIBS="-ltcl $LIBS" +-LIBS="-linsck64 $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:93775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + @@ -48031,7 +48295,7 @@ +php_enable_wddx=no + +echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 -+echo "configure:98991: checking whether to enable WDDX support" >&5 ++echo "configure:99313: 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" @@ -48051,8 +48315,30 @@ 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 +- +- +- case insck64 in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case insck64 in +- c|c_r|pthread*) ;; +- *) +- LIBS="-linsck64 $LIBS" +- ;; +- esac + + +- fi +- ;; +- esac + +ext_output="yes, shared" +ext_shared=yes @@ -48072,9 +48358,16 @@ + ext_shared=no + ;; +esac -+ -+ -+ + + +- +-else +- echo "$ac_t""no" 1>&6 + +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_insck64_bsd_tcp +- +echo "$ac_t""$ext_output" 1>&6 + + @@ -48082,33 +48375,32 @@ + +if test -z "$PHP_LIBXML_DIR"; then -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- +-fi +php_with_libxml_dir=no -+ + +- elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then +- +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:99036: checking libxml2 install dir" >&5 ++echo "configure:99358: 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" + PHP_LIBXML_DIR=$withval +else -- case tcl in +- case sybcs in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" - else - + PHP_LIBXML_DIR=no -- case tcl in +- case sybcs in - c|c_r|pthread*) ;; - *) -- LIBS="-ltcl $LIBS" +- LIBS="-lsybcs $LIBS" - ;; - esac @@ -48123,50 +48415,80 @@ - - --else -- echo "$ac_t""no" 1>&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_tcl_netg_errstr -- +- case sybct in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" +- else - -+ +- +- case sybct in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybct $LIBS" +- ;; +- esac + + +- fi +- ;; +- esac +fi -+ -+ + + +- +php_with_libexpat_dir=no + +echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 -+echo "configure:99060: checking libexpat dir for WDDX" >&5 ++echo "configure:99382: 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" + PHP_LIBEXPAT_DIR=$withval +else -- case sybtcl in +- case sybcomn in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" - else - + PHP_LIBEXPAT_DIR=no -- case sybtcl in +- case sybcomn in - c|c_r|pthread*) ;; - *) -- LIBS="-lsybtcl $LIBS" +- LIBS="-lsybcomn $LIBS" - ;; - esac -+ + +fi -+ -+ + +- fi +- ;; +- esac + +ext_output=$PHP_LIBEXPAT_DIR +echo "$ac_t""$ext_output" 1>&6 -+ + +- +- +- case sybintl in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case sybintl in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybintl $LIBS" +- ;; +- esac - fi @@ -48180,13 +48502,25 @@ + { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + fi +- +- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl" +- echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6 +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- $SYBASE_CT_LIBS +- " +- +- save_ext_shared=$ext_shared +- ext_shared=yes +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:99088: checking for xml2-config path" >&5 ++echo "configure:99410: 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 +- for ac_i in $ac_stuff; do + for i in $PHP_LIBXML_DIR /usr/local /usr; do + if test -x "$i/bin/xml2-config"; then + ac_cv_php_xml2_config_path="$i/bin/xml2-config" @@ -48194,17 +48528,8 @@ + fi + done + - fi - -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do ++fi ++ +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 + + if test -x "$ac_cv_php_xml2_config_path"; then @@ -48228,7 +48553,7 @@ else -@@ -94473,7 +99138,7 @@ fi +@@ -93955,7 +99460,7 @@ fi c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then @@ -48237,7 +48562,7 @@ else -@@ -94508,8 +99173,8 @@ fi +@@ -93990,8 +99495,8 @@ fi if test "$ext_shared" = "yes"; then @@ -48248,513 +48573,203 @@ else -@@ -94535,133 +99200,13 @@ fi +@@ -94017,550 +99522,773 @@ fi esac done -- echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 --echo "configure:94540: checking for insck__getVdate in -linsck" >&5 --ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` +- echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 +-echo "configure:94022: checking for netg_errstr in -lsybtcl" >&5 +-ac_lib_var=`echo sybtcl'_'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 --else -- ac_save_LIBS="$LIBS" --LIBS="-linsck $LIBS" --cat > conftest.$ac_ext <&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 -- -- -- case insck in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -- else - -- -- case insck in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- --else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck_insck__getVdate -- -- --fi -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do ++ + for ac_i in $LIBXML_INCS; 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*) ++ case $ac_i in + -I*) - ac_ii=`echo $ac_i|cut -c 3-` - -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ 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 -@@ -94674,209 +99219,98 @@ fi - fi - - -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$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 -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 "LIBPATH$unique=set" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "INCLUDEPATH$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 -- -- ++ + if test ""; then + INCLUDES="-I$ai_p $INCLUDES" + else + INCLUDES="$INCLUDES -I$ai_p" - fi - - fi - ++ fi ++ + fi + - ;; - esac - done - -- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 --echo "configure:94707: 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 --else ++ fi ++ ++ ;; ++ esac ++ done ++ ++ ++ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 ++echo "configure:99568: 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 - ac_save_LIBS="$LIBS" --LIBS="-linsck $LIBS" +-LIBS="-lsybtcl $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ ++ char xmlInitParser(); ++ int main() { ++ xmlInitParser(); ++ return 0; ++ } ++ + EOF +-if { (eval echo configure:94041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:99246: 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 ++if { (eval echo configure:99595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ++ LIBS=$old_LIBS ++ ++ php_cv_libxml_build_works=yes ++ ++ else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" --fi ++ rm -fr conftest* ++ ++ LIBS=$old_LIBS ++ ++ echo "$ac_t""no" 1>&6 ++ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } ++ ++ ++fi ++rm -fr conftest* + fi -rm -f conftest* -LIBS="$ac_save_LIBS" -- --fi + ++ ++ + 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 - ++ ++echo "$ac_t""$php_cv_libxml_build_works" 1>&6 ++ if test "$php_cv_libxml_build_works" = "yes"; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_LIBXML 1 ++EOF ++ ++ fi + ++ if test "$PHP_XML" = "no"; then ++ -- case insck in +- case sybtcl in - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" +- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" - else -- ++ case ext/xml in ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; 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 compat.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_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_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_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_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<&6 -+ cat > conftest.$ac_ext <&6 --echo "configure:94786: 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" -- PHP_SYSVMSG=$enableval --else -- -- PHP_SYSVMSG=no -- test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_SYSVMSG in --shared,*) -- PHP_SYSVMSG=`echo "$PHP_SYSVMSG"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SYSVMSG=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_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:94829: 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 --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:94839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" -+if { (eval echo configure:99273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ LIBS=$old_LIBS -+ -+ php_cv_libxml_build_works=yes -+ -+ - else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- : --else -- echo "$ac_t""no" 1>&6 --{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; } -+ rm -fr conftest* -+ -+ LIBS=$old_LIBS -+ -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -+ - - fi -+rm -fr conftest* -+fi - - -- cat >> confdefs.h <<\EOF --#define HAVE_SYSVMSG 1 --EOF -- -- -- ext_builddir=ext/sysvmsg -- ext_srcdir=$abs_srcdir/ext/sysvmsg -+ -+fi - -- ac_extra= -+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -+ if test "$php_cv_libxml_build_works" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBXML 1 -+EOF - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYSVMSG_SHARED=no -- -+ fi -+ -+ if test "$PHP_XML" = "no"; then -+ - -- case ext/sysvmsg in -+ case ext/xml in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -94891,7 +99325,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in sysvmsg.c; do -+ for ac_src in compat.c; do - - IFS=. - set $ac_src -@@ -94901,10 +99335,10 @@ EOF - 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" ;; -+ *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - cat >>Makefile.objects<>Makefile.objects<" 1>&2; exit 1; } + - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" -- -- cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&2; exit 1; } fi -+ +- ;; +- esac + + + if test "$EXPAT_DIR/include" != "/usr/include"; then + @@ -48841,23 +48807,14 @@ + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" - fi ++ fi -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_SYSVMSG_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- -- -- case ext/sysvmsg in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ + +-else +- echo "$ac_t""no" 1>&6 + 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" @@ -48870,43 +48827,18 @@ + + fi -- 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 +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_sybtcl_netg_errstr +- + fi - ++ + - -- old_IFS=$IFS -- for ac_src in sysvmsg.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS ++ + if test "$ext_shared" = "yes"; then + WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD" + if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -- 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</dev/null ; then @@ -48918,37 +48850,23 @@ + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" + fi - -- EXT_STATIC="$EXT_STATIC sysvmsg" -- ;; -- *) ++ + + if test "$ext_shared" = "yes"; then + WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" + test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" + else - - -- case ext/sysvmsg in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac ++ +- case sybtcl in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" +- else ++ + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- -- 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 sysvmsg.c; do ++ + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" @@ -48956,38 +48874,18 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ + fi - -- 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<&6 --echo "configure:95166: 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" -- PHP_SYSVSEM=$enableval --else ++ + fi - -- PHP_SYSVSEM=no -- test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL -- --fi -- ++ + + case expat in -+ c|c_r|pthread*) ;; -+ *) + c|c_r|pthread*) ;; + *) +- LIBS="-lsybtcl $LIBS" + LIBS="-lexpat $LIBS" -+ ;; -+ esac + ;; + esac --ext_output="yes, shared" --ext_shared=yes --case $PHP_SYSVSEM in --shared,*) -- PHP_SYSVSEM=`echo "$PHP_SYSVSEM"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SYSVSEM=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac +- fi +- ;; +- esac +- +- +-fi + fi - --echo "$ac_t""$ext_output" 1>&6 - ++ ++ + cat >> confdefs.h <<\EOF +#define HAVE_LIBEXPAT 1 +EOF - ++ + fi - ++ + cat >> confdefs.h <<\EOF +#define HAVE_WDDX 1 +EOF --if test "$PHP_SYSVSEM" != "no"; then -- -- ext_builddir=ext/sysvsem -- ext_srcdir=$abs_srcdir/ext/sysvsem -+ + + ext_builddir=ext/wddx + ext_srcdir=$abs_srcdir/ext/wddx - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYSVSEM_SHARED=no ++ ++ ac_extra= ++ ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_WDDX_SHARED=no +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff="-L$SYBASE_CT_LIBDIR" -- case ext/sysvsem in +- save_ext_shared=$ext_shared +- ext_shared=yes + case ext/wddx in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac ++ esac +- for ac_i in $ac_stuff; do +- case $ac_i in +- -pthread) +- if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -pthread" +- else +- -@@ -95231,7 +99543,7 @@ if test "$PHP_SYSVSEM" != "no"; then - - - old_IFS=$IFS -- for ac_src in sysvsem.c; do +- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ 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 wddx.c; do - IFS=. - set $ac_src -@@ -95254,18 +99566,18 @@ EOF - done - +- 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 ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- EXT_STATIC="$EXT_STATIC sysvsem" +- fi +- ;; +- -l*) +- ac_ii=`echo $ac_i|cut -c 3-` ++ 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<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h </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\"`" ++EOF ++ ++ ;; ++ esac ++ cat >> confdefs.h <&6 +-echo "configure:94216: 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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-linsck $LIBS" +-cat > conftest.$ac_ext <>Makefile.objects<&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" ++ done + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++ + EXT_STATIC="$EXT_STATIC wddx" - ;; - *) - ++ ;; ++ *) ++ -- case ext/sysvsem in +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- + case ext/wddx in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac ++ esac +- case insck in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" +- else +- -@@ -95455,7 +99767,7 @@ EOF +- case insck in +- c|c_r|pthread*) ;; +- *) +- LIBS="-linsck $LIBS" +- ;; +- esac +- + +- fi +- ;; +- 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 sysvsem.c; do ++ old_IFS=$IFS + for ac_src in wddx.c; do - IFS=. - set $ac_src -@@ -95480,7 +99792,7 @@ EOF +-else +- echo "$ac_t""no" 1>&6 ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - ;; - esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_insck_insck__getVdate +- +- +-fi ++ 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 + +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff="-L$SYBASE_CT_LIBDIR" +- +- 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 ++ cat >>Makefile.objects</dev/null ; then +- ai_p=$ac_ii +- else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ if test "$ext_builddir" = "."; then + PHP_PECL_EXTENSION=wddx - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++ fi -- cat >> confdefs.h <<\EOF --#define HAVE_SYSVSEM 1 --EOF -+ +- +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else +- + + am_i_shared=$PHP_WDDX_SHARED + is_it_shared=$PHP_LIBXML_SHARED + is_it_enabled=$PHP_LIBXML @@ -49355,33 +49458,99 @@ +but you've either not enabled libxml, or have disabled it. +" 1>&2; exit 1; } + 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 + PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" -- echo $ac_n "checking for union semun""... $ac_c" 1>&6 --echo "configure:95504: checking for union semun" >&5 --if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then +fi -+ -+ -+ + +- fi +- +- fi + +- ;; +- esac +- done + +- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 +-echo "configure:94383: 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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-linsck $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 -+echo "configure:99840: checking whether to enable XML support" >&5 ++echo "configure:100162: 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" + PHP_XML=$enableval -+else + 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" + + PHP_XML=yes + test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL -+ -+fi -+ -+ + + 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 +- +- +- case insck in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case insck in +- c|c_r|pthread*) ;; +- *) +- LIBS="-linsck $LIBS" +- ;; +- esac + + +- fi +- ;; +- esac + +ext_output="yes, shared" +ext_shared=yes @@ -49401,61 +49570,139 @@ + ext_shared=no + ;; +esac -+ -+ -+ + + +- +-else +- echo "$ac_t""no" 1>&6 + +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_insck_bsd_tcp +- +echo "$ac_t""$ext_output" 1>&6 + + + + +if test -z "$PHP_LIBXML_DIR"; then -+ + +-fi +php_with_libxml_dir=no -+ + +- else +- +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:99885: checking libxml2 install dir" >&5 ++echo "configure:100207: 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" + PHP_LIBXML_DIR=$withval +else -+ + +- case cs in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" +- else +- + PHP_LIBXML_DIR=no -+ -+ + +- case cs in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lcs $LIBS" +- ;; +- esac + +fi -+ -+ + +- fi +- ;; +- esac + +ext_output=$PHP_LIBXML_DIR +echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ + +- +- +- case ct in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case ct in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lct $LIBS" +- ;; +- esac + + +- fi +- ;; +- esac +fi -+ -+ + + +- +php_with_libexpat_dir=no + +echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 -+echo "configure:99909: checking libexpat install dir" >&5 ++echo "configure:100231: 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" + PHP_LIBEXPAT_DIR=$withval +else -+ + +- case comn in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" +- else +- + PHP_LIBEXPAT_DIR=no -+ -+ + +- case comn in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lcomn $LIBS" +- ;; +- esac + +fi -+ -+ + +- fi +- ;; +- esac + +ext_output=$PHP_LIBEXPAT_DIR +echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ + +- +- +- case intl in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case intl in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lintl $LIBS" +- ;; +- esac + + + +if test "$PHP_XML" != "no"; then + @@ -49467,7 +49714,7 @@ + + +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:99938: checking for xml2-config path" >&5 ++echo "configure:100260: 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 @@ -49476,11 +49723,27 @@ + if test -x "$i/bin/xml2-config"; then + ac_cv_php_xml2_config_path="$i/bin/xml2-config" + break -+ fi + fi +- ;; +- esac + done -+ + +fi -+ + +- +- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" +- echo "$ac_t""Sybase32 default: $SYBASE_CT_LIBS" 1>&6 +- +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- $SYBASE_CT_LIBS +- " +- +- save_ext_shared=$ext_shared +- ext_shared=yes +- +- for ac_i in $ac_stuff; do +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 + + if test -x "$ac_cv_php_xml2_config_path"; then @@ -49496,222 +49759,342 @@ + LIBXML_INCS=`$XML2_CONFIG --cflags` + + for ac_i in $LIBXML_LIBS; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then + case $ac_i in + -pthread) + if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -pthread" + XML_SHARED_LIBADD="$XML_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 + else + + +@@ -94582,7 +100310,7 @@ fi + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then +- LDFLAGS="$LDFLAGS -l$ac_ii" + XML_SHARED_LIBADD="$XML_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 + else + + +@@ -94617,8 +100345,8 @@ fi + + + if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" + test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_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 -+ -+ -+ for ac_i in $LIBXML_INCS; 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 -+ -+ -+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:100096: 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 -+ -+ -+ old_LIBS=$LIBS -+ LIBS=" -+ $XML_SHARED_LIBADD -+ $LIBS" -+ if test "$cross_compiling" = yes; then -+ -+ LIBS=$old_LIBS -+ -+else - cat > conftest.$ac_ext < --#include --#include -- +- echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 +-echo "configure:94649: 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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-ltcl $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +-EOF +-if { (eval echo configure:94668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -+if { (eval echo configure:100123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ LIBS=$old_LIBS -+ -+ php_cv_libxml_build_works=yes -+ - -- php_cv_semun=yes -- - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 - rm -rf conftest* -+ rm -fr conftest* -+ -+ LIBS=$old_LIBS -+ -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -+ - -- php_cv_semun=no -- - fi +- eval "ac_cv_lib_$ac_lib_var=no" +-fi -rm -f conftest* -- -+rm -fr conftest* - fi - --echo "$ac_t""$php_cv_semun" 1>&6 -- if test "$php_cv_semun" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_SEMUN 1 --EOF +-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 +- +- +- +- case tcl in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case tcl in +- c|c_r|pthread*) ;; +- *) +- LIBS="-ltcl $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- +- +- +-else +- echo "$ac_t""no" 1>&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_tcl_netg_errstr +- +- +- +- case sybtcl in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" +- else + +- +- case sybtcl in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lsybtcl $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- +- +- +-fi +- +- +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff="-L$SYBASE_CT_LIBDIR" +- +- save_ext_shared=$ext_shared +- ext_shared=yes +- +- for ac_i in $ac_stuff; do ++ for ac_i in $LIBXML_INCS; 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*) ++ -I*) + ac_ii=`echo $ac_i|cut -c 3-` + +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ if test "$ac_ii" != "/usr/include"; then + + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii +@@ -94810,176 +100391,187 @@ fi + fi -- else -- cat >> confdefs.h <<\EOF --#define HAVE_SEMUN 0 -+ + +- if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else +- +- + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" ++ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "LIBPATH$unique=set" ++ eval "INCLUDEPATH$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 +- +- ++ if test ""; then ++ INCLUDES="-I$ai_p $INCLUDES" ++ else ++ INCLUDES="$INCLUDES -I$ai_p" + fi + + fi + ++ fi ++ + ;; + esac + done + +- echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 +-echo "configure:94843: 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 "checking whether libxml build works""... $ac_c" 1>&6 ++echo "configure:100418: 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 +- ac_save_LIBS="$LIBS" +-LIBS="-linsck $LIBS" +-cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" ++if { (eval echo configure:100445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then ++ ++ LIBS=$old_LIBS ++ ++ php_cv_libxml_build_works=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 ++ rm -fr conftest* + +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared ++ LIBS=$old_LIBS + ++ echo "$ac_t""no" 1>&6 ++ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } ++ + +- case insck in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" +- else ++fi ++rm -fr conftest* +fi + ++ + +- +- case insck in +- c|c_r|pthread*) ;; +- *) +- LIBS="-linsck $LIBS" +- ;; +- esac ++fi + +echo "$ac_t""$php_cv_libxml_build_works" 1>&6 + if test "$php_cv_libxml_build_works" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_LIBXML 1 - EOF ++EOF -- fi --fi + fi + + xml_extra_sources="compat.c" @@ -49737,14 +50120,19 @@ + + else + { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } -+ fi + fi +- ;; +- esac +- +else + { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } + + fi + fi -+ + +-else +- echo "$ac_t""no" 1>&6 + if test "$PHP_LIBEXPAT_DIR" != "no"; then + for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do + if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then @@ -49752,13 +50140,17 @@ + break + fi + done - ++ + if test -z "$EXPAT_DIR"; then + { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } + fi --php_enable_sysvshm=no -+ +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_insck_insck__getVdate + +- +-fi + if test "$EXPAT_DIR/include" != "/usr/include"; then + + if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then @@ -49771,78 +50163,210 @@ + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" + fi --echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 --echo "configure:95556: 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" -- PHP_SYSVSHM=$enableval --else -+ -+ + +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff="-L$SYBASE_CT_LIBDIR" +- +- 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'` + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ + +- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then + if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "EXTRA_LDFLAGS$unique=set" +- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" +- fi +- + eval "INCLUDEPATH$unique=set" + + if test ""; then + INCLUDES="-I$ai_p $INCLUDES" + else + INCLUDES="$INCLUDES -I$ai_p" -+ 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 -+ + +- fi +- ;; +- esac + fi -+ + + -+ + +- ;; +- -L*) +- ac_ii=`echo $ac_i|cut -c 3-` + if test "$ext_shared" = "yes"; then + XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD" + if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -+ + +- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then + if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ + +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii + if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$EXPAT_DIR/$PHP_LIBDIR -+ else -+ + else + +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then + fi + + + if test "$ext_shared" = "yes"; then +- LDFLAGS="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" + test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_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 -+ -+ + else + + +@@ -94997,189 +100589,84 @@ fi + fi + + +- fi +- +- fi +- +- ;; +- esac +- done +- +- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 +-echo "configure:95010: 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 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-linsck $LIBS" +-cat > conftest.$ac_ext <&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 +- +- +- case insck in +- c|c_r|pthread*) ;; +- *) +- if test "$ext_shared" = "yes"; then +- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" +- else +- +- +- case insck in +- c|c_r|pthread*) ;; +- *) +- LIBS="-linsck $LIBS" +- ;; +- esac +- +- +- fi +- ;; +- esac +- +- +- +-else +- echo "$ac_t""no" 1>&6 +- +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_insck_bsd_tcp +- +- +-fi +- +- fi +-fi +- +- +- +-php_enable_sysvmsg=no + fi + + fi -+ + +-echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6 +-echo "configure:95089: 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" +- PHP_SYSVMSG=$enableval +-else +- +- PHP_SYSVMSG=no +- test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL + fi + else + -+ + +-fi + if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then + + if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then @@ -49856,7 +50380,7 @@ + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" + fi -+ + + + + @@ -49870,23 +50394,18 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" - -- PHP_SYSVSHM=no -- test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL -- --fi -- ++ + fi -ext_output="yes, shared" -ext_shared=yes --case $PHP_SYSVSHM in +-case $PHP_SYSVMSG in -shared,*) -- PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'` +- PHP_SYSVMSG=`echo "$PHP_SYSVMSG"|$SED 's/^shared,//'` - ;; -shared) -- PHP_SYSVSHM=yes +- PHP_SYSVMSG=yes - ;; -no) - ext_output=no @@ -49917,77 +50436,112 @@ + fi --if test "$PHP_SYSVSHM" != "no"; then -- cat >> confdefs.h <<\EOF --#define HAVE_SYSVSHM 1 +-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:95132: 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 < + cat >> confdefs.h <<\EOF +#define HAVE_LIBEXPAT 1 EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:95142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- : +-else +- echo "$ac_t""no" 1>&6 +-{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; } +- +-fi +- +- cat >> confdefs.h <<\EOF +-#define HAVE_SYSVMSG 1 +-EOF + fi -+ + -- ext_builddir=ext/sysvshm -- ext_srcdir=$abs_srcdir/ext/sysvshm +- ext_builddir=ext/sysvmsg +- ext_srcdir=$abs_srcdir/ext/sysvmsg + ext_builddir=ext/xml + ext_srcdir=$abs_srcdir/ext/xml ac_extra= if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYSVSHM_SHARED=no +- PHP_SYSVMSG_SHARED=no + PHP_XML_SHARED=no -- case ext/sysvshm in +- case ext/sysvmsg in + case ext/xml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -95625,7 +100359,7 @@ EOF +@@ -95194,7 +100681,7 @@ EOF old_IFS=$IFS -- for ac_src in sysvshm.c; do +- for ac_src in sysvmsg.c; do + for ac_src in xml.c $xml_extra_sources; do IFS=. set $ac_src -@@ -95648,18 +100382,18 @@ EOF +@@ -95217,18 +100704,18 @@ EOF done -- EXT_STATIC="$EXT_STATIC sysvshm" +- EXT_STATIC="$EXT_STATIC sysvmsg" + EXT_STATIC="$EXT_STATIC xml" if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" +- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg" + EXT_CLI_STATIC="$EXT_CLI_STATIC xml" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SYSVSHM_SHARED=yes +- PHP_SYSVMSG_SHARED=yes + PHP_XML_SHARED=yes -- case ext/sysvshm in +- case ext/sysvmsg in + case ext/xml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -95674,14 +100408,14 @@ EOF +@@ -95243,14 +100730,14 @@ EOF old_IFS=$IFS -- for ac_src in sysvshm.c; do +- for ac_src in sysvmsg.c; do + for ac_src in xml.c $xml_extra_sources; do IFS=. @@ -49995,98 +50549,98 @@ ac_obj=$1 IFS=$old_IFS -- shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo" +- shared_objects_sysvmsg="$shared_objects_sysvmsg $ac_bdir$ac_obj.lo" + shared_objects_xml="$shared_objects_xml $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" ;; -@@ -95704,31 +100438,31 @@ EOF +@@ -95273,31 +100760,31 @@ EOF 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'/phpsysvshm.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvshm.so '$ext_builddir'/phpsysvshm.so' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvmsg.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvmsg.so '$ext_builddir'/phpsysvmsg.so' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxml.so '$ext_builddir'/phpxml.so' ;; *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_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSHM, 3)_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVMSG, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)' ;; *) 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_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvshm.$suffix" +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvmsg.$suffix" + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxml.$suffix" else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix" +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvmsg.$suffix" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix" fi -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 --echo "configure:95900: checking for TIDY support" >&5 --# Check whether --with-tidy or --without-tidy was given. --if test "${with_tidy+set}" = set; then -- withval="$with_tidy" -- PHP_TIDY=$withval +-echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 +-echo "configure:95469: 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" +- PHP_SYSVSEM=$enableval +echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 -+echo "configure:100659: checking whether to enable XMLReader support" >&5 ++echo "configure:100981: 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" + PHP_XMLREADER=$enableval else -- PHP_TIDY=no -- test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL +- PHP_SYSVSEM=no +- test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL + PHP_XMLREADER=yes + test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL fi -@@ -95912,12 +100671,12 @@ fi +@@ -95481,12 +100993,12 @@ fi ext_output="yes, shared" ext_shared=yes --case $PHP_TIDY in +-case $PHP_SYSVSEM in +case $PHP_XMLREADER in shared,*) -- PHP_TIDY=`echo "$PHP_TIDY"|$SED 's/^shared,//'` +- PHP_SYSVSEM=`echo "$PHP_SYSVSEM"|$SED 's/^shared,//'` + PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'` ;; shared) -- PHP_TIDY=yes +- PHP_SYSVSEM=yes + PHP_XMLREADER=yes ;; no) ext_output=no -@@ -95936,171 +100695,72 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -95505,21 +101017,277 @@ echo "$ac_t""$ext_output" 1>&6 --if test "$PHP_TIDY" != "no"; then -- -- if test "$PHP_TIDY" != "yes"; then -- TIDY_SEARCH_DIRS=$PHP_TIDY -- else -- TIDY_SEARCH_DIRS="/usr/local /usr" -- fi -- -- for i in $TIDY_SEARCH_DIRS; do -- if test -f $i/include/tidy/tidy.h; then -- TIDY_DIR=$i -- TIDY_INCDIR=$i/include/tidy -- elif test -f $i/include/tidy.h; then -- TIDY_DIR=$i -- TIDY_INCDIR=$i/include -- fi -- done -- -- if test -z "$TIDY_DIR"; then -- { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; } -- fi -- -- TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR -- -- -- -- if test "$ext_shared" = "yes"; then -- TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD" -- if test -n "$TIDY_LIBDIR"; then -- -- if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then -- -- if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$TIDY_LIBDIR -- else -- -- ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_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" +-if test "$PHP_SYSVSEM" != "no"; then +- +- ext_builddir=ext/sysvsem +- ext_srcdir=$abs_srcdir/ext/sysvsem +if test -z "$PHP_LIBXML_DIR"; then - -- fi -- -- -- fi -- -- fi -- -- fi -- else -- -- -- if test -n "$TIDY_LIBDIR"; then -- -- if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then -- -- if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$TIDY_LIBDIR -- else -- -- ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" -- fi ++ +php_with_libxml_dir=no - -- -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:100704: checking libxml2 install dir" >&5 ++echo "configure:101026: 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" + PHP_LIBXML_DIR=$withval +else - -- 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" ++ + PHP_LIBXML_DIR=no - -- fi -- - -- -- fi ++ ++ +fi - -- fi -- -- -- case tidy in -- c|c_r|pthread*) ;; -- *) -- LIBS="-ltidy $LIBS" -- ;; -- esac - ++ ++ +ext_output=$PHP_LIBXML_DIR +echo "$ac_t""$ext_output" 1>&6 - - - -- fi ++ ++ ++ +fi - ++ +if test "$PHP_XMLREADER" != "no"; then - -- -- if test "$TIDY_INCDIR" != "/usr/include"; then -- -- if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then -- ai_p=$TIDY_INCDIR -- else -- -- ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`" ++ + if test "$PHP_LIBXML" = "no"; then + { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } - fi - -- - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ fi ++ ++ +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:100732: checking for xml2-config path" >&5 ++echo "configure:101054: 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 - -- 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 ++ + for i in $PHP_LIBXML_DIR /usr/local /usr; do + if test -x "$i/bin/xml2-config"; then + ac_cv_php_xml2_config_path="$i/bin/xml2-config" + break + fi + done - -- fi ++ +fi - ++ +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 - -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="" -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do ++ + if test -x "$ac_cv_php_xml2_config_path"; then + XML2_CONFIG="$ac_cv_php_xml2_config_path" + libxml_full_version=`$XML2_CONFIG --version` @@ -50445,42 +50861,93 @@ + LIBXML_INCS=`$XML2_CONFIG --cflags` + + for ac_i in $LIBXML_LIBS; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then + XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread" - else - - -@@ -96122,7 +100782,7 @@ if test "$PHP_TIDY" != "no"; then - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" ++ 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 + XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" - else - - -@@ -96157,8 +100817,8 @@ if test "$PHP_TIDY" != "no"; then - - - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ 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 + XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD" + test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD" - else - - -@@ -96184,77 +100844,128 @@ if test "$PHP_TIDY" != "no"; then - esac - done - -- echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 --echo "configure:96189: 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 ++ 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 ++ + + for ac_i in $LIBXML_INCS; do + case $ac_i in @@ -50523,27 +50990,10 @@ + + + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:100890: checking whether libxml build works" >&5 ++echo "configure:101212: 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 -- ac_save_LIBS="$LIBS" --LIBS="-ltidy $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else + + + old_LIBS=$LIBS @@ -50554,70 +51004,46 @@ + + LIBS=$old_LIBS + - 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" ++else + cat > conftest.$ac_ext <&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared - -- cat >> confdefs.h <<\EOF --#define HAVE_TIDYOPTGETDOC 1 ++ ++ + char xmlInitParser(); + int main() { + xmlInitParser(); + return 0; + } + - EOF -- -+if { (eval echo configure:100917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++EOF ++if { (eval echo configure:101239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then - ++ + LIBS=$old_LIBS + + php_cv_libxml_build_works=yes + - - else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_tidy_tidyOptGetDoc ++ ++else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + + LIBS=$old_LIBS - ++ + echo "$ac_t""no" 1>&6 + { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } + - - fi ++ ++fi +rm -fr conftest* +fi - - ++ ++ + +fi - -- -- ext_builddir=ext/tidy -- ext_srcdir=$abs_srcdir/ext/tidy ++ +echo "$ac_t""$php_cv_libxml_build_works" 1>&6 + if test "$php_cv_libxml_build_works" = "yes"; then + cat >> confdefs.h <<\EOF @@ -50637,59 +51063,59 @@ ac_extra= if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_TIDY_SHARED=no +- PHP_SYSVSEM_SHARED=no + PHP_XMLREADER_SHARED=no -- case ext/tidy in +- case ext/sysvsem in + case ext/xmlreader in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -96269,7 +100980,7 @@ fi +@@ -95534,7 +101302,7 @@ if test "$PHP_SYSVSEM" != "no"; then old_IFS=$IFS -- for ac_src in tidy.c; do +- for ac_src in sysvsem.c; do + for ac_src in php_xmlreader.c; do IFS=. set $ac_src -@@ -96292,18 +101003,18 @@ EOF +@@ -95557,18 +101325,18 @@ EOF done -- EXT_STATIC="$EXT_STATIC tidy" +- EXT_STATIC="$EXT_STATIC sysvsem" + EXT_STATIC="$EXT_STATIC xmlreader" if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" +- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_TIDY_SHARED=yes +- PHP_SYSVSEM_SHARED=yes + PHP_XMLREADER_SHARED=yes -- case ext/tidy in +- case ext/sysvsem in + case ext/xmlreader in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -96318,14 +101029,14 @@ EOF +@@ -95583,14 +101351,14 @@ EOF old_IFS=$IFS -- for ac_src in tidy.c; do +- for ac_src in sysvsem.c; do + for ac_src in php_xmlreader.c; do IFS=. @@ -50697,98 +51123,98 @@ ac_obj=$1 IFS=$old_IFS -- shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo" +- shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo" + shared_objects_xmlreader="$shared_objects_xmlreader $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" ;; -@@ -96348,31 +101059,31 @@ EOF +@@ -95613,31 +101381,31 @@ EOF 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'/phptidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptidy.so '$ext_builddir'/phptidy.so' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvsem.so '$ext_builddir'/phpsysvsem.so' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlreader.so '$ext_builddir'/phpxmlreader.so' ;; *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_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 3)_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)' ;; *) 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_tidy) $(PHPTIDY_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptidy.$suffix" +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvsem.$suffix" + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlreader.$suffix" else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix" +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix" fi -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <<\EOF +-#define HAVE_SYSVSEM 1 +-EOF +- +- echo $ac_n "checking for union semun""... $ac_c" 1>&6 +-echo "configure:95807: 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 <&2; exit 1; } + fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD" ++ + + PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD" -- cat >> confdefs.h <<\EOF --#define HAVE_TIDY 1 +-#include +-#include +-#include +- +-int main() { +-union semun x; +-; return 0; } -EOF -+ +-if { (eval echo configure:95823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* + +- php_cv_semun=yes +- +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* + else + { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } + fi +else + { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } -+ + +- php_cv_semun=no +- +-fi +-rm -f conftest* +- + fi - ++ fi +-echo "$ac_t""$php_cv_semun" 1>&6 +- if test "$php_cv_semun" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_SEMUN 1 +-EOF +- else +- cat >> confdefs.h <<\EOF +-#define HAVE_SEMUN 0 +-EOF +# Local macros for automake & autoconf +- fi +-fi --php_enable_tokenizer=yes --echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 --echo "configure:96552: 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" -- PHP_TOKENIZER=$enableval -+ -+ + +-php_enable_sysvshm=no + +-echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 +-echo "configure:95859: 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" +- PHP_SYSVSHM=$enableval + + + @@ -50932,124 +51398,86 @@ +php_with_xmlrpc=no + +echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6 -+echo "configure:101299: checking for XMLRPC-EPI support" >&5 ++echo "configure:101621: 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" + PHP_XMLRPC=$withval else -- PHP_TOKENIZER=yes -- test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL +- PHP_SYSVSHM=no +- test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL + PHP_XMLRPC=no + test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL fi -@@ -96564,12 +101311,12 @@ fi +@@ -95871,12 +101633,12 @@ fi ext_output="yes, shared" ext_shared=yes --case $PHP_TOKENIZER in +-case $PHP_SYSVSHM in +case $PHP_XMLRPC in shared,*) -- PHP_TOKENIZER=`echo "$PHP_TOKENIZER"|$SED 's/^shared,//'` +- PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'` + PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'` ;; shared) -- PHP_TOKENIZER=yes +- PHP_SYSVSHM=yes + PHP_XMLRPC=yes ;; no) ext_output=no -@@ -96588,199 +101335,341 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -95895,203 +101657,341 @@ echo "$ac_t""$ext_output" 1>&6 --if test "$PHP_TOKENIZER" != "no"; then +-if test "$PHP_SYSVSHM" != "no"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_SYSVSHM 1 +-EOF +if test -z "$PHP_LIBXML_DIR"; then - -- ext_builddir=ext/tokenizer -- ext_srcdir=$abs_srcdir/ext/tokenizer -- -- ac_extra= ++ +php_with_libxml_dir=no -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_TOKENIZER_SHARED=no -- -- -- case ext/tokenizer in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac +echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:101344: checking libxml2 install dir" >&5 ++echo "configure:101666: 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" + PHP_LIBXML_DIR=$withval +else - ++ + PHP_LIBXML_DIR=no +- ext_builddir=ext/sysvshm +- ext_srcdir=$abs_srcdir/ext/sysvshm -- 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 +- ac_extra= +fi - -- old_IFS=$IFS -- for ac_src in tokenizer.c tokenizer_data.c; do +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_SYSVSHM_SHARED=no +- - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" +- case ext/sysvshm in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac ++ +ext_output=$PHP_LIBXML_DIR +echo "$ac_t""$ext_output" 1>&6 - -- 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<&6 -+echo "configure:101368: checking libexpat dir for XMLRPC-EPI" >&5 ++echo "configure:101690: 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" @@ -51059,18 +51487,18 @@ + PHP_LIBEXPAT_DIR=no -- 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 +- 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 +fi - old_IFS=$IFS -- for ac_src in tokenizer.c tokenizer_data.c; do +- for ac_src in sysvshm.c; do +ext_output=$PHP_LIBEXPAT_DIR +echo "$ac_t""$ext_output" 1>&6 + @@ -51081,7 +51509,7 @@ +php_with_iconv_dir=no + +echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6 -+echo "configure:101391: checking iconv dir for XMLRPC-EPI" >&5 ++echo "configure:101713: 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" @@ -51095,7 +51523,7 @@ - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo" +- 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" ;; @@ -51142,17 +51570,24 @@ + cat >> confdefs.h <<\EOF +#define HAVE_XMLRPC 1 EOF -+ -+ +- done + + +- EXT_STATIC="$EXT_STATIC sysvshm" +- if test "$ext_shared" != "nocli"; then +- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" + if test "$PHP_LIBEXPAT_DIR" = "no"; then + + if test "$PHP_LIBXML" = "no"; then + { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ fi + fi +- else +- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then +- PHP_SYSVSHM_SHARED=yes + + +echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:101447: checking for xml2-config path" >&5 ++echo "configure:101769: 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 @@ -51162,27 +51597,10 @@ + ac_cv_php_xml2_config_path="$i/bin/xml2-config" + break + fi - done - -- case $host_alias in -- *netware*) -- -- install_modules="install-modules" ++ done ++ +fi - -- 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'/phptokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptokenizer.so '$ext_builddir'/phptokenizer.so' -- ;; -- *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_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 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_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD)' -- ;; ++ +echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 + + if test -x "$ac_cv_php_xml2_config_path"; then @@ -51196,7 +51614,12 @@ + if test "$LIBXML_VERSION" -ge "2006011"; then + LIBXML_LIBS=`$XML2_CONFIG --libs` + LIBXML_INCS=`$XML2_CONFIG --cflags` -+ + +- case ext/sysvshm in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac + for ac_i in $LIBXML_LIBS; do + case $ac_i in + -pthread) @@ -51204,15 +51627,22 @@ + XMLRPC_SHARED_LIBADD="$XMLRPC_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 -+ + +- 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 + fi + ;; + -l*) @@ -51232,11 +51662,16 @@ + *) + LIBS="$LIBS -l$ac_ii" + ;; - esac ++ esac -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptokenizer.$suffix" -+ + +- old_IFS=$IFS +- for ac_src in sysvshm.c; do +- +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS + fi + ;; + esac @@ -51245,28 +51680,33 @@ + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` -+ + +- shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo" + 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 -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix" ++ else + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -+ ++ fi + +- 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 + + if test "$ext_shared" = "yes"; then + XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" + test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" + else + - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" ++ + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + @@ -51280,25 +51720,40 @@ + + fi -- cat >>Makefile.objects<>Makefile.objects</dev/null ; then + ai_p=$ac_ii -+ else + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix" + + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" + fi - -- 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'/tokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(TOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/tokenizer.so '$ext_builddir'/tokenizer.so' -- ;; -- *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_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TOKENIZER, 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_tokenizer) $(TOKENIZER_SHARED_LIBADD)' -- ;; -- esac ++ + + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` @@ -51345,26 +51787,55 @@ + INCLUDES="$INCLUDES -I$ai_p" + fi + + fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" +- +- cat >>Makefile.objects<&6 -+echo "configure:101605: checking whether libxml build works" >&5 ++echo "configure:101927: 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 -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" + + old_LIBS=$LIBS + LIBS=" @@ -51376,12 +51847,12 @@ + +else + cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:101954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + LIBS=$old_LIBS @@ -51413,7 +51884,7 @@ +rm -fr conftest* +fi --$ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES) +-$ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES) - $link_cmd -EOF @@ -51423,7 +51894,7 @@ - ;; - esac - cat >> confdefs.h <&6 + if test "$php_cv_libxml_build_works" = "yes"; then + cat >> confdefs.h <<\EOF @@ -51434,7 +51905,7 @@ - fi - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_TOKENIZER_SHARED=no +- PHP_SYSVSHM_SHARED=no - case "$PHP_SAPI" in - cgi|embed) + fi @@ -51442,26 +51913,26 @@ + if test "$PHP_XML" = "no"; then -- case ext/tokenizer in +- case ext/sysvshm in + case ext/xml in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -96795,7 +101684,7 @@ EOF +@@ -96106,7 +102006,7 @@ EOF old_IFS=$IFS -- for ac_src in tokenizer.c tokenizer_data.c; do +- for ac_src in sysvshm.c; do + for ac_src in compat.c; do IFS=. set $ac_src -@@ -96805,10 +101694,10 @@ EOF +@@ -96116,10 +102016,10 @@ EOF PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" case $ac_src in @@ -51476,19 +51947,19 @@ esac cat >>Makefile.objects<" 1>&2; exit 1; } + + fi - ++ + else + testval=no + for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do @@ -51519,15 +51990,15 @@ +#define HAVE_LIBEXPAT 1 +EOF ++ + - old_IFS=$IFS -- for ac_src in tokenizer.c tokenizer_data.c; do +- for ac_src in sysvshm.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS -+ -+ + if test "$ext_shared" = "yes"; then + XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD" + if test -n "$i/$PHP_LIBDIR"; then @@ -51580,14 +52051,14 @@ + fi + + fi -+ -+ fi -+ else -+ - ;; - esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" +- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" ++ fi ++ else ++ ++ + if test -n "$i/$PHP_LIBDIR"; then + + if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then @@ -51621,13 +52092,13 @@ - if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=tokenizer +- PHP_PECL_EXTENSION=sysvshm - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + fi -+ -+ fi -+ + + fi ++ + + case expat in + c|c_r|pthread*) ;; @@ -51636,11 +52107,20 @@ + ;; + esac -+ -+ -+ +-fi + + + +-php_with_tidy=no + fi -+ + +-echo $ac_n "checking for TIDY support""... $ac_c" 1>&6 +-echo "configure:96203: checking for TIDY support" >&5 +-# Check whether --with-tidy or --without-tidy was given. +-if test "${with_tidy+set}" = set; then +- withval="$with_tidy" +- PHP_TIDY=$withval +-else + + + if test "$i/include" != "/usr/include"; then @@ -51653,14 +52133,12 @@ + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$i/include\"`" - fi - ++ fi ++ + -- src=$ext_srcdir/Makefile.frag -- ac_srcdir=$ext_srcdir -- ac_builddir=$ext_builddir -- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments +- PHP_TIDY=no +- test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" @@ -51674,21 +52152,40 @@ + fi + + fi -+ + +-fi + fi -+ + + testval=yes + break + fi + done -+ + + if test "$testval" = "no"; then + { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir= (deprecated!)" 1>&2; exit 1; } + fi + fi -+ + +-ext_output="yes, shared" +-ext_shared=yes +-case $PHP_TIDY in +-shared,*) +- PHP_TIDY=`echo "$PHP_TIDY"|$SED 's/^shared,//'` +- ;; +-shared) +- PHP_TIDY=yes +- ;; +-no) +- ext_output=no +- ext_shared=no +- ;; +-*) +- ext_output=yes +- ext_shared=no +- ;; +-esac + if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then -+ + + if test "$PHP_ICONV_DIR" != "no"; then + PHP_ICONV=$PHP_ICONV_DIR + fi @@ -51700,10 +52197,11 @@ + + found_iconv=no + unset ICONV_DIR -+ + + # Create the directories for a VPATH build: + $php_shtool mkdir -p ext/iconv -+ + +-echo "$ac_t""$ext_output" 1>&6 + echo > ext/iconv/php_have_bsd_iconv.h + echo > ext/iconv/php_have_ibm_iconv.h + echo > ext/iconv/php_have_glibc_iconv.h @@ -51713,15 +52211,15 @@ + echo > ext/iconv/php_iconv_aliased_libiconv.h + echo > ext/iconv/php_php_iconv_h_path.h + echo > ext/iconv/php_iconv_supports_errno.h -+ + + if test "$PHP_ICONV" = "yes"; then + echo $ac_n "checking for iconv""... $ac_c" 1>&6 -+echo "configure:101901: checking for iconv" >&5 ++echo "configure:102223: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:102251: \"$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 @@ -51754,8 +52253,13 @@ + eval "ac_cv_func_iconv=no" +fi +rm -f conftest* - fi ++fi +- if test "$PHP_TIDY" != "yes"; then +- TIDY_SEARCH_DIRS=$PHP_TIDY +- else +- TIDY_SEARCH_DIRS="/usr/local /usr" +- fi +if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then + echo "$ac_t""yes" 1>&6 + @@ -51763,14 +52267,23 @@ + +else + echo "$ac_t""no" 1>&6 -+ + +- for i in $TIDY_SEARCH_DIRS; do +- if test -f $i/include/tidy/tidy.h; then +- TIDY_DIR=$i +- TIDY_INCDIR=$i/include/tidy +- elif test -f $i/include/tidy.h; then +- TIDY_DIR=$i +- TIDY_INCDIR=$i/include +- fi +- done + echo $ac_n "checking for libiconv""... $ac_c" 1>&6 -+echo "configure:101950: checking for libiconv" >&5 ++echo "configure:102272: 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 <&2; exit 1; } +- fi +int main() { --php_enable_wddx=no +- TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR +/* 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. */ @@ -51791,19 +52307,13 @@ +#else +libiconv(); +#endif - --echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 --echo "configure:96898: 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" -- PHP_WDDX=$enableval ++ +; return 0; } +EOF -+if { (eval echo configure:101978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:102300: \"$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 ++else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* @@ -51811,56 +52321,49 @@ +fi +rm -f conftest* +fi -+ + +if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then + echo "$ac_t""yes" 1>&6 -- PHP_WDDX=no -- test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL + + echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h -+ + +- if test "$ext_shared" = "yes"; then +- TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD" +- if test -n "$TIDY_LIBDIR"; then + cat >> confdefs.h <<\EOF +#define HAVE_LIBICONV 1 +EOF - ++ + found_iconv=yes -+ + +- if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then +- +- if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$TIDY_LIBDIR +- else +- +- ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +else + echo "$ac_t""no" 1>&6 - fi - -+ +fi ++ + +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" ++fi ++ + fi -+ fi - --ext_output="yes, shared" --ext_shared=yes --case $PHP_WDDX in --shared,*) -- PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_WDDX=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac +- + if test "$found_iconv" = "no"; then - ++ + for i in $PHP_ICONV /usr/local /usr; do + if test -r $i/include/giconv.h; then + cat >> confdefs.h <<\EOF +#define HAVE_GICONV_H 1 +EOF - ++ + ICONV_DIR=$i + iconv_lib_name=giconv + break @@ -51870,8 +52373,7 @@ + break + fi + done - --echo "$ac_t""$ext_output" 1>&6 ++ + if test -z "$ICONV_DIR"; then + { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=" 1>&2; exit 1; } + fi @@ -51891,20 +52393,34 @@ + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) -+ if test "$ext_shared" = "yes"; then + if test "$ext_shared" = "yes"; then +- TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD" + LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ + else + + + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ + +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then + 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" +- + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi + fi + +- + fi +- +- fi + ;; + -l*) + ac_ii=`echo $ac_i|cut -c 3-` @@ -51924,98 +52440,83 @@ + LIBS="$LIBS -l$ac_ii" + ;; + esac ++ - -+ fi + fi +- else +- + ;; + esac - --if test -z "$PHP_LIBXML_DIR"; then +- if test -n "$TIDY_LIBDIR"; then +- +- if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then ++ + ;; + -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 "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$TIDY_LIBDIR + if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then + ai_p=$ac_ii -+ else -+ + else + +- ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" + ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ + fi + + +- + if test "$ext_shared" = "yes"; then + LDFLAGS="-L$ai_p $LDFLAGS" + test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" + else + --php_with_libxml_dir=no -- --echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:96943: 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" -- PHP_LIBXML_DIR=$withval --else - -- PHP_LIBXML_DIR=no -+ 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 + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +@@ -96341,60 +102443,82 @@ if test "$PHP_TIDY" != "no"; then + fi --fi -- -- --ext_output=$PHP_LIBXML_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -- --fi + fi -+ -+ fi + + fi --php_with_libexpat_dir=no +- fi +- +- +- case tidy in +- c|c_r|pthread*) ;; +- *) +- LIBS="-ltidy $LIBS" +- ;; +- esac +- +- +- + ;; + esac + done --echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 --echo "configure:96967: 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" -- PHP_LIBEXPAT_DIR=$withval +- fi + echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 -+echo "configure:102134: checking for libiconv in -l$iconv_lib_name" >&5 ++echo "configure:102456: 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 - else -- -- PHP_LIBEXPAT_DIR=no -- ++else + ac_save_LIBS="$LIBS" +LIBS="-l$iconv_lib_name $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:102475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -52034,191 +52535,135 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" - fi ++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 -+ + +- if test "$TIDY_INCDIR" != "/usr/include"; then +- +- if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then +- ai_p=$TIDY_INCDIR +- else +- +- ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ + +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`" +- fi + found_iconv=yes + + echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h --ext_output=$PHP_LIBEXPAT_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- +- +- +- 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 + cat >> confdefs.h <<\EOF +#define HAVE_LIBICONV 1 +EOF +- fi + + echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h --if test "$PHP_WDDX" != "no"; then + cat >> confdefs.h <<\EOF +#define ICONV_ALIASED_LIBICONV 1 +EOF -- if test "$PHP_LIBEXPAT_DIR" = "no"; then -- if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi + -+ + +else + echo "$ac_t""no" 1>&6 - ++ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + unset ac_cv_lib_$iconv_lib_name_libiconv - --echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:96995: 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 ++ + -+ save_old_LDFLAGS=$LDFLAGS + save_old_LDFLAGS=$LDFLAGS +- ac_stuff="" + ac_stuff=" + -L$ICONV_DIR/$PHP_LIBDIR + " -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -- --fi -- --echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -- -- if test -x "$ac_cv_php_xml2_config_path"; then -- XML2_CONFIG="$ac_cv_php_xml2_config_path" -- libxml_full_version=`$XML2_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $libxml_full_version -- IFS=$ac_IFS -- LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -- if test "$LIBXML_VERSION" -ge "2006011"; then -- LIBXML_LIBS=`$XML2_CONFIG --libs` -- LIBXML_INCS=`$XML2_CONFIG --cflags` -- -- for ac_i in $LIBXML_LIBS; do -+ 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 -- WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread" -+ LDFLAGS="$LDFLAGS -pthread" - else - - -@@ -97045,7 +102227,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" -+ LDFLAGS="$LDFLAGS -l$ac_ii" - else - - -@@ -97080,8 +102262,123 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + save_ext_shared=$ext_shared + ext_shared=yes +@@ -96487,27 +102611,27 @@ if test "$PHP_TIDY" != "no"; then + esac + done - - if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$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 tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 +-echo "configure:96492: checking for tidyOptGetDoc in -ltidy" >&5 +-ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'` + echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 -+echo "configure:102294: checking for iconv in -l$iconv_lib_name" >&5 ++echo "configure:102616: 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 -+else -+ ac_save_LIBS="$LIBS" + 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="-ltidy $LIBS" +LIBS="-l$iconv_lib_name $LIBS" -+cat > conftest.$ac_ext < conftest.$ac_ext <&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 -+ + ; return 0; } + EOF +-if { (eval echo configure:96511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:102635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -96526,386 +102650,749 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + +- cat >> confdefs.h <<\EOF +-#define HAVE_TIDYOPTGETDOC 1 +-EOF +- +- + found_iconv=yes + -+ -+else -+ echo "$ac_t""no" 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_tidy_tidyOptGetDoc + unset ac_cv_lib_$iconv_lib_name_iconv -+ -+ -+fi -+ + + + fi + + + +fi @@ -52236,7 +52681,7 @@ + + if test -n "$ICONV_DIR"; then + -+ + + if test "$ext_shared" = "yes"; then + XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD" + if test -n "$ICONV_DIR/$PHP_LIBDIR"; then @@ -52252,21 +52697,33 @@ + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" + fi -+ + + + if test "$ext_shared" = "yes"; then + XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" + test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" - else - ++ else ++ -@@ -97099,343 +102396,681 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - fi - - -- fi -- -- fi +- ext_builddir=ext/tidy +- ext_srcdir=$abs_srcdir/ext/tidy ++ ++ 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 + +- ac_extra= + +- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_TIDY_SHARED=no + fi + + fi @@ -52289,10 +52746,15 @@ + ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" + fi + -+ + + -+ -+ + +- case ext/tidy in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" @@ -52302,15 +52764,30 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" -+ + + fi -+ -+ + +- 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 + + + fi -+ + +- old_IFS=$IFS +- for ac_src in tidy.c; do + fi -+ + +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + + case $iconv_lib_name in + c|c_r|pthread*) ;; @@ -52318,14 +52795,37 @@ + LIBS="-l$iconv_lib_name $LIBS" + ;; + esac -+ -+ -+ -+ + +- 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</dev/null ; then @@ -52339,9 +52839,9 @@ + 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" @@ -52353,24 +52853,46 @@ + fi + + fi -+ + +- 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 + fi -+ + + fi + +else + { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; } + + fi -+ + +- old_IFS=$IFS +- for ac_src in tidy.c; do +- +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo" + fi +fi -+ + +- 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 +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:102503: checking for $ac_word" >&5 ++echo "configure:102825: 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 @@ -52396,23 +52918,26 @@ +else + echo "$ac_t""no" 1>&6 +fi -+ + +- cat >>Makefile.objects<&6 -+echo "configure:102531: checking for inline" >&5 ++echo "configure:102853: 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 <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:102867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_inline=$ac_kw; break +else @@ -52450,12 +52975,12 @@ + + +echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -+echo "configure:102583: checking for ANSI C header files" >&5 ++echo "configure:102905: 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 < +#include @@ -52463,7 +52988,7 @@ +#include +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:102596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:102918: \"$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* @@ -52480,7 +53005,7 @@ +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +cat > conftest.$ac_ext < +EOF @@ -52498,10 +53023,11 @@ +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 + EOF +- done +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "free" >/dev/null 2>&1; then + : @@ -52510,16 +53036,34 @@ + ac_cv_header_stdc=no +fi +rm -f conftest* -+ + +- case $host_alias in +- *netware*) +- +- install_modules="install-modules" +fi -+ + +- 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'/phptidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptidy.so '$ext_builddir'/phptidy.so' +- ;; +- *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_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 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_tidy) $(PHPTIDY_SHARED_LIBADD)' +- ;; +- esac +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +if test "$cross_compiling" = yes; then + : +else + cat > conftest.$ac_ext < +#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -52528,9 +53072,16 @@ +int main () { int i; for (i = 0; i < 256; i++) +if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +exit (0); } -+ + +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptidy.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix" +- fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" +EOF -+if { (eval echo configure:102663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:102985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + : +else @@ -52541,68 +53092,38 @@ +fi +rm -fr conftest* +fi -+ + +- cat >>Makefile.objects<&6 +if test $ac_cv_header_stdc = yes; then + cat >> confdefs.h <<\EOF +#define STDC_HEADERS 1 +EOF - -- -- for ac_i in $LIBXML_INCS; 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 ++ +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 +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:102690: checking for $ac_hdr" >&5 ++echo "configure:103012: 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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:102700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:103022: \"$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* @@ -52621,54 +53142,59 @@ + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done +- ;; +- *) +- +- 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'/tidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(TIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/tidy.so '$ext_builddir'/tidy.so' +- ;; +- *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_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TIDY, 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_tidy) $(TIDY_SHARED_LIBADD)' +- ;; +- esac + +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tidy.$suffix" +- else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/tidy.$suffix" - fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" -- ;; -- esac -- done +- cat >>Makefile.objects<&6 --echo "configure:97153: checking whether libxml build works" >&5 --if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -+ -+ +echo $ac_n "checking size of char""... $ac_c" 1>&6 -+echo "configure:102732: checking size of char" >&5 ++echo "configure:103054: 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 -- -- -- old_LIBS=$LIBS -- LIBS=" -- $WDDX_SHARED_LIBADD -- $LIBS" - if test "$cross_compiling" = yes; then -- -- LIBS=$old_LIBS -- ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ if test "$cross_compiling" = yes; then + ac_cv_sizeof_char=1 - else - cat > conftest.$ac_ext < conftest.$ac_ext < +#include +main() @@ -52679,58 +53205,45 @@ + exit(0); +} EOF --if { (eval echo configure:97180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:102752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then -- -- LIBS=$old_LIBS -- -- php_cv_libxml_build_works=yes -- -- ++if { (eval echo configure:103074: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- -- LIBS=$old_LIBS -- -- echo "$ac_t""no" 1>&6 -- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -- -- ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + ac_cv_sizeof_char=0 - fi - rm -fr conftest* - fi ++fi ++rm -fr conftest* ++fi -- -- - fi -- --echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -- if test "$php_cv_libxml_build_works" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBXML 1 +- ;; +- esac +- cat >> confdefs.h <&6 +cat >> confdefs.h <&6 -+echo "configure:102773: checking size of int" >&5 ++echo "configure:103095: 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 @@ -52765,7 +53261,7 @@ + ac_cv_sizeof_int=4 +else + cat > conftest.$ac_ext < +#include @@ -52777,7 +53273,7 @@ + exit(0); +} +EOF -+if { (eval echo configure:102793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:103115: \"$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 @@ -52789,23 +53285,33 @@ +rm -fr conftest* +fi -- cat >>Makefile.objects<&6 +cat >> confdefs.h <>Makefile.objects<&6 -+echo "configure:102813: checking size of long" >&5 ++echo "configure:103135: 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 @@ -52813,7 +53319,7 @@ + ac_cv_sizeof_long=4 +else + cat > conftest.$ac_ext < +#include @@ -52824,8 +53330,9 @@ + fprintf(f, "%d\n", sizeof(long)); + exit(0); +} -+EOF -+if { (eval echo configure:102833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + EOF +- done ++if { (eval echo configure:103155: \"$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 @@ -52837,32 +53344,34 @@ +rm -fr conftest* +fi -- fi -- -- else -- { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } -- fi --else -- { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } -- -- fi +fi +echo "$ac_t""$ac_cv_sizeof_long" 1>&6 +cat >> confdefs.h <&6 -+echo "configure:102853: checking size of long long" >&5 ++echo "configure:103175: 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 @@ -52870,7 +53379,7 @@ + ac_cv_sizeof_long_long=8 +else + cat > conftest.$ac_ext < +#include @@ -52882,7 +53391,7 @@ + exit(0); +} +EOF -+if { (eval echo configure:102873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:103195: \"$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 @@ -52894,50 +53403,35 @@ +rm -fr conftest* +fi -- if test -z "$EXPAT_DIR"; then -- { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } -- fi +fi +echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 +cat >> confdefs.h </dev/null ; then -- ai_p=$EXPAT_DIR/include -- else -- -- ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" -- fi - -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- old_IFS=$IFS +- for ac_src in tidy.c; do - -- 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 +- 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 +echo $ac_n "checking for size_t""... $ac_c" 1>&6 -+echo "configure:102893: checking for size_t" >&5 ++echo "configure:103215: 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 < +#if STDC_HEADERS @@ -52955,39 +53449,34 @@ +fi +rm -f conftest* -- fi +- cat >>Makefile.objects<&6 +if test $ac_cv_type_size_t = no; then + cat >> confdefs.h <<\EOF +#define size_t unsigned -+EOF + EOF +- done -- +fi -- if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD" -- if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -- -- if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$EXPAT_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" +- ;; +- esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" - fi +- +- +- BUILD_DIR="$BUILD_DIR $ext_builddir" +- +echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -+echo "configure:102926: checking whether time.h and sys/time.h may both be included" >&5 ++echo "configure:103248: 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 < +#include @@ -52996,7 +53485,7 @@ +struct tm *tp; +; return 0; } +EOF -+if { (eval echo configure:102940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:103262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes +else @@ -53008,43 +53497,26 @@ +rm -f conftest* +fi -- -- if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_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 +echo "$ac_t""$ac_cv_header_time" 1>&6 +if test $ac_cv_header_time = yes; then + cat >> confdefs.h <<\EOF +#define TIME_WITH_SYS_TIME 1 +EOF -+fi - -- fi +- if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=tidy - +- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++fi + - fi +echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -+echo "configure:102961: checking for uid_t in sys/types.h" >&5 ++echo "configure:103283: 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 @@ -53058,68 +53530,42 @@ +fi +rm -f conftest* -- fi -- else -- +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD" +fi -- if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -- -- if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$EXPAT_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -- fi +echo "$ac_t""$ac_cv_type_uid_t" 1>&6 +if test $ac_cv_type_uid_t = no; then -+ cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF +-#define HAVE_TIDY 1 +#define uid_t int -+EOF + EOF -- -- -- -- -- 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 +- + cat >> confdefs.h <<\EOF +#define gid_t int +EOF +fi -- -- fi -- fi -- -- -- case expat in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lexpat $LIBS" -- ;; -- esac +-php_enable_tokenizer=yes +-echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 +-echo "configure:96855: 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" +- PHP_TOKENIZER=$enableval +-else +- +- PHP_TOKENIZER=yes +- test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL +-fi -- fi +# Standard XMLRPC list +for ac_func in \ + strtoul strtoull snprintf \ @@ -53127,12 +53573,12 @@ + memcpy memmove +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:103006: checking for $ac_func" >&5 ++echo "configure:103328: 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 <> confdefs.h <<\EOF --#define HAVE_LIBEXPAT 1 --EOF +/* 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. */ @@ -53156,10 +53617,9 @@ +$ac_func(); +#endif -- fi +; return 0; } +EOF -+if { (eval echo configure:103034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:103356: \"$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 @@ -53171,26 +53631,26 @@ +rm -f conftest* +fi -- cat >> confdefs.h <<\EOF --#define HAVE_WDDX 1 +-echo "$ac_t""$ext_output" 1>&6 +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 <&6 +fi +done -+ -+ -+ + + + +-if test "$PHP_TOKENIZER" != "no"; then -- ext_builddir=ext/wddx -- ext_srcdir=$abs_srcdir/ext/wddx +- ext_builddir=ext/tokenizer +- ext_srcdir=$abs_srcdir/ext/tokenizer + ext_builddir=ext/xmlrpc + ext_srcdir=$abs_srcdir/ext/xmlrpc @@ -53198,25 +53658,25 @@ + ac_extra=`echo "-I@ext_srcdir@/libxmlrpc -DVERSION="0.50""|$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_WDDX_SHARED=no +- PHP_TOKENIZER_SHARED=no + PHP_XMLRPC_SHARED=no -- case ext/wddx in +- case ext/tokenizer in + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -97450,7 +103085,12 @@ EOF +@@ -96920,7 +103407,12 @@ if test "$PHP_TOKENIZER" != "no"; then old_IFS=$IFS -- for ac_src in wddx.c; do +- for ac_src in tokenizer.c tokenizer_data.c; do + for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ + libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ + libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ @@ -53226,36 +53686,36 @@ IFS=. set $ac_src -@@ -97473,18 +103113,18 @@ EOF +@@ -96943,18 +103435,18 @@ EOF done -- EXT_STATIC="$EXT_STATIC wddx" +- EXT_STATIC="$EXT_STATIC tokenizer" + EXT_STATIC="$EXT_STATIC xmlrpc" if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC wddx" +- EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_WDDX_SHARED=yes +- PHP_TOKENIZER_SHARED=yes + PHP_XMLRPC_SHARED=yes -- case ext/wddx in +- case ext/tokenizer in + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -97499,14 +103139,19 @@ EOF +@@ -96969,14 +103461,19 @@ EOF old_IFS=$IFS -- for ac_src in wddx.c; do +- for ac_src in tokenizer.c tokenizer_data.c; do + for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ + libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ + libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ @@ -53268,137 +53728,139 @@ ac_obj=$1 IFS=$old_IFS -- shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo" +- shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo" + shared_objects_xmlrpc="$shared_objects_xmlrpc $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" ;; -@@ -97529,31 +103174,31 @@ EOF +@@ -96999,31 +103496,31 @@ EOF 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'/phpwddx.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(PHPWDDX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpwddx.so '$ext_builddir'/phpwddx.so' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptokenizer.so '$ext_builddir'/phptokenizer.so' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so' ;; *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_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPWDDX, 3)_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' ;; *) 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_wddx) $(PHPWDDX_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpwddx.$suffix" +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptokenizer.$suffix" + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix" else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpwddx.$suffix" +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" fi -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx" +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<> confdefs.h <>Makefile.objects<&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -- { echo "configure: error: --You've configured extension wddx, which depends on extension libxml, --but you've either not enabled libxml, or have disabled it. --" 1>&2; exit 1; } -- fi -- -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" +- src=$ext_srcdir/Makefile.frag +- ac_srcdir=$ext_srcdir +- ac_builddir=$ext_builddir +- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments - -fi - - - --php_enable_xml=yes +-php_enable_wddx=no - --echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 --echo "configure:97747: 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" -- PHP_XML=$enableval +-echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 +-echo "configure:97201: 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" +- PHP_WDDX=$enableval -else - -- PHP_XML=yes -- test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL +- PHP_WDDX=no +- test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL - -fi - @@ -53514,12 +53960,12 @@ - -ext_output="yes, shared" -ext_shared=yes --case $PHP_XML in +-case $PHP_WDDX in -shared,*) -- PHP_XML=`echo "$PHP_XML"|$SED 's/^shared,//'` +- PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'` - ;; -shared) -- PHP_XML=yes +- PHP_WDDX=yes - ;; -no) - ext_output=no @@ -53543,7 +53989,7 @@ -php_with_libxml_dir=no - -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:97792: checking libxml2 install dir" >&5 +-echo "configure:97246: 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" @@ -53566,8 +54012,8 @@ - -php_with_libexpat_dir=no - --echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 --echo "configure:97816: checking libexpat install dir" >&5 +-echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 +-echo "configure:97270: 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" @@ -53586,17 +54032,16 @@ - - - --if test "$PHP_XML" != "no"; then +-if test "$PHP_WDDX" != "no"; then - - if test "$PHP_LIBEXPAT_DIR" = "no"; then -- - if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } +- { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } - fi - - -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:97845: checking for xml2-config path" >&5 +-echo "configure:97298: 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 @@ -53628,7 +54073,7 @@ - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread" +- WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread" - else - - @@ -53650,7 +54095,7 @@ - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" +- WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" - else - - @@ -53685,8 +54130,8 @@ - - - if test "$ext_shared" = "yes"; then -- XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" +- WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" - else - - @@ -53722,22 +54167,18 @@ - - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then - ai_p=$ac_ii -+ -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix" - else +- else - - ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" - ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" - fi +- 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" @@ -53749,171 +54190,73 @@ - fi - - fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" - +- - fi -+ cat >>Makefile.objects<&6 --echo "configure:98003: checking whether libxml build works" >&5 +-echo "configure:97456: 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 - -+ ;; -+ esac -+ cat >> confdefs.h < conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +- +-EOF +-if { (eval echo configure:97483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - LIBS=$old_LIBS - - php_cv_libxml_build_works=yes -+ done -+ -+ -+ EXT_STATIC="$EXT_STATIC xmlrpc" -+ ;; -+ *) - - +- +- -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -+ case ext/xmlrpc in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - +- - LIBS=$old_LIBS - - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - +- -fi -rm -fr conftest* -fi -+ -+ 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 xmlrpc-epi-php.c libxmlrpc/base64.c \ -+ libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -+ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -+ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -+ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -+ libxmlrpc/xml_to_soap.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - +- +- +- -fi -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - +- -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 - if test "$php_cv_libxml_build_works" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_LIBXML 1 -+ 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<&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -- { echo "configure: error: --You've configured extension xml, which depends on extension libxml, --but you've either not enabled libxml, or have disabled it. --" 1>&2; exit 1; } +- if test "$PHP_XML" = "no"; then + ++ EXT_STATIC="$EXT_STATIC xmlrpc" ++ ;; ++ *) + + +- case ext/xml in ++ case ext/xmlrpc in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; ++ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac + + +@@ -97535,20 +103646,25 @@ EOF + + + old_IFS=$IFS +- for ac_src in compat.c; do ++ for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ ++ libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ ++ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ ++ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ ++ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ ++ libxmlrpc/xml_to_soap.c; do + + IFS=. + set $ac_src + ac_obj=$1 + IFS=$old_IFS + +- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" + + case $ac_src in +- *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; +- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ *.c) ac_comp="$b_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<&2; exit 1; } - fi -else - { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } -- ++ ++ if test "$ext_builddir" = "."; then ++ PHP_PECL_EXTENSION=xmlrpc + - fi + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi -+ - + - if test "$PHP_LIBEXPAT_DIR" != "no"; then - for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do - if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then - EXPAT_DIR=$i + ++ + BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc" + + @@ -53984,7 +54364,7 @@ + XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi + else + echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6 -+echo "configure:103388: checking for XMLRPC-EPI in default path" >&5 ++echo "configure:103710: 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 @@ -54022,7 +54402,7 @@ fi -@@ -98135,28 +103430,28 @@ else +@@ -97618,28 +103752,28 @@ else fi @@ -54030,7 +54410,7 @@ + if test "$ext_shared" = "yes"; then -- XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD" +- WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD" - if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then + XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD" + if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then @@ -54054,14 +54434,14 @@ if test "$ext_shared" = "yes"; then -- XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" +- WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" + XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" + test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" else -@@ -98182,18 +103477,18 @@ else +@@ -97665,18 +103799,18 @@ else else @@ -54086,7 +54466,7 @@ fi -@@ -98219,10 +103514,10 @@ else +@@ -97702,10 +103836,10 @@ else fi @@ -54099,7 +54479,7 @@ ;; esac -@@ -98232,26 +103527,20 @@ else +@@ -97715,30 +103849,20 @@ else fi @@ -54109,68 +54489,72 @@ - - fi - +- cat >> confdefs.h <<\EOF +-#define HAVE_WDDX 1 +-EOF +- -- ext_builddir=ext/xml -- ext_srcdir=$abs_srcdir/ext/xml +- ext_builddir=ext/wddx +- ext_srcdir=$abs_srcdir/ext/wddx + ext_builddir=ext/xmlrpc + ext_srcdir=$abs_srcdir/ext/xmlrpc ac_extra= if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_XML_SHARED=no +- PHP_WDDX_SHARED=no + PHP_XMLRPC_SHARED=no -- case ext/xml in +- case ext/wddx in + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -98266,7 +103555,7 @@ EOF +@@ -97753,7 +103877,7 @@ EOF old_IFS=$IFS -- for ac_src in xml.c $xml_extra_sources; do +- for ac_src in wddx.c; do + for ac_src in xmlrpc-epi-php.c; do IFS=. set $ac_src -@@ -98289,18 +103578,18 @@ EOF +@@ -97776,18 +103900,18 @@ EOF done -- EXT_STATIC="$EXT_STATIC xml" +- EXT_STATIC="$EXT_STATIC wddx" + EXT_STATIC="$EXT_STATIC xmlrpc" if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC xml" +- EXT_CLI_STATIC="$EXT_CLI_STATIC wddx" + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_XML_SHARED=yes +- PHP_WDDX_SHARED=yes + PHP_XMLRPC_SHARED=yes -- case ext/xml in +- case ext/wddx in + case ext/xmlrpc in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -98315,14 +103604,14 @@ EOF +@@ -97802,14 +103926,14 @@ EOF old_IFS=$IFS -- for ac_src in xml.c $xml_extra_sources; do +- for ac_src in wddx.c; do + for ac_src in xmlrpc-epi-php.c; do IFS=. @@ -54178,98 +54562,98 @@ ac_obj=$1 IFS=$old_IFS -- shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo" +- shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo" + shared_objects_xmlrpc="$shared_objects_xmlrpc $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" ;; -@@ -98345,31 +103634,31 @@ EOF +@@ -97832,31 +103956,31 @@ EOF 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'/phpxml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxml.so '$ext_builddir'/phpxml.so' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpwddx.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(PHPWDDX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpwddx.so '$ext_builddir'/phpwddx.so' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so' ;; *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_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPWDDX, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' ;; *) 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_xml) $(PHPXML_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(PHPWDDX_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxml.$suffix" +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpwddx.$suffix" + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix" else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix" +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpwddx.$suffix" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" fi -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml" +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx" + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&2; exit 1; } +- fi +- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then +- { echo "configure: error: +-You've configured extension wddx, which depends on extension libxml, +-but you've either not enabled libxml, or have disabled it. +-" 1>&2; exit 1; } - fi -- -- done - -- -- cat >> confdefs.h <<\EOF --#define HAVE_XML 1 --EOF +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" - + XMLRPC_MODULE_TYPE=external fi --php_enable_xmlreader=yes +-php_enable_xml=yes +php_enable_xmlwriter=yes --echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 --echo "configure:98566: 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" -- PHP_XMLREADER=$enableval +-echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 +-echo "configure:98050: 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" +- PHP_XML=$enableval +echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6 -+echo "configure:103831: checking whether to enable XMLWriter support" >&5 ++echo "configure:104153: 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" + PHP_XMLWRITER=$enableval else -- PHP_XMLREADER=yes -- test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL +- PHP_XML=yes +- test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL + PHP_XMLWRITER=yes + test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL fi -@@ -98578,12 +103843,12 @@ fi +@@ -98062,12 +104165,12 @@ fi ext_output="yes, shared" ext_shared=yes --case $PHP_XMLREADER in +-case $PHP_XML in +case $PHP_XMLWRITER in shared,*) -- PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'` +- PHP_XML=`echo "$PHP_XML"|$SED 's/^shared,//'` + PHP_XMLWRITER=`echo "$PHP_XMLWRITER"|$SED 's/^shared,//'` ;; shared) -- PHP_XMLREADER=yes +- PHP_XML=yes + PHP_XMLWRITER=yes ;; no) ext_output=no -@@ -98607,7 +103872,7 @@ if test -z "$PHP_LIBXML_DIR"; then +@@ -98091,7 +104194,7 @@ if test -z "$PHP_LIBXML_DIR"; then php_with_libxml_dir=no echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:98611: checking libxml2 install dir" >&5 -+echo "configure:103876: checking libxml2 install dir" >&5 +-echo "configure:98095: checking libxml2 install dir" >&5 ++echo "configure:104198: 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" -@@ -98627,15 +103892,15 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -98111,40 +104214,15 @@ echo "$ac_t""$ext_output" 1>&6 fi --if test "$PHP_XMLREADER" != "no"; then +if test "$PHP_XMLWRITER" != "no"; then - if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } +-php_with_libexpat_dir=no ++ if test "$PHP_LIBXML" = "no"; then + { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } - fi ++ fi +-echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 +-echo "configure:98119: 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" +- PHP_LIBEXPAT_DIR=$withval +-else +- +- PHP_LIBEXPAT_DIR=no +- +-fi +- +- +-ext_output=$PHP_LIBEXPAT_DIR +-echo "$ac_t""$ext_output" 1>&6 +- +- +- +- +-if test "$PHP_XML" != "no"; then +- +- if test "$PHP_LIBEXPAT_DIR" = "no"; then +- +- if test "$PHP_LIBXML" = "no"; then +- { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } +- fi +- +- echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:98639: checking for xml2-config path" >&5 -+echo "configure:103904: checking for xml2-config path" >&5 +-echo "configure:98148: checking for xml2-config path" >&5 ++echo "configure:104226: 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 -@@ -98667,7 +103932,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -98176,7 +104254,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path case $ac_i in -pthread) if test "$ext_shared" = "yes"; then -- XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread" +- XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread" + XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread" else -@@ -98689,7 +103954,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -98198,7 +104276,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then -- XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" +- XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" + XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" else -@@ -98724,8 +103989,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -98233,8 +104311,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path if test "$ext_shared" = "yes"; then -- XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD" +- XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" + XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD" + test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD" else -@@ -98793,7 +104058,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -98302,7 +104380,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:98797: checking whether libxml build works" >&5 -+echo "configure:104062: checking whether libxml build works" >&5 +-echo "configure:98306: checking whether libxml build works" >&5 ++echo "configure:104384: 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 -@@ -98801,7 +104066,7 @@ else +@@ -98310,7 +104388,7 @@ else old_LIBS=$LIBS LIBS=" -- $XMLREADER_SHARED_LIBADD +- $XML_SHARED_LIBADD + $XMLWRITER_SHARED_LIBADD $LIBS" if test "$cross_compiling" = yes; then -@@ -98809,7 +104074,7 @@ else +@@ -98318,7 +104396,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:104089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:98333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:104411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -98856,23 +104121,23 @@ EOF +@@ -98364,197 +104442,24 @@ EOF + fi +- xml_extra_sources="compat.c" +- +- am_i_shared=$PHP_XML_SHARED +- is_it_shared=$PHP_LIBXML_SHARED +- is_it_enabled=$PHP_LIBXML +- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then +- { echo "configure: error: +-You've configured extension xml to build statically, but it +-depends on extension libxml, which you've configured to build shared. +-You either need to build xml shared or build libxml 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 xml, which depends on extension libxml, +-but you've either not enabled libxml, or have disabled it. +-" 1>&2; exit 1; } +- fi +- +- +- else +- { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } +- fi +-else +- { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } +- +- fi +- +- fi +- +- if test "$PHP_LIBEXPAT_DIR" != "no"; then +- for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do +- if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then +- EXPAT_DIR=$i +- break +- fi +- done +- +- if test -z "$EXPAT_DIR"; then +- { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } +- fi +- +- +- if test "$EXPAT_DIR/include" != "/usr/include"; then +- +- if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then +- ai_p=$EXPAT_DIR/include +- else +- +- ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" +- fi +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" +- if test -n "$unique" && test "`eval $cmd`" = "" ; then +- eval "INCLUDEPATH$unique=set" +- +- if test ""; then +- INCLUDES="-I$ai_p $INCLUDES" +- else +- INCLUDES="$INCLUDES -I$ai_p" +- fi +- +- fi +- +- fi +- +- +- +- if test "$ext_shared" = "yes"; then +- XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD" +- if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then +- +- if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then +- +- if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$EXPAT_DIR/$PHP_LIBDIR +- else +- +- ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" +- fi +- +- +- if test "$ext_shared" = "yes"; then +- XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_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 "$EXPAT_DIR/$PHP_LIBDIR"; then +- +- if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then +- +- if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$EXPAT_DIR/$PHP_LIBDIR +- else +- +- ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_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 expat in +- c|c_r|pthread*) ;; +- *) +- LIBS="-lexpat $LIBS" +- ;; +- esac +- +- +- +- +- fi +- +- cat >> confdefs.h <<\EOF --#define HAVE_XMLREADER 1 +-#define HAVE_LIBEXPAT 1 +#define HAVE_XMLWRITER 1 EOF - -- ext_builddir=ext/xmlreader -- ext_srcdir=$abs_srcdir/ext/xmlreader +- fi +- +- +- ext_builddir=ext/xml +- ext_srcdir=$abs_srcdir/ext/xml ++ + ext_builddir=ext/xmlwriter + ext_srcdir=$abs_srcdir/ext/xmlwriter ac_extra= if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_XMLREADER_SHARED=no +- PHP_XML_SHARED=no + PHP_XMLWRITER_SHARED=no -- case ext/xmlreader in +- case ext/xml in + case ext/xmlwriter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -98887,7 +104152,7 @@ EOF +@@ -98569,7 +104474,7 @@ EOF old_IFS=$IFS -- for ac_src in php_xmlreader.c; do +- for ac_src in xml.c $xml_extra_sources; do + for ac_src in php_xmlwriter.c; do IFS=. set $ac_src -@@ -98910,18 +104175,18 @@ EOF +@@ -98592,18 +104497,18 @@ EOF done -- EXT_STATIC="$EXT_STATIC xmlreader" +- EXT_STATIC="$EXT_STATIC xml" + EXT_STATIC="$EXT_STATIC xmlwriter" if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader" +- EXT_CLI_STATIC="$EXT_CLI_STATIC xml" + EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_XMLREADER_SHARED=yes +- PHP_XML_SHARED=yes + PHP_XMLWRITER_SHARED=yes -- case ext/xmlreader in +- case ext/xml in + case ext/xmlwriter in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac -@@ -98936,14 +104201,14 @@ EOF +@@ -98618,14 +104523,14 @@ EOF old_IFS=$IFS -- for ac_src in php_xmlreader.c; do +- for ac_src in xml.c $xml_extra_sources; do + for ac_src in php_xmlwriter.c; do IFS=. @@ -54591,98 +55174,98 @@ ac_obj=$1 IFS=$old_IFS -- shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo" +- shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo" + shared_objects_xmlwriter="$shared_objects_xmlwriter $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" ;; -@@ -98966,31 +104231,31 @@ EOF +@@ -98648,31 +104553,31 @@ EOF 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'/phpxmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlreader.so '$ext_builddir'/phpxmlreader.so' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxml.so '$ext_builddir'/phpxml.so' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlwriter.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlwriter.so '$ext_builddir'/phpxmlwriter.so' ;; *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_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLWRITER, 3)_SHARED_LIBADD)' ;; *) 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_xmlreader) $(PHPXMLREADER_SHARED_LIBADD)' +- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD)' ;; esac if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlreader.$suffix" +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxml.$suffix" + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlwriter.$suffix" else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix" +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix" fi -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader" +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml" + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -- { echo "configure: error: --You've configured extension xmlreader, which depends on extension dom, --but you've either not enabled dom, or have disabled it. --" 1>&2; exit 1; } -- fi - -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD" +- PHP_VAR_SUBST="$PHP_VAR_SUBST XML_SHARED_LIBADD" ++ + PHP_VAR_SUBST="$PHP_VAR_SUBST XMLWRITER_SHARED_LIBADD" - else -@@ -99185,32 +104431,19 @@ else - fi - ++ else ++ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } ++ fi ++else ++ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } + +- for header_file in ext/xml/; do +- +- +- unique=`echo $header_file|$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 $header_file" +- + fi --# Local macros for automake & autoconf -- -- -- -- -- -- -- -- +- done +- - +- cat >> confdefs.h <<\EOF +-#define HAVE_XML 1 +-EOF - + fi + + +-php_enable_xmlreader=yes +php_with_xsl=no -- --php_with_xmlrpc=no -- --echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6 --echo "configure:99206: 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" -- PHP_XMLRPC=$withval +-echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 +-echo "configure:98869: 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" +- PHP_XMLREADER=$enableval +echo $ac_n "checking for XSL support""... $ac_c" 1>&6 -+echo "configure:104439: checking for XSL support" >&5 ++echo "configure:104761: checking for XSL support" >&5 +# Check whether --with-xsl or --without-xsl was given. +if test "${with_xsl+set}" = set; then + withval="$with_xsl" + PHP_XSL=$withval else -- PHP_XMLRPC=no -- test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL +- PHP_XMLREADER=yes +- test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL + PHP_XSL=no + test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL fi -@@ -99218,12 +104451,12 @@ fi +@@ -98881,12 +104773,12 @@ fi ext_output="yes, shared" ext_shared=yes --case $PHP_XMLRPC in +-case $PHP_XMLREADER in +case $PHP_XSL in shared,*) -- PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'` +- PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'` + PHP_XSL=`echo "$PHP_XSL"|$SED 's/^shared,//'` ;; shared) -- PHP_XMLRPC=yes +- PHP_XMLREADER=yes + PHP_XSL=yes ;; no) ext_output=no -@@ -99242,147 +104475,41 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -98905,72 +104797,41 @@ echo "$ac_t""$ext_output" 1>&6 @@ -54856,7 +55432,7 @@ -php_with_libxml_dir=no - -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:99251: checking libxml2 install dir" >&5 +-echo "configure:98914: 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" @@ -54876,103 +55452,28 @@ - -fi - -- --php_with_libexpat_dir=no -- --echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6 --echo "configure:99275: 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" -- PHP_LIBEXPAT_DIR=$withval --else -- -- PHP_LIBEXPAT_DIR=no -- -- --fi -- -- --ext_output=$PHP_LIBEXPAT_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- -- --php_with_iconv_dir=no -- --echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6 --echo "configure:99298: 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" -- PHP_ICONV_DIR=$withval --else -- -- PHP_ICONV_DIR=no -- -- --fi -- -- --ext_output=$PHP_ICONV_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_XMLRPC" != "no"; then +-if test "$PHP_XMLREADER" != "no"; then +if test "$PHP_XSL" != "no"; then -- -- am_i_shared=$PHP_XMLRPC_SHARED -- is_it_shared=$PHP_LIBXML_SHARED -- is_it_enabled=$PHP_LIBXML -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension xmlrpc to build statically, but it --depends on extension libxml, which you've configured to build shared. --You either need to build xmlrpc shared or build libxml 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 xmlrpc, which depends on extension libxml, --but you've either not enabled libxml, or have disabled it. --" 1>&2; exit 1; } -+ if test "$PHP_LIBXML" = "no"; then + if test "$PHP_LIBXML" = "no"; then +- { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } + { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } fi - -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" -- -- cat >> confdefs.h <<\EOF --#define HAVE_XMLRPC 1 --EOF -- -- -- if test "$PHP_LIBEXPAT_DIR" = "no"; then - -- if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi -+ if test "$PHP_DOM" = "no"; then -+ { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; } -+ fi - -- +- -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:99354: checking for xml2-config path" >&5 +-echo "configure:98942: 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 -- + - for i in $PHP_LIBXML_DIR /usr/local /usr; do - if test -x "$i/bin/xml2-config"; then - ac_cv_php_xml2_config_path="$i/bin/xml2-config" ++ if test "$PHP_DOM" = "no"; then ++ { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; } ++ fi ++ + for i in $PHP_XSL /usr/local /usr; do + if test -x "$i/bin/xslt-config"; then + XSLT_CONFIG=$i/bin/xslt-config @@ -55010,32 +55511,32 @@ case $ac_i in -pthread) if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread" +- XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread" + XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -pthread" else -@@ -99404,7 +104531,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -98992,7 +104853,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" +- XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" + XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii" else -@@ -99439,8 +104566,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -99027,8 +104888,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" +- XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD" + XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" + test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" else -@@ -99467,7 +104594,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -99055,7 +104916,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path done @@ -55044,21 +55545,13 @@ case $ac_i in -I*) ac_ii=`echo $ac_i|cut -c 3-` -@@ -99502,81 +104629,359 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - fi +@@ -99094,88 +104955,177 @@ echo "$ac_t""$ac_cv_php_xml2_config_path + esac + done -- ;; -- esac -- done -- -+ ;; -+ esac -+ done -+ + + echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6 -+echo "configure:104639: checking for EXSLT support" >&5 ++echo "configure:104961: 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 @@ -55070,7 +55563,13 @@ + else + echo "$ac_t""found" 1>&6 + -+ + +- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 +-echo "configure:99100: 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 +- + if test "$ext_shared" = "yes"; then + XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD" + if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then @@ -55092,9 +55591,19 @@ + XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" + test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" + else -+ -+ -+ + +- old_LIBS=$LIBS +- LIBS=" +- $XMLREADER_SHARED_LIBADD +- $LIBS" +- if test "$cross_compiling" = yes; then + +- LIBS=$old_LIBS + +-else +- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then + +- LIBS=$old_LIBS +- +- php_cv_libxml_build_works=yes +- + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ + +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" @@ -55143,15 +55668,22 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" -+ + +- LIBS=$old_LIBS + fi + + -+ + +- echo "$ac_t""no" 1>&6 +- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } +- + fi + + fi -+ + +-fi +-rm -fr conftest* +-fi + + case exslt in + c|c_r|pthread*) ;; @@ -55159,9 +55691,13 @@ + LIBS="-lexslt $LIBS" + ;; + esac -+ -+ -+ + + +- +-fi + +-echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +- if test "$php_cv_libxml_build_works" = "yes"; then + + fi + @@ -55197,11 +55733,15 @@ + + fi + -+ cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF +-#define HAVE_LIBXML 1 +#define HAVE_XSL_EXSLT 1 -+EOF -+ -+ fi + EOF + + fi +- +- cat >> confdefs.h <<\EOF +-#define HAVE_XMLREADER 1 + else + { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; } + fi @@ -55211,711 +55751,447 @@ + + cat >> confdefs.h <<\EOF +#define HAVE_XSL 1 -+EOF -+ + EOF + +- +- ext_builddir=ext/xmlreader +- ext_srcdir=$abs_srcdir/ext/xmlreader + + ext_builddir=ext/xsl + ext_srcdir=$abs_srcdir/ext/xsl -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + + ac_extra= + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then +- PHP_XMLREADER_SHARED=no + PHP_XSL_SHARED=no -+ -+ + + +- case ext/xmlreader in + case ext/xsl in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; 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 + esac + + +@@ -99190,7 +105140,7 @@ EOF + + + old_IFS=$IFS +- for ac_src in php_xmlreader.c; do + for ac_src in php_xsl.c xsltprocessor.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<>Makefile.objects<>Makefile.objects<>Makefile.objects<&6 --echo "configure:99512: 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 -- -- -- old_LIBS=$LIBS -- LIBS=" -- $XMLRPC_SHARED_LIBADD -- $LIBS" -- if test "$cross_compiling" = yes; then -- -- LIBS=$old_LIBS -- --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- LIBS=$old_LIBS -- -- php_cv_libxml_build_works=yes -- -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- LIBS=$old_LIBS -- -- echo "$ac_t""no" 1>&6 -- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -- -+ -+ ;; -+ *) -+ -+ install_modules="install-modules" -+ -+ case $host_alias in -+ *aix*) -+ suffix=so +@@ -99306,31 +105256,31 @@ EOF + 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'/xmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(XMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlreader.so '$ext_builddir'/xmlreader.so' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xsl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(XSL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xsl.so '$ext_builddir'/xsl.so' -+ ;; -+ *netware*) -+ suffix=nlm + ;; + *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_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLREADER, 3)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XSL, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la + ;; + *) + 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_xmlreader) $(XMLREADER_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(XSL_SHARED_LIBADD)' -+ ;; -+ esac -+ -+ if test "x" = "xyes"; then + ;; + esac + + if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlreader.$suffix" + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xsl.$suffix" -+ else + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlreader.$suffix" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/xsl.$suffix" -+ fi + fi --fi --rm -fr conftest* --fi +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader" + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl" -+ -+ cat >>Makefile.objects<>Makefile.objects<&6 -- if test "$php_cv_libxml_build_works" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBXML 1 -+ ;; -+ esac -+ cat >> confdefs.h <> confdefs.h <>Makefile.objects<&2; exit 1; } -- fi --else -- { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } -- -- fi -+ 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 -- else -- testval=no -- for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do -- if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBEXPAT 1 -+ -+ old_IFS=$IFS + old_IFS=$IFS +- for ac_src in php_xmlreader.c; do + for ac_src in php_xsl.c xsltprocessor.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</dev/null ; then -- ai_p=$i/$PHP_LIBDIR -- else -- -- ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" -+ ;; -+ esac + ;; + esac +- EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader" + EXT_CLI_STATIC="$EXT_CLI_STATIC xsl" fi -- -- -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_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" -+ BUILD_DIR="$BUILD_DIR $ext_builddir" -- fi +@@ -99448,72 +105398,50 @@ EOF -- fi -- -- fi -- -- fi -- else -+ if test "$ext_builddir" = "."; then + if test "$ext_builddir" = "."; then +- PHP_PECL_EXTENSION=xmlreader + PHP_PECL_EXTENSION=xsl -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- if test -n "$i/$PHP_LIBDIR"; then -- -- if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$i/$PHP_LIBDIR -- else -- -- ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$i/$PHP_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" +- am_i_shared=$PHP_XMLREADER_SHARED +- is_it_shared=$PHP_DOM_SHARED +- is_it_enabled=$PHP_DOM ++ + PHP_VAR_SUBST="$PHP_VAR_SUBST XSL_SHARED_LIBADD" + - ++ + am_i_shared=$PHP_XSL_SHARED + is_it_shared=$PHP_LIBXML_SHARED + is_it_enabled=$PHP_LIBXML -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: + if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then + { echo "configure: error: +-You've configured extension xmlreader to build statically, but it +-depends on extension dom, which you've configured to build shared. +-You either need to build xmlreader shared or build dom statically for the +You've configured extension xsl to build statically, but it +depends on extension libxml, which you've configured to build shared. +You either need to build xsl shared or build libxml statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi + build to be successful. + " 1>&2; exit 1; } + fi +- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then + if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: + { echo "configure: error: +-You've configured extension xmlreader, which depends on extension dom, +-but you've either not enabled dom, or have disabled it. +-" 1>&2; exit 1; } +- fi +- +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD" +- +- +- else +- { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } +- fi +-else +- { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } +- +You've configured extension xsl, which depends on extension libxml, +but you've either not enabled libxml, or have disabled it. +" 1>&2; exit 1; } fi +- + -+fi + fi -- -- fi +-# Local macros for automake & autoconf +- +- +- +- +- +- +- +- +- +- -- fi -- +php_enable_zip=no -+ + +- +-php_with_xmlrpc=no +- +-echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6 +-echo "configure:99509: 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" +- PHP_XMLRPC=$withval +echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6 -+echo "configure:105115: checking for zip archive read/writesupport" >&5 ++echo "configure:105437: 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" + PHP_ZIP=$enableval -+else + else -- case expat in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lexpat $LIBS" -- ;; -- esac +- PHP_XMLRPC=no +- test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL + PHP_ZIP=no + test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL -+fi - + fi +@@ -99521,12 +105449,12 @@ fi -- fi -+ext_output="yes, shared" -+ext_shared=yes + ext_output="yes, shared" + ext_shared=yes +-case $PHP_XMLRPC in +case $PHP_ZIP in -+shared,*) + shared,*) +- PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'` + PHP_ZIP=`echo "$PHP_ZIP"|$SED 's/^shared,//'` -+ ;; -+shared) + ;; + shared) +- PHP_XMLRPC=yes + PHP_ZIP=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - - -- -- if test "$i/include" != "/usr/include"; then -- -- if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then -- ai_p=$i/include -- else -- -- ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$i/include\"`" -- fi - -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -+echo "$ac_t""$ext_output" 1>&6 - -- fi + ;; + no) + ext_output=no +@@ -99545,25 +105473,25 @@ echo "$ac_t""$ext_output" 1>&6 -- testval=yes -- break -- fi -- done -- if test "$testval" = "no"; then -- { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir= (deprecated!)" 1>&2; exit 1; } -- fi -- fi -- if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then +-if test -z "$PHP_LIBXML_DIR"; then +if test -z "$PHP_ZLIB_DIR"; then -+ + +-php_with_libxml_dir=no +php_with_zlib_dir=no -- if test "$PHP_ICONV_DIR" != "no"; then -- PHP_ICONV=$PHP_ICONV_DIR -- fi +-echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 +-echo "configure:99554: 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" +- PHP_LIBXML_DIR=$withval +echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -+echo "configure:105160: checking for the location of libz" >&5 ++echo "configure:105482: 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 + else -- if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then -- PHP_ICONV=yes -- fi +- PHP_LIBXML_DIR=no + PHP_ZLIB_DIR=no -- -- found_iconv=no -- unset ICONV_DIR -- # Create the directories for a VPATH build: -- $php_shtool mkdir -p ext/iconv -+fi + fi -- echo > ext/iconv/php_have_bsd_iconv.h -- echo > ext/iconv/php_have_ibm_iconv.h -- echo > ext/iconv/php_have_glibc_iconv.h -- echo > ext/iconv/php_have_libiconv.h -- echo > ext/iconv/php_have_iconv.h -- echo > ext/iconv/php_php_iconv_impl.h -- echo > ext/iconv/php_iconv_aliased_libiconv.h -- echo > ext/iconv/php_php_iconv_h_path.h -- echo > ext/iconv/php_iconv_supports_errno.h -- if test "$PHP_ICONV" = "yes"; then -- echo $ac_n "checking for iconv""... $ac_c" 1>&6 --echo "configure:99808: 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 < --/* 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 iconv(); +-ext_output=$PHP_LIBXML_DIR +ext_output=$PHP_ZLIB_DIR -+echo "$ac_t""$ext_output" 1>&6 + echo "$ac_t""$ext_output" 1>&6 --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_iconv) || defined (__stub___iconv) --choke me --#else --iconv(); --#endif +@@ -99571,315 +105499,501 @@ echo "$ac_t""$ext_output" 1>&6 + fi --; return 0; } --EOF --if { (eval echo configure:99836: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_iconv=no" --fi --rm -f conftest* - fi - --if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- found_iconv=yes -- --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for libiconv""... $ac_c" 1>&6 --echo "configure:99857: checking for libiconv" >&5 --if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 +-php_with_libexpat_dir=no +php_with_pcre_dir=no -+ + +-echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6 +-echo "configure:99578: 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" +- PHP_LIBEXPAT_DIR=$withval +echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 -+echo "configure:105184: checking pcre install prefix" >&5 ++echo "configure:105506: 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" + PHP_PCRE_DIR=$withval else -- cat > conftest.$ac_ext < --/* 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 libiconv(); -+ + +- PHP_LIBEXPAT_DIR=no + PHP_PCRE_DIR=no -+ + --int main() { -+fi + fi --/* 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_libiconv) || defined (__stub___libiconv) --choke me --#else --libiconv(); --#endif --; return 0; } --EOF --if { (eval echo configure:99885: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_libiconv=no" --fi --rm -f conftest* --fi +-ext_output=$PHP_LIBEXPAT_DIR +ext_output=$PHP_PCRE_DIR -+echo "$ac_t""$ext_output" 1>&6 + echo "$ac_t""$ext_output" 1>&6 --if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- -- echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h -- cat >> confdefs.h <<\EOF --#define HAVE_LIBICONV 1 --EOF -- found_iconv=yes -- --else -- echo "$ac_t""no" 1>&6 --fi +if test "$PHP_ZIP" != "no"; then -+ + +-php_with_iconv_dir=no +- +-echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6 +-echo "configure:99601: 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" +- PHP_ICONV_DIR=$withval +-else +- +- PHP_ICONV_DIR=no +- +- +-fi +- +- +-ext_output=$PHP_ICONV_DIR +-echo "$ac_t""$ext_output" 1>&6 +- +- + 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" @@ -55937,16 +56213,16 @@ + fi + done + fi -+ + + echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6 -+echo "configure:105228: checking for the location of zlib" >&5 ++echo "configure:105550: 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= to specify prefix where ZLIB include and library are located" 1>&2; exit 1; } + else + echo "$ac_t""$PHP_ZLIB_DIR" 1>&6 - --fi ++ +-if test "$PHP_XMLRPC" != "no"; then + if test "$ext_shared" = "yes"; then + ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD" + if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then @@ -55961,19 +56237,40 @@ + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" - fi ++ fi -- if test "$found_iconv" = "no"; then + + if test "$ext_shared" = "yes"; then + ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD" + test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_SHARED_LIBADD" + else + -+ -+ + +- am_i_shared=$PHP_XMLRPC_SHARED +- is_it_shared=$PHP_LIBXML_SHARED +- is_it_enabled=$PHP_LIBXML +- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then +- { echo "configure: error: +-You've configured extension xmlrpc to build statically, but it +-depends on extension libxml, which you've configured to build shared. +-You either need to build xmlrpc shared or build libxml 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 xmlrpc, which depends on extension libxml, +-but you've either not enabled libxml, or have disabled it. +-" 1>&2; exit 1; } +- fi + + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ + +- PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" +- +- cat >> confdefs.h <<\EOF +-#define HAVE_XMLRPC 1 +-EOF + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "LIBPATH$unique=set" @@ -55984,34 +56281,34 @@ + + fi -- for i in $PHP_ICONV /usr/local /usr; do -- if test -r $i/include/giconv.h; then -- cat >> confdefs.h <<\EOF --#define HAVE_GICONV_H 1 --EOF -- ICONV_DIR=$i -- iconv_lib_name=giconv -- break -- elif test -r $i/include/iconv.h; then -- ICONV_DIR=$i -- iconv_lib_name=iconv -- break - fi -- done +- if test "$PHP_LIBEXPAT_DIR" = "no"; then ++ fi + + fi -- if test -z "$ICONV_DIR"; then -- { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=" 1>&2; exit 1; } +- if test "$PHP_LIBXML" = "no"; then +- { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } fi -- -- if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || -- test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME -- then +- + else -+ -+ + +-echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 +-echo "configure:99657: 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 +- +- for i in $PHP_LIBXML_DIR /usr/local /usr; do +- if test -x "$i/bin/xml2-config"; then +- ac_cv_php_xml2_config_path="$i/bin/xml2-config" +- break +- fi +- done +- +-fi + +-echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 + if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then + + if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then @@ -56025,29 +56322,33 @@ + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" + fi -+ + +- if test -x "$ac_cv_php_xml2_config_path"; then +- XML2_CONFIG="$ac_cv_php_xml2_config_path" +- libxml_full_version=`$XML2_CONFIG --version` +- ac_IFS=$IFS +- IFS="." +- set $libxml_full_version +- IFS=$ac_IFS +- LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` +- if test "$LIBXML_VERSION" -ge "2006011"; then +- LIBXML_LIBS=`$XML2_CONFIG --libs` +- LIBXML_INCS=`$XML2_CONFIG --cflags` + -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$ICONV_DIR/$PHP_LIBDIR -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes - -- for ac_i in $ac_stuff; do +- for ac_i in $LIBXML_LIBS; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" +- XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread" - else - - unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ 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 "EXTRA_LDFLAGS$unique=set" @@ -56075,7 +56376,7 @@ - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" +- XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" - else - @@ -56121,8 +56422,8 @@ - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" - else - - @@ -56134,39 +56435,28 @@ if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" + eval "INCLUDEPATH$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" + if test ""; then + INCLUDES="-I$ai_p $INCLUDES" + else + INCLUDES="$INCLUDES -I$ai_p" + fi - -- 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 - -- ;; -- esac -- done ++ ++ fi ++ ++ fi ++ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=$INCLUDES + cat > conftest.$ac_ext <&6 --echo "configure:100041: 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 ++ +#include
+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) +yes @@ -56179,54 +56469,35 @@ + + PHP_PCRE_REGEX=yes + - else -- ac_save_LIBS="$LIBS" --LIBS="-l$iconv_lib_name $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < +#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) +yes +#endif + - EOF --if { (eval echo configure:100060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" ++ rm -rf conftest* + + PHP_PCRE_REGEX=pecl + - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" ++else ++ rm -rf conftest* + + PHP_PCRE_REGEX=no + - fi - rm -f conftest* --LIBS="$ac_save_LIBS" - ++fi ++rm -f conftest* ++ + - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 ++fi +rm -f conftest* + + CPPFLAGS=$old_CPPFLAGS @@ -56255,9 +56526,7 @@ +#define HAVE_ZIP 1 +EOF + - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared ++ + ext_builddir=ext/zip + ext_srcdir=$abs_srcdir/ext/zip + @@ -56265,10 +56534,7 @@ + + if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_ZIP_SHARED=no - -- found_iconv=yes -- -- echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h ++ + + case ext/zip in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; @@ -56277,10 +56543,7 @@ + esac + + - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBICONV 1 --EOF ++ + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre + b_c_meta=$php_c_meta @@ -56288,12 +56551,8 @@ + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo - -- -- echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h - -- cat >> confdefs.h <<\EOF --#define ICONV_ALIASED_LIBICONV 1 ++ ++ + old_IFS=$IFS + for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do + @@ -56314,9 +56573,9 @@ + cat >>Makefile.objects<&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_$iconv_lib_name_libiconv -- ++ ++ + b_c_pre=$shared_c_pre + b_cxx_pre=$shared_cxx_pre + b_c_meta=$shared_c_meta @@ -56351,7 +56604,7 @@ + + old_IFS=$IFS + for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do -+ + + IFS=. + set $ac_src + ac_obj=$1 @@ -56396,7 +56649,7 @@ + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpzip.$suffix" + else + PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzip.$suffix" -+ fi + fi + + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip" + @@ -56406,14 +56659,20 @@ + +$ext_builddir/phpzip.$suffix: \$(shared_objects_zip) \$(PHPZIP_SHARED_DEPENDENCIES) + $link_cmd -+ + +EOF -+ + +- fi +- +- fi + ;; + *) + + install_modules="install-modules" -+ + +- ;; +- esac +- done + case $host_alias in + *aix*) + suffix=so @@ -56428,29 +56687,96 @@ + link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) $(ZIP_SHARED_LIBADD)' + ;; + esac -+ + +- +- for ac_i in $LIBXML_INCS; 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 + if test "x" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/zip.$suffix" -+ else + else +- +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/zip.$suffix" -+ fi -+ + 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 + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip" -+ + +- ;; +- esac +- done + cat >>Makefile.objects<&6 +-echo "configure:99815: 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 +- +- +- old_LIBS=$LIBS +- LIBS=" +- $XMLRPC_SHARED_LIBADD +- $LIBS" +- if test "$cross_compiling" = yes; then +- +- LIBS=$old_LIBS +- +-else +- cat > conftest.$ac_ext <> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- +- LIBS=$old_LIBS +- +- php_cv_libxml_build_works=yes + + fi + fi @@ -56460,26 +56786,26 @@ + case "$PHP_SAPI" in + cgi|embed) -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$ICONV_DIR/$PHP_LIBDIR -- " -- save_ext_shared=$ext_shared -- ext_shared=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* + case ext/zip in + "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + esac -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -+ +- LIBS=$old_LIBS +- +- echo "$ac_t""no" 1>&6 +- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } +- + +-fi +-rm -fr conftest* +-fi + + b_c_pre=$php_c_pre + b_cxx_pre=$php_cxx_pre @@ -56488,8 +56814,8 @@ + b_c_post=$php_c_post + b_cxx_post=$php_cxx_post + b_lo=$php_lo -+ -+ + + + old_IFS=$IFS + for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do + @@ -56497,9 +56823,14 @@ + set $ac_src + ac_obj=$1 + IFS=$old_IFS -+ + +-fi + PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ + +-echo "$ac_t""$php_cv_libxml_build_works" 1>&6 +- if test "$php_cv_libxml_build_works" = "yes"; then +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBXML 1 + 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" ;; @@ -56510,197 +56841,148 @@ + cat >>Makefile.objects<>Makefile.objects<>Makefile.objects</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\"`" +- + ;; + esac + EXT_CLI_STATIC="$EXT_CLI_STATIC zip" - fi -+ ++ fi + +- BUILD_DIR="$BUILD_DIR ext/xml" + + BUILD_DIR="$BUILD_DIR $ext_builddir" -+ -+ + +- fi +- +- else +- { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } +- fi +-else +- { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } ++ + if test "$ext_builddir" = "."; then + PHP_PECL_EXTENSION=zip -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- + PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + -+ fi -+ - - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + fi + +- else +- testval=no +- for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do +- if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBEXPAT 1 +-EOF ++ ++ + $php_shtool mkdir -p $ext_builddir/lib - -- 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 ++ + +- ++ + PHP_VAR_SUBST="$PHP_VAR_SUBST ZIP_SHARED_LIBADD" +- if test "$ext_shared" = "yes"; then +- XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD" +- if test -n "$i/$PHP_LIBDIR"; then +- +- if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then +- +- if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$i/$PHP_LIBDIR +- else +- +- ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" +- fi -- fi -- fi +- if test "$ext_shared" = "yes"; then +- XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" +- else +- +- + src=$ext_srcdir/Makefile.frag + ac_srcdir=$ext_srcdir + ac_builddir=$ext_builddir + test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments - -- ;; -- esac -- done ++ +fi - -- echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 --echo "configure:100201: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-l$iconv_lib_name $LIBS" --cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" ++ ++ + +php_enable_http=no + +echo $ac_n "checking whether to enable extended HTTP support""... $ac_c" 1>&6 -+echo "configure:105752: checking whether to enable extended HTTP support" >&5 ++echo "configure:106074: checking whether to enable extended HTTP support" >&5 +# Check whether --enable-http or --disable-http was given. +if test "${enable_http+set}" = set; then + enableval="$enable_http" + PHP_HTTP=$enableval - 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" -+ ++else + +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + PHP_HTTP=no + test "$PHP_ENABLE_ALL" && PHP_HTTP=$PHP_ENABLE_ALL - - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 ++ ++fi + + + @@ -56733,84 +57015,13 @@ +php_with_http_shared_deps=$PHP_HTTP + +echo $ac_n "checking whether to depend on extensions which have been built shared""... $ac_c" 1>&6 -+echo "configure:105795: checking whether to depend on extensions which have been built shared" >&5 ++echo "configure:106117: checking whether to depend on extensions which have been built shared" >&5 +# Check whether --with-http-shared-deps or --without-http-shared-deps was given. +if test "${with_http_shared_deps+set}" = set; then + withval="$with_http_shared_deps" + PHP_HTTP_SHARED_DEPS=$withval +else -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- found_iconv=yes -- -+ PHP_HTTP_SHARED_DEPS=$PHP_HTTP - --else -- echo "$ac_t""no" 1>&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_$iconv_lib_name_iconv -- -- - fi - -- -- --fi - -- fi -- fi -+ext_output=$PHP_HTTP_SHARED_DEPS -+echo "$ac_t""$ext_output" 1>&6 - -- if test "$found_iconv" = "yes"; then -- -- echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h - -- cat >> confdefs.h <<\EOF --#define HAVE_ICONV 1 --EOF - -- if test -n "$ICONV_DIR"; then -- - -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD" -- if test -n "$ICONV_DIR/$PHP_LIBDIR"; then -- -- if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$ICONV_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" -- fi -+php_with_http_curl_requests=$PHP_HTTP - -- -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" -- else -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+echo $ac_n "checking whether to enable cURL HTTP request support""... $ac_c" 1>&6 -+echo "configure:105817: checking whether to enable cURL HTTP request support" >&5 -+# Check whether --with-http-curl-requests or --without-http-curl-requests was given. -+if test "${with_http_curl_requests+set}" = set; then -+ withval="$with_http_curl_requests" -+ PHP_HTTP_CURL_REQUESTS=$withval -+else - - cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" @@ -56818,7 +57029,7 @@ - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" - PHP_RPATHS="$PHP_RPATHS $ai_p" -+ PHP_HTTP_CURL_REQUESTS=$PHP_HTTP ++ PHP_HTTP_SHARED_DEPS=$PHP_HTTP - fi @@ -56831,34 +57042,54 @@ - fi - else - -+ext_output=$PHP_HTTP_CURL_REQUESTS ++ext_output=$PHP_HTTP_SHARED_DEPS +echo "$ac_t""$ext_output" 1>&6 -- if test -n "$ICONV_DIR/$PHP_LIBDIR"; then +- if test -n "$i/$PHP_LIBDIR"; then - -- if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then +- if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$ICONV_DIR/$PHP_LIBDIR +- if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$i/$PHP_LIBDIR - else - -- ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" +- ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" - fi - - -- -- ++ ++ ++php_with_http_curl_requests=$PHP_HTTP ++ ++echo $ac_n "checking whether to enable cURL HTTP request support""... $ac_c" 1>&6 ++echo "configure:106139: checking whether to enable cURL HTTP request support" >&5 ++# Check whether --with-http-curl-requests or --without-http-curl-requests was given. ++if test "${with_http_curl_requests+set}" = set; then ++ withval="$with_http_curl_requests" ++ PHP_HTTP_CURL_REQUESTS=$withval ++else + ++ PHP_HTTP_CURL_REQUESTS=$PHP_HTTP + - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + ++fi ++ ++ ++ext_output=$PHP_HTTP_CURL_REQUESTS ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ + +php_with_http_curl_libevent=$PHP_HTTP_CURL_REQUESTS + +echo $ac_n "checking whether to enable libevent support fur cURL""... $ac_c" 1>&6 -+echo "configure:105839: checking whether to enable libevent support fur cURL" >&5 ++echo "configure:106161: checking whether to enable libevent support fur cURL" >&5 +# Check whether --with-http-curl-libevent or --without-http-curl-libevent was given. +if test "${with_http_curl_libevent+set}" = set; then + withval="$with_http_curl_libevent" @@ -56891,7 +57122,7 @@ +php_with_http_zlib_compression=$PHP_HTTP + +echo $ac_n "checking whether to enable zlib encodings support""... $ac_c" 1>&6 -+echo "configure:105861: checking whether to enable zlib encodings support" >&5 ++echo "configure:106183: checking whether to enable zlib encodings support" >&5 +# Check whether --with-http-zlib-compression or --without-http-zlib-compression was given. +if test "${with_http_zlib_compression+set}" = set; then + withval="$with_http_zlib_compression" @@ -56900,10 +57131,10 @@ + PHP_HTTP_ZLIB_COMPRESSION=$PHP_HTTP -- case $iconv_lib_name in +- case expat in - c|c_r|pthread*) ;; - *) -- LIBS="-l$iconv_lib_name $LIBS" +- LIBS="-lexpat $LIBS" - ;; - esac @@ -56916,24 +57147,24 @@ - fi -- -- if test "$ICONV_DIR/include" != "/usr/include"; then +- +- if test "$i/include" != "/usr/include"; then - -- if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$ICONV_DIR/include +- if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then +- ai_p=$i/include - else - -- ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" +- ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`" +- ai_p="$ep_realdir/`basename \"$i/include\"`" - fi - +php_with_http_magic_mime="no" + +echo $ac_n "checking whether to enable response content type guessing""... $ac_c" 1>&6 -+echo "configure:105883: checking whether to enable response content type guessing" >&5 ++echo "configure:106205: checking whether to enable response content type guessing" >&5 +# Check whether --with-http-magic-mime or --without-http-magic-mime was given. +if test "${with_http_magic_mime+set}" = set; then + withval="$with_http_magic_mime" @@ -56951,11 +57182,7 @@ - INCLUDES="-I$ai_p $INCLUDES" - else - INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi - -- fi ++ +fi + + @@ -56964,35 +57191,30 @@ + + + - ++ +if test "$PHP_HTTP" != "no"; then + + + echo $ac_n "checking for egrep""... $ac_c" 1>&6 -+echo "configure:105906: checking for egrep" >&5 ++echo "configure:106228: checking for egrep" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' - fi -- --else -- { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; } -- -- fi ++ fi +fi + +echo "$ac_t""$ac_cv_prog_egrep" 1>&6 + EGREP=$ac_cv_prog_egrep + - ++ + + + + echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6 -+echo "configure:105924: checking for a sed that does not truncate output" >&5 ++echo "configure:106246: 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 @@ -57007,7 +57229,8 @@ + for ac_exec_ext in '' $ac_executable_extensions; do + if test -f "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -+ fi + fi +- + done + done +done @@ -57042,14 +57265,8 @@ + done +done + - fi - --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:100410: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then ++fi ++ +SED=$lt_cv_path_SED +echo "$ac_t""$SED" 1>&6 + @@ -57057,58 +57274,45 @@ + + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:105983: checking how to run the C preprocessor" >&5 ++echo "configure:106305: 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 -- if test -n "$RANLIB"; then -- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. ++ 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 < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:106004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:106326: \"$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 -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_RANLIB="ranlib" -- break -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" ++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 < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:106021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:106343: \"$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 + : @@ -57119,13 +57323,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:106038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:106360: \"$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 + : @@ -57148,18 +57352,27 @@ + ac_cv_prog_CPP="$CPP" +fi +echo "$ac_t""$CPP" 1>&6 -+ + +- fi + + if test "$PHP_HTTP_SHARED_DEPS" != "no"; then + cat >> confdefs.h <<\EOF +#define HTTP_SHARED_DEPS 1 +EOF -+ + +- testval=yes +- break +- fi +- done + else + cat >> confdefs.h <<\EOF +#define HTTP_SHARED_DEPS 0 +EOF -+ + +- if test "$testval" = "no"; then +- { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir= (deprecated!)" 1>&2; exit 1; } +- fi +- fi + fi + + @@ -57169,22 +57382,23 @@ + if test "x$PHP_LIBDIR" = "x"; then + PHP_LIBDIR=lib + fi -+ + +- if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then + for ac_hdr in netdb.h unistd.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:106087: checking for $ac_hdr" >&5 ++echo "configure:106409: 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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:106097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:106419: \"$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* @@ -57195,12 +57409,9 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" - fi ++fi +rm -f conftest* - fi --RANLIB="$ac_cv_prog_RANLIB" --if test -n "$RANLIB"; then -- echo "$ac_t""$RANLIB" 1>&6 ++fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` @@ -57208,378 +57419,733 @@ +#define $ac_tr_hdr 1 +EOF + - else - echo "$ac_t""no" 1>&6 - fi ++else ++ echo "$ac_t""no" 1>&6 ++fi +done --echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:100438: checking for inline" >&5 --if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then +- if test "$PHP_ICONV_DIR" != "no"; then +- PHP_ICONV=$PHP_ICONV_DIR +- fi +- +- if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then +- PHP_ICONV=yes +- fi + + unset ac_cv_func_gethostname + unset ac_cv_func___gethostname + unset found -+ + +- +- found_iconv=no +- unset ICONV_DIR +- +- # Create the directories for a VPATH build: +- $php_shtool mkdir -p ext/iconv +- +- echo > ext/iconv/php_have_bsd_iconv.h +- echo > ext/iconv/php_have_ibm_iconv.h +- echo > ext/iconv/php_have_glibc_iconv.h +- echo > ext/iconv/php_have_libiconv.h +- echo > ext/iconv/php_have_iconv.h +- echo > ext/iconv/php_php_iconv_impl.h +- echo > ext/iconv/php_iconv_aliased_libiconv.h +- echo > ext/iconv/php_php_iconv_h_path.h +- echo > ext/iconv/php_iconv_supports_errno.h +- +- if test "$PHP_ICONV" = "yes"; then +- echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:100111: checking for iconv" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then + echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -+echo "configure:106129: checking for gethostname" >&5 ++echo "configure:106451: checking for gethostname" >&5 +if eval "test \"`echo '$''{'ac_cv_func_gethostname'+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 < -+/* 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. */ + #include + /* 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 iconv(); +char gethostname(); int main() { --} $ac_kw foo() { -+ -+/* 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. */ + + /* 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_iconv) || defined (__stub___iconv) +#if defined (__stub_gethostname) || defined (__stub___gethostname) -+choke me -+#else + choke me + #else +-iconv(); +gethostname(); -+#endif -+ + #endif + ; return 0; } EOF --if { (eval echo configure:100452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:106157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:100139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* -- ac_cv_c_inline=$ac_kw; break +- eval "ac_cv_func_iconv=yes" + eval "ac_cv_func_gethostname=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 -+ rm -rf conftest* + rm -rf conftest* +- eval "ac_cv_func_iconv=no" + eval "ac_cv_func_gethostname=no" fi rm -f conftest* --done -- fi --echo "$ac_t""$ac_cv_c_inline" 1>&6 --case "$ac_cv_c_inline" in -- inline | yes) ;; -- no) cat >> confdefs.h <<\EOF --#define inline --EOF -- ;; -- *) cat >> confdefs.h <&6 + echo "$ac_t""yes" 1>&6 +- +- found_iconv=yes +- + found=yes -+else -+ echo "$ac_t""no" 1>&6 + else + echo "$ac_t""no" 1>&6 +- +- echo $ac_n "checking for libiconv""... $ac_c" 1>&6 +-echo "configure:100160: checking for libiconv" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then + echo $ac_n "checking for __gethostname""... $ac_c" 1>&6 -+echo "configure:106175: checking for __gethostname" >&5 ++echo "configure:106497: 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 <&6 + else + cat > conftest.$ac_ext < -+/* 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. */ + #include + /* 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 libiconv(); +char __gethostname(); -- -+int main() { + 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. */ + /* 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_libiconv) || defined (__stub___libiconv) +#if defined (__stub___gethostname) || defined (__stub_____gethostname) -+choke me -+#else + choke me + #else +-libiconv(); +__gethostname(); -+#endif + #endif -+; return 0; } -+EOF -+if { (eval echo configure:106203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* + ; return 0; } + EOF +-if { (eval echo configure:100188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- eval "ac_cv_func_libiconv=yes" + eval "ac_cv_func___gethostname=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_func_libiconv=no" + eval "ac_cv_func___gethostname=no" -+fi -+rm -f conftest* -+fi + fi + rm -f conftest* + fi +-if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then +if eval "test \"`echo '$ac_cv_func_'__gethostname`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 + echo "$ac_t""yes" 1>&6 +- +- +- echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h +- +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBICONV 1 +-EOF +- +- found_iconv=yes +- + found=yes -+else -+ echo "$ac_t""no" 1>&6 + else + echo "$ac_t""no" 1>&6 +found=no -+fi + fi +- +- + -+fi + fi +- fi +- +- if test "$found_iconv" = "no"; then --cat >> confdefs.h <<\EOF --#define UNDEF_THREADS_HACK +- for i in $PHP_ICONV /usr/local /usr; do +- if test -r $i/include/giconv.h; then +- cat >> confdefs.h <<\EOF +-#define HAVE_GICONV_H 1 + case $found in + yes) + cat >> confdefs.h <<\EOF +#define HAVE_GETHOSTNAME 1 EOF +- ICONV_DIR=$i +- iconv_lib_name=giconv +- break +- elif test -r $i/include/iconv.h; then +- ICONV_DIR=$i +- iconv_lib_name=iconv +- break +- fi +- done +- +- if test -z "$ICONV_DIR"; then +- { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=" 1>&2; exit 1; } +- fi +- +- if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || +- test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME +- then +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- -L$ICONV_DIR/$PHP_LIBDIR +- " +- +- 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 - - --echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:100490: checking for ANSI C header files" >&5 --if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then +- 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="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" +- else +- +- +- +- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + ac_cv_func_gethostname=yes + ;; -+ + +- 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 libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 +-echo "configure:100344: checking for libiconv in -l$iconv_lib_name" >&5 +-ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` + unset ac_cv_lib_nsl_gethostname + unset ac_cv_lib_nsl___gethostname + unset found + echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106241: checking for gethostname in -lnsl" >&5 ++echo "configure:106563: 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 + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -- cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < --#include --#include --#include -+/* 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. */ + /* 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 libiconv(); +char gethostname(); -+ -+int main() { + + int main() { +-libiconv() +gethostname() -+; return 0; } + ; return 0; } EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:100503: \"$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 -+if { (eval echo configure:106260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:100363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* -- ac_cv_header_stdc=yes -+ eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_lib_$ac_lib_var=yes" else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- ac_cv_header_stdc=no -+ eval "ac_cv_lib_$ac_lib_var=no" +@@ -100374,152 +106593,31 @@ LIBS="$ac_save_LIBS" fi - rm -f conftest* -+LIBS="$ac_save_LIBS" - --if test $ac_cv_header_stdc = yes; then -- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 + 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 +- +- found_iconv=yes +- +- echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h +- +- cat >> confdefs.h <<\EOF +-#define HAVE_LIBICONV 1 +-EOF +- +- +- echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h +- +- cat >> confdefs.h <<\EOF +-#define ICONV_ALIASED_LIBICONV 1 +-EOF +- +- +- + found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ + else + echo "$ac_t""no" 1>&6 + +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_$iconv_lib_name_libiconv +- +- +- save_old_LDFLAGS=$LDFLAGS +- ac_stuff=" +- -L$ICONV_DIR/$PHP_LIBDIR +- " +- +- 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="-L$ai_p $LDFLAGS" +- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$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 iconv in -l$iconv_lib_name""... $ac_c" 1>&6 +-echo "configure:100504: checking for iconv in -l$iconv_lib_name" >&5 +-ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` + echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106280: checking for __gethostname in -lnsl" >&5 ++echo "configure:106602: 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 -+else -+ ac_save_LIBS="$LIBS" + 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$iconv_lib_name $LIBS" +LIBS="-lnsl $LIBS" cat > conftest.$ac_ext < -+/* 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. */ + /* 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 iconv(); +char __gethostname(); -+ -+int main() { + + int main() { +-iconv() +__gethostname() -+; return 0; } + ; return 0; } EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "memchr" >/dev/null 2>&1; then -- : -+if { (eval echo configure:106299: \"$ac_link\") 1>&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 +-if { (eval echo configure:100523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* -- ac_cv_header_stdc=no -+ eval "ac_cv_lib_$ac_lib_var=no" - fi + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -100531,1133 +106629,1544 @@ fi rm -f conftest* -+LIBS="$ac_save_LIBS" + LIBS="$ac_save_LIBS" - fi +-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 +- +- found_iconv=yes +- +- +-else +- echo "$ac_t""no" 1>&6 - --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 < +- LDFLAGS=$save_old_LDFLAGS +- ext_shared=$save_ext_shared +- unset ac_cv_lib_$iconv_lib_name_iconv +- +- +-fi +- +- +- +-fi +- +- fi +- fi +- +- if test "$found_iconv" = "yes"; then +- +- echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h +- +- cat >> confdefs.h <<\EOF +-#define HAVE_ICONV 1 -EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "free" >/dev/null 2>&1; then -- : +- +- if test -n "$ICONV_DIR"; then +- +- +- if test "$ext_shared" = "yes"; then +- XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD" +- if test -n "$ICONV_DIR/$PHP_LIBDIR"; then +- +- if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then +- +- if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$ICONV_DIR/$PHP_LIBDIR +- else +- +- ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" +- fi +- +- +- if test "$ext_shared" = "yes"; then +- XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" +- test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_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 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes - else -- rm -rf conftest* -- ac_cv_header_stdc=no ++else + echo "$ac_t""no" 1>&6 +found=no - fi --rm -f conftest* ++fi +- fi +- +- fi + - fi ++fi --if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. --if test "$cross_compiling" = yes; then -- : -+ +- fi +- else +- + +- if test -n "$ICONV_DIR/$PHP_LIBDIR"; then +- +- if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then +- +- if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then +- ai_p=$ICONV_DIR/$PHP_LIBDIR +- else +- +- ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" +- fi + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lnsl" + if test "$cross_compiling" = yes; then + found=no - else - cat > conftest.$ac_ext < --#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) --#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) --int main () { int i; for (i = 0; i < 256; i++) --if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); --exit (0); } -- ++else ++ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:106335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then -- : ++EOF ++if { (eval echo configure:106657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++then + found=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- ac_cv_header_stdc=no ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + found=no - fi - rm -fr conftest* - fi ++fi ++rm -fr conftest* ++fi --fi --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" +- + LIBS=$ac_libs -+ fi + fi --echo "$ac_t""$ac_cv_header_stdc" 1>&6 --if test $ac_cv_header_stdc = yes; then -- cat >> confdefs.h <<\EOF --#define STDC_HEADERS 1 +- + if test "$found" = "yes"; then -+ -+ + +- fi +- +- fi +- + +- case $iconv_lib_name in + case nsl in -+ c|c_r|pthread*) ;; -+ *) + c|c_r|pthread*) ;; + *) +- LIBS="-l$iconv_lib_name $LIBS" + LIBS="-lnsl $LIBS" -+ ;; -+ esac -+ -+ + ;; + esac + + + cat >> confdefs.h <<\EOF +#define HAVE_GETHOSTNAME 1 - EOF ++EOF --fi + cat >> confdefs.h <<\EOF +#define HAVE_LIBNSL 1 +EOF --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:100597: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- fi +- +- +- +- if test "$ICONV_DIR/include" != "/usr/include"; then +- +- if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then +- ai_p=$ICONV_DIR/include + ac_cv_func_gethostname=yes -+ else -+ + else + +- ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`" +- fi + : -+ + +- + 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 + esac -+ + +- fi + + unset ac_cv_func_getdomainname + unset ac_cv_func___getdomainname + unset found + + echo $ac_n "checking for getdomainname""... $ac_c" 1>&6 -+echo "configure:106386: checking for getdomainname" >&5 ++echo "configure:106708: checking for getdomainname" >&5 +if eval "test \"`echo '$''{'ac_cv_func_getdomainname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext < @@ -57587,9 +58153,17 @@ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char getdomainname(); -+ + +- fi +- +-else +- { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; } +- +- fi +int main() { -+ + +- fi +-fi +/* 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. */ @@ -57598,45 +58172,66 @@ +#else +getdomainname(); +#endif -+ + +-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:100713: 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 +- if test -n "$RANLIB"; then +- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +; return 0; } - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:100607: \"$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 -+if { (eval echo configure:106414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" ++EOF ++if { (eval echo configure:106736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* + eval "ac_cv_func_getdomainname=yes" else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_RANLIB="ranlib" +- break +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* + eval "ac_cv_func_getdomainname=no" fi - rm -f conftest* ++rm -f conftest* fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +-RANLIB="$ac_cv_prog_RANLIB" +-if test -n "$RANLIB"; then +- echo "$ac_t""$RANLIB" 1>&6 + +if eval "test \"`echo '$ac_cv_func_'getdomainname`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 + found=yes -+else -+ echo "$ac_t""no" 1>&6 + else + echo "$ac_t""no" 1>&6 +-fi +- +-echo $ac_n "checking for inline""... $ac_c" 1>&6 +-echo "configure:100741: checking for inline" >&5 +-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then + echo $ac_n "checking for __getdomainname""... $ac_c" 1>&6 -+echo "configure:106432: checking for __getdomainname" >&5 ++echo "configure:106754: checking for __getdomainname" >&5 +if eval "test \"`echo '$''{'ac_cv_func___getdomainname'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <&6 + else +- ac_cv_c_inline=no +-for ac_kw in inline __inline__ __inline; do + cat > conftest.$ac_ext < @@ -57644,8 +58239,9 @@ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char __getdomainname(); -+ -+int main() { + + int main() { +-} $ac_kw foo() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named @@ -57656,39 +58252,65 @@ +__getdomainname(); +#endif + -+; return 0; } + ; return 0; } EOF -- -+if { (eval echo configure:106460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* +-if { (eval echo configure:100755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:106782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- ac_cv_c_inline=$ac_kw; break + eval "ac_cv_func___getdomainname=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func___getdomainname=no" -+fi -+rm -f conftest* -+fi -+ + fi + rm -f conftest* +-done +- + fi + +-echo "$ac_t""$ac_cv_c_inline" 1>&6 +-case "$ac_cv_c_inline" in +- inline | yes) ;; +- no) cat >> confdefs.h <<\EOF +-#define inline +-EOF +- ;; +- *) cat >> confdefs.h <&6 + found=yes - else - echo "$ac_t""no" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 +found=no +fi + - fi --done ++fi +-cat >> confdefs.h <<\EOF +-#define UNDEF_THREADS_HACK + case $found in + yes) + cat >> confdefs.h <<\EOF +#define HAVE_GETDOMAINNAME 1 -+EOF + EOF +- +- +-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:100793: checking for ANSI C header files" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + ac_cv_func_getdomainname=yes + ;; + @@ -57698,72 +58320,72 @@ + unset ac_cv_lib_nsl___getdomainname + unset found + echo $ac_n "checking for getdomainname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106498: checking for getdomainname in -lnsl" >&5 ++echo "configure:106820: checking for getdomainname in -lnsl" >&5 +ac_lib_var=`echo nsl'_'getdomainname | 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 + echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext < conftest.$ac_ext < +-#include +-#include +-#include +/* 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 getdomainname(); - ++ +int main() { +getdomainname() +; return 0; } -+EOF -+if { (eval echo configure:106517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* + EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:100806: \"$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 ++if { (eval echo configure:106839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- ac_cv_header_stdc=yes + eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* + else +- echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- ac_cv_header_stdc=no + eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* + fi + rm -f conftest* +LIBS="$ac_save_LIBS" +-if test $ac_cv_header_stdc = yes; then +- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else + echo "$ac_t""no" 1>&6 - --echo $ac_n "checking size of char""... $ac_c" 1>&6 --echo "configure:100639: checking size of char" >&5 --if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then ++ + echo $ac_n "checking for __getdomainname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106537: checking for __getdomainname in -lnsl" >&5 ++echo "configure:106859: checking for __getdomainname in -lnsl" >&5 +ac_lib_var=`echo nsl'_'__getdomainname | 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 -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_char=1 --else -- cat > conftest.$ac_ext <&6 ++else + ac_save_LIBS="$LIBS" +LIBS="-lnsl $LIBS" -+cat > conftest.$ac_ext < conftest.$ac_ext < --#include --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(char)); -- exit(0); --} +-#include +/* 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. */ @@ -57773,49 +58395,53 @@ +__getdomainname() +; return 0; } EOF --if { (eval echo configure:100659: \"$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` -+if { (eval echo configure:106556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "memchr" >/dev/null 2>&1; then +- : ++if { (eval echo configure:106878: \"$ac_link\") 1>&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 -fr conftest* -- ac_cv_sizeof_char=0 --fi --rm -fr conftest* -+ rm -rf conftest* ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -rf conftest* +- ac_cv_header_stdc=no + eval "ac_cv_lib_$ac_lib_var=no" fi -+rm -f conftest* + rm -f conftest* +LIBS="$ac_save_LIBS" fi --echo "$ac_t""$ac_cv_sizeof_char" 1>&6 --cat >> confdefs.h < conftest.$ac_ext < -EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "free" >/dev/null 2>&1; then +- : +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes -+else + else +- rm -rf conftest* +- ac_cv_header_stdc=no + echo "$ac_t""no" 1>&6 +found=no -+fi + fi +-rm -f conftest* + -+fi - + fi --echo $ac_n "checking size of int""... $ac_c" 1>&6 --echo "configure:100680: 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 -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_int=4 +-if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +-if test "$cross_compiling" = yes; then +- : ++ + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lnsl" @@ -57823,42 +58449,43 @@ + found=no else cat > conftest.$ac_ext < --#include --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(int)); -- exit(0); --} +-#include +-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +-int main () { int i; for (i = 0; i < 256; i++) +-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +-exit (0); } +- +main() { return (0); } EOF --if { (eval echo configure:100700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:106592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:100873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:106914: \"$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` +- : + found=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -fr conftest* -- ac_cv_sizeof_int=0 +- ac_cv_header_stdc=no + found=no fi rm -fr conftest* fi -fi --echo "$ac_t""$ac_cv_sizeof_int" 1>&6 --cat >> confdefs.h <&6 +-if test $ac_cv_header_stdc = yes; then +- cat >> confdefs.h <<\EOF +-#define STDC_HEADERS 1 + if test "$found" = "yes"; then + + @@ -57872,12 +58499,19 @@ + + cat >> confdefs.h <<\EOF +#define HAVE_GETDOMAINNAME 1 -+EOF -+ + EOF + +-fi + cat >> confdefs.h <<\EOF +#define HAVE_LIBNSL 1 - EOF ++EOF +-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:100900: checking for $ac_hdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + ac_cv_func_getdomainname=yes + else + @@ -57895,13 +58529,15 @@ + unset found + + echo $ac_n "checking for getservbyport""... $ac_c" 1>&6 -+echo "configure:106643: checking for getservbyport" >&5 ++echo "configure:106965: checking for getservbyport" >&5 +if eval "test \"`echo '$''{'ac_cv_func_getservbyport'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <&6 + else + cat > conftest.$ac_ext < +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char getservbyport(); below. */ +#include @@ -57920,83 +58556,49 @@ +#else +getservbyport(); +#endif - --echo $ac_n "checking size of long""... $ac_c" 1>&6 --echo "configure:100720: 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 -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_long=4 --else -- cat > conftest.$ac_ext < --#include --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(long)); -- exit(0); --} ++ +; return 0; } EOF --if { (eval echo configure:100740: \"$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` -+if { (eval echo configure:106671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:100910: \"$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 ++if { (eval echo configure:106993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_func_getservbyport=yes" else +- echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_sizeof_long=0 --fi --rm -fr conftest* -+ rm -rf conftest* + rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" + eval "ac_cv_func_getservbyport=no" fi -- -+rm -f conftest* + rm -f conftest* fi --echo "$ac_t""$ac_cv_sizeof_long" 1>&6 --cat >> confdefs.h <&6 --echo "configure:100760: 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 +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ +if eval "test \"`echo '$ac_cv_func_'getservbyport`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 + echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 + echo "$ac_t""no" 1>&6 +-fi +-done + echo $ac_n "checking for __getservbyport""... $ac_c" 1>&6 -+echo "configure:106689: checking for __getservbyport" >&5 ++echo "configure:107011: checking for __getservbyport" >&5 +if eval "test \"`echo '$''{'ac_cv_func___getservbyport'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < --#include --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(long long)); -- exit(0); --} ++else ++ cat > conftest.$ac_ext < @@ -58004,7 +58606,7 @@ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char __getservbyport(); -+ + +int main() { + +/* The GNU C library defines this for functions which it implements @@ -58015,26 +58617,20 @@ +#else +__getservbyport(); +#endif -+ + +; return 0; } - EOF --if { (eval echo configure:100780: \"$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` -+if { (eval echo configure:106717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++EOF ++if { (eval echo configure:107039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func___getservbyport=yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_sizeof_long_long=0 ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func___getservbyport=no" - fi --rm -fr conftest* ++fi +rm -f conftest* - fi ++fi +if eval "test \"`echo '$ac_cv_func_'__getservbyport`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -58044,22 +58640,18 @@ +found=no +fi + - fi --echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 --cat >> confdefs.h <&6 --echo "configure:100800: checking for size_t" >&5 --if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + case $found in + yes) + cat >> confdefs.h <<\EOF +#define HAVE_GETSERVBYPORT 1 +EOF -+ + +-echo $ac_n "checking size of char""... $ac_c" 1>&6 +-echo "configure:100942: checking size of char" >&5 +-if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then + ac_cv_func_getservbyport=yes + ;; + @@ -58069,23 +58661,29 @@ + unset ac_cv_lib_nsl___getservbyport + unset found + echo $ac_n "checking for getservbyport in -lnsl""... $ac_c" 1>&6 -+echo "configure:106755: checking for getservbyport in -lnsl" >&5 ++echo "configure:107077: checking for getservbyport in -lnsl" >&5 +ac_lib_var=`echo nsl'_'getservbyport | 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 +- if test "$cross_compiling" = yes; then +- ac_cv_sizeof_char=1 +-else - cat > conftest.$ac_ext < conftest.$ac_ext < --#if STDC_HEADERS --#include --#include --#endif +-#include +-main() +-{ +- FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(char)); +- exit(0); +-} +/* 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. */ @@ -58095,87 +58693,68 @@ +getservbyport() +; return 0; } EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+if { (eval echo configure:106774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- ac_cv_type_size_t=yes +-if { (eval echo configure:100961: \"$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` ++if { (eval echo configure:107096: \"$ac_link\") 1>&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* -- ac_cv_type_size_t=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_sizeof_char=0 ++ rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi - rm -f conftest* +-rm -fr conftest* ++rm -f conftest* +LIBS="$ac_save_LIBS" - - fi --echo "$ac_t""$ac_cv_type_size_t" 1>&6 --if test $ac_cv_type_size_t = no; then -- cat >> confdefs.h <<\EOF --#define size_t unsigned --EOF -- --fi ++ ++fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else + echo "$ac_t""no" 1>&6 - --echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:100833: 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 "checking for __getservbyport in -lnsl""... $ac_c" 1>&6 -+echo "configure:106794: checking for __getservbyport in -lnsl" >&5 ++echo "configure:107116: checking for __getservbyport in -lnsl" >&5 +ac_lib_var=`echo nsl'_'__getservbyport | 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 -- cat > conftest.$ac_ext <&6 ++else + ac_save_LIBS="$LIBS" +LIBS="-lnsl $LIBS" +cat > conftest.$ac_ext < --#include --#include ++#line 107124 "configure" ++#include "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 __getservbyport(); + - int main() { --struct tm *tp; ++int main() { +__getservbyport() - ; return 0; } - EOF --if { (eval echo configure:100847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:106813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- ac_cv_header_time=yes ++; return 0; } ++EOF ++if { (eval echo configure:107135: \"$ac_link\") 1>&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* -- ac_cv_header_time=no ++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* --fi ++rm -f conftest* +LIBS="$ac_save_LIBS" --echo "$ac_t""$ac_cv_header_time" 1>&6 --if test $ac_cv_header_time = yes; then -- cat >> confdefs.h <<\EOF --#define TIME_WITH_SYS_TIME 1 + fi +-echo "$ac_t""$ac_cv_sizeof_char" 1>&6 +-cat >> confdefs.h <&6 + found=yes @@ -58185,13 +58764,16 @@ +fi + - fi ++fi --echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 --echo "configure:100868: checking for uid_t in sys/types.h" >&5 --if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then + +-echo $ac_n "checking size of int""... $ac_c" 1>&6 +-echo "configure:100982: 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 +- if test "$cross_compiling" = yes; then +- ac_cv_sizeof_int=4 + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lnsl" @@ -58199,36 +58781,38 @@ + found=no else cat > conftest.$ac_ext < +-#include +-main() +-{ +- FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(int)); +- exit(0); +-} +main() { return (0); } EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "uid_t" >/dev/null 2>&1; then -- rm -rf conftest* -- ac_cv_type_uid_t=yes -+if { (eval echo configure:106849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then +-if { (eval echo configure:101001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:107171: \"$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` + found=yes else -- rm -rf conftest* -- ac_cv_type_uid_t=no -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* +- ac_cv_sizeof_int=0 + found=no fi --rm -f conftest* -- -+rm -fr conftest* + rm -fr conftest* fi --echo "$ac_t""$ac_cv_type_uid_t" 1>&6 --if test $ac_cv_type_uid_t = no; then -- cat >> confdefs.h <<\EOF --#define uid_t int +-fi +-echo "$ac_t""$ac_cv_sizeof_int" 1>&6 +-cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_GETSERVBYPORT 1 - EOF - -- cat >> confdefs.h <<\EOF --#define gid_t int ++EOF ++ + cat >> confdefs.h <<\EOF +#define HAVE_LIBNSL 1 EOF --fi + ac_cv_func_getservbyport=yes + else + + : +-echo $ac_n "checking size of long""... $ac_c" 1>&6 +-echo "configure:101021: checking size of long" >&5 +-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then + fi + + ;; + + esac - ++ + + unset ac_cv_func_getservbyname + unset ac_cv_func___getservbyname + unset found + + echo $ac_n "checking for getservbyname""... $ac_c" 1>&6 -+echo "configure:106900: checking for getservbyname" >&5 ++echo "configure:107222: checking for getservbyname" >&5 +if eval "test \"`echo '$''{'ac_cv_func_getservbyname'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <&6 + else +- if test "$cross_compiling" = yes; then +- ac_cv_sizeof_long=4 +-else + cat > conftest.$ac_ext < +-main() +-{ +- FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(long)); +- exit(0); +-} +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char getservbyname(); below. */ +#include @@ -58285,9 +58881,9 @@ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char getservbyname(); - ++ +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. */ @@ -58296,260 +58892,240 @@ +#else +getservbyname(); +#endif - ++ +; return 0; } -+EOF -+if { (eval echo configure:106928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF +-if { (eval echo configure:101040: \"$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` ++if { (eval echo configure:107250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_getservbyname=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_sizeof_long=0 +-fi +-rm -fr conftest* + rm -rf conftest* + eval "ac_cv_func_getservbyname=no" -+fi + fi +- +rm -f conftest* -+fi + fi +-echo "$ac_t""$ac_cv_sizeof_long" 1>&6 +-cat >> confdefs.h <&6 --echo "configure:100913: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +- +-echo $ac_n "checking size of long long""... $ac_c" 1>&6 +-echo "configure:101060: 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 +if eval "test \"`echo '$ac_cv_func_'getservbyname`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes -+else + else +- if test "$cross_compiling" = yes; then +- ac_cv_sizeof_long_long=8 + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for __getservbyname""... $ac_c" 1>&6 -+echo "configure:106946: checking for __getservbyname" >&5 ++echo "configure:107268: checking for __getservbyname" >&5 +if eval "test \"`echo '$''{'ac_cv_func___getservbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 ++ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +-main() +-{ +- FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); +- fprintf(f, "%d\n", sizeof(long long)); +- exit(0); +-} ++/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char __getservbyname(); below. */ - #include - /* 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(); ++#include ++/* 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 __getservbyname(); - - 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) ++ ++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___getservbyname) || defined (__stub_____getservbyname) - choke me - #else --$ac_func(); ++choke me ++#else +__getservbyname(); - #endif - - ; return 0; } ++#endif ++ ++; return 0; } EOF --if { (eval echo configure:100941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:106974: \"$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" +-if { (eval echo configure:101079: \"$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` ++if { (eval echo configure:107296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* + eval "ac_cv_func___getservbyname=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" +- rm -fr conftest* +- ac_cv_sizeof_long_long=0 ++ rm -rf conftest* + eval "ac_cv_func___getservbyname=no" fi - rm -f conftest* +-rm -fr conftest* ++rm -f conftest* fi --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +if eval "test \"`echo '$ac_cv_func_'__getservbyname`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <&6 + found=yes - else - echo "$ac_t""no" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 +found=no +fi + fi --done -- -- -- +-echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 +-cat >> confdefs.h <&6 +-echo "configure:101099: checking for size_t" >&5 +-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + case $found in + yes) + cat >> confdefs.h <<\EOF +#define HAVE_GETSERVBYNAME 1 +EOF - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_XMLRPC_SHARED=no -- -- -- case ext/xmlrpc in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- ++ + ac_cv_func_getservbyname=yes + ;; - -- -- 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 xmlrpc-epi-php.c libxmlrpc/base64.c \ -- libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -- libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -- libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -- libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -- libxmlrpc/xml_to_soap.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 ++ + unset ac_cv_lib_nsl_getservbyname + unset ac_cv_lib_nsl___getservbyname + unset found + echo $ac_n "checking for getservbyname in -lnsl""... $ac_c" 1>&6 -+echo "configure:107012: checking for getservbyname in -lnsl" >&5 ++echo "configure:107334: checking for getservbyname in -lnsl" >&5 +ac_lib_var=`echo nsl'_'getservbyname | 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 + echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext < conftest.$ac_ext < +-#if STDC_HEADERS +-#include +-#include +-#endif +/* 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 getservbyname(); - -- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then ++if { (eval echo configure:107353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- ac_cv_type_size_t=yes + eval "ac_cv_lib_$ac_lib_var=yes" -+else + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 -+ rm -rf conftest* + rm -rf conftest* +- ac_cv_type_size_t=no + eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* + fi + rm -f conftest* +LIBS="$ac_save_LIBS" -+fi + fi +-echo "$ac_t""$ac_cv_type_size_t" 1>&6 +-if test $ac_cv_type_size_t = no; then +- cat >> confdefs.h <<\EOF +-#define size_t unsigned +-EOF +- +-fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + found=yes +else + echo "$ac_t""no" 1>&6 -- EXT_STATIC="$EXT_STATIC xmlrpc" -- if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" -- fi -- else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_XMLRPC_SHARED=yes -- -- case ext/xmlrpc in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- +-echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +-echo "configure:101132: 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 "checking for __getservbyname in -lnsl""... $ac_c" 1>&6 -+echo "configure:107051: checking for __getservbyname in -lnsl" >&5 ++echo "configure:107373: checking for __getservbyname in -lnsl" >&5 +ac_lib_var=`echo nsl'_'__getservbyname | 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 + echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext < conftest.$ac_ext < +-#include +-#include +/* 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 __getservbyname(); - -- 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 -+int main() { ++ + int main() { +-struct tm *tp; +__getservbyname() -+; return 0; } -+EOF -+if { (eval echo configure:107070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* + ; return 0; } + EOF +-if { (eval echo configure:101146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:107392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* +- ac_cv_header_time=yes + eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- ac_cv_header_time=no + eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* + fi + rm -f conftest* +-fi +LIBS="$ac_save_LIBS" +-echo "$ac_t""$ac_cv_header_time" 1>&6 +-if test $ac_cv_header_time = yes; then +- cat >> confdefs.h <<\EOF +-#define TIME_WITH_SYS_TIME 1 +-EOF +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 @@ -58559,88 +59135,54 @@ +found=no +fi -- old_IFS=$IFS -- for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ -- libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -- libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -- libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -- libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -- libxmlrpc/xml_to_soap.c; do - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" -+fi - -- 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 ++ + fi -- cat >>Makefile.objects<&6 +-echo "configure:101167: 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 ++ + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -lnsl" + if test "$cross_compiling" = yes; then + found=no -+else -+ cat > conftest.$ac_ext < conftest.$ac_ext < +main() { return (0); } 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'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so' -- ;; -- *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_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 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_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)' -- ;; -- esac -+if { (eval echo configure:107106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "uid_t" >/dev/null 2>&1; then +- rm -rf conftest* +- ac_cv_type_uid_t=yes ++if { (eval echo configure:107428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + found=yes -+else + else +- rm -rf conftest* +- ac_cv_type_uid_t=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + found=no -+fi + fi +-rm -f conftest* +- +rm -fr conftest* -+fi + fi -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" +-echo "$ac_t""$ac_cv_type_uid_t" 1>&6 +-if test $ac_cv_type_uid_t = no; then +- cat >> confdefs.h <<\EOF +-#define uid_t int + LIBS=$ac_libs - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" - -- cat >>Makefile.objects<> confdefs.h <<\EOF +#define HAVE_GETSERVBYNAME 1 EOF -- ;; -- *) -- -- install_modules="install-modules" +- cat >> confdefs.h <<\EOF +-#define gid_t int + cat >> confdefs.h <<\EOF +#define HAVE_LIBNSL 1 -+EOF + EOF -- 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'/xmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(XMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlrpc.so '$ext_builddir'/xmlrpc.so' -- ;; -- *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_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 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_xmlrpc) $(XMLRPC_SHARED_LIBADD)' -- ;; +-fi + ac_cv_func_getservbyname=yes + else + @@ -58688,14 +59214,12 @@ + + ;; + - esac - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix" ++ esac ++ + + if test "$PHP_HTTP_ZLIB_COMPRESSION" != "no"; then + echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -+echo "configure:107154: checking for zlib.h" >&5 ++echo "configure:107476: checking for zlib.h" >&5 + ZLIB_DIR= + for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do + if test -f "$i/include/zlib.h"; then @@ -58709,7 +59233,7 @@ + else + echo "$ac_t""found in $ZLIB_DIR" 1>&6 + echo $ac_n "checking for zlib version >= 1.2.0.4""... $ac_c" 1>&6 -+echo "configure:107168: checking for zlib version >= 1.2.0.4" >&5 ++echo "configure:107490: checking for zlib version >= 1.2.0.4" >&5 + ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[^0-9\.]//g'` + echo "$ac_t""$ZLIB_VERSION" 1>&6 + if test `echo $ZLIB_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then @@ -58720,18 +59244,16 @@ + + if test -z "$ZLIB_DIR/include" || echo "$ZLIB_DIR/include" | grep '^/' >/dev/null ; then + ai_p=$ZLIB_DIR/include - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" ++ else + + ep_dir="`echo $ZLIB_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ZLIB_DIR/include\"`" - fi ++ fi + + - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" ++ + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" @@ -58746,16 +59268,10 @@ + + fi -- cat >>Makefile.objects<> confdefs.h <&6 +-echo "configure:101212: checking for $ac_func" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + fi + + fi - - fi ++ ++ fi + else + + @@ -58818,22 +59338,12 @@ + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`" - fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_XMLRPC_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- ++ fi ++ + + - -- case ext/xmlrpc in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac - ++ ++ + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" @@ -58843,35 +59353,15 @@ + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" + PHP_RPATHS="$PHP_RPATHS $ai_p" - ++ + fi - -- 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 - ++ ++ + + fi - -- old_IFS=$IFS -- for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ -- libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -- libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -- libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -- libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -- libxmlrpc/xml_to_soap.c; do ++ + fi - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ + + case z in + c|c_r|pthread*) ;; @@ -58879,31 +59369,10 @@ + LIBS="-lz $LIBS" + ;; + esac - -- 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<&6 -+echo "configure:107312: checking for curl/curl.h" >&5 ++echo "configure:107634: checking for curl/curl.h" >&5 + CURL_DIR= + for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do + if test -f "$i/include/curl/curl.h"; then @@ -58933,7 +59402,7 @@ + fi + + echo $ac_n "checking for curl-config""... $ac_c" 1>&6 -+echo "configure:107328: checking for curl-config" >&5 ++echo "configure:107650: checking for curl-config" >&5 + CURL_CONFIG= + for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do + if test -x "$i"; then @@ -58949,7 +59418,7 @@ + fi + + echo $ac_n "checking for curl version >= 7.12.3""... $ac_c" 1>&6 -+echo "configure:107344: checking for curl version >= 7.12.3" >&5 ++echo "configure:107666: checking for curl version >= 7.12.3" >&5 + CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[^0-9\.]//g'` + echo "$ac_t""$CURL_VERSION" 1>&6 + if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then @@ -58968,7 +59437,7 @@ + LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR" + + echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 -+echo "configure:107363: checking for SSL support in libcurl" >&5 ++echo "configure:107685: 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 @@ -58978,14 +59447,14 @@ + + + echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 -+echo "configure:107373: checking for openssl support in libcurl" >&5 ++echo "configure:107695: checking for openssl support in libcurl" >&5 + if test "$cross_compiling" = yes; then + + echo "$ac_t""no" 1>&6 + +else + cat > conftest.$ac_ext < @@ -59000,23 +59469,31 @@ + } + +EOF -+if { (eval echo configure:107395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:107717: \"$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 + ac_safe=`echo "openssl/crypto.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for openssl/crypto.h""... $ac_c" 1>&6 -+echo "configure:107401: checking for openssl/crypto.h" >&5 ++echo "configure:107723: checking for openssl/crypto.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 <&6 + else + cat > conftest.$ac_ext < +-/* 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(); +#include +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:107411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:107733: \"$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* @@ -59032,23 +59509,25 @@ +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 - ++ + cat >> confdefs.h <<\EOF +#define HTTP_HAVE_OPENSSL 1 +EOF -- 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 +-int main() { + +else + echo "$ac_t""no" 1>&6 +fi +-/* 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 + +else + echo "configure: failed program was:" >&5 @@ -59061,23 +59540,17 @@ +rm -fr conftest* +fi -- old_IFS=$IFS -- for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ -- libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -- libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -- libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -- libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -- libxmlrpc/xml_to_soap.c; do +-; return 0; } + + echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 -+echo "configure:107451: checking for gnutls support in libcurl" >&5 ++echo "configure:107773: checking for gnutls support in libcurl" >&5 + if test "$cross_compiling" = yes; then + + echo "$ac_t""no" 1>&6 + +else + cat > conftest.$ac_ext < @@ -59092,77 +59565,76 @@ + } + +EOF -+if { (eval echo configure:107473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:107795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 -+echo "configure:107479: checking for gcrypt.h" >&5 ++echo "configure:107801: checking for gcrypt.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 + EOF +-if { (eval echo configure:101240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:107489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:107811: \"$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* + rm -rf conftest* +- eval "ac_cv_func_$ac_func=yes" + eval "ac_cv_header_$ac_safe=yes" -+else + else + echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* +- eval "ac_cv_func_$ac_func=no" + eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi + fi + rm -f conftest* + fi +- +-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 + echo "$ac_t""yes" 1>&6 +- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` +- cat >> confdefs.h <> confdefs.h <<\EOF +#define HTTP_HAVE_GNUTLS 1 -+EOF - -- 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 + EOF +- ++ + -+else -+ echo "$ac_t""no" 1>&6 -+fi + else + echo "$ac_t""no" 1>&6 + fi +-done +- +- +- -- cat >>Makefile.objects<&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* -+ + +- ext_builddir=ext/xmlrpc +- ext_srcdir=$abs_srcdir/ext/xmlrpc + echo "$ac_t""no" 1>&6 + +fi +rm -fr conftest* +fi +- ac_extra=`echo "-I@ext_srcdir@/libxmlrpc -DVERSION="0.50""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` + else + echo "$ac_t""no" 1>&6 + fi @@ -59174,7 +59646,7 @@ + + + echo $ac_n "checking for bundled SSL CA info""... $ac_c" 1>&6 -+echo "configure:107538: checking for bundled SSL CA info" >&5 ++echo "configure:107860: checking for bundled SSL CA info" >&5 + CURL_CAINFO= + for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do + if test -f "$i"; then @@ -59189,10 +59661,7 @@ + cat >> confdefs.h <>Makefile.objects</dev/null ; then + ai_p=$CURL_DIR/$PHP_LIBDIR -+ else + else +- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then +- PHP_XMLRPC_SHARED=yes +- +- case ext/xmlrpc in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac + + ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + + ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" - fi - ++ fi ++ + + if test "$ext_shared" = "yes"; then + HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" @@ -59258,9 +59776,70 @@ + -- BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc" +- +- 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 xmlrpc-epi-php.c libxmlrpc/base64.c \ +- libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ +- libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ +- libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ +- libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ +- libxmlrpc/xml_to_soap.c; do + unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` +- IFS=. +- set $ac_src +- ac_obj=$1 +- IFS=$old_IFS +- +- shared_objects_xmlrpc="$shared_objects_xmlrpc $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<>Makefile.objects<&6 --echo "configure:101295: 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 -- echo "$ac_t""found in $i" 1>&6 -- break - fi -- done +- ;; +- *) +- +- install_modules="install-modules" ++ fi + - fi ++ fi -- if test -z "$XMLRPC_DIR"; then -- echo "$ac_t""not found" 1>&6 -- { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; } -- fi +- 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'/xmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(XMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlrpc.so '$ext_builddir'/xmlrpc.so' +- ;; +- *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_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 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_xmlrpc) $(XMLRPC_SHARED_LIBADD)' +- ;; +- esac + fi + else + -- -- if test "$XMLRPC_DIR" != "/usr/include"; then +- if test "x" = "xyes"; then +- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix" + if test -n "$CURL_DIR/$PHP_LIBDIR"; then - -- if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then -- ai_p=$XMLRPC_DIR ++ + if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then + + if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then + ai_p=$CURL_DIR/$PHP_LIBDIR else - -- ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" ++ + ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" + ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" +- +- cat >>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects</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 ++ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" ++ else ++ + + +- BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc" ++ 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 + +- XMLRPC_MODULE_TYPE=builtin +- +-elif test "$PHP_XMLRPC" != "no"; then + +- if test -r $PHP_XMLRPC/include/xmlrpc.h; then +- XMLRPC_DIR=$PHP_XMLRPC/include +- elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; 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:101594: 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 +- echo "$ac_t""found in $i" 1>&6 +- break + fi +- done ++ + fi + +- if test -z "$XMLRPC_DIR"; then +- echo "$ac_t""not found" 1>&6 +- { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; } +- fi ++ ;; ++ esac ++ done + +- +- if test "$XMLRPC_DIR" != "/usr/include"; then +- +- if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then +- ai_p=$XMLRPC_DIR +- else +- +- ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" +- +- ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`" +- fi ++ cat >> confdefs.h <<\EOF ++#define HTTP_HAVE_CURL 1 ++EOF + +- ++ ++ ++ save_old_LDFLAGS=$LDFLAGS ++ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR ++ " ++ ++ 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 $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + +- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$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 +- ++ 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 -+ + +- if test "$ext_shared" = "yes"; then +- XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD" +- if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then + + fi + ;; @@ -59414,7 +60251,8 @@ + ;; + -L*) + ac_ii=`echo $ac_i|cut -c 3-` -+ + +- if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then + if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then - if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then @@ -59435,12 +60273,12 @@ if test "$ext_shared" = "yes"; then - XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" - test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" -+ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" else -@@ -101380,26 +107765,88 @@ echo "configure:101295: checking for XML +@@ -101679,26 +108188,136 @@ echo "configure:101594: checking for XML fi @@ -59448,11 +60286,59 @@ + esac + done + -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_CURL 1 ++ echo $ac_n "checking for curl_share_strerror in -lcurl""... $ac_c" 1>&6 ++echo "configure:108197: checking for curl_share_strerror in -lcurl" >&5 ++ac_lib_var=`echo curl'_'curl_share_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 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lcurl $LIBS" ++cat > conftest.$ac_ext <&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_CURL_SHARE_STRERROR 1 +EOF + -+ ++ ++else ++ echo "$ac_t""no" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ unset ac_cv_lib_curl_curl_share_strerror ++ ++ ++fi ++ + + save_old_LDFLAGS=$LDFLAGS + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR @@ -59539,7 +60425,7 @@ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -101415,431 +107862,676 @@ echo "configure:101295: checking for XML +@@ -101714,431 +108333,676 @@ echo "configure:101594: checking for XML fi @@ -59562,28 +60448,28 @@ + esac + done -+ echo $ac_n "checking for curl_share_strerror in -lcurl""... $ac_c" 1>&6 -+echo "configure:107875: checking for curl_share_strerror in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_share_strerror | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 ++echo "configure:108346: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:108365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -59602,7 +60488,7 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF -+#define HAVE_CURL_SHARE_STRERROR 1 ++#define HAVE_CURL_MULTI_STRERROR 1 +EOF @@ -59614,7 +60500,7 @@ - ac_extra= + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_share_strerror ++ unset ac_cv_lib_curl_curl_multi_strerror + + +fi @@ -59634,7 +60520,7 @@ - esac + save_ext_shared=$ext_shared + ext_shared=yes -+ + + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) @@ -59644,7 +60530,7 @@ + + 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" @@ -59794,21 +60680,21 @@ - *netware*) - - install_modules="install-modules" -+ echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 -+echo "configure:108024: checking for curl_multi_strerror in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6 ++echo "configure:108495: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:108514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -59861,7 +60747,7 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF -+#define HAVE_CURL_MULTI_STRERROR 1 ++#define HAVE_CURL_EASY_STRERROR 1 EOF - ;; @@ -59888,7 +60774,7 @@ - esac + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_multi_strerror ++ unset ac_cv_lib_curl_curl_easy_strerror + + +fi @@ -59897,13 +60783,11 @@ - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix" - else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" -- fi + + save_old_LDFLAGS=$LDFLAGS + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR + " - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" ++ + save_ext_shared=$ext_shared + ext_shared=yes + @@ -59921,7 +60805,9 @@ + if test -n "$unique" && test "`eval $cmd`" = "" ; then + eval "EXTRA_LDFLAGS$unique=set" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi + fi +- +- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" - cat >>Makefile.objects<&6 -+echo "configure:108173: checking for curl_easy_strerror in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'` + +- 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 ++ echo $ac_n "checking for curl_easy_reset in -lcurl""... $ac_c" 1>&6 ++echo "configure:108644: checking for curl_easy_reset in -lcurl" >&5 ++ac_lib_var=`echo curl'_'curl_easy_reset | 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="-lcurl $LIBS" +cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + EOF +- done +- ++if { (eval echo configure:108663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -60055,56 +60961,44 @@ +rm -f conftest* +LIBS="$ac_save_LIBS" -- old_IFS=$IFS -- for ac_src in xmlrpc-epi-php.c; do +- EXT_STATIC="$EXT_STATIC xmlrpc" +- ;; +- *) +- +- +- case ext/xmlrpc in +- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; +- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; +- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; +- esac +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 -- 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<> confdefs.h <<\EOF -+#define HAVE_CURL_EASY_STRERROR 1 - EOF -- done - -+ ++#define HAVE_CURL_EASY_RESET 1 ++EOF ++ + +else + echo "$ac_t""no" 1>&6 -- EXT_STATIC="$EXT_STATIC xmlrpc" -- ;; -- *) -- +- 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 + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_easy_strerror ++ unset ac_cv_lib_curl_curl_easy_reset + - -- case ext/xmlrpc in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac ++ +fi -+ + + + save_old_LDFLAGS=$LDFLAGS + ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR @@ -60112,7 +61006,7 @@ + + save_ext_shared=$ext_shared + ext_shared=yes - ++ + for ac_i in $ac_stuff; do + case $ac_i in + -pthread) @@ -60120,7 +61014,7 @@ + LDFLAGS="$LDFLAGS -pthread" + else + - ++ + unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` + + cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" @@ -60129,15 +61023,6 @@ + EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" + fi -- 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 xmlrpc-epi-php.c; do + fi @@ -60243,14 +61128,14 @@ + done -echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6 --echo "configure:101738: checking whether to enable XMLWriter support" >&5 +-echo "configure:102037: 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" - PHP_XMLWRITER=$enableval -+ echo $ac_n "checking for curl_easy_reset in -lcurl""... $ac_c" 1>&6 -+echo "configure:108322: checking for curl_easy_reset in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_easy_reset | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for curl_formget in -lcurl""... $ac_c" 1>&6 ++echo "configure:108793: checking for curl_formget in -lcurl" >&5 ++ac_lib_var=`echo curl'_'curl_formget | 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 @@ -60260,18 +61145,18 @@ + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:108812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -60290,7 +61175,7 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF -+#define HAVE_CURL_EASY_RESET 1 ++#define HAVE_CURL_FORMGET 1 +EOF + @@ -60317,7 +61202,7 @@ -esac + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_easy_reset ++ unset ac_cv_lib_curl_curl_formget + + +fi @@ -60401,7 +61286,7 @@ -php_with_libxml_dir=no - -echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:101783: checking libxml2 install dir" >&5 +-echo "configure:102082: 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" @@ -60434,27 +61319,27 @@ + esac + done -+ echo $ac_n "checking for curl_formget in -lcurl""... $ac_c" 1>&6 -+echo "configure:108471: checking for curl_formget in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_formget | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for curl_multi_setopt in -lcurl""... $ac_c" 1>&6 ++echo "configure:108942: checking for curl_multi_setopt in -lcurl" >&5 ++ac_lib_var=`echo curl'_'curl_multi_setopt | 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="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:108961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -60478,12 +61363,12 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF -+#define HAVE_CURL_FORMGET 1 ++#define HAVE_CURL_MULTI_SETOPT 1 +EOF -echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:101811: checking for xml2-config path" >&5 +-echo "configure:102110: 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 @@ -60498,7 +61383,7 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_formget ++ unset ac_cv_lib_curl_curl_multi_setopt + + fi @@ -60535,7 +61420,7 @@ else -@@ -101861,7 +108553,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -102160,7 +109024,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then @@ -60544,7 +61429,7 @@ else -@@ -101896,8 +108588,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -102195,8 +109059,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path if test "$ext_shared" = "yes"; then @@ -60555,33 +61440,38 @@ else -@@ -101923,13 +108615,115 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -102222,22 +109086,128 @@ echo "$ac_t""$ac_cv_php_xml2_config_path esac done - - for ac_i in $LIBXML_INCS; do -+ echo $ac_n "checking for curl_multi_setopt in -lcurl""... $ac_c" 1>&6 -+echo "configure:108620: checking for curl_multi_setopt in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_multi_setopt | sed 'y%./+-%__p_%'` +- case $ac_i in +- -I*) +- ac_ii=`echo $ac_i|cut -c 3-` +- +- if test "$ac_ii" != "/usr/include"; then ++ echo $ac_n "checking for curl_multi_timeout in -lcurl""... $ac_c" 1>&6 ++echo "configure:109091: checking for curl_multi_timeout in -lcurl" >&5 ++ac_lib_var=`echo curl'_'curl_multi_timeout | 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="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:109110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -60600,7 +61490,7 @@ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared + cat >> confdefs.h <<\EOF -+#define HAVE_CURL_MULTI_SETOPT 1 ++#define HAVE_CURL_MULTI_TIMEOUT 1 +EOF + + @@ -60609,122 +61499,101 @@ + + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_multi_setopt ++ unset ac_cv_lib_curl_curl_multi_timeout + + +fi + + -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do - case $ac_i in -- -I*) -+ -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 -+ ++ ++ if test "$PHP_HTTP_CURL_LIBEVENT" != "no"; then ++ ++ extname=event ++ haveext=$PHP_EVENT ++ ++ echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6 ++echo "configure:109151: checking for ext/$extname support" >&5 ++ if test -x "$PHP_EXECUTABLE"; then ++ grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` ++ if test "$grepext" = "$extname"; then ++ HTTP_HAVE_EXT_EVENT=1 ++ echo "$ac_t""yes" 1>&6 ++ ++ echo "configure: warning: event support is incompatible with pecl/event; continuing without libevent support" 1>&2 ++ ++ else ++ HTTP_HAVE_EXT_EVENT= ++ echo "$ac_t""no" 1>&6 ++ ++ echo $ac_n "checking for event.h""... $ac_c" 1>&6 ++echo "configure:109165: checking for event.h" >&5 ++ EVENT_DIR= ++ for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do ++ if test -f "$i/include/event.h"; then ++ EVENT_DIR=$i ++ break ++ fi ++ done ++ if test "x$EVENT_DIR" = "x"; then ++ echo "$ac_t""not found" 1>&6 ++ echo "configure: warning: continuing without libevent support" 1>&2 ++ else ++ echo "$ac_t""found in $EVENT_DIR" 1>&6 ++ ++ echo $ac_n "checking for libevent version, roughly""... $ac_c" 1>&6 ++echo "configure:109180: checking for libevent version, roughly" >&5 ++ EVENT_VER="1.1b or lower" ++ if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then ++ if test -f "$EVENT_DIR/include/evrpc.h"; then ++ EVENT_VER="1.4 or greater" ++ else ++ EVENT_VER="1.2 or greater" ++ fi ++ fi ++ cat >> confdefs.h <&6 ++ ++ echo $ac_n "checking for libcurl version >= 7.16.0""... $ac_c" 1>&6 ++echo "configure:109196: checking for libcurl version >= 7.16.0" >&5 ++ echo "$ac_t""$CURL_VERSION" 1>&6 ++ if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then ++ echo "configure: warning: libcurl version greater or equal to 7.16.0 required; continuing without libevent support" 1>&2 ++ else ++ ++ if test "$EVENT_DIR/include" != "/usr/include"; then - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then - ai_p=$ac_ii -@@ -101942,481 +108736,290 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - fi - +- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then +- ai_p=$ac_ii ++ if test -z "$EVENT_DIR/include" || echo "$EVENT_DIR/include" | grep '^/' >/dev/null ; then ++ ai_p=$EVENT_DIR/include + else -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ -+ - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ cmd="echo $ac_n \"\$LIBPATH$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 -+ eval "LIBPATH$unique=set" +- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ep_dir="`echo $EVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ + ep_realdir="`(cd \"$ep_dir\" && pwd)`" +- ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ ai_p="$ep_realdir/`basename \"$EVENT_DIR/include\"`" fi -+ -+ fi -+ - fi + +@@ -102258,464 +109228,120 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - ;; - esac - done + fi +- ;; +- esac +- done +- - - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:101969: checking whether libxml build works" >&5 +-echo "configure:102268: checking whether libxml build works" >&5 -if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -+ echo $ac_n "checking for curl_multi_timeout in -lcurl""... $ac_c" 1>&6 -+echo "configure:108769: checking for curl_multi_timeout in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_multi_timeout | 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 +- echo $ac_n "(cached) $ac_c" 1>&6 +-else - - - old_LIBS=$LIBS @@ -60737,29 +61606,24 @@ - -else - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-EOF +-if { (eval echo configure:102295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - LIBS=$old_LIBS @@ -60767,31 +61631,27 @@ - php_cv_libxml_build_works=yes - - -+if { (eval echo configure:108788: \"$ac_link\") 1>&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 +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 - rm -fr conftest* - - LIBS=$old_LIBS -- ++ if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then ++ ai_p=$EVENT_DIR/$PHP_LIBDIR ++ else + - echo "$ac_t""no" 1>&6 - { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } - - -fi -rm -fr conftest* -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" - fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - +-fi +- - - - fi +-fi - -echo "$ac_t""$php_cv_libxml_build_works" 1>&6 - if test "$php_cv_libxml_build_works" = "yes"; then @@ -60801,36 +61661,38 @@ - - 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 +- cat >> confdefs.h <<\EOF -#define HAVE_XMLWRITER 1 -+#define HAVE_CURL_MULTI_TIMEOUT 1 - EOF - -- +-EOF +- ++ ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" + - ext_builddir=ext/xmlwriter - ext_srcdir=$abs_srcdir/ext/xmlwriter - - ac_extra= -- ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`" ++ fi + - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_XMLWRITER_SHARED=no -- -- + ++ if test "$ext_shared" = "yes"; then ++ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" ++ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" ++ else ++ + - case ext/xmlwriter in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; - /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -- -+else -+ echo "$ac_t""no" 1>&6 - ++ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` + +- - b_c_pre=$php_c_pre - b_cxx_pre=$php_cxx_pre - b_c_meta=$php_c_meta @@ -60842,10 +61704,13 @@ - - old_IFS=$IFS - for ac_src in php_xmlwriter.c; do -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_multi_timeout -+ ++ 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" - IFS=. - set $ac_src @@ -60860,82 +61725,22 @@ - *.S) ac_comp="$b_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 -- ++ fi + - cat >>Makefile.objects<&6 -+echo "configure:108829: checking for ext/$extname support" >&5 -+ if test -x "$PHP_EXECUTABLE"; then -+ grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` -+ if test "$grepext" = "$extname"; then -+ HTTP_HAVE_EXT_EVENT=1 -+ echo "$ac_t""yes" 1>&6 -+ -+ echo "configure: warning: event support is incompatible with pecl/event; continuing without libevent support" 1>&2 -+ -+ else -+ HTTP_HAVE_EXT_EVENT= -+ echo "$ac_t""no" 1>&6 -+ -+ echo $ac_n "checking for event.h""... $ac_c" 1>&6 -+echo "configure:108843: checking for event.h" >&5 -+ EVENT_DIR= -+ for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do -+ if test -f "$i/include/event.h"; then -+ EVENT_DIR=$i -+ break -+ fi -+ done -+ if test "x$EVENT_DIR" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ echo "configure: warning: continuing without libevent support" 1>&2 -+ else -+ echo "$ac_t""found in $EVENT_DIR" 1>&6 -+ -+ echo $ac_n "checking for libevent version, roughly""... $ac_c" 1>&6 -+echo "configure:108858: checking for libevent version, roughly" >&5 -+ EVENT_VER="1.1b or lower" -+ if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then -+ if test -f "$EVENT_DIR/include/evrpc.h"; then -+ EVENT_VER="1.4 or greater" -+ else -+ EVENT_VER="1.2 or greater" -+ fi -+ fi -+ cat >> confdefs.h <&6 -+ -+ echo $ac_n "checking for libcurl version >= 7.16.0""... $ac_c" 1>&6 -+echo "configure:108874: checking for libcurl version >= 7.16.0" >&5 -+ echo "$ac_t""$CURL_VERSION" 1>&6 -+ if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then -+ echo "configure: warning: libcurl version greater or equal to 7.16.0 required; continuing without libevent support" 1>&2 -+ else -+ -+ if test "$EVENT_DIR/include" != "/usr/include"; then -+ -+ if test -z "$EVENT_DIR/include" || echo "$EVENT_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$EVENT_DIR/include + fi else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_XMLWRITER_SHARED=yes @@ -60956,17 +61761,10 @@ - b_cxx_post=$shared_cxx_post - b_lo=$shared_lo - -+ -+ ep_dir="`echo $EVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$EVENT_DIR/include\"`" -+ fi - +- - old_IFS=$IFS - for ac_src in php_xmlwriter.c; do -+ - +- - IFS=. - set $ac_src - ac_obj=$1 @@ -61012,8 +61810,7 @@ - else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix" - fi -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - +- - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" - - cat >>Makefile.objects</dev/null ; then ++ ai_p=$EVENT_DIR/$PHP_LIBDIR + else +- PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlwriter.$suffix" +- fi - - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" - @@ -61077,8 +61871,13 @@ - cat >> confdefs.h </dev/null ; then -+ ai_p=$EVENT_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`" -+ fi - +- - EXT_STATIC="$EXT_STATIC xmlwriter" - ;; - *) -+ -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" -+ else - +- - case ext/xmlwriter in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; @@ -61200,54 +61980,36 @@ - $ac_comp -EOF - done -+ fi - - +- +- - ;; - esac - EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter" -+ fi -+ fi - - - BUILD_DIR="$BUILD_DIR $ext_builddir" - -- + - if test "$ext_builddir" = "."; then - PHP_PECL_EXTENSION=xmlwriter -+ fi -+ else - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - -+ if test -n "$EVENT_DIR/$PHP_LIBDIR"; then -+ -+ if test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$EVENT_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`" +- fi - +- - PHP_VAR_SUBST="$PHP_VAR_SUBST XMLWRITER_SHARED_LIBADD" - -+ - +- - else - { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } - fi -else - { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - -- fi +- + fi - -fi - @@ -61256,13 +62018,12 @@ -php_with_xsl=no - -echo $ac_n "checking for XSL support""... $ac_c" 1>&6 --echo "configure:102346: checking for XSL support" >&5 +-echo "configure:102645: checking for XSL support" >&5 -# Check whether --with-xsl or --without-xsl was given. -if test "${with_xsl+set}" = set; then - withval="$with_xsl" - PHP_XSL=$withval -else -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - PHP_XSL=no - test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL @@ -61295,24 +62056,13 @@ -echo "$ac_t""$ext_output" 1>&6 - - -+ 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 - - +- +- -if test "$PHP_XSL" != "no"; then -+ -+ fi - +- - if test "$PHP_LIBXML" = "no"; then - { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } - fi +- fi - if test "$PHP_DOM" = "no"; then - { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; } @@ -61324,7 +62074,13 @@ - break - fi - done -- ++ case event in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-levent $LIBS" ++ ;; ++ esac + - if test -z "$XSLT_CONFIG"; then - { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; } - else @@ -61339,14 +62095,6 @@ - XSL_INCS=`$XSLT_CONFIG --cflags` - - for ac_i in $XSL_LIBS; do -+ -+ case event in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-levent $LIBS" -+ ;; -+ esac -+ + + + @@ -61374,7 +62122,7 @@ else -@@ -102438,7 +109041,7 @@ if test "$PHP_XSL" != "no"; then +@@ -102737,7 +109363,7 @@ if test "$PHP_XSL" != "no"; then c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then @@ -61383,7 +62131,7 @@ else -@@ -102473,8 +109076,8 @@ if test "$PHP_XSL" != "no"; then +@@ -102772,8 +109398,8 @@ if test "$PHP_XSL" != "no"; then if test "$ext_shared" = "yes"; then @@ -61394,7 +62142,7 @@ else -@@ -102500,22 +109103,121 @@ if test "$PHP_XSL" != "no"; then +@@ -102799,22 +109425,121 @@ if test "$PHP_XSL" != "no"; then esac done @@ -61406,7 +62154,7 @@ - - if test "$ac_ii" != "/usr/include"; then + echo $ac_n "checking for curl_multi_socket_action in -lcurl""... $ac_c" 1>&6 -+echo "configure:109108: checking for curl_multi_socket_action in -lcurl" >&5 ++echo "configure:109430: checking for curl_multi_socket_action in -lcurl" >&5 +ac_lib_var=`echo curl'_'curl_multi_socket_action | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -61414,7 +62162,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:109449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -61473,7 +62221,7 @@ + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for event.h""... $ac_c" 1>&6 -+echo "configure:109175: checking for event.h" >&5 ++echo "configure:109497: checking for event.h" >&5 + EVENT_DIR= + for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do + if test -f "$i/include/event.h"; then @@ -61488,7 +62236,7 @@ + echo "$ac_t""found in $EVENT_DIR" 1>&6 + + echo $ac_n "checking for libevent version, roughly""... $ac_c" 1>&6 -+echo "configure:109190: checking for libevent version, roughly" >&5 ++echo "configure:109512: checking for libevent version, roughly" >&5 + EVENT_VER="1.1b or lower" + if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then + if test -f "$EVENT_DIR/include/evrpc.h"; then @@ -61504,7 +62252,7 @@ + echo "$ac_t""$EVENT_VER" 1>&6 + + echo $ac_n "checking for libcurl version >= 7.16.0""... $ac_c" 1>&6 -+echo "configure:109206: checking for libcurl version >= 7.16.0" >&5 ++echo "configure:109528: checking for libcurl version >= 7.16.0" >&5 + echo "$ac_t""$CURL_VERSION" 1>&6 + if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then + echo "configure: warning: libcurl version greater or equal to 7.16.0 required; continuing without libevent support" 1>&2 @@ -61527,7 +62275,7 @@ fi -@@ -102536,45 +109238,28 @@ if test "$PHP_XSL" != "no"; then +@@ -102835,45 +109560,28 @@ if test "$PHP_XSL" != "no"; then fi @@ -61537,7 +62285,7 @@ - - - echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6 --echo "configure:102546: checking for EXSLT support" >&5 +-echo "configure:102845: 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 @@ -61583,7 +62331,7 @@ else -@@ -102600,18 +109285,18 @@ echo "configure:102546: checking for EXS +@@ -102899,18 +109607,18 @@ echo "configure:102845: checking for EXS else @@ -61608,10 +62356,11 @@ fi -@@ -102623,541 +109308,264 @@ echo "configure:102546: checking for EXS +@@ -102921,542 +109629,265 @@ echo "configure:102845: checking for EXS + cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" if test -n "$unique" && test "`eval $cmd`" = "" ; then - eval "LIBPATH$unique=set" +- eval "LIBPATH$unique=set" - - test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" - LDFLAGS="$LDFLAGS -L$ai_p" @@ -62007,12 +62756,13 @@ -php_enable_zip=no - -echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6 --echo "configure:103022: checking for zip archive read/writesupport" >&5 +-echo "configure:103321: 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" - PHP_ZIP=$enableval -else ++ eval "LIBPATH$unique=set" + + test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" + LDFLAGS="$LDFLAGS -L$ai_p" @@ -62094,7 +62844,7 @@ + fi -echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 --echo "configure:103067: checking for the location of libz" >&5 +-echo "configure:103366: 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" @@ -62179,13 +62929,13 @@ + done -echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 --echo "configure:103091: checking pcre install prefix" >&5 +-echo "configure:103390: 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" - PHP_PCRE_DIR=$withval + echo $ac_n "checking for curl_multi_socket_action in -lcurl""... $ac_c" 1>&6 -+echo "configure:109440: checking for curl_multi_socket_action in -lcurl" >&5 ++echo "configure:109762: checking for curl_multi_socket_action in -lcurl" >&5 +ac_lib_var=`echo curl'_'curl_multi_socket_action | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 @@ -62196,7 +62946,7 @@ + ac_save_LIBS="$LIBS" +LIBS="-lcurl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:109781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else @@ -62265,7 +63015,7 @@ - fi + if test "$PHP_HTTP_MAGIC_MIME" != "no"; then + echo $ac_n "checking for magic.h""... $ac_c" 1>&6 -+echo "configure:109502: checking for magic.h" >&5 ++echo "configure:109824: checking for magic.h" >&5 + MAGIC_DIR= + for i in "$PHP_HTTP_MAGIC_MIME" /usr/local /usr /opt; do + if test -f "$i/include/magic.h"; then @@ -62303,7 +63053,7 @@ fi - echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6 --echo "configure:103135: checking for the location of zlib" >&5 +-echo "configure:103434: 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= to specify prefix where ZLIB include and library are located" 1>&2; exit 1; } - else @@ -62360,7 +63110,7 @@ else -@@ -103183,18 +109591,18 @@ echo "configure:103135: checking for the +@@ -103482,18 +109913,18 @@ echo "configure:103434: checking for the else @@ -62385,7 +63135,7 @@ fi -@@ -103220,10 +109628,10 @@ echo "configure:103135: checking for the +@@ -103519,10 +109950,10 @@ echo "configure:103434: checking for the fi @@ -62398,7 +63148,7 @@ ;; esac -@@ -103233,17 +109641,57 @@ echo "configure:103135: checking for the +@@ -103532,17 +109963,57 @@ echo "configure:103434: checking for the fi @@ -62413,7 +63163,7 @@ + haveext=$PHP_HASH + + echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6 -+echo "configure:109656: checking for ext/$extname support" >&5 ++echo "configure:109978: checking for ext/$extname support" >&5 + if test -x "$PHP_EXECUTABLE"; then + grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` + if test "$grepext" = "$extname"; then @@ -62421,7 +63171,7 @@ + echo "$ac_t""yes" 1>&6 + + echo $ac_n "checking for php_hash.h""... $ac_c" 1>&6 -+echo "configure:109664: checking for php_hash.h" >&5 ++echo "configure:109986: checking for php_hash.h" >&5 + HTTP_EXT_HASH_INCDIR= + for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do + if test -d $i; then @@ -62462,7 +63212,7 @@ fi -@@ -103264,97 +109712,160 @@ echo "configure:103135: checking for the +@@ -103563,97 +110034,160 @@ echo "configure:103434: checking for the fi @@ -62471,7 +63221,7 @@ - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=$INCLUDES - cat > conftest.$ac_ext < @@ -62491,7 +63241,7 @@ + echo "$ac_t""yes" 1>&6 + + echo $ac_n "checking for php_hash.h""... $ac_c" 1>&6 -+echo "configure:109728: checking for php_hash.h" >&5 ++echo "configure:110050: checking for php_hash.h" >&5 + HTTP_EXT_HASH_INCDIR= + for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do + if test -d $i; then @@ -62521,7 +63271,7 @@ - rm -rf conftest* - - cat > conftest.$ac_ext < @@ -62610,7 +63360,7 @@ + haveext=$PHP_ICONV + + echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6 -+echo "configure:109794: checking for ext/$extname support" >&5 ++echo "configure:110116: checking for ext/$extname support" >&5 + if test -x "$PHP_EXECUTABLE"; then + grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` + if test "$grepext" = "$extname"; then @@ -62641,7 +63391,7 @@ + haveext=$PHP_SESSION + + echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6 -+echo "configure:109822: checking for ext/$extname support" >&5 ++echo "configure:110144: checking for ext/$extname support" >&5 + if test -x "$PHP_EXECUTABLE"; then + grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` + if test "$grepext" = "$extname"; then @@ -62696,7 +63446,7 @@ esac -@@ -103369,7 +109880,7 @@ EOF +@@ -103668,7 +110202,7 @@ EOF old_IFS=$IFS @@ -62705,7 +63455,7 @@ IFS=. set $ac_src -@@ -103392,18 +109903,18 @@ EOF +@@ -103691,18 +110225,18 @@ EOF done @@ -62730,7 +63480,7 @@ esac -@@ -103418,14 +109929,14 @@ EOF +@@ -103717,14 +110251,14 @@ EOF old_IFS=$IFS @@ -62747,7 +63497,7 @@ 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" ;; -@@ -103448,31 +109959,31 @@ EOF +@@ -103747,31 +110281,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -62788,7 +63538,7 @@ $link_cmd EOF -@@ -103485,31 +109996,31 @@ EOF +@@ -103784,31 +110318,31 @@ EOF case $host_alias in *aix*) suffix=so @@ -62829,7 +63579,7 @@ $link_cmd EOF -@@ -103517,22 +110028,22 @@ EOF +@@ -103816,22 +110350,22 @@ EOF ;; esac cat >> confdefs.h <&6 -+echo "configure:110154: checking whether to add a dependency on ext/$extname" >&5 ++echo "configure:110476: checking whether to add a dependency on ext/$extname" >&5 + if test "$PHP_HTTP_SHARED_DEPS" = "no"; then + echo "$ac_t""no" 1>&6 + @@ -62959,7 +63709,7 @@ + haveext=$HTTP_HAVE_EXT_ICONV + + echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6 -+echo "configure:110192: checking whether to add a dependency on ext/$extname" >&5 ++echo "configure:110514: checking whether to add a dependency on ext/$extname" >&5 + if test "$PHP_HTTP_SHARED_DEPS" = "no"; then + echo "$ac_t""no" 1>&6 + @@ -62997,7 +63747,7 @@ + haveext=$HTTP_HAVE_EXT_SESSION + + echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6 -+echo "configure:110230: checking whether to add a dependency on ext/$extname" >&5 ++echo "configure:110552: checking whether to add a dependency on ext/$extname" >&5 + if test "$PHP_HTTP_SHARED_DEPS" = "no"; then + echo "$ac_t""no" 1>&6 + @@ -63085,2238 +63835,6748 @@ fi -@@ -103656,7 +110313,7 @@ fi +@@ -103954,7 +110634,7 @@ fi + php_enable_mysqlnd=no + + echo $ac_n "checking whether to enable mysqlnd""... $ac_c" 1>&6 +-echo "configure:103958: checking whether to enable mysqlnd" >&5 ++echo "configure:110638: checking whether to enable mysqlnd" >&5 + # Check whether --enable-mysqlnd or --disable-mysqlnd was given. + if test "${enable_mysqlnd+set}" = set; then + enableval="$enable_mysqlnd" +@@ -103998,7 +110678,7 @@ echo "$ac_t""$ext_output" 1>&6 php_enable_mysqlnd_compression_support=yes - echo $ac_n "checking whether to enable compressed protocol support in mysqlnd""... $ac_c" 1>&6 --echo "configure:103660: checking whether to enable compressed protocol support in mysqlnd" >&5 -+echo "configure:110317: checking whether to enable compressed protocol support in mysqlnd" >&5 + echo $ac_n "checking whether to disable compressed protocol support in mysqlnd""... $ac_c" 1>&6 +-echo "configure:104002: checking whether to disable compressed protocol support in mysqlnd" >&5 ++echo "configure:110682: checking whether to disable compressed protocol support in mysqlnd" >&5 # Check whether --enable-mysqlnd_compression_support or --disable-mysqlnd_compression_support was given. if test "${enable_mysqlnd_compression_support+set}" = set; then enableval="$enable_mysqlnd_compression_support" -@@ -103680,7 +110337,7 @@ if test -z "$PHP_ZLIB_DIR"; then +@@ -104022,7 +110702,7 @@ if test -z "$PHP_ZLIB_DIR"; then php_with_zlib_dir=no echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 --echo "configure:103684: checking for the location of libz" >&5 -+echo "configure:110341: checking for the location of libz" >&5 +-echo "configure:104026: checking for the location of libz" >&5 ++echo "configure:110706: 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" -@@ -104047,7 +110704,7 @@ if test "$PHP_MYSQLND_ENABLED" = "yes" | +@@ -104389,7 +111069,7 @@ if test "$PHP_MYSQLND" != "no" || test " for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6 --echo "configure:104051: checking whether $php_typename exists" >&5 -+echo "configure:110708: checking whether $php_typename exists" >&5 +-echo "configure:104393: checking whether $php_typename exists" >&5 ++echo "configure:111073: checking whether $php_typename exists" >&5 php_cache_value=php_cv_sizeof_$php_typename if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then -@@ -104064,7 +110721,7 @@ else +@@ -104406,7 +111086,7 @@ else else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -104094,7 +110751,7 @@ int main() +@@ -104436,7 +111116,7 @@ int main() } EOF --if { (eval echo configure:104098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:110755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:104440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:111120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then eval $php_cache_value=`cat conftestval` -@@ -104234,7 +110891,7 @@ if test "$PHP_RECODE" != "no"; then +@@ -104576,7 +111256,7 @@ if test "$PHP_RECODE" != "no"; then done echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:104238: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 -+echo "configure:110895: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 +-echo "configure:104580: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 ++echo "configure:111260: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 ac_lib_var=`echo $MYSQL_LIBNAME'_'hash_insert | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -104242,7 +110899,7 @@ else +@@ -104584,7 +111264,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$MYSQL_LIBNAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:110914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:104599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:111279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -104355,7 +111012,7 @@ fi +@@ -104697,7 +111377,7 @@ fi php_with_pear=DEFAULT echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6 --echo "configure:104359: checking whether to install PEAR" >&5 -+echo "configure:111016: checking whether to install PEAR" >&5 +-echo "configure:104701: checking whether to install PEAR" >&5 ++echo "configure:111381: 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" -@@ -104457,7 +111114,7 @@ fi +@@ -104799,7 +111479,7 @@ fi bison_version=none if test "$YACC"; then echo $ac_n "checking for bison version""... $ac_c" 1>&6 --echo "configure:104461: checking for bison version" >&5 -+echo "configure:111118: checking for bison version" >&5 +-echo "configure:104803: checking for bison version" >&5 ++echo "configure:111483: 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 -@@ -104513,17 +111170,17 @@ dlfcn.h +@@ -104855,17 +111535,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:104517: checking for $ac_hdr" >&5 -+echo "configure:111174: checking for $ac_hdr" >&5 +-echo "configure:104859: checking for $ac_hdr" >&5 ++echo "configure:111539: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:104527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:111184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:104869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:111549: \"$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* -@@ -104551,12 +111208,12 @@ done +@@ -104893,12 +111573,12 @@ done echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:104555: checking for size_t" >&5 -+echo "configure:111212: checking for size_t" >&5 +-echo "configure:104897: checking for size_t" >&5 ++echo "configure:111577: 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 < #if STDC_HEADERS -@@ -104584,12 +111241,12 @@ EOF +@@ -104926,12 +111606,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:104588: checking return type of signal handlers" >&5 -+echo "configure:111245: checking return type of signal handlers" >&5 +-echo "configure:104930: checking return type of signal handlers" >&5 ++echo "configure:111610: 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 < #include -@@ -104606,7 +111263,7 @@ int main() { +@@ -104948,7 +111628,7 @@ int main() { int i; ; return 0; } EOF --if { (eval echo configure:104610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:111267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:104952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:111632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else -@@ -104630,12 +111287,12 @@ EOF +@@ -104972,12 +111652,12 @@ EOF echo $ac_n "checking for uint""... $ac_c" 1>&6 --echo "configure:104634: checking for uint" >&5 -+echo "configure:111291: checking for uint" >&5 +-echo "configure:104976: checking for uint" >&5 ++echo "configure:111656: 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 < #if STDC_HEADERS -@@ -104663,12 +111320,12 @@ EOF +@@ -105005,12 +111685,12 @@ EOF fi echo $ac_n "checking for ulong""... $ac_c" 1>&6 --echo "configure:104667: checking for ulong" >&5 -+echo "configure:111324: checking for ulong" >&5 +-echo "configure:105009: checking for ulong" >&5 ++echo "configure:111689: 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 < #if STDC_HEADERS -@@ -104698,9 +111355,9 @@ fi +@@ -105040,9 +111720,9 @@ fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 --echo "configure:104702: checking for int32_t" >&5 -+echo "configure:111359: checking for int32_t" >&5 +-echo "configure:105044: checking for int32_t" >&5 ++echo "configure:111724: checking for int32_t" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:111380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:105065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:111745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <&6 --echo "configure:104742: checking for uint32_t" >&5 -+echo "configure:111399: checking for uint32_t" >&5 +-echo "configure:105084: checking for uint32_t" >&5 ++echo "configure:111764: checking for uint32_t" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:111420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:105105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:111785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <&6 --echo "configure:104782: checking for vprintf" >&5 -+echo "configure:111439: checking for vprintf" >&5 +-echo "configure:105124: checking for vprintf" >&5 ++echo "configure:111804: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:111832: \"$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 -@@ -104830,12 +111487,12 @@ fi +@@ -105172,12 +111852,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 --echo "configure:104834: checking for _doprnt" >&5 -+echo "configure:111491: checking for _doprnt" >&5 +-echo "configure:105176: checking for _doprnt" >&5 ++echo "configure:111856: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:111884: \"$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 -@@ -104883,7 +111540,7 @@ fi +@@ -105225,7 +111905,7 @@ fi fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:104887: checking for 8-bit clean memcmp" >&5 -+echo "configure:111544: checking for 8-bit clean memcmp" >&5 +-echo "configure:105229: checking for 8-bit clean memcmp" >&5 ++echo "configure:111909: 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 -@@ -104891,7 +111548,7 @@ else +@@ -105233,7 +111913,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:111562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:105247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:111927: \"$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 -@@ -104921,19 +111578,19 @@ test $ac_cv_func_memcmp_clean = no && LI +@@ -105263,19 +111943,19 @@ test $ac_cv_func_memcmp_clean = no && LI # 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:104925: checking for working alloca.h" >&5 -+echo "configure:111582: checking for working alloca.h" >&5 +-echo "configure:105267: checking for working alloca.h" >&5 ++echo "configure:111947: 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 < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF --if { (eval echo configure:104937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:111959: \"$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 -@@ -104954,12 +111611,12 @@ EOF +@@ -105296,12 +111976,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:104958: checking for alloca" >&5 -+echo "configure:111615: checking for alloca" >&5 +-echo "configure:105300: checking for alloca" >&5 ++echo "configure:111980: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112013: \"$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 -@@ -105019,12 +111676,12 @@ EOF +@@ -105361,12 +112041,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:105023: checking whether alloca needs Cray hooks" >&5 -+echo "configure:111680: checking whether alloca needs Cray hooks" >&5 +-echo "configure:105365: checking whether alloca needs Cray hooks" >&5 ++echo "configure:112045: 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 <&6 +@@ -105391,12 +112071,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:105053: checking for $ac_func" >&5 -+echo "configure:111710: checking for $ac_func" >&5 +-echo "configure:105395: checking for $ac_func" >&5 ++echo "configure:112075: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112103: \"$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 -@@ -105104,7 +111761,7 @@ done +@@ -105446,7 +112126,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:105108: checking stack direction for C alloca" >&5 -+echo "configure:111765: checking stack direction for C alloca" >&5 +-echo "configure:105450: checking stack direction for C alloca" >&5 ++echo "configure:112130: 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 -@@ -105112,7 +111769,7 @@ else +@@ -105454,7 +112134,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:111792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:105477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:112157: \"$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 -@@ -105155,12 +111812,12 @@ fi +@@ -105497,12 +112177,12 @@ fi for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:105159: checking for $ac_func" >&5 -+echo "configure:111816: checking for $ac_func" >&5 +-echo "configure:105501: checking for $ac_func" >&5 ++echo "configure:112181: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112209: \"$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 -@@ -105209,7 +111866,7 @@ done +@@ -105551,7 +112231,7 @@ done echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6 --echo "configure:105213: checking whether sprintf is broken" >&5 -+echo "configure:111870: checking whether sprintf is broken" >&5 +-echo "configure:105555: checking whether sprintf is broken" >&5 ++echo "configure:112235: 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 -@@ -105220,11 +111877,11 @@ else +@@ -105562,11 +112242,11 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:111885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:105570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:112250: \"$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 -@@ -105258,12 +111915,12 @@ EOF +@@ -105600,12 +112280,12 @@ EOF for ac_func in finite isfinite isinf isnan do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:105262: checking for $ac_func" >&5 -+echo "configure:111919: checking for $ac_func" >&5 +-echo "configure:105604: checking for $ac_func" >&5 ++echo "configure:112284: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112312: \"$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 -@@ -105313,13 +111970,13 @@ done +@@ -105655,13 +112335,13 @@ done echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6 --echo "configure:105317: checking whether fp_except is defined" >&5 -+echo "configure:111974: checking whether fp_except is defined" >&5 +-echo "configure:105659: checking whether fp_except is defined" >&5 ++echo "configure:112339: 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 < -@@ -105330,7 +111987,7 @@ fp_except x = (fp_except) 0; +@@ -105672,7 +112352,7 @@ fp_except x = (fp_except) 0; ; return 0; } EOF --if { (eval echo configure:105334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:111991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:105676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:112356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_fp_except=yes -@@ -105357,9 +112014,9 @@ EOF +@@ -105699,9 +112379,9 @@ EOF echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6 --echo "configure:105361: checking for usable _FPU_SETCW" >&5 -+echo "configure:112018: checking for usable _FPU_SETCW" >&5 +-echo "configure:105703: checking for usable _FPU_SETCW" >&5 ++echo "configure:112383: checking for usable _FPU_SETCW" >&5 cat > conftest.$ac_ext < -@@ -105379,7 +112036,7 @@ int main() { +@@ -105721,7 +112401,7 @@ int main() { ; return 0; } EOF --if { (eval echo configure:105383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cfp_have__fpu_setcw=yes else -@@ -105400,9 +112057,9 @@ EOF +@@ -105742,9 +112422,9 @@ EOF fi echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6 --echo "configure:105404: checking for usable fpsetprec" >&5 -+echo "configure:112061: checking for usable fpsetprec" >&5 +-echo "configure:105746: checking for usable fpsetprec" >&5 ++echo "configure:112426: checking for usable fpsetprec" >&5 cat > conftest.$ac_ext < -@@ -105421,7 +112078,7 @@ int main() { +@@ -105763,7 +112443,7 @@ int main() { ; return 0; } EOF --if { (eval echo configure:105425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cfp_have_fpsetprec=yes else -@@ -105442,9 +112099,9 @@ EOF +@@ -105784,9 +112464,9 @@ EOF fi echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6 --echo "configure:105446: checking for usable _controlfp" >&5 -+echo "configure:112103: checking for usable _controlfp" >&5 +-echo "configure:105788: checking for usable _controlfp" >&5 ++echo "configure:112468: checking for usable _controlfp" >&5 cat > conftest.$ac_ext < -@@ -105463,7 +112120,7 @@ int main() { +@@ -105805,7 +112485,7 @@ int main() { ; return 0; } EOF --if { (eval echo configure:105467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cfp_have__controlfp=yes else -@@ -105484,9 +112141,9 @@ EOF +@@ -105826,9 +112506,9 @@ EOF fi echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6 --echo "configure:105488: checking for usable _controlfp_s" >&5 -+echo "configure:112145: checking for usable _controlfp_s" >&5 +-echo "configure:105830: checking for usable _controlfp_s" >&5 ++echo "configure:112510: checking for usable _controlfp_s" >&5 cat > conftest.$ac_ext < -@@ -105506,7 +112163,7 @@ int main() { +@@ -105848,7 +112528,7 @@ int main() { ; return 0; } EOF --if { (eval echo configure:105510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cfp_have__controlfp_s=yes else -@@ -105527,9 +112184,9 @@ EOF +@@ -105869,9 +112549,9 @@ EOF fi echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6 --echo "configure:105531: checking whether FPU control word can be manipulated by inline assembler" >&5 -+echo "configure:112188: checking whether FPU control word can be manipulated by inline assembler" >&5 +-echo "configure:105873: checking whether FPU control word can be manipulated by inline assembler" >&5 ++echo "configure:112553: checking whether FPU control word can be manipulated by inline assembler" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:105897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cfp_have_fpu_inline_asm_x86=yes else -@@ -105573,7 +112230,7 @@ EOF +@@ -105915,7 +112595,7 @@ EOF echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6 --echo "configure:105577: checking whether double cast to long preserves least significant bits" >&5 -+echo "configure:112234: checking whether double cast to long preserves least significant bits" >&5 +-echo "configure:105919: checking whether double cast to long preserves least significant bits" >&5 ++echo "configure:112599: checking whether double cast to long preserves least significant bits" >&5 if test "$cross_compiling" = yes; then -@@ -105581,7 +112238,7 @@ if test "$cross_compiling" = yes; then +@@ -105923,7 +112603,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -105605,7 +112262,7 @@ int main() +@@ -105947,7 +112627,7 @@ int main() } EOF --if { (eval echo configure:105609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:112266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:105951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:112631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF -@@ -105631,17 +112288,17 @@ for ac_hdr in dlfcn.h +@@ -105973,17 +112653,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:105635: checking for $ac_hdr" >&5 -+echo "configure:112292: checking for $ac_hdr" >&5 +-echo "configure:105977: checking for $ac_hdr" >&5 ++echo "configure:112657: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:105645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:112302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:105987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:112667: \"$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* -@@ -105669,14 +112326,14 @@ done +@@ -106011,14 +112691,14 @@ done echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6 --echo "configure:105673: checking whether dlsym() requires a leading underscore in symbol names" >&5 -+echo "configure:112330: checking whether dlsym() requires a leading underscore in symbol names" >&5 +-echo "configure:106015: checking whether dlsym() requires a leading underscore in symbol names" >&5 ++echo "configure:112695: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:112400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then +- if { (eval echo configure:106085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:112765: \"$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 -@@ -105822,23 +112479,23 @@ fi +@@ -106164,23 +112844,23 @@ fi echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6 --echo "configure:105826: checking virtual machine dispatch method" >&5 -+echo "configure:112483: checking virtual machine dispatch method" >&5 +-echo "configure:106168: checking virtual machine dispatch method" >&5 ++echo "configure:112848: 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:105830: checking whether to enable thread-safety" >&5 -+echo "configure:112487: checking whether to enable thread-safety" >&5 +-echo "configure:106172: checking whether to enable thread-safety" >&5 ++echo "configure:112852: 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:105834: checking whether to enable inline optimization for GCC" >&5 -+echo "configure:112491: checking whether to enable inline optimization for GCC" >&5 +-echo "configure:106176: checking whether to enable inline optimization for GCC" >&5 ++echo "configure:112856: checking whether to enable inline optimization for GCC" >&5 echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6 echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6 --echo "configure:105838: checking whether to enable Zend debugging" >&5 -+echo "configure:112495: checking whether to enable Zend debugging" >&5 +-echo "configure:106180: checking whether to enable Zend debugging" >&5 ++echo "configure:112860: 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:105842: checking whether to enable Zend multibyte" >&5 -+echo "configure:112499: checking whether to enable Zend multibyte" >&5 +-echo "configure:106184: checking whether to enable Zend multibyte" >&5 ++echo "configure:112864: checking whether to enable Zend multibyte" >&5 echo "$ac_t""$ZEND_MULTIBYTE" 1>&6 case $PHP_ZEND_VM in -@@ -105911,21 +112568,21 @@ fi +@@ -106253,21 +112933,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:105915: checking for inline" >&5 -+echo "configure:112572: checking for inline" >&5 +-echo "configure:106257: checking for inline" >&5 ++echo "configure:112937: 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 <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:112586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:106271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:112951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else -@@ -105954,7 +112611,7 @@ esac +@@ -106296,7 +112976,7 @@ esac echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6 --echo "configure:105958: checking target system is Darwin" >&5 -+echo "configure:112615: checking target system is Darwin" >&5 +-echo "configure:106300: checking target system is Darwin" >&5 ++echo "configure:112980: checking target system is Darwin" >&5 if echo "$target" | grep "darwin" > /dev/null; then cat >> confdefs.h <<\EOF #define DARWIN 1 -@@ -105966,7 +112623,7 @@ else +@@ -106308,7 +112988,7 @@ else fi echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6 --echo "configure:105970: checking for MM alignment and log values" >&5 -+echo "configure:112627: checking for MM alignment and log values" >&5 +-echo "configure:106312: checking for MM alignment and log values" >&5 ++echo "configure:112992: checking for MM alignment and log values" >&5 if test "$cross_compiling" = yes; then -@@ -105974,7 +112631,7 @@ if test "$cross_compiling" = yes; then +@@ -106316,7 +112996,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106010,7 +112667,7 @@ int main() +@@ -106352,7 +113032,7 @@ int main() } EOF --if { (eval echo configure:106014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:112671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:106356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:113036: \"$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` -@@ -106035,7 +112692,7 @@ fi +@@ -106377,7 +113057,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:106039: checking for memory allocation using mmap(MAP_ANON)" >&5 -+echo "configure:112696: checking for memory allocation using mmap(MAP_ANON)" >&5 +-echo "configure:106381: checking for memory allocation using mmap(MAP_ANON)" >&5 ++echo "configure:113061: checking for memory allocation using mmap(MAP_ANON)" >&5 if test "$cross_compiling" = yes; then -@@ -106043,7 +112700,7 @@ if test "$cross_compiling" = yes; then +@@ -106385,7 +113065,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106079,7 +112736,7 @@ int main() +@@ -106421,7 +113101,7 @@ int main() } EOF --if { (eval echo configure:106083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:112740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:106425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:113105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF -@@ -106101,7 +112758,7 @@ fi +@@ -106443,7 +113123,7 @@ fi echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6 --echo "configure:106105: checking for memory allocation using mmap("/dev/zero")" >&5 -+echo "configure:112762: checking for memory allocation using mmap("/dev/zero")" >&5 +-echo "configure:106447: checking for memory allocation using mmap("/dev/zero")" >&5 ++echo "configure:113127: checking for memory allocation using mmap("/dev/zero")" >&5 if test "$cross_compiling" = yes; then -@@ -106109,7 +112766,7 @@ if test "$cross_compiling" = yes; then +@@ -106451,7 +113131,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106155,7 +112812,7 @@ int main() +@@ -106497,7 +113177,7 @@ int main() } EOF --if { (eval echo configure:106159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:112816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:106501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:113181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF -@@ -106179,12 +112836,12 @@ fi +@@ -106521,12 +113201,12 @@ fi for ac_func in mremap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:106183: checking for $ac_func" >&5 -+echo "configure:112840: checking for $ac_func" >&5 +-echo "configure:106525: checking for $ac_func" >&5 ++echo "configure:113205: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:106553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:113233: \"$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 -@@ -106274,17 +112931,17 @@ for ac_hdr in stdarg.h +@@ -106616,17 +113296,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:106278: checking for $ac_hdr" >&5 -+echo "configure:112935: checking for $ac_hdr" >&5 +-echo "configure:106620: checking for $ac_hdr" >&5 ++echo "configure:113300: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:106288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:112945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:106630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:113310: \"$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* -@@ -106361,7 +113018,7 @@ if test "$TSRM_PTH" != "no"; then +@@ -106703,7 +113383,7 @@ if test "$TSRM_PTH" != "no"; then echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6 --echo "configure:106365: checking for GNU Pth" >&5 -+echo "configure:113022: checking for GNU Pth" >&5 +-echo "configure:106707: checking for GNU Pth" >&5 ++echo "configure:113387: 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 -@@ -106391,17 +113048,17 @@ elif test "$TSRM_ST" != "no"; then +@@ -106733,17 +113413,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:106395: checking for $ac_hdr" >&5 -+echo "configure:113052: checking for $ac_hdr" >&5 +-echo "configure:106737: checking for $ac_hdr" >&5 ++echo "configure:113417: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:106405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:113062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:106747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:113427: \"$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* -@@ -106431,7 +113088,7 @@ done +@@ -106773,7 +113453,7 @@ done LIBS="$LIBS -lst" echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6 --echo "configure:106435: checking for SGI's State Threads" >&5 -+echo "configure:113092: checking for SGI's State Threads" >&5 +-echo "configure:106777: checking for SGI's State Threads" >&5 ++echo "configure:113457: checking for SGI's State Threads" >&5 echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF #define TSRM_ST 1 -@@ -106470,7 +113127,7 @@ if test "$cross_compiling" = yes; then +@@ -106812,7 +113492,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106488,7 +113145,7 @@ int main() { +@@ -106830,7 +113510,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF --if { (eval echo configure:106492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:106834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:113514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -106508,7 +113165,7 @@ fi +@@ -106850,7 +113530,7 @@ fi CFLAGS=$save_CFLAGS echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 --echo "configure:106512: checking for pthreads_cflags" >&5 -+echo "configure:113169: checking for pthreads_cflags" >&5 +-echo "configure:106854: checking for pthreads_cflags" >&5 ++echo "configure:113534: 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 -@@ -106530,7 +113187,7 @@ if test "$cross_compiling" = yes; then +@@ -106872,7 +113552,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106548,7 +113205,7 @@ int main() { +@@ -106890,7 +113570,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF --if { (eval echo configure:106552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:106894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:113574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -106578,7 +113235,7 @@ fi +@@ -106920,7 +113600,7 @@ fi echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 --echo "configure:106582: checking for pthreads_lib" >&5 -+echo "configure:113239: checking for pthreads_lib" >&5 +-echo "configure:106924: checking for pthreads_lib" >&5 ++echo "configure:113604: 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 -@@ -106600,7 +113257,7 @@ if test "$cross_compiling" = yes; then +@@ -106942,7 +113622,7 @@ if test "$cross_compiling" = yes; then else cat > conftest.$ac_ext < -@@ -106618,7 +113275,7 @@ int main() { +@@ -106960,7 +113640,7 @@ int main() { return pthread_create(&thd, NULL, thread_routine, &data); } EOF --if { (eval echo configure:106622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:106964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:113644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -106669,7 +113326,7 @@ EOF +@@ -107011,7 +113691,7 @@ EOF echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6 --echo "configure:106673: checking for POSIX threads" >&5 -+echo "configure:113330: checking for POSIX threads" >&5 +-echo "configure:107015: checking for POSIX threads" >&5 ++echo "configure:113695: checking for POSIX threads" >&5 echo "$ac_t""yes" 1>&6 fi -@@ -107305,7 +113962,7 @@ fi +@@ -107647,7 +114327,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 --echo "configure:107309: checking build system type" >&5 -+echo "configure:113966: checking build system type" >&5 +-echo "configure:107651: checking build system type" >&5 ++echo "configure:114331: checking build system type" >&5 build_alias=$build case "$build_alias" in -@@ -107334,7 +113991,7 @@ ac_prog=ld +@@ -107676,7 +114356,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:107338: checking for ld used by $CC" >&5 -+echo "configure:113995: checking for ld used by $CC" >&5 +-echo "configure:107680: checking for ld used by $CC" >&5 ++echo "configure:114360: checking for ld used by $CC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw -@@ -107364,10 +114021,10 @@ echo "configure:107338: checking for ld +@@ -107706,10 +114386,10 @@ echo "configure:107680: checking for ld esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 --echo "configure:107368: checking for GNU ld" >&5 -+echo "configure:114025: checking for GNU ld" >&5 +-echo "configure:107710: checking for GNU ld" >&5 ++echo "configure:114390: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 --echo "configure:107371: checking for non-GNU ld" >&5 -+echo "configure:114028: checking for non-GNU ld" >&5 +-echo "configure:107713: checking for non-GNU ld" >&5 ++echo "configure:114393: 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 -@@ -107406,7 +114063,7 @@ else +@@ -107748,7 +114428,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:107410: checking if the linker ($LD) is GNU ld" >&5 -+echo "configure:114067: checking if the linker ($LD) is GNU ld" >&5 +-echo "configure:107752: checking if the linker ($LD) is GNU ld" >&5 ++echo "configure:114432: 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 -@@ -107426,7 +114083,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld +@@ -107768,7 +114448,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:107430: checking for $LD option to reload object files" >&5 -+echo "configure:114087: checking for $LD option to reload object files" >&5 +-echo "configure:107772: checking for $LD option to reload object files" >&5 ++echo "configure:114452: 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 -@@ -107451,7 +114108,7 @@ case $host_os in +@@ -107793,7 +114473,7 @@ case $host_os in esac echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 --echo "configure:107455: checking for BSD-compatible nm" >&5 -+echo "configure:114112: checking for BSD-compatible nm" >&5 +-echo "configure:107797: checking for BSD-compatible nm" >&5 ++echo "configure:114477: 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 -@@ -107504,7 +114161,7 @@ echo "$ac_t""$lt_cv_path_NM" 1>&6 +@@ -107846,7 +114526,7 @@ echo "$ac_t""$lt_cv_path_NM" 1>&6 NM="$lt_cv_path_NM" echo $ac_n "checking how to recognize dependent libraries""... $ac_c" 1>&6 --echo "configure:107508: checking how to recognize dependent libraries" >&5 -+echo "configure:114165: checking how to recognize dependent libraries" >&5 +-echo "configure:107850: checking how to recognize dependent libraries" >&5 ++echo "configure:114530: checking how to recognize dependent libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -107696,13 +114353,13 @@ deplibs_check_method=$lt_cv_deplibs_chec +@@ -108038,13 +114718,13 @@ deplibs_check_method=$lt_cv_deplibs_chec test -z "$deplibs_check_method" && deplibs_check_method=unknown echo $ac_n "checking for object suffix""... $ac_c" 1>&6 --echo "configure:107700: checking for object suffix" >&5 -+echo "configure:114357: checking for object suffix" >&5 +-echo "configure:108042: checking for object suffix" >&5 ++echo "configure:114722: 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:107706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:114363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:108048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:114728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; -@@ -107722,7 +114379,7 @@ ac_objext=$ac_cv_objext +@@ -108064,7 +114744,7 @@ ac_objext=$ac_cv_objext echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 --echo "configure:107726: checking for executable suffix" >&5 -+echo "configure:114383: checking for executable suffix" >&5 +-echo "configure:108068: checking for executable suffix" >&5 ++echo "configure:114748: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -107732,7 +114389,7 @@ else +@@ -108074,10 +114754,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= -- if { (eval echo configure:107736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+ if { (eval echo configure:114393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +- if { (eval echo configure:108078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then ++ if { (eval echo configure:114758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.$ac_ext | *.c | *.o | *.obj) ;; -@@ -107778,7 +114435,7 @@ case $host in +- *.c | *.o | *.obj) ;; ++ *.$ac_ext | *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done +@@ -108120,7 +114800,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext -- if { (eval echo configure:107782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:114439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- if { (eval echo configure:108124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:114804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" -@@ -107792,8 +114449,8 @@ ia64-*-hpux*) +@@ -108134,8 +114814,8 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. -- echo '#line 107796 "configure"' > conftest.$ac_ext -- if { (eval echo configure:107797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ echo '#line 114453 "configure"' > conftest.$ac_ext -+ if { (eval echo configure:114454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- echo '#line 108138 "configure"' > conftest.$ac_ext +- if { (eval echo configure:108139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ echo '#line 114818 "configure"' > conftest.$ac_ext ++ if { (eval echo configure:114819: \"$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*) -@@ -107827,7 +114484,7 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc +@@ -108169,7 +114849,7 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext -- if { (eval echo configure:107831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:114488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- if { (eval echo configure:108173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:114853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.o` in *32-bit*) case $host in -@@ -107877,7 +114534,7 @@ s390*-*linux*|sparc*-*linux*) +@@ -108219,7 +114899,7 @@ 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:107881: checking whether the C compiler needs -belf" >&5 -+echo "configure:114538: checking whether the C compiler needs -belf" >&5 +-echo "configure:108223: checking whether the C compiler needs -belf" >&5 ++echo "configure:114903: 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 -@@ -107890,14 +114547,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext +@@ -108232,14 +114912,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:114558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:108243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:114923: \"$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 -@@ -107925,7 +114582,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 +@@ -108267,7 +114947,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext -- if { (eval echo configure:107929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:114586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- if { (eval echo configure:108271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:114951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in -@@ -107954,7 +114611,7 @@ if test -n "$CXX" && ( test "X$CXX" != " +@@ -108296,7 +114976,7 @@ if test -n "$CXX" && ( test "X$CXX" != " ( (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:107958: checking how to run the C++ preprocessor" >&5 -+echo "configure:114615: checking how to run the C++ preprocessor" >&5 +-echo "configure:108300: checking how to run the C++ preprocessor" >&5 ++echo "configure:114980: 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 -@@ -107967,12 +114624,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee +@@ -108309,12 +114989,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:107976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:114633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:108318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:114998: \"$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 : -@@ -108002,7 +114659,7 @@ fi +@@ -108344,7 +115024,7 @@ fi # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # 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:108006: checking the maximum length of command line arguments" >&5 -+echo "configure:114663: checking the maximum length of command line arguments" >&5 +-echo "configure:108348: checking the maximum length of command line arguments" >&5 ++echo "configure:115028: 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 -@@ -108124,7 +114781,7 @@ fi +@@ -108466,7 +115146,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:108128: checking command to parse $NM output from $compiler object" >&5 -+echo "configure:114785: checking command to parse $NM output from $compiler object" >&5 +-echo "configure:108470: checking command to parse $NM output from $compiler object" >&5 ++echo "configure:115150: 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 -@@ -108228,10 +114885,10 @@ void nm_test_func(){} +@@ -108570,10 +115250,10 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF -- if { (eval echo configure:108232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:114889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- if { (eval echo configure:108574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:115254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. nlist=conftest.nm -- if { (eval echo configure:108235: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then -+ if { (eval echo configure:114892: \"$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:108577: \"$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:115257: \"$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" -@@ -108282,7 +114939,7 @@ EOF +@@ -108624,7 +115304,7 @@ EOF lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" -- if { (eval echo configure:108286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ if { (eval echo configure:114943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- if { (eval echo configure:108628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ if { (eval echo configure:115308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then pipe_works=yes fi LIBS="$lt_save_LIBS" -@@ -108322,7 +114979,7 @@ else +@@ -108664,7 +115344,7 @@ else fi echo $ac_n "checking for objdir""... $ac_c" 1>&6 --echo "configure:108326: checking for objdir" >&5 -+echo "configure:114983: checking for objdir" >&5 +-echo "configure:108668: checking for objdir" >&5 ++echo "configure:115348: checking for objdir" >&5 if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108388,7 +115045,7 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" +@@ -108730,7 +115410,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:108392: checking for $ac_word" >&5 -+echo "configure:115049: checking for $ac_word" >&5 +-echo "configure:108734: checking for $ac_word" >&5 ++echo "configure:115414: 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 -@@ -108420,7 +115077,7 @@ if test -n "$ac_tool_prefix"; then +@@ -108762,7 +115442,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:108424: checking for $ac_word" >&5 -+echo "configure:115081: checking for $ac_word" >&5 +-echo "configure:108766: checking for $ac_word" >&5 ++echo "configure:115446: 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 -@@ -108455,7 +115112,7 @@ fi +@@ -108797,7 +115477,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:108459: checking for $ac_word" >&5 -+echo "configure:115116: checking for $ac_word" >&5 +-echo "configure:108801: checking for $ac_word" >&5 ++echo "configure:115481: 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 -@@ -108487,7 +115144,7 @@ if test -n "$ac_tool_prefix"; then +@@ -108829,7 +115509,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:108491: checking for $ac_word" >&5 -+echo "configure:115148: checking for $ac_word" >&5 +-echo "configure:108833: checking for $ac_word" >&5 ++echo "configure:115513: 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 -@@ -108522,7 +115179,7 @@ fi +@@ -108864,7 +115544,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:108526: checking for $ac_word" >&5 -+echo "configure:115183: checking for $ac_word" >&5 +-echo "configure:108868: checking for $ac_word" >&5 ++echo "configure:115548: 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 -@@ -108554,7 +115211,7 @@ if test -n "$ac_tool_prefix"; then +@@ -108896,7 +115576,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:108558: checking for $ac_word" >&5 -+echo "configure:115215: checking for $ac_word" >&5 +-echo "configure:108900: checking for $ac_word" >&5 ++echo "configure:115580: 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 -@@ -108641,7 +115298,7 @@ case $deplibs_check_method in +@@ -108983,7 +115663,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:108645: checking for ${ac_tool_prefix}file" >&5 -+echo "configure:115302: checking for ${ac_tool_prefix}file" >&5 +-echo "configure:108987: checking for ${ac_tool_prefix}file" >&5 ++echo "configure:115667: 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 -@@ -108701,7 +115358,7 @@ fi +@@ -109043,7 +115723,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:108705: checking for file" >&5 -+echo "configure:115362: checking for file" >&5 +-echo "configure:109047: checking for file" >&5 ++echo "configure:115727: 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 -@@ -108773,7 +115430,7 @@ esac +@@ -109115,7 +115795,7 @@ esac # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:108777: checking for $ac_word" >&5 -+echo "configure:115434: checking for $ac_word" >&5 +-echo "configure:109119: checking for $ac_word" >&5 ++echo "configure:115799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108805,7 +115462,7 @@ if test -n "$ac_tool_prefix"; then +@@ -109147,7 +115827,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:108809: checking for $ac_word" >&5 -+echo "configure:115466: checking for $ac_word" >&5 +-echo "configure:109151: checking for $ac_word" >&5 ++echo "configure:115831: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108840,7 +115497,7 @@ fi +@@ -109182,7 +115862,7 @@ fi # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:108844: checking for $ac_word" >&5 -+echo "configure:115501: checking for $ac_word" >&5 +-echo "configure:109186: checking for $ac_word" >&5 ++echo "configure:115866: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108872,7 +115529,7 @@ if test -n "$ac_tool_prefix"; then +@@ -109214,7 +115894,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:108876: checking for $ac_word" >&5 -+echo "configure:115533: checking for $ac_word" >&5 +-echo "configure:109218: checking for $ac_word" >&5 ++echo "configure:115898: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108906,7 +115563,7 @@ fi +@@ -109248,7 +115928,7 @@ fi echo $ac_n "checking for -single_module linker flag""... $ac_c" 1>&6 --echo "configure:108910: checking for -single_module linker flag" >&5 -+echo "configure:115567: checking for -single_module linker flag" >&5 +-echo "configure:109252: checking for -single_module linker flag" >&5 ++echo "configure:115932: checking for -single_module linker flag" >&5 if eval "test \"`echo '$''{'lt_cv_apple_cc_single_mod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108929,7 +115586,7 @@ fi +@@ -109271,7 +115951,7 @@ fi echo "$ac_t""$lt_cv_apple_cc_single_mod" 1>&6 echo $ac_n "checking for -exported_symbols_list linker flag""... $ac_c" 1>&6 --echo "configure:108933: checking for -exported_symbols_list linker flag" >&5 -+echo "configure:115590: checking for -exported_symbols_list linker flag" >&5 +-echo "configure:109275: checking for -exported_symbols_list linker flag" >&5 ++echo "configure:115955: checking for -exported_symbols_list linker flag" >&5 if eval "test \"`echo '$''{'lt_cv_ld_exported_symbols_list'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -108939,12 +115596,12 @@ else +@@ -109281,12 +115961,12 @@ else LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:115605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:109290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:115970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then lt_cv_ld_exported_symbols_list=yes rm -rf conftest* else -@@ -109078,7 +115735,7 @@ if test "$GCC" = yes; then +@@ -109420,7 +116100,7 @@ if test "$GCC" = yes; then echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 --echo "configure:109082: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo "configure:115739: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +-echo "configure:109424: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++echo "configure:116104: 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 -@@ -109095,11 +115752,11 @@ else +@@ -109437,11 +116117,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:109099: $lt_compile\"" >&5) -+ (eval echo "\"configure:115756: $lt_compile\"" >&5) +- (eval echo "\"configure:109441: $lt_compile\"" >&5) ++ (eval echo "\"configure:116121: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "configure:109103: \$? = $ac_status" >&5 -+ echo "configure:115760: \$? = $ac_status" >&5 +- echo "configure:109445: \$? = $ac_status" >&5 ++ echo "configure:116125: \$? = $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. -@@ -109128,7 +115785,7 @@ lt_prog_compiler_pic= +@@ -109470,7 +116150,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:109132: checking for $compiler option to produce PIC" >&5 -+echo "configure:115789: checking for $compiler option to produce PIC" >&5 +-echo "configure:109474: checking for $compiler option to produce PIC" >&5 ++echo "configure:116154: checking for $compiler option to produce PIC" >&5 if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' -@@ -109375,7 +116032,7 @@ echo "$ac_t""$lt_prog_compiler_pic" 1>&6 +@@ -109717,7 +116397,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:109379: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+echo "configure:116036: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +-echo "configure:109721: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++echo "configure:116401: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109392,11 +116049,11 @@ else +@@ -109734,11 +116414,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:109396: $lt_compile\"" >&5) -+ (eval echo "\"configure:116053: $lt_compile\"" >&5) +- (eval echo "\"configure:109738: $lt_compile\"" >&5) ++ (eval echo "\"configure:116418: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "configure:109400: \$? = $ac_status" >&5 -+ echo "configure:116057: \$? = $ac_status" >&5 +- echo "configure:109742: \$? = $ac_status" >&5 ++ echo "configure:116422: \$? = $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. -@@ -109438,7 +116095,7 @@ esac +@@ -109780,7 +116460,7 @@ esac # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 --echo "configure:109442: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo "configure:116099: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +-echo "configure:109784: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo "configure:116464: checking if $compiler static flag $lt_tmp_static_flag works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109476,7 +116133,7 @@ fi +@@ -109818,7 +116498,7 @@ fi echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 --echo "configure:109480: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo "configure:116137: checking if $compiler supports -c -o file.$ac_objext" >&5 +-echo "configure:109822: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo "configure:116502: 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 -@@ -109496,11 +116153,11 @@ else +@@ -109838,11 +116518,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:109500: $lt_compile\"" >&5) -+ (eval echo "\"configure:116157: $lt_compile\"" >&5) +- (eval echo "\"configure:109842: $lt_compile\"" >&5) ++ (eval echo "\"configure:116522: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "configure:109504: \$? = $ac_status" >&5 -+ echo "configure:116161: \$? = $ac_status" >&5 +- echo "configure:109846: \$? = $ac_status" >&5 ++ echo "configure:116526: \$? = $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 -@@ -109530,7 +116187,7 @@ hard_links="nottested" +@@ -109872,7 +116552,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:109534: checking if we can lock with hard links" >&5 -+echo "configure:116191: checking if we can lock with hard links" >&5 +-echo "configure:109876: checking if we can lock with hard links" >&5 ++echo "configure:116556: 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 -@@ -109547,7 +116204,7 @@ else +@@ -109889,7 +116569,7 @@ else fi echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 --echo "configure:109551: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo "configure:116208: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-echo "configure:109893: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo "configure:116573: checking whether the $compiler linker ($LD) supports shared libraries" >&5 runpath_var= allow_undefined_flag= -@@ -109958,12 +116615,12 @@ _LT_EOF +@@ -110300,12 +116980,12 @@ _LT_EOF # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:116624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:110309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:116989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -109996,12 +116653,12 @@ if test -z "$aix_libpath"; then aix_libp +@@ -110338,12 +117018,12 @@ if test -z "$aix_libpath"; then aix_libp # Determine the default libpath from the value encoded in an empty executable. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:116662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:110347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:117027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -110491,11 +117148,11 @@ x|xyes) +@@ -110833,11 +117513,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:110495: checking whether -lc should be explicitly linked in" >&5 -+echo "configure:117152: checking whether -lc should be explicitly linked in" >&5 +-echo "configure:110837: checking whether -lc should be explicitly linked in" >&5 ++echo "configure:117517: checking whether -lc should be explicitly linked in" >&5 $rm conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext -- if { (eval echo configure:110499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then -+ if { (eval echo configure:117156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then +- if { (eval echo configure:110841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then ++ if { (eval echo configure:117521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -110509,7 +117166,7 @@ echo "configure:110495: checking whether +@@ -110851,7 +117531,7 @@ echo "configure:110837: checking whether libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= -- if { (eval echo configure:110513: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } -+ if { (eval echo configure:117170: \"$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:110855: \"$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:117535: \"$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 -@@ -110528,7 +117185,7 @@ echo "configure:110495: checking whether +@@ -110870,7 +117550,7 @@ echo "configure:110837: checking whether esac echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 --echo "configure:110532: checking dynamic linker characteristics" >&5 -+echo "configure:117189: checking dynamic linker characteristics" >&5 +-echo "configure:110874: checking dynamic linker characteristics" >&5 ++echo "configure:117554: checking dynamic linker characteristics" >&5 library_names_spec= libname_spec='lib$name' soname_spec= -@@ -111153,7 +117810,7 @@ if test "$GCC" = yes; then +@@ -111495,7 +118175,7 @@ if test "$GCC" = yes; then fi echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 --echo "configure:111157: checking how to hardcode library paths into programs" >&5 -+echo "configure:117814: checking how to hardcode library paths into programs" >&5 +-echo "configure:111499: checking how to hardcode library paths into programs" >&5 ++echo "configure:118179: checking how to hardcode library paths into programs" >&5 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ -@@ -111191,7 +117848,7 @@ fi +@@ -111533,7 +118213,7 @@ fi striplib= old_striplib= echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 --echo "configure:111195: checking whether stripping libraries is possible" >&5 -+echo "configure:117852: checking whether stripping libraries is possible" >&5 +-echo "configure:111537: checking whether stripping libraries is possible" >&5 ++echo "configure:118217: 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" -@@ -111242,7 +117899,7 @@ else +@@ -111584,7 +118264,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:111246: checking for dlopen in -ldl" >&5 -+echo "configure:117903: checking for dlopen in -ldl" >&5 +-echo "configure:111588: checking for dlopen in -ldl" >&5 ++echo "configure:118268: 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 -@@ -111250,7 +117907,7 @@ else +@@ -111592,7 +118272,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:117922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:111607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -111290,12 +117947,12 @@ fi +@@ -111632,12 +118312,12 @@ fi *) echo $ac_n "checking for shl_load""... $ac_c" 1>&6 --echo "configure:111294: checking for shl_load" >&5 -+echo "configure:117951: checking for shl_load" >&5 +-echo "configure:111636: checking for shl_load" >&5 ++echo "configure:118316: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:117979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:111664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118344: \"$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 -@@ -111336,7 +117993,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_ +@@ -111678,7 +118358,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 --echo "configure:111340: checking for shl_load in -ldld" >&5 -+echo "configure:117997: checking for shl_load in -ldld" >&5 +-echo "configure:111682: checking for shl_load in -ldld" >&5 ++echo "configure:118362: 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 -@@ -111344,7 +118001,7 @@ else +@@ -111686,7 +118366,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:111701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -111374,12 +118031,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -111716,12 +118396,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 --echo "configure:111378: checking for dlopen" >&5 -+echo "configure:118035: checking for dlopen" >&5 +-echo "configure:111720: checking for dlopen" >&5 ++echo "configure:118400: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:111748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118428: \"$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 -@@ -111420,7 +118077,7 @@ if eval "test \"`echo '$ac_cv_func_'dlop +@@ -111762,7 +118442,7 @@ if eval "test \"`echo '$ac_cv_func_'dlop else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:111424: checking for dlopen in -ldl" >&5 -+echo "configure:118081: checking for dlopen in -ldl" >&5 +-echo "configure:111766: checking for dlopen in -ldl" >&5 ++echo "configure:118446: 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 -@@ -111428,7 +118085,7 @@ else +@@ -111770,7 +118450,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:111785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -111458,7 +118115,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -111800,7 +118480,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 --echo "configure:111462: checking for dlopen in -lsvld" >&5 -+echo "configure:118119: checking for dlopen in -lsvld" >&5 +-echo "configure:111804: checking for dlopen in -lsvld" >&5 ++echo "configure:118484: 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 -@@ -111466,7 +118123,7 @@ else +@@ -111808,7 +118488,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsvld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:111823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -111496,7 +118153,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -111838,7 +118518,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 --echo "configure:111500: checking for dld_link in -ldld" >&5 -+echo "configure:118157: checking for dld_link in -ldld" >&5 +-echo "configure:111842: checking for dld_link in -ldld" >&5 ++echo "configure:118522: 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 -@@ -111504,7 +118161,7 @@ else +@@ -111846,7 +118526,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:111861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:118541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -111571,7 +118228,7 @@ fi +@@ -111913,7 +118593,7 @@ fi LIBS="$lt_cv_dlopen_libs $LIBS" - echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 --echo "configure:111575: checking whether a program can dlopen itself" >&5 -+echo "configure:118232: 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 -@@ -111581,7 +118238,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <&6 +-echo "configure:111917: checking whether a program can dlopen itself" >&5 ++echo "configure:118597: 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 +@@ -111923,7 +118603,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:118670: \"$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 +@@ -112009,7 +118689,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 +-echo "configure:112013: checking whether a statically linked program can dlopen itself" >&5 ++echo "configure:118693: 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 +@@ -112019,7 +118699,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:118766: \"$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 +@@ -112123,11 +118803,11 @@ fi + + # Report which library types will actually be built + echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 +-echo "configure:112127: checking if libtool supports shared libraries" >&5 ++echo "configure:118807: 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:112131: checking whether to build shared libraries" >&5 ++echo "configure:118811: 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 +@@ -112150,7 +118830,7 @@ esac + echo "$ac_t""$enable_shared" 1>&6 + + echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 +-echo "configure:112154: checking whether to build static libraries" >&5 ++echo "configure:118834: 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 +@@ -112836,7 +119516,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:112840: checking for ld used by $CC" >&5 ++echo "configure:119520: checking for ld used by $CC" >&5 + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -112866,10 +119546,10 @@ echo "configure:112840: checking for ld + esac + elif test "$with_gnu_ld" = yes; then + echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 +-echo "configure:112870: checking for GNU ld" >&5 ++echo "configure:119550: checking for GNU ld" >&5 + else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 +-echo "configure:112873: checking for non-GNU ld" >&5 ++echo "configure:119553: 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 +@@ -112908,7 +119588,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:112912: checking if the linker ($LD) is GNU ld" >&5 ++echo "configure:119592: 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 +@@ -112974,7 +119654,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:112978: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo "configure:119658: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + ld_shlibs_CXX=yes + case $host_os in + aix3*) +@@ -113072,12 +119752,12 @@ case $host_os in + # Determine the default libpath from the value encoded in an empty executable. + + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:119761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -113111,12 +119791,12 @@ if test -z "$aix_libpath"; then aix_libp + # Determine the default libpath from the value encoded in an empty executable. + + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:119800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -113883,7 +120563,7 @@ private: + }; + EOF + +-if { (eval echo configure:113887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:120567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + +@@ -114039,7 +120719,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:114043: checking for $compiler option to produce PIC" >&5 ++echo "configure:120723: checking for $compiler option to produce PIC" >&5 + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -114336,7 +121016,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX" + 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:114340: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++echo "configure:121020: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 + if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -114353,11 +121033,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:114357: $lt_compile\"" >&5) ++ (eval echo "\"configure:121037: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "configure:114361: \$? = $ac_status" >&5 ++ echo "configure:121041: \$? = $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. +@@ -114399,7 +121079,7 @@ esac + # + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" + echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 +-echo "configure:114403: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo "configure:121083: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -114437,7 +121117,7 @@ fi + + + echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 +-echo "configure:114441: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo "configure:121121: 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 +@@ -114457,11 +121137,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:114461: $lt_compile\"" >&5) ++ (eval echo "\"configure:121141: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "configure:114465: \$? = $ac_status" >&5 ++ echo "configure:121145: \$? = $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 +@@ -114491,7 +121171,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:114495: checking if we can lock with hard links" >&5 ++echo "configure:121175: 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 +@@ -114508,7 +121188,7 @@ else + fi + + echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 +-echo "configure:114512: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo "configure:121192: 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 +@@ -114554,11 +121234,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:114558: checking whether -lc should be explicitly linked in" >&5 ++echo "configure:121238: checking whether -lc should be explicitly linked in" >&5 + $rm conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + +- if { (eval echo configure:114562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then ++ if { (eval echo configure:121242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext +@@ -114572,7 +121252,7 @@ echo "configure:114558: checking whether + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= +- if { (eval echo configure:114576: \"$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:121256: \"$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 +@@ -114591,7 +121271,7 @@ echo "configure:114558: checking whether + esac + + echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 +-echo "configure:114595: checking dynamic linker characteristics" >&5 ++echo "configure:121275: checking dynamic linker characteristics" >&5 + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -115164,7 +121844,7 @@ if test "$GCC" = yes; then + fi + + echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 +-echo "configure:115168: checking how to hardcode library paths into programs" >&5 ++echo "configure:121848: 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" || \ +--- a/generated_lists ++++ b/generated_lists +@@ -1,3 +1,3 @@ + makefile_am_files = Zend/Makefile.am TSRM/Makefile.am + config_h_files = Zend/acconfig.h TSRM/acconfig.h +-config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config9.m4 ext/recode/config.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite3/config0.m4 ext/sqlite/config.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4 ++config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/apc/config.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dio/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/http/config9.m4 ext/http/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libevent/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config9.m4 ext/recode/config.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite3/config0.m4 ext/sqlite/config.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4 +--- a/main/php_config.h.in ++++ b/main/php_config.h.in +@@ -1,4 +1,4 @@ +-/* main/php_config.h.in. Generated from configure.in by autoheader. */ ++/* main/php_config.h.in. Generated automatically from configure.in by autoheader 2.13. */ + /* Leave this file alone */ + /* + +----------------------------------------------------------------------+ +@@ -32,442 +32,1112 @@ + #define ZEND_DLIMPORT + + +-#undef uint +-#undef ulong ++/* Define if on AIX 3. ++ System headers sometimes define this. ++ We just want to avoid a redefinition error message. */ ++#ifndef _ALL_SOURCE ++#undef _ALL_SOURCE ++#endif + +-/* Define if you want to enable memory limit support */ +-#define MEMORY_LIMIT 0 ++/* Define if using alloca.c. */ ++#undef C_ALLOCA + ++/* Define to empty if the keyword does not work. */ ++#undef const + +-/* */ +-#undef AIX ++/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. ++ This function is required for alloca.c support on those systems. */ ++#undef CRAY_STACKSEG_END + +-/* Whether to use native BeOS threads */ +-#undef BETHREADS ++/* Define to `int' if doesn't define. */ ++#undef gid_t + +-/* */ +-#undef CDB_INCLUDE_FILE ++/* Define if you have alloca, as a function or macro. */ ++#undef HAVE_ALLOCA + +-/* Define if system uses EBCDIC */ +-#undef CHARSET_EBCDIC ++/* Define if you have and it should be used (not on Ultrix). */ ++#undef HAVE_ALLOCA_H + +-/* Whether to build bcmath as dynamic module */ +-#undef COMPILE_DL_BCMATH ++/* Define if you don't have vprintf but do have _doprnt. */ ++#undef HAVE_DOPRNT + +-/* Whether to build bz2 as dynamic module */ +-#undef COMPILE_DL_BZ2 ++/* Define if your system has a working fnmatch function. */ ++#undef HAVE_FNMATCH + +-/* Whether to build calendar as dynamic module */ +-#undef COMPILE_DL_CALENDAR ++/* Define if your struct stat has st_blksize. */ ++#undef HAVE_ST_BLKSIZE + +-/* Whether to build ctype as dynamic module */ +-#undef COMPILE_DL_CTYPE ++/* Define if your struct stat has st_blocks. */ ++#undef HAVE_ST_BLOCKS + +-/* Whether to build curl as dynamic module */ +-#undef COMPILE_DL_CURL ++/* Define if your struct stat has st_rdev. */ ++#undef HAVE_ST_RDEV + +-/* Whether to build date as dynamic module */ +-#undef COMPILE_DL_DATE ++/* Define if your struct tm has tm_zone. */ ++#undef HAVE_TM_ZONE + +-/* Whether to build dba as dynamic module */ +-#undef COMPILE_DL_DBA ++/* Define if you don't have tm_zone but do have the external array ++ tzname. */ ++#undef HAVE_TZNAME + +-/* Whether to build dom as dynamic module */ +-#undef COMPILE_DL_DOM ++/* Define if utime(file, NULL) sets file's timestamp to the present. */ ++#undef HAVE_UTIME_NULL + +-/* Whether to build enchant as dynamic module */ +-#undef COMPILE_DL_ENCHANT ++/* Define if you have the vprintf function. */ ++#undef HAVE_VPRINTF + +-/* Whether to build ereg as dynamic module */ +-#undef COMPILE_DL_EREG ++/* Define as __inline if that's what the C compiler calls it. */ ++#undef inline + +-/* Whether to build exif as dynamic module */ +-#undef COMPILE_DL_EXIF ++/* Define if your C compiler doesn't accept -c and -o together. */ ++#undef NO_MINUS_C_MINUS_O + +-/* Whether to build fileinfo as dynamic module */ +-#undef COMPILE_DL_FILEINFO ++/* Define as the return type of signal handlers (int or void). */ ++#undef RETSIGTYPE + +-/* Whether to build filter as dynamic module */ +-#undef COMPILE_DL_FILTER ++/* Define to `unsigned' if doesn't define. */ ++#undef size_t + +-/* Whether to build ftp as dynamic module */ +-#undef COMPILE_DL_FTP ++/* If using the C implementation of alloca, define if you know the ++ direction of stack growth for your system; otherwise it will be ++ automatically deduced at run-time. ++ STACK_DIRECTION > 0 => grows toward higher addresses ++ STACK_DIRECTION < 0 => grows toward lower addresses ++ STACK_DIRECTION = 0 => direction of growth unknown ++ */ ++#undef STACK_DIRECTION + +-/* Whether to build gd as dynamic module */ +-#undef COMPILE_DL_GD ++/* Define if you have the ANSI C header files. */ ++#undef STDC_HEADERS + +-/* Whether to build gettext as dynamic module */ +-#undef COMPILE_DL_GETTEXT ++/* Define if you can safely include both and . */ ++#undef TIME_WITH_SYS_TIME + +-/* Whether to build gmp as dynamic module */ +-#undef COMPILE_DL_GMP ++/* Define if your declares struct tm. */ ++#undef TM_IN_SYS_TIME + +-/* Whether to build hash as dynamic module */ +-#undef COMPILE_DL_HASH ++/* Define to `int' if doesn't define. */ ++#undef uid_t + +-/* Whether to build iconv as dynamic module */ +-#undef COMPILE_DL_ICONV ++#undef uint ++#undef ulong + +-/* Whether to build imap as dynamic module */ +-#undef COMPILE_DL_IMAP ++/* The number of bytes in a char. */ ++#undef SIZEOF_CHAR + +-/* Whether to build interbase as dynamic module */ +-#undef COMPILE_DL_INTERBASE ++/* The number of bytes in a char *. */ ++#undef SIZEOF_CHAR_P + +-/* Whether to build intl as dynamic module */ +-#undef COMPILE_DL_INTL ++/* The number of bytes in a int. */ ++#undef SIZEOF_INT + +-/* Whether to build json as dynamic module */ +-#undef COMPILE_DL_JSON ++/* The number of bytes in a long. */ ++#undef SIZEOF_LONG + +-/* Whether to build ldap as dynamic module */ +-#undef COMPILE_DL_LDAP ++/* The number of bytes in a long int. */ ++#undef SIZEOF_LONG_INT + +-/* Whether to build libxml as dynamic module */ +-#undef COMPILE_DL_LIBXML ++/* The number of bytes in a long long. */ ++#undef SIZEOF_LONG_LONG + +-/* Whether to build mbstring as dynamic module */ +-#undef COMPILE_DL_MBSTRING ++/* The number of bytes in a long long int. */ ++#undef SIZEOF_LONG_LONG_INT + +-/* Whether to build mcrypt as dynamic module */ +-#undef COMPILE_DL_MCRYPT ++/* The number of bytes in a short. */ ++#undef SIZEOF_SHORT + +-/* Whether to build mssql as dynamic module */ +-#undef COMPILE_DL_MSSQL ++/* The number of bytes in a size_t. */ ++#undef SIZEOF_SIZE_T + +-/* Whether to build mysql as dynamic module */ +-#undef COMPILE_DL_MYSQL ++/* Define if you have the CreateProcess function. */ ++#undef HAVE_CREATEPROCESS + +-/* Whether to build mysqli as dynamic module */ +-#undef COMPILE_DL_MYSQLI ++/* Define if you have the acosh function. */ ++#undef HAVE_ACOSH + +-/* Whether to build mysqlnd as dynamic module */ +-#undef COMPILE_DL_MYSQLND ++/* Define if you have the alphasort function. */ ++#undef HAVE_ALPHASORT + +-/* Whether to build oci8 as dynamic module */ +-#undef COMPILE_DL_OCI8 ++/* Define if you have the asctime_r function. */ ++#undef HAVE_ASCTIME_R + +-/* Whether to build odbc as dynamic module */ +-#undef COMPILE_DL_ODBC ++/* Define if you have the asinh function. */ ++#undef HAVE_ASINH + +-/* Whether to build openssl as dynamic module */ +-#undef COMPILE_DL_OPENSSL ++/* Define if you have the asprintf function. */ ++#undef HAVE_ASPRINTF + +-/* Whether to build pcntl as dynamic module */ +-#undef COMPILE_DL_PCNTL ++/* Define if you have the atanh function. */ ++#undef HAVE_ATANH + +-/* Whether to build pcre as dynamic module */ +-#undef COMPILE_DL_PCRE ++/* Define if you have the atoll function. */ ++#undef HAVE_ATOLL + +-/* Whether to build pdo as dynamic module */ +-#undef COMPILE_DL_PDO ++/* Define if you have the chroot function. */ ++#undef HAVE_CHROOT + +-/* Whether to build pdo_dblib as dynamic module */ +-#undef COMPILE_DL_PDO_DBLIB ++/* Define if you have the clearenv function. */ ++#undef HAVE_CLEARENV + +-/* Whether to build pdo_firebird as dynamic module */ +-#undef COMPILE_DL_PDO_FIREBIRD ++/* Define if you have the crypt function. */ ++#undef HAVE_CRYPT + +-/* Whether to build pdo_mysql as dynamic module */ +-#undef COMPILE_DL_PDO_MYSQL ++/* Define if you have the crypt_r function. */ ++#undef HAVE_CRYPT_R + +-/* Whether to build pdo_oci as dynamic module */ +-#undef COMPILE_DL_PDO_OCI ++/* Define if you have the ctermid function. */ ++#undef HAVE_CTERMID + +-/* Whether to build pdo_odbc as dynamic module */ +-#undef COMPILE_DL_PDO_ODBC ++/* Define if you have the ctime_r function. */ ++#undef HAVE_CTIME_R + +-/* Whether to build pdo_pgsql as dynamic module */ +-#undef COMPILE_DL_PDO_PGSQL ++/* Define if you have the cuserid function. */ ++#undef HAVE_CUSERID + +-/* Whether to build pdo_sqlite as dynamic module */ +-#undef COMPILE_DL_PDO_SQLITE ++/* Define if you have the fabsf function. */ ++#undef HAVE_FABSF + +-/* Whether to build pgsql as dynamic module */ +-#undef COMPILE_DL_PGSQL ++/* Define if you have the finite function. */ ++#undef HAVE_FINITE + +-/* Whether to build phar as dynamic module */ +-#undef COMPILE_DL_PHAR ++/* Define if you have the flock function. */ ++#undef HAVE_FLOCK + +-/* Whether to build posix as dynamic module */ +-#undef COMPILE_DL_POSIX ++/* Define if you have the floorf function. */ ++#undef HAVE_FLOORF + +-/* Whether to build pspell as dynamic module */ +-#undef COMPILE_DL_PSPELL ++/* Define if you have the fork function. */ ++#undef HAVE_FORK + +-/* Whether to build readline as dynamic module */ +-#undef COMPILE_DL_READLINE ++/* Define if you have the fpclass function. */ ++#undef HAVE_FPCLASS + +-/* Whether to build recode as dynamic module */ +-#undef COMPILE_DL_RECODE ++/* Define if you have the ftok function. */ ++#undef HAVE_FTOK + +-/* Whether to build reflection as dynamic module */ +-#undef COMPILE_DL_REFLECTION ++/* Define if you have the funopen function. */ ++#undef HAVE_FUNOPEN + +-/* Whether to build session as dynamic module */ +-#undef COMPILE_DL_SESSION ++/* Define if you have the gai_strerror function. */ ++#undef HAVE_GAI_STRERROR + +-/* Whether to build shmop as dynamic module */ +-#undef COMPILE_DL_SHMOP ++/* Define if you have the gcvt function. */ ++#undef HAVE_GCVT + +-/* Whether to build simplexml as dynamic module */ +-#undef COMPILE_DL_SIMPLEXML ++/* Define if you have the getcwd function. */ ++#undef HAVE_GETCWD + +-/* Whether to build snmp as dynamic module */ +-#undef COMPILE_DL_SNMP ++/* Define if you have the getgrgid_r function. */ ++#undef HAVE_GETGRGID_R + +-/* Whether to build soap as dynamic module */ +-#undef COMPILE_DL_SOAP ++/* Define if you have the getgrnam_r function. */ ++#undef HAVE_GETGRNAM_R + +-/* Whether to build sockets as dynamic module */ +-#undef COMPILE_DL_SOCKETS ++/* Define if you have the getgroups function. */ ++#undef HAVE_GETGROUPS + +-/* Whether to build spl as dynamic module */ +-#undef COMPILE_DL_SPL ++/* Define if you have the gethostname function. */ ++#undef HAVE_GETHOSTNAME + +-/* Whether to build sqlite as dynamic module */ +-#undef COMPILE_DL_SQLITE ++/* Define if you have the getloadavg function. */ ++#undef HAVE_GETLOADAVG + +-/* Whether to build sqlite3 as dynamic module */ +-#undef COMPILE_DL_SQLITE3 ++/* Define if you have the getlogin function. */ ++#undef HAVE_GETLOGIN + +-/* Whether to build standard as dynamic module */ +-#undef COMPILE_DL_STANDARD ++/* Define if you have the getopt function. */ ++#undef HAVE_GETOPT + +-/* Whether to build sybase_ct as dynamic module */ +-#undef COMPILE_DL_SYBASE_CT ++/* Define if you have the getpgid function. */ ++#undef HAVE_GETPGID + +-/* Whether to build sysvmsg as dynamic module */ +-#undef COMPILE_DL_SYSVMSG ++/* Define if you have the getpid function. */ ++#undef HAVE_GETPID + +-/* Whether to build sysvsem as dynamic module */ +-#undef COMPILE_DL_SYSVSEM ++/* Define if you have the getpriority function. */ ++#undef HAVE_GETPRIORITY + +-/* Whether to build sysvshm as dynamic module */ +-#undef COMPILE_DL_SYSVSHM ++/* Define if you have the getprotobyname function. */ ++#undef HAVE_GETPROTOBYNAME + +-/* Whether to build tidy as dynamic module */ +-#undef COMPILE_DL_TIDY ++/* Define if you have the getprotobynumber function. */ ++#undef HAVE_GETPROTOBYNUMBER + +-/* Whether to build tokenizer as dynamic module */ +-#undef COMPILE_DL_TOKENIZER ++/* Define if you have the getpwnam_r function. */ ++#undef HAVE_GETPWNAM_R + +-/* Whether to build wddx as dynamic module */ +-#undef COMPILE_DL_WDDX ++/* Define if you have the getpwuid_r function. */ ++#undef HAVE_GETPWUID_R + +-/* Whether to build xml as dynamic module */ +-#undef COMPILE_DL_XML ++/* Define if you have the getrlimit function. */ ++#undef HAVE_GETRLIMIT + +-/* Whether to build xmlreader as dynamic module */ +-#undef COMPILE_DL_XMLREADER ++/* Define if you have the getrusage function. */ ++#undef HAVE_GETRUSAGE + +-/* Whether to build xmlrpc as dynamic module */ +-#undef COMPILE_DL_XMLRPC ++/* Define if you have the getservbyname function. */ ++#undef HAVE_GETSERVBYNAME + +-/* Whether to build xmlwriter as dynamic module */ +-#undef COMPILE_DL_XMLWRITER ++/* Define if you have the getservbyport function. */ ++#undef HAVE_GETSERVBYPORT + +-/* Whether to build xsl as dynamic module */ +-#undef COMPILE_DL_XSL ++/* Define if you have the getsid function. */ ++#undef HAVE_GETSID + +-/* Whether to build zip as dynamic module */ +-#undef COMPILE_DL_ZIP ++/* Define if you have the gettimeofday function. */ ++#undef HAVE_GETTIMEOFDAY + +-/* Whether to build zlib as dynamic module */ +-#undef COMPILE_DL_ZLIB ++/* Define if you have the getwd function. */ ++#undef HAVE_GETWD + +-/* */ +-#undef COOKIE_IO_FUNCTIONS_T ++/* Define if you have the glob function. */ ++#undef HAVE_GLOB + +-/* */ +-#undef COOKIE_SEEKER_USES_OFF64_T ++/* Define if you have the gmtime_r function. */ ++#undef HAVE_GMTIME_R + +-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP +- systems. This function is required for `alloca.c' support on those systems. +- */ +-#undef CRAY_STACKSEG_END ++/* Define if you have the grantpt function. */ ++#undef HAVE_GRANTPT + +-/* Define if crypt_r has uses CRYPTD */ +-#undef CRYPT_R_CRYPTD ++/* Define if you have the hstrerror function. */ ++#undef HAVE_HSTRERROR + +-/* Define if struct crypt_data requires _GNU_SOURCE */ +-#undef CRYPT_R_GNU_SOURCE ++/* Define if you have the hypot function. */ ++#undef HAVE_HYPOT + +-/* Define if crypt_r uses struct crypt_data */ +-#undef CRYPT_R_STRUCT_CRYPT_DATA ++/* Define if you have the inet_ntoa function. */ ++#undef HAVE_INET_NTOA + +-/* Define to 1 if using `alloca.c'. */ +-#undef C_ALLOCA ++/* Define if you have the inet_ntop function. */ ++#undef HAVE_INET_NTOP + +-/* Define if the target system is darwin */ +-#undef DARWIN ++/* Define if you have the inet_pton function. */ ++#undef HAVE_INET_PTON + +-/* */ +-#undef DB1_INCLUDE_FILE ++/* Define if you have the initgroups function. */ ++#undef HAVE_INITGROUPS ++ ++/* Define if you have the isascii function. */ ++#undef HAVE_ISASCII ++ ++/* Define if you have the isfinite function. */ ++#undef HAVE_ISFINITE ++ ++/* Define if you have the isinf function. */ ++#undef HAVE_ISINF ++ ++/* Define if you have the isnan function. */ ++#undef HAVE_ISNAN ++ ++/* Define if you have the kill function. */ ++#undef HAVE_KILL ++ ++/* Define if you have the lchown function. */ ++#undef HAVE_LCHOWN ++ ++/* Define if you have the ldap_parse_reference function. */ ++#undef HAVE_LDAP_PARSE_REFERENCE ++ ++/* Define if you have the ldap_parse_result function. */ ++#undef HAVE_LDAP_PARSE_RESULT ++ ++/* Define if you have the ldap_start_tls_s function. */ ++#undef HAVE_LDAP_START_TLS_S ++ ++/* Define if you have the link function. */ ++#undef HAVE_LINK ++ ++/* Define if you have the localeconv function. */ ++#undef HAVE_LOCALECONV ++ ++/* Define if you have the localtime_r function. */ ++#undef HAVE_LOCALTIME_R ++ ++/* Define if you have the lockf function. */ ++#undef HAVE_LOCKF ++ ++/* Define if you have the log1p function. */ ++#undef HAVE_LOG1P ++ ++/* Define if you have the lrand48 function. */ ++#undef HAVE_LRAND48 ++ ++/* Define if you have the makedev function. */ ++#undef HAVE_MAKEDEV ++ ++/* Define if you have the mblen function. */ ++#undef HAVE_MBLEN ++ ++/* Define if you have the mbrlen function. */ ++#undef HAVE_MBRLEN ++ ++/* Define if you have the mbsinit function. */ ++#undef HAVE_MBSINIT ++ ++/* Define if you have the memcpy function. */ ++#undef HAVE_MEMCPY ++ ++/* Define if you have the memmove function. */ ++#undef HAVE_MEMMOVE ++ ++/* Define if you have the mempcpy function. */ ++#undef HAVE_MEMPCPY ++ ++/* Define if you have the mkfifo function. */ ++#undef HAVE_MKFIFO ++ ++/* Define if you have the mknod function. */ ++#undef HAVE_MKNOD ++ ++/* Define if you have the mkstemp function. */ ++#undef HAVE_MKSTEMP ++ ++/* Define if you have the mmap function. */ ++#undef HAVE_MMAP ++ ++/* Define if you have the mremap function. */ ++#undef HAVE_MREMAP ++ ++/* Define if you have the mysql_commit function. */ ++#undef HAVE_MYSQL_COMMIT ++ ++/* Define if you have the mysql_next_result function. */ ++#undef HAVE_MYSQL_NEXT_RESULT ++ ++/* Define if you have the mysql_sqlstate function. */ ++#undef HAVE_MYSQL_SQLSTATE ++ ++/* Define if you have the mysql_stmt_prepare function. */ ++#undef HAVE_MYSQL_STMT_PREPARE ++ ++/* Define if you have the nanosleep function. */ ++#undef HAVE_NANOSLEEP ++ ++/* Define if you have the nice function. */ ++#undef HAVE_NICE ++ ++/* Define if you have the nl_langinfo function. */ ++#undef HAVE_NL_LANGINFO ++ ++/* Define if you have the perror function. */ ++#undef HAVE_PERROR ++ ++/* Define if you have the poll function. */ ++#undef HAVE_POLL ++ ++/* Define if you have the ptsname function. */ ++#undef HAVE_PTSNAME ++ ++/* Define if you have the putenv function. */ ++#undef HAVE_PUTENV ++ ++/* Define if you have the rand_r function. */ ++#undef HAVE_RAND_R ++ ++/* Define if you have the random function. */ ++#undef HAVE_RANDOM ++ ++/* Define if you have the realpath function. */ ++#undef HAVE_REALPATH ++ ++/* Define if you have the rl_completion_matches function. */ ++#undef HAVE_RL_COMPLETION_MATCHES ++ ++/* Define if you have the scandir function. */ ++#undef HAVE_SCANDIR ++ ++/* Define if you have the setegid function. */ ++#undef HAVE_SETEGID ++ ++/* Define if you have the setenv function. */ ++#undef HAVE_SETENV ++ ++/* Define if you have the seteuid function. */ ++#undef HAVE_SETEUID ++ ++/* Define if you have the setitimer function. */ ++#undef HAVE_SETITIMER ++ ++/* Define if you have the setlocale function. */ ++#undef HAVE_SETLOCALE ++ ++/* Define if you have the setpgid function. */ ++#undef HAVE_SETPGID ++ ++/* Define if you have the setpriority function. */ ++#undef HAVE_SETPRIORITY ++ ++/* Define if you have the setproctitle function. */ ++#undef HAVE_SETPROCTITLE ++ ++/* Define if you have the setsid function. */ ++#undef HAVE_SETSID ++ ++/* Define if you have the setsockopt function. */ ++#undef HAVE_SETSOCKOPT ++ ++/* Define if you have the setvbuf function. */ ++#undef HAVE_SETVBUF ++ ++/* Define if you have the shutdown function. */ ++#undef HAVE_SHUTDOWN ++ ++/* Define if you have the sigaction function. */ ++#undef HAVE_SIGACTION ++ ++/* Define if you have the sigprocmask function. */ ++#undef HAVE_SIGPROCMASK ++ ++/* Define if you have the sigsetjmp function. */ ++#undef HAVE_SIGSETJMP ++ ++/* Define if you have the sigtimedwait function. */ ++#undef HAVE_SIGTIMEDWAIT ++ ++/* Define if you have the sigwaitinfo function. */ ++#undef HAVE_SIGWAITINFO ++ ++/* Define if you have the sin function. */ ++#undef HAVE_SIN ++ ++/* Define if you have the snprintf function. */ ++#undef HAVE_SNPRINTF ++ ++/* Define if you have the socketpair function. */ ++#undef HAVE_SOCKETPAIR ++ ++/* Define if you have the srand48 function. */ ++#undef HAVE_SRAND48 ++ ++/* Define if you have the srandom function. */ ++#undef HAVE_SRANDOM ++ ++/* Define if you have the statfs function. */ ++#undef HAVE_STATFS ++ ++/* Define if you have the statvfs function. */ ++#undef HAVE_STATVFS ++ ++/* Define if you have the std_syslog function. */ ++#undef HAVE_STD_SYSLOG ++ ++/* Define if you have the strcasecmp function. */ ++#undef HAVE_STRCASECMP ++ ++/* Define if you have the strcoll function. */ ++#undef HAVE_STRCOLL ++ ++/* Define if you have the strdup function. */ ++#undef HAVE_STRDUP ++ ++/* Define if you have the strerror function. */ ++#undef HAVE_STRERROR ++ ++/* Define if you have the strfmon function. */ ++#undef HAVE_STRFMON ++ ++/* Define if you have the strftime function. */ ++#undef HAVE_STRFTIME ++ ++/* Define if you have the strlcat function. */ ++#undef HAVE_STRLCAT ++ ++/* Define if you have the strlcpy function. */ ++#undef HAVE_STRLCPY ++ ++/* Define if you have the strndup function. */ ++#undef HAVE_STRNDUP ++ ++/* Define if you have the strnlen function. */ ++#undef HAVE_STRNLEN ++ ++/* Define if you have the strpbrk function. */ ++#undef HAVE_STRPBRK ++ ++/* Define if you have the strpncpy function. */ ++#undef HAVE_STRPNCPY ++ ++/* Define if you have the strptime function. */ ++#undef HAVE_STRPTIME ++ ++/* Define if you have the strstr function. */ ++#undef HAVE_STRSTR ++ ++/* Define if you have the strtod function. */ ++#undef HAVE_STRTOD ++ ++/* Define if you have the strtok_r function. */ ++#undef HAVE_STRTOK_R ++ ++/* Define if you have the strtol function. */ ++#undef HAVE_STRTOL ++ ++/* Define if you have the strtoll function. */ ++#undef HAVE_STRTOLL ++ ++/* Define if you have the strtoul function. */ ++#undef HAVE_STRTOUL ++ ++/* Define if you have the strtoull function. */ ++#undef HAVE_STRTOULL ++ ++/* Define if you have the symlink function. */ ++#undef HAVE_SYMLINK ++ ++/* Define if you have the tempnam function. */ ++#undef HAVE_TEMPNAM ++ ++/* Define if you have the tzset function. */ ++#undef HAVE_TZSET ++ ++/* Define if you have the unlockpt function. */ ++#undef HAVE_UNLOCKPT ++ ++/* Define if you have the unsetenv function. */ ++#undef HAVE_UNSETENV ++ ++/* Define if you have the usleep function. */ ++#undef HAVE_USLEEP ++ ++/* Define if you have the utime function. */ ++#undef HAVE_UTIME ++ ++/* Define if you have the utimes function. */ ++#undef HAVE_UTIMES ++ ++/* Define if you have the vasprintf function. */ ++#undef HAVE_VASPRINTF ++ ++/* Define if you have the vsnprintf function. */ ++#undef HAVE_VSNPRINTF ++ ++/* Define if you have the wait3 function. */ ++#undef HAVE_WAIT3 ++ ++/* Define if you have the waitpid function. */ ++#undef HAVE_WAITPID ++ ++/* Define if you have the header file. */ ++#undef HAVE__NSAPI_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_ALLOCA_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_ARPA_INET_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_ARPA_NAMESER_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_ASSERT_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_ATOMIC_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_CRYPT_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_DEFAULT_STORE_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_DIRENT_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_DLFCN_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_DNS_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_ERRNO_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_FCNTL_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_GRP_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_IEEEFP_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_LANGINFO_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_LIMITS_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_LOCALE_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_MALLOC_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_MONETARY_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_NDIR_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_NETDB_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_NETINET_IN_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_NETINET_TCP_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_OPENSSL_CRYPTO_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_PWD_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_RESOLV_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SIGNAL_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_ST_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_STDARG_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_STDBOOL_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_STDIO_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_STRING_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_DIR_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_FILE_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_IOCTL_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_IPC_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_LOADAVG_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_MKDEV_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_MMAN_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_MOUNT_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_NDIR_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_PARAM_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_POLL_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_RESOURCE_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_SELECT_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_SOCKET_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_STATFS_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_STATVFS_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_SYSEXITS_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_TIME_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_TIMES_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_UIO_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_UN_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_UTSNAME_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_VARARGS_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_VFS_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_WAIT_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYSEXITS_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYSLOG_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_TERMIOS_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_TIME_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_TUXMODULE_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_UNIX_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_UTIME_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_WCHAR_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_XMLPARSE_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_XMLTOK_H ++ ++/* Define if you have the m library (-lm). */ ++#undef HAVE_LIBM ++ ++/* Define if the target system has /dev/urandom device */ ++#undef HAVE_DEV_URANDOM ++ ++/* Whether you have AOLserver */ ++#undef HAVE_AOLSERVER ++ ++/* */ ++#undef HAVE_AP_CONFIG_H ++ ++/* */ ++#undef HAVE_AP_COMPAT_H ++ ++/* */ ++#undef HAVE_APACHE ++ ++/* */ ++#undef HAVE_APACHE ++ ++/* */ ++#undef HAVE_AP_CONFIG_H ++ ++/* */ ++#undef HAVE_AP_CONFIG_H ++ ++/* */ ++#undef HAVE_AP_COMPAT_H ++ ++/* */ ++#undef HAVE_OLD_COMPAT_H ++ ++/* */ ++#undef HAVE_AP_CONFIG_H ++ ++/* */ ++#undef HAVE_AP_COMPAT_H ++ ++/* */ ++#undef HAVE_OLD_COMPAT_H ++ ++/* */ ++#undef HAVE_AP_CONFIG_H ++ ++/* */ ++#undef HAVE_AP_COMPAT_H ++ ++/* */ ++#undef HAVE_OLD_COMPAT_H ++ ++/* */ ++#undef USE_TRANSFER_TABLES ++ ++/* */ ++#undef PHP_APACHE_HAVE_CLIENT_FD ++ ++/* */ ++#undef HAVE_AP_CONFIG_H ++ ++/* */ ++#undef HAVE_AP_COMPAT_H ++ ++/* */ ++#undef HAVE_APACHE_HOOKS ++ ++/* */ ++#undef HAVE_APACHE ++ ++/* */ ++#undef HAVE_AP_CONFIG_H ++ ++/* */ ++#undef HAVE_AP_CONFIG_H ++ ++/* */ ++#undef HAVE_AP_COMPAT_H ++ ++/* */ ++#undef HAVE_OLD_COMPAT_H ++ ++/* */ ++#undef HAVE_AP_CONFIG_H ++ ++/* */ ++#undef HAVE_AP_COMPAT_H ++ ++/* */ ++#undef HAVE_OLD_COMPAT_H ++ ++/* */ ++#undef HAVE_AP_CONFIG_H ++ ++/* */ ++#undef HAVE_AP_COMPAT_H ++ ++/* */ ++#undef HAVE_OLD_COMPAT_H ++ ++/* */ ++#undef USE_TRANSFER_TABLES ++ ++/* */ ++#undef PHP_APACHE_HAVE_CLIENT_FD ++ ++/* Whether to compile with Caudium support */ ++#undef HAVE_CAUDIUM ++ ++/* Whether you have a Continuity Server */ ++#undef HAVE_CONTINUITY ++ ++/* do we have prctl? */ ++#undef HAVE_PRCTL ++ ++/* do we have clock_gettime? */ ++#undef HAVE_CLOCK_GETTIME ++ ++/* do we have clock_get_time? */ ++#undef HAVE_CLOCK_GET_TIME ++ ++/* do we have ptrace? */ ++#undef HAVE_PTRACE ++ ++/* do we have mach_vm_read? */ ++#undef HAVE_MACH_VM_READ ++ ++/* /proc/pid/mem interface */ ++#undef PROC_MEM_FILE ++ ++/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */ ++#undef HAVE_BUILTIN_ATOMIC + +-/* */ +-#undef DB1_VERSION ++/* do we have TCP_INFO? */ ++#undef HAVE_LQ_TCP_INFO + +-/* */ +-#undef DB2_INCLUDE_FILE ++/* do we have SO_LISTENQxxx? */ ++#undef HAVE_LQ_SO_LISTENQ + +-/* */ +-#undef DB3_INCLUDE_FILE ++/* do we have sysconf? */ ++#undef HAVE_SYSCONF + +-/* */ +-#undef DB4_INCLUDE_FILE ++/* do we have times? */ ++#undef HAVE_TIMES + +-/* */ +-#undef DBA_CDB ++/* do we have kqueue? */ ++#undef HAVE_KQUEUE + +-/* */ +-#undef DBA_CDB_BUILTIN ++/* do we have port framework? */ ++#undef HAVE_PORT + +-/* */ +-#undef DBA_CDB_MAKE ++/* do we have /dev/poll? */ ++#undef HAVE_DEVPOLL + +-/* */ +-#undef DBA_DB1 ++/* do we have epoll? */ ++#undef HAVE_EPOLL + +-/* */ +-#undef DBA_DB2 ++/* do we have poll? */ ++#undef HAVE_POLL + +-/* */ +-#undef DBA_DB3 ++/* do we have select? */ ++#undef HAVE_SELECT + +-/* */ +-#undef DBA_DB4 ++/* fpm user name */ ++#undef PHP_FPM_USER + +-/* */ +-#undef DBA_DBM ++/* fpm group name */ ++#undef PHP_FPM_GROUP + +-/* */ +-#undef DBA_FLATFILE ++/* */ ++#undef WITH_ZEUS + +-/* */ +-#undef DBA_GDBM ++/* Whether you have a Netscape/iPlanet/Sun Webserver */ ++#undef HAVE_NSAPI + +-/* */ +-#undef DBA_INIFILE ++/* Whether you have phttpd */ ++#undef HAVE_PHTTPD + +-/* */ +-#undef DBA_NDBM ++/* whether you want Pi3Web support */ ++#undef WITH_PI3WEB + +-/* */ +-#undef DBA_QDBM ++/* Whether you use Roxen */ ++#undef HAVE_ROXEN + +-/* */ +-#undef DBM_INCLUDE_FILE ++/* Whether to use Roxen in ZTS mode */ ++#undef ROXEN_USE_ZTS + +-/* */ +-#undef DBM_VERSION ++/* Define if the socklen_t typedef is in sys/socket.h */ ++#undef HAVE_SOCKLEN_T + +-/* */ +-#undef DEFAULT_SHORT_OPEN_TAG ++/* Define if sockaddr_un in sys/un.h contains a sun_len component */ ++#undef HAVE_SOCKADDR_UN_SUN_LEN + +-/* Define if dlsym() requires a leading underscore in symbol names. */ +-#undef DLSYM_NEEDS_UNDERSCORE ++/* Define if cross-process locking is required by accept() */ ++#undef USE_LOCKING + +-/* Whether to enable chroot() function */ +-#undef ENABLE_CHROOT_FUNC ++/* Define if system uses EBCDIC */ ++#undef CHARSET_EBCDIC + +-/* */ +-#undef ENABLE_GD_TTF ++/* Define if processor uses big-endian word */ ++#undef WORDS_BIGENDIAN + +-/* */ +-#undef ENCHANT_VERSION_STRING ++/* whether write(2) works */ ++#undef PHP_WRITE_STDOUT + +-/* */ +-#undef GDBM_INCLUDE_FILE ++/* */ ++#undef HAVE_SOCKET + +-/* Whether you use GNU Pth */ +-#undef GNUPTH ++/* */ ++#undef HAVE_SOCKET + +-/* Whether 3 arg set_rebind_proc() */ +-#undef HAVE_3ARG_SETREBINDPROC ++/* */ ++#undef HAVE_LIBSOCKET + +-/* Define to 1 if you have the `acosh' function. */ +-#undef HAVE_ACOSH ++/* */ ++#undef HAVE_SOCKETPAIR + +-/* */ +-#undef HAVE_ADABAS ++/* */ ++#undef HAVE_SOCKETPAIR + +-/* whether the compiler supports __alignof__ */ +-#undef HAVE_ALIGNOF ++/* */ ++#undef HAVE_LIBSOCKET + +-/* Define to 1 if you have `alloca', as a function or macro. */ +-#undef HAVE_ALLOCA ++/* */ ++#undef HAVE_HTONL + +-/* Define to 1 if you have and it should be used (not on Ultrix). +- */ +-#undef HAVE_ALLOCA_H ++/* */ ++#undef HAVE_HTONL + +-/* Define to 1 if you have the `alphasort' function. */ +-#undef HAVE_ALPHASORT ++/* */ ++#undef HAVE_LIBSOCKET + +-/* Whether you have AOLserver */ +-#undef HAVE_AOLSERVER ++/* */ ++#undef HAVE_GETHOSTNAME + +-/* */ +-#undef HAVE_APACHE ++/* */ ++#undef HAVE_GETHOSTNAME + +-/* */ +-#undef HAVE_APACHE_HOOKS ++/* */ ++#undef HAVE_LIBNSL + +-/* Define to 1 if you have the +- header file. */ +-#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H ++/* */ ++#undef HAVE_GETHOSTBYADDR + +-/* */ +-#undef HAVE_AP_COMPAT_H ++/* */ ++#undef HAVE_GETHOSTBYADDR + +-/* */ +-#undef HAVE_AP_CONFIG_H ++/* */ ++#undef HAVE_LIBNSL + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_ARPA_INET_H ++/* */ ++#undef HAVE_YP_GET_DEFAULT_DOMAIN + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_ARPA_NAMESER_H ++/* */ ++#undef HAVE_YP_GET_DEFAULT_DOMAIN + +-/* Define to 1 if you have the `asctime_r' function. */ +-#undef HAVE_ASCTIME_R ++/* */ ++#undef HAVE_LIBNSL + +-/* Define to 1 if you have the `asinh' function. */ +-#undef HAVE_ASINH ++/* */ ++#undef HAVE_DLOPEN + +-/* Define to 1 if you have the `asprintf' function. */ +-#undef HAVE_ASPRINTF ++/* */ ++#undef HAVE_DLOPEN + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_ASSERT_H ++/* */ ++#undef HAVE_LIBDL + +-/* Define to 1 if you have the `atanh' function. */ +-#undef HAVE_ATANH ++/* */ ++#undef HAVE_LIBDL + +-/* whether atof() accepts INF */ +-#undef HAVE_ATOF_ACCEPTS_INF ++/* */ ++#undef HAVE_INET_ATON + +-/* whether atof() accepts NAN */ +-#undef HAVE_ATOF_ACCEPTS_NAN ++/* */ ++#undef HAVE_INET_ATON + +-/* Define to 1 if you have the `atoll' function. */ +-#undef HAVE_ATOLL ++/* */ ++#undef HAVE_LIBRESOLV + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_ATOMIC_H ++/* */ ++#undef HAVE_INET_ATON + +-/* whether the compiler supports __attribute__ ((__aligned__)) */ +-#undef HAVE_ATTRIBUTE_ALIGNED ++/* */ ++#undef HAVE_LIBBIND + +-/* Whether you have bcmath */ +-#undef HAVE_BCMATH ++/* */ ++#undef HAVE_FOPENCOOKIE + +-/* */ +-#undef HAVE_BIND_TEXTDOMAIN_CODESET ++/* */ ++#undef COOKIE_IO_FUNCTIONS_T + +-/* */ +-#undef HAVE_BIRDSTEP ++/* */ ++#undef COOKIE_SEEKER_USES_OFF64_T + + /* Define if system has broken getcwd */ + #undef HAVE_BROKEN_GETCWD +@@ -475,1975 +1145,1977 @@ + /* Define if your glibc borks on fopen with mode a+ */ + #undef HAVE_BROKEN_GLIBC_FOPEN_APPEND + +-/* Whether we have librecode 3.5 */ +-#undef HAVE_BROKEN_RECODE ++/* Whether localtime_r is declared */ ++#undef MISSING_LOCALTIME_R_DECL + +-/* Konstantin Chuguev's iconv implementation */ +-#undef HAVE_BSD_ICONV ++/* Whether gmtime_r is declared */ ++#undef MISSING_GMTIME_R_DECL + +-/* */ +-#undef HAVE_BUILD_DEFS_H ++/* Whether asctime_r is declared */ ++#undef MISSING_ASCTIME_R_DECL + +-/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */ +-#undef HAVE_BUILTIN_ATOMIC ++/* Whether ctime_r is declared */ ++#undef MISSING_CTIME_R_DECL + +-/* */ +-#undef HAVE_BUNDLED_PCRE ++/* Whether strtok_r is declared */ ++#undef MISSING_STRTOK_R_DECL + +-/* */ +-#undef HAVE_BZ2 ++/* */ ++#undef MISSING_FCLOSE_DECL + +-/* */ +-#undef HAVE_CALENDAR ++/* */ ++#undef MISSING_FCLOSE_DECL + +-/* Whether to compile with Caudium support */ +-#undef HAVE_CAUDIUM ++/* whether you have tm_gmtoff in struct tm */ ++#undef HAVE_TM_GMTOFF + +-/* Define to 1 if you have the `chroot' function. */ +-#undef HAVE_CHROOT ++/* whether you have struct flock */ ++#undef HAVE_STRUCT_FLOCK + +-/* Define to 1 if you have the `clearenv' function. */ +-#undef HAVE_CLEARENV ++/* Whether you have socklen_t */ ++#undef HAVE_SOCKLEN_T + +-/* */ +-#undef HAVE_CLI0CLI_H ++/* Size of intmax_t */ ++#undef SIZEOF_INTMAX_T + +-/* */ +-#undef HAVE_CLI0CORE_H ++/* Whether intmax_t is available */ ++#undef HAVE_INTMAX_T + +-/* */ +-#undef HAVE_CLI0DEFS_H ++/* Size of ssize_t */ ++#undef SIZEOF_SSIZE_T + +-/* */ +-#undef HAVE_CLI0ENV_H ++/* Whether ssize_t is available */ ++#undef HAVE_SSIZE_T + +-/* */ +-#undef HAVE_CLI0EXT_H ++/* Size of ptrdiff_t */ ++#undef SIZEOF_PTRDIFF_T + +-/* do we have clock_gettime? */ +-#undef HAVE_CLOCK_GETTIME ++/* Whether ptrdiff_t is available */ ++#undef HAVE_PTRDIFF_T + +-/* do we have clock_get_time? */ +-#undef HAVE_CLOCK_GET_TIME ++/* Whether you have struct sockaddr_storage */ ++#undef HAVE_SOCKADDR_STORAGE + +-/* Whether you have struct cmsghdr */ +-#undef HAVE_CMSGHDR ++/* Whether struct sockaddr has field sa_len */ ++#undef HAVE_SOCKADDR_SA_LEN + +-/* */ +-#undef HAVE_CODBC ++/* */ ++#undef HAVE_NANOSLEEP + +-/* */ +-#undef HAVE_COLORCLOSESTHWB ++/* */ ++#undef HAVE_LIBRT + +-/* Whether you have a Continuity Server */ +-#undef HAVE_CONTINUITY ++/* Define if you have the getaddrinfo function */ ++#undef HAVE_GETADDRINFO + +-/* Define to 1 if you have the `CreateProcess' function. */ +-#undef HAVE_CREATEPROCESS ++/* Define if you have the __sync_fetch_and_add function */ ++#undef HAVE_SYNC_FETCH_AND_ADD + +-/* */ +-#undef HAVE_CRYPT ++/* Whether system headers declare timezone */ ++#undef HAVE_DECLARED_TIMEZONE + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_CRYPT_H ++/* Whether you have HP-UX 10.x */ ++#undef PHP_HPUX_TIME_R + +-/* Define to 1 if you have the `crypt_r' function. */ +-#undef HAVE_CRYPT_R ++/* Whether you have IRIX-style functions */ ++#undef PHP_IRIX_TIME_R + +-/* Define to 1 if you have the `ctermid' function. */ +-#undef HAVE_CTERMID ++/* whether you have POSIX readdir_r */ ++#undef HAVE_POSIX_READDIR_R + +-/* Define to 1 if you have the `ctime_r' function. */ +-#undef HAVE_CTIME_R ++/* whether you have old-style readdir_r */ ++#undef HAVE_OLD_READDIR_R + +-/* */ +-#undef HAVE_CTYPE ++/* */ ++#undef in_addr_t + +-/* */ +-#undef HAVE_CURL ++/* Define if crypt_r has uses CRYPTD */ ++#undef CRYPT_R_CRYPTD + +-/* */ +-#undef HAVE_CURL_EASY_STRERROR ++/* Define if crypt_r uses struct crypt_data */ ++#undef CRYPT_R_STRUCT_CRYPT_DATA + +-/* Have cURL with GnuTLS support */ +-#undef HAVE_CURL_GNUTLS ++/* Define if struct crypt_data requires _GNU_SOURCE */ ++#undef CRYPT_R_GNU_SOURCE + +-/* */ +-#undef HAVE_CURL_MULTI_STRERROR ++/* Whether you have gcov */ ++#undef HAVE_GCOV + +-/* Have cURL with OpenSSL support */ +-#undef HAVE_CURL_OPENSSL ++/* */ ++#undef PHP_SAFE_MODE + +-/* Have cURL with SSL support */ +-#undef HAVE_CURL_SSL ++/* */ ++#undef PHP_SAFE_MODE + +-/* */ +-#undef HAVE_CURL_VERSION_INFO ++/* */ ++#undef PHP_SAFE_MODE_EXEC_DIR + +-/* Define to 1 if you have the `cuserid' function. */ +-#undef HAVE_CUSERID ++/* */ ++#undef PHP_SAFE_MODE_EXEC_DIR ++ ++/* */ ++#undef PHP_SIGCHILD ++ ++/* */ ++#undef PHP_SIGCHILD ++ ++/* */ ++#undef MAGIC_QUOTES ++ ++/* */ ++#undef MAGIC_QUOTES + +-/* */ +-#undef HAVE_DBA ++/* */ ++#undef DEFAULT_SHORT_OPEN_TAG + +-/* Whether you want DBMaker */ +-#undef HAVE_DBMAKER ++/* */ ++#undef DEFAULT_SHORT_OPEN_TAG + +-/* */ +-#undef HAVE_DCNGETTEXT ++/* Whether you have dmalloc */ ++#undef HAVE_DMALLOC + +-/* Whether system headers declare timezone */ +-#undef HAVE_DECLARED_TIMEZONE ++/* Whether to enable IPv6 support */ ++#undef HAVE_IPV6 + +-/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. +- */ +-#undef HAVE_DECL_TZNAME ++/* Define if int32_t type is present. */ ++#undef HAVE_INT32_T + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_DEFAULT_STORE_H ++/* Define if uint32_t type is present. */ ++#undef HAVE_UINT32_T + +-/* do we have /dev/poll? */ +-#undef HAVE_DEVPOLL ++/* Define if system timezone data is used */ ++#undef HAVE_SYSTEM_TZDATA + +-/* Define if the target system has /dev/urandom device */ +-#undef HAVE_DEV_URANDOM ++/* Define for location of system timezone data */ ++#undef HAVE_SYSTEM_TZDATA_PREFIX + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_DIRENT_H ++/* Whether to build date as dynamic module */ ++#undef COMPILE_DL_DATE + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_DLFCN_H ++/* Whether to build ereg as dynamic module */ ++#undef COMPILE_DL_EREG + +-/* */ +-#undef HAVE_DLOPEN ++/* */ ++#undef HAVE_REGEX_T_RE_MAGIC + +-/* Whether you have dmalloc */ +-#undef HAVE_DMALLOC ++/* */ ++#undef HSREGEX + +-/* */ +-#undef HAVE_DNGETTEXT ++/* */ ++#undef REGEX + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_DNS_H ++/* */ ++#undef REGEX + +-/* */ +-#undef HAVE_DNS_SEARCH ++/* 1 */ ++#undef HAVE_REGEX_T_RE_MAGIC + +-/* */ +-#undef HAVE_DN_EXPAND ++/* */ ++#undef HAVE_LIBXML + +-/* */ +-#undef HAVE_DN_SKIPNAME ++/* */ ++#undef HAVE_LIBXML + +-/* */ +-#undef HAVE_DOM ++/* Whether to build libxml as dynamic module */ ++#undef COMPILE_DL_LIBXML + +-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +-#undef HAVE_DOPRNT ++/* Whether to build openssl as dynamic module */ ++#undef COMPILE_DL_OPENSSL + + /* OpenSSL 0.9.7 or later */ + #undef HAVE_DSA_DEFAULT_METHOD + +-/* embedded MySQL support enabled */ +-#undef HAVE_EMBEDDED_MYSQLI ++/* OpenSSL 0.9.7 or later */ ++#undef HAVE_DSA_DEFAULT_METHOD + +-/* */ +-#undef HAVE_EMPRESS ++/* */ ++#undef HAVE_OPENSSL_EXT + +-/* */ +-#undef HAVE_ENCHANT ++/* */ ++#undef HAVE_PCRE + +-/* */ +-#undef HAVE_ENCHANT_BROKER_SET_PARAM ++/* Whether to build pcre as dynamic module */ ++#undef COMPILE_DL_PCRE + +-/* do we have epoll? */ +-#undef HAVE_EPOLL ++/* Whether to build pcre as dynamic module */ ++#undef COMPILE_DL_PCRE + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_ERRNO_H ++/* */ ++#undef HAVE_BUNDLED_PCRE + +-/* */ +-#undef HAVE_ESOOB ++/* have commercial sqlite3 with crypto support */ ++#undef HAVE_SQLITE3_KEY + +-/* Whether you want EXIF (metadata from images) support */ +-#undef HAVE_EXIF ++/* have sqlite3 with extension support */ ++#undef SQLITE_OMIT_LOAD_EXTENSION + +-/* Define to 1 if you have the `fabsf' function. */ +-#undef HAVE_FABSF ++/* */ ++#undef HAVE_SQLITE3 + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_FCNTL_H ++/* Whether to build sqlite3 as dynamic module */ ++#undef COMPILE_DL_SQLITE3 + +-/* Define to 1 if you have the `finite' function. */ +-#undef HAVE_FINITE ++/* Whether to build zlib as dynamic module */ ++#undef COMPILE_DL_ZLIB + +-/* Define to 1 if you have the `flock' function. */ +-#undef HAVE_FLOCK ++/* */ ++#undef HAVE_ZLIB + +-/* Define to 1 if you have the `floorf' function. */ +-#undef HAVE_FLOORF ++/* */ ++#undef APC_MMAP + +-/* Define if flush should be called explicitly after a buffered io. */ +-#undef HAVE_FLUSHIO ++/* */ ++#undef APC_FILEHITS + +-/* Define to 1 if your system has a working POSIX `fnmatch' function. */ +-#undef HAVE_FNMATCH ++/* */ ++#undef __DEBUG_APC__ + +-/* */ +-#undef HAVE_FOPENCOOKIE ++/* */ ++#undef APC_SEM_LOCKS + +-/* Define to 1 if you have the `fork' function. */ +-#undef HAVE_FORK ++/* */ ++#undef APC_SPIN_LOCKS + +-/* Define to 1 if you have the `fpclass' function. */ +-#undef HAVE_FPCLASS ++/* */ ++#undef APC_PTHREADMUTEX_LOCKS + +-/* whether fpsetprec is present and usable */ +-#undef HAVE_FPSETPREC ++/* */ ++#undef APC_FCNTL_LOCKS + +-/* whether FPU control word can be manipulated by inline assembler */ +-#undef HAVE_FPU_INLINE_ASM_X86 ++/* shm/mmap memory protection */ ++#undef APC_MEMPROTECT + +-/* whether floatingpoint.h defines fp_except */ +-#undef HAVE_FP_EXCEPT ++/* */ ++#undef APC_HAVE_LOOKUP_HOOKS + +-/* */ +-#undef HAVE_FREETDS ++/* */ ++#undef APC_HAVE_LOOKUP_HOOKS + +-/* Define to 1 if you have the `ftok' function. */ +-#undef HAVE_FTOK ++/* */ ++#undef HAVE_SEMUN + +-/* Whether you want FTP support */ +-#undef HAVE_FTP ++/* */ ++#undef HAVE_SEMUN + +-/* Define to 1 if you have the `funopen' function. */ +-#undef HAVE_FUNOPEN ++/* enable valgrind memchecks */ ++#undef HAVE_VALGRIND_MEMCHECK_H + +-/* Define to 1 if you have the `gai_strerror' function. */ +-#undef HAVE_GAI_STRERROR ++/* Whether to build apc as dynamic module */ ++#undef COMPILE_DL_APC + +-/* Whether you have gcov */ +-#undef HAVE_GCOV ++/* */ ++#undef HAVE_APC + +-/* Define to 1 if you have the `gcvt' function. */ +-#undef HAVE_GCVT ++/* Whether to build bcmath as dynamic module */ ++#undef COMPILE_DL_BCMATH + +-/* */ +-#undef HAVE_GDIMAGECOLORRESOLVE ++/* Whether you have bcmath */ ++#undef HAVE_BCMATH + +-/* */ +-#undef HAVE_GD_BUNDLED ++/* */ ++#undef HAVE_BZ2 + +-/* */ +-#undef HAVE_GD_CACHE_CREATE ++/* Whether to build bz2 as dynamic module */ ++#undef COMPILE_DL_BZ2 + +-/* */ +-#undef HAVE_GD_DYNAMIC_CTX_EX ++/* */ ++#undef HAVE_CALENDAR + +-/* */ +-#undef HAVE_GD_FONTCACHESHUTDOWN ++/* Whether to build calendar as dynamic module */ ++#undef COMPILE_DL_CALENDAR + +-/* */ +-#undef HAVE_GD_FONTMUTEX ++/* */ ++#undef HAVE_CTYPE + +-/* */ +-#undef HAVE_GD_FREEFONTCACHE ++/* Whether to build ctype as dynamic module */ ++#undef COMPILE_DL_CTYPE + +-/* */ +-#undef HAVE_GD_GD2 ++/* Have cURL with SSL support */ ++#undef HAVE_CURL_SSL + +-/* */ +-#undef HAVE_GD_GIF_CREATE ++/* Have cURL with OpenSSL support */ ++#undef HAVE_CURL_OPENSSL + +-/* */ +-#undef HAVE_GD_GIF_CTX ++/* Have cURL with GnuTLS support */ ++#undef HAVE_CURL_GNUTLS + +-/* */ +-#undef HAVE_GD_GIF_READ ++/* */ ++#undef HAVE_CURL + +-/* */ +-#undef HAVE_GD_IMAGEELLIPSE ++/* */ ++#undef HAVE_CURL_VERSION_INFO + +-/* */ +-#undef HAVE_GD_IMAGESETBRUSH ++/* */ ++#undef HAVE_CURL_EASY_STRERROR + +-/* */ +-#undef HAVE_GD_IMAGESETTILE ++/* */ ++#undef HAVE_CURL_MULTI_STRERROR + +-/* */ +-#undef HAVE_GD_JPG ++/* */ ++#undef PHP_CURL_URL_WRAPPERS + +-/* */ +-#undef HAVE_GD_PNG ++/* Whether to build curl as dynamic module */ ++#undef COMPILE_DL_CURL + +-/* */ +-#undef HAVE_GD_STRINGFT ++/* */ ++#undef QDBM_INCLUDE_FILE + +-/* */ +-#undef HAVE_GD_STRINGFTEX ++/* */ ++#undef DBA_QDBM + +-/* */ +-#undef HAVE_GD_STRINGTTF ++/* */ ++#undef GDBM_INCLUDE_FILE + +-/* */ +-#undef HAVE_GD_WBMP ++/* */ ++#undef DBA_GDBM + +-/* */ +-#undef HAVE_GD_XBM ++/* */ ++#undef NDBM_INCLUDE_FILE + +-/* */ +-#undef HAVE_GD_XPM ++/* */ ++#undef DBA_NDBM + +-/* Define if you have the getaddrinfo function */ +-#undef HAVE_GETADDRINFO ++/* */ ++#undef DBA_DB4 + +-/* Define to 1 if you have the `getcwd' function. */ +-#undef HAVE_GETCWD ++/* */ ++#undef DB4_INCLUDE_FILE + +-/* Define to 1 if you have the `getgrgid_r' function. */ +-#undef HAVE_GETGRGID_R ++/* */ ++#undef DBA_DB3 + +-/* Define to 1 if you have the `getgrnam_r' function. */ +-#undef HAVE_GETGRNAM_R ++/* */ ++#undef DB3_INCLUDE_FILE + +-/* Define to 1 if you have the `getgroups' function. */ +-#undef HAVE_GETGROUPS ++/* */ ++#undef DBA_DB2 + +-/* */ +-#undef HAVE_GETHOSTBYADDR ++/* */ ++#undef DB2_INCLUDE_FILE + +-/* Define to 1 if you have the `gethostname' function. */ +-#undef HAVE_GETHOSTNAME ++/* */ ++#undef DB1_VERSION + +-/* Define to 1 if you have the `getloadavg' function. */ +-#undef HAVE_GETLOADAVG ++/* */ ++#undef DB1_VERSION + +-/* Define to 1 if you have the `getlogin' function. */ +-#undef HAVE_GETLOGIN ++/* */ ++#undef DB1_INCLUDE_FILE + +-/* Define to 1 if you have the `getopt' function. */ +-#undef HAVE_GETOPT ++/* */ ++#undef DBA_DB1 + +-/* Define to 1 if you have the `getpgid' function. */ +-#undef HAVE_GETPGID ++/* */ ++#undef DBM_INCLUDE_FILE + +-/* Define to 1 if you have the `getpid' function. */ +-#undef HAVE_GETPID ++/* */ ++#undef DBM_VERSION + +-/* Define to 1 if you have the `getpriority' function. */ +-#undef HAVE_GETPRIORITY ++/* */ ++#undef DBM_VERSION + +-/* Define to 1 if you have the `getprotobyname' function. */ +-#undef HAVE_GETPROTOBYNAME ++/* */ ++#undef DBA_DBM + +-/* Define to 1 if you have the `getprotobynumber' function. */ +-#undef HAVE_GETPROTOBYNUMBER ++/* */ ++#undef DBA_CDB_BUILTIN + +-/* Define to 1 if you have the `getpwnam_r' function. */ +-#undef HAVE_GETPWNAM_R ++/* */ ++#undef DBA_CDB_MAKE + +-/* Define to 1 if you have the `getpwuid_r' function. */ +-#undef HAVE_GETPWUID_R ++/* */ ++#undef DBA_CDB + +-/* Define to 1 if you have the `getrlimit' function. */ +-#undef HAVE_GETRLIMIT ++/* */ ++#undef CDB_INCLUDE_FILE + +-/* Define to 1 if you have the `getrusage' function. */ +-#undef HAVE_GETRUSAGE ++/* */ ++#undef DBA_CDB + +-/* Define to 1 if you have the `getservbyname' function. */ +-#undef HAVE_GETSERVBYNAME ++/* */ ++#undef DBA_INIFILE + +-/* Define to 1 if you have the `getservbyport' function. */ +-#undef HAVE_GETSERVBYPORT ++/* */ ++#undef DBA_FLATFILE + +-/* Define to 1 if you have the `getsid' function. */ +-#undef HAVE_GETSID ++/* */ ++#undef HAVE_DBA + +-/* Define to 1 if you have the `gettimeofday' function. */ +-#undef HAVE_GETTIMEOFDAY ++/* Whether to build dba as dynamic module */ ++#undef COMPILE_DL_DBA + +-/* Define to 1 if you have the `getwd' function. */ +-#undef HAVE_GETWD ++/* Whether to build dio as dynamic module */ ++#undef COMPILE_DL_DIO + +-/* */ +-#undef HAVE_GICONV_H ++/* */ ++#undef HAVE_LIBXML + +-/* glibc's iconv implementation */ +-#undef HAVE_GLIBC_ICONV ++/* */ ++#undef HAVE_DOM + +-/* Define to 1 if you have the `glob' function. */ +-#undef HAVE_GLOB ++/* Whether to build dom as dynamic module */ ++#undef COMPILE_DL_DOM + +-/* */ +-#undef HAVE_GMP ++/* Whether to build enchant as dynamic module */ ++#undef COMPILE_DL_ENCHANT + +-/* Define to 1 if you have the `gmtime_r' function. */ +-#undef HAVE_GMTIME_R ++/* */ ++#undef HAVE_ENCHANT + +-/* Define to 1 if you have the `grantpt' function. */ +-#undef HAVE_GRANTPT ++/* */ ++#undef HAVE_ENCHANT_BROKER_SET_PARAM + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_GRP_H ++/* */ ++#undef ENCHANT_VERSION_STRING + +-/* Have HASH Extension */ +-#undef HAVE_HASH_EXT ++/* Whether you want EXIF (metadata from images) support */ ++#undef HAVE_EXIF + +-/* Define to 1 if you have the `hstrerror' function. */ +-#undef HAVE_HSTRERROR ++/* Whether to build exif as dynamic module */ ++#undef COMPILE_DL_EXIF + +-/* */ +-#undef HAVE_HTONL ++/* Whether to build fileinfo as dynamic module */ ++#undef COMPILE_DL_FILEINFO + +-/* whether HUGE_VAL == INF */ +-#undef HAVE_HUGE_VAL_INF ++/* Whether to build filter as dynamic module */ ++#undef COMPILE_DL_FILTER + +-/* whether HUGE_VAL + -HUGEVAL == NAN */ +-#undef HAVE_HUGE_VAL_NAN ++/* Whether you want FTP support */ ++#undef HAVE_FTP + +-/* Define to 1 if you have the `hypot' function. */ +-#undef HAVE_HYPOT ++/* Whether to build ftp as dynamic module */ ++#undef COMPILE_DL_FTP + +-/* */ +-#undef HAVE_IBASE ++/* */ ++#undef USE_GD_IMGSTRTTF + +-/* */ +-#undef HAVE_IBMDB2 ++/* */ ++#undef USE_GD_IMGSTRTTF + +-/* IBM iconv implementation */ +-#undef HAVE_IBM_ICONV ++/* */ ++#undef HAVE_LIBFREETYPE + +-/* */ +-#undef HAVE_ICONV ++/* */ ++#undef ENABLE_GD_TTF + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_IEEEFP_H ++/* */ ++#undef HAVE_LIBT1 + +-/* */ +-#undef HAVE_IMAP ++/* */ ++#undef HAVE_LIBGD + +-/* */ +-#undef HAVE_IMAP2000 ++/* */ ++#undef HAVE_LIBGD13 + +-/* */ +-#undef HAVE_IMAP2001 ++/* */ ++#undef HAVE_LIBGD15 + +-/* */ +-#undef HAVE_IMAP2004 ++/* */ ++#undef HAVE_LIBGD20 + +-/* */ +-#undef HAVE_IMAP_AUTH_GSS ++/* */ ++#undef HAVE_LIBGD204 + +-/* */ +-#undef HAVE_IMAP_KRB ++/* */ ++#undef HAVE_GD_IMAGESETTILE + +-/* */ +-#undef HAVE_IMAP_MUTF7 ++/* */ ++#undef HAVE_GD_IMAGESETBRUSH + +-/* */ +-#undef HAVE_IMAP_SSL ++/* */ ++#undef HAVE_GDIMAGECOLORRESOLVE + +-/* */ +-#undef HAVE_INET_ATON ++/* */ ++#undef HAVE_COLORCLOSESTHWB + +-/* Define to 1 if you have the `inet_ntoa' function. */ +-#undef HAVE_INET_NTOA ++/* */ ++#undef HAVE_GD_WBMP + +-/* Define to 1 if you have the `inet_ntop' function. */ +-#undef HAVE_INET_NTOP ++/* */ ++#undef HAVE_GD_GD2 + +-/* Define to 1 if you have the `inet_pton' function. */ +-#undef HAVE_INET_PTON ++/* */ ++#undef HAVE_GD_PNG + +-/* Define to 1 if you have the `initgroups' function. */ +-#undef HAVE_INITGROUPS ++/* */ ++#undef HAVE_GD_XBM + +-/* Define if int32_t type is present. */ +-#undef HAVE_INT32_T ++/* */ ++#undef HAVE_GD_BUNDLED + +-/* Whether intmax_t is available */ +-#undef HAVE_INTMAX_T ++/* */ ++#undef HAVE_GD_GIF_READ + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_INTTYPES_H ++/* */ ++#undef HAVE_GD_GIF_CREATE + +-/* */ +-#undef HAVE_IODBC ++/* */ ++#undef HAVE_GD_IMAGEELLIPSE + +-/* */ +-#undef HAVE_IODBC_H ++/* */ ++#undef HAVE_GD_FONTCACHESHUTDOWN + +-/* Whether to enable IPv6 support */ +-#undef HAVE_IPV6 ++/* */ ++#undef HAVE_GD_FONTMUTEX + +-/* Define to 1 if you have the `isascii' function. */ +-#undef HAVE_ISASCII ++/* */ ++#undef HAVE_GD_DYNAMIC_CTX_EX + +-/* Define to 1 if you have the `isfinite' function. */ +-#undef HAVE_ISFINITE ++/* */ ++#undef HAVE_GD_GIF_CTX + +-/* Define to 1 if you have the `isinf' function. */ +-#undef HAVE_ISINF ++/* */ ++#undef HAVE_GD_JPG + +-/* Define to 1 if you have the `isnan' function. */ +-#undef HAVE_ISNAN ++/* */ ++#undef HAVE_GD_XPM + +-/* */ +-#undef HAVE_ISQLEXT_H ++/* */ ++#undef HAVE_GD_STRINGFT + +-/* */ +-#undef HAVE_ISQL_H ++/* */ ++#undef HAVE_GD_STRINGFTEX + +-/* whether to enable JavaScript Object Serialization support */ +-#undef HAVE_JSON ++/* */ ++#undef ENABLE_GD_TTF + +-/* Define to 1 if you have the `kill' function. */ +-#undef HAVE_KILL ++/* */ ++#undef USE_GD_JISX0208 + +-/* do we have kqueue? */ +-#undef HAVE_KQUEUE ++/* */ ++#undef USE_GD_IMGSTRTTF + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_LANGINFO_H ++/* */ ++#undef USE_GD_IMGSTRTTF + +-/* Define to 1 if you have the `lchown' function. */ +-#undef HAVE_LCHOWN ++/* */ ++#undef HAVE_LIBFREETYPE + +-/* */ +-#undef HAVE_LDAP ++/* */ ++#undef ENABLE_GD_TTF + +-/* Define to 1 if you have the `ldap_parse_reference' function. */ +-#undef HAVE_LDAP_PARSE_REFERENCE ++/* */ ++#undef HAVE_LIBT1 + +-/* Define to 1 if you have the `ldap_parse_result' function. */ +-#undef HAVE_LDAP_PARSE_RESULT ++/* */ ++#undef HAVE_LIBGD + +-/* LDAP SASL support */ +-#undef HAVE_LDAP_SASL ++/* */ ++#undef HAVE_LIBGD13 + +-/* */ +-#undef HAVE_LDAP_SASL_H ++/* */ ++#undef HAVE_LIBGD15 + +-/* */ +-#undef HAVE_LDAP_SASL_SASL_H ++/* */ ++#undef HAVE_GD_PNG + +-/* Define to 1 if you have the `ldap_start_tls_s' function. */ +-#undef HAVE_LDAP_START_TLS_S ++/* */ ++#undef HAVE_GD_GIF_READ + +-/* */ +-#undef HAVE_LIBBIND ++/* */ ++#undef HAVE_GD_GIF_CREATE + +-/* */ +-#undef HAVE_LIBCRYPT ++/* */ ++#undef HAVE_GD_WBMP + +-/* */ +-#undef HAVE_LIBDL ++/* */ ++#undef HAVE_GD_JPG + +-/* */ +-#undef HAVE_LIBDNET_STUB ++/* */ ++#undef HAVE_GD_XPM + +-/* */ +-#undef HAVE_LIBEDIT ++/* */ ++#undef HAVE_GD_GD2 + +-/* */ +-#undef HAVE_LIBEXPAT ++/* */ ++#undef HAVE_LIBGD20 + +-/* */ +-#undef HAVE_LIBFREETYPE ++/* */ ++#undef HAVE_GD_IMAGESETTILE + +-/* */ +-#undef HAVE_LIBGD ++/* */ ++#undef HAVE_GD_IMAGEELLIPSE + +-/* */ +-#undef HAVE_LIBGD13 ++/* */ ++#undef HAVE_GD_IMAGESETBRUSH + +-/* */ +-#undef HAVE_LIBGD15 ++/* */ ++#undef HAVE_GD_STRINGTTF + +-/* */ +-#undef HAVE_LIBGD20 ++/* */ ++#undef HAVE_GD_STRINGFT + +-/* */ +-#undef HAVE_LIBGD204 ++/* */ ++#undef HAVE_GD_STRINGFTEX + +-/* */ +-#undef HAVE_LIBICONV ++/* */ ++#undef HAVE_COLORCLOSESTHWB + +-/* */ +-#undef HAVE_LIBINTL ++/* */ ++#undef HAVE_GDIMAGECOLORRESOLVE + +-/* Define to 1 if you have the `m' library (-lm). */ +-#undef HAVE_LIBM ++/* */ ++#undef HAVE_GD_GIF_CTX + +-/* */ +-#undef HAVE_LIBMCRYPT ++/* */ ++#undef HAVE_GD_CACHE_CREATE + +-/* Whether you have libmm */ +-#undef HAVE_LIBMM ++/* */ ++#undef HAVE_GD_FONTCACHESHUTDOWN + +-/* */ +-#undef HAVE_LIBNSL ++/* */ ++#undef HAVE_GD_FREEFONTCACHE + +-/* */ +-#undef HAVE_LIBPAM ++/* */ ++#undef HAVE_GD_FONTMUTEX + +-/* */ +-#undef HAVE_LIBRARYMANAGER_H ++/* */ ++#undef HAVE_GD_DYNAMIC_CTX_EX + +-/* */ +-#undef HAVE_LIBREADLINE ++/* */ ++#undef HAVE_LIBGD204 + +-/* Whether we have librecode 3.5 or higher */ +-#undef HAVE_LIBRECODE ++/* Whether to build gd as dynamic module */ ++#undef COMPILE_DL_GD + +-/* */ +-#undef HAVE_LIBRESOLV ++/* */ ++#undef HAVE_LIBINTL + +-/* */ +-#undef HAVE_LIBRT ++/* Whether to build gettext as dynamic module */ ++#undef COMPILE_DL_GETTEXT + +-/* */ +-#undef HAVE_LIBSOCKET ++/* */ ++#undef HAVE_NGETTEXT + +-/* */ +-#undef HAVE_LIBT1 ++/* */ ++#undef HAVE_DNGETTEXT + +-/* */ +-#undef HAVE_LIBXML ++/* */ ++#undef HAVE_DCNGETTEXT + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_LIMITS_H ++/* */ ++#undef HAVE_BIND_TEXTDOMAIN_CODESET + +-/* Define to 1 if you have the `link' function. */ +-#undef HAVE_LINK ++/* Whether to build gmp as dynamic module */ ++#undef COMPILE_DL_GMP + +-/* Define to 1 if you have the `localeconv' function. */ +-#undef HAVE_LOCALECONV ++/* */ ++#undef HAVE_GMP + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_LOCALE_H ++/* */ ++#undef PHP_MHASH_BC + +-/* Define to 1 if you have the `localtime_r' function. */ +-#undef HAVE_LOCALTIME_R ++/* Have HASH Extension */ ++#undef HAVE_HASH_EXT + +-/* Define to 1 if you have the `lockf' function. */ +-#undef HAVE_LOCKF ++/* Define if processor uses big-endian word */ ++#undef WORDS_BIGENDIAN + +-/* Define to 1 if you have the `log1p' function. */ +-#undef HAVE_LOG1P ++/* Whether to build hash as dynamic module */ ++#undef COMPILE_DL_HASH + +-/* do we have SO_LISTENQxxx? */ +-#undef HAVE_LQ_SO_LISTENQ ++/* */ ++#undef HAVE_LIBICONV + +-/* do we have TCP_INFO? */ +-#undef HAVE_LQ_TCP_INFO ++/* */ ++#undef HAVE_GICONV_H + +-/* Define to 1 if you have the `lrand48' function. */ +-#undef HAVE_LRAND48 ++/* */ ++#undef HAVE_LIBICONV + +-/* do we have mach_vm_read? */ +-#undef HAVE_MACH_VM_READ ++/* iconv() is aliased to libiconv() in -liconv */ ++#undef ICONV_ALIASED_LIBICONV + +-/* Define to 1 if you have the `makedev' function. */ +-#undef HAVE_MAKEDEV ++/* */ ++#undef HAVE_ICONV + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_MALLOC_H ++/* Which iconv implementation to use */ ++#undef PHP_ICONV_IMPL + +-/* Define to 1 if you have the `mblen' function. */ +-#undef HAVE_MBLEN ++/* Konstantin Chuguev's iconv implementation */ ++#undef HAVE_BSD_ICONV + +-/* whether to have multibyte regex support */ +-#undef HAVE_MBREGEX ++/* Which iconv implementation to use */ ++#undef PHP_ICONV_IMPL + +-/* Define to 1 if you have the `mbrlen' function. */ +-#undef HAVE_MBRLEN ++/* glibc's iconv implementation */ ++#undef HAVE_GLIBC_ICONV + +-/* Define to 1 if you have the `mbsinit' function. */ +-#undef HAVE_MBSINIT ++/* Which iconv implementation to use */ ++#undef PHP_ICONV_IMPL + +-/* Define if your system has mbstate_t in wchar.h */ +-#undef HAVE_MBSTATE_T ++/* IBM iconv implementation */ ++#undef HAVE_IBM_ICONV + +-/* whether to have multibyte string support */ +-#undef HAVE_MBSTRING ++/* Which iconv implementation to use */ ++#undef PHP_ICONV_IMPL + +-/* Define to 1 if you have the `memcpy' function. */ +-#undef HAVE_MEMCPY ++/* Whether iconv supports error no or not */ ++#undef ICONV_SUPPORTS_ERRNO + +-/* Define to 1 if you have the `memmove' function. */ +-#undef HAVE_MEMMOVE ++/* Whether iconv supports error no or not */ ++#undef ICONV_SUPPORTS_ERRNO + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_MEMORY_H ++/* Whether iconv supports error no or not */ ++#undef ICONV_SUPPORTS_ERRNO + +-/* Define to 1 if you have the `mempcpy' function. */ +-#undef HAVE_MEMPCPY ++/* Path to iconv.h */ ++#undef PHP_ICONV_H_PATH + +-/* Define if the target system has support for memory allocation using +- mmap(MAP_ANON) */ +-#undef HAVE_MEM_MMAP_ANON ++/* Whether to build iconv as dynamic module */ ++#undef COMPILE_DL_ICONV + +-/* Define if the target system has support for memory allocation using +- mmap("/dev/zero") */ +-#undef HAVE_MEM_MMAP_ZERO ++/* Whether to build imap as dynamic module */ ++#undef COMPILE_DL_IMAP + +-/* Define to 1 if you have the `mkfifo' function. */ +-#undef HAVE_MKFIFO ++/* */ ++#undef HAVE_IMAP + +-/* Define to 1 if you have the `mknod' function. */ +-#undef HAVE_MKNOD ++/* */ ++#undef HAVE_IMAP2000 + +-/* Define to 1 if you have the `mkstemp' function. */ +-#undef HAVE_MKSTEMP ++/* */ ++#undef HAVE_IMAP2000 + +-/* Define to 1 if you have the `mmap' function. */ +-#undef HAVE_MMAP ++/* */ ++#undef HAVE_IMAP2000 + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_MONETARY_H ++/* */ ++#undef HAVE_IMAP2000 + +-/* Define to 1 if you have the `mremap' function. */ +-#undef HAVE_MREMAP ++/* */ ++#undef HAVE_IMAP2000 + +-/* */ +-#undef HAVE_MSSQL ++/* */ ++#undef HAVE_IMAP2000 + +-/* Whether you have MySQL */ +-#undef HAVE_MYSQL ++/* */ ++#undef HAVE_IMAP2004 + +-/* */ +-#undef HAVE_MYSQLILIB ++/* Whether utf8_mime2text() has new signature */ ++#undef HAVE_NEW_MIME2TEXT + +-/* Define to 1 if you have the `mysql_commit' function. */ +-#undef HAVE_MYSQL_COMMIT ++/* */ ++#undef HAVE_IMAP2001 + +-/* Define to 1 if you have the `mysql_next_result' function. */ +-#undef HAVE_MYSQL_NEXT_RESULT ++/* */ ++#undef HAVE_LIBPAM + +-/* Define to 1 if you have the `mysql_sqlstate' function. */ +-#undef HAVE_MYSQL_SQLSTATE ++/* */ ++#undef HAVE_LIBCRYPT + +-/* Define to 1 if you have the `mysql_stmt_prepare' function. */ +-#undef HAVE_MYSQL_STMT_PREPARE ++/* */ ++#undef HAVE_IMAP_KRB + +-/* Define to 1 if you have the `nanosleep' function. */ +-#undef HAVE_NANOSLEEP ++/* */ ++#undef HAVE_IMAP_SSL + +-/* Define to 1 if you have the header file, and it defines `DIR'. */ +-#undef HAVE_NDIR_H ++/* */ ++#undef HAVE_IMAP_AUTH_GSS + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_NETDB_H ++/* */ ++#undef HAVE_IMAP_MUTF7 + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_NETINET_IN_H ++/* */ ++#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_NETINET_TCP_H ++/* */ ++#undef HAVE_IBASE + +-/* */ +-#undef HAVE_NET_SNMP ++/* Whether to build interbase as dynamic module */ ++#undef COMPILE_DL_INTERBASE + +-/* Whether utf8_mime2text() has new signature */ +-#undef HAVE_NEW_MIME2TEXT ++/* Whether to build intl as dynamic module */ ++#undef COMPILE_DL_INTL + +-/* */ +-#undef HAVE_NGETTEXT ++/* whether to enable JavaScript Object Serialization support */ ++#undef HAVE_JSON + +-/* Define to 1 if you have the `nice' function. */ +-#undef HAVE_NICE ++/* Whether to build json as dynamic module */ ++#undef COMPILE_DL_JSON + +-/* Define to 1 if you have the `nl_langinfo' function. */ +-#undef HAVE_NL_LANGINFO ++/* Whether to build ldap as dynamic module */ ++#undef COMPILE_DL_LDAP + +-/* Whether you have a Netscape/iPlanet/Sun Webserver */ +-#undef HAVE_NSAPI ++/* */ ++#undef HAVE_NSLDAP + +-/* */ ++/* */ + #undef HAVE_NSLDAP + +-/* */ +-#undef HAVE_OCI8 ++/* */ ++#undef HAVE_NSLDAP + +-/* */ +-#undef HAVE_OCICOLLASSIGN ++/* */ ++#undef HAVE_NSLDAP + +-/* */ +-#undef HAVE_OCIENVCREATE ++/* */ ++#undef HAVE_ORALDAP + +-/* */ +-#undef HAVE_OCIENVNLSCREATE ++/* */ ++#undef HAVE_ORALDAP_10 + +-/* */ +-#undef HAVE_OCILOBISTEMPORARY ++/* */ ++#undef HAVE_LDAP + +-/* */ +-#undef HAVE_OCISTMTFETCH2 ++/* Whether 3 arg set_rebind_proc() */ ++#undef HAVE_3ARG_SETREBINDPROC + +-/* */ +-#undef HAVE_OCI_INSTANT_CLIENT ++/* */ ++#undef HAVE_LDAP_SASL_SASL_H + +-/* */ +-#undef HAVE_OCI_LOB_READ2 ++/* */ ++#undef HAVE_LDAP_SASL_H + +-/* */ +-#undef HAVE_ODBC2 ++/* LDAP SASL support */ ++#undef HAVE_LDAP_SASL + +-/* */ +-#undef HAVE_ODBCSDK_H ++/* Whether to build libevent as dynamic module */ ++#undef COMPILE_DL_LIBEVENT + +-/* */ +-#undef HAVE_ODBC_H ++/* whether to have multibyte string support */ ++#undef HAVE_MBSTRING + +-/* */ +-#undef HAVE_ODBC_ROUTER ++/* whether to check multibyte regex backtrack */ ++#undef USE_COMBINATION_EXPLOSION_CHECK + +-/* */ +-#undef HAVE_OLD_COMPAT_H ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDARG_PROTOTYPES + +-/* whether you have old-style readdir_r */ +-#undef HAVE_OLD_READDIR_R ++/* Define to 1 if the bundled oniguruma is used */ ++#undef PHP_ONIG_BUNDLED + + /* Define to 1 if the oniguruma library is available */ + #undef HAVE_ONIG + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_OPENSSL_CRYPTO_H ++/* Define to 1 if the oniguruma library is available */ ++#undef HAVE_ONIG + +-/* */ +-#undef HAVE_OPENSSL_EXT ++/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */ ++#undef PHP_ONIG_BAD_KOI8_ENTRY + +-/* */ +-#undef HAVE_ORALDAP ++/* whether to have multibyte regex support */ ++#undef HAVE_MBREGEX + +-/* */ +-#undef HAVE_ORALDAP_10 ++/* Whether to build mbstring as dynamic module */ ++#undef COMPILE_DL_MBSTRING + +-/* Whether struct _zend_object_value is packed */ +-#undef HAVE_PACKED_OBJECT_VALUE ++/* */ ++#undef HAVE_LIBMCRYPT + +-/* */ +-#undef HAVE_PCRE ++/* */ ++#undef HAVE_LIBMCRYPT + +-/* */ +-#undef HAVE_PDO_DBLIB ++/* Whether to build mcrypt as dynamic module */ ++#undef COMPILE_DL_MCRYPT + +-/* */ +-#undef HAVE_PDO_FIREBIRD ++/* Whether to build mssql as dynamic module */ ++#undef COMPILE_DL_MSSQL + +-/* Whether to build PostgreSQL for PDO support or not */ +-#undef HAVE_PDO_PGSQL ++/* */ ++#undef HAVE_LIBDNET_STUB + +-/* */ +-#undef HAVE_PDO_SQLITELIB ++/* */ ++#undef HAVE_MSSQL + +-/* Define to 1 if you have the `perror' function. */ +-#undef HAVE_PERROR ++/* */ ++#undef HAVE_FREETDS + +-/* Whether to build PostgreSQL support or not */ +-#undef HAVE_PGSQL ++/* */ ++#undef PHP_MYSQL_UNIX_SOCK_ADDR + +-/* Whether libpq is compiled with --enable-multibyte */ +-#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT ++/* */ ++#undef PHP_MYSQL_UNIX_SOCK_ADDR + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PGTRANSACTIONSTATUS ++/* Whether you have MySQL */ ++#undef HAVE_MYSQL + +-/* Whether to have pg_config.h */ +-#undef HAVE_PG_CONFIG_H ++/* Whether to build mysql as dynamic module */ ++#undef COMPILE_DL_MYSQL + +-/* PostgreSQL 8.1 or later */ +-#undef HAVE_PG_LO_CREATE ++/* Whether mysqlnd is enabled */ ++#undef MYSQL_USE_MYSQLND + +-/* PostgreSQL 8.4 or later */ +-#undef HAVE_PG_LO_IMPORT_WITH_OID ++/* embedded MySQL support enabled */ ++#undef HAVE_EMBEDDED_MYSQLI + +-/* */ +-#undef HAVE_PHP_SESSION ++/* */ ++#undef HAVE_MYSQLILIB + +-/* Whether you have phttpd */ +-#undef HAVE_PHTTPD ++/* */ ++#undef HAVE_STMT_NEXT_RESULT + +-/* Define to 1 if you have the `poll' function. */ +-#undef HAVE_POLL ++/* Whether to build mysqli as dynamic module */ ++#undef COMPILE_DL_MYSQLI + +-/* do we have port framework? */ +-#undef HAVE_PORT ++/* Whether mysqlnd is enabled */ ++#undef MYSQLI_USE_MYSQLND + +-/* whether to include POSIX-like functions */ +-#undef HAVE_POSIX ++/* */ ++#undef HAVE_OCI_LOB_READ2 + +-/* whether you have POSIX readdir_r */ +-#undef HAVE_POSIX_READDIR_R ++/* Whether to build oci8 as dynamic module */ ++#undef COMPILE_DL_OCI8 + +-/* PostgreSQL 7.0.x or later */ +-#undef HAVE_PQCLIENTENCODING ++/* */ ++#undef HAVE_OCI8 + +-/* Broken libpq under windows */ +-#undef HAVE_PQCMDTUPLES ++/* */ ++#undef PHP_OCI8_DEF_DIR + +-/* PostgreSQL 7.2.0 or later */ +-#undef HAVE_PQESCAPE ++/* */ ++#undef PHP_OCI8_DEF_SHARED_LIBADD + +-/* PostgreSQL 8.1.4 or later */ +-#undef HAVE_PQESCAPE_BYTEA_CONN ++/* */ ++#undef HAVE_OCI_INSTANT_CLIENT + +-/* PostgreSQL 8.1.4 or later */ +-#undef HAVE_PQESCAPE_CONN ++/* */ ++#undef HAVE_OCI_LOB_READ2 + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQEXECPARAMS ++/* Whether to build oci8 as dynamic module */ ++#undef COMPILE_DL_OCI8 + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQEXECPREPARED ++/* */ ++#undef HAVE_OCI8 + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQFREEMEM ++/* */ ++#undef HAVE_ADABAS + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQFTABLE ++/* */ ++#undef HAVE_SAPDB + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQGETCOPYDATA ++/* */ ++#undef HAVE_SOLID_35 + +-/* Older PostgreSQL */ +-#undef HAVE_PQOIDVALUE ++/* */ ++#undef HAVE_SOLID_30 + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQPARAMETERSTATUS ++/* */ ++#undef HAVE_SOLID + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQPREPARE ++/* Needed in sqlunix.h */ ++#undef SS_LINUX + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQPROTOCOLVERSION ++/* Needed in sqlunix.h */ ++#undef SS_LINUX + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQPUTCOPYDATA ++/* Needed in sqlunix.h for wchar defs */ ++#undef SS_FBX + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQPUTCOPYEND ++/* Needed in sqlunix.h for wchar defs */ ++#undef SS_FBX + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQRESULTERRORFIELD ++/* */ ++#undef HAVE_IBMDB2 + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQSENDPREPARE ++/* */ ++#undef HAVE_ODBC_ROUTER + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQSENDQUERYPARAMS ++/* */ ++#undef HAVE_EMPRESS + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQSENDQUERYPREPARED ++/* */ ++#undef HAVE_EMPRESS + +-/* PostgreSQL 7.4 or later */ +-#undef HAVE_PQSETERRORVERBOSITY ++/* */ ++#undef AIX + +-/* PostgreSQL 7.0.x or later */ +-#undef HAVE_PQSETNONBLOCKING ++/* */ ++#undef HPUX + +-/* PostgreSQL 7.3.0 or later */ +-#undef HAVE_PQUNESCAPEBYTEA ++/* */ ++#undef LINUX + +-/* do we have prctl? */ +-#undef HAVE_PRCTL ++/* */ ++#undef NEUTRINO + +-/* */ +-#undef HAVE_PREAD ++/* */ ++#undef ISOLARIS + +-/* */ +-#undef HAVE_PSPELL ++/* */ ++#undef SOLARIS + +-/* do we have ptrace? */ +-#undef HAVE_PTRACE ++/* */ ++#undef UNIXWARE + +-/* Whether ptrdiff_t is available */ +-#undef HAVE_PTRDIFF_T ++/* */ ++#undef HAVE_BIRDSTEP + +-/* Define to 1 if you have the `ptsname' function. */ +-#undef HAVE_PTSNAME ++/* */ ++#undef HAVE_CODBC + +-/* Define to 1 if you have the `putenv' function. */ +-#undef HAVE_PUTENV ++/* */ ++#undef HAVE_IODBC + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_PWD_H ++/* */ ++#undef HAVE_ODBC2 + +-/* */ +-#undef HAVE_PWRITE ++/* */ ++#undef HAVE_ESOOB + +-/* Define to 1 if you have the `random' function. */ +-#undef HAVE_RANDOM ++/* */ ++#undef HAVE_UNIXODBC + +-/* Define to 1 if you have the `rand_r' function. */ +-#undef HAVE_RAND_R ++/* Whether you want DBMaker */ ++#undef HAVE_DBMAKER + +-/* Define to 1 if you have the `realpath' function. */ +-#undef HAVE_REALPATH ++/* */ ++#undef HAVE_SQLDATASOURCES + +-/* Whether Reflection is enabled */ +-#undef HAVE_REFLECTION ++/* */ ++#undef HAVE_UODBC + +-/* 1 */ +-#undef HAVE_REGEX_T_RE_MAGIC ++/* Whether to build odbc as dynamic module */ ++#undef COMPILE_DL_ODBC + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_RESOLV_H ++/* */ ++#undef HAVE_FORK + +-/* */ +-#undef HAVE_RES_NSEARCH ++/* */ ++#undef HAVE_WAITPID + +-/* */ +-#undef HAVE_RES_SEARCH ++/* */ ++#undef HAVE_SIGACTION + +-/* */ +-#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST ++/* Whether to build pcntl as dynamic module */ ++#undef COMPILE_DL_PCNTL + +-/* */ +-#undef HAVE_RL_CALLBACK_READ_CHAR ++/* Whether to build pdo as dynamic module */ ++#undef COMPILE_DL_PDO + +-/* Define to 1 if you have the `rl_completion_matches' function. */ +-#undef HAVE_RL_COMPLETION_MATCHES ++/* Whether to build pdo_dblib as dynamic module */ ++#undef COMPILE_DL_PDO_DBLIB + +-/* Whether you use Roxen */ +-#undef HAVE_ROXEN ++/* */ ++#undef HAVE_LIBDNET_STUB + +-/* */ +-#undef HAVE_SAPDB ++/* */ ++#undef HAVE_PDO_DBLIB + +-/* Define to 1 if you have the `scandir' function. */ +-#undef HAVE_SCANDIR ++/* */ ++#undef HAVE_FREETDS + +-/* do we have select? */ +-#undef HAVE_SELECT ++/* */ ++#undef HAVE_PDO_FIREBIRD + +-/* */ +-#undef HAVE_SEMUN ++/* Whether to build pdo_firebird as dynamic module */ ++#undef COMPILE_DL_PDO_FIREBIRD + +-/* Define to 1 if you have the `setegid' function. */ +-#undef HAVE_SETEGID ++/* Whether pdo_mysql uses mysqlnd */ ++#undef PDO_USE_MYSQLND ++ ++/* Whether you have MySQL */ ++#undef HAVE_MYSQL + +-/* Define to 1 if you have the `setenv' function. */ +-#undef HAVE_SETENV ++/* */ ++#undef PDO_MYSQL_UNIX_ADDR + +-/* Define to 1 if you have the `seteuid' function. */ +-#undef HAVE_SETEUID ++/* Whether to build pdo_mysql as dynamic module */ ++#undef COMPILE_DL_PDO_MYSQL + +-/* Define to 1 if you have the `setitimer' function. */ +-#undef HAVE_SETITIMER ++/* */ ++#undef HAVE_OCIENVCREATE + +-/* Define to 1 if you have the `setlocale' function. */ +-#undef HAVE_SETLOCALE ++/* */ ++#undef HAVE_OCIENVNLSCREATE + +-/* Define to 1 if you have the `setpgid' function. */ +-#undef HAVE_SETPGID ++/* */ ++#undef HAVE_OCILOBISTEMPORARY + +-/* Define to 1 if you have the `setpriority' function. */ +-#undef HAVE_SETPRIORITY ++/* */ ++#undef HAVE_OCILOBISTEMPORARY + +-/* Define to 1 if you have the `setproctitle' function. */ +-#undef HAVE_SETPROCTITLE ++/* */ ++#undef HAVE_OCICOLLASSIGN + +-/* Define to 1 if you have the `setsid' function. */ +-#undef HAVE_SETSID ++/* */ ++#undef HAVE_OCISTMTFETCH2 - #if HAVE_DLFCN_H -@@ -111644,7 +118301,7 @@ int main () - exit (status); - } - EOF -- if { (eval echo configure:111648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:118305: \"$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 -@@ -111667,7 +118324,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 --echo "configure:111671: checking whether a statically linked program can dlopen itself" >&5 -+echo "configure:118328: 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 -@@ -111677,7 +118334,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:118401: \"$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 -@@ -111781,11 +118438,11 @@ fi +-/* Define to 1 if you have the `setvbuf' function. */ +-#undef HAVE_SETVBUF ++/* */ ++#undef PHP_PDO_OCI_CLIENT_VERSION - # Report which library types will actually be built - echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 --echo "configure:111785: checking if libtool supports shared libraries" >&5 -+echo "configure:118442: checking if libtool supports shared libraries" >&5 - echo "$ac_t""$can_build_shared" 1>&6 +-/* */ +-#undef HAVE_SHMOP ++/* */ ++#undef HAVE_ODBC_H - echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 --echo "configure:111789: checking whether to build shared libraries" >&5 -+echo "configure:118446: checking whether to build shared libraries" >&5 - test "$can_build_shared" = "no" && enable_shared=no +-/* Define to 1 if you have the `shutdown' function. */ +-#undef HAVE_SHUTDOWN ++/* */ ++#undef HAVE_ODBCSDK_H - # On AIX, shared libraries and static libraries use the same namespace, and -@@ -111808,7 +118465,7 @@ esac - echo "$ac_t""$enable_shared" 1>&6 +-/* */ +-#undef HAVE_SIGACTION ++/* */ ++#undef HAVE_IODBC_H - echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 --echo "configure:111812: checking whether to build static libraries" >&5 -+echo "configure:118469: 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 -@@ -112494,7 +119151,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:112498: checking for ld used by $CC" >&5 -+echo "configure:119155: checking for ld used by $CC" >&5 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -112524,10 +119181,10 @@ echo "configure:112498: checking for ld - esac - elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 --echo "configure:112528: checking for GNU ld" >&5 -+echo "configure:119185: checking for GNU ld" >&5 - else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 --echo "configure:112531: checking for non-GNU ld" >&5 -+echo "configure:119188: 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 -@@ -112566,7 +119223,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:112570: checking if the linker ($LD) is GNU ld" >&5 -+echo "configure:119227: 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 -@@ -112632,7 +119289,7 @@ fi +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SIGNAL_H ++/* */ ++#undef HAVE_SQLUNIX_H - # 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:112636: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo "configure:119293: checking whether the $compiler linker ($LD) supports shared libraries" >&5 - ld_shlibs_CXX=yes - case $host_os in - aix3*) -@@ -112730,12 +119387,12 @@ case $host_os in - # Determine the default libpath from the value encoded in an empty executable. - - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:119396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -112769,12 +119426,12 @@ if test -z "$aix_libpath"; then aix_libp - # Determine the default libpath from the value encoded in an empty executable. - - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:119435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -113541,7 +120198,7 @@ private: - }; - EOF +-/* Define to 1 if you have the `sigprocmask' function. */ +-#undef HAVE_SIGPROCMASK ++/* */ ++#undef HAVE_SQLTYPES_H --if { (eval echo configure:113545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:120202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. +-/* Define to 1 if you have the `sigsetjmp' function. */ +-#undef HAVE_SIGSETJMP ++/* */ ++#undef HAVE_SQLUCODE_H -@@ -113697,7 +120354,7 @@ lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= +-/* Define to 1 if you have the `sigtimedwait' function. */ +-#undef HAVE_SIGTIMEDWAIT ++/* */ ++#undef HAVE_SQL_H - echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 --echo "configure:113701: checking for $compiler option to produce PIC" >&5 -+echo "configure:120358: checking for $compiler option to produce PIC" >&5 - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -113994,7 +120651,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX" - 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:113998: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -+echo "configure:120655: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -114011,11 +120668,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:114015: $lt_compile\"" >&5) -+ (eval echo "\"configure:120672: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "configure:114019: \$? = $ac_status" >&5 -+ echo "configure:120676: \$? = $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. -@@ -114057,7 +120714,7 @@ esac - # - wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" - echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 --echo "configure:114061: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo "configure:120718: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -114095,7 +120752,7 @@ fi +-/* Define to 1 if you have the `sigwaitinfo' function. */ +-#undef HAVE_SIGWAITINFO ++/* */ ++#undef HAVE_ISQL_H +-/* */ +-#undef HAVE_SIMPLEXML ++/* */ ++#undef HAVE_SQLEXT_H - echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 --echo "configure:114099: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo "configure:120756: 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 -@@ -114115,11 +120772,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:114119: $lt_compile\"" >&5) -+ (eval echo "\"configure:120776: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "configure:114123: \$? = $ac_status" >&5 -+ echo "configure:120780: \$? = $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 -@@ -114149,7 +120806,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:114153: checking if we can lock with hard links" >&5 -+echo "configure:120810: 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 -@@ -114166,7 +120823,7 @@ else - fi +-/* Define to 1 if you have the `sin' function. */ +-#undef HAVE_SIN ++/* */ ++#undef HAVE_ISQLEXT_H - echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 --echo "configure:114170: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo "configure:120827: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +-/* */ +-#undef HAVE_SNMP ++/* */ ++#undef HAVE_UDBCEXT_H - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -@@ -114212,11 +120869,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:114216: checking whether -lc should be explicitly linked in" >&5 -+echo "configure:120873: checking whether -lc should be explicitly linked in" >&5 - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext +-/* */ +-#undef HAVE_SNMP_PARSE_OID ++/* */ ++#undef HAVE_SQLCLI1_H -- if { (eval echo configure:114220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then -+ if { (eval echo configure:120877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext -@@ -114230,7 +120887,7 @@ echo "configure:114216: checking whether - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= -- if { (eval echo configure:114234: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } -+ if { (eval echo configure:120891: \"$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 -@@ -114249,7 +120906,7 @@ echo "configure:114216: checking whether - esac +-/* Define to 1 if you have the `snprintf' function. */ +-#undef HAVE_SNPRINTF ++/* */ ++#undef HAVE_LIBRARYMANAGER_H - echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 --echo "configure:114253: checking dynamic linker characteristics" >&5 -+echo "configure:120910: checking dynamic linker characteristics" >&5 - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -114822,7 +121479,7 @@ if test "$GCC" = yes; then - fi +-/* */ +-#undef HAVE_SOAP ++/* */ ++#undef HAVE_CLI0CORE_H - echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 --echo "configure:114826: checking how to hardcode library paths into programs" >&5 -+echo "configure:121483: 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" || \ ---- a/generated_lists -+++ b/generated_lists -@@ -1,3 +1,3 @@ - makefile_am_files = Zend/Makefile.am TSRM/Makefile.am - config_h_files = Zend/acconfig.h TSRM/acconfig.h --config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config.m4 ext/recode/config9.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite/config.m4 ext/sqlite3/config0.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4 -+config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/apc/config.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dio/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/http/config9.m4 ext/http/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libevent/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config9.m4 ext/recode/config.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite3/config0.m4 ext/sqlite/config.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4 ---- a/main/php_config.h.in -+++ b/main/php_config.h.in -@@ -1262,6 +1262,12 @@ - /* Define if uint32_t type is present. */ - #undef HAVE_UINT32_T +-/* Whether struct sockaddr has field sa_len */ +-#undef HAVE_SOCKADDR_SA_LEN ++/* */ ++#undef HAVE_CLI0EXT_H -+/* Define if system timezone data is used */ -+#undef HAVE_SYSTEM_TZDATA -+ -+/* Define for location of system timezone data */ -+#undef HAVE_SYSTEM_TZDATA_PREFIX -+ - /* Whether to build date as dynamic module */ - #undef COMPILE_DL_DATE +-/* Whether you have struct sockaddr_storage */ +-#undef HAVE_SOCKADDR_STORAGE ++/* */ ++#undef HAVE_CLI0CLI_H -@@ -1334,6 +1340,51 @@ - /* */ - #undef HAVE_ZLIB +-/* Define if sockaddr_un in sys/un.h contains a sun_len component */ +-#undef HAVE_SOCKADDR_UN_SUN_LEN ++/* */ ++#undef HAVE_CLI0DEFS_H +-/* */ +-#undef HAVE_SOCKET +/* */ -+#undef APC_MMAP -+ ++#undef HAVE_CLI0ENV_H + +-/* Define to 1 if you have the `socketpair' function. */ +-#undef HAVE_SOCKETPAIR ++/* Whether to build pdo_odbc as dynamic module */ ++#undef COMPILE_DL_PDO_ODBC + +-/* */ +-#undef HAVE_SOCKETS ++/* Whether to have pg_config.h */ ++#undef HAVE_PG_CONFIG_H + +-/* Whether you have socklen_t */ +-#undef HAVE_SOCKLEN_T ++/* Whether to have pg_config.h */ ++#undef HAVE_PG_CONFIG_H + +-/* */ +-#undef HAVE_SOLID ++/* Whether to build PostgreSQL for PDO support or not */ ++#undef HAVE_PDO_PGSQL + +-/* */ +-#undef HAVE_SOLID_30 ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQPARAMETERSTATUS + +-/* */ +-#undef HAVE_SOLID_35 ++/* PostgreSQL 8.0 or later */ ++#undef HAVE_PQPREPARE + +-/* Whether you want SPL (Standard PHP Library) support */ +-#undef HAVE_SPL ++/* PostgreSQL 8.1.4 or later */ ++#undef HAVE_PQESCAPE_CONN + +-/* */ +-#undef HAVE_SQLCLI1_H ++/* PostgreSQL 8.1.4 or later */ ++#undef HAVE_PQESCAPE_BYTEA_CONN + +-/* */ +-#undef HAVE_SQLDATASOURCES ++/* Whether libpq is compiled with --enable-multibyte */ ++#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT + +-/* */ +-#undef HAVE_SQLEXT_H ++/* Whether to build pdo_pgsql as dynamic module */ ++#undef COMPILE_DL_PDO_PGSQL + +-/* */ +-#undef HAVE_SQLITE3 +/* */ -+#undef APC_FILEHITS -+ ++#undef HAVE_PDO_SQLITELIB + + /* have commercial sqlite3 with crypto support */ + #undef HAVE_SQLITE3_KEY + +-/* */ +-#undef HAVE_SQLTYPES_H ++/* Whether to build pdo_sqlite as dynamic module */ ++#undef COMPILE_DL_PDO_SQLITE + +-/* */ +-#undef HAVE_SQLUCODE_H ++/* Whether to build pdo_sqlite as dynamic module */ ++#undef COMPILE_DL_PDO_SQLITE + +-/* */ +-#undef HAVE_SQLUNIX_H ++/* Whether to have pg_config.h */ ++#undef HAVE_PG_CONFIG_H + +-/* */ +-#undef HAVE_SQL_H ++/* Whether to have pg_config.h */ ++#undef HAVE_PG_CONFIG_H + +-/* Define to 1 if you have the `srand48' function. */ +-#undef HAVE_SRAND48 ++/* Whether to build PostgreSQL support or not */ ++#undef HAVE_PGSQL + +-/* Define to 1 if you have the `srandom' function. */ +-#undef HAVE_SRANDOM ++/* PostgreSQL 7.2.0 or later */ ++#undef HAVE_PQESCAPE + +-/* Whether ssize_t is available */ +-#undef HAVE_SSIZE_T ++/* PostgreSQL 7.3.0 or later */ ++#undef HAVE_PQUNESCAPEBYTEA + +-/* Define to 1 if you have the `statfs' function. */ +-#undef HAVE_STATFS ++/* PostgreSQL 7.0.x or later */ ++#undef HAVE_PQSETNONBLOCKING + +-/* Define to 1 if you have the `statvfs' function. */ +-#undef HAVE_STATVFS ++/* Broken libpq under windows */ ++#undef HAVE_PQCMDTUPLES + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STDARG_H ++/* Older PostgreSQL */ ++#undef HAVE_PQOIDVALUE + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STDARG_PROTOTYPES ++/* PostgreSQL 7.0.x or later */ ++#undef HAVE_PQCLIENTENCODING + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STDBOOL_H ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQPARAMETERSTATUS + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STDINT_H ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQPROTOCOLVERSION + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STDIO_H ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PGTRANSACTIONSTATUS + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STDLIB_H ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQEXECPARAMS + +-/* Define to 1 if you have the `std_syslog' function. */ +-#undef HAVE_STD_SYSLOG ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQPREPARE + +-/* */ +-#undef HAVE_STMT_NEXT_RESULT ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQEXECPREPARED + +-/* Define to 1 if you have the `strcasecmp' function. */ +-#undef HAVE_STRCASECMP ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQRESULTERRORFIELD + +-/* Define to 1 if you have the `strcoll' function. */ +-#undef HAVE_STRCOLL ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQSENDQUERYPARAMS + +-/* Define to 1 if you have the `strdup' function. */ +-#undef HAVE_STRDUP ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQSENDPREPARE + +-/* Define to 1 if you have the `strerror' function. */ +-#undef HAVE_STRERROR ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQSENDQUERYPREPARED + +-/* Define to 1 if you have the `strfmon' function. */ +-#undef HAVE_STRFMON ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQPUTCOPYDATA + +-/* Define to 1 if you have the `strftime' function. */ +-#undef HAVE_STRFTIME ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQPUTCOPYEND + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STRINGS_H ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQGETCOPYDATA + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_STRING_H ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQFREEMEM + +-/* Define to 1 if you have the `strlcat' function. */ +-#undef HAVE_STRLCAT ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQSETERRORVERBOSITY + +-/* Define to 1 if you have the `strlcpy' function. */ +-#undef HAVE_STRLCPY ++/* PostgreSQL 7.4 or later */ ++#undef HAVE_PQFTABLE + +-/* Define to 1 if you have the `strndup' function. */ +-#undef HAVE_STRNDUP ++/* PostgreSQL 8.1.4 or later */ ++#undef HAVE_PQESCAPE_CONN + +-/* Define to 1 if you have the `strnlen' function. */ +-#undef HAVE_STRNLEN ++/* PostgreSQL 8.1.4 or later */ ++#undef HAVE_PQESCAPE_BYTEA_CONN + +-/* Define to 1 if you have the `strpbrk' function. */ +-#undef HAVE_STRPBRK ++/* Whether libpq is compiled with --enable-multibyte */ ++#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT + +-/* Define to 1 if you have the `strpncpy' function. */ +-#undef HAVE_STRPNCPY ++/* PostgreSQL 8.1 or later */ ++#undef HAVE_PG_LO_CREATE + +-/* Define to 1 if you have the `strptime' function. */ +-#undef HAVE_STRPTIME ++/* PostgreSQL 8.4 or later */ ++#undef HAVE_PG_LO_IMPORT_WITH_OID + +-/* whether strptime() declaration fails */ +-#undef HAVE_STRPTIME_DECL_FAILS ++/* Whether to build pgsql as dynamic module */ ++#undef COMPILE_DL_PGSQL + +-/* Define to 1 if you have the `strstr' function. */ +-#undef HAVE_STRSTR ++/* Whether to build phar as dynamic module */ ++#undef COMPILE_DL_PHAR + +-/* Define to 1 if you have the `strtod' function. */ +-#undef HAVE_STRTOD +/* */ -+#undef __DEBUG_APC__ -+ ++#undef PHAR_HASH_OK + +-/* Define to 1 if you have the `strtok_r' function. */ +-#undef HAVE_STRTOK_R +/* */ -+#undef APC_SEM_LOCKS ++#undef PHAR_HAVE_OPENSSL + +-/* Define to 1 if you have the `strtol' function. */ +-#undef HAVE_STRTOL ++/* whether to include POSIX-like functions */ ++#undef HAVE_POSIX + +-/* Define to 1 if you have the `strtoll' function. */ +-#undef HAVE_STRTOLL ++/* Whether to build posix as dynamic module */ ++#undef COMPILE_DL_POSIX + +-/* Define to 1 if you have the `strtoul' function. */ +-#undef HAVE_STRTOUL ++/* Whether you have a working ttyname_r */ ++#undef HAVE_TTYNAME_R + +-/* Define to 1 if you have the `strtoull' function. */ +-#undef HAVE_STRTOULL ++/* Wether struct utsname has domainname */ ++#undef HAVE_UTSNAME_DOMAINNAME + +-/* whether you have struct flock */ +-#undef HAVE_STRUCT_FLOCK ++/* Whether to build pspell as dynamic module */ ++#undef COMPILE_DL_PSPELL + +/* */ -+#undef APC_SPIN_LOCKS ++#undef HAVE_PSPELL + +/* */ -+#undef APC_PTHREADMUTEX_LOCKS -+ ++#undef HAVE_RL_CALLBACK_READ_CHAR + +-/* Define to 1 if `st_blksize' is member of `struct stat'. */ +-#undef HAVE_STRUCT_STAT_ST_BLKSIZE +/* */ -+#undef APC_FCNTL_LOCKS ++#undef HAVE_LIBREADLINE + +-/* Define to 1 if `st_blocks' is member of `struct stat'. */ +-#undef HAVE_STRUCT_STAT_ST_BLOCKS ++/* */ ++#undef HAVE_LIBEDIT + +-/* Define to 1 if `st_rdev' is member of `struct stat'. */ +-#undef HAVE_STRUCT_STAT_ST_RDEV ++/* Whether to build readline as dynamic module */ ++#undef COMPILE_DL_READLINE + +-/* Define to 1 if `tm_zone' is member of `struct tm'. */ +-#undef HAVE_STRUCT_TM_TM_ZONE ++/* Whether we have librecode 3.5 */ ++#undef HAVE_BROKEN_RECODE + +-/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use +- `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */ +-#undef HAVE_ST_BLKSIZE ++/* Whether we have librecode 3.5 or higher */ ++#undef HAVE_LIBRECODE + +-/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use +- `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */ +-#undef HAVE_ST_BLOCKS ++/* Whether to build recode as dynamic module */ ++#undef COMPILE_DL_RECODE + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_ST_H ++/* Whether Reflection is enabled */ ++#undef HAVE_REFLECTION + +-/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use +- `HAVE_STRUCT_STAT_ST_RDEV' instead. */ +-#undef HAVE_ST_RDEV ++/* Whether to build reflection as dynamic module */ ++#undef COMPILE_DL_REFLECTION + +-/* */ +-#undef HAVE_SYBASE_CT ++/* */ ++#undef HAVE_PWRITE + +-/* Define to 1 if you have the `symlink' function. */ +-#undef HAVE_SYMLINK ++/* whether pwrite64 is default */ ++#undef PHP_PWRITE_64 + +-/* Define if you have the __sync_fetch_and_add function */ +-#undef HAVE_SYNC_FETCH_AND_ADD ++/* */ ++#undef HAVE_PREAD + -+/* shm/mmap memory protection */ -+#undef APC_MEMPROTECT ++/* whether pread64 is default */ ++#undef PHP_PREAD_64 + ++/* Whether to build session as dynamic module */ ++#undef COMPILE_DL_SESSION + +-/* do we have sysconf? */ +-#undef HAVE_SYSCONF +/* */ -+#undef APC_HAVE_LOOKUP_HOOKS -+ ++#undef HAVE_PHP_SESSION + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYSEXITS_H ++/* Whether you have libmm */ ++#undef HAVE_LIBMM + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYSLOG_H +/* */ -+#undef APC_HAVE_LOOKUP_HOOKS -+ ++#undef HAVE_SHMOP + +-/* */ +-#undef HAVE_SYSVMSG ++/* Whether to build shmop as dynamic module */ ++#undef COMPILE_DL_SHMOP + +-/* */ +-#undef HAVE_SYSVSEM ++/* */ ++#undef HAVE_LIBXML + +-/* */ +-#undef HAVE_SYSVSHM ++/* */ ++#undef HAVE_SIMPLEXML + +-/* Define to 1 if you have the header file, and it defines `DIR'. +- */ +-#undef HAVE_SYS_DIR_H ++/* Whether to build simplexml as dynamic module */ ++#undef COMPILE_DL_SIMPLEXML + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_FILE_H ++/* */ ++#undef HAVE_NET_SNMP + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_IOCTL_H ++/* */ ++#undef HAVE_SNMP_PARSE_OID + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_IPC_H ++/* */ ++#undef HAVE_SNMP + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_LOADAVG_H ++/* */ ++#undef UCD_SNMP_HACK + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_MKDEV_H ++/* Whether to build snmp as dynamic module */ ++#undef COMPILE_DL_SNMP + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_MMAN_H ++/* */ ++#undef HAVE_LIBXML + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_MOUNT_H ++/* */ ++#undef HAVE_SOAP + +-/* Define to 1 if you have the header file, and it defines `DIR'. +- */ +-#undef HAVE_SYS_NDIR_H ++/* Whether to build soap as dynamic module */ ++#undef COMPILE_DL_SOAP + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_PARAM_H ++/* Whether you have struct cmsghdr */ ++#undef HAVE_CMSGHDR + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_POLL_H ++/* */ ++#undef MISSING_MSGHDR_MSGFLAGS + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_RESOURCE_H ++/* */ ++#undef HAVE_SOCKETS + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_SELECT_H ++/* Whether to build sockets as dynamic module */ ++#undef COMPILE_DL_SOCKETS + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_SOCKET_H ++/* Whether struct _zend_object_value is packed */ ++#undef HAVE_PACKED_OBJECT_VALUE + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_STATFS_H ++/* Whether you want SPL (Standard PHP Library) support */ ++#undef HAVE_SPL + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_STATVFS_H ++/* Whether to build spl as dynamic module */ ++#undef COMPILE_DL_SPL + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_STAT_H ++/* Have PDO */ ++#undef PHP_SQLITE2_HAVE_PDO + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_SYSEXITS_H ++/* Whether to build sqlite as dynamic module */ ++#undef COMPILE_DL_SQLITE + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_TIMES_H ++/* Size of a pointer */ ++#undef SQLITE_PTR_SZ + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_TIME_H ++/* */ ++#undef SQLITE_UTF8 + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_TYPES_H ++/* Define if flush should be called explicitly after a buffered io. */ ++#undef HAVE_FLUSHIO + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_UIO_H ++/* */ ++#undef HAVE_CRYPT + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_UN_H ++/* whether the compiler supports __alignof__ */ ++#undef HAVE_ALIGNOF + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_UTSNAME_H ++/* whether the compiler supports __attribute__ ((__aligned__)) */ ++#undef HAVE_ATTRIBUTE_ALIGNED + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_VARARGS_H ++/* Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5 */ ++#undef PHP_USE_PHP_CRYPT_R + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_VFS_H ++/* Whether the system supports standard DES salt */ ++#undef PHP_STD_DES_CRYPT + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_SYS_WAIT_H ++/* Whether the system supports BlowFish salt */ ++#undef PHP_BLOWFISH_CRYPT + +-/* Define to 1 if you have the `tempnam' function. */ +-#undef HAVE_TEMPNAM ++/* Whether the system supports extended DES salt */ ++#undef PHP_EXT_DES_CRYPT + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_TERMIOS_H ++/* Whether the system supports MD5 salt */ ++#undef PHP_MD5_CRYPT + +-/* */ +-#undef HAVE_TIDY ++/* Whether the system supports SHA512 salt */ ++#undef PHP_SHA512_CRYPT + +-/* */ +-#undef HAVE_TIDYOPTGETDOC ++/* Whether the system supports SHA256 salt */ ++#undef PHP_SHA256_CRYPT + +-/* do we have times? */ +-#undef HAVE_TIMES ++/* Whether the system supports standard DES salt */ ++#undef PHP_STD_DES_CRYPT + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_TIME_H ++/* Whether the system supports BlowFish salt */ ++#undef PHP_BLOWFISH_CRYPT + +-/* whether you have tm_gmtoff in struct tm */ +-#undef HAVE_TM_GMTOFF ++/* Whether the system supports extended DES salt */ ++#undef PHP_EXT_DES_CRYPT + +-/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use +- `HAVE_STRUCT_TM_TM_ZONE' instead. */ +-#undef HAVE_TM_ZONE ++/* Whether the system supports MD5 salt */ ++#undef PHP_MD5_CRYPT + +-/* Whether you have a working ttyname_r */ +-#undef HAVE_TTYNAME_R ++/* Whether the system supports SHA512 salt */ ++#undef PHP_SHA512_CRYPT + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_TUXMODULE_H ++/* Whether the system supports SHA256 salt */ ++#undef PHP_SHA256_CRYPT + +-/* Define to 1 if you don't have `tm_zone' but do have the external array +- `tzname'. */ +-#undef HAVE_TZNAME ++/* Whether PHP has to use its own crypt_r for blowfish, des and ext des */ ++#undef PHP_USE_PHP_CRYPT_R + +-/* Define to 1 if you have the `tzset' function. */ +-#undef HAVE_TZSET ++/* Define if your system has fork/vfork/CreateProcess */ ++#undef PHP_CAN_SUPPORT_PROC_OPEN + +-/* */ +-#undef HAVE_UDBCEXT_H ++/* Whether to enable chroot() function */ ++#undef ENABLE_CHROOT_FUNC + +-/* Define if uint32_t type is present. */ +-#undef HAVE_UINT32_T ++/* */ ++#undef HAVE_RES_NSEARCH + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_UNISTD_H ++/* */ ++#undef HAVE_RES_NSEARCH + +-/* */ +-#undef HAVE_UNIXODBC ++/* */ ++#undef HAVE_LIBRESOLV + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_UNIX_H ++/* */ ++#undef HAVE_RES_NSEARCH + +-/* Define to 1 if you have the `unlockpt' function. */ +-#undef HAVE_UNLOCKPT ++/* */ ++#undef HAVE_LIBBIND + +-/* Define to 1 if you have the `unsetenv' function. */ +-#undef HAVE_UNSETENV ++/* */ ++#undef HAVE_RES_NSEARCH + +-/* */ +-#undef HAVE_UODBC ++/* */ ++#undef HAVE_LIBSOCKET + +-/* Define to 1 if you have the `usleep' function. */ +-#undef HAVE_USLEEP ++/* */ ++#undef HAVE_DNS_SEARCH + +-/* Define to 1 if you have the `utime' function. */ +-#undef HAVE_UTIME ++/* */ ++#undef HAVE_DNS_SEARCH + +-/* Define to 1 if you have the `utimes' function. */ +-#undef HAVE_UTIMES ++/* */ ++#undef HAVE_LIBRESOLV + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_UTIME_H ++/* */ ++#undef HAVE_DNS_SEARCH + +-/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */ +-#undef HAVE_UTIME_NULL ++/* */ ++#undef HAVE_LIBBIND + +-/* Wether struct utsname has domainname */ +-#undef HAVE_UTSNAME_DOMAINNAME ++/* */ ++#undef HAVE_DNS_SEARCH + +-/* Define to 1 if you have the `vasprintf' function. */ +-#undef HAVE_VASPRINTF ++/* */ ++#undef HAVE_LIBSOCKET + +-/* Define to 1 if you have the `vprintf' function. */ +-#undef HAVE_VPRINTF ++/* */ ++#undef HAVE_DN_EXPAND + +-/* Define to 1 if you have the `vsnprintf' function. */ +-#undef HAVE_VSNPRINTF ++/* */ ++#undef HAVE_DN_EXPAND + +-/* Define to 1 if you have the `wait3' function. */ +-#undef HAVE_WAIT3 ++/* */ ++#undef HAVE_LIBRESOLV + +-/* */ +-#undef HAVE_WAITPID ++/* */ ++#undef HAVE_DN_EXPAND + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_WCHAR_H ++/* */ ++#undef HAVE_LIBBIND + +-/* */ +-#undef HAVE_WDDX ++/* */ ++#undef HAVE_DN_EXPAND + +-/* */ +-#undef HAVE_XML ++/* */ ++#undef HAVE_LIBSOCKET + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_XMLPARSE_H ++/* */ ++#undef HAVE_DN_SKIPNAME + +-/* */ +-#undef HAVE_XMLREADER ++/* */ ++#undef HAVE_DN_SKIPNAME + +-/* */ +-#undef HAVE_XMLRPC ++/* */ ++#undef HAVE_LIBRESOLV + +-/* Define to 1 if you have the header file. */ +-#undef HAVE_XMLTOK_H ++/* */ ++#undef HAVE_DN_SKIPNAME + +-/* */ +-#undef HAVE_XMLWRITER ++/* */ ++#undef HAVE_LIBBIND + +-/* */ +-#undef HAVE_XSL ++/* */ ++#undef HAVE_DN_SKIPNAME + +-/* */ +-#undef HAVE_XSL_EXSLT ++/* */ ++#undef HAVE_LIBSOCKET + +-/* */ +-#undef HAVE_YP_GET_DEFAULT_DOMAIN ++/* */ ++#undef HAVE_RES_SEARCH + +-/* */ +-#undef HAVE_ZIP ++/* */ ++#undef HAVE_RES_SEARCH + +-/* */ +-#undef HAVE_ZLIB ++/* */ ++#undef HAVE_LIBRESOLV + +-/* whether _controlfp is present usable */ +-#undef HAVE__CONTROLFP ++/* */ ++#undef HAVE_RES_SEARCH + +-/* whether _controlfp_s is present and usable */ +-#undef HAVE__CONTROLFP_S ++/* */ ++#undef HAVE_LIBBIND + +-/* whether _FPU_SETCW is present and usable */ +-#undef HAVE__FPU_SETCW ++/* */ ++#undef HAVE_RES_SEARCH + +-/* */ +-#undef HPUX ++/* */ ++#undef HAVE_LIBSOCKET + +-/* */ +-#undef HSREGEX ++/* whether atof() accepts NAN */ ++#undef HAVE_ATOF_ACCEPTS_NAN + +-/* iconv() is aliased to libiconv() in -liconv */ +-#undef ICONV_ALIASED_LIBICONV ++/* whether atof() accepts INF */ ++#undef HAVE_ATOF_ACCEPTS_INF + +-/* Whether iconv supports error no or not */ +-#undef ICONV_SUPPORTS_ERRNO ++/* whether HUGE_VAL == INF */ ++#undef HAVE_HUGE_VAL_INF + +-/* */ +-#undef ISOLARIS ++/* whether HUGE_VAL + -HUGEVAL == NAN */ ++#undef HAVE_HUGE_VAL_NAN + +-/* */ +-#undef LINUX ++/* whether strptime() declaration fails */ ++#undef HAVE_STRPTIME_DECL_FAILS + +-/* */ +-#undef MAGIC_QUOTES ++/* Define if your system has mbstate_t in wchar.h */ ++#undef HAVE_MBSTATE_T + +-/* Whether asctime_r is declared */ +-#undef MISSING_ASCTIME_R_DECL ++/* Whether to build standard as dynamic module */ ++#undef COMPILE_DL_STANDARD + +-/* Whether ctime_r is declared */ +-#undef MISSING_CTIME_R_DECL ++/* */ ++#undef HAVE_SYBASE_CT + +-/* */ +-#undef MISSING_FCLOSE_DECL ++/* Whether to build sybase_ct as dynamic module */ ++#undef COMPILE_DL_SYBASE_CT + +-/* Whether gmtime_r is declared */ +-#undef MISSING_GMTIME_R_DECL ++/* */ ++#undef HAVE_SYSVMSG + +-/* Whether localtime_r is declared */ +-#undef MISSING_LOCALTIME_R_DECL ++/* Whether to build sysvmsg as dynamic module */ ++#undef COMPILE_DL_SYSVMSG + +-/* */ +-#undef MISSING_MSGHDR_MSGFLAGS ++/* Whether to build sysvsem as dynamic module */ ++#undef COMPILE_DL_SYSVSEM + +-/* Whether strtok_r is declared */ +-#undef MISSING_STRTOK_R_DECL ++/* */ ++#undef HAVE_SYSVSEM + +-/* Whether mysqlnd is enabled */ +-#undef MYSQLI_USE_MYSQLND +/* */ +#undef HAVE_SEMUN -+ + +-/* Enable compressed protocol support */ +-#undef MYSQLND_COMPRESSION_WANTED +/* */ +#undef HAVE_SEMUN -+ -+/* enable valgrind memchecks */ -+#undef HAVE_VALGRIND_MEMCHECK_H -+ -+/* Whether to build apc as dynamic module */ -+#undef COMPILE_DL_APC -+ + +-/* Enable SSL support */ +-#undef MYSQLND_SSL_SUPPORTED +/* */ -+#undef HAVE_APC ++#undef HAVE_SYSVSHM + - /* Whether to build bcmath as dynamic module */ - #undef COMPILE_DL_BCMATH ++/* Whether to build sysvshm as dynamic module */ ++#undef COMPILE_DL_SYSVSHM -@@ -1472,6 +1523,9 @@ - /* Whether to build dba as dynamic module */ - #undef COMPILE_DL_DBA +-/* Whether mysqlnd is enabled */ +-#undef MYSQL_USE_MYSQLND ++/* */ ++#undef HAVE_TIDYOPTGETDOC -+/* Whether to build dio as dynamic module */ -+#undef COMPILE_DL_DIO -+ - /* */ - #undef HAVE_LIBXML +-/* */ +-#undef NDBM_INCLUDE_FILE ++/* Whether to build tidy as dynamic module */ ++#undef COMPILE_DL_TIDY -@@ -1895,6 +1949,9 @@ - /* LDAP SASL support */ - #undef HAVE_LDAP_SASL +-/* */ +-#undef NEUTRINO ++/* */ ++#undef HAVE_TIDY -+/* Whether to build libevent as dynamic module */ -+#undef COMPILE_DL_LIBEVENT -+ - /* whether to have multibyte string support */ - #undef HAVE_MBSTRING +-/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +-#undef NO_MINUS_C_MINUS_O ++/* Whether to build tokenizer as dynamic module */ ++#undef COMPILE_DL_TOKENIZER + +-/* Define to the address where bug reports for this package should be sent. */ +-#undef PACKAGE_BUGREPORT ++/* */ ++#undef HAVE_LIBXML + +-/* Define to the full name of this package. */ +-#undef PACKAGE_NAME ++/* */ ++#undef HAVE_LIBEXPAT + +-/* Define to the full name and version of this package. */ +-#undef PACKAGE_STRING ++/* */ ++#undef HAVE_WDDX + +-/* Define to the one symbol short name of this package. */ +-#undef PACKAGE_TARNAME ++/* Whether to build wddx as dynamic module */ ++#undef COMPILE_DL_WDDX + +-/* Define to the version of this package. */ +-#undef PACKAGE_VERSION ++/* */ ++#undef HAVE_LIBXML + +-/* */ +-#undef PDO_MYSQL_UNIX_ADDR ++/* */ ++#undef HAVE_LIBEXPAT + +-/* Whether pdo_mysql uses mysqlnd */ +-#undef PDO_USE_MYSQLND ++/* Whether to build xml as dynamic module */ ++#undef COMPILE_DL_XML + +-/* */ +-#undef PHAR_HASH_OK ++/* */ ++#undef HAVE_XML + +-/* */ +-#undef PHAR_HAVE_OPENSSL ++/* */ ++#undef HAVE_LIBXML + +-/* */ +-#undef PHP_APACHE_HAVE_CLIENT_FD ++/* */ ++#undef HAVE_XMLREADER + +-/* Whether the system supports BlowFish salt */ +-#undef PHP_BLOWFISH_CRYPT ++/* Whether to build xmlreader as dynamic module */ ++#undef COMPILE_DL_XMLREADER + +-/* PHP build date */ +-#undef PHP_BUILD_DATE ++/* */ ++#undef HAVE_XMLRPC + +-/* Define if your system has fork/vfork/CreateProcess */ +-#undef PHP_CAN_SUPPORT_PROC_OPEN ++/* */ ++#undef HAVE_LIBXML + +-/* */ +-#undef PHP_CURL_URL_WRAPPERS ++/* */ ++#undef HAVE_LIBEXPAT + +-/* Whether the system supports extended DES salt */ +-#undef PHP_EXT_DES_CRYPT ++/* */ ++#undef HAVE_LIBICONV -@@ -2813,6 +2870,120 @@ - /* Whether to build zip as dynamic module */ - #undef COMPILE_DL_ZIP +-/* fpm group name */ +-#undef PHP_FPM_GROUP ++/* */ ++#undef HAVE_GICONV_H + +-/* fpm user name */ +-#undef PHP_FPM_USER ++/* */ ++#undef HAVE_LIBICONV + +-/* Whether you have HP-UX 10.x */ +-#undef PHP_HPUX_TIME_R ++/* iconv() is aliased to libiconv() in -liconv */ ++#undef ICONV_ALIASED_LIBICONV + +-/* Path to iconv.h */ +-#undef PHP_ICONV_H_PATH ++/* */ ++#undef HAVE_ICONV + +-/* Which iconv implementation to use */ +-#undef PHP_ICONV_IMPL ++/* */ ++#undef UNDEF_THREADS_HACK + +-/* Whether you have IRIX-style functions */ +-#undef PHP_IRIX_TIME_R ++/* Whether to build xmlrpc as dynamic module */ ++#undef COMPILE_DL_XMLRPC + +-/* Whether the system supports MD5 salt */ +-#undef PHP_MD5_CRYPT ++/* Whether to build xmlrpc as dynamic module */ ++#undef COMPILE_DL_XMLRPC + +-/* */ +-#undef PHP_MHASH_BC ++/* */ ++#undef HAVE_LIBXML + +-/* */ +-#undef PHP_MYSQL_UNIX_SOCK_ADDR ++/* */ ++#undef HAVE_XMLWRITER + +-/* */ +-#undef PHP_OCI8_DEF_DIR ++/* Whether to build xmlwriter as dynamic module */ ++#undef COMPILE_DL_XMLWRITER + +-/* */ +-#undef PHP_OCI8_DEF_SHARED_LIBADD ++/* */ ++#undef HAVE_XSL_EXSLT + +-/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */ +-#undef PHP_ONIG_BAD_KOI8_ENTRY ++/* */ ++#undef HAVE_XSL + +-/* Define to 1 if the bundled oniguruma is used */ +-#undef PHP_ONIG_BUNDLED ++/* Whether to build xsl as dynamic module */ ++#undef COMPILE_DL_XSL +-/* uname output */ +-#undef PHP_OS ++/* */ ++#undef HAVE_ZIP + +-/* */ +-#undef PHP_PDO_OCI_CLIENT_VERSION ++/* Whether to build zip as dynamic module */ ++#undef COMPILE_DL_ZIP + +-/* whether pread64 is default */ +-#undef PHP_PREAD_64 +/* */ +#undef HTTP_SHARED_DEPS -+ + +-/* whether pwrite64 is default */ +-#undef PHP_PWRITE_64 +/* */ +#undef HTTP_SHARED_DEPS -+ + +-/* */ +-#undef PHP_SAFE_MODE +/* */ +#undef HAVE_GETHOSTNAME -+ + +-/* */ +-#undef PHP_SAFE_MODE_EXEC_DIR +/* */ +#undef HAVE_GETHOSTNAME -+ + +-/* Whether the system supports SHA256 salt */ +-#undef PHP_SHA256_CRYPT +/* */ +#undef HAVE_LIBNSL -+ + +-/* Whether the system supports SHA512 salt */ +-#undef PHP_SHA512_CRYPT +/* */ +#undef HAVE_GETDOMAINNAME -+ + +-/* */ +-#undef PHP_SIGCHILD +/* */ +#undef HAVE_GETDOMAINNAME -+ + +-/* Have PDO */ +-#undef PHP_SQLITE2_HAVE_PDO +/* */ +#undef HAVE_LIBNSL -+ + +-/* Whether the system supports standard DES salt */ +-#undef PHP_STD_DES_CRYPT +/* */ +#undef HAVE_GETSERVBYPORT -+ + +-/* uname -a output */ +-#undef PHP_UNAME +/* */ +#undef HAVE_GETSERVBYPORT -+ + +-/* Whether PHP has to use its own crypt_r for blowfish, des and ext des */ +-#undef PHP_USE_PHP_CRYPT_R +/* */ +#undef HAVE_LIBNSL -+ + +-/* whether write(2) works */ +-#undef PHP_WRITE_STDOUT +/* */ +#undef HAVE_GETSERVBYNAME -+ + +-/* /proc/pid/mem interface */ +-#undef PROC_MEM_FILE +/* */ +#undef HAVE_GETSERVBYNAME -+ + +-/* Whether to use Pthreads */ +-#undef PTHREADS +/* */ +#undef HAVE_LIBNSL -+ + +-/* */ +-#undef QDBM_INCLUDE_FILE +/* Have zlib support */ +#undef HTTP_HAVE_ZLIB -+ + +-/* */ +-#undef REGEX +/* */ +#undef HTTP_HAVE_SSL -+ + +-/* Define as the return type of signal handlers (`int' or `void'). */ +-#undef RETSIGTYPE +/* */ +#undef HTTP_HAVE_OPENSSL -+ + +-/* Whether to use Roxen in ZTS mode */ +-#undef ROXEN_USE_ZTS +/* */ +#undef HTTP_HAVE_GNUTLS -+ + +-/* The size of `char', as computed by sizeof. */ +-#undef SIZEOF_CHAR +/* path to bundled SSL CA info */ +#undef HTTP_CURL_CAINFO -+ + +-/* The size of `char *', as computed by sizeof. */ +-#undef SIZEOF_CHAR_P +/* Have cURL support */ +#undef HTTP_HAVE_CURL -+ + +-/* The size of `int', as computed by sizeof. */ +-#undef SIZEOF_INT +/* */ +#undef HAVE_CURL_SHARE_STRERROR -+ + +-/* Size of intmax_t */ +-#undef SIZEOF_INTMAX_T +/* */ +#undef HAVE_CURL_MULTI_STRERROR -+ + +-/* The size of `long', as computed by sizeof. */ +-#undef SIZEOF_LONG +/* */ +#undef HAVE_CURL_EASY_STRERROR -+ + +-/* The size of `long int', as computed by sizeof. */ +-#undef SIZEOF_LONG_INT +/* */ +#undef HAVE_CURL_EASY_RESET -+ + +-/* The size of `long long', as computed by sizeof. */ +-#undef SIZEOF_LONG_LONG +/* */ +#undef HAVE_CURL_FORMGET -+ + +-/* The size of `long long int', as computed by sizeof. */ +-#undef SIZEOF_LONG_LONG_INT +/* */ +#undef HAVE_CURL_MULTI_SETOPT -+ + +-/* Size of ptrdiff_t */ +-#undef SIZEOF_PTRDIFF_T +/* */ +#undef HAVE_CURL_MULTI_TIMEOUT -+ + +-/* The size of `short', as computed by sizeof. */ +-#undef SIZEOF_SHORT +/* */ +#undef HTTP_EVENT_VERSION -+ + +-/* The size of `size_t', as computed by sizeof. */ +-#undef SIZEOF_SIZE_T +/* Have libevent support for cURL */ +#undef HTTP_HAVE_EVENT -+ + +-/* Size of ssize_t */ +-#undef SIZEOF_SSIZE_T +/* */ +#undef HAVE_CURL_MULTI_SOCKET_ACTION -+ + +-/* */ +-#undef SOLARIS +/* */ +#undef HTTP_EVENT_VERSION -+ + +-/* have sqlite3 with extension support */ +-#undef SQLITE_OMIT_LOAD_EXTENSION +/* Have libevent support for cURL */ +#undef HTTP_HAVE_EVENT -+ + +-/* Size of a pointer */ +-#undef SQLITE_PTR_SZ +/* */ +#undef HAVE_CURL_MULTI_SOCKET_ACTION -+ + +-/* */ +-#undef SQLITE_UTF8 +/* Have magic mime support */ +#undef HTTP_HAVE_MAGIC -+ + +-/* Needed in sqlunix.h for wchar defs */ +-#undef SS_FBX +/* Have ext/hash support */ +#undef HTTP_HAVE_PHP_HASH_H -+ + +-/* Needed in sqlunix.h */ +-#undef SS_LINUX +/* Have ext/hash support */ +#undef HTTP_HAVE_PHP_HASH_H -+ + +-/* If using the C implementation of alloca, define if you know the +- direction of stack growth for your system; otherwise it will be +- automatically deduced at runtime. +- STACK_DIRECTION > 0 => grows toward higher addresses +- STACK_DIRECTION < 0 => grows toward lower addresses +- STACK_DIRECTION = 0 => direction of growth unknown */ +-#undef STACK_DIRECTION +/* Whether to build http as dynamic module */ +#undef COMPILE_DL_HTTP -+ + +-/* Define to 1 if you have the ANSI C header files. */ +-#undef STDC_HEADERS +/* Have extended HTTP support */ +#undef HAVE_HTTP + +-/* Define to 1 if you can safely include both and . */ +-#undef TIME_WITH_SYS_TIME ++/* Enable compressed protocol support */ ++#undef MYSQLND_COMPRESSION_WANTED + +-/* Define to 1 if your declares `struct tm'. */ +-#undef TM_IN_SYS_TIME ++/* Enable SSL support */ ++#undef MYSQLND_SSL_SUPPORTED + +-/* */ +-#undef TSRM_ST ++/* Whether to build mysqlnd as dynamic module */ ++#undef COMPILE_DL_MYSQLND + +-/* */ +-#undef UCD_SNMP_HACK ++/* Define if int32_t type is present. */ ++#undef HAVE_INT32_T + +-/* */ +-#undef UNDEF_THREADS_HACK ++/* Define if uint32_t type is present. */ ++#undef HAVE_UINT32_T + +-/* */ +-#undef UNIXWARE ++/* Whether sprintf is broken */ ++#undef ZEND_BROKEN_SPRINTF + +-/* whether to check multibyte regex backtrack */ +-#undef USE_COMBINATION_EXPLOSION_CHECK ++/* whether floatingpoint.h defines fp_except */ ++#undef HAVE_FP_EXCEPT + +-/* */ +-#undef USE_GD_IMGSTRTTF ++/* whether _FPU_SETCW is present and usable */ ++#undef HAVE__FPU_SETCW + +-/* */ +-#undef USE_GD_JISX0208 ++/* whether fpsetprec is present and usable */ ++#undef HAVE_FPSETPREC + +-/* Define if cross-process locking is required by accept() */ +-#undef USE_LOCKING ++/* whether _controlfp is present usable */ ++#undef HAVE__CONTROLFP + +-/* Enable extensions on AIX 3, Interix. */ +-#ifndef _ALL_SOURCE +-# undef _ALL_SOURCE +-#endif +-/* Enable GNU extensions on systems that have them. */ +-#ifndef _GNU_SOURCE +-# undef _GNU_SOURCE +-#endif +-/* Enable threading extensions on Solaris. */ +-#ifndef _POSIX_PTHREAD_SEMANTICS +-# undef _POSIX_PTHREAD_SEMANTICS +-#endif +-/* Enable extensions on HP NonStop. */ +-#ifndef _TANDEM_SOURCE +-# undef _TANDEM_SOURCE +-#endif +-/* Enable general extensions on Solaris. */ +-#ifndef __EXTENSIONS__ +-# undef __EXTENSIONS__ +-#endif ++/* whether _controlfp_s is present and usable */ ++#undef HAVE__CONTROLFP_S + ++/* whether FPU control word can be manipulated by inline assembler */ ++#undef HAVE_FPU_INLINE_ASM_X86 + +-/* */ +-#undef USE_TRANSFER_TABLES ++/* Define if double cast to long preserves least significant bits */ ++#undef ZEND_DVAL_TO_LVAL_CAST_OK + +-/* whether you want Pi3Web support */ +-#undef WITH_PI3WEB ++/* Define if dlsym() requires a leading underscore in symbol names. */ ++#undef DLSYM_NEEDS_UNDERSCORE + +-/* */ +-#undef WITH_ZEUS ++/* virtual machine dispatch method */ ++#undef ZEND_VM_KIND + +-/* Define if processor uses big-endian word */ +-#undef WORDS_BIGENDIAN ++/* virtual machine dispatch method */ ++#undef ZEND_VM_KIND + +-/* Whether sprintf is broken */ +-#undef ZEND_BROKEN_SPRINTF ++/* virtual machine dispatch method */ ++#undef ZEND_VM_KIND + +-/* */ ++/* */ + #undef ZEND_DEBUG + +-/* Define if double cast to long preserves least significant bits */ +-#undef ZEND_DVAL_TO_LVAL_CAST_OK ++/* */ ++#undef ZEND_DEBUG ++ ++/* */ ++#undef ZTS + - /* Enable compressed protocol support */ - #undef MYSQLND_COMPRESSION_WANTED ++/* */ ++#undef ZEND_MULTIBYTE ++ ++/* Define if the target system is darwin */ ++#undef DARWIN + +-/* */ ++/* */ + #undef ZEND_MM_ALIGNMENT + +-/* */ ++/* */ + #undef ZEND_MM_ALIGNMENT_LOG2 + +-/* */ +-#undef ZEND_MULTIBYTE ++/* Define if the target system has support for memory allocation using mmap(MAP_ANON) */ ++#undef HAVE_MEM_MMAP_ANON + +-/* virtual machine dispatch method */ +-#undef ZEND_VM_KIND ++/* Define if the target system has support for memory allocation using mmap(/dev/zero) */ ++#undef HAVE_MEM_MMAP_ZERO + +-/* */ ++/* */ + #undef ZTS + +-/* Define to 1 if on MINIX. */ +-#undef _MINIX ++/* Whether you use GNU Pth */ ++#undef GNUPTH + +-/* Define to 2 if the system does not provide POSIX.1 features except with +- this defined. */ +-#undef _POSIX_1_SOURCE ++/* */ ++#undef TSRM_ST + +-/* Define to 1 if you need to in order for `stat' and other things to work. */ +-#undef _POSIX_SOURCE ++/* Whether to use native BeOS threads */ ++#undef BETHREADS + +-/* Define to empty if `const' does not conform to ANSI C. */ +-#undef const ++/* Whether to use Pthreads */ ++#undef PTHREADS + +-/* Define to `int' if doesn't define. */ +-#undef gid_t ++/* PHP build date */ ++#undef PHP_BUILD_DATE + +-/* */ +-#undef in_addr_t ++/* hardcode for each of the cross compiler host */ ++#undef PHP_OS + +-/* Define to `__inline__' or `__inline' if that's what the C compiler +- calls it, or to nothing if 'inline' is not supported under any name. */ +-#ifndef __cplusplus +-#undef inline +-#endif ++/* hardcode for each of the cross compiler host */ ++#undef PHP_UNAME + +-/* Define to `unsigned int' if does not define. */ +-#undef size_t ++/* uname -a output */ ++#undef PHP_UNAME + +-/* Define to `int' if doesn't define. */ +-#undef uid_t ++/* uname output */ ++#undef PHP_OS + +-/* Define to `unsigned int ' if does not define. */ +-#undef uint ++/* */ ++#undef HAVE_BUILD_DEFS_H + +-/* Define to `unsigned long ' if does not define. */ +-#undef ulong + + #ifndef ZEND_ACCONFIG_H_NO_C_PROTOS diff --git a/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch b/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch index 0b4489281e..8ace5f29e6 100644 --- a/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch +++ b/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -16067,7 +16067,7 @@ fi +@@ -16357,7 +16357,7 @@ fi ac_libs=$LIBS LIBS="$LIBS -ldl" if test "$cross_compiling" = yes; then @@ -8,4 +8,4 @@ + found=$found else cat > conftest.$ac_ext <