-diff -Nru php-5.2.4.vanilla/configure php-5.2.4.fpm/configure
---- php-5.2.4.vanilla/configure 2007-08-30 03:39:18.000000000 +0400
-+++ php-5.2.4.fpm/configure 2007-09-11 23:59:31.000000000 +0400
-@@ -1038,6 +1038,11 @@
- --disable-path-info-check CGI: If this is disabled, paths such as
- /info.php/test?a=b will fail to work"
- ac_help="$ac_help
-+ --enable-fpm FastCGI: If this is enabled, the fastcgi support
-+ will include experimental process manager code"
-+ac_help="$ac_help
-+ --with-xml-config=PATH FPM: use xml-config in PATH to find libxml"
-+ac_help="$ac_help
-
- General settings:
- "
-@@ -2149,12 +2154,12 @@
-
-
- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
--echo "configure:2153: checking for Cygwin environment" >&5
-+echo "configure:2158: checking for Cygwin environment" >&5
- if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2158 "configure"
-+#line 2163 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -2165,7 +2170,7 @@
- return __CYGWIN__;
- ; return 0; }
- EOF
--if { (eval echo configure:2169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_cygwin=yes
- else
-@@ -2182,19 +2187,19 @@
- CYGWIN=
- test "$ac_cv_cygwin" = yes && CYGWIN=yes
- echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
--echo "configure:2186: checking for mingw32 environment" >&5
-+echo "configure:2191: checking for mingw32 environment" >&5
- if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2191 "configure"
-+#line 2196 "configure"
- #include "confdefs.h"
-
- int main() {
- return __MINGW32__;
- ; return 0; }
- EOF
--if { (eval echo configure:2198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_mingw32=yes
- else
-@@ -2213,7 +2218,7 @@
-
-
- echo $ac_n "checking for egrep""... $ac_c" 1>&6
--echo "configure:2217: checking for egrep" >&5
-+echo "configure:2222: checking for egrep" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2228,7 +2233,7 @@
-
-
- echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
--echo "configure:2232: checking for a sed that does not truncate output" >&5
-+echo "configure:2237: 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
-@@ -2378,7 +2383,7 @@
- fi
-
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:2382: checking host system type" >&5
-+echo "configure:2387: checking host system type" >&5
-
- host_alias=$host
- case "$host_alias" in
-@@ -2399,7 +2404,7 @@
- echo "$ac_t""$host" 1>&6
-
- echo $ac_n "checking target system type""... $ac_c" 1>&6
--echo "configure:2403: checking target system type" >&5
-+echo "configure:2408: checking target system type" >&5
-
- target_alias=$target
- case "$target_alias" in
-@@ -2511,7 +2516,7 @@
- # 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:2515: checking for $ac_word" >&5
-+echo "configure:2520: 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
-@@ -2541,7 +2546,7 @@
- # 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:2545: checking for $ac_word" >&5
-+echo "configure:2550: 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
-@@ -2592,7 +2597,7 @@
- # 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:2596: checking for $ac_word" >&5
-+echo "configure:2601: 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
-@@ -2624,7 +2629,7 @@
- fi
-
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:2628: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:2633: 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.
-@@ -2635,12 +2640,12 @@
-
- cat > conftest.$ac_ext << EOF
-
--#line 2639 "configure"
-+#line 2644 "configure"
- #include "confdefs.h"
-
- main(){return(0);}
- EOF
--if { (eval echo configure:2644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2649: \"$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
-@@ -2666,12 +2671,12 @@
- { 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:2670: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:2675: 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:2675: checking whether we are using GNU C" >&5
-+echo "configure:2680: 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
-@@ -2680,7 +2685,7 @@
- yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2684: \"$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:2689: \"$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
-@@ -2699,7 +2704,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:2703: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:2708: 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
-@@ -2731,7 +2736,7 @@
- fi
-
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:2735: checking how to run the C preprocessor" >&5
-+echo "configure:2740: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -2746,13 +2751,13 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
--#line 2750 "configure"
-+#line 2755 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2761: \"$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
- :
-@@ -2763,13 +2768,13 @@
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
--#line 2767 "configure"
-+#line 2772 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2778: \"$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
- :
-@@ -2780,13 +2785,13 @@
- rm -rf conftest*
- CPP="${CC-cc} -nologo -E"
- cat > conftest.$ac_ext <<EOF
--#line 2784 "configure"
-+#line 2789 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2795: \"$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
- :
-@@ -2813,9 +2818,9 @@
-
- ICC="no"
- echo $ac_n "checking for icc""... $ac_c" 1>&6
--echo "configure:2817: checking for icc" >&5
-+echo "configure:2822: checking for icc" >&5
- cat > conftest.$ac_ext <<EOF
--#line 2819 "configure"
-+#line 2824 "configure"
- #include "confdefs.h"
- __INTEL_COMPILER
- EOF
-@@ -2835,10 +2840,10 @@
-
- if test "x$CC" != xcc; then
- echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
--echo "configure:2839: checking whether $CC and cc understand -c and -o together" >&5
-+echo "configure:2844: 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:2842: checking whether cc understands -c and -o together" >&5
-+echo "configure:2847: 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]/_/'`"
-@@ -2850,16 +2855,16 @@
- # 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:2854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-- test -f conftest.o && { (eval echo configure:2855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-+if { (eval echo configure:2859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-+ test -f conftest.o && { (eval echo configure:2860: \"$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:2860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2865: \"$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:2862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-- test -f conftest.o && { (eval echo configure:2863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-+ if { (eval echo configure:2867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-+ test -f conftest.o && { (eval echo configure:2868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
- then
- # cc works too.
- :
-@@ -2886,7 +2891,7 @@
- fi
-
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:2890: checking how to run the C preprocessor" >&5
-+echo "configure:2895: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -2901,13 +2906,13 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
--#line 2905 "configure"
-+#line 2910 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2916: \"$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
- :
-@@ -2918,13 +2923,13 @@
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
--#line 2922 "configure"
-+#line 2927 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2933: \"$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
- :
-@@ -2935,13 +2940,13 @@
- rm -rf conftest*
- CPP="${CC-cc} -nologo -E"
- cat > conftest.$ac_ext <<EOF
--#line 2939 "configure"
-+#line 2944 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2950: \"$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
- :
-@@ -2966,9 +2971,9 @@
- echo "$ac_t""$CPP" 1>&6
-
- echo $ac_n "checking for AIX""... $ac_c" 1>&6
--echo "configure:2970: checking for AIX" >&5
-+echo "configure:2975: checking for AIX" >&5
- cat > conftest.$ac_ext <<EOF
--#line 2972 "configure"
-+#line 2977 "configure"
- #include "confdefs.h"
- #ifdef _AIX
- yes
-@@ -2990,7 +2995,7 @@
-
-
- echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:2994: checking whether ln -s works" >&5
-+echo "configure:2999: 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
-@@ -3015,7 +3020,7 @@
- php_with_libdir=lib
-
- echo $ac_n "checking for system library directory""... $ac_c" 1>&6
--echo "configure:3019: checking for system library directory" >&5
-+echo "configure:3024: 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"
-@@ -3041,7 +3046,7 @@
- php_enable_rpath=yes
-
- echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6
--echo "configure:3045: checking whether to enable runpaths" >&5
-+echo "configure:3050: 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"
-@@ -3065,7 +3070,7 @@
-
-
- echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6
--echo "configure:3069: checking if compiler supports -R" >&5
-+echo "configure:3074: 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
-@@ -3073,14 +3078,14 @@
- SAVE_LIBS=$LIBS
- LIBS="-R /usr/$PHP_LIBDIR $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3077 "configure"
-+#line 3082 "configure"
- #include "confdefs.h"
-
- int main() {
-
- ; return 0; }
- EOF
--if { (eval echo configure:3084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- php_cv_cc_dashr=yes
- else
-@@ -3098,7 +3103,7 @@
- ld_runpath_switch=-R
- else
- echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6
--echo "configure:3102: checking if compiler supports -Wl,-rpath," >&5
-+echo "configure:3107: 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
-@@ -3106,14 +3111,14 @@
- SAVE_LIBS=$LIBS
- LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3110 "configure"
-+#line 3115 "configure"
- #include "confdefs.h"
-
- int main() {
-
- ; return 0; }
- EOF
--if { (eval echo configure:3117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- php_cv_cc_rpath=yes
- else
-@@ -3142,7 +3147,7 @@
- # 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:3146: checking for $ac_word" >&5
-+echo "configure:3151: 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
-@@ -3170,7 +3175,7 @@
-
- if test -n "$RE2C"; then
- echo $ac_n "checking for re2c version""... $ac_c" 1>&6
--echo "configure:3174: checking for re2c version" >&5
-+echo "configure:3179: 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
-@@ -3202,7 +3207,7 @@
- # 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:3206: checking for $ac_word" >&5
-+echo "configure:3211: 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
-@@ -3243,7 +3248,7 @@
- ;;
- *)
- echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6
--echo "configure:3247: checking if $AWK is broken" >&5
-+echo "configure:3252: 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; }
-@@ -3262,7 +3267,7 @@
- # 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:3266: checking for $ac_word" >&5
-+echo "configure:3271: 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
-@@ -3302,7 +3307,7 @@
- bison_version=none
- if test "$YACC"; then
- echo $ac_n "checking for bison version""... $ac_c" 1>&6
--echo "configure:3306: checking for bison version" >&5
-+echo "configure:3311: 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
-@@ -3342,7 +3347,7 @@
- # Extract the first word of "flex", so it can be a program name with args.
- set dummy flex; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3346: checking for $ac_word" >&5
-+echo "configure:3351: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3376,7 +3381,7 @@
- *) ac_lib=l ;;
- esac
- echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
--echo "configure:3380: checking for yywrap in -l$ac_lib" >&5
-+echo "configure:3385: checking for yywrap in -l$ac_lib" >&5
- ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3384,7 +3389,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$ac_lib $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3388 "configure"
-+#line 3393 "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
-@@ -3395,7 +3400,7 @@
- yywrap()
- ; return 0; }
- EOF
--if { (eval echo configure:3399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3419,7 +3424,7 @@
-
- if test "$LEX" = "flex"; then
- echo $ac_n "checking lex output file root""... $ac_c" 1>&6
--echo "configure:3423: checking lex output file root" >&5
-+echo "configure:3428: checking lex output file root" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3440,7 +3445,7 @@
- LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
- echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
--echo "configure:3444: checking whether yytext is a pointer" >&5
-+echo "configure:3449: checking whether yytext is a pointer" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3452,14 +3457,14 @@
- ac_save_LIBS="$LIBS"
- LIBS="$LIBS $LEXLIB"
- cat > conftest.$ac_ext <<EOF
--#line 3456 "configure"
-+#line 3461 "configure"
- #include "confdefs.h"
- `cat $LEX_OUTPUT_ROOT.c`
- int main() {
-
- ; return 0; }
- EOF
--if { (eval echo configure:3463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_prog_lex_yytext_pointer=yes
- else
-@@ -3483,12 +3488,12 @@
- :
- fi
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:3487: checking for working const" >&5
-+echo "configure:3492: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3492 "configure"
-+#line 3497 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -3537,7 +3542,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:3541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_const=yes
- else
-@@ -3563,7 +3568,7 @@
-
- if test "$LEX" = "flex"; then
- echo $ac_n "checking for flex version""... $ac_c" 1>&6
--echo "configure:3567: checking for flex version" >&5
-+echo "configure:3572: checking for flex version" >&5
- if eval "test \"`echo '$''{'php_cv_flex_version'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3629,7 +3634,7 @@
-
- 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:3633: checking whether $CC supports -no-cpp-precomp" >&5
-+echo "configure:3638: 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
-@@ -3827,7 +3832,7 @@
- # 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:3831: checking whether to force non-PIC code in shared modules" >&5
-+echo "configure:3836: 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
-@@ -3855,7 +3860,7 @@
-
-
- echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6
--echo "configure:3859: checking whether /dev/urandom exists" >&5
-+echo "configure:3864: 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
-@@ -3916,7 +3921,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 3920 "configure"
-+#line 3925 "configure"
- #include "confdefs.h"
-
- #include <pthread.h>
-@@ -3934,7 +3939,7 @@
- return pthread_create(&thd, NULL, thread_routine, &data);
- }
- EOF
--if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- pthreads_working=yes
-@@ -3954,7 +3959,7 @@
- CFLAGS=$save_CFLAGS
-
- echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
--echo "configure:3958: checking for pthreads_cflags" >&5
-+echo "configure:3963: 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
-@@ -3976,7 +3981,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 3980 "configure"
-+#line 3985 "configure"
- #include "confdefs.h"
-
- #include <pthread.h>
-@@ -3994,7 +3999,7 @@
- return pthread_create(&thd, NULL, thread_routine, &data);
- }
- EOF
--if { (eval echo configure:3998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- pthreads_working=yes
-@@ -4024,7 +4029,7 @@
- echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
-
- echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
--echo "configure:4028: checking for pthreads_lib" >&5
-+echo "configure:4033: 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
-@@ -4046,7 +4051,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 4050 "configure"
-+#line 4055 "configure"
- #include "confdefs.h"
-
- #include <pthread.h>
-@@ -4064,7 +4069,7 @@
- return pthread_create(&thd, NULL, thread_routine, &data);
- }
- EOF
--if { (eval echo configure:4068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- pthreads_working=yes
-@@ -4198,7 +4203,7 @@
-
-
- echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6
--echo "configure:4202: checking for AOLserver support" >&5
-+echo "configure:4207: checking for AOLserver support" >&5
-
- if test "$PHP_AOLSERVER" != "no"; then
- if test -d "$PHP_AOLSERVER/include"; then
-@@ -4455,7 +4460,7 @@
-
-
- echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6
--echo "configure:4459: checking for Apache 1.x module support via DSO through APXS" >&5
-+echo "configure:4464: checking for Apache 1.x module support via DSO through APXS" >&5
-
- if test "$PHP_APXS" != "no"; then
- if test "$PHP_APXS" = "yes"; then
-@@ -4778,7 +4783,7 @@
-
-
- echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6
--echo "configure:4782: checking for Apache 1.x module support" >&5
-+echo "configure:4787: checking for Apache 1.x module support" >&5
-
- if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
-
-@@ -5611,7 +5616,7 @@
- php_enable_mod_charset=no
-
- echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
--echo "configure:5615: checking whether to enable Apache charset compatibility option" >&5
-+echo "configure:5620: 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"
-@@ -5646,7 +5651,7 @@
-
- gcc_arg_name=ac_cv_gcc_arg_rdynamic
- echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
--echo "configure:5650: checking whether $CC supports -rdynamic" >&5
-+echo "configure:5655: 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
-@@ -5689,7 +5694,7 @@
-
-
- echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
--echo "configure:5693: checking for member fd in BUFF *" >&5
-+echo "configure:5698: 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
-@@ -5701,14 +5706,14 @@
- CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
- fi
- cat > conftest.$ac_ext <<EOF
--#line 5705 "configure"
-+#line 5710 "configure"
- #include "confdefs.h"
- #include <httpd.h>
- int main() {
- conn_rec *c; int fd = c->client->fd;
- ; return 0; }
- EOF
--if { (eval echo configure:5712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- ac_cv_php_fd_in_buff=yes
-@@ -5784,7 +5789,7 @@
-
-
- echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6
--echo "configure:5788: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
-+echo "configure:5793: 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
-@@ -6632,7 +6637,7 @@
-
-
- echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6
--echo "configure:6636: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
-+echo "configure:6641: 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
-@@ -7481,7 +7486,7 @@
-
-
- echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6
--echo "configure:7485: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
-+echo "configure:7490: 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
-@@ -7804,7 +7809,7 @@
-
-
- echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6
--echo "configure:7808: checking for Apache 1.x (hooks) module support" >&5
-+echo "configure:7813: 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
-
-@@ -8637,7 +8642,7 @@
- php_enable_mod_charset=no
-
- echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
--echo "configure:8641: checking whether to enable Apache charset compatibility option" >&5
-+echo "configure:8646: 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"
-@@ -8672,7 +8677,7 @@
-
- gcc_arg_name=ac_cv_gcc_arg_rdynamic
- echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
--echo "configure:8676: checking whether $CC supports -rdynamic" >&5
-+echo "configure:8681: 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
-@@ -8715,7 +8720,7 @@
-
-
- echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
--echo "configure:8719: checking for member fd in BUFF *" >&5
-+echo "configure:8724: 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
-@@ -8727,14 +8732,14 @@
- CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
- fi
- cat > conftest.$ac_ext <<EOF
--#line 8731 "configure"
-+#line 8736 "configure"
- #include "confdefs.h"
- #include <httpd.h>
- int main() {
- conn_rec *c; int fd = c->client->fd;
- ; return 0; }
- EOF
--if { (eval echo configure:8738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- ac_cv_php_fd_in_buff=yes
-@@ -8811,7 +8816,7 @@
-
-
- echo $ac_n "checking for Caudium support""... $ac_c" 1>&6
--echo "configure:8815: checking for Caudium support" >&5
-+echo "configure:8820: checking for Caudium support" >&5
-
- if test "$PHP_CAUDIUM" != "no"; then
- if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi
-@@ -8881,7 +8886,7 @@
- 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:8885: checking for C includes in $PIKE_C_INCLUDE" >&5
-+echo "configure:8890: 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 #######
-@@ -9162,7 +9167,7 @@
-
-
- echo $ac_n "checking for CLI build""... $ac_c" 1>&6
--echo "configure:9166: checking for CLI build" >&5
-+echo "configure:9171: checking for CLI build" >&5
- if test "$PHP_CLI" != "no"; then
-
- src=$abs_srcdir/sapi/cli/Makefile.frag
-@@ -9208,7 +9213,7 @@
- php_with_continuity=no
-
- echo $ac_n "checking for Continuity support""... $ac_c" 1>&6
--echo "configure:9212: checking for Continuity support" >&5
-+echo "configure:9217: checking for Continuity support" >&5
- # Check whether --with-continuity or --without-continuity was given.
- if test "${with_continuity+set}" = set; then
- withval="$with_continuity"
-@@ -9235,7 +9240,7 @@
- { 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:9239: checking for Continuity include files" >&5
-+echo "configure:9244: 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
-@@ -9485,7 +9490,7 @@
-
-
- echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6
--echo "configure:9489: checking for embedded SAPI library support" >&5
-+echo "configure:9494: checking for embedded SAPI library support" >&5
-
- if test "$PHP_EMBED" != "no"; then
- case "$PHP_EMBED" in
-@@ -9702,7 +9707,7 @@
- php_with_isapi=no
-
- echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6
--echo "configure:9706: checking for Zeus ISAPI support" >&5
-+echo "configure:9711: 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"
-@@ -9951,7 +9956,7 @@
- php_with_milter=no
-
- echo $ac_n "checking for Milter support""... $ac_c" 1>&6
--echo "configure:9955: checking for Milter support" >&5
-+echo "configure:9960: checking for Milter support" >&5
- # Check whether --with-milter or --without-milter was given.
- if test "${with_milter+set}" = set; then
- withval="$with_milter"
-@@ -10235,7 +10240,7 @@
- php_with_nsapi=no
-
- echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6
--echo "configure:10239: checking for NSAPI support" >&5
-+echo "configure:10244: checking for NSAPI support" >&5
- # Check whether --with-nsapi or --without-nsapi was given.
- if test "${with_nsapi+set}" = set; then
- withval="$with_nsapi"
-@@ -10262,7 +10267,7 @@
- { 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:10266: checking for NSAPI include files" >&5
-+echo "configure:10271: 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
-@@ -10270,17 +10275,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:10274: checking for $ac_hdr" >&5
-+echo "configure:10279: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 10279 "configure"
-+#line 10284 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:10284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:10289: \"$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*
-@@ -10315,17 +10320,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:10319: checking for $ac_hdr" >&5
-+echo "configure:10324: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 10324 "configure"
-+#line 10329 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:10329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:10334: \"$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*
-@@ -10587,7 +10592,7 @@
- php_with_phttpd=no
-
- echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6
--echo "configure:10591: checking for PHTTPD support" >&5
-+echo "configure:10596: checking for PHTTPD support" >&5
- # Check whether --with-phttpd or --without-phttpd was given.
- if test "${with_phttpd+set}" = set; then
- withval="$with_phttpd"
-@@ -10833,7 +10838,7 @@
- php_with_pi3web=no
-
- echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6
--echo "configure:10837: checking for Pi3Web support" >&5
-+echo "configure:10842: checking for Pi3Web support" >&5
- # Check whether --with-pi3web or --without-pi3web was given.
- if test "${with_pi3web+set}" = set; then
- withval="$with_pi3web"
-@@ -11200,7 +11205,7 @@
- php_enable_roxen_zts=no
-
- echo $ac_n "checking whether Roxen module is build using ZTS""... $ac_c" 1>&6
--echo "configure:11204: checking whether Roxen module is build using ZTS" >&5
-+echo "configure:11209: 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"
-@@ -11224,7 +11229,7 @@
-
- RESULT=
- echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6
--echo "configure:11228: checking for Roxen/Pike support" >&5
-+echo "configure:11233: 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; }
-@@ -11502,7 +11507,7 @@
-
-
- echo $ac_n "checking for thttpd""... $ac_c" 1>&6
--echo "configure:11506: checking for thttpd" >&5
-+echo "configure:11511: checking for thttpd" >&5
-
- if test "$PHP_THTTPD" != "no"; then
- if test ! -d $PHP_THTTPD; then
-@@ -11535,7 +11540,7 @@
-
- gcc_arg_name=ac_cv_gcc_arg_rdynamic
- echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
--echo "configure:11539: checking whether $CC supports -rdynamic" >&5
-+echo "configure:11544: 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
-@@ -11763,24 +11768,24 @@
-
-
- echo $ac_n "checking for TUX""... $ac_c" 1>&6
--echo "configure:11767: checking for TUX" >&5
-+echo "configure:11772: 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:11774: checking for $ac_hdr" >&5
-+echo "configure:11779: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 11779 "configure"
-+#line 11784 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:11784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:11789: \"$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*
-@@ -12009,7 +12014,7 @@
-
-
- echo $ac_n "checking for webjames""... $ac_c" 1>&6
--echo "configure:12013: checking for webjames" >&5
-+echo "configure:12018: checking for webjames" >&5
-
- if test "$PHP_WEBJAMES" != "no"; then
-
-@@ -12359,9 +12364,34 @@
-
-
-
-+
-+php_enable_fpm=no
-+
-+
-+# Check whether --enable-fpm or --disable-fpm was given.
-+if test "${enable_fpm+set}" = set; then
-+ enableval="$enable_fpm"
-+ PHP_FPM=$enableval
-+else
-+
-+ PHP_FPM=no
+diff -Naur php-src-vanilla/sapi/fpm/ac/fpm_build.m4 php-src/sapi/fpm/ac/fpm_build.m4
+--- php-src-vanilla/sapi/fpm/ac/fpm_build.m4 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/ac/fpm_build.m4 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,47 @@
+
-+ if test "$PHP_ENABLE_ALL" && test "no" = "yes"; then
-+ PHP_FPM=$PHP_ENABLE_ALL
-+ fi
-+
-+fi
++AC_DEFUN([AC_FPM_BUILD_SAPI],
++[
++ PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/fpm/ac/Makefile.frag,$abs_srcdir/sapi/fpm,sapi/fpm)
+
++ SAPI_FPM_PATH=sapi/fpm/$php_fpm_bin
++ PHP_SUBST(SAPI_FPM_PATH)
++
++ mkdir -p sapi/fpm/cgi
++ PHP_FPM_SAPI_FILES=`cd $abs_srcdir/sapi/fpm && find cgi/ \( -name *.c \) -exec printf "{} " \;`
++ # PHP_FPM_SAPI_FILES="cgi/cgi_main.c cgi/fastcgi.c"
+
-+ext_output=$PHP_FPM
-+
-+
-+
-+
-+
- if test "$PHP_SAPI" = "default"; then
- echo $ac_n "checking whether to build CGI binary""... $ac_c" 1>&6
--echo "configure:12365: checking whether to build CGI binary" >&5
-+echo "configure:12395: checking whether to build CGI binary" >&5
- if test "$PHP_CGI" != "no"; then
- echo "$ac_t""yes" 1>&6
-
-@@ -12384,7 +12414,7 @@
-
-
- echo $ac_n "checking whether to enable fastcgi support""... $ac_c" 1>&6
--echo "configure:12388: checking whether to enable fastcgi support" >&5
-+echo "configure:12418: checking whether to enable fastcgi support" >&5
- if test "$PHP_FASTCGI" = "yes"; then
- PHP_ENABLE_FASTCGI=1
- PHP_FCGI_FILES="fastcgi.c"
-@@ -12398,8 +12428,25 @@
-
- echo "$ac_t""$PHP_FASTCGI" 1>&6
-
-+ if test "$PHP_FASTCGI" = "yes"; then
-+ echo $ac_n "checking whether to activate experimental fastcgi process manager code""... $ac_c" 1>&6
-+echo "configure:12434: checking whether to activate experimental fastcgi process manager code" >&5
-+ if test "$PHP_FPM" = "yes"; then
-+ PHP_FASTCGI_PM=1
-+ else
-+ PHP_FASTCGI_PM=0
-+ fi
-+ echo "$ac_t""$PHP_FPM" 1>&6
-+ else
-+ PHP_FASTCGI_PM=0
-+ fi
-+ cat >> confdefs.h <<EOF
-+#define PHP_FASTCGI_PM $PHP_FASTCGI_PM
-+EOF
-+
-+
- echo $ac_n "checking whether to force Apache CGI redirect""... $ac_c" 1>&6
--echo "configure:12403: checking whether to force Apache CGI redirect" >&5
-+echo "configure:12450: checking whether to force Apache CGI redirect" >&5
- if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then
- CGI_REDIRECT=1
- else
-@@ -12412,7 +12459,7 @@
- echo "$ac_t""$PHP_FORCE_CGI_REDIRECT" 1>&6
-
- echo $ac_n "checking whether to discard path_info + path_translated""... $ac_c" 1>&6
--echo "configure:12416: checking whether to discard path_info + path_translated" >&5
-+echo "configure:12463: checking whether to discard path_info + path_translated" >&5
- if test "$PHP_DISCARD_PATH" = "yes"; then
- DISCARD_PATH=1
- else
-@@ -12425,7 +12472,7 @@
- echo "$ac_t""$PHP_DISCARD_PATH" 1>&6
-
- echo $ac_n "checking whether to enable path info checking""... $ac_c" 1>&6
--echo "configure:12429: checking whether to enable path info checking" >&5
-+echo "configure:12476: checking whether to enable path info checking" >&5
- if test "$PHP_PATH_INFO_CHECK" = "yes"; then
- ENABLE_PATHINFO_CHECK=1
- else
-@@ -12614,10 +12661,10 @@
- BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- ;;
- *darwin*)
-- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- ;;
- *)
-- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- ;;
- esac
-
-@@ -12637,7 +12684,7 @@
-
-
- echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6
--echo "configure:12641: checking for chosen SAPI module" >&5
-+echo "configure:12688: checking for chosen SAPI module" >&5
- echo "$ac_t""$PHP_SAPI" 1>&6
-
- if test "$enable_maintainer_zts" = "yes"; then
-@@ -12680,6 +12727,262 @@
-
- fi
-
-+if test "$PHP_FASTCGI" = "yes" -a "$PHP_FPM" = "yes"; then
-+
-+ echo "$ac_t""" 1>&6
-+ echo "$ac_t""${T_MD}Running FastCGI Process Manager checks${T_ME}" 1>&6
++ mkdir -p sapi/fpm/fpm
++ PHP_FPM_CORE_FILES=`cd $abs_srcdir/sapi/fpm && find fpm/ \( -name *.c -not -name fpm_trace*.c \) -exec printf "{} " \;`
++ # PHP_FPM_CORE_FILES="fpm/fpm_process_ctl.c fpm/fpm_signals.c fpm/fpm_shm.c fpm/fpm.c fpm/fpm_worker_pool.c fpm/fpm_clock.c fpm/fpm_env.c fpm/fpm_shm_slots.c fpm/fpm_children.c fpm/fpm_events.c fpm/fpm_php.c fpm/fpm_unix.c fpm/fpm_request.c fpm/fpm_sockets.c fpm/fpm_php_trace.c fpm/zlog.c fpm/fpm_cleanup.c fpm/fpm_conf.c fpm/xml_config.c fpm/fpm_stdio.c"
+
-+
++ if test "$fpm_trace_type" ; then
++ PHP_FPM_TRACE_FILES=`cd $abs_srcdir/sapi/fpm && find fpm/ \( -name fpm_trace.c -or -name fpm_trace_$fpm_trace_type.c \) -exec printf "{} " \;`
++ fi
++
++ PHP_FPM_CFLAGS="$LIBEVENT_CFLAGS -I$abs_srcdir/sapi/fpm"
+
++ SAPI_EXTRA_LIBS="$LIBEVENT_LIBS"
++ PHP_SUBST(SAPI_EXTRA_LIBS)
++
++ dnl Set install target and select SAPI
++ INSTALL_IT=":"
+
++ PHP_SELECT_SAPI(fpm, program, $PHP_FPM_SAPI_FILES $PHP_FPM_CORE_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
+
++ case $host_alias in
++ *aix*)
++ BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
++ ;;
++ *darwin*)
++ BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
++ ;;
++ *)
++ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
++ ;;
++ esac
+
++ ENDIF=endif
++ PHP_SUBST(ENDIF)
++ PHP_SUBST(BUILD_FPM)
+
++])
+diff -Naur php-src-vanilla/sapi/fpm/ac/fpm_checks.m4 php-src/sapi/fpm/ac/fpm_checks.m4
+--- php-src-vanilla/sapi/fpm/ac/fpm_checks.m4 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/ac/fpm_checks.m4 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,299 @@
++dnl
++dnl $Id$
++dnl
+
++AC_DEFUN([AC_FPM_CHECKS],
++[
++ AC_FPM_STDLIBS
++ AC_FPM_PRCTL
++ AC_FPM_CLOCK
++ AC_FPM_TRACE
++])
+
++AC_DEFUN([AC_FPM_STDLIBS],
++[
++ AC_CHECK_FUNCS(setenv clearenv)
+
++ AC_SEARCH_LIBS(socket, socket)
++ AC_SEARCH_LIBS(inet_addr, nsl)
+
-+
++ AC_CHECK_HEADERS([errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h])
++ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/time.h])
++ AC_CHECK_HEADERS([arpa/inet.h netinet/in.h])
++])
+
-+ echo "$ac_t""checking for XML configuration" 1>&6
++AC_DEFUN([AC_FPM_PRCTL],
++[
++ AC_MSG_CHECKING([for prctl])
+
-+ # Check whether --with-xml-config or --without-xml-config was given.
-+if test "${with_xml_config+set}" = set; then
-+ withval="$with_xml_config"
-+ XMLCONFIG="$withval"
-+else
-+ for ac_prog in xml2-config xml-config
-+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:12760: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_path_XMLCONFIG'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ case "$XMLCONFIG" in
-+ /*)
-+ ac_cv_path_XMLCONFIG="$XMLCONFIG" # Let the user override the test with a path.
-+ ;;
-+ ?:/*)
-+ ac_cv_path_XMLCONFIG="$XMLCONFIG" # 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_XMLCONFIG="$ac_dir/$ac_word"
-+ break
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+ ;;
-+esac
-+fi
-+XMLCONFIG="$ac_cv_path_XMLCONFIG"
-+if test -n "$XMLCONFIG"; then
-+ echo "$ac_t""$XMLCONFIG" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
++ AC_TRY_COMPILE([ #include <sys/prctl.h> ], [prctl(0, 0, 0, 0, 0);], [
++ AC_DEFINE([HAVE_PRCTL], 1, [do we have prctl?])
++ AC_MSG_RESULT([yes])
++ ], [
++ AC_MSG_RESULT([no])
++ ])
++])
+
-+test -n "$XMLCONFIG" && break
-+done
-+test -n "$XMLCONFIG" || XMLCONFIG=""""
++AC_DEFUN([AC_FPM_CLOCK],
++[
++ have_clock_gettime=no
+
-+
-+fi
++ AC_MSG_CHECKING([for clock_gettime])
+
++ AC_TRY_LINK([ #include <time.h> ], [struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);], [
++ have_clock_gettime=yes
++ AC_MSG_RESULT([yes])
++ ], [
++ AC_MSG_RESULT([no])
++ ])
+
-+ if test "x$XMLCONFIG" = "x"; then
-+ { echo "configure: error: XML configuration could not be found" 1>&2; exit 1; }
-+ else
-+ echo $ac_n "checking for libxml library""... $ac_c" 1>&6
-+echo "configure:12804: checking for libxml library" >&5
++ if test "$have_clock_gettime" = "no"; then
++ AC_MSG_CHECKING([for clock_gettime in -lrt])
+
-+ if test ! -x "$XMLCONFIG"; then
-+ { echo "configure: error: $XMLCONFIG cannot be executed" 1>&2; exit 1; }
-+ fi
++ SAVED_LIBS="$LIBS"
++ LIBS="$LIBS -lrt"
+
-+ LIBXML_LIBS="`$XMLCONFIG --libs`"
-+ LIBXML_CFLAGS="`$XMLCONFIG --cflags`"
-+ LIBXML_VERSION="`$XMLCONFIG --version`"
++ AC_TRY_LINK([ #include <time.h> ], [struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);], [
++ have_clock_gettime=yes
++ AC_MSG_RESULT([yes])
++ ], [
++ LIBS="$SAVED_LIBS"
++ AC_MSG_RESULT([no])
++ ])
++ fi
+
-+ echo "$ac_t""yes, $LIBXML_VERSION" 1>&6
++ if test "$have_clock_gettime" = "yes"; then
++ AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [do we have clock_gettime?])
++ fi
+
-+
-+ SAVED_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $LIBXML_CFLAGS"
-+ SAVED_LIBS="$LIBS"
-+ LIBS="$LIBS $LIBXML_LIBS"
-+
-+ echo $ac_n "checking for xmlParseFile""... $ac_c" 1>&6
-+echo "configure:12823: checking for xmlParseFile" >&5
-+if eval "test \"`echo '$''{'ac_cv_func_xmlParseFile'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 12828 "configure"
-+#include "confdefs.h"
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char xmlParseFile(); below. */
-+#include <assert.h>
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char xmlParseFile();
-+
-+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_xmlParseFile) || defined (__stub___xmlParseFile)
-+choke me
-+#else
-+xmlParseFile();
-+#endif
++ have_clock_get_time=no
+
-+; return 0; }
-+EOF
-+if { (eval echo configure:12851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_func_xmlParseFile=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_func_xmlParseFile=no"
-+fi
-+rm -f conftest*
-+fi
++ if test "$have_clock_gettime" = "no"; then
++ AC_MSG_CHECKING([for clock_get_time])
+
-+if eval "test \"`echo '$ac_cv_func_'xmlParseFile`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ :
-+else
-+ echo "$ac_t""no" 1>&6
-+{ echo "configure: error: Failed to link with libxml" 1>&2; exit 1; }
-+fi
++ AC_TRY_RUN([ #include <mach/mach.h>
++ #include <mach/clock.h>
++ #include <mach/mach_error.h>
+
++ int main()
++ {
++ kern_return_t ret; clock_serv_t aClock; mach_timespec_t aTime;
++ ret = host_get_clock_service(mach_host_self(), REALTIME_CLOCK, &aClock);
+
-+ CFLAGS="$SAVED_CFLAGS"
-+ LIBS="$SAVED_LIBS"
++ if (ret != KERN_SUCCESS) {
++ return 1;
++ }
+
++ ret = clock_get_time(aClock, &aTime);
++ if (ret != KERN_SUCCESS) {
++ return 2;
++ }
+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_LIBXML 1
-+EOF
++ return 0;
++ }
++ ], [
++ have_clock_get_time=yes
++ AC_MSG_RESULT([yes])
++ ], [
++ AC_MSG_RESULT([no])
++ ])
++ fi
+
++ if test "$have_clock_get_time" = "yes"; then
++ AC_DEFINE([HAVE_CLOCK_GET_TIME], 1, [do we have clock_get_time?])
+ fi
++])
+
++AC_DEFUN([AC_FPM_TRACE],
++[
++ have_ptrace=no
++ have_broken_ptrace=no
++
++ AC_MSG_CHECKING([for ptrace])
++
++ AC_TRY_COMPILE([
++ #include <sys/types.h>
++ #include <sys/ptrace.h> ], [ptrace(0, 0, (void *) 0, 0);], [
++ have_ptrace=yes
++ AC_MSG_RESULT([yes])
++ ], [
++ AC_MSG_RESULT([no])
++ ])
+
-+LIBEVENT_CFLAGS="-I$abs_srcdir/libevent"
-+LIBEVENT_LIBS="$abs_builddir/libevent/libevent.la"
++ if test "$have_ptrace" = "yes"; then
++ AC_MSG_CHECKING([whether ptrace works])
+
-+SAPI_EXTRA_DEPS="$LIBEVENT_LIBS"
++ AC_TRY_RUN([
++ #include <unistd.h>
++ #include <signal.h>
++ #include <sys/wait.h>
++ #include <sys/types.h>
++ #include <sys/ptrace.h>
++ #include <errno.h>
+
-+FPM_SOURCES="fpm.c fpm_conf.c fpm_signals.c fpm_children.c fpm_worker_pool.c fpm_unix.c fpm_cleanup.c \
-+ fpm_sockets.c fpm_stdio.c fpm_env.c fpm_events.c fpm_php.c fpm_process_ctl.c fpm_shm.c xml_config.c zlog.c"
++ #if !defined(PTRACE_ATTACH) && defined(PT_ATTACH)
++ #define PTRACE_ATTACH PT_ATTACH
++ #endif
+
-+FPM_CFLAGS="$LIBEVENT_CFLAGS $LIBXML_CFLAGS $JUDY_CFLAGS"
-+SAPI_EXTRA_LIBS="$LIBEVENT_LIBS $LIBXML_LIBS $JUDY_LIBS"
++ #if !defined(PTRACE_DETACH) && defined(PT_DETACH)
++ #define PTRACE_DETACH PT_DETACH
++ #endif
+
-+FPM_CFLAGS="$FPM_CFLAGS -I$abs_srcdir/sapi/cgi" # for fastcgi.h
++ #if !defined(PTRACE_PEEKDATA) && defined(PT_READ_D)
++ #define PTRACE_PEEKDATA PT_READ_D
++ #endif
+
-+if [ "x$CC" = "xgcc" ] ; then
-+ FPM_CFLAGS="-W -Wall -Wpointer-arith -Wno-unused-parameter -Wno-unused-function -Wunused-variable -Wunused-value $FPM_CFLAGS"
-+fi
++ int main()
++ {
++ long v1 = (unsigned int) -1; /* copy will fail if sizeof(long) == 8 and we've got "int ptrace()" */
++ long v2;
++ pid_t child;
++ int status;
+
++ if ( (child = fork()) ) { /* parent */
++ int ret = 0;
+
-+ src=$abs_srcdir/sapi/cgi/fpm/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 (0 > ptrace(PTRACE_ATTACH, child, 0, 0)) {
++ return 1;
++ }
+
++ waitpid(child, &status, 0);
+
++ #ifdef PT_IO
++ struct ptrace_io_desc ptio = {
++ .piod_op = PIOD_READ_D,
++ .piod_offs = &v1,
++ .piod_addr = &v2,
++ .piod_len = sizeof(v1)
++ };
+
-+
-+ case sapi/cgi/fpm in
-+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
-+ /*) ac_srcdir=`echo "sapi/cgi/fpm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
-+ *) ac_srcdir="$abs_srcdir/sapi/cgi/fpm/"; ac_bdir="sapi/cgi/fpm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
-+ esac
-+
-+
++ if (0 > ptrace(PT_IO, child, (void *) &ptio, 0)) {
++ ret = 1;
++ }
++ #else
++ errno = 0;
+
-+ 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
++ v2 = ptrace(PTRACE_PEEKDATA, child, (void *) &v1, 0);
+
++ if (errno) {
++ ret = 1;
++ }
++ #endif
++ ptrace(PTRACE_DETACH, child, (void *) 1, 0);
+
-+ old_IFS=$IFS
-+ for ac_src in $FPM_SOURCES; do
-+
-+ IFS=.
-+ set $ac_src
-+ ac_obj=$1
-+ IFS=$old_IFS
-+
-+ PHP_SAPI_OBJS="$PHP_SAPI_OBJS $ac_bdir$ac_obj.lo"
++ kill(child, SIGKILL);
+
-+ case $ac_src in
-+ *.c) ac_comp="$b_c_pre $FPM_CFLAGS $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 $FPM_CFLAGS $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 $FPM_CFLAGS $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 $FPM_CFLAGS $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-+ esac
++ return ret ? ret : (v1 != v2);
++ }
++ else { /* child */
++ sleep(10);
++ return 0;
++ }
++ }
++ ], [
++ AC_MSG_RESULT([yes])
++ ], [
++ have_ptrace=no
++ have_broken_ptrace=yes
++ AC_MSG_RESULT([no])
++ ])
++ fi
+
-+ cat >>Makefile.objects<<EOF
-+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-+ $ac_comp
-+EOF
-+ done
++ if test "$have_ptrace" = "yes"; then
++ AC_DEFINE([HAVE_PTRACE], 1, [do we have ptrace?])
++ fi
+
++ have_mach_vm_read=no
+
++ if test "$have_broken_ptrace" = "yes"; then
++ AC_MSG_CHECKING([for mach_vm_read])
+
++ AC_TRY_COMPILE([ #include <mach/mach.h>
++ #include <mach/mach_vm.h>
++ ], [
++ mach_vm_read((vm_map_t)0, (mach_vm_address_t)0, (mach_vm_size_t)0, (vm_offset_t *)0, (mach_msg_type_number_t*)0);
++ ], [
++ have_mach_vm_read=yes
++ AC_MSG_RESULT([yes])
++ ], [
++ AC_MSG_RESULT([no])
++ ])
++ fi
+
-+
-+ BUILD_DIR="$BUILD_DIR sapi/cgi/fpm"
-+
++ if test "$have_mach_vm_read" = "yes"; then
++ AC_DEFINE([HAVE_MACH_VM_READ], 1, [do we have mach_vm_read?])
++ fi
+
++ proc_mem_file=""
+
-+install_fpm="install-fpm"
++ if test -r /proc/$$/mem ; then
++ proc_mem_file="mem"
++ else
++ if test -r /proc/$$/as ; then
++ proc_mem_file="as"
++ fi
++ fi
+
++ if test -n "$proc_mem_file" ; then
++ AC_MSG_CHECKING([for proc mem file])
++
++ AC_TRY_RUN([
++ #define _GNU_SOURCE
++ #define _FILE_OFFSET_BITS 64
++ #if HAVE_INTTYPES_H
++ #include <inttypes.h>
++ #else
++ #include <stdint.h>
++ #endif
++
++ #include <unistd.h>
++ #include <sys/types.h>
++ #include <sys/stat.h>
++ #include <fcntl.h>
++ #include <stdio.h>
++ int main()
++ {
++ long v1 = (unsigned int) -1, v2 = 0;
++ char buf[128];
++ int fd;
++ sprintf(buf, "/proc/%d/$proc_mem_file", getpid());
++ fd = open(buf, O_RDONLY);
++ if (0 > fd) {
++ return 1;
++ }
++ if (sizeof(long) != pread(fd, &v2, sizeof(long), (uintptr_t) &v1)) {
++ close(fd);
++ return 1;
++ }
++ close(fd);
++ return v1 != v2;
++ }
++ ], [
++ AC_MSG_RESULT([$proc_mem_file])
++ ], [
++ proc_mem_file=""
++ AC_MSG_RESULT([no])
++ ])
++ fi
++
++ if test -n "$proc_mem_file"; then
++ AC_DEFINE_UNQUOTED([PROC_MEM_FILE], "$proc_mem_file", [/proc/pid/mem interface])
++ fi
++
++ fpm_trace_type=""
+
-+ echo "$ac_t""" 1>&6
-+ echo "$ac_t""${T_MD}Configuring libevent${T_ME}" 1>&6
++ if test "$have_ptrace" = "yes"; then
++ fpm_trace_type=ptrace
++
++ elif test -n "$proc_mem_file"; then
++ fpm_trace_type=pread
++
++ elif test "$have_mach_vm_read" = "yes" ; then
++ fpm_trace_type=mach
++
++ else
++ AC_MSG_ERROR([FPM Trace - ptrace, pread, or mach: could not be found])
++ fi
++
++])
+
+diff -Naur php-src-vanilla/sapi/fpm/ac/fpm_conf.m4 php-src/sapi/fpm/ac/fpm_conf.m4
+--- php-src-vanilla/sapi/fpm/ac/fpm_conf.m4 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/ac/fpm_conf.m4 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,188 @@
+
-+test -d "$abs_builddir/libevent" || mkdir -p $abs_builddir/libevent
++AC_DEFUN([AC_FPM_ARGS],
++[
++ PHP_ARG_WITH(fpm-bin,,
++ [ --with-fpm-bin[=PATH] Set the path for the php-fpm binary [/usr/local/bin/php-fpm]], yes, no)
+
++ PHP_ARG_WITH(fpm-port,,
++ [ --with-fpm-port[=PORT] Set the tcp port number to listen for cgi requests [9000]], yes, no)
+
-+chmod +x "$abs_srcdir/libevent/configure" \
-+ "$abs_srcdir/libevent/config.guess" \
-+ "$abs_srcdir/libevent/config.sub" \
-+ "$abs_srcdir/libevent/depcomp" \
-+ "$abs_srcdir/libevent/install-sh" \
-+ "$abs_srcdir/libevent/missing" \
-+ "$abs_srcdir/libevent/mkinstalldirs"
++ PHP_ARG_WITH(fpm-conf,,
++ [ --with-fpm-conf[=PATH] Set the path for php-fpm configuration file [/etc/php-fpm.conf]], yes, no)
+
-+libevent_configure="cd $abs_builddir/libevent ; $abs_srcdir/libevent/configure --disable-shared"
++ PHP_ARG_WITH(fpm-init,,
++ [ --with-fpm-init[=PATH] Set the path for php-fpm init file [/etc/init.d/php-fpm]], yes, no)
+
-+(eval $libevent_configure)
++ PHP_ARG_WITH(fpm-log,,
++ [ --with-fpm-log[=PATH] Set the path for php-fpm log file [/var/log/php-fpm.log]], yes, no)
+
-+if [ ! -f "$abs_builddir/libevent/Makefile" ] ; then
-+ echo "Failed to configure libevent" >&2
-+ exit 1
-+fi
++ PHP_ARG_WITH(fpm-pid,,
++ [ --with-fpm-pid[=PATH] Set the path for php-fpm pid file [/var/run/php-fpm.pid]], yes, no)
+
++ PHP_ARG_WITH(fpm-user,,
++ [ --with-fpm-user[=USER] Set the user for php-fpm to run as [nobody]], yes, no)
+
-+fi
++ PHP_ARG_WITH(fpm-group,,
++ [ --with-fpm-group[=GRP] Set the group for php-fpm to run as. For a system user,
++ this should be set to match the fpm username [nobody]], yes, no)
++])
+
-
-
-
-@@ -12695,7 +12998,7 @@
- # 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:12699: checking for $ac_word" >&5
-+echo "configure:13002: 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
-@@ -12734,7 +13037,7 @@
-
-
- echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6
--echo "configure:12738: checking whether system uses EBCDIC" >&5
-+echo "configure:13041: 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
-@@ -12745,7 +13048,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 12749 "configure"
-+#line 13052 "configure"
- #include "confdefs.h"
-
- int main(void) {
-@@ -12753,7 +13056,7 @@
- }
-
- EOF
--if { (eval echo configure:12757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:13060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- ac_cv_ebcdic=yes
-@@ -12781,7 +13084,7 @@
-
-
- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
--echo "configure:12785: checking whether byte ordering is bigendian" >&5
-+echo "configure:13088: 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
-@@ -12791,7 +13094,7 @@
- ac_cv_c_bigendian_php=unknown
- else
- cat > conftest.$ac_ext <<EOF
--#line 12795 "configure"
-+#line 13098 "configure"
- #include "confdefs.h"
-
- int main(void)
-@@ -12807,7 +13110,7 @@
- }
-
- EOF
--if { (eval echo configure:12811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:13114: \"$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
-@@ -12833,7 +13136,7 @@
-
-
- echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6
--echo "configure:12837: checking whether writing to stdout works" >&5
-+echo "configure:13140: 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
-@@ -12844,7 +13147,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 12848 "configure"
-+#line 13151 "configure"
- #include "confdefs.h"
-
- #ifdef HAVE_UNISTD_H
-@@ -12862,7 +13165,7 @@
- }
-
- EOF
--if { (eval echo configure:12866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:13169: \"$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
-@@ -12937,12 +13240,12 @@
- unset found
-
- echo $ac_n "checking for socket""... $ac_c" 1>&6
--echo "configure:12941: checking for socket" >&5
-+echo "configure:13244: checking for socket" >&5
- if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 12946 "configure"
-+#line 13249 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char socket(); below. */
-@@ -12965,7 +13268,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:12969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13272: \"$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
-@@ -12983,12 +13286,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __socket""... $ac_c" 1>&6
--echo "configure:12987: checking for __socket" >&5
-+echo "configure:13290: checking for __socket" >&5
- if eval "test \"`echo '$''{'ac_cv_func___socket'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 12992 "configure"
-+#line 13295 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __socket(); below. */
-@@ -13011,7 +13314,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:13015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13318: \"$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
-@@ -13049,7 +13352,7 @@
- unset ac_cv_lib_socket___socket
- unset found
- echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:13053: checking for socket in -lsocket" >&5
-+echo "configure:13356: 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
-@@ -13057,7 +13360,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 13061 "configure"
-+#line 13364 "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
-@@ -13068,7 +13371,7 @@
- socket()
- ; return 0; }
- EOF
--if { (eval echo configure:13072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -13088,7 +13391,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6
--echo "configure:13092: checking for __socket in -lsocket" >&5
-+echo "configure:13395: 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
-@@ -13096,7 +13399,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 13100 "configure"
-+#line 13403 "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
-@@ -13107,7 +13410,7 @@
- __socket()
- ; return 0; }
- EOF
--if { (eval echo configure:13111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -13139,11 +13442,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 13143 "configure"
-+#line 13446 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:13147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:13450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -13194,12 +13497,12 @@
- unset found
-
- echo $ac_n "checking for socketpair""... $ac_c" 1>&6
--echo "configure:13198: checking for socketpair" >&5
-+echo "configure:13501: checking for socketpair" >&5
- if eval "test \"`echo '$''{'ac_cv_func_socketpair'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 13203 "configure"
-+#line 13506 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char socketpair(); below. */
-@@ -13222,7 +13525,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:13226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13529: \"$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
-@@ -13240,12 +13543,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __socketpair""... $ac_c" 1>&6
--echo "configure:13244: checking for __socketpair" >&5
-+echo "configure:13547: checking for __socketpair" >&5
- if eval "test \"`echo '$''{'ac_cv_func___socketpair'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 13249 "configure"
-+#line 13552 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __socketpair(); below. */
-@@ -13268,7 +13571,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:13272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13575: \"$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
-@@ -13306,7 +13609,7 @@
- unset ac_cv_lib_socket___socketpair
- unset found
- echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6
--echo "configure:13310: checking for socketpair in -lsocket" >&5
-+echo "configure:13613: 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
-@@ -13314,7 +13617,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 13318 "configure"
-+#line 13621 "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
-@@ -13325,7 +13628,7 @@
- socketpair()
- ; return 0; }
- EOF
--if { (eval echo configure:13329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -13345,7 +13648,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6
--echo "configure:13349: checking for __socketpair in -lsocket" >&5
-+echo "configure:13652: 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
-@@ -13353,7 +13656,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 13357 "configure"
-+#line 13660 "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
-@@ -13364,7 +13667,7 @@
- __socketpair()
- ; return 0; }
- EOF
--if { (eval echo configure:13368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -13396,11 +13699,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 13400 "configure"
-+#line 13703 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:13404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:13707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -13451,12 +13754,12 @@
- unset found
-
- echo $ac_n "checking for htonl""... $ac_c" 1>&6
--echo "configure:13455: checking for htonl" >&5
-+echo "configure:13758: checking for htonl" >&5
- if eval "test \"`echo '$''{'ac_cv_func_htonl'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 13460 "configure"
-+#line 13763 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char htonl(); below. */
-@@ -13479,7 +13782,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:13483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13786: \"$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
-@@ -13497,12 +13800,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __htonl""... $ac_c" 1>&6
--echo "configure:13501: checking for __htonl" >&5
-+echo "configure:13804: checking for __htonl" >&5
- if eval "test \"`echo '$''{'ac_cv_func___htonl'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 13506 "configure"
-+#line 13809 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __htonl(); below. */
-@@ -13525,7 +13828,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:13529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13832: \"$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
-@@ -13563,7 +13866,7 @@
- unset ac_cv_lib_socket___htonl
- unset found
- echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6
--echo "configure:13567: checking for htonl in -lsocket" >&5
-+echo "configure:13870: 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
-@@ -13571,7 +13874,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 13575 "configure"
-+#line 13878 "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
-@@ -13582,7 +13885,7 @@
- htonl()
- ; return 0; }
- EOF
--if { (eval echo configure:13586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -13602,7 +13905,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6
--echo "configure:13606: checking for __htonl in -lsocket" >&5
-+echo "configure:13909: 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
-@@ -13610,7 +13913,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 13614 "configure"
-+#line 13917 "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
-@@ -13621,7 +13924,7 @@
- __htonl()
- ; return 0; }
- EOF
--if { (eval echo configure:13625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:13928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -13653,11 +13956,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 13657 "configure"
-+#line 13960 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:13661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:13964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -13708,12 +14011,12 @@
- unset found
-
- echo $ac_n "checking for gethostname""... $ac_c" 1>&6
--echo "configure:13712: checking for gethostname" >&5
-+echo "configure:14015: checking for gethostname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 13717 "configure"
-+#line 14020 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostname(); below. */
-@@ -13736,7 +14039,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:13740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14043: \"$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
-@@ -13754,12 +14057,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __gethostname""... $ac_c" 1>&6
--echo "configure:13758: checking for __gethostname" >&5
-+echo "configure:14061: checking for __gethostname" >&5
- if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 13763 "configure"
-+#line 14066 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __gethostname(); below. */
-@@ -13782,7 +14085,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:13786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14089: \"$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
-@@ -13820,7 +14123,7 @@
- unset ac_cv_lib_nsl___gethostname
- unset found
- echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
--echo "configure:13824: checking for gethostname in -lnsl" >&5
-+echo "configure:14127: 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
-@@ -13828,7 +14131,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 13832 "configure"
-+#line 14135 "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
-@@ -13839,7 +14142,7 @@
- gethostname()
- ; return 0; }
- EOF
--if { (eval echo configure:13843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -13859,7 +14162,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6
--echo "configure:13863: checking for __gethostname in -lnsl" >&5
-+echo "configure:14166: 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
-@@ -13867,7 +14170,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 13871 "configure"
-+#line 14174 "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
-@@ -13878,7 +14181,7 @@
- __gethostname()
- ; return 0; }
- EOF
--if { (eval echo configure:13882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -13910,11 +14213,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 13914 "configure"
-+#line 14217 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:13918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:14221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -13965,12 +14268,12 @@
- unset found
-
- echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6
--echo "configure:13969: checking for gethostbyaddr" >&5
-+echo "configure:14272: checking for gethostbyaddr" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 13974 "configure"
-+#line 14277 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyaddr(); below. */
-@@ -13993,7 +14296,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:13997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14300: \"$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
-@@ -14011,12 +14314,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6
--echo "configure:14015: checking for __gethostbyaddr" >&5
-+echo "configure:14318: checking for __gethostbyaddr" >&5
- if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 14020 "configure"
-+#line 14323 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __gethostbyaddr(); below. */
-@@ -14039,7 +14342,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:14043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14346: \"$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
-@@ -14077,7 +14380,7 @@
- unset ac_cv_lib_nsl___gethostbyaddr
- unset found
- echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
--echo "configure:14081: checking for gethostbyaddr in -lnsl" >&5
-+echo "configure:14384: 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
-@@ -14085,7 +14388,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 14089 "configure"
-+#line 14392 "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
-@@ -14096,7 +14399,7 @@
- gethostbyaddr()
- ; return 0; }
- EOF
--if { (eval echo configure:14100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -14116,7 +14419,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6
--echo "configure:14120: checking for __gethostbyaddr in -lnsl" >&5
-+echo "configure:14423: 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
-@@ -14124,7 +14427,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 14128 "configure"
-+#line 14431 "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
-@@ -14135,7 +14438,7 @@
- __gethostbyaddr()
- ; return 0; }
- EOF
--if { (eval echo configure:14139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -14167,11 +14470,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 14171 "configure"
-+#line 14474 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:14175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:14478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -14222,12 +14525,12 @@
- unset found
-
- echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6
--echo "configure:14226: checking for yp_get_default_domain" >&5
-+echo "configure:14529: checking for yp_get_default_domain" >&5
- if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 14231 "configure"
-+#line 14534 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char yp_get_default_domain(); below. */
-@@ -14250,7 +14553,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:14254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14557: \"$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
-@@ -14268,12 +14571,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6
--echo "configure:14272: checking for __yp_get_default_domain" >&5
-+echo "configure:14575: checking for __yp_get_default_domain" >&5
- if eval "test \"`echo '$''{'ac_cv_func___yp_get_default_domain'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 14277 "configure"
-+#line 14580 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __yp_get_default_domain(); below. */
-@@ -14296,7 +14599,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:14300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14603: \"$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
-@@ -14334,7 +14637,7 @@
- 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:14338: checking for yp_get_default_domain in -lnsl" >&5
-+echo "configure:14641: 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
-@@ -14342,7 +14645,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 14346 "configure"
-+#line 14649 "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
-@@ -14353,7 +14656,7 @@
- yp_get_default_domain()
- ; return 0; }
- EOF
--if { (eval echo configure:14357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -14373,7 +14676,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6
--echo "configure:14377: checking for __yp_get_default_domain in -lnsl" >&5
-+echo "configure:14680: 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
-@@ -14381,7 +14684,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 14385 "configure"
-+#line 14688 "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
-@@ -14392,7 +14695,7 @@
- __yp_get_default_domain()
- ; return 0; }
- EOF
--if { (eval echo configure:14396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -14424,11 +14727,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 14428 "configure"
-+#line 14731 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:14432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:14735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -14480,12 +14783,12 @@
- unset found
-
- echo $ac_n "checking for dlopen""... $ac_c" 1>&6
--echo "configure:14484: checking for dlopen" >&5
-+echo "configure:14787: checking for dlopen" >&5
- if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 14489 "configure"
-+#line 14792 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen(); below. */
-@@ -14508,7 +14811,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:14512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14815: \"$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
-@@ -14526,12 +14829,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __dlopen""... $ac_c" 1>&6
--echo "configure:14530: checking for __dlopen" >&5
-+echo "configure:14833: checking for __dlopen" >&5
- if eval "test \"`echo '$''{'ac_cv_func___dlopen'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 14535 "configure"
-+#line 14838 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __dlopen(); below. */
-@@ -14554,7 +14857,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:14558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14861: \"$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
-@@ -14592,7 +14895,7 @@
- unset ac_cv_lib_dl___dlopen
- unset found
- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:14596: checking for dlopen in -ldl" >&5
-+echo "configure:14899: 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
-@@ -14600,7 +14903,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 14604 "configure"
-+#line 14907 "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
-@@ -14611,7 +14914,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:14615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -14631,7 +14934,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:14635: checking for __dlopen in -ldl" >&5
-+echo "configure:14938: 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
-@@ -14639,7 +14942,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 14643 "configure"
-+#line 14946 "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
-@@ -14650,7 +14953,7 @@
- __dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:14654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -14682,11 +14985,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 14686 "configure"
-+#line 14989 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:14690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:14993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -14738,7 +15041,7 @@
-
- fi
- echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
--echo "configure:14742: checking for sin in -lm" >&5
-+echo "configure:15045: 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
-@@ -14746,7 +15049,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lm $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 14750 "configure"
-+#line 15053 "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
-@@ -14757,7 +15060,7 @@
- sin()
- ; return 0; }
- EOF
--if { (eval echo configure:14761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -14791,12 +15094,12 @@
- unset found
-
- echo $ac_n "checking for res_search""... $ac_c" 1>&6
--echo "configure:14795: checking for res_search" >&5
-+echo "configure:15098: checking for res_search" >&5
- if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 14800 "configure"
-+#line 15103 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char res_search(); below. */
-@@ -14819,7 +15122,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:14823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15126: \"$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
-@@ -14837,12 +15140,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __res_search""... $ac_c" 1>&6
--echo "configure:14841: checking for __res_search" >&5
-+echo "configure:15144: checking for __res_search" >&5
- if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 14846 "configure"
-+#line 15149 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __res_search(); below. */
-@@ -14865,7 +15168,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:14869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15172: \"$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
-@@ -14903,7 +15206,7 @@
- unset ac_cv_lib_resolv___res_search
- unset found
- echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
--echo "configure:14907: checking for res_search in -lresolv" >&5
-+echo "configure:15210: 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
-@@ -14911,7 +15214,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 14915 "configure"
-+#line 15218 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -14922,7 +15225,7 @@
- res_search()
- ; return 0; }
- EOF
--if { (eval echo configure:14926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -14942,7 +15245,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6
--echo "configure:14946: checking for __res_search in -lresolv" >&5
-+echo "configure:15249: 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
-@@ -14950,7 +15253,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 14954 "configure"
-+#line 15257 "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
-@@ -14961,7 +15264,7 @@
- __res_search()
- ; return 0; }
- EOF
--if { (eval echo configure:14965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -14993,11 +15296,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 14997 "configure"
-+#line 15300 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:15001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:15304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -15039,7 +15342,7 @@
- unset ac_cv_lib_bind___res_search
- unset found
- echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6
--echo "configure:15043: checking for res_search in -lbind" >&5
-+echo "configure:15346: 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
-@@ -15047,7 +15350,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 15051 "configure"
-+#line 15354 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -15058,7 +15361,7 @@
- res_search()
- ; return 0; }
- EOF
--if { (eval echo configure:15062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -15078,7 +15381,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6
--echo "configure:15082: checking for __res_search in -lbind" >&5
-+echo "configure:15385: 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
-@@ -15086,7 +15389,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 15090 "configure"
-+#line 15393 "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
-@@ -15097,7 +15400,7 @@
- __res_search()
- ; return 0; }
- EOF
--if { (eval echo configure:15101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -15129,11 +15432,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 15133 "configure"
-+#line 15436 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:15137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:15440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -15175,7 +15478,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:15179: checking for res_search in -lsocket" >&5
-+echo "configure:15482: 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
-@@ -15183,7 +15486,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 15187 "configure"
-+#line 15490 "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
-@@ -15194,7 +15497,7 @@
- res_search()
- ; return 0; }
- EOF
--if { (eval echo configure:15198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -15214,7 +15517,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6
--echo "configure:15218: checking for __res_search in -lsocket" >&5
-+echo "configure:15521: 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
-@@ -15222,7 +15525,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 15226 "configure"
-+#line 15529 "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
-@@ -15233,7 +15536,7 @@
- __res_search()
- ; return 0; }
- EOF
--if { (eval echo configure:15237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -15265,11 +15568,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 15269 "configure"
-+#line 15572 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:15273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:15576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -15327,12 +15630,12 @@
- unset found
-
- echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
--echo "configure:15331: checking for inet_aton" >&5
-+echo "configure:15634: checking for inet_aton" >&5
- if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 15336 "configure"
-+#line 15639 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char inet_aton(); below. */
-@@ -15355,7 +15658,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:15359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15662: \"$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
-@@ -15373,12 +15676,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6
--echo "configure:15377: checking for __inet_aton" >&5
-+echo "configure:15680: checking for __inet_aton" >&5
- if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 15382 "configure"
-+#line 15685 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __inet_aton(); below. */
-@@ -15401,7 +15704,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:15405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15708: \"$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
-@@ -15439,7 +15742,7 @@
- unset ac_cv_lib_resolv___inet_aton
- unset found
- echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
--echo "configure:15443: checking for inet_aton in -lresolv" >&5
-+echo "configure:15746: 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
-@@ -15447,7 +15750,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 15451 "configure"
-+#line 15754 "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
-@@ -15458,7 +15761,7 @@
- inet_aton()
- ; return 0; }
- EOF
--if { (eval echo configure:15462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -15478,7 +15781,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6
--echo "configure:15482: checking for __inet_aton in -lresolv" >&5
-+echo "configure:15785: 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
-@@ -15486,7 +15789,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 15490 "configure"
-+#line 15793 "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
-@@ -15497,7 +15800,7 @@
- __inet_aton()
- ; return 0; }
- EOF
--if { (eval echo configure:15501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -15529,11 +15832,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 15533 "configure"
-+#line 15836 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:15537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:15840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -15575,7 +15878,7 @@
- unset ac_cv_lib_bind___inet_aton
- unset found
- echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6
--echo "configure:15579: checking for inet_aton in -lbind" >&5
-+echo "configure:15882: 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
-@@ -15583,7 +15886,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 15587 "configure"
-+#line 15890 "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
-@@ -15594,7 +15897,7 @@
- inet_aton()
- ; return 0; }
- EOF
--if { (eval echo configure:15598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -15614,7 +15917,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6
--echo "configure:15618: checking for __inet_aton in -lbind" >&5
-+echo "configure:15921: 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
-@@ -15622,7 +15925,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 15626 "configure"
-+#line 15929 "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
-@@ -15633,7 +15936,7 @@
- __inet_aton()
- ; return 0; }
- EOF
--if { (eval echo configure:15637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -15665,11 +15968,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 15669 "configure"
-+#line 15972 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:15673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:15976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -15723,12 +16026,12 @@
- unset found
-
- echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6
--echo "configure:15727: checking for dn_skipname" >&5
-+echo "configure:16030: checking for dn_skipname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 15732 "configure"
-+#line 16035 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dn_skipname(); below. */
-@@ -15751,7 +16054,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:15755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16058: \"$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
-@@ -15769,12 +16072,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6
--echo "configure:15773: checking for __dn_skipname" >&5
-+echo "configure:16076: checking for __dn_skipname" >&5
- if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 15778 "configure"
-+#line 16081 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __dn_skipname(); below. */
-@@ -15797,7 +16100,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:15801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16104: \"$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
-@@ -15835,7 +16138,7 @@
- unset ac_cv_lib_resolv___dn_skipname
- unset found
- echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6
--echo "configure:15839: checking for dn_skipname in -lresolv" >&5
-+echo "configure:16142: 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
-@@ -15843,7 +16146,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 15847 "configure"
-+#line 16150 "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
-@@ -15854,7 +16157,7 @@
- dn_skipname()
- ; return 0; }
- EOF
--if { (eval echo configure:15858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -15874,7 +16177,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6
--echo "configure:15878: checking for __dn_skipname in -lresolv" >&5
-+echo "configure:16181: 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
-@@ -15882,7 +16185,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 15886 "configure"
-+#line 16189 "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
-@@ -15893,7 +16196,7 @@
- __dn_skipname()
- ; return 0; }
- EOF
--if { (eval echo configure:15897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -15925,11 +16228,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 15929 "configure"
-+#line 16232 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:15933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:16236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -15971,7 +16274,7 @@
- unset ac_cv_lib_bind___dn_skipname
- unset found
- echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6
--echo "configure:15975: checking for dn_skipname in -lbind" >&5
-+echo "configure:16278: 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
-@@ -15979,7 +16282,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 15983 "configure"
-+#line 16286 "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
-@@ -15990,7 +16293,7 @@
- dn_skipname()
- ; return 0; }
- EOF
--if { (eval echo configure:15994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -16010,7 +16313,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
--echo "configure:16014: checking for __dn_skipname in -lbind" >&5
-+echo "configure:16317: 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
-@@ -16018,7 +16321,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 16022 "configure"
-+#line 16325 "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
-@@ -16029,7 +16332,7 @@
- __dn_skipname()
- ; return 0; }
- EOF
--if { (eval echo configure:16033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -16061,11 +16364,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 16065 "configure"
-+#line 16368 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:16069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:16372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -16117,12 +16420,12 @@
-
-
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:16121: checking for ANSI C header files" >&5
-+echo "configure:16424: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 16126 "configure"
-+#line 16429 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -16130,7 +16433,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:16134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:16437: \"$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*
-@@ -16147,7 +16450,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
--#line 16151 "configure"
-+#line 16454 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -16165,7 +16468,7 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 16169 "configure"
-+#line 16472 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -16186,7 +16489,7 @@
- :
- else
- cat > conftest.$ac_ext <<EOF
--#line 16190 "configure"
-+#line 16493 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -16197,7 +16500,7 @@
- exit (0); }
-
- EOF
--if { (eval echo configure:16201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:16504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -16225,12 +16528,12 @@
- 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:16229: checking for $ac_hdr that defines DIR" >&5
-+echo "configure:16532: checking for $ac_hdr that defines DIR" >&5
- if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 16234 "configure"
-+#line 16537 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -16238,7 +16541,7 @@
- DIR *dirp = 0;
- ; return 0; }
- EOF
--if { (eval echo configure:16242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- eval "ac_cv_header_dirent_$ac_safe=yes"
- else
-@@ -16263,7 +16566,7 @@
- # 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:16267: checking for opendir in -ldir" >&5
-+echo "configure:16570: 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
-@@ -16271,7 +16574,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldir $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 16275 "configure"
-+#line 16578 "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
-@@ -16282,7 +16585,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:16286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -16304,7 +16607,7 @@
-
- else
- echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
--echo "configure:16308: checking for opendir in -lx" >&5
-+echo "configure:16611: 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
-@@ -16312,7 +16615,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lx $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 16316 "configure"
-+#line 16619 "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
-@@ -16323,7 +16626,7 @@
- opendir()
- ; return 0; }
- EOF
--if { (eval echo configure:16327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -16405,17 +16708,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:16409: checking for $ac_hdr" >&5
-+echo "configure:16712: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 16414 "configure"
-+#line 16717 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:16419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:16722: \"$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*
-@@ -16444,12 +16747,12 @@
-
-
- echo $ac_n "checking for fopencookie""... $ac_c" 1>&6
--echo "configure:16448: checking for fopencookie" >&5
-+echo "configure:16751: checking for fopencookie" >&5
- if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 16453 "configure"
-+#line 16756 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char fopencookie(); below. */
-@@ -16472,7 +16775,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:16476: \"$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_func_fopencookie=yes"
- else
-@@ -16494,7 +16797,7 @@
-
- if test "$have_glibc_fopencookie" = "yes"; then
- cat > conftest.$ac_ext <<EOF
--#line 16498 "configure"
-+#line 16801 "configure"
- #include "confdefs.h"
-
- #define _GNU_SOURCE
-@@ -16504,7 +16807,7 @@
- cookie_io_functions_t cookie;
- ; return 0; }
- EOF
--if { (eval echo configure:16508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- have_cookie_io_functions_t=yes
- else
-@@ -16523,7 +16826,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 16527 "configure"
-+#line 16830 "configure"
- #include "confdefs.h"
-
- #define _GNU_SOURCE
-@@ -16555,7 +16858,7 @@
-
-
- EOF
--if { (eval echo configure:16559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:16862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- cookie_io_functions_use_off64_t=yes
-@@ -16575,7 +16878,7 @@
- else
-
- cat > conftest.$ac_ext <<EOF
--#line 16579 "configure"
-+#line 16882 "configure"
- #include "confdefs.h"
-
- #define _GNU_SOURCE
-@@ -16585,7 +16888,7 @@
- _IO_cookie_io_functions_t cookie;
- ; return 0; }
- EOF
--if { (eval echo configure:16589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- have_IO_cookie_io_functions_t=yes
- else
-@@ -16619,7 +16922,7 @@
-
-
- echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6
--echo "configure:16623: checking for broken getcwd" >&5
-+echo "configure:16926: checking for broken getcwd" >&5
- os=`uname -sr 2>/dev/null`
- case $os in
- SunOS*)
-@@ -16634,14 +16937,14 @@
-
-
- echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6
--echo "configure:16638: checking for broken libc stdio" >&5
-+echo "configure:16941: checking for broken libc stdio" >&5
- if eval "test \"`echo '$''{'have_broken_glibc_fopen_append'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- if test "$cross_compiling" = yes; then
- cat > conftest.$ac_ext <<EOF
--#line 16645 "configure"
-+#line 16948 "configure"
- #include "confdefs.h"
-
- #include <features.h>
-@@ -16654,7 +16957,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:16658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- have_broken_glibc_fopen_append=yes
- else
-@@ -16667,7 +16970,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 16671 "configure"
-+#line 16974 "configure"
- #include "confdefs.h"
-
- #include <stdio.h>
-@@ -16695,7 +16998,7 @@
- }
-
- EOF
--if { (eval echo configure:16699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- have_broken_glibc_fopen_append=no
- else
-@@ -16723,12 +17026,12 @@
-
-
- echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
--echo "configure:16727: checking whether struct tm is in sys/time.h or time.h" >&5
-+echo "configure:17030: checking whether struct tm is in sys/time.h or time.h" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 16732 "configure"
-+#line 17035 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <time.h>
-@@ -16736,7 +17039,7 @@
- struct tm *tp; tp->tm_sec;
- ; return 0; }
- EOF
--if { (eval echo configure:16740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_struct_tm=time.h
- else
-@@ -16757,12 +17060,12 @@
- fi
-
- echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
--echo "configure:16761: checking for tm_zone in struct tm" >&5
-+echo "configure:17064: checking for tm_zone in struct tm" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 16766 "configure"
-+#line 17069 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_cv_struct_tm>
-@@ -16770,7 +17073,7 @@
- struct tm tm; tm.tm_zone;
- ; return 0; }
- EOF
--if { (eval echo configure:16774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_struct_tm_zone=yes
- else
-@@ -16790,12 +17093,12 @@
-
- else
- echo $ac_n "checking for tzname""... $ac_c" 1>&6
--echo "configure:16794: checking for tzname" >&5
-+echo "configure:17097: checking for tzname" >&5
- if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 16799 "configure"
-+#line 17102 "configure"
- #include "confdefs.h"
- #include <time.h>
- #ifndef tzname /* For SGI. */
-@@ -16805,7 +17108,7 @@
- atoi(*tzname);
- ; return 0; }
- EOF
--if { (eval echo configure:16809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:17112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_var_tzname=yes
- else
-@@ -16829,16 +17132,16 @@
-
-
- echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6
--echo "configure:16833: checking for missing declarations of reentrant functions" >&5
-+echo "configure:17136: checking for missing declarations of reentrant functions" >&5
- cat > conftest.$ac_ext <<EOF
--#line 16835 "configure"
-+#line 17138 "configure"
- #include "confdefs.h"
- #include <time.h>
- int main() {
- struct tm *(*func)() = localtime_r
- ; return 0; }
- EOF
--if { (eval echo configure:16842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- :
-@@ -16856,14 +17159,14 @@
- fi
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
--#line 16860 "configure"
-+#line 17163 "configure"
- #include "confdefs.h"
- #include <time.h>
- int main() {
- struct tm *(*func)() = gmtime_r
- ; return 0; }
- EOF
--if { (eval echo configure:16867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- :
-@@ -16881,14 +17184,14 @@
- fi
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
--#line 16885 "configure"
-+#line 17188 "configure"
- #include "confdefs.h"
- #include <time.h>
- int main() {
- char *(*func)() = asctime_r
- ; return 0; }
- EOF
--if { (eval echo configure:16892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- :
-@@ -16906,14 +17209,14 @@
- fi
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
--#line 16910 "configure"
-+#line 17213 "configure"
- #include "confdefs.h"
- #include <time.h>
- int main() {
- char *(*func)() = ctime_r
- ; return 0; }
- EOF
--if { (eval echo configure:16917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- :
-@@ -16931,14 +17234,14 @@
- fi
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
--#line 16935 "configure"
-+#line 17238 "configure"
- #include "confdefs.h"
- #include <string.h>
- int main() {
- char *(*func)() = strtok_r
- ; return 0; }
- EOF
--if { (eval echo configure:16942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- :
-@@ -16959,16 +17262,16 @@
-
-
- echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6
--echo "configure:16963: checking for fclose declaration" >&5
-+echo "configure:17266: checking for fclose declaration" >&5
- cat > conftest.$ac_ext <<EOF
--#line 16965 "configure"
-+#line 17268 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- int (*func)() = fclose
- ; return 0; }
- EOF
--if { (eval echo configure:16972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- cat >> confdefs.h <<\EOF
-@@ -16994,12 +17297,12 @@
-
-
- echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
--echo "configure:16998: checking for tm_gmtoff in struct tm" >&5
-+echo "configure:17301: checking for tm_gmtoff in struct tm" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17003 "configure"
-+#line 17306 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_cv_struct_tm>
-@@ -17007,7 +17310,7 @@
- struct tm tm; tm.tm_gmtoff;
- ; return 0; }
- EOF
--if { (eval echo configure:17011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_struct_tm_gmtoff=yes
- else
-@@ -17030,12 +17333,12 @@
-
-
- echo $ac_n "checking for struct flock""... $ac_c" 1>&6
--echo "configure:17034: checking for struct flock" >&5
-+echo "configure:17337: checking for struct flock" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17039 "configure"
-+#line 17342 "configure"
- #include "confdefs.h"
-
- #include <unistd.h>
-@@ -17045,7 +17348,7 @@
- struct flock x;
- ; return 0; }
- EOF
--if { (eval echo configure:17049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- ac_cv_struct_flock=yes
-@@ -17072,12 +17375,12 @@
-
-
- echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
--echo "configure:17076: checking for socklen_t" >&5
-+echo "configure:17379: checking for socklen_t" >&5
- if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17081 "configure"
-+#line 17384 "configure"
- #include "confdefs.h"
-
- #include <sys/types.h>
-@@ -17089,7 +17392,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:17093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- ac_cv_socklen_t=yes
-@@ -17115,7 +17418,7 @@
-
-
- echo $ac_n "checking size of size_t""... $ac_c" 1>&6
--echo "configure:17119: checking size of size_t" >&5
-+echo "configure:17422: 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
-@@ -17123,18 +17426,18 @@
- ac_cv_sizeof_size_t=8
- else
- cat > conftest.$ac_ext <<EOF
--#line 17127 "configure"
-+#line 17430 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(size_t));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:17138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17441: \"$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
-@@ -17154,7 +17457,7 @@
-
-
- echo $ac_n "checking size of long long""... $ac_c" 1>&6
--echo "configure:17158: checking size of long long" >&5
-+echo "configure:17461: 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
-@@ -17162,18 +17465,18 @@
- ac_cv_sizeof_long_long=8
- else
- cat > conftest.$ac_ext <<EOF
--#line 17166 "configure"
-+#line 17469 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long long));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:17177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17480: \"$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
-@@ -17193,7 +17496,7 @@
-
-
- echo $ac_n "checking size of long long int""... $ac_c" 1>&6
--echo "configure:17197: checking size of long long int" >&5
-+echo "configure:17500: 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
-@@ -17201,18 +17504,18 @@
- ac_cv_sizeof_long_long_int=8
- else
- cat > conftest.$ac_ext <<EOF
--#line 17205 "configure"
-+#line 17508 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long long int));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:17216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17519: \"$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
-@@ -17232,7 +17535,7 @@
-
-
- echo $ac_n "checking size of long""... $ac_c" 1>&6
--echo "configure:17236: checking size of long" >&5
-+echo "configure:17539: 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
-@@ -17240,18 +17543,18 @@
- ac_cv_sizeof_long=8
- else
- cat > conftest.$ac_ext <<EOF
--#line 17244 "configure"
-+#line 17547 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:17255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17558: \"$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
-@@ -17271,7 +17574,7 @@
-
-
- echo $ac_n "checking size of int""... $ac_c" 1>&6
--echo "configure:17275: checking size of int" >&5
-+echo "configure:17578: 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
-@@ -17279,18 +17582,18 @@
- ac_cv_sizeof_int=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 17283 "configure"
-+#line 17586 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(int));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:17294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17597: \"$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
-@@ -17312,7 +17615,7 @@
-
-
- echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6
--echo "configure:17316: checking size of intmax_t" >&5
-+echo "configure:17619: 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
-@@ -17329,7 +17632,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 17333 "configure"
-+#line 17636 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #if STDC_HEADERS
-@@ -17353,7 +17656,7 @@
- }
-
- EOF
--if { (eval echo configure:17357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17660: \"$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`
-@@ -17392,7 +17695,7 @@
-
-
- echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6
--echo "configure:17396: checking size of ssize_t" >&5
-+echo "configure:17699: 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
-@@ -17409,7 +17712,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 17413 "configure"
-+#line 17716 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #if STDC_HEADERS
-@@ -17433,7 +17736,7 @@
- }
-
- EOF
--if { (eval echo configure:17437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17740: \"$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`
-@@ -17472,7 +17775,7 @@
-
-
- echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6
--echo "configure:17476: checking size of ptrdiff_t" >&5
-+echo "configure:17779: 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
-@@ -17489,7 +17792,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 17493 "configure"
-+#line 17796 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #if STDC_HEADERS
-@@ -17513,7 +17816,7 @@
- }
-
- EOF
--if { (eval echo configure:17517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17820: \"$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`
-@@ -17552,12 +17855,12 @@
-
-
- echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
--echo "configure:17556: checking for st_blksize in struct stat" >&5
-+echo "configure:17859: checking for st_blksize in struct stat" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17561 "configure"
-+#line 17864 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -17565,7 +17868,7 @@
- struct stat s; s.st_blksize;
- ; return 0; }
- EOF
--if { (eval echo configure:17569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_struct_st_blksize=yes
- else
-@@ -17587,12 +17890,12 @@
-
- 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:17591: checking for st_blocks in struct stat" >&5
-+echo "configure:17894: checking for st_blocks in struct stat" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17596 "configure"
-+#line 17899 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -17600,7 +17903,7 @@
- struct stat s; s.st_blocks;
- ; return 0; }
- EOF
--if { (eval echo configure:17604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_struct_st_blocks=yes
- else
-@@ -17627,12 +17930,12 @@
- WARNING_LEVEL=0
- fi
- echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
--echo "configure:17631: checking for st_rdev in struct stat" >&5
-+echo "configure:17934: checking for st_rdev in struct stat" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17636 "configure"
-+#line 17939 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -17640,7 +17943,7 @@
- struct stat s; s.st_rdev;
- ; return 0; }
- EOF
--if { (eval echo configure:17644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_struct_st_rdev=yes
- else
-@@ -17662,12 +17965,12 @@
-
-
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:17666: checking for size_t" >&5
-+echo "configure:17969: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17671 "configure"
-+#line 17974 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -17695,12 +17998,12 @@
- fi
-
- echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
--echo "configure:17699: checking for uid_t in sys/types.h" >&5
-+echo "configure:18002: checking for uid_t in sys/types.h" >&5
- if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17704 "configure"
-+#line 18007 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- EOF
-@@ -17731,12 +18034,12 @@
-
-
- echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6
--echo "configure:17735: checking for struct sockaddr_storage" >&5
-+echo "configure:18038: checking for struct sockaddr_storage" >&5
- if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17740 "configure"
-+#line 18043 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -17744,7 +18047,7 @@
- struct sockaddr_storage s; s
- ; return 0; }
- EOF
--if { (eval echo configure:17748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_sockaddr_storage=yes
- else
-@@ -17765,13 +18068,13 @@
-
- fi
- echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6
--echo "configure:17769: checking for field sa_len in struct sockaddr" >&5
-+echo "configure:18072: checking for field sa_len in struct sockaddr" >&5
- if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- cat > conftest.$ac_ext <<EOF
--#line 17775 "configure"
-+#line 18078 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -17779,7 +18082,7 @@
- static struct sockaddr sa; int n = (int) sa.sa_len; return n;
- ; return 0; }
- EOF
--if { (eval echo configure:17783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_sockaddr_sa_len=yes
- else
-@@ -17802,12 +18105,12 @@
-
-
- echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6
--echo "configure:17806: checking for IPv6 support" >&5
-+echo "configure:18109: checking for IPv6 support" >&5
- if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17811 "configure"
-+#line 18114 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -17816,7 +18119,7 @@
- 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:17820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_ipv6_support=yes
- else
-@@ -17832,12 +18135,12 @@
-
-
- echo $ac_n "checking for vprintf""... $ac_c" 1>&6
--echo "configure:17836: checking for vprintf" >&5
-+echo "configure:18139: checking for vprintf" >&5
- if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17841 "configure"
-+#line 18144 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char vprintf(); below. */
-@@ -17860,7 +18163,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:17864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18167: \"$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
-@@ -17884,12 +18187,12 @@
-
- if test "$ac_cv_func_vprintf" != yes; then
- echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
--echo "configure:17888: checking for _doprnt" >&5
-+echo "configure:18191: checking for _doprnt" >&5
- if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 17893 "configure"
-+#line 18196 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char _doprnt(); below. */
-@@ -17912,7 +18215,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:17916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18219: \"$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
-@@ -17939,6 +18242,7 @@
- for ac_func in alphasort \
- asctime_r \
- chroot \
-+clearenv \
- ctime_r \
- cuserid \
- crypt \
-@@ -18019,12 +18323,12 @@
-
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18023: checking for $ac_func" >&5
-+echo "configure:18327: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 18028 "configure"
-+#line 18332 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -18047,7 +18351,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:18051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18355: \"$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
-@@ -18073,25 +18377,25 @@
-
-
- echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
--echo "configure:18077: checking for getaddrinfo" >&5
-+echo "configure:18381: checking for getaddrinfo" >&5
- if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 18082 "configure"
-+#line 18386 "configure"
- #include "confdefs.h"
- #include <netdb.h>
- int main() {
- struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);
- ; return 0; }
- EOF
--if { (eval echo configure:18089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- if test "$cross_compiling" = yes; then
- ac_cv_func_getaddrinfo=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 18095 "configure"
-+#line 18399 "configure"
- #include "confdefs.h"
-
- #include <netdb.h>
-@@ -18131,7 +18435,7 @@
- }
-
- EOF
--if { (eval echo configure:18135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18439: \"$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
-@@ -18163,12 +18467,12 @@
- for ac_func in strlcat strlcpy getopt
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18167: checking for $ac_func" >&5
-+echo "configure:18471: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 18172 "configure"
-+#line 18476 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -18191,7 +18495,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:18195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18499: \"$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
-@@ -18218,7 +18522,7 @@
-
-
- echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
--echo "configure:18222: checking whether utime accepts a null argument" >&5
-+echo "configure:18526: 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
-@@ -18228,7 +18532,7 @@
- ac_cv_func_utime_null=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 18232 "configure"
-+#line 18536 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -18239,7 +18543,7 @@
- && t.st_mtime - s.st_mtime < 120));
- }
- EOF
--if { (eval echo configure:18243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18547: \"$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
-@@ -18265,19 +18569,19 @@
- # 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:18269: checking for working alloca.h" >&5
-+echo "configure:18573: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 18274 "configure"
-+#line 18578 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:18281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18585: \"$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
-@@ -18298,12 +18602,12 @@
- fi
-
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:18302: checking for alloca" >&5
-+echo "configure:18606: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 18307 "configure"
-+#line 18611 "configure"
- #include "confdefs.h"
-
- #ifdef __GNUC__
-@@ -18331,7 +18635,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:18335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18639: \"$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
-@@ -18363,12 +18667,12 @@
-
-
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:18367: checking whether alloca needs Cray hooks" >&5
-+echo "configure:18671: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 18372 "configure"
-+#line 18676 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -18393,12 +18697,12 @@
- 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:18397: checking for $ac_func" >&5
-+echo "configure:18701: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 18402 "configure"
-+#line 18706 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -18421,7 +18725,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:18425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18729: \"$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
-@@ -18448,7 +18752,7 @@
- fi
-
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:18452: checking stack direction for C alloca" >&5
-+echo "configure:18756: 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
-@@ -18456,7 +18760,7 @@
- ac_cv_c_stack_direction=0
- else
- cat > conftest.$ac_ext <<EOF
--#line 18460 "configure"
-+#line 18764 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -18475,7 +18779,7 @@
- exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:18479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18783: \"$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
-@@ -18498,13 +18802,13 @@
-
-
- echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
--echo "configure:18502: checking for declared timezone" >&5
-+echo "configure:18806: checking for declared timezone" >&5
- if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- cat > conftest.$ac_ext <<EOF
--#line 18508 "configure"
-+#line 18812 "configure"
- #include "confdefs.h"
-
- #include <sys/types.h>
-@@ -18519,7 +18823,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:18523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- ac_cv_declared_timezone=yes
-@@ -18545,7 +18849,7 @@
-
-
- echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6
--echo "configure:18549: checking for type of reentrant time-related functions" >&5
-+echo "configure:18853: 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
-@@ -18556,7 +18860,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 18560 "configure"
-+#line 18864 "configure"
- #include "confdefs.h"
-
- #include <time.h>
-@@ -18574,7 +18878,7 @@
- }
-
- EOF
--if { (eval echo configure:18578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18882: \"$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
-@@ -18590,7 +18894,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 18594 "configure"
-+#line 18898 "configure"
- #include "confdefs.h"
-
- #include <time.h>
-@@ -18606,7 +18910,7 @@
- }
-
- EOF
--if { (eval echo configure:18610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18914: \"$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
-@@ -18644,12 +18948,12 @@
-
-
- echo $ac_n "checking for readdir_r""... $ac_c" 1>&6
--echo "configure:18648: checking for readdir_r" >&5
-+echo "configure:18952: checking for readdir_r" >&5
- if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 18653 "configure"
-+#line 18957 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char readdir_r(); below. */
-@@ -18672,7 +18976,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:18676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18980: \"$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
-@@ -18694,7 +18998,7 @@
-
- if test "$ac_cv_func_readdir_r" = "yes"; then
- echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6
--echo "configure:18698: checking for type of readdir_r" >&5
-+echo "configure:19002: 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
-@@ -18705,7 +19009,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 18709 "configure"
-+#line 19013 "configure"
- #include "confdefs.h"
-
- #define _REENTRANT
-@@ -18730,7 +19034,7 @@
- }
-
- EOF
--if { (eval echo configure:18734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:19038: \"$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
-@@ -18741,7 +19045,7 @@
- rm -fr conftest*
-
- cat > conftest.$ac_ext <<EOF
--#line 18745 "configure"
-+#line 19049 "configure"
- #include "confdefs.h"
-
- #define _REENTRANT
-@@ -18751,7 +19055,7 @@
-
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:18755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:19059: \"$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*
-@@ -18793,12 +19097,12 @@
-
-
- echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
--echo "configure:18797: checking for in_addr_t" >&5
-+echo "configure:19101: checking for in_addr_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 18802 "configure"
-+#line 19106 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -18832,12 +19136,12 @@
- for ac_func in crypt_r
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:18836: checking for $ac_func" >&5
-+echo "configure:19140: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 18841 "configure"
-+#line 19145 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -18860,7 +19164,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:18864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19168: \"$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
-@@ -18888,14 +19192,14 @@
- 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:18892: checking which data struct is used by crypt_r" >&5
-+echo "configure:19196: checking which data struct is used by crypt_r" >&5
- if eval "test \"`echo '$''{'php_cv_crypt_r_style'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- php_cv_crypt_r_style=none
- cat > conftest.$ac_ext <<EOF
--#line 18899 "configure"
-+#line 19203 "configure"
- #include "confdefs.h"
-
- #define _REENTRANT 1
-@@ -18908,7 +19212,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:18912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- php_cv_crypt_r_style=cryptd
- else
-@@ -18919,7 +19223,7 @@
-
- if test "$php_cv_crypt_r_style" = "none"; then
- cat > conftest.$ac_ext <<EOF
--#line 18923 "configure"
-+#line 19227 "configure"
- #include "confdefs.h"
-
- #define _REENTRANT 1
-@@ -18932,7 +19236,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:18936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- php_cv_crypt_r_style=struct_crypt_data
- else
-@@ -18944,7 +19248,7 @@
-
- if test "$php_cv_crypt_r_style" = "none"; then
- cat > conftest.$ac_ext <<EOF
--#line 18948 "configure"
-+#line 19252 "configure"
- #include "confdefs.h"
-
- #define _REENTRANT 1
-@@ -18958,7 +19262,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:18962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- php_cv_crypt_r_style=struct_crypt_data_gnu_source
- else
-@@ -19017,7 +19321,7 @@
- php_enable_gcov=no
-
- echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6
--echo "configure:19021: checking whether to include gcov symbols" >&5
-+echo "configure:19325: 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"
-@@ -19059,7 +19363,7 @@
- # 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:19063: checking for $ac_word" >&5
-+echo "configure:19367: 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
-@@ -19088,7 +19392,7 @@
- # 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:19092: checking for $ac_word" >&5
-+echo "configure:19396: 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
-@@ -19123,7 +19427,7 @@
-
- if test "$LTP"; then
- echo $ac_n "checking for ltp version""... $ac_c" 1>&6
--echo "configure:19127: checking for ltp version" >&5
-+echo "configure:19431: 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
-@@ -19180,7 +19484,7 @@
- php_enable_debug=no
-
- echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6
--echo "configure:19184: checking whether to include debugging symbols" >&5
-+echo "configure:19488: 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"
-@@ -19222,7 +19526,7 @@
- php_with_layout=PHP
-
- echo $ac_n "checking layout of installed files""... $ac_c" 1>&6
--echo "configure:19226: checking layout of installed files" >&5
-+echo "configure:19530: 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"
-@@ -19257,7 +19561,7 @@
- php_with_config_file_path=DEFAULT
-
- echo $ac_n "checking path to configuration file""... $ac_c" 1>&6
--echo "configure:19261: checking path to configuration file" >&5
-+echo "configure:19565: 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"
-@@ -19291,7 +19595,7 @@
- fi
-
- echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6
--echo "configure:19295: checking where to scan for configuration files" >&5
-+echo "configure:19599: checking where to scan for configuration files" >&5
-
- php_with_config_file_scan_dir=DEFAULT
-
-@@ -19327,7 +19631,7 @@
- php_enable_safe_mode=no
-
- echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6
--echo "configure:19331: checking whether to enable safe mode by default" >&5
-+echo "configure:19635: 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"
-@@ -19362,7 +19666,7 @@
- fi
-
- echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6
--echo "configure:19366: checking for safe mode exec dir" >&5
-+echo "configure:19670: checking for safe mode exec dir" >&5
-
- php_with_exec_dir=no
-
-@@ -19406,7 +19710,7 @@
- php_enable_sigchild=no
-
- echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6
--echo "configure:19410: checking whether to enable PHP's own SIGCHLD handler" >&5
-+echo "configure:19714: 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"
-@@ -19444,7 +19748,7 @@
- php_enable_magic_quotes=no
-
- echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6
--echo "configure:19448: checking whether to enable magic quotes by default" >&5
-+echo "configure:19752: 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"
-@@ -19482,7 +19786,7 @@
- php_enable_libgcc=no
-
- echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6
--echo "configure:19486: checking whether to explicitly link against libgcc" >&5
-+echo "configure:19790: 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"
-@@ -19562,7 +19866,7 @@
- php_enable_short_tags=yes
-
- echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6
--echo "configure:19566: checking whether to enable short tags by default" >&5
-+echo "configure:19870: 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"
-@@ -19600,7 +19904,7 @@
- php_enable_dmalloc=no
-
- echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6
--echo "configure:19604: checking whether to enable dmalloc" >&5
-+echo "configure:19908: 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"
-@@ -19624,7 +19928,7 @@
-
- if test "$PHP_DMALLOC" = "yes"; then
- echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6
--echo "configure:19628: checking for dmalloc_error in -ldmalloc" >&5
-+echo "configure:19932: 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
-@@ -19632,7 +19936,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldmalloc $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 19636 "configure"
-+#line 19940 "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
-@@ -19643,7 +19947,7 @@
- dmalloc_error()
- ; return 0; }
- EOF
--if { (eval echo configure:19647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -19688,7 +19992,7 @@
- php_enable_ipv6=yes
-
- echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6
--echo "configure:19692: checking whether to enable IPv6 support" >&5
-+echo "configure:19996: 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"
-@@ -19718,7 +20022,7 @@
- fi
-
- echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6
--echo "configure:19722: checking how big to make fd sets" >&5
-+echo "configure:20026: checking how big to make fd sets" >&5
-
- php_enable_fd_setsize=no
-
-@@ -19789,7 +20093,7 @@
- php_enable_libxml=yes
-
- echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6
--echo "configure:19793: checking whether to enable LIBXML support" >&5
-+echo "configure:20097: 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"
-@@ -19837,7 +20141,7 @@
- php_with_libxml_dir=no
-
- echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
--echo "configure:19841: checking libxml2 install dir" >&5
-+echo "configure:20145: 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"
-@@ -19866,7 +20170,7 @@
-
-
- echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
--echo "configure:19870: checking for xml2-config path" >&5
-+echo "configure:20174: 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
-@@ -20024,7 +20328,7 @@
-
-
- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
--echo "configure:20028: checking whether libxml build works" >&5
-+echo "configure:20332: 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
-@@ -20040,7 +20344,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 20044 "configure"
-+#line 20348 "configure"
- #include "confdefs.h"
-
-
-@@ -20051,7 +20355,7 @@
- }
-
- EOF
--if { (eval echo configure:20055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:20359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -20405,7 +20709,7 @@
- php_with_openssl=no
-
- echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6
--echo "configure:20409: checking for OpenSSL support" >&5
-+echo "configure:20713: checking for OpenSSL support" >&5
- # Check whether --with-openssl or --without-openssl was given.
- if test "${with_openssl+set}" = set; then
- withval="$with_openssl"
-@@ -20452,7 +20756,7 @@
- php_with_kerberos=no
-
- echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6
--echo "configure:20456: checking for Kerberos support" >&5
-+echo "configure:20760: checking for Kerberos support" >&5
- # Check whether --with-kerberos or --without-kerberos was given.
- if test "${with_kerberos+set}" = set; then
- withval="$with_kerberos"
-@@ -20770,7 +21074,7 @@
- # 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:20774: checking for $ac_word" >&5
-+echo "configure:21078: 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
-@@ -21130,7 +21434,7 @@
- fi
-
- echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6
--echo "configure:21134: checking for DSA_get_default_method in -lssl" >&5
-+echo "configure:21438: 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
-@@ -21138,7 +21442,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lssl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 21142 "configure"
-+#line 21446 "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
-@@ -21149,7 +21453,7 @@
- DSA_get_default_method()
- ; return 0; }
- EOF
--if { (eval echo configure:21153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:21457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -21191,7 +21495,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:21195: checking for $ac_word" >&5
-+echo "configure:21499: 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
-@@ -21396,9 +21700,9 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=-I$OPENSSL_INCDIR
- echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
--echo "configure:21400: checking for OpenSSL version" >&5
-+echo "configure:21704: checking for OpenSSL version" >&5
- cat > conftest.$ac_ext <<EOF
--#line 21402 "configure"
-+#line 21706 "configure"
- #include "confdefs.h"
-
- #include <openssl/opensslv.h>
-@@ -21553,7 +21857,7 @@
- done
-
- echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
--echo "configure:21557: checking for CRYPTO_free in -lcrypto" >&5
-+echo "configure:21861: 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
-@@ -21561,7 +21865,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcrypto $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 21565 "configure"
-+#line 21869 "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
-@@ -21572,7 +21876,7 @@
- CRYPTO_free()
- ; return 0; }
- EOF
--if { (eval echo configure:21576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:21880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -21729,7 +22033,7 @@
- done
-
- echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
--echo "configure:21733: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-+echo "configure:22037: 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
-@@ -21737,7 +22041,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lssl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 21741 "configure"
-+#line 22045 "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
-@@ -21748,7 +22052,7 @@
- SSL_CTX_set_ssl_version()
- ; return 0; }
- EOF
--if { (eval echo configure:21752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:22056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -21870,7 +22174,7 @@
- php_with_pcre_regex=yes
-
- echo $ac_n "checking for PCRE support""... $ac_c" 1>&6
--echo "configure:21874: checking for PCRE support" >&5
-+echo "configure:22178: checking for PCRE support" >&5
- # Check whether --with-pcre-regex or --without-pcre-regex was given.
- if test "${with_pcre_regex+set}" = set; then
- withval="$with_pcre_regex"
-@@ -22702,7 +23006,7 @@
- php_with_zlib=no
-
- echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6
--echo "configure:22706: checking for ZLIB support" >&5
-+echo "configure:23010: checking for ZLIB support" >&5
- # Check whether --with-zlib or --without-zlib was given.
- if test "${with_zlib+set}" = set; then
- withval="$with_zlib"
-@@ -22749,7 +23053,7 @@
- php_with_zlib_dir=no
-
- echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6
--echo "configure:22753: checking if the location of ZLIB install directory is defined" >&5
-+echo "configure:23057: 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"
-@@ -23184,7 +23488,7 @@
- done
-
- echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6
--echo "configure:23188: checking for gzgets in -lz" >&5
-+echo "configure:23492: 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
-@@ -23192,7 +23496,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lz $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 23196 "configure"
-+#line 23500 "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
-@@ -23203,7 +23507,7 @@
- gzgets()
- ; return 0; }
- EOF
--if { (eval echo configure:23207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:23511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -23343,7 +23647,7 @@
- php_enable_bcmath=no
-
- echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
--echo "configure:23347: checking whether to enable bc style precision math functions" >&5
-+echo "configure:23651: 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"
-@@ -23700,7 +24004,7 @@
- php_with_bz2=no
-
- echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
--echo "configure:23704: checking for BZip2 support" >&5
-+echo "configure:24008: checking for BZip2 support" >&5
- # Check whether --with-bz2 or --without-bz2 was given.
- if test "${with_bz2+set}" = set; then
- withval="$with_bz2"
-@@ -23748,7 +24052,7 @@
- BZIP_DIR=$PHP_BZ2
- else
- echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6
--echo "configure:23752: checking for BZip2 in default path" >&5
-+echo "configure:24056: 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
-@@ -23861,7 +24165,7 @@
- done
-
- echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6
--echo "configure:23865: checking for BZ2_bzerror in -lbz2" >&5
-+echo "configure:24169: 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
-@@ -23869,7 +24173,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbz2 $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 23873 "configure"
-+#line 24177 "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
-@@ -23880,7 +24184,7 @@
- BZ2_bzerror()
- ; return 0; }
- EOF
--if { (eval echo configure:23884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:24188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -24337,7 +24641,7 @@
- php_enable_calendar=no
-
- echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6
--echo "configure:24341: checking whether to enable calendar conversion support" >&5
-+echo "configure:24645: 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"
-@@ -24673,7 +24977,7 @@
- php_enable_ctype=yes
-
- echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6
--echo "configure:24677: checking whether to enable ctype functions" >&5
-+echo "configure:24981: 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"
-@@ -25009,7 +25313,7 @@
- php_with_curl=no
-
- echo $ac_n "checking for cURL support""... $ac_c" 1>&6
--echo "configure:25013: checking for cURL support" >&5
-+echo "configure:25317: checking for cURL support" >&5
- # Check whether --with-curl or --without-curl was given.
- if test "${with_curl+set}" = set; then
- withval="$with_curl"
-@@ -25056,7 +25360,7 @@
- php_with_curlwrappers=no
-
- echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6
--echo "configure:25060: checking if we should use cURL for url streams" >&5
-+echo "configure:25364: 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"
-@@ -25083,7 +25387,7 @@
- CURL_DIR=$PHP_CURL
- else
- echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6
--echo "configure:25087: checking for cURL in default path" >&5
-+echo "configure:25391: 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
-@@ -25101,7 +25405,7 @@
-
- CURL_CONFIG="curl-config"
- echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6
--echo "configure:25105: checking for cURL 7.10.5 or greater" >&5
-+echo "configure:25409: 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
-@@ -25121,7 +25425,7 @@
- fi
-
- echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
--echo "configure:25125: checking for SSL support in libcurl" >&5
-+echo "configure:25429: 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
-@@ -25136,7 +25440,7 @@
- LDFLAGS="`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
-
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:25140: checking how to run the C preprocessor" >&5
-+echo "configure:25444: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -25151,13 +25455,13 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
--#line 25155 "configure"
-+#line 25459 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:25161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:25465: \"$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
- :
-@@ -25168,13 +25472,13 @@
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
--#line 25172 "configure"
-+#line 25476 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:25178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:25482: \"$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
- :
-@@ -25185,13 +25489,13 @@
- rm -rf conftest*
- CPP="${CC-cc} -nologo -E"
- cat > conftest.$ac_ext <<EOF
--#line 25189 "configure"
-+#line 25493 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:25195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:25499: \"$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
- :
-@@ -25216,14 +25520,14 @@
- echo "$ac_t""$CPP" 1>&6
-
- echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
--echo "configure:25220: checking for openssl support in libcurl" >&5
-+echo "configure:25524: checking for openssl support in libcurl" >&5
- if test "$cross_compiling" = yes; then
-
- echo "$ac_t""no" 1>&6
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 25227 "configure"
-+#line 25531 "configure"
- #include "confdefs.h"
-
- #include <curl/curl.h>
-@@ -25238,23 +25542,23 @@
- }
-
- EOF
--if { (eval echo configure:25242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:25546: \"$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:25248: checking for openssl/crypto.h" >&5
-+echo "configure:25552: 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 <<EOF
--#line 25253 "configure"
-+#line 25557 "configure"
- #include "confdefs.h"
- #include <openssl/crypto.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:25258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:25562: \"$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*
-@@ -25294,14 +25598,14 @@
-
-
- echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
--echo "configure:25298: checking for gnutls support in libcurl" >&5
-+echo "configure:25602: checking for gnutls support in libcurl" >&5
- if test "$cross_compiling" = yes; then
-
- echo "$ac_t""no" 1>&6
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 25305 "configure"
-+#line 25609 "configure"
- #include "confdefs.h"
-
- #include <curl/curl.h>
-@@ -25316,23 +25620,23 @@
- }
-
- EOF
--if { (eval echo configure:25320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:25624: \"$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:25326: checking for gcrypt.h" >&5
-+echo "configure:25630: 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
--#line 25331 "configure"
-+#line 25635 "configure"
- #include "confdefs.h"
- #include <gcrypt.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:25336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:25640: \"$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*
-@@ -25693,7 +25997,7 @@
- done
-
- echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
--echo "configure:25697: checking for curl_easy_perform in -lcurl" >&5
-+echo "configure:26001: 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
-@@ -25701,7 +26005,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcurl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 25705 "configure"
-+#line 26009 "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
-@@ -25712,7 +26016,7 @@
- curl_easy_perform()
- ; return 0; }
- EOF
--if { (eval echo configure:25716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:26020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -25848,7 +26152,7 @@
- done
-
- echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6
--echo "configure:25852: checking for curl_version_info in -lcurl" >&5
-+echo "configure:26156: 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
-@@ -25856,7 +26160,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcurl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 25860 "configure"
-+#line 26164 "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
-@@ -25867,7 +26171,7 @@
- curl_version_info()
- ; return 0; }
- EOF
--if { (eval echo configure:25871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:26175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -26001,7 +26305,7 @@
- done
-
- echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6
--echo "configure:26005: checking for curl_easy_strerror in -lcurl" >&5
-+echo "configure:26309: 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
-@@ -26009,7 +26313,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcurl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 26013 "configure"
-+#line 26317 "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
-@@ -26020,7 +26324,7 @@
- curl_easy_strerror()
- ; return 0; }
- EOF
--if { (eval echo configure:26024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:26328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -26154,7 +26458,7 @@
- done
-
- echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6
--echo "configure:26158: checking for curl_multi_strerror in -lcurl" >&5
-+echo "configure:26462: 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
-@@ -26162,7 +26466,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcurl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 26166 "configure"
-+#line 26470 "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
-@@ -26173,7 +26477,7 @@
- curl_multi_strerror()
- ; return 0; }
- EOF
--if { (eval echo configure:26177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:26481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -26507,7 +26811,7 @@
-
-
- echo $ac_n "checking size of long""... $ac_c" 1>&6
--echo "configure:26511: checking size of long" >&5
-+echo "configure:26815: 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
-@@ -26515,18 +26819,18 @@
- ac_cv_sizeof_long=8
- else
- cat > conftest.$ac_ext <<EOF
--#line 26519 "configure"
-+#line 26823 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:26530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:26834: \"$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
-@@ -26546,7 +26850,7 @@
-
-
- echo $ac_n "checking size of int""... $ac_c" 1>&6
--echo "configure:26550: checking size of int" >&5
-+echo "configure:26854: 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
-@@ -26554,18 +26858,18 @@
- ac_cv_sizeof_int=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 26558 "configure"
-+#line 26862 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(int));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:26569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:26873: \"$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
-@@ -26586,13 +26890,13 @@
-
-
- echo $ac_n "checking for int32_t""... $ac_c" 1>&6
--echo "configure:26590: checking for int32_t" >&5
-+echo "configure:26894: checking for int32_t" >&5
- if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- cat > conftest.$ac_ext <<EOF
--#line 26596 "configure"
-+#line 26900 "configure"
- #include "confdefs.h"
-
- #if HAVE_SYS_TYPES_H
-@@ -26611,7 +26915,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:26615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:26919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_int_type_int32_t=yes
- else
-@@ -26634,13 +26938,13 @@
-
-
- echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
--echo "configure:26638: checking for uint32_t" >&5
-+echo "configure:26942: checking for uint32_t" >&5
- if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- cat > conftest.$ac_ext <<EOF
--#line 26644 "configure"
-+#line 26948 "configure"
- #include "confdefs.h"
-
- #if HAVE_SYS_TYPES_H
-@@ -26659,7 +26963,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:26663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:26967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_int_type_uint32_t=yes
- else
-@@ -26691,17 +26995,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:26695: checking for $ac_hdr" >&5
-+echo "configure:26999: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 26700 "configure"
-+#line 27004 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:26705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:27009: \"$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*
-@@ -26731,12 +27035,12 @@
- for ac_func in strtoll atoll strftime
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:26735: checking for $ac_func" >&5
-+echo "configure:27039: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 26740 "configure"
-+#line 27044 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -26759,7 +27063,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:26763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:27067: \"$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
-@@ -27542,7 +27846,7 @@
- done
-
- echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6
--echo "configure:27546: checking for dpopen in -l$LIB" >&5
-+echo "configure:27850: 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
-@@ -27550,7 +27854,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$LIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 27554 "configure"
-+#line 27858 "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
-@@ -27561,7 +27865,7 @@
- dpopen()
- ; return 0; }
- EOF
--if { (eval echo configure:27565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:27869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -27730,7 +28034,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:27734: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:28038: checking for $THIS_FULL_NAME support" >&5
- if test -n ""; then
- { echo "configure: error: " 1>&2; exit 1; }
- fi
-@@ -27758,7 +28062,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:27762: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:28066: 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
-@@ -27877,7 +28181,7 @@
- done
-
- echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
--echo "configure:27881: checking for gdbm_open in -lgdbm" >&5
-+echo "configure:28185: 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
-@@ -27885,7 +28189,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgdbm $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 27889 "configure"
-+#line 28193 "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
-@@ -27896,7 +28200,7 @@
- gdbm_open()
- ; return 0; }
- EOF
--if { (eval echo configure:27900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:28204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -28061,7 +28365,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:28065: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:28369: checking for $THIS_FULL_NAME support" >&5
- if test -n ""; then
- { echo "configure: error: " 1>&2; exit 1; }
- fi
-@@ -28190,7 +28494,7 @@
- done
-
- echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6
--echo "configure:28194: checking for dbm_open in -l$LIB" >&5
-+echo "configure:28498: 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
-@@ -28198,7 +28502,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$LIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 28202 "configure"
-+#line 28506 "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
-@@ -28209,7 +28513,7 @@
- dbm_open()
- ; return 0; }
- EOF
--if { (eval echo configure:28213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:28517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -28378,7 +28682,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:28382: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:28686: checking for $THIS_FULL_NAME support" >&5
- if test -n ""; then
- { echo "configure: error: " 1>&2; exit 1; }
- fi
-@@ -28440,7 +28744,7 @@
- LIBS="-l$LIB $LIBS"
-
- cat > conftest.$ac_ext <<EOF
--#line 28444 "configure"
-+#line 28748 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -28451,11 +28755,11 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:28455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:28759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
-
- cat > conftest.$ac_ext <<EOF
--#line 28459 "configure"
-+#line 28763 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -28492,14 +28796,14 @@
- done
- if test -z "$THIS_LIBS"; then
- echo $ac_n "checking for db4 major version""... $ac_c" 1>&6
--echo "configure:28496: checking for db4 major version" >&5
-+echo "configure:28800: 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:28501: checking for db4 minor version and patch level" >&5
-+echo "configure:28805: checking for db4 minor version and patch level" >&5
- cat > conftest.$ac_ext <<EOF
--#line 28503 "configure"
-+#line 28807 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -28525,9 +28829,9 @@
- fi
- if test "$ext_shared" = "yes"; then
- echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
--echo "configure:28529: checking if dba can be used as shared extension" >&5
-+echo "configure:28833: checking if dba can be used as shared extension" >&5
- cat > conftest.$ac_ext <<EOF
--#line 28531 "configure"
-+#line 28835 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -28684,7 +28988,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:28688: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:28992: checking for $THIS_FULL_NAME support" >&5
- if test -n ""; then
- { echo "configure: error: " 1>&2; exit 1; }
- fi
-@@ -28712,7 +29016,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:28716: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:29020: 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
-@@ -28763,7 +29067,7 @@
- LIBS="-l$LIB $LIBS"
-
- cat > conftest.$ac_ext <<EOF
--#line 28767 "configure"
-+#line 29071 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -28774,11 +29078,11 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:28778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:29082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
-
- cat > conftest.$ac_ext <<EOF
--#line 28782 "configure"
-+#line 29086 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -28815,14 +29119,14 @@
- done
- if test -z "$THIS_LIBS"; then
- echo $ac_n "checking for db3 major version""... $ac_c" 1>&6
--echo "configure:28819: checking for db3 major version" >&5
-+echo "configure:29123: 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:28824: checking for db4 minor version and patch level" >&5
-+echo "configure:29128: checking for db4 minor version and patch level" >&5
- cat > conftest.$ac_ext <<EOF
--#line 28826 "configure"
-+#line 29130 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -28848,9 +29152,9 @@
- fi
- if test "$ext_shared" = "yes"; then
- echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
--echo "configure:28852: checking if dba can be used as shared extension" >&5
-+echo "configure:29156: checking if dba can be used as shared extension" >&5
- cat > conftest.$ac_ext <<EOF
--#line 28854 "configure"
-+#line 29158 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -29007,7 +29311,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:29011: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:29315: checking for $THIS_FULL_NAME support" >&5
- if test -n ""; then
- { echo "configure: error: " 1>&2; exit 1; }
- fi
-@@ -29035,7 +29339,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:29039: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:29343: 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
-@@ -29086,7 +29390,7 @@
- LIBS="-l$LIB $LIBS"
-
- cat > conftest.$ac_ext <<EOF
--#line 29090 "configure"
-+#line 29394 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -29097,11 +29401,11 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:29101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:29405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
-
- cat > conftest.$ac_ext <<EOF
--#line 29105 "configure"
-+#line 29409 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -29138,14 +29442,14 @@
- done
- if test -z "$THIS_LIBS"; then
- echo $ac_n "checking for db2 major version""... $ac_c" 1>&6
--echo "configure:29142: checking for db2 major version" >&5
-+echo "configure:29446: 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:29147: checking for db4 minor version and patch level" >&5
-+echo "configure:29451: checking for db4 minor version and patch level" >&5
- cat > conftest.$ac_ext <<EOF
--#line 29149 "configure"
-+#line 29453 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -29171,9 +29475,9 @@
- fi
- if test "$ext_shared" = "yes"; then
- echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
--echo "configure:29175: checking if dba can be used as shared extension" >&5
-+echo "configure:29479: checking if dba can be used as shared extension" >&5
- cat > conftest.$ac_ext <<EOF
--#line 29177 "configure"
-+#line 29481 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -29330,7 +29634,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:29334: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:29638: checking for $THIS_FULL_NAME support" >&5
- if test -n ""; then
- { echo "configure: error: " 1>&2; exit 1; }
- fi
-@@ -29350,7 +29654,7 @@
- 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:29354: checking for DB1 in library" >&5
-+echo "configure:29658: checking for DB1 in library" >&5
- if test "$HAVE_DB4" = "1"; then
- THIS_VERSION=4
- THIS_LIBS=$DB4_LIBS
-@@ -29398,7 +29702,7 @@
- fi
- echo "$ac_t""$THIS_LIBS" 1>&6
- echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6
--echo "configure:29402: checking for DB1 in header" >&5
-+echo "configure:29706: checking for DB1 in header" >&5
- echo "$ac_t""$THIS_INCLUDE" 1>&6
- if test -n "$THIS_INCLUDE"; then
-
-@@ -29408,7 +29712,7 @@
- LIBS="-l$THIS_LIBS $LIBS"
-
- cat > conftest.$ac_ext <<EOF
--#line 29412 "configure"
-+#line 29716 "configure"
- #include "confdefs.h"
-
- #include "$THIS_INCLUDE"
-@@ -29419,7 +29723,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:29423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:29727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
-
- cat >> confdefs.h <<EOF
-@@ -29569,7 +29873,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:29573: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:29877: checking for $THIS_FULL_NAME support" >&5
- if test -n ""; then
- { echo "configure: error: " 1>&2; exit 1; }
- fi
-@@ -29597,7 +29901,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:29601: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:29905: 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
-@@ -29721,7 +30025,7 @@
- done
-
- echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6
--echo "configure:29725: checking for dbminit in -l$LIB" >&5
-+echo "configure:30029: 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
-@@ -29729,7 +30033,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$LIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 29733 "configure"
-+#line 30037 "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
-@@ -29740,7 +30044,7 @@
- dbminit()
- ; return 0; }
- EOF
--if { (eval echo configure:29744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:30048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -29760,7 +30064,7 @@
- ext_shared=$save_ext_shared
-
- echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6
--echo "configure:29764: checking for DBM using GDBM" >&5
-+echo "configure:30068: checking for DBM using GDBM" >&5
- cat >> confdefs.h <<EOF
- #define DBM_INCLUDE_FILE "$THIS_INCLUDE"
- EOF
-@@ -29924,7 +30228,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:29928: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:30232: checking for $THIS_FULL_NAME support" >&5
- if test -n ""; then
- { echo "configure: error: " 1>&2; exit 1; }
- fi
-@@ -30145,7 +30449,7 @@
- done
-
- echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6
--echo "configure:30149: checking for cdb_read in -l$LIB" >&5
-+echo "configure:30453: 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
-@@ -30153,7 +30457,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$LIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 30157 "configure"
-+#line 30461 "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
-@@ -30164,7 +30468,7 @@
- cdb_read()
- ; return 0; }
- EOF
--if { (eval echo configure:30168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:30472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -30333,7 +30637,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:30337: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:30641: checking for $THIS_FULL_NAME support" >&5
- if test -n ""; then
- { echo "configure: error: " 1>&2; exit 1; }
- fi
-@@ -30364,7 +30668,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:30368: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:30672: checking for $THIS_FULL_NAME support" >&5
- if test -n ""; then
- { echo "configure: error: " 1>&2; exit 1; }
- fi
-@@ -30395,7 +30699,7 @@
- THIS_FULL_NAME="$THIS_NAME"
- fi
- echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
--echo "configure:30399: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:30703: checking for $THIS_FULL_NAME support" >&5
- if test -n ""; then
- { echo "configure: error: " 1>&2; exit 1; }
- fi
-@@ -30410,7 +30714,7 @@
-
-
- echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
--echo "configure:30414: checking whether to enable DBA interface" >&5
-+echo "configure:30718: 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
-@@ -30729,7 +31033,7 @@
- php_enable_dbase=no
-
- echo $ac_n "checking whether to enable dbase support""... $ac_c" 1>&6
--echo "configure:30733: checking whether to enable dbase support" >&5
-+echo "configure:31037: checking whether to enable dbase support" >&5
- # Check whether --enable-dbase or --disable-dbase was given.
- if test "${enable_dbase+set}" = set; then
- enableval="$enable_dbase"
-@@ -31065,7 +31369,7 @@
- php_enable_dom=yes
-
- echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6
--echo "configure:31069: checking whether to enable DOM support" >&5
-+echo "configure:31373: 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"
-@@ -31113,7 +31417,7 @@
- php_with_libxml_dir=no
-
- echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
--echo "configure:31117: checking libxml2 install dir" >&5
-+echo "configure:31421: 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"
-@@ -31144,7 +31448,7 @@
-
-
- echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
--echo "configure:31148: checking for xml2-config path" >&5
-+echo "configure:31452: 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
-@@ -31302,7 +31606,7 @@
-
-
- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
--echo "configure:31306: checking whether libxml build works" >&5
-+echo "configure:31610: 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
-@@ -31318,7 +31622,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 31322 "configure"
-+#line 31626 "configure"
- #include "confdefs.h"
-
-
-@@ -31329,7 +31633,7 @@
- }
-
- EOF
--if { (eval echo configure:31333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:31637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -31741,7 +32045,7 @@
- php_enable_exif=no
-
- echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6
--echo "configure:31745: checking whether to enable EXIF (metadata from images) support" >&5
-+echo "configure:32049: 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"
-@@ -32077,7 +32381,7 @@
- php_with_fbsql=no
-
- echo $ac_n "checking for FrontBase SQL92 (fbsql) support""... $ac_c" 1>&6
--echo "configure:32081: checking for FrontBase SQL92 (fbsql) support" >&5
-+echo "configure:32385: checking for FrontBase SQL92 (fbsql) support" >&5
- # Check whether --with-fbsql or --without-fbsql was given.
- if test "${with_fbsql+set}" = set; then
- withval="$with_fbsql"
-@@ -32573,7 +32877,7 @@
- php_with_fdftk=no
-
- echo $ac_n "checking for FDF support""... $ac_c" 1>&6
--echo "configure:32577: checking for FDF support" >&5
-+echo "configure:32881: checking for FDF support" >&5
- # Check whether --with-fdftk or --without-fdftk was given.
- if test "${with_fdftk+set}" = set; then
- withval="$with_fdftk"
-@@ -32791,7 +33095,7 @@
- done
-
- echo $ac_n "checking for FDFOpen in -l$file""... $ac_c" 1>&6
--echo "configure:32795: checking for FDFOpen in -l$file" >&5
-+echo "configure:33099: checking for FDFOpen in -l$file" >&5
- ac_lib_var=`echo $file'_'FDFOpen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -32799,7 +33103,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$file $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 32803 "configure"
-+#line 33107 "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
-@@ -32810,7 +33114,7 @@
- FDFOpen()
- ; return 0; }
- EOF
--if { (eval echo configure:32814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:33118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -32937,7 +33241,7 @@
- done
-
- echo $ac_n "checking for FDFGetFDFVersion in -l$file""... $ac_c" 1>&6
--echo "configure:32941: checking for FDFGetFDFVersion in -l$file" >&5
-+echo "configure:33245: checking for FDFGetFDFVersion in -l$file" >&5
- ac_lib_var=`echo $file'_'FDFGetFDFVersion | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -32945,7 +33249,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$file $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 32949 "configure"
-+#line 33253 "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
-@@ -32956,7 +33260,7 @@
- FDFGetFDFVersion()
- ; return 0; }
- EOF
--if { (eval echo configure:32960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:33264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -33393,7 +33697,7 @@
- php_enable_filter=yes
-
- echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6
--echo "configure:33397: checking whether to enable input filter support" >&5
-+echo "configure:33701: 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"
-@@ -33440,7 +33744,7 @@
- php_with_pcre_dir=no
-
- echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
--echo "configure:33444: checking pcre install prefix" >&5
-+echo "configure:33748: 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"
-@@ -33470,7 +33774,7 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=$INCLUDES
- cat > conftest.$ac_ext <<EOF
--#line 33474 "configure"
-+#line 33778 "configure"
- #include "confdefs.h"
-
- #include <main/php_config.h>
-@@ -33489,7 +33793,7 @@
- rm -rf conftest*
-
- cat > conftest.$ac_ext <<EOF
--#line 33493 "configure"
-+#line 33797 "configure"
- #include "confdefs.h"
-
- #include <main/php_config.h>
-@@ -33848,7 +34152,7 @@
- php_enable_ftp=no
-
- echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6
--echo "configure:33852: checking whether to enable FTP support" >&5
-+echo "configure:34156: 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"
-@@ -33895,7 +34199,7 @@
- php_with_openssl_dir=no
-
- echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6
--echo "configure:33899: checking OpenSSL dir for FTP" >&5
-+echo "configure:34203: 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"
-@@ -34225,7 +34529,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:34229: checking for $ac_word" >&5
-+echo "configure:34533: 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
-@@ -34430,9 +34734,9 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=-I$OPENSSL_INCDIR
- echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
--echo "configure:34434: checking for OpenSSL version" >&5
-+echo "configure:34738: checking for OpenSSL version" >&5
- cat > conftest.$ac_ext <<EOF
--#line 34436 "configure"
-+#line 34740 "configure"
- #include "confdefs.h"
-
- #include <openssl/opensslv.h>
-@@ -34587,7 +34891,7 @@
- done
-
- echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
--echo "configure:34591: checking for CRYPTO_free in -lcrypto" >&5
-+echo "configure:34895: 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
-@@ -34595,7 +34899,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcrypto $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 34599 "configure"
-+#line 34903 "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
-@@ -34606,7 +34910,7 @@
- CRYPTO_free()
- ; return 0; }
- EOF
--if { (eval echo configure:34610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:34914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -34763,7 +35067,7 @@
- done
-
- echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
--echo "configure:34767: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-+echo "configure:35071: 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
-@@ -34771,7 +35075,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lssl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 34775 "configure"
-+#line 35079 "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
-@@ -34782,7 +35086,7 @@
- SSL_CTX_set_ssl_version()
- ; return 0; }
- EOF
--if { (eval echo configure:34786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:35090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -34901,7 +35205,7 @@
- php_with_gd=no
-
- echo $ac_n "checking for GD support""... $ac_c" 1>&6
--echo "configure:34905: checking for GD support" >&5
-+echo "configure:35209: checking for GD support" >&5
- # Check whether --with-gd or --without-gd was given.
- if test "${with_gd+set}" = set; then
- withval="$with_gd"
-@@ -34949,7 +35253,7 @@
- php_with_jpeg_dir=no
-
- echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6
--echo "configure:34953: checking for the location of libjpeg" >&5
-+echo "configure:35257: 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"
-@@ -34977,7 +35281,7 @@
- php_with_png_dir=no
-
- echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
--echo "configure:34981: checking for the location of libpng" >&5
-+echo "configure:35285: 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"
-@@ -35005,7 +35309,7 @@
- php_with_zlib_dir=no
-
- echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
--echo "configure:35009: checking for the location of libz" >&5
-+echo "configure:35313: 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"
-@@ -35032,7 +35336,7 @@
- php_with_xpm_dir=no
-
- echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6
--echo "configure:35036: checking for the location of libXpm" >&5
-+echo "configure:35340: 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"
-@@ -35058,7 +35362,7 @@
- php_with_ttf=no
-
- echo $ac_n "checking for FreeType 1.x support""... $ac_c" 1>&6
--echo "configure:35062: checking for FreeType 1.x support" >&5
-+echo "configure:35366: checking for FreeType 1.x support" >&5
- # Check whether --with-ttf or --without-ttf was given.
- if test "${with_ttf+set}" = set; then
- withval="$with_ttf"
-@@ -35084,7 +35388,7 @@
- php_with_freetype_dir=no
-
- echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6
--echo "configure:35088: checking for FreeType 2" >&5
-+echo "configure:35392: 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"
-@@ -35110,7 +35414,7 @@
- php_with_t1lib=no
-
- echo $ac_n "checking for T1lib support""... $ac_c" 1>&6
--echo "configure:35114: checking for T1lib support" >&5
-+echo "configure:35418: checking for T1lib support" >&5
- # Check whether --with-t1lib or --without-t1lib was given.
- if test "${with_t1lib+set}" = set; then
- withval="$with_t1lib"
-@@ -35136,7 +35440,7 @@
- php_enable_gd_native_ttf=no
-
- echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6
--echo "configure:35140: checking whether to enable truetype string function in GD" >&5
-+echo "configure:35444: 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"
-@@ -35162,7 +35466,7 @@
- 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:35166: checking whether to enable JIS-mapped Japanese font support in GD" >&5
-+echo "configure:35470: 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"
-@@ -35218,12 +35522,12 @@
- for ac_func in fabsf floorf
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:35222: checking for $ac_func" >&5
-+echo "configure:35526: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 35227 "configure"
-+#line 35531 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -35246,7 +35550,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:35250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:35554: \"$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
-@@ -35418,7 +35722,7 @@
- done
-
- echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
--echo "configure:35422: checking for jpeg_read_header in -ljpeg" >&5
-+echo "configure:35726: 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
-@@ -35426,7 +35730,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ljpeg $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 35430 "configure"
-+#line 35734 "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
-@@ -35437,7 +35741,7 @@
- jpeg_read_header()
- ; return 0; }
- EOF
--if { (eval echo configure:35441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:35745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -35719,7 +36023,7 @@
- done
-
- echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
--echo "configure:35723: checking for png_write_image in -lpng" >&5
-+echo "configure:36027: 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
-@@ -35727,7 +36031,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpng $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 35731 "configure"
-+#line 36035 "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
-@@ -35738,7 +36042,7 @@
- png_write_image()
- ; return 0; }
- EOF
--if { (eval echo configure:35742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:36046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -36118,7 +36422,7 @@
- done
-
- echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
--echo "configure:36122: checking for XpmFreeXpmImage in -lXpm" >&5
-+echo "configure:36426: 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
-@@ -36126,7 +36430,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lXpm $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 36130 "configure"
-+#line 36434 "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
-@@ -36137,7 +36441,7 @@
- XpmFreeXpmImage()
- ; return 0; }
- EOF
--if { (eval echo configure:36141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:36445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -36512,7 +36816,7 @@
- done
-
- echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
--echo "configure:36516: checking for FT_New_Face in -lfreetype" >&5
-+echo "configure:36820: 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
-@@ -36520,7 +36824,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lfreetype $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 36524 "configure"
-+#line 36828 "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
-@@ -36531,7 +36835,7 @@
- FT_New_Face()
- ; return 0; }
- EOF
--if { (eval echo configure:36535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:36839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -36894,7 +37198,7 @@
-
- else
- echo $ac_n "checking for FreeType 1 support""... $ac_c" 1>&6
--echo "configure:36898: checking for FreeType 1 support" >&5
-+echo "configure:37202: checking for FreeType 1 support" >&5
- echo "$ac_t""no - FreeType 2.x is to be used instead" 1>&6
- fi
- fi
-@@ -37008,7 +37312,7 @@
- done
-
- echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
--echo "configure:37012: checking for T1_StrError in -lt1" >&5
-+echo "configure:37316: 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
-@@ -37016,7 +37320,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lt1 $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 37020 "configure"
-+#line 37324 "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
-@@ -37027,7 +37331,7 @@
- T1_StrError()
- ; return 0; }
- EOF
--if { (eval echo configure:37031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:37335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -37469,7 +37773,7 @@
- done
-
- echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
--echo "configure:37473: checking for jpeg_read_header in -ljpeg" >&5
-+echo "configure:37777: 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
-@@ -37477,7 +37781,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ljpeg $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 37481 "configure"
-+#line 37785 "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
-@@ -37488,7 +37792,7 @@
- jpeg_read_header()
- ; return 0; }
- EOF
--if { (eval echo configure:37492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:37796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -37770,7 +38074,7 @@
- done
-
- echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
--echo "configure:37774: checking for png_write_image in -lpng" >&5
-+echo "configure:38078: 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
-@@ -37778,7 +38082,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpng $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 37782 "configure"
-+#line 38086 "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
-@@ -37789,7 +38093,7 @@
- png_write_image()
- ; return 0; }
- EOF
--if { (eval echo configure:37793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:38097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -38169,7 +38473,7 @@
- done
-
- echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
--echo "configure:38173: checking for XpmFreeXpmImage in -lXpm" >&5
-+echo "configure:38477: 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
-@@ -38177,7 +38481,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lXpm $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 38181 "configure"
-+#line 38485 "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
-@@ -38188,7 +38492,7 @@
- XpmFreeXpmImage()
- ; return 0; }
- EOF
--if { (eval echo configure:38192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:38496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -38563,7 +38867,7 @@
- done
-
- echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
--echo "configure:38567: checking for FT_New_Face in -lfreetype" >&5
-+echo "configure:38871: 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
-@@ -38571,7 +38875,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lfreetype $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 38575 "configure"
-+#line 38879 "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
-@@ -38582,7 +38886,7 @@
- FT_New_Face()
- ; return 0; }
- EOF
--if { (eval echo configure:38586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:38890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -38945,7 +39249,7 @@
-
- else
- echo $ac_n "checking for FreeType 1 support""... $ac_c" 1>&6
--echo "configure:38949: checking for FreeType 1 support" >&5
-+echo "configure:39253: checking for FreeType 1 support" >&5
- echo "$ac_t""no - FreeType 2.x is to be used instead" 1>&6
- fi
- fi
-@@ -39059,7 +39363,7 @@
- done
-
- echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
--echo "configure:39063: checking for T1_StrError in -lt1" >&5
-+echo "configure:39367: 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
-@@ -39067,7 +39371,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lt1 $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 39071 "configure"
-+#line 39375 "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
-@@ -39078,7 +39382,7 @@
- T1_StrError()
- ; return 0; }
- EOF
--if { (eval echo configure:39082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:39386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -39453,7 +39757,7 @@
- done
-
- echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
--echo "configure:39457: checking for gdImageString16 in -lgd" >&5
-+echo "configure:39761: 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
-@@ -39461,7 +39765,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 39465 "configure"
-+#line 39769 "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
-@@ -39472,7 +39776,7 @@
- gdImageString16()
- ; return 0; }
- EOF
--if { (eval echo configure:39476: \"$ac_link\") 1>&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
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -39601,7 +39905,7 @@
- done
-
- echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6
--echo "configure:39605: checking for gdImagePaletteCopy in -lgd" >&5
-+echo "configure:39909: 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
-@@ -39609,7 +39913,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 39613 "configure"
-+#line 39917 "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
-@@ -39620,7 +39924,7 @@
- gdImagePaletteCopy()
- ; return 0; }
- EOF
--if { (eval echo configure:39624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:39928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -39749,7 +40053,7 @@
- done
-
- echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
--echo "configure:39753: checking for gdImageCreateFromPng in -lgd" >&5
-+echo "configure:40057: 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
-@@ -39757,7 +40061,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 39761 "configure"
-+#line 40065 "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
-@@ -39768,7 +40072,7 @@
- gdImageCreateFromPng()
- ; return 0; }
- EOF
--if { (eval echo configure:39772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:40076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -39897,7 +40201,7 @@
- done
-
- echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
--echo "configure:39901: checking for gdImageCreateFromGif in -lgd" >&5
-+echo "configure:40205: 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
-@@ -39905,7 +40209,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 39909 "configure"
-+#line 40213 "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
-@@ -39916,7 +40220,7 @@
- gdImageCreateFromGif()
- ; return 0; }
- EOF
--if { (eval echo configure:39920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:40224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -40045,7 +40349,7 @@
- done
-
- echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6
--echo "configure:40049: checking for gdImageGif in -lgd" >&5
-+echo "configure:40353: 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
-@@ -40053,7 +40357,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 40057 "configure"
-+#line 40361 "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
-@@ -40064,7 +40368,7 @@
- gdImageGif()
- ; return 0; }
- EOF
--if { (eval echo configure:40068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:40372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -40193,7 +40497,7 @@
- done
-
- echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6
--echo "configure:40197: checking for gdImageWBMP in -lgd" >&5
-+echo "configure:40501: 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
-@@ -40201,7 +40505,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 40205 "configure"
-+#line 40509 "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
-@@ -40212,7 +40516,7 @@
- gdImageWBMP()
- ; return 0; }
- EOF
--if { (eval echo configure:40216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:40520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -40341,7 +40645,7 @@
- done
-
- echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
--echo "configure:40345: checking for gdImageCreateFromJpeg in -lgd" >&5
-+echo "configure:40649: 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
-@@ -40349,7 +40653,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 40353 "configure"
-+#line 40657 "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
-@@ -40360,7 +40664,7 @@
- gdImageCreateFromJpeg()
- ; return 0; }
- EOF
--if { (eval echo configure:40364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:40668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -40489,7 +40793,7 @@
- done
-
- echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6
--echo "configure:40493: checking for gdImageCreateFromXpm in -lgd" >&5
-+echo "configure:40797: 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
-@@ -40497,7 +40801,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 40501 "configure"
-+#line 40805 "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
-@@ -40508,7 +40812,7 @@
- gdImageCreateFromXpm()
- ; return 0; }
- EOF
--if { (eval echo configure:40512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:40816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -40637,7 +40941,7 @@
- done
-
- echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6
--echo "configure:40641: checking for gdImageCreateFromGd2 in -lgd" >&5
-+echo "configure:40945: 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
-@@ -40645,7 +40949,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 40649 "configure"
-+#line 40953 "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
-@@ -40656,7 +40960,7 @@
- gdImageCreateFromGd2()
- ; return 0; }
- EOF
--if { (eval echo configure:40660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:40964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -40785,7 +41089,7 @@
- done
-
- echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6
--echo "configure:40789: checking for gdImageCreateTrueColor in -lgd" >&5
-+echo "configure:41093: 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
-@@ -40793,7 +41097,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 40797 "configure"
-+#line 41101 "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
-@@ -40804,7 +41108,7 @@
- gdImageCreateTrueColor()
- ; return 0; }
- EOF
--if { (eval echo configure:40808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:41112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -40933,7 +41237,7 @@
- done
-
- echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6
--echo "configure:40937: checking for gdImageSetTile in -lgd" >&5
-+echo "configure:41241: 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
-@@ -40941,7 +41245,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 40945 "configure"
-+#line 41249 "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
-@@ -40952,7 +41256,7 @@
- gdImageSetTile()
- ; return 0; }
- EOF
--if { (eval echo configure:40956: \"$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
-@@ -41081,7 +41385,7 @@
- done
-
- echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6
--echo "configure:41085: checking for gdImageEllipse in -lgd" >&5
-+echo "configure:41389: 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
-@@ -41089,7 +41393,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 41093 "configure"
-+#line 41397 "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
-@@ -41100,7 +41404,7 @@
- gdImageEllipse()
- ; return 0; }
- EOF
--if { (eval echo configure:41104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:41408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -41229,7 +41533,7 @@
- done
-
- echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6
--echo "configure:41233: checking for gdImageSetBrush in -lgd" >&5
-+echo "configure:41537: 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
-@@ -41237,7 +41541,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 41241 "configure"
-+#line 41545 "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
-@@ -41248,7 +41552,7 @@
- gdImageSetBrush()
- ; return 0; }
- EOF
--if { (eval echo configure:41252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:41556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -41377,7 +41681,7 @@
- done
-
- echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6
--echo "configure:41381: checking for gdImageStringTTF in -lgd" >&5
-+echo "configure:41685: 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
-@@ -41385,7 +41689,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 41389 "configure"
-+#line 41693 "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
-@@ -41396,7 +41700,7 @@
- gdImageStringTTF()
- ; return 0; }
- EOF
--if { (eval echo configure:41400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:41704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -41525,7 +41829,7 @@
- done
-
- echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6
--echo "configure:41529: checking for gdImageStringFT in -lgd" >&5
-+echo "configure:41833: 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
-@@ -41533,7 +41837,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 41537 "configure"
-+#line 41841 "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
-@@ -41544,7 +41848,7 @@
- gdImageStringFT()
- ; return 0; }
- EOF
--if { (eval echo configure:41548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:41852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -41673,7 +41977,7 @@
- done
-
- echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6
--echo "configure:41677: checking for gdImageStringFTEx in -lgd" >&5
-+echo "configure:41981: 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
-@@ -41681,7 +41985,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 41685 "configure"
-+#line 41989 "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
-@@ -41692,7 +41996,7 @@
- gdImageStringFTEx()
- ; return 0; }
- EOF
--if { (eval echo configure:41696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -41821,7 +42125,7 @@
- done
-
- echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6
--echo "configure:41825: checking for gdImageColorClosestHWB in -lgd" >&5
-+echo "configure:42129: 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
-@@ -41829,7 +42133,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 41833 "configure"
-+#line 42137 "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
-@@ -41840,7 +42144,7 @@
- gdImageColorClosestHWB()
- ; return 0; }
- EOF
--if { (eval echo configure:41844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -41969,7 +42273,7 @@
- done
-
- echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
--echo "configure:41973: checking for gdImageColorResolve in -lgd" >&5
-+echo "configure:42277: 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
-@@ -41977,7 +42281,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 41981 "configure"
-+#line 42285 "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
-@@ -41988,7 +42292,7 @@
- gdImageColorResolve()
- ; return 0; }
- EOF
--if { (eval echo configure:41992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -42117,7 +42421,7 @@
- done
-
- echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6
--echo "configure:42121: checking for gdImageGifCtx in -lgd" >&5
-+echo "configure:42425: 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
-@@ -42125,7 +42429,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 42129 "configure"
-+#line 42433 "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
-@@ -42136,7 +42440,7 @@
- gdImageGifCtx()
- ; return 0; }
- EOF
--if { (eval echo configure:42140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -42265,7 +42569,7 @@
- done
-
- echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
--echo "configure:42269: checking for gdCacheCreate in -lgd" >&5
-+echo "configure:42573: 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
-@@ -42273,7 +42577,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 42277 "configure"
-+#line 42581 "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
-@@ -42284,7 +42588,7 @@
- gdCacheCreate()
- ; return 0; }
- EOF
--if { (eval echo configure:42288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -42413,7 +42717,7 @@
- done
-
- echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6
--echo "configure:42417: checking for gdFontCacheShutdown in -lgd" >&5
-+echo "configure:42721: 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
-@@ -42421,7 +42725,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 42425 "configure"
-+#line 42729 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -42432,7 +42736,7 @@
- gdFontCacheShutdown()
- ; return 0; }
- EOF
--if { (eval echo configure:42436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -42561,7 +42865,7 @@
- done
-
- echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6
--echo "configure:42565: checking for gdFreeFontCache in -lgd" >&5
-+echo "configure:42869: 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
-@@ -42569,7 +42873,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 42573 "configure"
-+#line 42877 "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
-@@ -42580,7 +42884,7 @@
- gdFreeFontCache()
- ; return 0; }
- EOF
--if { (eval echo configure:42584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -42709,7 +43013,7 @@
- done
-
- echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6
--echo "configure:42713: checking for gdFontCacheMutexSetup in -lgd" >&5
-+echo "configure:43017: 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
-@@ -42717,7 +43021,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 42721 "configure"
-+#line 43025 "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
-@@ -42728,7 +43032,7 @@
- gdFontCacheMutexSetup()
- ; return 0; }
- EOF
--if { (eval echo configure:42732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:43036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -42857,7 +43161,7 @@
- done
-
- echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6
--echo "configure:42861: checking for gdNewDynamicCtxEx in -lgd" >&5
-+echo "configure:43165: 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
-@@ -42865,7 +43169,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 42869 "configure"
-+#line 43173 "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
-@@ -42876,7 +43180,7 @@
- gdNewDynamicCtxEx()
- ; return 0; }
- EOF
--if { (eval echo configure:42880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:43184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -42931,7 +43235,7 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=-I$GD_INCLUDE
- cat > conftest.$ac_ext <<EOF
--#line 42935 "configure"
-+#line 43239 "configure"
- #include "confdefs.h"
-
- #include <gd.h>
-@@ -42945,7 +43249,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:42949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:43253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- cat >> confdefs.h <<\EOF
-@@ -43264,7 +43568,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 43268 "configure"
-+#line 43572 "configure"
- #include "confdefs.h"
-
- char foobar () {}
-@@ -43275,7 +43579,7 @@
- }
-
- EOF
--if { (eval echo configure:43279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:43583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -43427,7 +43731,7 @@
- done
-
- echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
--echo "configure:43431: checking for gdImageCreate in -lgd" >&5
-+echo "configure:43735: 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
-@@ -43435,7 +43739,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgd $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 43439 "configure"
-+#line 43743 "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
-@@ -43446,7 +43750,7 @@
- gdImageCreate()
- ; return 0; }
- EOF
--if { (eval echo configure:43450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:43754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -43511,7 +43815,7 @@
- php_with_gettext=no
-
- echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6
--echo "configure:43515: checking for GNU gettext support" >&5
-+echo "configure:43819: 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"
-@@ -43569,7 +43873,7 @@
- O_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
- echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
--echo "configure:43573: checking for bindtextdomain in -lintl" >&5
-+echo "configure:43877: 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
-@@ -43577,7 +43881,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 43581 "configure"
-+#line 43885 "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
-@@ -43588,7 +43892,7 @@
- bindtextdomain()
- ; return 0; }
- EOF
--if { (eval echo configure:43592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:43896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -43610,7 +43914,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6
--echo "configure:43614: checking for bindtextdomain in -lc" >&5
-+echo "configure:43918: 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
-@@ -43618,7 +43922,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lc $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 43622 "configure"
-+#line 43926 "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
-@@ -43629,7 +43933,7 @@
- bindtextdomain()
- ; return 0; }
- EOF
--if { (eval echo configure:43633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:43937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -44082,7 +44386,7 @@
-
-
- echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
--echo "configure:44086: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-+echo "configure:44390: 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
-@@ -44090,7 +44394,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 44094 "configure"
-+#line 44398 "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
-@@ -44101,7 +44405,7 @@
- ngettext()
- ; return 0; }
- EOF
--if { (eval echo configure:44105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -44125,7 +44429,7 @@
- fi
-
- echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
--echo "configure:44129: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-+echo "configure:44433: 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
-@@ -44133,7 +44437,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 44137 "configure"
-+#line 44441 "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
-@@ -44144,7 +44448,7 @@
- dngettext()
- ; return 0; }
- EOF
--if { (eval echo configure:44148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -44168,7 +44472,7 @@
- fi
-
- echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
--echo "configure:44172: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-+echo "configure:44476: 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
-@@ -44176,7 +44480,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 44180 "configure"
-+#line 44484 "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
-@@ -44187,7 +44491,7 @@
- dcngettext()
- ; return 0; }
- EOF
--if { (eval echo configure:44191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -44211,7 +44515,7 @@
- fi
-
- echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
--echo "configure:44215: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
-+echo "configure:44519: 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
-@@ -44219,7 +44523,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 44223 "configure"
-+#line 44527 "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
-@@ -44230,7 +44534,7 @@
- bind_textdomain_codeset()
- ; return 0; }
- EOF
--if { (eval echo configure:44234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -44261,7 +44565,7 @@
- php_with_gmp=no
-
- echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6
--echo "configure:44265: checking for GNU MP support" >&5
-+echo "configure:44569: 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"
-@@ -44412,7 +44716,7 @@
- done
-
- echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
--echo "configure:44416: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
-+echo "configure:44720: 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
-@@ -44420,7 +44724,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgmp $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 44424 "configure"
-+#line 44728 "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
-@@ -44431,7 +44735,7 @@
- __gmp_randinit_lc_2exp_size()
- ; return 0; }
- EOF
--if { (eval echo configure:44435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -44556,7 +44860,7 @@
- done
-
- echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
--echo "configure:44560: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
-+echo "configure:44864: 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
-@@ -44564,7 +44868,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgmp $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 44568 "configure"
-+#line 44872 "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
-@@ -44575,7 +44879,7 @@
- gmp_randinit_lc_2exp_size()
- ; return 0; }
- EOF
--if { (eval echo configure:44579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -45036,7 +45340,7 @@
- php_enable_hash=yes
-
- echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6
--echo "configure:45040: checking whether to enable hash support" >&5
-+echo "configure:45344: 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"
-@@ -45086,7 +45390,7 @@
-
-
- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
--echo "configure:45090: checking whether byte ordering is bigendian" >&5
-+echo "configure:45394: 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
-@@ -45096,7 +45400,7 @@
- ac_cv_c_bigendian_php=unknown
- else
- cat > conftest.$ac_ext <<EOF
--#line 45100 "configure"
-+#line 45404 "configure"
- #include "confdefs.h"
-
- int main(void)
-@@ -45112,7 +45416,7 @@
- }
-
- EOF
--if { (eval echo configure:45116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:45420: \"$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
-@@ -45137,7 +45441,7 @@
-
-
- echo $ac_n "checking size of short""... $ac_c" 1>&6
--echo "configure:45141: checking size of short" >&5
-+echo "configure:45445: 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
-@@ -45145,18 +45449,18 @@
- ac_cv_sizeof_short=2
- else
- cat > conftest.$ac_ext <<EOF
--#line 45149 "configure"
-+#line 45453 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(short));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:45160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:45464: \"$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
-@@ -45176,7 +45480,7 @@
-
-
- echo $ac_n "checking size of int""... $ac_c" 1>&6
--echo "configure:45180: checking size of int" >&5
-+echo "configure:45484: 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
-@@ -45184,18 +45488,18 @@
- ac_cv_sizeof_int=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 45188 "configure"
-+#line 45492 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(int));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:45199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:45503: \"$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
-@@ -45215,7 +45519,7 @@
-
-
- echo $ac_n "checking size of long""... $ac_c" 1>&6
--echo "configure:45219: checking size of long" >&5
-+echo "configure:45523: 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
-@@ -45223,18 +45527,18 @@
- ac_cv_sizeof_long=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 45227 "configure"
-+#line 45531 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:45238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:45542: \"$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
-@@ -45254,7 +45558,7 @@
-
-
- echo $ac_n "checking size of long long""... $ac_c" 1>&6
--echo "configure:45258: checking size of long long" >&5
-+echo "configure:45562: 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
-@@ -45262,18 +45566,18 @@
- ac_cv_sizeof_long_long=8
- else
- cat > conftest.$ac_ext <<EOF
--#line 45266 "configure"
-+#line 45570 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long long));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:45277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:45581: \"$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
-@@ -45610,7 +45914,7 @@
- php_with_iconv=yes
-
- echo $ac_n "checking for iconv support""... $ac_c" 1>&6
--echo "configure:45614: checking for iconv support" >&5
-+echo "configure:45918: checking for iconv support" >&5
- # Check whether --with-iconv or --without-iconv was given.
- if test "${with_iconv+set}" = set; then
- withval="$with_iconv"
-@@ -45672,12 +45976,12 @@
-
- if test "$PHP_ICONV" = "yes"; then
- echo $ac_n "checking for iconv""... $ac_c" 1>&6
--echo "configure:45676: checking for iconv" >&5
-+echo "configure:45980: checking for iconv" >&5
- if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 45681 "configure"
-+#line 45985 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char iconv(); below. */
-@@ -45700,7 +46004,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:45704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46008: \"$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
-@@ -45721,12 +46025,12 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for libiconv""... $ac_c" 1>&6
--echo "configure:45725: checking for libiconv" >&5
-+echo "configure:46029: checking for libiconv" >&5
- if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 45730 "configure"
-+#line 46034 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char libiconv(); below. */
-@@ -45749,7 +46053,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:45753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46057: \"$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
-@@ -45905,7 +46209,7 @@
- done
-
- echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
--echo "configure:45909: checking for libiconv in -l$iconv_lib_name" >&5
-+echo "configure:46213: 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
-@@ -45913,7 +46217,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$iconv_lib_name $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 45917 "configure"
-+#line 46221 "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
-@@ -45924,7 +46228,7 @@
- libiconv()
- ; return 0; }
- EOF
--if { (eval echo configure:45928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -46058,7 +46362,7 @@
- done
-
- echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
--echo "configure:46062: checking for iconv in -l$iconv_lib_name" >&5
-+echo "configure:46366: 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
-@@ -46066,7 +46370,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$iconv_lib_name $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 46070 "configure"
-+#line 46374 "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
-@@ -46077,7 +46381,7 @@
- iconv()
- ; return 0; }
- EOF
--if { (eval echo configure:46081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -46288,16 +46592,16 @@
- fi
-
- echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6
--echo "configure:46292: checking if iconv is glibc's" >&5
-+echo "configure:46596: checking if iconv is glibc's" >&5
- cat > conftest.$ac_ext <<EOF
--#line 46294 "configure"
-+#line 46598 "configure"
- #include "confdefs.h"
- #include <gnu/libc-version.h>
- int main() {
- gnu_get_libc_version();
- ; return 0; }
- EOF
--if { (eval echo configure:46301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
-
- echo "$ac_t""yes" 1>&6
-@@ -46315,7 +46619,7 @@
-
- if test -z "$iconv_impl_name"; then
- echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6
--echo "configure:46319: checking if using GNU libiconv" >&5
-+echo "configure:46623: checking if using GNU libiconv" >&5
- php_iconv_old_ld="$LDFLAGS"
- LDFLAGS="-liconv $LDFLAGS"
- if test "$cross_compiling" = yes; then
-@@ -46325,7 +46629,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 46329 "configure"
-+#line 46633 "configure"
- #include "confdefs.h"
-
- #include <$PHP_ICONV_H_PATH>
-@@ -46335,7 +46639,7 @@
- }
-
- EOF
--if { (eval echo configure:46339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:46643: \"$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
-@@ -46357,16 +46661,16 @@
-
- if test -z "$iconv_impl_name"; then
- echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6
--echo "configure:46361: checking if iconv is Konstantin Chuguev's" >&5
-+echo "configure:46665: checking if iconv is Konstantin Chuguev's" >&5
- cat > conftest.$ac_ext <<EOF
--#line 46363 "configure"
-+#line 46667 "configure"
- #include "confdefs.h"
- #include <iconv.h>
- int main() {
- iconv_ccs_init(NULL, NULL);
- ; return 0; }
- EOF
--if { (eval echo configure:46370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
-
- echo "$ac_t""yes" 1>&6
-@@ -46534,7 +46838,7 @@
- esac
-
- echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
--echo "configure:46538: checking if iconv supports errno" >&5
-+echo "configure:46842: checking if iconv supports errno" >&5
- if test "$cross_compiling" = yes; then
-
- echo "$ac_t""no" 1>&6
-@@ -46548,7 +46852,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 46552 "configure"
-+#line 46856 "configure"
- #include "confdefs.h"
-
- #include <$PHP_ICONV_H_PATH>
-@@ -46569,7 +46873,7 @@
- }
-
- EOF
--if { (eval echo configure:46573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:46877: \"$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
-@@ -46601,9 +46905,9 @@
-
-
- echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6
--echo "configure:46605: checking if your cpp allows macro usage in include lines" >&5
-+echo "configure:46909: checking if your cpp allows macro usage in include lines" >&5
- cat > conftest.$ac_ext <<EOF
--#line 46607 "configure"
-+#line 46911 "configure"
- #include "confdefs.h"
-
- #define FOO <$PHP_ICONV_H_PATH>
-@@ -46613,7 +46917,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:46617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:46921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- echo "$ac_t""yes" 1>&6
-@@ -46958,7 +47262,7 @@
- php_with_imap=no
-
- echo $ac_n "checking for IMAP support""... $ac_c" 1>&6
--echo "configure:46962: checking for IMAP support" >&5
-+echo "configure:47266: checking for IMAP support" >&5
- # Check whether --with-imap or --without-imap was given.
- if test "${with_imap+set}" = set; then
- withval="$with_imap"
-@@ -47005,7 +47309,7 @@
- php_with_kerberos=no
-
- echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6
--echo "configure:47009: checking for IMAP Kerberos support" >&5
-+echo "configure:47313: 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"
-@@ -47031,7 +47335,7 @@
- php_with_imap_ssl=no
-
- echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6
--echo "configure:47035: checking for IMAP SSL support" >&5
-+echo "configure:47339: 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"
-@@ -47427,7 +47731,7 @@
- done
-
- cat > conftest.$ac_ext <<EOF
--#line 47431 "configure"
-+#line 47735 "configure"
- #include "confdefs.h"
- #include <$IMAP_INC_DIR/mail.h>
- EOF
-@@ -47447,12 +47751,12 @@
- old_CFLAGS=$CFLAGS
- CFLAGS="-I$IMAP_INC_DIR"
- echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6
--echo "configure:47451: checking for utf8_mime2text signature" >&5
-+echo "configure:47755: checking for utf8_mime2text signature" >&5
- if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 47456 "configure"
-+#line 47760 "configure"
- #include "confdefs.h"
-
- #include <stdio.h>
-@@ -47465,7 +47769,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:47469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:47773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- ac_cv_utf8_mime2text=old
-@@ -47494,12 +47798,12 @@
- old_CFLAGS=$CFLAGS
- CFLAGS="-I$IMAP_INC_DIR"
- echo $ac_n "checking for U8T_CANONICAL""... $ac_c" 1>&6
--echo "configure:47498: checking for U8T_CANONICAL" >&5
-+echo "configure:47802: checking for U8T_CANONICAL" >&5
- if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 47503 "configure"
-+#line 47807 "configure"
- #include "confdefs.h"
-
- #include <c-client.h>
-@@ -47510,7 +47814,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:47514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:47818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- ac_cv_u8t_canonical=yes
-@@ -47540,7 +47844,7 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=-I$IMAP_INC_DIR
- cat > conftest.$ac_ext <<EOF
--#line 47544 "configure"
-+#line 47848 "configure"
- #include "confdefs.h"
-
- #include "imap4r1.h"
-@@ -47659,7 +47963,7 @@
- done
-
- echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
--echo "configure:47663: checking for pam_start in -lpam" >&5
-+echo "configure:47967: 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
-@@ -47667,7 +47971,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpam $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 47671 "configure"
-+#line 47975 "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
-@@ -47678,7 +47982,7 @@
- pam_start()
- ; return 0; }
- EOF
--if { (eval echo configure:47682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:47986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -47833,7 +48137,7 @@
- done
-
- echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
--echo "configure:47837: checking for crypt in -lcrypt" >&5
-+echo "configure:48141: 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
-@@ -47841,7 +48145,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcrypt $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 47845 "configure"
-+#line 48149 "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
-@@ -47852,7 +48156,7 @@
- crypt()
- ; return 0; }
- EOF
--if { (eval echo configure:47856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:48160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -48056,7 +48360,7 @@
- # 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:48060: checking for $ac_word" >&5
-+echo "configure:48364: 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
-@@ -48425,7 +48729,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 48429 "configure"
-+#line 48733 "configure"
- #include "confdefs.h"
- #include <$IMAP_INC_DIR/linkage.h>
- EOF
-@@ -48466,7 +48770,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:48470: checking for $ac_word" >&5
-+echo "configure:48774: 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
-@@ -48671,9 +48975,9 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=-I$OPENSSL_INCDIR
- echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
--echo "configure:48675: checking for OpenSSL version" >&5
-+echo "configure:48979: checking for OpenSSL version" >&5
- cat > conftest.$ac_ext <<EOF
--#line 48677 "configure"
-+#line 48981 "configure"
- #include "confdefs.h"
-
- #include <openssl/opensslv.h>
-@@ -48828,7 +49132,7 @@
- done
-
- echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
--echo "configure:48832: checking for CRYPTO_free in -lcrypto" >&5
-+echo "configure:49136: 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
-@@ -48836,7 +49140,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcrypto $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 48840 "configure"
-+#line 49144 "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
-@@ -48847,7 +49151,7 @@
- CRYPTO_free()
- ; return 0; }
- EOF
--if { (eval echo configure:48851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:49155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -49004,7 +49308,7 @@
- done
-
- echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
--echo "configure:49008: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-+echo "configure:49312: 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
-@@ -49012,7 +49316,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lssl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 49016 "configure"
-+#line 49320 "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
-@@ -49023,7 +49327,7 @@
- SSL_CTX_set_ssl_version()
- ; return 0; }
- EOF
--if { (eval echo configure:49027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:49331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -49142,7 +49446,7 @@
-
- elif test -f "$IMAP_INC_DIR/linkage.c"; then
- cat > conftest.$ac_ext <<EOF
--#line 49146 "configure"
-+#line 49450 "configure"
- #include "confdefs.h"
- #include <$IMAP_INC_DIR/linkage.c>
- EOF
-@@ -49173,7 +49477,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 49177 "configure"
-+#line 49481 "configure"
- #include "confdefs.h"
-
-
-@@ -49200,7 +49504,7 @@
- }
-
- EOF
--if { (eval echo configure:49204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:49508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -49227,7 +49531,7 @@
-
-
- echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6
--echo "configure:49231: checking whether build with IMAP works" >&5
-+echo "configure:49535: checking whether build with IMAP works" >&5
-
-
- old_LIBS=$LIBS
-@@ -49238,7 +49542,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 49242 "configure"
-+#line 49546 "configure"
- #include "confdefs.h"
-
-
-@@ -49265,7 +49569,7 @@
- }
-
- EOF
--if { (eval echo configure:49269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:49573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -49297,7 +49601,7 @@
- php_with_interbase=no
-
- echo $ac_n "checking for InterBase support""... $ac_c" 1>&6
--echo "configure:49301: checking for InterBase support" >&5
-+echo "configure:49605: checking for InterBase support" >&5
- # Check whether --with-interbase or --without-interbase was given.
- if test "${with_interbase+set}" = set; then
- withval="$with_interbase"
-@@ -49447,7 +49751,7 @@
- done
-
- echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
--echo "configure:49451: checking for isc_detach_database in -lfbclient" >&5
-+echo "configure:49755: 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
-@@ -49455,7 +49759,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lfbclient $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 49459 "configure"
-+#line 49763 "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
-@@ -49466,7 +49770,7 @@
- isc_detach_database()
- ; return 0; }
- EOF
--if { (eval echo configure:49470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:49774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -49593,7 +49897,7 @@
- done
-
- echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
--echo "configure:49597: checking for isc_detach_database in -lgds" >&5
-+echo "configure:49901: 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
-@@ -49601,7 +49905,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgds $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 49605 "configure"
-+#line 49909 "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
-@@ -49612,7 +49916,7 @@
- isc_detach_database()
- ; return 0; }
- EOF
--if { (eval echo configure:49616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:49920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -49739,7 +50043,7 @@
- done
-
- echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
--echo "configure:49743: checking for isc_detach_database in -lib_util" >&5
-+echo "configure:50047: 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
-@@ -49747,7 +50051,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lib_util $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 49751 "configure"
-+#line 50055 "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
-@@ -49758,7 +50062,7 @@
- isc_detach_database()
- ; return 0; }
- EOF
--if { (eval echo configure:49762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:50066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -50224,7 +50528,7 @@
- php_enable_json=yes
-
- echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6
--echo "configure:50228: checking whether to enable JavaScript Object Serialization support" >&5
-+echo "configure:50532: 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"
-@@ -50273,12 +50577,12 @@
- EOF
-
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:50277: checking for ANSI C header files" >&5
-+echo "configure:50581: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 50282 "configure"
-+#line 50586 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -50286,7 +50590,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:50290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:50594: \"$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*
-@@ -50303,7 +50607,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
--#line 50307 "configure"
-+#line 50611 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -50321,7 +50625,7 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 50325 "configure"
-+#line 50629 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -50342,7 +50646,7 @@
- :
- else
- cat > conftest.$ac_ext <<EOF
--#line 50346 "configure"
-+#line 50650 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -50353,7 +50657,7 @@
- exit (0); }
-
- EOF
--if { (eval echo configure:50357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:50661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -50672,7 +50976,7 @@
- php_with_ldap=no
-
- echo $ac_n "checking for LDAP support""... $ac_c" 1>&6
--echo "configure:50676: checking for LDAP support" >&5
-+echo "configure:50980: checking for LDAP support" >&5
- # Check whether --with-ldap or --without-ldap was given.
- if test "${with_ldap+set}" = set; then
- withval="$with_ldap"
-@@ -50719,7 +51023,7 @@
- php_with_ldap_sasl=no
-
- echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6
--echo "configure:50723: checking for LDAP Cyrus SASL support" >&5
-+echo "configure:51027: 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"
-@@ -53053,19 +53357,19 @@
- LIBS="$LIBS $LDAP_SHARED_LIBADD"
-
- echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6
--echo "configure:53057: checking for 3 arg ldap_set_rebind_proc" >&5
-+echo "configure:53361: checking for 3 arg ldap_set_rebind_proc" >&5
- if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 53062 "configure"
-+#line 53366 "configure"
- #include "confdefs.h"
- #include <ldap.h>
- int main() {
- ldap_set_rebind_proc(0,0,0)
- ; return 0; }
- EOF
--if { (eval echo configure:53069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:53373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_3arg_setrebindproc=yes
- else
-@@ -53088,12 +53392,12 @@
- 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:53092: checking for $ac_func" >&5
-+echo "configure:53396: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 53097 "configure"
-+#line 53401 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -53116,7 +53420,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:53120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:53424: \"$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
-@@ -53278,7 +53582,7 @@
- done
-
- echo $ac_n "checking for sasl_version in -lldap""... $ac_c" 1>&6
--echo "configure:53282: checking for sasl_version in -lldap" >&5
-+echo "configure:53586: checking for sasl_version in -lldap" >&5
- ac_lib_var=`echo ldap'_'sasl_version | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -53286,7 +53590,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lldap $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 53290 "configure"
-+#line 53594 "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
-@@ -53297,7 +53601,7 @@
- sasl_version()
- ; return 0; }
- EOF
--if { (eval echo configure:53301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:53605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -53466,12 +53770,12 @@
- fi
-
- echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6
--echo "configure:53470: checking for ldap_bind_s" >&5
-+echo "configure:53774: checking for ldap_bind_s" >&5
- if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 53475 "configure"
-+#line 53779 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char ldap_bind_s(); below. */
-@@ -53494,7 +53798,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:53498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:53802: \"$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
-@@ -53545,7 +53849,7 @@
- php_enable_mbstring=no
-
- echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6
--echo "configure:53549: checking whether to enable multibyte string support" >&5
-+echo "configure:53853: 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"
-@@ -53592,7 +53896,7 @@
- php_enable_mbregex=yes
-
- echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6
--echo "configure:53596: checking whether to enable multibyte regex support" >&5
-+echo "configure:53900: 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"
-@@ -53618,7 +53922,7 @@
- php_enable_mbregex_backtrack=yes
-
- echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6
--echo "configure:53622: checking whether to check multibyte regex backtrack" >&5
-+echo "configure:53926: 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"
-@@ -53644,7 +53948,7 @@
- php_with_libmbfl=no
-
- echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6
--echo "configure:53648: checking for external libmbfl" >&5
-+echo "configure:53952: checking for external libmbfl" >&5
- # Check whether --with-libmbfl or --without-libmbfl was given.
- if test "${with_libmbfl+set}" = set; then
- withval="$with_libmbfl"
-@@ -53680,7 +53984,7 @@
-
- if test "$PHP_MBREGEX" = "yes"; then
- echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
--echo "configure:53684: checking for variable length prototypes and stdarg.h" >&5
-+echo "configure:53988: checking for variable length prototypes and stdarg.h" >&5
- if eval "test \"`echo '$''{'cv_php_mbstring_stdarg'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -53699,7 +54003,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 53703 "configure"
-+#line 54007 "configure"
- #include "confdefs.h"
-
- #include <stdarg.h>
-@@ -53714,7 +54018,7 @@
- int main() { return foo(10, "", 3.14); }
-
- EOF
--if { (eval echo configure:53718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:54022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- cv_php_mbstring_stdarg=yes
- else
-@@ -53735,17 +54039,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:53739: checking for $ac_hdr" >&5
-+echo "configure:54043: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 53744 "configure"
-+#line 54048 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:53749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:54053: \"$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*
-@@ -53772,7 +54076,7 @@
- done
-
- echo $ac_n "checking size of int""... $ac_c" 1>&6
--echo "configure:53776: checking size of int" >&5
-+echo "configure:54080: 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
-@@ -53780,18 +54084,18 @@
- ac_cv_sizeof_int=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 53784 "configure"
-+#line 54088 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(int));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:53795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:54099: \"$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
-@@ -53811,7 +54115,7 @@
-
-
- echo $ac_n "checking size of short""... $ac_c" 1>&6
--echo "configure:53815: checking size of short" >&5
-+echo "configure:54119: 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
-@@ -53819,18 +54123,18 @@
- ac_cv_sizeof_short=2
- else
- cat > conftest.$ac_ext <<EOF
--#line 53823 "configure"
-+#line 54127 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(short));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:53834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:54138: \"$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
-@@ -53850,7 +54154,7 @@
-
-
- echo $ac_n "checking size of long""... $ac_c" 1>&6
--echo "configure:53854: checking size of long" >&5
-+echo "configure:54158: 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
-@@ -53858,18 +54162,18 @@
- ac_cv_sizeof_long=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 53862 "configure"
-+#line 54166 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:53873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:54177: \"$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
-@@ -53889,12 +54193,12 @@
-
-
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:53893: checking for working const" >&5
-+echo "configure:54197: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 53898 "configure"
-+#line 54202 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -53943,7 +54247,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:53947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:54251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_const=yes
- else
-@@ -53964,12 +54268,12 @@
- fi
-
- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:53968: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:54272: checking whether time.h and sys/time.h may both be included" >&5
- if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 53973 "configure"
-+#line 54277 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -53978,7 +54282,7 @@
- struct tm *tp;
- ; return 0; }
- EOF
--if { (eval echo configure:53982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:54286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_header_time=yes
- else
-@@ -54001,19 +54305,19 @@
- # 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:54005: checking for working alloca.h" >&5
-+echo "configure:54309: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 54010 "configure"
-+#line 54314 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:54017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:54321: \"$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
-@@ -54034,12 +54338,12 @@
- fi
-
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:54038: checking for alloca" >&5
-+echo "configure:54342: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 54043 "configure"
-+#line 54347 "configure"
- #include "confdefs.h"
-
- #ifdef __GNUC__
-@@ -54067,7 +54371,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:54071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:54375: \"$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
-@@ -54099,12 +54403,12 @@
-
-
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:54103: checking whether alloca needs Cray hooks" >&5
-+echo "configure:54407: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 54108 "configure"
-+#line 54412 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -54129,12 +54433,12 @@
- 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:54133: checking for $ac_func" >&5
-+echo "configure:54437: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 54138 "configure"
-+#line 54442 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -54157,7 +54461,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:54161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:54465: \"$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
-@@ -54184,7 +54488,7 @@
- fi
-
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:54188: checking stack direction for C alloca" >&5
-+echo "configure:54492: 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
-@@ -54192,7 +54496,7 @@
- ac_cv_c_stack_direction=0
- else
- cat > conftest.$ac_ext <<EOF
--#line 54196 "configure"
-+#line 54500 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -54211,7 +54515,7 @@
- exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:54215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:54519: \"$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
-@@ -54233,7 +54537,7 @@
- fi
-
- echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
--echo "configure:54237: checking for 8-bit clean memcmp" >&5
-+echo "configure:54541: 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
-@@ -54241,7 +54545,7 @@
- ac_cv_func_memcmp_clean=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 54245 "configure"
-+#line 54549 "configure"
- #include "confdefs.h"
-
- main()
-@@ -54251,7 +54555,7 @@
- }
-
- EOF
--if { (eval echo configure:54255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:54559: \"$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
-@@ -54601,7 +54905,7 @@
- done
-
- echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6
--echo "configure:54605: checking for mbfl_buffer_converter_new in -lmbfl" >&5
-+echo "configure:54909: 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
-@@ -54609,7 +54913,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lmbfl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 54613 "configure"
-+#line 54917 "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
-@@ -54620,7 +54924,7 @@
- mbfl_buffer_converter_new()
- ; return 0; }
- EOF
--if { (eval echo configure:54624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:54928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -55243,7 +55547,7 @@
- php_with_mcrypt=no
-
- echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6
--echo "configure:55247: checking for mcrypt support" >&5
-+echo "configure:55551: checking for mcrypt support" >&5
- # Check whether --with-mcrypt or --without-mcrypt was given.
- if test "${with_mcrypt+set}" = set; then
- withval="$with_mcrypt"
-@@ -55299,9 +55603,9 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=-I$MCRYPT_DIR/include
- echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6
--echo "configure:55303: checking for libmcrypt version" >&5
-+echo "configure:55607: checking for libmcrypt version" >&5
- cat > conftest.$ac_ext <<EOF
--#line 55305 "configure"
-+#line 55609 "configure"
- #include "confdefs.h"
-
- #include <mcrypt.h>
-@@ -55425,7 +55729,7 @@
- done
-
- echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
--echo "configure:55429: checking for mcrypt_module_open in -lmcrypt" >&5
-+echo "configure:55733: 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
-@@ -55433,7 +55737,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lmcrypt $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 55437 "configure"
-+#line 55741 "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
-@@ -55444,7 +55748,7 @@
- mcrypt_module_open()
- ; return 0; }
- EOF
--if { (eval echo configure:55448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:55752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -55597,7 +55901,7 @@
- done
-
- echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
--echo "configure:55601: checking for mcrypt_module_open in -lmcrypt" >&5
-+echo "configure:55905: 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
-@@ -55605,7 +55909,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lmcrypt $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 55609 "configure"
-+#line 55913 "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
-@@ -55616,7 +55920,7 @@
- mcrypt_module_open()
- ; return 0; }
- EOF
--if { (eval echo configure:55620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:55924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -56078,7 +56382,7 @@
- php_with_mhash=no
-
- echo $ac_n "checking for mhash support""... $ac_c" 1>&6
--echo "configure:56082: checking for mhash support" >&5
-+echo "configure:56386: checking for mhash support" >&5
- # Check whether --with-mhash or --without-mhash was given.
- if test "${with_mhash+set}" = set; then
- withval="$with_mhash"
-@@ -56554,7 +56858,7 @@
- php_with_mime_magic=no
-
- echo $ac_n "checking whether to include mime_magic support""... $ac_c" 1>&6
--echo "configure:56558: checking whether to include mime_magic support" >&5
-+echo "configure:56862: checking whether to include mime_magic support" >&5
- # Check whether --with-mime-magic or --without-mime-magic was given.
- if test "${with_mime_magic+set}" = set; then
- withval="$with_mime_magic"
-@@ -56912,7 +57216,7 @@
- php_with_ming=no
-
- echo $ac_n "checking for MING support""... $ac_c" 1>&6
--echo "configure:56916: checking for MING support" >&5
-+echo "configure:57220: checking for MING support" >&5
- # Check whether --with-ming or --without-ming was given.
- if test "${with_ming+set}" = set; then
- withval="$with_ming"
-@@ -56957,7 +57261,7 @@
-
- if test "$PHP_MING" != "no"; then
- echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
--echo "configure:56961: checking for sin in -lm" >&5
-+echo "configure:57265: 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
-@@ -56965,7 +57269,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lm $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 56969 "configure"
-+#line 57273 "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
-@@ -56976,7 +57280,7 @@
- sin()
- ; return 0; }
- EOF
--if { (eval echo configure:56980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:57284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -57123,7 +57427,7 @@
- done
-
- echo $ac_n "checking for Ming_useSWFVersion in -lming""... $ac_c" 1>&6
--echo "configure:57127: checking for Ming_useSWFVersion in -lming" >&5
-+echo "configure:57431: checking for Ming_useSWFVersion in -lming" >&5
- ac_lib_var=`echo ming'_'Ming_useSWFVersion | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -57131,7 +57435,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lming $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 57135 "configure"
-+#line 57439 "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
-@@ -57142,7 +57446,7 @@
- Ming_useSWFVersion()
- ; return 0; }
- EOF
--if { (eval echo configure:57146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:57450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -57405,7 +57709,7 @@
- done
-
- echo $ac_n "checking for SWFPrebuiltClip in -lming""... $ac_c" 1>&6
--echo "configure:57409: checking for SWFPrebuiltClip in -lming" >&5
-+echo "configure:57713: checking for SWFPrebuiltClip in -lming" >&5
- ac_lib_var=`echo ming'_'SWFPrebuiltClip | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -57413,7 +57717,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lming $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 57417 "configure"
-+#line 57721 "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
-@@ -57424,7 +57728,7 @@
- SWFPrebuiltClip()
- ; return 0; }
- EOF
--if { (eval echo configure:57428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:57732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -57553,7 +57857,7 @@
- done
-
- echo $ac_n "checking for SWFMovie_namedAnchor in -lming""... $ac_c" 1>&6
--echo "configure:57557: checking for SWFMovie_namedAnchor in -lming" >&5
-+echo "configure:57861: checking for SWFMovie_namedAnchor in -lming" >&5
- ac_lib_var=`echo ming'_'SWFMovie_namedAnchor | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -57561,7 +57865,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lming $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 57565 "configure"
-+#line 57869 "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
-@@ -57572,7 +57876,7 @@
- SWFMovie_namedAnchor()
- ; return 0; }
- EOF
--if { (eval echo configure:57576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:57880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -57701,7 +58005,7 @@
- done
-
- echo $ac_n "checking for Ming_setSWFCompression in -lming""... $ac_c" 1>&6
--echo "configure:57705: checking for Ming_setSWFCompression in -lming" >&5
-+echo "configure:58009: checking for Ming_setSWFCompression in -lming" >&5
- ac_lib_var=`echo ming'_'Ming_setSWFCompression | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -57709,7 +58013,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lming $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 57713 "configure"
-+#line 58017 "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
-@@ -57720,7 +58024,7 @@
- Ming_setSWFCompression()
- ; return 0; }
- EOF
--if { (eval echo configure:57724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:58028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -57757,14 +58061,14 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=-I$MING_INC_DIR
- echo $ac_n "checking for destroySWFBlock""... $ac_c" 1>&6
--echo "configure:57761: checking for destroySWFBlock" >&5
-+echo "configure:58065: checking for destroySWFBlock" >&5
- if test "$cross_compiling" = yes; then
-
- echo "$ac_t""unknown" 1>&6
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 57768 "configure"
-+#line 58072 "configure"
- #include "confdefs.h"
-
- #include "ming.h"
-@@ -57776,7 +58080,7 @@
- }
-
- EOF
--if { (eval echo configure:57780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:58084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- echo "$ac_t""missing" 1>&6
-@@ -57798,7 +58102,7 @@
-
-
- cat > conftest.$ac_ext <<EOF
--#line 57802 "configure"
-+#line 58106 "configure"
- #include "confdefs.h"
-
- #include <ming.h>
-@@ -57825,7 +58129,7 @@
-
-
- cat > conftest.$ac_ext <<EOF
--#line 57829 "configure"
-+#line 58133 "configure"
- #include "confdefs.h"
-
- #include <ming.h>
-@@ -57836,7 +58140,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:57840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:58144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- cat >> confdefs.h <<\EOF
-@@ -58144,7 +58448,7 @@
- php_with_msql=no
-
- echo $ac_n "checking for mSQL support""... $ac_c" 1>&6
--echo "configure:58148: checking for mSQL support" >&5
-+echo "configure:58452: checking for mSQL support" >&5
- # Check whether --with-msql or --without-msql was given.
- if test "${with_msql+set}" = set; then
- withval="$with_msql"
-@@ -58613,11 +58917,11 @@
-
-
- echo $ac_n "checking mSQL version""... $ac_c" 1>&6
--echo "configure:58617: checking mSQL version" >&5
-+echo "configure:58921: checking mSQL version" >&5
- ac_php_oldcppflags=$CPPFLAGS
- CPPFLAGS="$INCLUDES $CPPFLAGS"
- cat > conftest.$ac_ext <<EOF
--#line 58621 "configure"
-+#line 58925 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include "msql.h"
-@@ -58625,7 +58929,7 @@
- int i = IDX_TYPE
- ; return 0; }
- EOF
--if { (eval echo configure:58629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:58933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- cat >> confdefs.h <<\EOF
-@@ -58657,7 +58961,7 @@
- php_with_mssql=no
-
- echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6
--echo "configure:58661: checking for MSSQL support via FreeTDS" >&5
-+echo "configure:58965: 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"
-@@ -59147,7 +59451,7 @@
- fi
-
- echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:59151: checking for dnet_addr in -ldnet_stub" >&5
-+echo "configure:59455: 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
-@@ -59155,7 +59459,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldnet_stub $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 59159 "configure"
-+#line 59463 "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
-@@ -59166,7 +59470,7 @@
- dnet_addr()
- ; return 0; }
- EOF
--if { (eval echo configure:59170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:59474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -59310,7 +59614,7 @@
- php_with_mysql=no
-
- echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
--echo "configure:59314: checking for MySQL support" >&5
-+echo "configure:59618: checking for MySQL support" >&5
- # Check whether --with-mysql or --without-mysql was given.
- if test "${with_mysql+set}" = set; then
- withval="$with_mysql"
-@@ -59357,7 +59661,7 @@
- php_with_mysql_sock=no
-
- echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6
--echo "configure:59361: checking for specified location of the MySQL UNIX socket" >&5
-+echo "configure:59665: 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"
-@@ -59384,7 +59688,7 @@
- php_with_zlib_dir=no
-
- echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
--echo "configure:59388: checking for the location of libz" >&5
-+echo "configure:59692: 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"
-@@ -59415,7 +59719,7 @@
-
-
- echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6
--echo "configure:59419: checking for MySQL UNIX socket location" >&5
-+echo "configure:59723: checking for MySQL UNIX socket location" >&5
- if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
- MYSQL_SOCK=$PHP_MYSQL_SOCK
- cat >> confdefs.h <<EOF
-@@ -59606,7 +59910,7 @@
- done
-
- echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
--echo "configure:59610: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
-+echo "configure:59914: 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
-@@ -59614,7 +59918,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$MYSQL_LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 59618 "configure"
-+#line 59922 "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
-@@ -59625,7 +59929,7 @@
- mysql_close()
- ; return 0; }
- EOF
--if { (eval echo configure:59629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:59933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -59848,7 +60152,7 @@
- done
-
- echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
--echo "configure:59852: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
-+echo "configure:60156: 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
-@@ -59856,7 +60160,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$MYSQL_LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 59860 "configure"
-+#line 60164 "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
-@@ -59867,7 +60171,7 @@
- mysql_error()
- ; return 0; }
- EOF
--if { (eval echo configure:59871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:60175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -60022,7 +60326,7 @@
- done
-
- echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
--echo "configure:60026: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
-+echo "configure:60330: 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
-@@ -60030,7 +60334,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$MYSQL_LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 60034 "configure"
-+#line 60338 "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
-@@ -60041,7 +60345,7 @@
- mysql_errno()
- ; return 0; }
- EOF
--if { (eval echo configure:60045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:60349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -60523,7 +60827,7 @@
- php_with_mysqli=no
-
- echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6
--echo "configure:60527: checking for MySQLi support" >&5
-+echo "configure:60831: checking for MySQLi support" >&5
- # Check whether --with-mysqli or --without-mysqli was given.
- if test "${with_mysqli+set}" = set; then
- withval="$with_mysqli"
-@@ -60570,7 +60874,7 @@
- php_enable_embedded_mysqli=no
-
- echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6
--echo "configure:60574: checking whether to enable embedded MySQLi support" >&5
-+echo "configure:60878: 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"
-@@ -60721,7 +61025,7 @@
- done
-
- echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
--echo "configure:60725: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
-+echo "configure:61029: 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
-@@ -60729,7 +61033,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$MYSQL_LIB_NAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 60733 "configure"
-+#line 61037 "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
-@@ -60740,7 +61044,7 @@
- mysql_set_server_option()
- ; return 0; }
- EOF
--if { (eval echo configure:60744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:61048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -60988,7 +61292,7 @@
- done
-
- echo $ac_n "checking for mysql_stmt_field_count in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
--echo "configure:60992: checking for mysql_stmt_field_count in -l$MYSQL_LIB_NAME" >&5
-+echo "configure:61296: checking for mysql_stmt_field_count in -l$MYSQL_LIB_NAME" >&5
- ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_field_count | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -60996,7 +61300,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$MYSQL_LIB_NAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 61000 "configure"
-+#line 61304 "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
-@@ -61007,7 +61311,7 @@
- mysql_stmt_field_count()
- ; return 0; }
- EOF
--if { (eval echo configure:61011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:61315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -61345,7 +61649,7 @@
- php_with_ncurses=no
-
- echo $ac_n "checking for ncurses support""... $ac_c" 1>&6
--echo "configure:61349: checking for ncurses support" >&5
-+echo "configure:61653: checking for ncurses support" >&5
- # Check whether --with-ncurses or --without-ncurses was given.
- if test "${with_ncurses+set}" = set; then
- withval="$with_ncurses"
-@@ -61552,7 +61856,7 @@
- done
-
- echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
--echo "configure:61556: checking for $LIBSYMBOL in -l$LIBNAME" >&5
-+echo "configure:61860: 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
-@@ -61560,7 +61864,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 61564 "configure"
-+#line 61868 "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
-@@ -61571,7 +61875,7 @@
- $LIBSYMBOL()
- ; return 0; }
- EOF
--if { (eval echo configure:61575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:61879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -61790,7 +62094,7 @@
- done
-
- echo $ac_n "checking for new_panel in -lpanel""... $ac_c" 1>&6
--echo "configure:61794: checking for new_panel in -lpanel" >&5
-+echo "configure:62098: checking for new_panel in -lpanel" >&5
- ac_lib_var=`echo panel'_'new_panel | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -61798,7 +62102,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpanel $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 61802 "configure"
-+#line 62106 "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
-@@ -61809,7 +62113,7 @@
- new_panel()
- ; return 0; }
- EOF
--if { (eval echo configure:61813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:62117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -61957,7 +62261,7 @@
-
-
- echo $ac_n "checking for color_set in -l$LIBNAME""... $ac_c" 1>&6
--echo "configure:61961: checking for color_set in -l$LIBNAME" >&5
-+echo "configure:62265: checking for color_set in -l$LIBNAME" >&5
- ac_lib_var=`echo $LIBNAME'_'color_set | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -61965,7 +62269,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 61969 "configure"
-+#line 62273 "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
-@@ -61976,7 +62280,7 @@
- color_set()
- ; return 0; }
- EOF
--if { (eval echo configure:61980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:62284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -62000,7 +62304,7 @@
- fi
-
- echo $ac_n "checking for slk_color in -l$LIBNAME""... $ac_c" 1>&6
--echo "configure:62004: checking for slk_color in -l$LIBNAME" >&5
-+echo "configure:62308: checking for slk_color in -l$LIBNAME" >&5
- ac_lib_var=`echo $LIBNAME'_'slk_color | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -62008,7 +62312,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 62012 "configure"
-+#line 62316 "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
-@@ -62019,7 +62323,7 @@
- slk_color()
- ; return 0; }
- EOF
--if { (eval echo configure:62023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:62327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -62043,7 +62347,7 @@
- fi
-
- echo $ac_n "checking for assume_default_colors in -l$LIBNAME""... $ac_c" 1>&6
--echo "configure:62047: checking for assume_default_colors in -l$LIBNAME" >&5
-+echo "configure:62351: checking for assume_default_colors in -l$LIBNAME" >&5
- ac_lib_var=`echo $LIBNAME'_'assume_default_colors | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -62051,7 +62355,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 62055 "configure"
-+#line 62359 "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
-@@ -62062,7 +62366,7 @@
- assume_default_colors()
- ; return 0; }
- EOF
--if { (eval echo configure:62066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:62370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -62086,7 +62390,7 @@
- fi
-
- echo $ac_n "checking for use_extended_names in -l$LIBNAME""... $ac_c" 1>&6
--echo "configure:62090: checking for use_extended_names in -l$LIBNAME" >&5
-+echo "configure:62394: checking for use_extended_names in -l$LIBNAME" >&5
- ac_lib_var=`echo $LIBNAME'_'use_extended_names | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -62094,7 +62398,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 62098 "configure"
-+#line 62402 "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
-@@ -62105,7 +62409,7 @@
- use_extended_names()
- ; return 0; }
- EOF
--if { (eval echo configure:62109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:62413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -62437,7 +62741,7 @@
- php_with_oci8=no
-
- echo $ac_n "checking for Oracle (OCI8) support""... $ac_c" 1>&6
--echo "configure:62441: checking for Oracle (OCI8) support" >&5
-+echo "configure:62745: checking for Oracle (OCI8) support" >&5
- # Check whether --with-oci8 or --without-oci8 was given.
- if test "${with_oci8+set}" = set; then
- withval="$with_oci8"
-@@ -62482,7 +62786,7 @@
-
- if test "$PHP_OCI8" != "no"; then
- echo $ac_n "checking PHP version""... $ac_c" 1>&6
--echo "configure:62486: checking PHP version" >&5
-+echo "configure:62790: checking PHP version" >&5
-
- tmp_version=$PHP_VERSION
- if test -z "$tmp_version"; then
-@@ -62536,7 +62840,7 @@
- if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
-
- echo $ac_n "checking Oracle Install Directory""... $ac_c" 1>&6
--echo "configure:62540: checking Oracle Install Directory" >&5
-+echo "configure:62844: checking Oracle Install Directory" >&5
- if test "$PHP_OCI8" = "yes"; then
- OCI8_DIR=$ORACLE_HOME
- else
-@@ -62546,7 +62850,7 @@
-
-
- echo $ac_n "checking size of long int""... $ac_c" 1>&6
--echo "configure:62550: checking size of long int" >&5
-+echo "configure:62854: 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
-@@ -62554,18 +62858,18 @@
- ac_cv_sizeof_long_int=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 62558 "configure"
-+#line 62862 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long int));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:62569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:62873: \"$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
-@@ -62585,7 +62889,7 @@
-
-
- echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6
--echo "configure:62589: checking if we're on a 64-bit platform" >&5
-+echo "configure:62893: 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_OCI8_LIB_DIR=lib32
-@@ -62595,7 +62899,7 @@
- fi
-
- echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
--echo "configure:62599: checking OCI8 libraries dir" >&5
-+echo "configure:62903: checking OCI8 libraries dir" >&5
- if test -d "$OCI8_DIR/lib" && test ! -d "$OCI8_DIR/lib32"; then
- OCI8_LIB_DIR=lib
- elif test ! -d "$OCI8_DIR/lib" && test -d "$OCI8_DIR/lib32"; then
-@@ -62929,7 +63233,7 @@
-
-
- echo $ac_n "checking Oracle version""... $ac_c" 1>&6
--echo "configure:62933: checking Oracle version" >&5
-+echo "configure:63237: checking Oracle version" >&5
- if test -s "$OCI8_DIR/orainst/unix.rgs"; then
- OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/ */:/g' | cut -d: -f 6 | cut -c 2-4`
- test -z "$OCI8_VERSION" && OCI8_VERSION=7.3
-@@ -63444,7 +63748,7 @@
- done
-
- echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
--echo "configure:63448: checking for OCIEnvCreate in -lclntsh" >&5
-+echo "configure:63752: 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
-@@ -63452,7 +63756,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 63456 "configure"
-+#line 63760 "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
-@@ -63463,7 +63767,7 @@
- OCIEnvCreate()
- ; return 0; }
- EOF
--if { (eval echo configure:63467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:63771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -63597,7 +63901,7 @@
- done
-
- echo $ac_n "checking for OCIStmtPrepare2 in -lclntsh""... $ac_c" 1>&6
--echo "configure:63601: checking for OCIStmtPrepare2 in -lclntsh" >&5
-+echo "configure:63905: checking for OCIStmtPrepare2 in -lclntsh" >&5
- ac_lib_var=`echo clntsh'_'OCIStmtPrepare2 | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -63605,7 +63909,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 63609 "configure"
-+#line 63913 "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
-@@ -63616,7 +63920,7 @@
- OCIStmtPrepare2()
- ; return 0; }
- EOF
--if { (eval echo configure:63620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:63924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -63814,7 +64118,7 @@
- done
-
- echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
--echo "configure:63818: checking for OCIEnvCreate in -lclntsh" >&5
-+echo "configure:64122: 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
-@@ -63822,7 +64126,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 63826 "configure"
-+#line 64130 "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
-@@ -63833,7 +64137,7 @@
- OCIEnvCreate()
- ; return 0; }
- EOF
--if { (eval echo configure:63837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:64141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -63967,7 +64271,7 @@
- done
-
- echo $ac_n "checking for OCIStmtPrepare2 in -lclntsh""... $ac_c" 1>&6
--echo "configure:63971: checking for OCIStmtPrepare2 in -lclntsh" >&5
-+echo "configure:64275: checking for OCIStmtPrepare2 in -lclntsh" >&5
- ac_lib_var=`echo clntsh'_'OCIStmtPrepare2 | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -63975,7 +64279,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 63979 "configure"
-+#line 64283 "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
-@@ -63986,7 +64290,7 @@
- OCIStmtPrepare2()
- ; return 0; }
- EOF
--if { (eval echo configure:63990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:64294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -64026,7 +64330,7 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=$OCI8_INCLUDES
- cat > conftest.$ac_ext <<EOF
--#line 64030 "configure"
-+#line 64334 "configure"
- #include "confdefs.h"
-
- #include <oci.h>
-@@ -64221,7 +64525,7 @@
- done
-
- echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
--echo "configure:64225: checking for OCIEnvNlsCreate in -lclntsh" >&5
-+echo "configure:64529: 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
-@@ -64229,7 +64533,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 64233 "configure"
-+#line 64537 "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
-@@ -64240,7 +64544,7 @@
- OCIEnvNlsCreate()
- ; return 0; }
- EOF
--if { (eval echo configure:64244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:64548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -64357,7 +64661,7 @@
- done
-
- echo $ac_n "checking for OCINlsCharSetNameToId in -lclntsh""... $ac_c" 1>&6
--echo "configure:64361: checking for OCINlsCharSetNameToId in -lclntsh" >&5
-+echo "configure:64665: checking for OCINlsCharSetNameToId in -lclntsh" >&5
- ac_lib_var=`echo clntsh'_'OCINlsCharSetNameToId | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -64365,7 +64669,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 64369 "configure"
-+#line 64673 "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
-@@ -64376,7 +64680,7 @@
- OCINlsCharSetNameToId()
- ; return 0; }
- EOF
--if { (eval echo configure:64380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:64684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -64523,7 +64827,7 @@
- done
-
- echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
--echo "configure:64527: checking for OCIEnvCreate in -lclntsh" >&5
-+echo "configure:64831: 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
-@@ -64531,7 +64835,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 64535 "configure"
-+#line 64839 "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
-@@ -64542,7 +64846,7 @@
- OCIEnvCreate()
- ; return 0; }
- EOF
--if { (eval echo configure:64546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:64850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -64676,7 +64980,7 @@
- done
-
- echo $ac_n "checking for OCIStmtPrepare2 in -lclntsh""... $ac_c" 1>&6
--echo "configure:64680: checking for OCIStmtPrepare2 in -lclntsh" >&5
-+echo "configure:64984: checking for OCIStmtPrepare2 in -lclntsh" >&5
- ac_lib_var=`echo clntsh'_'OCIStmtPrepare2 | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -64684,7 +64988,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 64688 "configure"
-+#line 64992 "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
-@@ -64695,7 +64999,7 @@
- OCIStmtPrepare2()
- ; return 0; }
- EOF
--if { (eval echo configure:64699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:65003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -64829,7 +65133,7 @@
- done
-
- echo $ac_n "checking for OCILobRead2 in -lclntsh""... $ac_c" 1>&6
--echo "configure:64833: checking for OCILobRead2 in -lclntsh" >&5
-+echo "configure:65137: checking for OCILobRead2 in -lclntsh" >&5
- ac_lib_var=`echo clntsh'_'OCILobRead2 | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -64837,7 +65141,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 64841 "configure"
-+#line 65145 "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
-@@ -64848,7 +65152,7 @@
- OCILobRead2()
- ; return 0; }
- EOF
--if { (eval echo configure:64852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:65156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -65080,7 +65384,7 @@
- done
-
- echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
--echo "configure:65084: checking for OCILobIsTemporary in -lclntsh" >&5
-+echo "configure:65388: 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
-@@ -65088,7 +65392,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 65092 "configure"
-+#line 65396 "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
-@@ -65099,7 +65403,7 @@
- OCILobIsTemporary()
- ; return 0; }
- EOF
--if { (eval echo configure:65103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:65407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -65229,7 +65533,7 @@
- done
-
- echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
--echo "configure:65233: checking for OCILobIsTemporary in -locijdbc8" >&5
-+echo "configure:65537: 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
-@@ -65237,7 +65541,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-locijdbc8 $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 65241 "configure"
-+#line 65545 "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
-@@ -65248,7 +65552,7 @@
- OCILobIsTemporary()
- ; return 0; }
- EOF
--if { (eval echo configure:65252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:65556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -65409,7 +65713,7 @@
- done
-
- echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
--echo "configure:65413: checking for OCICollAssign in -lclntsh" >&5
-+echo "configure:65717: 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
-@@ -65417,7 +65721,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 65421 "configure"
-+#line 65725 "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
-@@ -65428,7 +65732,7 @@
- OCICollAssign()
- ; return 0; }
- EOF
--if { (eval echo configure:65432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:65736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -66054,7 +66358,7 @@
- elif test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
-
- echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
--echo "configure:66058: checking Oracle Instant Client directory" >&5
-+echo "configure:66362: checking Oracle Instant Client directory" >&5
- if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
- PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client/lib 2> /dev/null | tail -1`
- if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
-@@ -66066,7 +66370,7 @@
- OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
-
- echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
--echo "configure:66070: checking Oracle Instant Client SDK header directory" >&5
-+echo "configure:66374: checking Oracle Instant Client SDK header directory" >&5
-
- OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client/lib/*$!/usr/include/oracle/\1/client!'`
-
-@@ -66275,7 +66579,7 @@
-
-
- echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6
--echo "configure:66279: checking Oracle Instant Client version" >&5
-+echo "configure:66583: checking Oracle Instant Client version" >&5
- if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz11.$SHLIB_SUFFIX_NAME; then
- if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
- if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
-@@ -66769,7 +67073,7 @@
-
- if test "$PHP_ADABAS" != "no"; then
- echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
--echo "configure:66773: checking for Adabas support" >&5
-+echo "configure:67077: checking for Adabas support" >&5
- if test "$PHP_ADABAS" = "yes"; then
- PHP_ADABAS=/usr/local
- fi
-@@ -66975,7 +67279,7 @@
-
- if test "$PHP_SAPDB" != "no"; then
- echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
--echo "configure:66979: checking for SAP DB support" >&5
-+echo "configure:67283: checking for SAP DB support" >&5
- if test "$PHP_SAPDB" = "yes"; then
- PHP_SAPDB=/usr/local
- fi
-@@ -67111,7 +67415,7 @@
-
- if test "$PHP_SOLID" != "no"; then
- echo $ac_n "checking for Solid support""... $ac_c" 1>&6
--echo "configure:67115: checking for Solid support" >&5
-+echo "configure:67419: checking for Solid support" >&5
- if test "$PHP_SOLID" = "yes"; then
- PHP_SOLID=/usr/local/solid
- fi
-@@ -67138,7 +67442,7 @@
- echo "$ac_t""$ext_output" 1>&6
-
- echo $ac_n "checking Solid library file""... $ac_c" 1>&6
--echo "configure:67142: checking Solid library file" >&5
-+echo "configure:67446: 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
-@@ -67262,7 +67566,7 @@
-
- if test "$PHP_IBM_DB2" != "no"; then
- echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
--echo "configure:67266: checking for IBM DB2 support" >&5
-+echo "configure:67570: 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
-@@ -67293,7 +67597,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 67297 "configure"
-+#line 67601 "configure"
- #include "confdefs.h"
-
-
-@@ -67304,7 +67608,7 @@
- }
-
- EOF
--if { (eval echo configure:67308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:67612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -67388,7 +67692,7 @@
-
- if test "$PHP_ODBCROUTER" != "no"; then
- echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6
--echo "configure:67392: checking for ODBCRouter.com support" >&5
-+echo "configure:67696: checking for ODBCRouter.com support" >&5
- if test "$PHP_ODBCROUTER" = "yes"; then
- PHP_ODBCROUTER=/usr
- fi
-@@ -67455,7 +67759,7 @@
-
- if test "$PHP_EMPRESS" != "no"; then
- echo $ac_n "checking for Empress support""... $ac_c" 1>&6
--echo "configure:67459: checking for Empress support" >&5
-+echo "configure:67763: checking for Empress support" >&5
- if test "$PHP_EMPRESS" = "yes"; then
- ODBC_INCDIR=$EMPRESSPATH/include/odbc
- ODBC_LIBDIR=$EMPRESSPATH/shlib
-@@ -67473,7 +67777,7 @@
- echo "$ac_t""$ext_output" 1>&6
-
- echo $ac_n "checking Empress library file""... $ac_c" 1>&6
--echo "configure:67477: checking Empress library file" >&5
-+echo "configure:67781: 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`
-@@ -67532,7 +67836,7 @@
-
- if test "$PHP_EMPRESS_BCS" != "no"; then
- echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
--echo "configure:67536: checking for Empress local access support" >&5
-+echo "configure:67840: checking for Empress local access support" >&5
- if test "$PHP_EMPRESS_BCS" = "yes"; then
- ODBC_INCDIR=$EMPRESSPATH/include/odbc
- ODBC_LIBDIR=$EMPRESSPATH/shlib
-@@ -67566,7 +67870,7 @@
- echo "$ac_t""$ext_output" 1>&6
-
- echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
--echo "configure:67570: checking Empress local access library file" >&5
-+echo "configure:67874: 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`
-@@ -67625,7 +67929,7 @@
-
- if test "$PHP_BIRDSTEP" != "no"; then
- echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
--echo "configure:67629: checking for Birdstep support" >&5
-+echo "configure:67933: checking for Birdstep support" >&5
- if test "$PHP_BIRDSTEP" = "yes"; then
- ODBC_INCDIR=/usr/local/birdstep/include
- ODBC_LIBDIR=/usr/local/birdstep/lib
-@@ -67740,7 +68044,7 @@
-
- if test "$PHP_CUSTOM_ODBC" != "no"; then
- echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
--echo "configure:67744: checking for a custom ODBC support" >&5
-+echo "configure:68048: checking for a custom ODBC support" >&5
- if test "$PHP_CUSTOM_ODBC" = "yes"; then
- PHP_CUSTOM_ODBC=/usr/local
- fi
-@@ -67807,7 +68111,7 @@
-
- if test "$PHP_IODBC" != "no"; then
- echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
--echo "configure:67811: checking for iODBC support" >&5
-+echo "configure:68115: checking for iODBC support" >&5
- if test "$PHP_IODBC" = "yes"; then
- PHP_IODBC=/usr/local
- fi
-@@ -67956,7 +68260,7 @@
-
- if test "$PHP_ESOOB" != "no"; then
- echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
--echo "configure:67960: checking for Easysoft ODBC-ODBC Bridge support" >&5
-+echo "configure:68264: checking for Easysoft ODBC-ODBC Bridge support" >&5
- if test "$PHP_ESOOB" = "yes"; then
- PHP_ESOOB=/usr/local/easysoft/oob/client
- fi
-@@ -68023,7 +68327,7 @@
-
- if test "$PHP_UNIXODBC" != "no"; then
- echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
--echo "configure:68027: checking for unixODBC support" >&5
-+echo "configure:68331: checking for unixODBC support" >&5
- if test "$PHP_UNIXODBC" = "yes"; then
- PHP_UNIXODBC=/usr/local
- fi
-@@ -68095,7 +68399,7 @@
-
- if test "$PHP_DBMAKER" != "no"; then
- echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
--echo "configure:68099: checking for DBMaker support" >&5
-+echo "configure:68403: 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}'`
-@@ -68647,7 +68951,7 @@
- php_enable_pcntl=no
-
- echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
--echo "configure:68651: checking whether to enable pcntl support" >&5
-+echo "configure:68955: 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"
-@@ -68695,12 +68999,12 @@
- for ac_func in fork
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:68699: checking for $ac_func" >&5
-+echo "configure:69003: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 68704 "configure"
-+#line 69008 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -68723,7 +69027,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:68727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:69031: \"$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
-@@ -68754,12 +69058,12 @@
- for ac_func in waitpid
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:68758: checking for $ac_func" >&5
-+echo "configure:69062: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 68763 "configure"
-+#line 69067 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -68782,7 +69086,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:68786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:69090: \"$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
-@@ -68813,12 +69117,12 @@
- for ac_func in sigaction
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:68817: checking for $ac_func" >&5
-+echo "configure:69121: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 68822 "configure"
-+#line 69126 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -68841,7 +69145,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:68845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:69149: \"$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
-@@ -68872,12 +69176,12 @@
- for ac_func in getpriority setpriority wait3
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:68876: checking for $ac_func" >&5
-+echo "configure:69180: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 68881 "configure"
-+#line 69185 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -68900,7 +69204,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:68904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:69208: \"$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
-@@ -69215,7 +69519,7 @@
- php_enable_pdo=yes
-
- echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6
--echo "configure:69219: checking whether to enable PDO support" >&5
-+echo "configure:69523: 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"
-@@ -69640,7 +69944,7 @@
- php_with_pdo_dblib=no
-
- echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6
--echo "configure:69644: checking for PDO_DBLIB support via FreeTDS" >&5
-+echo "configure:69948: 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"
-@@ -69857,13 +70161,13 @@
-
-
- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:69861: checking for PDO includes" >&5
-+echo "configure:70165: 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:69867: checking for PDO includes" >&5
-+echo "configure:70171: 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
-@@ -70166,7 +70470,7 @@
- fi
-
- echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:70170: checking for dnet_addr in -ldnet_stub" >&5
-+echo "configure:70474: 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
-@@ -70174,7 +70478,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldnet_stub $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 70178 "configure"
-+#line 70482 "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
-@@ -70185,7 +70489,7 @@
- dnet_addr()
- ; return 0; }
- EOF
--if { (eval echo configure:70189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:70493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -70350,7 +70654,7 @@
- php_with_pdo_firebird=no
-
- echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6
--echo "configure:70354: checking for Firebird support for PDO" >&5
-+echo "configure:70658: 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"
-@@ -70500,7 +70804,7 @@
- done
-
- echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
--echo "configure:70504: checking for isc_detach_database in -lfbclient" >&5
-+echo "configure:70808: 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
-@@ -70508,7 +70812,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lfbclient $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 70512 "configure"
-+#line 70816 "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
-@@ -70519,7 +70823,7 @@
- isc_detach_database()
- ; return 0; }
- EOF
--if { (eval echo configure:70523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:70827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -70646,7 +70950,7 @@
- done
-
- echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
--echo "configure:70650: checking for isc_detach_database in -lgds" >&5
-+echo "configure:70954: 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
-@@ -70654,7 +70958,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lgds $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 70658 "configure"
-+#line 70962 "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
-@@ -70665,7 +70969,7 @@
- isc_detach_database()
- ; return 0; }
- EOF
--if { (eval echo configure:70669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:70973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -70792,7 +71096,7 @@
- done
-
- echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
--echo "configure:70796: checking for isc_detach_database in -lib_util" >&5
-+echo "configure:71100: 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
-@@ -70800,7 +71104,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lib_util $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 70804 "configure"
-+#line 71108 "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
-@@ -70811,7 +71115,7 @@
- isc_detach_database()
- ; return 0; }
- EOF
--if { (eval echo configure:70815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:71119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -70856,13 +71160,13 @@
-
-
- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:70860: checking for PDO includes" >&5
-+echo "configure:71164: 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:70866: checking for PDO includes" >&5
-+echo "configure:71170: 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
-@@ -71329,7 +71633,7 @@
- php_with_pdo_mysql=no
-
- echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6
--echo "configure:71333: checking for MySQL support for PDO" >&5
-+echo "configure:71637: 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"
-@@ -71377,7 +71681,7 @@
- php_with_zlib_dir=no
-
- echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
--echo "configure:71381: checking for the location of libz" >&5
-+echo "configure:71685: 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"
-@@ -71407,7 +71711,7 @@
-
-
- echo $ac_n "checking for mysql_config""... $ac_c" 1>&6
--echo "configure:71411: checking for mysql_config" >&5
-+echo "configure:71715: checking for mysql_config" >&5
-
- if test -f $PHP_PDO_MYSQL && test -x $PHP_PDO_MYSQL ; then
- PDO_MYSQL_CONFIG=$PHP_PDO_MYSQL
-@@ -71441,7 +71745,7 @@
- # 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:71445: checking for $ac_word" >&5
-+echo "configure:71749: 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
-@@ -71489,7 +71793,7 @@
- else
- echo "$ac_t""not found" 1>&6
- echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6
--echo "configure:71493: checking for mysql install under $PDO_MYSQL_DIR" >&5
-+echo "configure:71797: 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
-@@ -71743,7 +72047,7 @@
- done
-
- echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
--echo "configure:71747: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
-+echo "configure:72051: 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
-@@ -71751,7 +72055,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 71755 "configure"
-+#line 72059 "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
-@@ -71762,7 +72066,7 @@
- mysql_query()
- ; return 0; }
- EOF
--if { (eval echo configure:71766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:72070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -72115,7 +72419,7 @@
- done
-
- echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
--echo "configure:72119: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
-+echo "configure:72423: 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
-@@ -72123,7 +72427,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 72127 "configure"
-+#line 72431 "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
-@@ -72134,7 +72438,7 @@
- mysql_query()
- ; return 0; }
- EOF
--if { (eval echo configure:72138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:72442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -72289,7 +72593,7 @@
- done
-
- echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
--echo "configure:72293: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
-+echo "configure:72597: 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
-@@ -72297,7 +72601,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$PDO_MYSQL_LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 72301 "configure"
-+#line 72605 "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
-@@ -72308,7 +72612,7 @@
- mysql_query()
- ; return 0; }
- EOF
--if { (eval echo configure:72312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:72616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -72481,12 +72785,12 @@
- 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:72485: checking for $ac_func" >&5
-+echo "configure:72789: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 72490 "configure"
-+#line 72794 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -72509,7 +72813,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:72513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:72817: \"$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
-@@ -72538,13 +72842,13 @@
-
-
- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:72542: checking for PDO includes" >&5
-+echo "configure:72846: 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:72548: checking for PDO includes" >&5
-+echo "configure:72852: 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
-@@ -72892,7 +73196,7 @@
- php_with_pdo_oci=no
-
- echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6
--echo "configure:72896: checking Oracle OCI support for PDO" >&5
-+echo "configure:73200: 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"
-@@ -72937,7 +73241,7 @@
-
- if test "$PHP_PDO_OCI" != "no"; then
- echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
--echo "configure:72941: checking Oracle Install-Dir" >&5
-+echo "configure:73245: checking Oracle Install-Dir" >&5
- if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
- PDO_OCI_DIR=$ORACLE_HOME
- else
-@@ -72946,7 +73250,7 @@
- echo "$ac_t""$PDO_OCI_DIR :$PHP_PDO_OCI:" 1>&6
-
- echo $ac_n "checking if that is sane""... $ac_c" 1>&6
--echo "configure:72950: checking if that is sane" >&5
-+echo "configure:73254: checking if that is sane" >&5
- if test -z "$PDO_OCI_DIR"; then
- { echo "configure: error:
- You need to tell me where to find your oracle SDK, or set ORACLE_HOME.
-@@ -72959,7 +73263,7 @@
- PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`"
- PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`"
- echo $ac_n "checking for oci.h""... $ac_c" 1>&6
--echo "configure:72963: checking for oci.h" >&5
-+echo "configure:73267: checking for oci.h" >&5
- if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then
-
- if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" != "/usr/include"; then
-@@ -73108,7 +73412,7 @@
- else
-
- echo $ac_n "checking size of long int""... $ac_c" 1>&6
--echo "configure:73112: checking size of long int" >&5
-+echo "configure:73416: 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
-@@ -73116,18 +73420,18 @@
- ac_cv_sizeof_long_int=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 73120 "configure"
-+#line 73424 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long int));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:73131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:73435: \"$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
-@@ -73147,7 +73451,7 @@
-
-
- echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6
--echo "configure:73151: checking if we're on a 64-bit platform" >&5
-+echo "configure:73455: 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"
-@@ -73157,7 +73461,7 @@
- fi
-
- echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
--echo "configure:73161: checking OCI8 libraries dir" >&5
-+echo "configure:73465: 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
-@@ -73524,7 +73828,7 @@
- fi
-
- echo $ac_n "checking Oracle version""... $ac_c" 1>&6
--echo "configure:73528: checking Oracle version" >&5
-+echo "configure:73832: checking Oracle version" >&5
- if test -s "$PDO_OCI_DIR/orainst/unix.rgs"; then
- PDO_OCI_VERSION=`grep '"ocommon"' $PDO_OCI_DIR/orainst/unix.rgs | sed 's/ */:/g' | cut -d: -f 6 | cut -c 2-4`
- test -z "$PDO_OCI_VERSION" && PDO_OCI_VERSION=7.3
-@@ -74215,7 +74519,7 @@
- done
-
- echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
--echo "configure:74219: checking for OCIEnvCreate in -lclntsh" >&5
-+echo "configure:74523: 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
-@@ -74223,7 +74527,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 74227 "configure"
-+#line 74531 "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
-@@ -74234,7 +74538,7 @@
- OCIEnvCreate()
- ; return 0; }
- EOF
--if { (eval echo configure:74238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:74542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -74368,7 +74672,7 @@
- done
-
- echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
--echo "configure:74372: checking for OCIEnvNlsCreate in -lclntsh" >&5
-+echo "configure:74676: 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
-@@ -74376,7 +74680,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 74380 "configure"
-+#line 74684 "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
-@@ -74387,7 +74691,7 @@
- OCIEnvNlsCreate()
- ; return 0; }
- EOF
--if { (eval echo configure:74391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:74695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -74521,7 +74825,7 @@
- done
-
- echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
--echo "configure:74525: checking for OCILobIsTemporary in -lclntsh" >&5
-+echo "configure:74829: 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
-@@ -74529,7 +74833,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 74533 "configure"
-+#line 74837 "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
-@@ -74540,7 +74844,7 @@
- OCILobIsTemporary()
- ; return 0; }
- EOF
--if { (eval echo configure:74544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:74848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -74670,7 +74974,7 @@
- done
-
- echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
--echo "configure:74674: checking for OCILobIsTemporary in -locijdbc8" >&5
-+echo "configure:74978: 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
-@@ -74678,7 +74982,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-locijdbc8 $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 74682 "configure"
-+#line 74986 "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
-@@ -74689,7 +74993,7 @@
- OCILobIsTemporary()
- ; return 0; }
- EOF
--if { (eval echo configure:74693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:74997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -74850,7 +75154,7 @@
- done
-
- echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
--echo "configure:74854: checking for OCICollAssign in -lclntsh" >&5
-+echo "configure:75158: 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
-@@ -74858,7 +75162,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 74862 "configure"
-+#line 75166 "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
-@@ -74869,7 +75173,7 @@
- OCICollAssign()
- ; return 0; }
- EOF
--if { (eval echo configure:74873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:75177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -75003,7 +75307,7 @@
- done
-
- echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6
--echo "configure:75007: checking for OCIStmtFetch2 in -lclntsh" >&5
-+echo "configure:75311: 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
-@@ -75011,7 +75315,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lclntsh $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 75015 "configure"
-+#line 75319 "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
-@@ -75022,7 +75326,7 @@
- OCIStmtFetch2()
- ; return 0; }
- EOF
--if { (eval echo configure:75026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:75330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -75061,13 +75365,13 @@
-
-
- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:75065: checking for PDO includes" >&5
-+echo "configure:75369: 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:75071: checking for PDO includes" >&5
-+echo "configure:75375: 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
-@@ -75422,7 +75726,7 @@
- php_with_pdo_odbc=no
-
- echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6
--echo "configure:75426: checking for ODBC v3 support for PDO" >&5
-+echo "configure:75730: 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"
-@@ -75473,13 +75777,13 @@
-
-
- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:75477: checking for PDO includes" >&5
-+echo "configure:75781: 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:75483: checking for PDO includes" >&5
-+echo "configure:75787: 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
-@@ -75500,7 +75804,7 @@
-
-
- echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6
--echo "configure:75504: checking for selected PDO ODBC flavour" >&5
-+echo "configure:75808: 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`"
-@@ -75573,7 +75877,7 @@
-
-
- echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75577: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:75881: 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
-@@ -75587,7 +75891,7 @@
-
-
- echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75591: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:75895: 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
-@@ -75601,7 +75905,7 @@
-
-
- echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75605: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:75909: 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
-@@ -75615,7 +75919,7 @@
-
-
- echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75619: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:75923: 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
-@@ -75629,7 +75933,7 @@
-
-
- echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75633: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:75937: 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
-@@ -75643,7 +75947,7 @@
-
-
- echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75647: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:75951: 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
-@@ -75657,7 +75961,7 @@
-
-
- echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75661: checking for sql.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:75965: 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
-@@ -75671,7 +75975,7 @@
-
-
- echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75675: checking for isql.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:75979: 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
-@@ -75685,7 +75989,7 @@
-
-
- echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75689: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:75993: 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
-@@ -75699,7 +76003,7 @@
-
-
- echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75703: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:76007: 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
-@@ -75713,7 +76017,7 @@
-
-
- echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75717: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:76021: 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
-@@ -75727,7 +76031,7 @@
-
-
- echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75731: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:76035: 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
-@@ -75741,7 +76045,7 @@
-
-
- echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75745: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:76049: 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
-@@ -75755,7 +76059,7 @@
-
-
- echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75759: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:76063: 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
-@@ -75769,7 +76073,7 @@
-
-
- echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75773: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:76077: 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
-@@ -75783,7 +76087,7 @@
-
-
- echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75787: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:76091: 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
-@@ -75797,7 +76101,7 @@
-
-
- echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75801: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:76105: 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
-@@ -75811,7 +76115,7 @@
-
-
- echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
--echo "configure:75815: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:76119: 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
-@@ -76017,7 +76321,7 @@
- done
-
- echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
--echo "configure:76021: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
-+echo "configure:76325: 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
-@@ -76025,7 +76329,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$pdo_odbc_def_lib $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 76029 "configure"
-+#line 76333 "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
-@@ -76036,7 +76340,7 @@
- SQLBindCol()
- ; return 0; }
- EOF
--if { (eval echo configure:76040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -76151,7 +76455,7 @@
- done
-
- echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
--echo "configure:76155: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
-+echo "configure:76459: 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
-@@ -76159,7 +76463,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$pdo_odbc_def_lib $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 76163 "configure"
-+#line 76467 "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
-@@ -76170,7 +76474,7 @@
- SQLAllocHandle()
- ; return 0; }
- EOF
--if { (eval echo configure:76174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -76537,7 +76841,7 @@
- php_with_pdo_pgsql=no
-
- echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6
--echo "configure:76541: checking for PostgreSQL support for PDO" >&5
-+echo "configure:76845: 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"
-@@ -76594,7 +76898,7 @@
-
-
- echo $ac_n "checking for pg_config""... $ac_c" 1>&6
--echo "configure:76598: checking for pg_config" >&5
-+echo "configure:76902: 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"
-@@ -76658,13 +76962,13 @@
-
-
- echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
--echo "configure:76662: checking for openssl dependencies" >&5
-+echo "configure:76966: checking for openssl dependencies" >&5
- if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; 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:76668: checking for $ac_word" >&5
-+echo "configure:76972: 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
-@@ -76708,7 +77012,7 @@
- old_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR"
- echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
--echo "configure:76712: checking for PQescapeString in -lpq" >&5
-+echo "configure:77016: 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
-@@ -76716,7 +77020,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 76720 "configure"
-+#line 77024 "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
-@@ -76727,7 +77031,7 @@
- PQescapeString()
- ; return 0; }
- EOF
--if { (eval echo configure:76731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -76751,7 +77055,7 @@
- fi
-
- echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
--echo "configure:76755: checking for PQescapeStringConn in -lpq" >&5
-+echo "configure:77059: 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
-@@ -76759,7 +77063,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 76763 "configure"
-+#line 77067 "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
-@@ -76770,7 +77074,7 @@
- PQescapeStringConn()
- ; return 0; }
- EOF
--if { (eval echo configure:76774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -76794,7 +77098,7 @@
- fi
-
- echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
--echo "configure:76798: checking for PQescapeByteaConn in -lpq" >&5
-+echo "configure:77102: 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
-@@ -76802,7 +77106,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 76806 "configure"
-+#line 77110 "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
-@@ -76813,7 +77117,7 @@
- PQescapeByteaConn()
- ; return 0; }
- EOF
--if { (eval echo configure:76817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -76837,7 +77141,7 @@
- fi
-
- echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
--echo "configure:76841: checking for PQsetnonblocking in -lpq" >&5
-+echo "configure:77145: 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
-@@ -76845,7 +77149,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 76849 "configure"
-+#line 77153 "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
-@@ -76856,7 +77160,7 @@
- PQsetnonblocking()
- ; return 0; }
- EOF
--if { (eval echo configure:76860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -76880,7 +77184,7 @@
- fi
-
- echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
--echo "configure:76884: checking for PQcmdTuples in -lpq" >&5
-+echo "configure:77188: 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
-@@ -76888,7 +77192,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 76892 "configure"
-+#line 77196 "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
-@@ -76899,7 +77203,7 @@
- PQcmdTuples()
- ; return 0; }
- EOF
--if { (eval echo configure:76903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -76923,7 +77227,7 @@
- fi
-
- echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
--echo "configure:76927: checking for PQoidValue in -lpq" >&5
-+echo "configure:77231: 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
-@@ -76931,7 +77235,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 76935 "configure"
-+#line 77239 "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
-@@ -76942,7 +77246,7 @@
- PQoidValue()
- ; return 0; }
- EOF
--if { (eval echo configure:76946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -76966,7 +77270,7 @@
- fi
-
- echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
--echo "configure:76970: checking for PQclientEncoding in -lpq" >&5
-+echo "configure:77274: 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
-@@ -76974,7 +77278,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 76978 "configure"
-+#line 77282 "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
-@@ -76985,7 +77289,7 @@
- PQclientEncoding()
- ; return 0; }
- EOF
--if { (eval echo configure:76989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -77009,7 +77313,7 @@
- fi
-
- echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
--echo "configure:77013: checking for PQparameterStatus in -lpq" >&5
-+echo "configure:77317: 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
-@@ -77017,7 +77321,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 77021 "configure"
-+#line 77325 "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
-@@ -77028,7 +77332,7 @@
- PQparameterStatus()
- ; return 0; }
- EOF
--if { (eval echo configure:77032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -77052,7 +77356,7 @@
- fi
-
- echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
--echo "configure:77056: checking for PQprotocolVersion in -lpq" >&5
-+echo "configure:77360: 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
-@@ -77060,7 +77364,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 77064 "configure"
-+#line 77368 "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
-@@ -77071,7 +77375,7 @@
- PQprotocolVersion()
- ; return 0; }
- EOF
--if { (eval echo configure:77075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -77095,7 +77399,7 @@
- fi
-
- echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
--echo "configure:77099: checking for PQtransactionStatus in -lpq" >&5
-+echo "configure:77403: 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
-@@ -77103,7 +77407,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 77107 "configure"
-+#line 77411 "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
-@@ -77114,7 +77418,7 @@
- PQtransactionStatus()
- ; return 0; }
- EOF
--if { (eval echo configure:77118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -77138,7 +77442,7 @@
- fi
-
- echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
--echo "configure:77142: checking for PQunescapeBytea in -lpq" >&5
-+echo "configure:77446: 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
-@@ -77146,7 +77450,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 77150 "configure"
-+#line 77454 "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
-@@ -77157,7 +77461,7 @@
- PQunescapeBytea()
- ; return 0; }
- EOF
--if { (eval echo configure:77161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -77181,7 +77485,7 @@
- fi
-
- echo $ac_n "checking for PQExecParams in -lpq""... $ac_c" 1>&6
--echo "configure:77185: checking for PQExecParams in -lpq" >&5
-+echo "configure:77489: 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
-@@ -77189,7 +77493,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 77193 "configure"
-+#line 77497 "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
-@@ -77200,7 +77504,7 @@
- PQExecParams()
- ; return 0; }
- EOF
--if { (eval echo configure:77204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -77224,7 +77528,7 @@
- fi
-
- echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6
--echo "configure:77228: checking for PQresultErrorField in -lpq" >&5
-+echo "configure:77532: 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
-@@ -77232,7 +77536,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 77236 "configure"
-+#line 77540 "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
-@@ -77243,7 +77547,7 @@
- PQresultErrorField()
- ; return 0; }
- EOF
--if { (eval echo configure:77247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -77267,7 +77571,7 @@
- fi
-
- echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
--echo "configure:77271: checking for pg_encoding_to_char in -lpq" >&5
-+echo "configure:77575: 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
-@@ -77275,7 +77579,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 77279 "configure"
-+#line 77583 "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
-@@ -77286,7 +77590,7 @@
- pg_encoding_to_char()
- ; return 0; }
- EOF
--if { (eval echo configure:77290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -77311,7 +77615,7 @@
-
-
- echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
--echo "configure:77315: checking for PQprepare in -lpq" >&5
-+echo "configure:77619: 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
-@@ -77319,7 +77623,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 77323 "configure"
-+#line 77627 "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
-@@ -77330,7 +77634,7 @@
- PQprepare()
- ; return 0; }
- EOF
--if { (eval echo configure:77334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -77493,13 +77797,13 @@
-
-
- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:77497: checking for PDO includes" >&5
-+echo "configure:77801: 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:77503: checking for PDO includes" >&5
-+echo "configure:77807: 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
-@@ -77832,7 +78136,7 @@
- php_with_pdo_sqlite=yes
-
- echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6
--echo "configure:77836: checking for sqlite 3 support for PDO" >&5
-+echo "configure:78140: 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"
-@@ -77880,13 +78184,13 @@
-
-
- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:77884: checking for PDO includes" >&5
-+echo "configure:78188: 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:77890: checking for PDO includes" >&5
-+echo "configure:78194: 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
-@@ -77915,7 +78219,7 @@
- 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:77919: checking for sqlite3 files in default path" >&5
-+echo "configure:78223: 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
-@@ -78061,7 +78365,7 @@
- done
-
- echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
--echo "configure:78065: checking for $LIBSYMBOL in -l$LIBNAME" >&5
-+echo "configure:78369: 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
-@@ -78069,7 +78373,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 78073 "configure"
-+#line 78377 "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
-@@ -78080,7 +78384,7 @@
- $LIBSYMBOL()
- ; return 0; }
- EOF
--if { (eval echo configure:78084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:78388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -78310,7 +78614,7 @@
- done
-
- echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
--echo "configure:78314: checking for sqlite3_key in -lsqlite3" >&5
-+echo "configure:78618: 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
-@@ -78318,7 +78622,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsqlite3 $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 78322 "configure"
-+#line 78626 "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
-@@ -78329,7 +78633,7 @@
- sqlite3_key()
- ; return 0; }
- EOF
--if { (eval echo configure:78333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:78637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -78960,7 +79264,7 @@
-
-
- echo $ac_n "checking size of char *""... $ac_c" 1>&6
--echo "configure:78964: checking size of char *" >&5
-+echo "configure:79268: 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
-@@ -78968,18 +79272,18 @@
- ac_cv_sizeof_char_p=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 78972 "configure"
-+#line 79276 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(char *));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:78983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:79287: \"$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
-@@ -79026,12 +79330,12 @@
- for ac_func in usleep nanosleep
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:79030: checking for $ac_func" >&5
-+echo "configure:79334: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 79035 "configure"
-+#line 79339 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -79054,7 +79358,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:79058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:79362: \"$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
-@@ -79082,17 +79386,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:79086: checking for $ac_hdr" >&5
-+echo "configure:79390: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 79091 "configure"
-+#line 79395 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:79096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:79400: \"$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*
-@@ -79216,7 +79520,7 @@
- done
-
- echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6
--echo "configure:79220: checking for fdatasync in -lrt" >&5
-+echo "configure:79524: 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
-@@ -79224,7 +79528,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lrt $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79228 "configure"
-+#line 79532 "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
-@@ -79235,7 +79539,7 @@
- fdatasync()
- ; return 0; }
- EOF
--if { (eval echo configure:79239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:79543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79318,7 +79622,7 @@
- php_with_pgsql=no
-
- echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
--echo "configure:79322: checking for PostgreSQL support" >&5
-+echo "configure:79626: checking for PostgreSQL support" >&5
- # Check whether --with-pgsql or --without-pgsql was given.
- if test "${with_pgsql+set}" = set; then
- withval="$with_pgsql"
-@@ -79375,7 +79679,7 @@
-
-
- echo $ac_n "checking for pg_config""... $ac_c" 1>&6
--echo "configure:79379: checking for pg_config" >&5
-+echo "configure:79683: 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"
-@@ -79443,7 +79747,7 @@
- old_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR"
- echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
--echo "configure:79447: checking for PQescapeString in -lpq" >&5
-+echo "configure:79751: 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
-@@ -79451,7 +79755,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79455 "configure"
-+#line 79759 "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
-@@ -79462,7 +79766,7 @@
- PQescapeString()
- ; return 0; }
- EOF
--if { (eval echo configure:79466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:79770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79486,7 +79790,7 @@
- fi
-
- echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
--echo "configure:79490: checking for PQunescapeBytea in -lpq" >&5
-+echo "configure:79794: 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
-@@ -79494,7 +79798,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79498 "configure"
-+#line 79802 "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
-@@ -79505,7 +79809,7 @@
- PQunescapeBytea()
- ; return 0; }
- EOF
--if { (eval echo configure:79509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:79813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79529,7 +79833,7 @@
- fi
-
- echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
--echo "configure:79533: checking for PQsetnonblocking in -lpq" >&5
-+echo "configure:79837: 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
-@@ -79537,7 +79841,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79541 "configure"
-+#line 79845 "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
-@@ -79548,7 +79852,7 @@
- PQsetnonblocking()
- ; return 0; }
- EOF
--if { (eval echo configure:79552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:79856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79572,7 +79876,7 @@
- fi
-
- echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
--echo "configure:79576: checking for PQcmdTuples in -lpq" >&5
-+echo "configure:79880: 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
-@@ -79580,7 +79884,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79584 "configure"
-+#line 79888 "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
-@@ -79591,7 +79895,7 @@
- PQcmdTuples()
- ; return 0; }
- EOF
--if { (eval echo configure:79595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:79899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79615,7 +79919,7 @@
- fi
-
- echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
--echo "configure:79619: checking for PQoidValue in -lpq" >&5
-+echo "configure:79923: 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
-@@ -79623,7 +79927,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79627 "configure"
-+#line 79931 "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
-@@ -79634,7 +79938,7 @@
- PQoidValue()
- ; return 0; }
- EOF
--if { (eval echo configure:79638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:79942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79658,7 +79962,7 @@
- fi
-
- echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
--echo "configure:79662: checking for PQclientEncoding in -lpq" >&5
-+echo "configure:79966: 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
-@@ -79666,7 +79970,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79670 "configure"
-+#line 79974 "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
-@@ -79677,7 +79981,7 @@
- PQclientEncoding()
- ; return 0; }
- EOF
--if { (eval echo configure:79681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:79985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79701,7 +80005,7 @@
- fi
-
- echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
--echo "configure:79705: checking for PQparameterStatus in -lpq" >&5
-+echo "configure:80009: 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
-@@ -79709,7 +80013,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79713 "configure"
-+#line 80017 "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
-@@ -79720,7 +80024,7 @@
- PQparameterStatus()
- ; return 0; }
- EOF
--if { (eval echo configure:79724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79744,7 +80048,7 @@
- fi
-
- echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
--echo "configure:79748: checking for PQprotocolVersion in -lpq" >&5
-+echo "configure:80052: 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
-@@ -79752,7 +80056,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79756 "configure"
-+#line 80060 "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
-@@ -79763,7 +80067,7 @@
- PQprotocolVersion()
- ; return 0; }
- EOF
--if { (eval echo configure:79767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79787,7 +80091,7 @@
- fi
-
- echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
--echo "configure:79791: checking for PQtransactionStatus in -lpq" >&5
-+echo "configure:80095: 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
-@@ -79795,7 +80099,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79799 "configure"
-+#line 80103 "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
-@@ -79806,7 +80110,7 @@
- PQtransactionStatus()
- ; return 0; }
- EOF
--if { (eval echo configure:79810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79830,7 +80134,7 @@
- fi
-
- echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6
--echo "configure:79834: checking for PQexecParams in -lpq" >&5
-+echo "configure:80138: 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
-@@ -79838,7 +80142,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79842 "configure"
-+#line 80146 "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
-@@ -79849,7 +80153,7 @@
- PQexecParams()
- ; return 0; }
- EOF
--if { (eval echo configure:79853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79873,7 +80177,7 @@
- fi
-
- echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
--echo "configure:79877: checking for PQprepare in -lpq" >&5
-+echo "configure:80181: 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
-@@ -79881,7 +80185,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79885 "configure"
-+#line 80189 "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
-@@ -79892,7 +80196,7 @@
- PQprepare()
- ; return 0; }
- EOF
--if { (eval echo configure:79896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79916,7 +80220,7 @@
- fi
-
- echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6
--echo "configure:79920: checking for PQexecPrepared in -lpq" >&5
-+echo "configure:80224: 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
-@@ -79924,7 +80228,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79928 "configure"
-+#line 80232 "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
-@@ -79935,7 +80239,7 @@
- PQexecPrepared()
- ; return 0; }
- EOF
--if { (eval echo configure:79939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -79959,7 +80263,7 @@
- fi
-
- echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6
--echo "configure:79963: checking for PQresultErrorField in -lpq" >&5
-+echo "configure:80267: 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
-@@ -79967,7 +80271,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 79971 "configure"
-+#line 80275 "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
-@@ -79978,7 +80282,7 @@
- PQresultErrorField()
- ; return 0; }
- EOF
--if { (eval echo configure:79982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80002,7 +80306,7 @@
- fi
-
- echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6
--echo "configure:80006: checking for PQsendQueryParams in -lpq" >&5
-+echo "configure:80310: 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
-@@ -80010,7 +80314,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80014 "configure"
-+#line 80318 "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
-@@ -80021,7 +80325,7 @@
- PQsendQueryParams()
- ; return 0; }
- EOF
--if { (eval echo configure:80025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80045,7 +80349,7 @@
- fi
-
- echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6
--echo "configure:80049: checking for PQsendPrepare in -lpq" >&5
-+echo "configure:80353: 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
-@@ -80053,7 +80357,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80057 "configure"
-+#line 80361 "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
-@@ -80064,7 +80368,7 @@
- PQsendPrepare()
- ; return 0; }
- EOF
--if { (eval echo configure:80068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80088,7 +80392,7 @@
- fi
-
- echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6
--echo "configure:80092: checking for PQsendQueryPrepared in -lpq" >&5
-+echo "configure:80396: 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
-@@ -80096,7 +80400,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80100 "configure"
-+#line 80404 "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
-@@ -80107,7 +80411,7 @@
- PQsendQueryPrepared()
- ; return 0; }
- EOF
--if { (eval echo configure:80111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80131,7 +80435,7 @@
- fi
-
- echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6
--echo "configure:80135: checking for PQputCopyData in -lpq" >&5
-+echo "configure:80439: 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
-@@ -80139,7 +80443,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80143 "configure"
-+#line 80447 "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
-@@ -80150,7 +80454,7 @@
- PQputCopyData()
- ; return 0; }
- EOF
--if { (eval echo configure:80154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80174,7 +80478,7 @@
- fi
-
- echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6
--echo "configure:80178: checking for PQputCopyEnd in -lpq" >&5
-+echo "configure:80482: 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
-@@ -80182,7 +80486,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80186 "configure"
-+#line 80490 "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
-@@ -80193,7 +80497,7 @@
- PQputCopyEnd()
- ; return 0; }
- EOF
--if { (eval echo configure:80197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80217,7 +80521,7 @@
- fi
-
- echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6
--echo "configure:80221: checking for PQgetCopyData in -lpq" >&5
-+echo "configure:80525: 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
-@@ -80225,7 +80529,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80229 "configure"
-+#line 80533 "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
-@@ -80236,7 +80540,7 @@
- PQgetCopyData()
- ; return 0; }
- EOF
--if { (eval echo configure:80240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80260,7 +80564,7 @@
- fi
-
- echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6
--echo "configure:80264: checking for PQfreemem in -lpq" >&5
-+echo "configure:80568: 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
-@@ -80268,7 +80572,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80272 "configure"
-+#line 80576 "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
-@@ -80279,7 +80583,7 @@
- PQfreemem()
- ; return 0; }
- EOF
--if { (eval echo configure:80283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80303,7 +80607,7 @@
- fi
-
- echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6
--echo "configure:80307: checking for PQsetErrorVerbosity in -lpq" >&5
-+echo "configure:80611: 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
-@@ -80311,7 +80615,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80315 "configure"
-+#line 80619 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -80322,7 +80626,7 @@
- PQsetErrorVerbosity()
- ; return 0; }
- EOF
--if { (eval echo configure:80326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80346,7 +80650,7 @@
- fi
-
- echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6
--echo "configure:80350: checking for PQftable in -lpq" >&5
-+echo "configure:80654: 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
-@@ -80354,7 +80658,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80358 "configure"
-+#line 80662 "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
-@@ -80365,7 +80669,7 @@
- PQftable()
- ; return 0; }
- EOF
--if { (eval echo configure:80369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80389,7 +80693,7 @@
- fi
-
- echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
--echo "configure:80393: checking for PQescapeStringConn in -lpq" >&5
-+echo "configure:80697: 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
-@@ -80397,7 +80701,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80401 "configure"
-+#line 80705 "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
-@@ -80408,7 +80712,7 @@
- PQescapeStringConn()
- ; return 0; }
- EOF
--if { (eval echo configure:80412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80432,7 +80736,7 @@
- fi
-
- echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
--echo "configure:80436: checking for PQescapeByteaConn in -lpq" >&5
-+echo "configure:80740: 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
-@@ -80440,7 +80744,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80444 "configure"
-+#line 80748 "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
-@@ -80451,7 +80755,7 @@
- PQescapeByteaConn()
- ; return 0; }
- EOF
--if { (eval echo configure:80455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80475,7 +80779,7 @@
- fi
-
- echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
--echo "configure:80479: checking for pg_encoding_to_char in -lpq" >&5
-+echo "configure:80783: 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
-@@ -80483,7 +80787,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpq $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 80487 "configure"
-+#line 80791 "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
-@@ -80494,7 +80798,7 @@
- pg_encoding_to_char()
- ; return 0; }
- EOF
--if { (eval echo configure:80498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -80943,7 +81247,7 @@
- php_enable_posix=yes
-
- echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6
--echo "configure:80947: checking whether to enable POSIX-like functions" >&5
-+echo "configure:81251: 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"
-@@ -81277,17 +81581,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:81281: checking for $ac_hdr" >&5
-+echo "configure:81585: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 81286 "configure"
-+#line 81590 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:81291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:81595: \"$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*
-@@ -81317,12 +81621,12 @@
- 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:81321: checking for $ac_func" >&5
-+echo "configure:81625: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 81326 "configure"
-+#line 81630 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -81345,7 +81649,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:81349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:81653: \"$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
-@@ -81371,14 +81675,14 @@
-
-
- echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6
--echo "configure:81375: checking for working ttyname_r() implementation" >&5
-+echo "configure:81679: checking for working ttyname_r() implementation" >&5
- if test "$cross_compiling" = yes; then
-
- echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 81382 "configure"
-+#line 81686 "configure"
- #include "confdefs.h"
-
- #include <unistd.h>
-@@ -81391,7 +81695,7 @@
- }
-
- EOF
--if { (eval echo configure:81395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:81699: \"$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
-@@ -81418,7 +81722,7 @@
- php_with_pspell=no
-
- echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6
--echo "configure:81422: checking for PSPELL support" >&5
-+echo "configure:81726: checking for PSPELL support" >&5
- # Check whether --with-pspell or --without-pspell was given.
- if test "${with_pspell+set}" = set; then
- withval="$with_pspell"
-@@ -81960,7 +82264,7 @@
- done
-
- echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6
--echo "configure:81964: checking for new_aspell_config in -laspell" >&5
-+echo "configure:82268: 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
-@@ -81968,7 +82272,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-laspell $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 81972 "configure"
-+#line 82276 "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
-@@ -81979,7 +82283,7 @@
- new_aspell_config()
- ; return 0; }
- EOF
--if { (eval echo configure:81983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:82287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -82153,7 +82457,7 @@
- php_with_libedit=no
-
- echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6
--echo "configure:82157: checking for libedit readline replacement" >&5
-+echo "configure:82461: 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"
-@@ -82201,7 +82505,7 @@
- php_with_readline=no
-
- echo $ac_n "checking for readline support""... $ac_c" 1>&6
--echo "configure:82205: checking for readline support" >&5
-+echo "configure:82509: checking for readline support" >&5
- # Check whether --with-readline or --without-readline was given.
- if test "${with_readline+set}" = set; then
- withval="$with_readline"
-@@ -82288,7 +82592,7 @@
-
- PHP_READLINE_LIBS=""
- echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
--echo "configure:82292: checking for tgetent in -lncurses" >&5
-+echo "configure:82596: 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
-@@ -82296,7 +82600,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lncurses $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 82300 "configure"
-+#line 82604 "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
-@@ -82307,7 +82611,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:82311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:82615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -82352,7 +82656,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
--echo "configure:82356: checking for tgetent in -ltermcap" >&5
-+echo "configure:82660: 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
-@@ -82360,7 +82664,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ltermcap $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 82364 "configure"
-+#line 82668 "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
-@@ -82371,7 +82675,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:82375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:82679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -82518,7 +82822,7 @@
- done
-
- echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
--echo "configure:82522: checking for readline in -lreadline" >&5
-+echo "configure:82826: 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
-@@ -82526,7 +82830,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lreadline $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 82530 "configure"
-+#line 82834 "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
-@@ -82537,7 +82841,7 @@
- readline()
- ; return 0; }
- EOF
--if { (eval echo configure:82541: \"$ac_link\") 1>&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
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -82766,7 +83070,7 @@
- done
-
- echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6
--echo "configure:82770: checking for rl_callback_read_char in -lreadline" >&5
-+echo "configure:83074: 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
-@@ -82774,7 +83078,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lreadline $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 82778 "configure"
-+#line 83082 "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
-@@ -82785,7 +83089,7 @@
- rl_callback_read_char()
- ; return 0; }
- EOF
--if { (eval echo configure:82789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:83093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -82919,7 +83223,7 @@
- done
-
- echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
--echo "configure:82923: checking for add_history in -lhistory" >&5
-+echo "configure:83227: checking for add_history in -lhistory" >&5
- ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -82927,7 +83231,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lhistory $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 82931 "configure"
-+#line 83235 "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
-@@ -82938,7 +83242,7 @@
- add_history()
- ; return 0; }
- EOF
--if { (eval echo configure:82942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:83246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -83117,7 +83421,7 @@
-
-
- echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
--echo "configure:83121: checking for tgetent in -lncurses" >&5
-+echo "configure:83425: 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
-@@ -83125,7 +83429,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lncurses $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 83129 "configure"
-+#line 83433 "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
-@@ -83136,7 +83440,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:83140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:83444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -83180,7 +83484,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
--echo "configure:83184: checking for tgetent in -ltermcap" >&5
-+echo "configure:83488: 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
-@@ -83188,7 +83492,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ltermcap $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 83192 "configure"
-+#line 83496 "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
-@@ -83199,7 +83503,7 @@
- tgetent()
- ; return 0; }
- EOF
--if { (eval echo configure:83203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:83507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -83345,7 +83649,7 @@
- done
-
- echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
--echo "configure:83349: checking for readline in -ledit" >&5
-+echo "configure:83653: 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
-@@ -83353,7 +83657,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ledit $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 83357 "configure"
-+#line 83661 "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
-@@ -83364,7 +83668,7 @@
- readline()
- ; return 0; }
- EOF
--if { (eval echo configure:83368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:83672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -83505,12 +83809,12 @@
- for ac_func in rl_completion_matches
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:83509: checking for $ac_func" >&5
-+echo "configure:83813: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 83514 "configure"
-+#line 83818 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -83533,7 +83837,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:83537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:83841: \"$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
-@@ -83848,7 +84152,7 @@
- php_with_recode=no
-
- echo $ac_n "checking for recode support""... $ac_c" 1>&6
--echo "configure:83852: checking for recode support" >&5
-+echo "configure:84156: checking for recode support" >&5
- # Check whether --with-recode or --without-recode was given.
- if test "${with_recode+set}" = set; then
- withval="$with_recode"
-@@ -84015,7 +84319,7 @@
- done
-
- echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6
--echo "configure:84019: checking for recode_format_table in -lrecode" >&5
-+echo "configure:84323: 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
-@@ -84023,7 +84327,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lrecode $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 84027 "configure"
-+#line 84331 "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
-@@ -84034,7 +84338,7 @@
- recode_format_table()
- ; return 0; }
- EOF
--if { (eval echo configure:84038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:84342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -84164,7 +84468,7 @@
- LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
- LIBS="$LIBS -lrecode"
- cat > conftest.$ac_ext <<EOF
--#line 84168 "configure"
-+#line 84472 "configure"
- #include "confdefs.h"
-
- char *program_name;
-@@ -84175,7 +84479,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:84179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:84483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
-
-
-@@ -84338,17 +84642,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:84342: checking for $ac_hdr" >&5
-+echo "configure:84646: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 84347 "configure"
-+#line 84651 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:84352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:84656: \"$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*
-@@ -84662,7 +84966,7 @@
- php_enable_reflection=yes
-
- echo $ac_n "checking whether to enable reflection support""... $ac_c" 1>&6
--echo "configure:84666: checking whether to enable reflection support" >&5
-+echo "configure:84970: checking whether to enable reflection support" >&5
- # Check whether --enable-reflection or --disable-reflection was given.
- if test "${enable_reflection+set}" = set; then
- enableval="$enable_reflection"
-@@ -84977,7 +85281,7 @@
- php_enable_session=yes
-
- echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6
--echo "configure:84981: checking whether to enable PHP sessions" >&5
-+echo "configure:85285: 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"
-@@ -85024,7 +85328,7 @@
- php_with_mm=no
-
- echo $ac_n "checking for mm support""... $ac_c" 1>&6
--echo "configure:85028: checking for mm support" >&5
-+echo "configure:85332: checking for mm support" >&5
- # Check whether --with-mm or --without-mm was given.
- if test "${with_mm+set}" = set; then
- withval="$with_mm"
-@@ -85049,7 +85353,7 @@
- if test "$PHP_SESSION" != "no"; then
-
- echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6
--echo "configure:85053: checking whether pwrite works" >&5
-+echo "configure:85357: checking whether pwrite works" >&5
- if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -85061,7 +85365,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 85065 "configure"
-+#line 85369 "configure"
- #include "confdefs.h"
-
- #include <sys/types.h>
-@@ -85082,7 +85386,7 @@
-
-
- EOF
--if { (eval echo configure:85086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:85390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- ac_cv_pwrite=yes
-@@ -85107,7 +85411,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 85111 "configure"
-+#line 85415 "configure"
- #include "confdefs.h"
-
- #include <sys/types.h>
-@@ -85128,7 +85432,7 @@
-
-
- EOF
--if { (eval echo configure:85132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:85436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- ac_cv_pwrite=yes
-@@ -85169,7 +85473,7 @@
-
-
- echo $ac_n "checking whether pread works""... $ac_c" 1>&6
--echo "configure:85173: checking whether pread works" >&5
-+echo "configure:85477: checking whether pread works" >&5
- if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -85182,7 +85486,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 85186 "configure"
-+#line 85490 "configure"
- #include "confdefs.h"
-
- #include <sys/types.h>
-@@ -85202,7 +85506,7 @@
- }
-
- EOF
--if { (eval echo configure:85206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:85510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- ac_cv_pread=yes
-@@ -85229,7 +85533,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 85233 "configure"
-+#line 85537 "configure"
- #include "confdefs.h"
-
- #include <sys/types.h>
-@@ -85249,7 +85553,7 @@
- }
-
- EOF
--if { (eval echo configure:85253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:85557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- ac_cv_pread=yes
-@@ -85764,7 +86068,7 @@
- php_enable_shmop=no
-
- echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6
--echo "configure:85768: checking whether to enable shmop support" >&5
-+echo "configure:86072: 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"
-@@ -86100,7 +86404,7 @@
- php_enable_simplexml=yes
-
- echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6
--echo "configure:86104: checking whether to enable SimpleXML support" >&5
-+echo "configure:86408: 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"
-@@ -86148,7 +86452,7 @@
- php_with_libxml_dir=no
-
- echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
--echo "configure:86152: checking libxml2 install dir" >&5
-+echo "configure:86456: 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"
-@@ -86179,7 +86483,7 @@
-
-
- echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
--echo "configure:86183: checking for xml2-config path" >&5
-+echo "configure:86487: 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
-@@ -86337,7 +86641,7 @@
-
-
- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
--echo "configure:86341: checking whether libxml build works" >&5
-+echo "configure:86645: 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
-@@ -86353,7 +86657,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 86357 "configure"
-+#line 86661 "configure"
- #include "confdefs.h"
-
-
-@@ -86364,7 +86668,7 @@
- }
-
- EOF
--if { (eval echo configure:86368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:86672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -86741,7 +87045,7 @@
- php_with_snmp=no
-
- echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
--echo "configure:86745: checking for SNMP support" >&5
-+echo "configure:87049: checking for SNMP support" >&5
- # Check whether --with-snmp or --without-snmp was given.
- if test "${with_snmp+set}" = set; then
- withval="$with_snmp"
-@@ -86788,7 +87092,7 @@
- php_with_openssl_dir=no
-
- echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6
--echo "configure:86792: checking OpenSSL dir for SNMP" >&5
-+echo "configure:87096: 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"
-@@ -86814,7 +87118,7 @@
- php_enable_ucd_snmp_hack=no
-
- echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
--echo "configure:86818: checking whether to enable UCD SNMP hack" >&5
-+echo "configure:87122: 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"
-@@ -86842,7 +87146,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:86846: checking for $ac_word" >&5
-+echo "configure:87150: 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
-@@ -87043,17 +87347,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:87047: checking for $ac_hdr" >&5
-+echo "configure:87351: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 87052 "configure"
-+#line 87356 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:87057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:87361: \"$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*
-@@ -87081,9 +87385,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:87085: checking for OpenSSL support in SNMP libraries" >&5
-+echo "configure:87389: checking for OpenSSL support in SNMP libraries" >&5
- cat > conftest.$ac_ext <<EOF
--#line 87087 "configure"
-+#line 87391 "configure"
- #include "confdefs.h"
-
- #include <ucd-snmp-config.h>
-@@ -87138,7 +87442,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:87142: checking for $ac_word" >&5
-+echo "configure:87446: 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
-@@ -87343,9 +87647,9 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS=-I$OPENSSL_INCDIR
- echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
--echo "configure:87347: checking for OpenSSL version" >&5
-+echo "configure:87651: checking for OpenSSL version" >&5
- cat > conftest.$ac_ext <<EOF
--#line 87349 "configure"
-+#line 87653 "configure"
- #include "confdefs.h"
-
- #include <openssl/opensslv.h>
-@@ -87500,7 +87804,7 @@
- done
-
- echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
--echo "configure:87504: checking for CRYPTO_free in -lcrypto" >&5
-+echo "configure:87808: 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
-@@ -87508,7 +87812,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcrypto $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 87512 "configure"
-+#line 87816 "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
-@@ -87519,7 +87823,7 @@
- CRYPTO_free()
- ; return 0; }
- EOF
--if { (eval echo configure:87523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:87827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -87676,7 +87980,7 @@
- done
-
- echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
--echo "configure:87680: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-+echo "configure:87984: 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
-@@ -87684,7 +87988,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lssl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 87688 "configure"
-+#line 87992 "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
-@@ -87695,7 +87999,7 @@
- SSL_CTX_set_ssl_version()
- ; return 0; }
- EOF
--if { (eval echo configure:87699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:88003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -87808,7 +88112,7 @@
- fi
-
- echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
--echo "configure:87812: checking for kstat_read in -lkstat" >&5
-+echo "configure:88116: 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
-@@ -87816,7 +88120,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lkstat $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 87820 "configure"
-+#line 88124 "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
-@@ -87827,7 +88131,7 @@
- kstat_read()
- ; return 0; }
- EOF
--if { (eval echo configure:87831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:88135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -88098,7 +88402,7 @@
- done
-
- echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6
--echo "configure:88102: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
-+echo "configure:88406: 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
-@@ -88106,7 +88410,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$SNMP_LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 88110 "configure"
-+#line 88414 "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
-@@ -88117,7 +88421,7 @@
- snmp_parse_oid()
- ; return 0; }
- EOF
--if { (eval echo configure:88121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:88425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -88251,7 +88555,7 @@
- done
-
- echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6
--echo "configure:88255: checking for init_snmp in -l$SNMP_LIBNAME" >&5
-+echo "configure:88559: 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
-@@ -88259,7 +88563,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$SNMP_LIBNAME $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 88263 "configure"
-+#line 88567 "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
-@@ -88270,7 +88574,7 @@
- init_snmp()
- ; return 0; }
- EOF
--if { (eval echo configure:88274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:88578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -88606,7 +88910,7 @@
- php_enable_soap=no
-
- echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6
--echo "configure:88610: checking whether to enable SOAP support" >&5
-+echo "configure:88914: 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"
-@@ -88654,7 +88958,7 @@
- php_with_libxml_dir=no
-
- echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
--echo "configure:88658: checking libxml2 install dir" >&5
-+echo "configure:88962: 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"
-@@ -88685,7 +88989,7 @@
-
-
- echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
--echo "configure:88689: checking for xml2-config path" >&5
-+echo "configure:88993: 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
-@@ -88843,7 +89147,7 @@
-
-
- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
--echo "configure:88847: checking whether libxml build works" >&5
-+echo "configure:89151: 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
-@@ -88859,7 +89163,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 88863 "configure"
-+#line 89167 "configure"
- #include "confdefs.h"
-
-
-@@ -88870,7 +89174,7 @@
- }
-
- EOF
--if { (eval echo configure:88874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:89178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -89209,7 +89513,7 @@
- php_enable_sockets=no
-
- echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6
--echo "configure:89213: checking whether to enable sockets support" >&5
-+echo "configure:89517: 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"
-@@ -89254,13 +89558,13 @@
-
- if test "$PHP_SOCKETS" != "no"; then
- echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
--echo "configure:89258: checking for struct cmsghdr" >&5
-+echo "configure:89562: checking for struct cmsghdr" >&5
- if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- cat > conftest.$ac_ext <<EOF
--#line 89264 "configure"
-+#line 89568 "configure"
- #include "confdefs.h"
-
- #include <sys/types.h>
-@@ -89269,7 +89573,7 @@
- struct cmsghdr s; s
- ; return 0; }
- EOF
--if { (eval echo configure:89273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:89577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_cmsghdr=yes
- else
-@@ -89294,12 +89598,12 @@
- for ac_func in hstrerror socketpair
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:89298: checking for $ac_func" >&5
-+echo "configure:89602: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 89303 "configure"
-+#line 89607 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -89322,7 +89626,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:89326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:89630: \"$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
-@@ -89350,17 +89654,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:89354: checking for $ac_hdr" >&5
-+echo "configure:89658: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 89359 "configure"
-+#line 89663 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:89364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:89668: \"$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*
-@@ -89387,7 +89691,7 @@
- done
-
- cat > conftest.$ac_ext <<EOF
--#line 89391 "configure"
-+#line 89695 "configure"
- #include "confdefs.h"
-
- #include <sys/types.h>
-@@ -89397,7 +89701,7 @@
- static struct msghdr tp; int n = (int) tp.msg_flags; return n
- ; return 0; }
- EOF
--if { (eval echo configure:89401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:89705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- :
- else
- echo "configure: failed program was:" >&5
-@@ -89703,7 +90007,7 @@
- php_enable_spl=yes
-
- echo $ac_n "checking enable SPL suppport""... $ac_c" 1>&6
--echo "configure:89707: checking enable SPL suppport" >&5
-+echo "configure:90011: checking enable SPL suppport" >&5
- # Check whether --enable-spl or --disable-spl was given.
- if test "${enable_spl+set}" = set; then
- enableval="$enable_spl"
-@@ -89748,7 +90052,7 @@
-
- if test "$PHP_SPL" != "no"; then
- echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6
--echo "configure:89752: checking whether zend_object_value is packed" >&5
-+echo "configure:90056: checking whether zend_object_value is packed" >&5
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS"
- if test "$cross_compiling" = yes; then
-@@ -89758,7 +90062,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 89762 "configure"
-+#line 90066 "configure"
- #include "confdefs.h"
-
- #include "Zend/zend_types.h"
-@@ -89767,7 +90071,7 @@
- }
-
- EOF
--if { (eval echo configure:89771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:90075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- ac_result=1
-@@ -90121,7 +90425,7 @@
- php_with_sqlite=yes
-
- echo $ac_n "checking for sqlite support""... $ac_c" 1>&6
--echo "configure:90125: checking for sqlite support" >&5
-+echo "configure:90429: checking for sqlite support" >&5
- # Check whether --with-sqlite or --without-sqlite was given.
- if test "${with_sqlite+set}" = set; then
- withval="$with_sqlite"
-@@ -90168,7 +90472,7 @@
- php_enable_sqlite_utf8=no
-
- echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6
--echo "configure:90172: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
-+echo "configure:90476: 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"
-@@ -90199,13 +90503,13 @@
- if test "$PHP_PDO" != "no"; then
-
- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
--echo "configure:90203: checking for PDO includes" >&5
-+echo "configure:90507: 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:90209: checking for PDO includes" >&5
-+echo "configure:90513: 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
-@@ -90239,7 +90543,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:90243: checking for sqlite files in default path" >&5
-+echo "configure:90547: checking for sqlite files in default path" >&5
- for i in $SEARCH_PATH ; do
- if test -r $i/$SEARCH_FOR; then
- SQLITE_DIR=$i
-@@ -90351,7 +90655,7 @@
- done
-
- echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6
--echo "configure:90355: checking for sqlite_open in -lsqlite" >&5
-+echo "configure:90659: 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
-@@ -90359,7 +90663,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsqlite $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 90363 "configure"
-+#line 90667 "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
-@@ -90370,7 +90674,7 @@
- sqlite_open()
- ; return 0; }
- EOF
--if { (eval echo configure:90374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -90543,7 +90847,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:90547: checking for $ac_word" >&5
-+echo "configure:90851: 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
-@@ -90571,7 +90875,7 @@
-
- if test "$LEMON"; then
- echo $ac_n "checking for lemon version""... $ac_c" 1>&6
--echo "configure:90575: checking for lemon version" >&5
-+echo "configure:90879: 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
-@@ -90973,7 +91277,7 @@
-
-
- echo $ac_n "checking size of char *""... $ac_c" 1>&6
--echo "configure:90977: checking size of char *" >&5
-+echo "configure:91281: 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
-@@ -90981,18 +91285,18 @@
- ac_cv_sizeof_char_p=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 90985 "configure"
-+#line 91289 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(char *));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:90996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91300: \"$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
-@@ -91054,12 +91358,12 @@
- for ac_func in usleep nanosleep
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:91058: checking for $ac_func" >&5
-+echo "configure:91362: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 91063 "configure"
-+#line 91367 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -91082,7 +91386,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:91086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91390: \"$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
-@@ -91110,17 +91414,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:91114: checking for $ac_hdr" >&5
-+echo "configure:91418: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 91119 "configure"
-+#line 91423 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:91124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:91428: \"$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*
-@@ -91151,7 +91455,7 @@
-
-
- echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6
--echo "configure:91155: checking whether flush should be called explicitly after a buffered io" >&5
-+echo "configure:91459: 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
-@@ -91162,7 +91466,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 91166 "configure"
-+#line 91470 "configure"
- #include "confdefs.h"
-
- #include <stdio.h>
-@@ -91200,7 +91504,7 @@
- }
-
- EOF
--if { (eval echo configure:91204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91508: \"$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
-@@ -91228,7 +91532,7 @@
-
- if test "$ac_cv_func_crypt" = "no"; then
- echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
--echo "configure:91232: checking for crypt in -lcrypt" >&5
-+echo "configure:91536: 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
-@@ -91236,7 +91540,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcrypt $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 91240 "configure"
-+#line 91544 "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
-@@ -91247,7 +91551,7 @@
- crypt()
- ; return 0; }
- EOF
--if { (eval echo configure:91251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91555: \"$ac_link\") 1>&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,7 +91580,7 @@
- fi
-
- echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
--echo "configure:91280: checking for standard DES crypt" >&5
-+echo "configure:91584: 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
-@@ -91287,7 +91591,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 91291 "configure"
-+#line 91595 "configure"
- #include "confdefs.h"
-
- #if HAVE_UNISTD_H
-@@ -91306,7 +91610,7 @@
- #endif
- }
- EOF
--if { (eval echo configure:91310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91614: \"$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
-@@ -91336,7 +91640,7 @@
-
-
- echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
--echo "configure:91340: checking for extended DES crypt" >&5
-+echo "configure:91644: 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
-@@ -91347,7 +91651,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 91351 "configure"
-+#line 91655 "configure"
- #include "confdefs.h"
-
- #if HAVE_UNISTD_H
-@@ -91366,7 +91670,7 @@
- #endif
- }
- EOF
--if { (eval echo configure:91370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91674: \"$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
-@@ -91396,7 +91700,7 @@
-
-
- echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
--echo "configure:91400: checking for MD5 crypt" >&5
-+echo "configure:91704: 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
-@@ -91407,7 +91711,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 91411 "configure"
-+#line 91715 "configure"
- #include "confdefs.h"
-
- #if HAVE_UNISTD_H
-@@ -91435,7 +91739,7 @@
- #endif
- }
- EOF
--if { (eval echo configure:91439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- ac_cv_crypt_md5=yes
-@@ -91494,7 +91798,7 @@
-
-
- echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
--echo "configure:91498: checking for Blowfish crypt" >&5
-+echo "configure:91802: 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
-@@ -91505,7 +91809,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 91509 "configure"
-+#line 91813 "configure"
- #include "confdefs.h"
-
- #if HAVE_UNISTD_H
-@@ -91530,7 +91834,7 @@
- #endif
- }
- EOF
--if { (eval echo configure:91534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91838: \"$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
-@@ -91562,12 +91866,12 @@
- for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:91566: checking for $ac_func" >&5
-+echo "configure:91870: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 91571 "configure"
-+#line 91875 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -91590,7 +91894,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:91594: \"$ac_link\") 1>&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_func_$ac_func=yes"
- else
-@@ -91615,7 +91919,7 @@
- done
-
- echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
--echo "configure:91619: checking for working fnmatch" >&5
-+echo "configure:91923: 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
-@@ -91626,11 +91930,11 @@
- ac_cv_func_fnmatch_works=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 91630 "configure"
-+#line 91934 "configure"
- #include "confdefs.h"
- main() { exit (fnmatch ("a*", "abc", 0) != 0); }
- EOF
--if { (eval echo configure:91634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91938: \"$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
-@@ -91761,13 +92065,13 @@
- EOF
-
- echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6
--echo "configure:91765: checking whether field re_magic exists in struct regex_t" >&5
-+echo "configure:92069: checking whether field re_magic exists in struct regex_t" >&5
- if eval "test \"`echo '$''{'ac_cv_regex_t_re_magic'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- cat > conftest.$ac_ext <<EOF
--#line 91771 "configure"
-+#line 92075 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <regex.h>
-@@ -91775,7 +92079,7 @@
- regex_t rt; rt.re_magic;
- ; return 0; }
- EOF
--if { (eval echo configure:91779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:92083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_regex_t_re_magic=yes
- else
-@@ -91796,11 +92100,11 @@
- fi
- fi
- echo $ac_n "checking which regex library to use""... $ac_c" 1>&6
--echo "configure:91800: checking which regex library to use" >&5
-+echo "configure:92104: checking which regex library to use" >&5
- echo "$ac_t""$REGEX_TYPE" 1>&6
-
- echo $ac_n "checking whether rounding works as expected""... $ac_c" 1>&6
--echo "configure:91804: checking whether rounding works as expected" >&5
-+echo "configure:92108: checking whether rounding works as expected" >&5
- if test "$cross_compiling" = yes; then
-
- PHP_ROUND_FUZZ=0.50000000001
-@@ -91808,7 +92112,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 91812 "configure"
-+#line 92116 "configure"
- #include "confdefs.h"
-
- #include <math.h>
-@@ -91821,7 +92125,7 @@
- }
-
- EOF
--if { (eval echo configure:91825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:92129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- PHP_ROUND_FUZZ=0.5
-@@ -91851,12 +92155,12 @@
- for ac_func in fork CreateProcess
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:91855: checking for $ac_func" >&5
-+echo "configure:92159: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 91860 "configure"
-+#line 92164 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -91879,7 +92183,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:91883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92187: \"$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
-@@ -91911,7 +92215,7 @@
- fi
-
- echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6
--echo "configure:91915: checking if your OS can spawn processes with inherited handles" >&5
-+echo "configure:92219: 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
-@@ -91936,12 +92240,12 @@
- unset found
-
- echo $ac_n "checking for res_nmkquery""... $ac_c" 1>&6
--echo "configure:91940: checking for res_nmkquery" >&5
-+echo "configure:92244: checking for res_nmkquery" >&5
- if eval "test \"`echo '$''{'ac_cv_func_res_nmkquery'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 91945 "configure"
-+#line 92249 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char res_nmkquery(); below. */
-@@ -91964,7 +92268,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:91968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_res_nmkquery=yes"
- else
-@@ -91982,12 +92286,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __res_nmkquery""... $ac_c" 1>&6
--echo "configure:91986: checking for __res_nmkquery" >&5
-+echo "configure:92290: checking for __res_nmkquery" >&5
- if eval "test \"`echo '$''{'ac_cv_func___res_nmkquery'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 91991 "configure"
-+#line 92295 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __res_nmkquery(); below. */
-@@ -92010,7 +92314,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:92014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func___res_nmkquery=yes"
- else
-@@ -92048,7 +92352,7 @@
- unset ac_cv_lib_resolv___res_nmkquery
- unset found
- echo $ac_n "checking for res_nmkquery in -lresolv""... $ac_c" 1>&6
--echo "configure:92052: checking for res_nmkquery in -lresolv" >&5
-+echo "configure:92356: checking for res_nmkquery in -lresolv" >&5
- ac_lib_var=`echo resolv'_'res_nmkquery | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92056,7 +92360,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92060 "configure"
-+#line 92364 "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
-@@ -92067,7 +92371,7 @@
- res_nmkquery()
- ; return 0; }
- EOF
--if { (eval echo configure:92071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92087,7 +92391,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __res_nmkquery in -lresolv""... $ac_c" 1>&6
--echo "configure:92091: checking for __res_nmkquery in -lresolv" >&5
-+echo "configure:92395: checking for __res_nmkquery in -lresolv" >&5
- ac_lib_var=`echo resolv'_'__res_nmkquery | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92095,7 +92399,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92099 "configure"
-+#line 92403 "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
-@@ -92106,7 +92410,7 @@
- __res_nmkquery()
- ; return 0; }
- EOF
--if { (eval echo configure:92110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92138,11 +92442,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 92142 "configure"
-+#line 92446 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:92146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:92450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -92184,7 +92488,7 @@
- unset ac_cv_lib_bind___res_nmkquery
- unset found
- echo $ac_n "checking for res_nmkquery in -lbind""... $ac_c" 1>&6
--echo "configure:92188: checking for res_nmkquery in -lbind" >&5
-+echo "configure:92492: checking for res_nmkquery in -lbind" >&5
- ac_lib_var=`echo bind'_'res_nmkquery | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92192,7 +92496,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92196 "configure"
-+#line 92500 "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
-@@ -92203,7 +92507,7 @@
- res_nmkquery()
- ; return 0; }
- EOF
--if { (eval echo configure:92207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92223,7 +92527,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __res_nmkquery in -lbind""... $ac_c" 1>&6
--echo "configure:92227: checking for __res_nmkquery in -lbind" >&5
-+echo "configure:92531: checking for __res_nmkquery in -lbind" >&5
- ac_lib_var=`echo bind'_'__res_nmkquery | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92231,7 +92535,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92235 "configure"
-+#line 92539 "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
-@@ -92242,7 +92546,7 @@
- __res_nmkquery()
- ; return 0; }
- EOF
--if { (eval echo configure:92246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92274,11 +92578,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 92278 "configure"
-+#line 92582 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:92282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:92586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -92320,7 +92624,7 @@
- unset ac_cv_lib_socket___res_nmkquery
- unset found
- echo $ac_n "checking for res_nmkquery in -lsocket""... $ac_c" 1>&6
--echo "configure:92324: checking for res_nmkquery in -lsocket" >&5
-+echo "configure:92628: checking for res_nmkquery in -lsocket" >&5
- ac_lib_var=`echo socket'_'res_nmkquery | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92328,7 +92632,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92332 "configure"
-+#line 92636 "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
-@@ -92339,7 +92643,7 @@
- res_nmkquery()
- ; return 0; }
- EOF
--if { (eval echo configure:92343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92359,7 +92663,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __res_nmkquery in -lsocket""... $ac_c" 1>&6
--echo "configure:92363: checking for __res_nmkquery in -lsocket" >&5
-+echo "configure:92667: checking for __res_nmkquery in -lsocket" >&5
- ac_lib_var=`echo socket'_'__res_nmkquery | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92367,7 +92671,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92371 "configure"
-+#line 92675 "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
-@@ -92378,7 +92682,7 @@
- __res_nmkquery()
- ; return 0; }
- EOF
--if { (eval echo configure:92382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92410,11 +92714,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 92414 "configure"
-+#line 92718 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:92418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:92722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -92471,12 +92775,12 @@
- unset found
-
- echo $ac_n "checking for res_nsend""... $ac_c" 1>&6
--echo "configure:92475: checking for res_nsend" >&5
-+echo "configure:92779: checking for res_nsend" >&5
- if eval "test \"`echo '$''{'ac_cv_func_res_nsend'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 92480 "configure"
-+#line 92784 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char res_nsend(); below. */
-@@ -92499,7 +92803,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:92503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_res_nsend=yes"
- else
-@@ -92517,12 +92821,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __res_nsend""... $ac_c" 1>&6
--echo "configure:92521: checking for __res_nsend" >&5
-+echo "configure:92825: checking for __res_nsend" >&5
- if eval "test \"`echo '$''{'ac_cv_func___res_nsend'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 92526 "configure"
-+#line 92830 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __res_nsend(); below. */
-@@ -92545,7 +92849,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:92549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func___res_nsend=yes"
- else
-@@ -92583,7 +92887,7 @@
- unset ac_cv_lib_resolv___res_nsend
- unset found
- echo $ac_n "checking for res_nsend in -lresolv""... $ac_c" 1>&6
--echo "configure:92587: checking for res_nsend in -lresolv" >&5
-+echo "configure:92891: checking for res_nsend in -lresolv" >&5
- ac_lib_var=`echo resolv'_'res_nsend | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92591,7 +92895,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92595 "configure"
-+#line 92899 "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
-@@ -92602,7 +92906,7 @@
- res_nsend()
- ; return 0; }
- EOF
--if { (eval echo configure:92606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92622,7 +92926,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __res_nsend in -lresolv""... $ac_c" 1>&6
--echo "configure:92626: checking for __res_nsend in -lresolv" >&5
-+echo "configure:92930: checking for __res_nsend in -lresolv" >&5
- ac_lib_var=`echo resolv'_'__res_nsend | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92630,7 +92934,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92634 "configure"
-+#line 92938 "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
-@@ -92641,7 +92945,7 @@
- __res_nsend()
- ; return 0; }
- EOF
--if { (eval echo configure:92645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92673,11 +92977,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 92677 "configure"
-+#line 92981 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:92681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:92985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -92719,7 +93023,7 @@
- unset ac_cv_lib_bind___res_nsend
- unset found
- echo $ac_n "checking for res_nsend in -lbind""... $ac_c" 1>&6
--echo "configure:92723: checking for res_nsend in -lbind" >&5
-+echo "configure:93027: checking for res_nsend in -lbind" >&5
- ac_lib_var=`echo bind'_'res_nsend | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92727,7 +93031,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92731 "configure"
-+#line 93035 "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
-@@ -92738,7 +93042,7 @@
- res_nsend()
- ; return 0; }
- EOF
--if { (eval echo configure:92742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92758,7 +93062,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __res_nsend in -lbind""... $ac_c" 1>&6
--echo "configure:92762: checking for __res_nsend in -lbind" >&5
-+echo "configure:93066: checking for __res_nsend in -lbind" >&5
- ac_lib_var=`echo bind'_'__res_nsend | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92766,7 +93070,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92770 "configure"
-+#line 93074 "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
-@@ -92777,7 +93081,7 @@
- __res_nsend()
- ; return 0; }
- EOF
--if { (eval echo configure:92781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92809,11 +93113,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 92813 "configure"
-+#line 93117 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:92817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:93121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -92855,7 +93159,7 @@
- unset ac_cv_lib_socket___res_nsend
- unset found
- echo $ac_n "checking for res_nsend in -lsocket""... $ac_c" 1>&6
--echo "configure:92859: checking for res_nsend in -lsocket" >&5
-+echo "configure:93163: checking for res_nsend in -lsocket" >&5
- ac_lib_var=`echo socket'_'res_nsend | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92863,7 +93167,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92867 "configure"
-+#line 93171 "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
-@@ -92874,7 +93178,7 @@
- res_nsend()
- ; return 0; }
- EOF
--if { (eval echo configure:92878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92894,7 +93198,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __res_nsend in -lsocket""... $ac_c" 1>&6
--echo "configure:92898: checking for __res_nsend in -lsocket" >&5
-+echo "configure:93202: checking for __res_nsend in -lsocket" >&5
- ac_lib_var=`echo socket'_'__res_nsend | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92902,7 +93206,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 92906 "configure"
-+#line 93210 "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
-@@ -92913,7 +93217,7 @@
- __res_nsend()
- ; return 0; }
- EOF
--if { (eval echo configure:92917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -92945,11 +93249,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 92949 "configure"
-+#line 93253 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:92953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:93257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -93006,12 +93310,12 @@
- unset found
-
- echo $ac_n "checking for dn_expand""... $ac_c" 1>&6
--echo "configure:93010: checking for dn_expand" >&5
-+echo "configure:93314: checking for dn_expand" >&5
- if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 93015 "configure"
-+#line 93319 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dn_expand(); below. */
-@@ -93034,7 +93338,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:93038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93342: \"$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
-@@ -93052,12 +93356,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6
--echo "configure:93056: checking for __dn_expand" >&5
-+echo "configure:93360: checking for __dn_expand" >&5
- if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 93061 "configure"
-+#line 93365 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char __dn_expand(); below. */
-@@ -93080,7 +93384,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:93084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93388: \"$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
-@@ -93118,7 +93422,7 @@
- unset ac_cv_lib_resolv___dn_expand
- unset found
- echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
--echo "configure:93122: checking for dn_expand in -lresolv" >&5
-+echo "configure:93426: 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
-@@ -93126,7 +93430,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 93130 "configure"
-+#line 93434 "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
-@@ -93137,7 +93441,7 @@
- dn_expand()
- ; return 0; }
- EOF
--if { (eval echo configure:93141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -93157,7 +93461,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
--echo "configure:93161: checking for __dn_expand in -lresolv" >&5
-+echo "configure:93465: 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
-@@ -93165,7 +93469,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 93169 "configure"
-+#line 93473 "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
-@@ -93176,7 +93480,7 @@
- __dn_expand()
- ; return 0; }
- EOF
--if { (eval echo configure:93180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -93208,11 +93512,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 93212 "configure"
-+#line 93516 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:93216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:93520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -93254,7 +93558,7 @@
- unset ac_cv_lib_bind___dn_expand
- unset found
- echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6
--echo "configure:93258: checking for dn_expand in -lbind" >&5
-+echo "configure:93562: 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
-@@ -93262,7 +93566,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 93266 "configure"
-+#line 93570 "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
-@@ -93273,7 +93577,7 @@
- dn_expand()
- ; return 0; }
- EOF
--if { (eval echo configure:93277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -93293,7 +93597,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6
--echo "configure:93297: checking for __dn_expand in -lbind" >&5
-+echo "configure:93601: 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
-@@ -93301,7 +93605,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lbind $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 93305 "configure"
-+#line 93609 "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
-@@ -93312,7 +93616,7 @@
- __dn_expand()
- ; return 0; }
- EOF
--if { (eval echo configure:93316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -93344,11 +93648,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 93348 "configure"
-+#line 93652 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:93352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:93656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -93390,7 +93694,7 @@
- unset ac_cv_lib_socket___dn_expand
- unset found
- echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6
--echo "configure:93394: checking for dn_expand in -lsocket" >&5
-+echo "configure:93698: 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
-@@ -93398,7 +93702,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 93402 "configure"
-+#line 93706 "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
-@@ -93409,7 +93713,7 @@
- dn_expand()
- ; return 0; }
- EOF
--if { (eval echo configure:93413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -93429,7 +93733,7 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6
--echo "configure:93433: checking for __dn_expand in -lsocket" >&5
-+echo "configure:93737: 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
-@@ -93437,7 +93741,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 93441 "configure"
-+#line 93745 "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
-@@ -93448,7 +93752,7 @@
- __dn_expand()
- ; return 0; }
- EOF
--if { (eval echo configure:93452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -93480,11 +93784,11 @@
- found=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 93484 "configure"
-+#line 93788 "configure"
- #include "confdefs.h"
- main() { return (0); }
- EOF
--if { (eval echo configure:93488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:93792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- found=yes
- else
-@@ -93537,7 +93841,7 @@
-
-
- echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6
--echo "configure:93541: checking whether atof() accepts NAN" >&5
-+echo "configure:93845: 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
-@@ -93548,7 +93852,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 93552 "configure"
-+#line 93856 "configure"
- #include "confdefs.h"
-
- #include <math.h>
-@@ -93568,7 +93872,7 @@
- }
-
- EOF
--if { (eval echo configure:93572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:93876: \"$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
-@@ -93595,7 +93899,7 @@
- fi
-
- echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6
--echo "configure:93599: checking whether atof() accepts INF" >&5
-+echo "configure:93903: 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
-@@ -93606,7 +93910,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 93610 "configure"
-+#line 93914 "configure"
- #include "confdefs.h"
-
- #include <math.h>
-@@ -93629,7 +93933,7 @@
- }
-
- EOF
--if { (eval echo configure:93633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:93937: \"$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
-@@ -93656,7 +93960,7 @@
- fi
-
- echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6
--echo "configure:93660: checking whether HUGE_VAL == INF" >&5
-+echo "configure:93964: 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
-@@ -93667,7 +93971,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 93671 "configure"
-+#line 93975 "configure"
- #include "confdefs.h"
-
- #include <math.h>
-@@ -93690,7 +93994,7 @@
- }
-
- EOF
--if { (eval echo configure:93694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:93998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- ac_cv_huge_val_inf=yes
-@@ -93717,7 +94021,7 @@
- fi
-
- echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6
--echo "configure:93721: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
-+echo "configure:94025: 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
-@@ -93728,7 +94032,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 93732 "configure"
-+#line 94036 "configure"
- #include "confdefs.h"
-
- #include <math.h>
-@@ -93753,7 +94057,7 @@
- }
-
- EOF
--if { (eval echo configure:93757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:94061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- ac_cv_huge_val_nan=yes
-@@ -93780,13 +94084,13 @@
- fi
-
- echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6
--echo "configure:93784: checking whether strptime() declaration fails" >&5
-+echo "configure:94088: checking whether strptime() declaration fails" >&5
- if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- cat > conftest.$ac_ext <<EOF
--#line 93790 "configure"
-+#line 94094 "configure"
- #include "confdefs.h"
-
- #include <time.h>
-@@ -93802,7 +94106,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:93806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:94110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- ac_cv_strptime_decl_fails=no
-@@ -93830,17 +94134,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:93834: checking for $ac_hdr" >&5
-+echo "configure:94138: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 93839 "configure"
-+#line 94143 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:93844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:94148: \"$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*
-@@ -93869,12 +94173,12 @@
- for ac_func in mblen
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:93873: checking for $ac_func" >&5
-+echo "configure:94177: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 93878 "configure"
-+#line 94182 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -93897,7 +94201,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:93901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:94205: \"$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
-@@ -93924,12 +94228,12 @@
- for ac_func in mbrlen mbsinit
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:93928: checking for $ac_func" >&5
-+echo "configure:94232: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 93933 "configure"
-+#line 94237 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -93952,7 +94256,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:93956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:94260: \"$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
-@@ -93977,13 +94281,13 @@
- done
-
- echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
--echo "configure:93981: checking for mbstate_t" >&5
-+echo "configure:94285: checking for mbstate_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- cat > conftest.$ac_ext <<EOF
--#line 93987 "configure"
-+#line 94291 "configure"
- #include "confdefs.h"
-
- #ifdef HAVE_WCHAR_H
-@@ -93996,7 +94300,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:94000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:94304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- ac_cv_type_mbstate_t=yes
-@@ -94372,7 +94676,7 @@
- php_with_sybase=no
-
- echo $ac_n "checking for Sybase support""... $ac_c" 1>&6
--echo "configure:94376: checking for Sybase support" >&5
-+echo "configure:94680: checking for Sybase support" >&5
- # Check whether --with-sybase or --without-sybase was given.
- if test "${with_sybase+set}" = set; then
- withval="$with_sybase"
-@@ -94833,7 +95137,7 @@
- fi
-
- echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:94837: checking for dnet_addr in -ldnet_stub" >&5
-+echo "configure:95141: 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
-@@ -94841,7 +95145,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldnet_stub $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 94845 "configure"
-+#line 95149 "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
-@@ -94852,7 +95156,7 @@
- dnet_addr()
- ; return 0; }
- EOF
--if { (eval echo configure:94856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:95160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -94978,7 +95282,7 @@
- EOF
-
- echo $ac_n "checking for tdsdbopen in -lsybdb""... $ac_c" 1>&6
--echo "configure:94982: checking for tdsdbopen in -lsybdb" >&5
-+echo "configure:95286: checking for tdsdbopen in -lsybdb" >&5
- ac_lib_var=`echo sybdb'_'tdsdbopen | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -94986,7 +95290,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsybdb $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 94990 "configure"
-+#line 95294 "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
-@@ -94997,7 +95301,7 @@
- tdsdbopen()
- ; return 0; }
- EOF
--if { (eval echo configure:95001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:95305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -95039,7 +95343,7 @@
- php_with_sybase_ct=no
-
- echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
--echo "configure:95043: checking for Sybase-CT support" >&5
-+echo "configure:95347: 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"
-@@ -95678,7 +95982,7 @@
- done
-
- echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
--echo "configure:95682: checking for netg_errstr in -ltcl" >&5
-+echo "configure:95986: 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
-@@ -95686,7 +95990,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ltcl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 95690 "configure"
-+#line 95994 "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
-@@ -95697,7 +96001,7 @@
- netg_errstr()
- ; return 0; }
- EOF
--if { (eval echo configure:95701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:96005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -95872,7 +96176,7 @@
- done
-
- echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
--echo "configure:95876: checking for insck__getVdate in -linsck" >&5
-+echo "configure:96180: 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
-@@ -95880,7 +96184,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-linsck $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 95884 "configure"
-+#line 96188 "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
-@@ -95891,7 +96195,7 @@
- insck__getVdate()
- ; return 0; }
- EOF
--if { (eval echo configure:95895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:96199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -96039,7 +96343,7 @@
- done
-
- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
--echo "configure:96043: checking for bsd_tcp in -linsck" >&5
-+echo "configure:96347: 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
-@@ -96047,7 +96351,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-linsck $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 96051 "configure"
-+#line 96355 "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
-@@ -96058,7 +96362,7 @@
- bsd_tcp()
- ; return 0; }
- EOF
--if { (eval echo configure:96062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:96366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -96118,7 +96422,7 @@
- php_enable_sysvmsg=no
-
- echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6
--echo "configure:96122: checking whether to enable System V IPC support" >&5
-+echo "configure:96426: 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"
-@@ -96164,17 +96468,17 @@
- 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:96168: checking for sys/msg.h" >&5
-+echo "configure:96472: checking for sys/msg.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 96173 "configure"
-+#line 96477 "configure"
- #include "confdefs.h"
- #include <sys/msg.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:96178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:96482: \"$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*
-@@ -96490,7 +96794,7 @@
- php_enable_sysvsem=no
-
- echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
--echo "configure:96494: checking whether to enable System V semaphore support" >&5
-+echo "configure:96798: 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"
-@@ -96820,12 +97124,12 @@
- EOF
-
- echo $ac_n "checking for union semun""... $ac_c" 1>&6
--echo "configure:96824: checking for union semun" >&5
-+echo "configure:97128: checking for union semun" >&5
- if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 96829 "configure"
-+#line 97133 "configure"
- #include "confdefs.h"
-
- #include <sys/types.h>
-@@ -96836,7 +97140,7 @@
- union semun x;
- ; return 0; }
- EOF
--if { (eval echo configure:96840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:97144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- php_cv_semun=yes
-@@ -96872,7 +97176,7 @@
- php_enable_sysvshm=no
-
- echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
--echo "configure:96876: checking whether to enable System V shared memory support" >&5
-+echo "configure:97180: 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"
-@@ -97208,7 +97512,7 @@
- php_with_tidy=no
-
- echo $ac_n "checking for TIDY support""... $ac_c" 1>&6
--echo "configure:97212: checking for TIDY support" >&5
-+echo "configure:97516: checking for TIDY support" >&5
- # Check whether --with-tidy or --without-tidy was given.
- if test "${with_tidy+set}" = set; then
- withval="$with_tidy"
-@@ -97500,7 +97804,7 @@
- done
-
- echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6
--echo "configure:97504: checking for tidyOptGetDoc in -ltidy" >&5
-+echo "configure:97808: 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
-@@ -97508,7 +97812,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ltidy $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 97512 "configure"
-+#line 97816 "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
-@@ -97519,7 +97823,7 @@
- tidyOptGetDoc()
- ; return 0; }
- EOF
--if { (eval echo configure:97523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:97827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -97852,7 +98156,7 @@
- php_enable_tokenizer=yes
-
- echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6
--echo "configure:97856: checking whether to enable tokenizer support" >&5
-+echo "configure:98160: 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"
-@@ -98190,7 +98494,7 @@
- php_enable_wddx=no
-
- echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6
--echo "configure:98194: checking whether to enable WDDX support" >&5
-+echo "configure:98498: 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"
-@@ -98238,7 +98542,7 @@
- php_with_libxml_dir=no
-
- echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
--echo "configure:98242: checking libxml2 install dir" >&5
-+echo "configure:98546: 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"
-@@ -98265,7 +98569,7 @@
- php_with_libexpat_dir=no
-
- echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6
--echo "configure:98269: checking libexpat dir for WDDX" >&5
-+echo "configure:98573: 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"
-@@ -98296,7 +98600,7 @@
-
-
- echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
--echo "configure:98300: checking for xml2-config path" >&5
-+echo "configure:98604: 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
-@@ -98454,7 +98758,7 @@
-
-
- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
--echo "configure:98458: checking whether libxml build works" >&5
-+echo "configure:98762: 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
-@@ -98470,7 +98774,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 98474 "configure"
-+#line 98778 "configure"
- #include "confdefs.h"
-
-
-@@ -98481,7 +98785,7 @@
- }
-
- EOF
--if { (eval echo configure:98485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:98789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -99037,7 +99341,7 @@
- php_enable_xml=yes
-
- echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6
--echo "configure:99041: checking whether to enable XML support" >&5
-+echo "configure:99345: 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"
-@@ -99085,7 +99389,7 @@
- php_with_libxml_dir=no
-
- echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
--echo "configure:99089: checking libxml2 install dir" >&5
-+echo "configure:99393: 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"
-@@ -99112,7 +99416,7 @@
- php_with_libexpat_dir=no
-
- echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6
--echo "configure:99116: checking libexpat install dir" >&5
-+echo "configure:99420: 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"
-@@ -99144,7 +99448,7 @@
-
-
- echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
--echo "configure:99148: checking for xml2-config path" >&5
-+echo "configure:99452: 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
-@@ -99302,7 +99606,7 @@
-
-
- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
--echo "configure:99306: checking whether libxml build works" >&5
-+echo "configure:99610: 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
-@@ -99318,7 +99622,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 99322 "configure"
-+#line 99626 "configure"
- #include "confdefs.h"
-
-
-@@ -99329,7 +99633,7 @@
- }
-
- EOF
--if { (eval echo configure:99333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:99637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -99854,7 +100158,7 @@
- php_enable_xmlreader=yes
-
- echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6
--echo "configure:99858: checking whether to enable XMLReader support" >&5
-+echo "configure:100162: 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"
-@@ -99902,7 +100206,7 @@
- php_with_libxml_dir=no
-
- echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
--echo "configure:99906: checking libxml2 install dir" >&5
-+echo "configure:100210: 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"
-@@ -99933,7 +100237,7 @@
-
-
- echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
--echo "configure:99937: checking for xml2-config path" >&5
-+echo "configure:100241: 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
-@@ -100091,7 +100395,7 @@
-
-
- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
--echo "configure:100095: checking whether libxml build works" >&5
-+echo "configure:100399: 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
-@@ -100107,7 +100411,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 100111 "configure"
-+#line 100415 "configure"
- #include "confdefs.h"
-
-
-@@ -100118,7 +100422,7 @@
- }
-
- EOF
--if { (eval echo configure:100122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:100426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -100489,7 +100793,7 @@
- php_with_xmlrpc=no
-
- echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
--echo "configure:100493: checking for XMLRPC-EPI support" >&5
-+echo "configure:100797: 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"
-@@ -100537,7 +100841,7 @@
- php_with_libxml_dir=no
-
- echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
--echo "configure:100541: checking libxml2 install dir" >&5
-+echo "configure:100845: 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"
-@@ -100564,7 +100868,7 @@
- php_with_libexpat_dir=no
-
- echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6
--echo "configure:100568: checking libexpat dir for XMLRPC-EPI" >&5
-+echo "configure:100872: 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"
-@@ -100590,7 +100894,7 @@
- php_with_iconv_dir=no
-
- echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6
--echo "configure:100594: checking iconv dir for XMLRPC-EPI" >&5
-+echo "configure:100898: 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"
-@@ -100649,7 +100953,7 @@
-
-
- echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
--echo "configure:100653: checking for xml2-config path" >&5
-+echo "configure:100957: 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
-@@ -100807,7 +101111,7 @@
-
-
- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
--echo "configure:100811: checking whether libxml build works" >&5
-+echo "configure:101115: 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
-@@ -100823,7 +101127,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 100827 "configure"
-+#line 101131 "configure"
- #include "confdefs.h"
-
-
-@@ -100834,7 +101138,7 @@
- }
-
- EOF
--if { (eval echo configure:100838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:101142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -101099,12 +101403,12 @@
-
- if test "$PHP_ICONV" = "yes"; then
- echo $ac_n "checking for iconv""... $ac_c" 1>&6
--echo "configure:101103: checking for iconv" >&5
-+echo "configure:101407: checking for iconv" >&5
- if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 101108 "configure"
-+#line 101412 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char iconv(); below. */
-@@ -101127,7 +101431,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:101131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:101435: \"$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
-@@ -101148,12 +101452,12 @@
- echo "$ac_t""no" 1>&6
-
- echo $ac_n "checking for libiconv""... $ac_c" 1>&6
--echo "configure:101152: checking for libiconv" >&5
-+echo "configure:101456: checking for libiconv" >&5
- if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 101157 "configure"
-+#line 101461 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char libiconv(); below. */
-@@ -101176,7 +101480,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:101180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:101484: \"$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
-@@ -101332,7 +101636,7 @@
- done
-
- echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
--echo "configure:101336: checking for libiconv in -l$iconv_lib_name" >&5
-+echo "configure:101640: 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
-@@ -101340,7 +101644,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$iconv_lib_name $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 101344 "configure"
-+#line 101648 "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
-@@ -101351,7 +101655,7 @@
- libiconv()
- ; return 0; }
- EOF
--if { (eval echo configure:101355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:101659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -101485,7 +101789,7 @@
- done
-
- echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
--echo "configure:101489: checking for iconv in -l$iconv_lib_name" >&5
-+echo "configure:101793: 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
-@@ -101493,7 +101797,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-l$iconv_lib_name $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 101497 "configure"
-+#line 101801 "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
-@@ -101504,7 +101808,7 @@
- iconv()
- ; return 0; }
- EOF
--if { (eval echo configure:101508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:101812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -101693,7 +101997,7 @@
- # 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:101697: checking for $ac_word" >&5
-+echo "configure:102001: 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
-@@ -101721,21 +102025,21 @@
- fi
-
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:101725: checking for inline" >&5
-+echo "configure:102029: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
- cat > conftest.$ac_ext <<EOF
--#line 101732 "configure"
-+#line 102036 "configure"
- #include "confdefs.h"
-
- int main() {
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:101739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:102043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_inline=$ac_kw; break
- else
-@@ -101773,12 +102077,12 @@
-
-
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:101777: checking for ANSI C header files" >&5
-+echo "configure:102081: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 101782 "configure"
-+#line 102086 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -101786,7 +102090,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:101790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:102094: \"$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*
-@@ -101803,7 +102107,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
--#line 101807 "configure"
-+#line 102111 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -101821,7 +102125,7 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 101825 "configure"
-+#line 102129 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -101842,7 +102146,7 @@
- :
- else
- cat > conftest.$ac_ext <<EOF
--#line 101846 "configure"
-+#line 102150 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -101853,7 +102157,7 @@
- exit (0); }
-
- EOF
--if { (eval echo configure:101857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:102161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -101880,17 +102184,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:101884: checking for $ac_hdr" >&5
-+echo "configure:102188: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 101889 "configure"
-+#line 102193 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:101894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:102198: \"$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*
-@@ -101922,7 +102226,7 @@
-
-
- echo $ac_n "checking size of char""... $ac_c" 1>&6
--echo "configure:101926: checking size of char" >&5
-+echo "configure:102230: 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
-@@ -101930,18 +102234,18 @@
- ac_cv_sizeof_char=1
- else
- cat > conftest.$ac_ext <<EOF
--#line 101934 "configure"
-+#line 102238 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(char));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:101945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:102249: \"$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
-@@ -101962,7 +102266,7 @@
-
-
- echo $ac_n "checking size of int""... $ac_c" 1>&6
--echo "configure:101966: checking size of int" >&5
-+echo "configure:102270: 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
-@@ -101970,18 +102274,18 @@
- ac_cv_sizeof_int=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 101974 "configure"
-+#line 102278 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(int));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:101985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:102289: \"$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
-@@ -102001,7 +102305,7 @@
-
-
- echo $ac_n "checking size of long""... $ac_c" 1>&6
--echo "configure:102005: checking size of long" >&5
-+echo "configure:102309: 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
-@@ -102009,18 +102313,18 @@
- ac_cv_sizeof_long=4
- else
- cat > conftest.$ac_ext <<EOF
--#line 102013 "configure"
-+#line 102317 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:102024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:102328: \"$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
-@@ -102040,7 +102344,7 @@
-
-
- echo $ac_n "checking size of long long""... $ac_c" 1>&6
--echo "configure:102044: checking size of long long" >&5
-+echo "configure:102348: 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
-@@ -102048,18 +102352,18 @@
- ac_cv_sizeof_long_long=8
- else
- cat > conftest.$ac_ext <<EOF
--#line 102052 "configure"
-+#line 102356 "configure"
- #include "confdefs.h"
- #include <stdio.h>
--int main()
-+main()
- {
- FILE *f=fopen("conftestval", "w");
-- if (!f) return(1);
-+ if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long long));
-- return(0);
-+ exit(0);
- }
- EOF
--if { (eval echo configure:102063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:102367: \"$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
-@@ -102079,12 +102383,12 @@
-
-
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:102083: checking for size_t" >&5
-+echo "configure:102387: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 102088 "configure"
-+#line 102392 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -102112,12 +102416,12 @@
- fi
-
- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:102116: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:102420: checking whether time.h and sys/time.h may both be included" >&5
- if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 102121 "configure"
-+#line 102425 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -102126,7 +102430,7 @@
- struct tm *tp;
- ; return 0; }
- EOF
--if { (eval echo configure:102130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:102434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_header_time=yes
- else
-@@ -102147,12 +102451,12 @@
- fi
-
- echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
--echo "configure:102151: checking for uid_t in sys/types.h" >&5
-+echo "configure:102455: checking for uid_t in sys/types.h" >&5
- if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 102156 "configure"
-+#line 102460 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- EOF
-@@ -102192,12 +102496,12 @@
- memcpy memmove
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:102196: checking for $ac_func" >&5
-+echo "configure:102500: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 102201 "configure"
-+#line 102505 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -102220,7 +102524,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:102224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:102528: \"$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
-@@ -102563,7 +102867,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:102567: checking for XMLRPC-EPI in default path" >&5
-+echo "configure:102871: 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
-@@ -102995,7 +103299,7 @@
- php_enable_xmlwriter=yes
-
- echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6
--echo "configure:102999: checking whether to enable XMLWriter support" >&5
-+echo "configure:103303: 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"
-@@ -103043,7 +103347,7 @@
- php_with_libxml_dir=no
-
- echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
--echo "configure:103047: checking libxml2 install dir" >&5
-+echo "configure:103351: 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"
-@@ -103074,7 +103378,7 @@
-
-
- echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
--echo "configure:103078: checking for xml2-config path" >&5
-+echo "configure:103382: 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
-@@ -103232,7 +103536,7 @@
-
-
- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
--echo "configure:103236: checking whether libxml build works" >&5
-+echo "configure:103540: 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
-@@ -103248,7 +103552,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 103252 "configure"
-+#line 103556 "configure"
- #include "confdefs.h"
-
-
-@@ -103259,7 +103563,7 @@
- }
-
- EOF
--if { (eval echo configure:103263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:103567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- LIBS=$old_LIBS
-@@ -103598,7 +103902,7 @@
- php_with_xsl=no
-
- echo $ac_n "checking for XSL support""... $ac_c" 1>&6
--echo "configure:103602: checking for XSL support" >&5
-+echo "configure:103906: checking for XSL support" >&5
- # Check whether --with-xsl or --without-xsl was given.
- if test "${with_xsl+set}" = set; then
- withval="$with_xsl"
-@@ -103801,7 +104105,7 @@
-
-
- echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6
--echo "configure:103805: checking for EXSLT support" >&5
-+echo "configure:104109: 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
-@@ -104266,7 +104570,7 @@
- php_enable_zip=no
-
- echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6
--echo "configure:104270: checking for zip archive read/writesupport" >&5
-+echo "configure:104574: 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"
-@@ -104314,7 +104618,7 @@
- php_with_zlib_dir=no
-
- echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
--echo "configure:104318: checking for the location of libz" >&5
-+echo "configure:104622: 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"
-@@ -104362,7 +104666,7 @@
- fi
-
- echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6
--echo "configure:104366: checking for the location of zlib" >&5
-+echo "configure:104670: checking for the location of zlib" >&5
- if test "$PHP_ZLIB_DIR" = "no"; then
- { echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" 1>&2; exit 1; }
- else
-@@ -104879,7 +105183,7 @@
- php_with_pear=DEFAULT
-
- echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6
--echo "configure:104883: checking whether to install PEAR" >&5
-+echo "configure:105187: 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"
-@@ -104989,7 +105293,7 @@
- bison_version=none
- if test "$YACC"; then
- echo $ac_n "checking for bison version""... $ac_c" 1>&6
--echo "configure:104993: checking for bison version" >&5
-+echo "configure:105297: 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
-@@ -105046,17 +105350,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:105050: checking for $ac_hdr" >&5
-+echo "configure:105354: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105055 "configure"
-+#line 105359 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:105060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:105364: \"$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*
-@@ -105084,12 +105388,12 @@
-
-
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:105088: checking for size_t" >&5
-+echo "configure:105392: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105093 "configure"
-+#line 105397 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -105117,12 +105421,12 @@
- fi
-
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:105121: checking return type of signal handlers" >&5
-+echo "configure:105425: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105126 "configure"
-+#line 105430 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -105139,7 +105443,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:105143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:105447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_type_signal=void
- else
-@@ -105163,12 +105467,12 @@
-
-
- echo $ac_n "checking for uint""... $ac_c" 1>&6
--echo "configure:105167: checking for uint" >&5
-+echo "configure:105471: checking for uint" >&5
- if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105172 "configure"
-+#line 105476 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -105196,12 +105500,12 @@
- fi
-
- echo $ac_n "checking for ulong""... $ac_c" 1>&6
--echo "configure:105200: checking for ulong" >&5
-+echo "configure:105504: checking for ulong" >&5
- if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105205 "configure"
-+#line 105509 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -105231,9 +105535,9 @@
-
-
- echo $ac_n "checking for int32_t""... $ac_c" 1>&6
--echo "configure:105235: checking for int32_t" >&5
-+echo "configure:105539: checking for int32_t" >&5
- cat > conftest.$ac_ext <<EOF
--#line 105237 "configure"
-+#line 105541 "configure"
- #include "confdefs.h"
-
- #if HAVE_SYS_TYPES_H
-@@ -105252,7 +105556,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:105256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:105560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- cat >> confdefs.h <<EOF
-@@ -105271,9 +105575,9 @@
- rm -f conftest*
-
- echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
--echo "configure:105275: checking for uint32_t" >&5
-+echo "configure:105579: checking for uint32_t" >&5
- cat > conftest.$ac_ext <<EOF
--#line 105277 "configure"
-+#line 105581 "configure"
- #include "confdefs.h"
-
- #if HAVE_SYS_TYPES_H
-@@ -105292,7 +105596,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:105296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:105600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- cat >> confdefs.h <<EOF
-@@ -105311,12 +105615,12 @@
- rm -f conftest*
-
- echo $ac_n "checking for vprintf""... $ac_c" 1>&6
--echo "configure:105315: checking for vprintf" >&5
-+echo "configure:105619: checking for vprintf" >&5
- if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105320 "configure"
-+#line 105624 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char vprintf(); below. */
-@@ -105339,7 +105643,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:105343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:105647: \"$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
-@@ -105363,12 +105667,12 @@
-
- if test "$ac_cv_func_vprintf" != yes; then
- echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
--echo "configure:105367: checking for _doprnt" >&5
-+echo "configure:105671: checking for _doprnt" >&5
- if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105372 "configure"
-+#line 105676 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char _doprnt(); below. */
-@@ -105391,7 +105695,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:105395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:105699: \"$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
-@@ -105416,7 +105720,7 @@
- fi
-
- echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
--echo "configure:105420: checking for 8-bit clean memcmp" >&5
-+echo "configure:105724: 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
-@@ -105424,7 +105728,7 @@
- ac_cv_func_memcmp_clean=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 105428 "configure"
-+#line 105732 "configure"
- #include "confdefs.h"
-
- main()
-@@ -105434,7 +105738,7 @@
- }
-
- EOF
--if { (eval echo configure:105438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:105742: \"$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
-@@ -105454,19 +105758,19 @@
- # 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:105458: checking for working alloca.h" >&5
-+echo "configure:105762: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105463 "configure"
-+#line 105767 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:105470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:105774: \"$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
-@@ -105487,12 +105791,12 @@
- fi
-
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:105491: checking for alloca" >&5
-+echo "configure:105795: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105496 "configure"
-+#line 105800 "configure"
- #include "confdefs.h"
-
- #ifdef __GNUC__
-@@ -105520,7 +105824,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:105524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:105828: \"$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
-@@ -105552,12 +105856,12 @@
-
-
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:105556: checking whether alloca needs Cray hooks" >&5
-+echo "configure:105860: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105561 "configure"
-+#line 105865 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -105582,12 +105886,12 @@
- 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:105586: checking for $ac_func" >&5
-+echo "configure:105890: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105591 "configure"
-+#line 105895 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -105610,7 +105914,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:105614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:105918: \"$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
-@@ -105637,7 +105941,7 @@
- fi
-
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:105641: checking stack direction for C alloca" >&5
-+echo "configure:105945: 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
-@@ -105645,7 +105949,7 @@
- ac_cv_c_stack_direction=0
- else
- cat > conftest.$ac_ext <<EOF
--#line 105649 "configure"
-+#line 105953 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -105664,7 +105968,7 @@
- exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:105668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:105972: \"$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
-@@ -105688,12 +105992,12 @@
- for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:105692: checking for $ac_func" >&5
-+echo "configure:105996: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105697 "configure"
-+#line 106001 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -105716,7 +106020,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:105720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:106024: \"$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
-@@ -105742,7 +106046,7 @@
-
-
- echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6
--echo "configure:105746: checking whether sprintf is broken" >&5
-+echo "configure:106050: 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
-@@ -105753,11 +106057,11 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 105757 "configure"
-+#line 106061 "configure"
- #include "confdefs.h"
- main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }
- EOF
--if { (eval echo configure:105761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:106065: \"$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
-@@ -105791,12 +106095,12 @@
- for ac_func in finite isfinite isinf isnan
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:105795: checking for $ac_func" >&5
-+echo "configure:106099: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105800 "configure"
-+#line 106104 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -105819,7 +106123,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:105823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:106127: \"$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
-@@ -105846,13 +106150,13 @@
-
-
- echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6
--echo "configure:105850: checking whether fp_except is defined" >&5
-+echo "configure:106154: checking whether fp_except is defined" >&5
- if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
- cat > conftest.$ac_ext <<EOF
--#line 105856 "configure"
-+#line 106160 "configure"
- #include "confdefs.h"
-
- #include <floatingpoint.h>
-@@ -105863,7 +106167,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:105867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:106171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
-
- ac_cv_type_fp_except=yes
-@@ -105893,17 +106197,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:105897: checking for $ac_hdr" >&5
-+echo "configure:106201: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 105902 "configure"
-+#line 106206 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:105907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:106211: \"$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*
-@@ -105931,14 +106235,14 @@
-
-
- echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6
--echo "configure:105935: checking whether dlsym() requires a leading underscore in symbol names" >&5
-+echo "configure:106239: checking whether dlsym() requires a leading underscore in symbol names" >&5
- if test "$cross_compiling" = yes; then :
-
- else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 105942 "configure"
-+#line 106246 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -105999,7 +106303,7 @@
- exit (status);
- }
- EOF
-- if { (eval echo configure:106003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ if { (eval echo configure:106307: \"$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
-@@ -106082,23 +106386,23 @@
-
-
- echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6
--echo "configure:106086: checking virtual machine dispatch method" >&5
-+echo "configure:106390: 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:106090: checking whether to enable thread-safety" >&5
-+echo "configure:106394: 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:106094: checking whether to enable inline optimization for GCC" >&5
-+echo "configure:106398: 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:106098: checking whether to enable Zend debugging" >&5
-+echo "configure:106402: 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:106102: checking whether to enable Zend multibyte" >&5
-+echo "configure:106406: checking whether to enable Zend multibyte" >&5
- echo "$ac_t""$ZEND_MULTIBYTE" 1>&6
-
- case $PHP_ZEND_VM in
-@@ -106171,21 +106475,21 @@
-
-
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:106175: checking for inline" >&5
-+echo "configure:106479: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
- cat > conftest.$ac_ext <<EOF
--#line 106182 "configure"
-+#line 106486 "configure"
- #include "confdefs.h"
-
- int main() {
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:106189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:106493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_inline=$ac_kw; break
- else
-@@ -106214,7 +106518,7 @@
-
-
- echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6
--echo "configure:106218: checking target system is Darwin" >&5
-+echo "configure:106522: checking target system is Darwin" >&5
- if echo "$target" | grep "darwin" > /dev/null; then
- cat >> confdefs.h <<\EOF
- #define DARWIN 1
-@@ -106226,7 +106530,7 @@
- fi
-
- echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6
--echo "configure:106230: checking for MM alignment and log values" >&5
-+echo "configure:106534: checking for MM alignment and log values" >&5
-
- if test "$cross_compiling" = yes; then
-
-@@ -106234,7 +106538,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 106238 "configure"
-+#line 106542 "configure"
- #include "confdefs.h"
-
- #include <stdio.h>
-@@ -106270,7 +106574,7 @@
- }
-
- EOF
--if { (eval echo configure:106274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:106578: \"$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`
-@@ -106295,7 +106599,7 @@
- echo "$ac_t""done" 1>&6
-
- echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6
--echo "configure:106299: checking for memory allocation using mmap(MAP_ANON)" >&5
-+echo "configure:106603: checking for memory allocation using mmap(MAP_ANON)" >&5
-
- if test "$cross_compiling" = yes; then
-
-@@ -106303,7 +106607,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 106307 "configure"
-+#line 106611 "configure"
- #include "confdefs.h"
-
- #include <sys/types.h>
-@@ -106339,7 +106643,7 @@
- }
-
- EOF
--if { (eval echo configure:106343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:106647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- cat >> confdefs.h <<\EOF
-@@ -106361,7 +106665,7 @@
-
-
- echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6
--echo "configure:106365: checking for memory allocation using mmap("/dev/zero")" >&5
-+echo "configure:106669: checking for memory allocation using mmap("/dev/zero")" >&5
-
- if test "$cross_compiling" = yes; then
-
-@@ -106369,7 +106673,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 106373 "configure"
-+#line 106677 "configure"
- #include "confdefs.h"
-
- #include <sys/types.h>
-@@ -106415,7 +106719,7 @@
- }
-
- EOF
--if { (eval echo configure:106419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:106723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- cat >> confdefs.h <<\EOF
-@@ -106439,12 +106743,12 @@
- for ac_func in mremap
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:106443: checking for $ac_func" >&5
-+echo "configure:106747: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 106448 "configure"
-+#line 106752 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -106467,7 +106771,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:106471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:106775: \"$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
-@@ -106534,17 +106838,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:106538: checking for $ac_hdr" >&5
-+echo "configure:106842: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 106543 "configure"
-+#line 106847 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:106548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:106852: \"$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*
-@@ -106621,7 +106925,7 @@
-
-
- echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6
--echo "configure:106625: checking for GNU Pth" >&5
-+echo "configure:106929: 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
-@@ -106651,17 +106955,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:106655: checking for $ac_hdr" >&5
-+echo "configure:106959: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 106660 "configure"
-+#line 106964 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:106665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:106969: \"$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*
-@@ -106691,7 +106995,7 @@
-
- LIBS="$LIBS -lst"
- echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6
--echo "configure:106695: checking for SGI's State Threads" >&5
-+echo "configure:106999: checking for SGI's State Threads" >&5
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
- #define TSRM_ST 1
-@@ -106730,7 +107034,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 106734 "configure"
-+#line 107038 "configure"
- #include "confdefs.h"
-
- #include <pthread.h>
-@@ -106748,7 +107052,7 @@
- return pthread_create(&thd, NULL, thread_routine, &data);
- }
- EOF
--if { (eval echo configure:106752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:107056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- pthreads_working=yes
-@@ -106768,7 +107072,7 @@
- CFLAGS=$save_CFLAGS
-
- echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
--echo "configure:106772: checking for pthreads_cflags" >&5
-+echo "configure:107076: 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
-@@ -106790,7 +107094,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 106794 "configure"
-+#line 107098 "configure"
- #include "confdefs.h"
-
- #include <pthread.h>
-@@ -106808,7 +107112,7 @@
- return pthread_create(&thd, NULL, thread_routine, &data);
- }
- EOF
--if { (eval echo configure:106812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:107116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- pthreads_working=yes
-@@ -106838,7 +107142,7 @@
- echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
-
- echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
--echo "configure:106842: checking for pthreads_lib" >&5
-+echo "configure:107146: 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
-@@ -106860,7 +107164,7 @@
-
- else
- cat > conftest.$ac_ext <<EOF
--#line 106864 "configure"
-+#line 107168 "configure"
- #include "confdefs.h"
-
- #include <pthread.h>
-@@ -106878,7 +107182,7 @@
- return pthread_create(&thd, NULL, thread_routine, &data);
- }
- EOF
--if { (eval echo configure:106882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:107186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-
- pthreads_working=yes
-@@ -106929,7 +107233,7 @@
-
-
- echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
--echo "configure:106933: checking for POSIX threads" >&5
-+echo "configure:107237: checking for POSIX threads" >&5
- echo "$ac_t""yes" 1>&6
- fi
-
-@@ -107327,6 +107631,18 @@
-
-
-
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_EXTRA_LIBS"
++AC_DEFUN([AC_FPM_VARS],
++[
++ fpm_prefix=$ac_default_prefix
++ if test $prefix != "NONE" -a $prefix != "" -a $prefix != "no" ; then
++ fpm_prefix=$prefix
++ else
++ prefix=$fpm_prefix
++ fi
+
-+
++ if test $exec_prefix = "NONE" -o $exec_prefix = "" -o $exec_prefix = "no" ; then
++ exec_prefix=$fpm_prefix
++ fi
+
++ if test `echo "$bindir" | grep "exec_prefix"` ; then
++ bindir=$exec_prefix/bin
++ fi
+
-+
-+ PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_EXTRA_DEPS"
++ fpm_bin_prefix=$fpm_prefix/bin
++ if test $bindir != "NONE" -a $bindir != "" -a $bindir != "no" ; then
++ fpm_bin_prefix=$bindir
++ fi
+
-+
++ if test -z "$PHP_FPM_BIN" -o "$PHP_FPM_BIN" = "yes" -o "$PHP_FPM_BIN" = "no"; then
++ php_fpm_bin_path="$fpm_bin_prefix/php-fpm"
++ else
++ php_fpm_bin_path="$PHP_FPM_BIN"
++ fi
++ php_fpm_bin=`basename $php_fpm_bin_path`
++ php_fpm_bin_dir=`dirname $php_fpm_bin_path`
+
++ if test -z "$PHP_FPM_PORT" -o "$PHP_FPM_PORT" = "yes" -o "$PHP_FPM_PORT" = "no"; then
++ php_fpm_port="9000"
++ else
++ php_fpm_port="$PHP_FPM_PORT"
++ fi
+
-+
- PHP_VAR_SUBST="$PHP_VAR_SUBST ZEND_EXTRA_LIBS"
-
-
-@@ -107542,7 +107858,7 @@
-
-
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:107546: checking build system type" >&5
-+echo "configure:107862: checking build system type" >&5
-
- build_alias=$build
- case "$build_alias" in
-@@ -107571,7 +107887,7 @@
- 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:107575: checking for ld used by $CC" >&5
-+echo "configure:107891: checking for ld used by $CC" >&5
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
-@@ -107601,10 +107917,10 @@
- esac
- elif test "$with_gnu_ld" = yes; then
- echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
--echo "configure:107605: checking for GNU ld" >&5
-+echo "configure:107921: checking for GNU ld" >&5
- else
- echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
--echo "configure:107608: checking for non-GNU ld" >&5
-+echo "configure:107924: 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
-@@ -107643,7 +107959,7 @@
- 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:107647: checking if the linker ($LD) is GNU ld" >&5
-+echo "configure:107963: 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
-@@ -107663,7 +107979,7 @@
-
-
- echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
--echo "configure:107667: checking for $LD option to reload object files" >&5
-+echo "configure:107983: 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
-@@ -107688,7 +108004,7 @@
- esac
-
- echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
--echo "configure:107692: checking for BSD-compatible nm" >&5
-+echo "configure:108008: 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
-@@ -107734,7 +108050,7 @@
- NM="$lt_cv_path_NM"
-
- echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
--echo "configure:107738: checking how to recognise dependent libraries" >&5
-+echo "configure:108054: checking how to recognise dependent libraries" >&5
- if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -107912,13 +108228,13 @@
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
- echo $ac_n "checking for object suffix""... $ac_c" 1>&6
--echo "configure:107916: checking for object suffix" >&5
-+echo "configure:108232: 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:107922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:108238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- for ac_file in conftest.*; do
- case $ac_file in
- *.c) ;;
-@@ -107938,7 +108254,7 @@
-
-
- echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
--echo "configure:107942: checking for executable suffix" >&5
-+echo "configure:108258: checking for executable suffix" >&5
- if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -107948,7 +108264,7 @@
- rm -f conftest*
- echo 'int main () { return 0; }' > conftest.$ac_ext
- ac_cv_exeext=
-- if { (eval echo configure:107952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+ if { (eval echo configure:108268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
- for file in conftest.*; do
- case $file in
- *.c | *.o | *.obj) ;;
-@@ -107991,7 +108307,7 @@
- ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
-- if { (eval echo configure:107995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ if { (eval echo configure:108311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
- HPUX_IA64_MODE="32"
-@@ -108005,8 +108321,8 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 108009 "configure"' > conftest.$ac_ext
-- if { (eval echo configure:108010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ echo '#line 108325 "configure"' > conftest.$ac_ext
-+ if { (eval echo configure:108326: \"$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*)
-@@ -108039,7 +108355,7 @@
- x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
-- if { (eval echo configure:108043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ if { (eval echo configure:108359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
-@@ -108083,7 +108399,7 @@
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
--echo "configure:108087: checking whether the C compiler needs -belf" >&5
-+echo "configure:108403: 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
-@@ -108096,14 +108412,14 @@
- cross_compiling=$ac_cv_prog_cc_cross
-
- cat > conftest.$ac_ext <<EOF
--#line 108100 "configure"
-+#line 108416 "configure"
- #include "confdefs.h"
-
- int main() {
-
- ; return 0; }
- EOF
--if { (eval echo configure:108107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:108423: \"$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
-@@ -108141,7 +108457,7 @@
- ( (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:108145: checking how to run the C++ preprocessor" >&5
-+echo "configure:108461: 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
-@@ -108154,12 +108470,12 @@
- cross_compiling=$ac_cv_prog_cxx_cross
- CXXCPP="${CXX-g++} -E"
- cat > conftest.$ac_ext <<EOF
--#line 108158 "configure"
-+#line 108474 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:108163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:108479: \"$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
- :
-@@ -108190,7 +108506,7 @@
-
- # 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:108194: checking the maximum length of command line arguments" >&5
-+echo "configure:108510: 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
-@@ -108291,7 +108607,7 @@
-
- # 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:108295: checking command to parse $NM output from $compiler object" >&5
-+echo "configure:108611: 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
-@@ -108386,10 +108702,10 @@
- int main(){nm_test_var='a';nm_test_func();return(0);}
- EOF
-
-- if { (eval echo configure:108390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ if { (eval echo configure:108706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- # Now try to grab the symbols.
- nlist=conftest.nm
-- if { (eval echo configure:108393: \"$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:108709: \"$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"
-@@ -108440,7 +108756,7 @@
- lt_save_CFLAGS="$CFLAGS"
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-- if { (eval echo configure:108444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ if { (eval echo configure:108760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- LIBS="$lt_save_LIBS"
-@@ -108480,7 +108796,7 @@
- fi
-
- echo $ac_n "checking for objdir""... $ac_c" 1>&6
--echo "configure:108484: checking for objdir" >&5
-+echo "configure:108800: checking for objdir" >&5
- if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -108546,7 +108862,7 @@
- # 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:108550: checking for $ac_word" >&5
-+echo "configure:108866: 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
-@@ -108578,7 +108894,7 @@
- # 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:108582: checking for $ac_word" >&5
-+echo "configure:108898: 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
-@@ -108613,7 +108929,7 @@
- # 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:108617: checking for $ac_word" >&5
-+echo "configure:108933: 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
-@@ -108645,7 +108961,7 @@
- # 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:108649: checking for $ac_word" >&5
-+echo "configure:108965: 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
-@@ -108680,7 +108996,7 @@
- # 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:108684: checking for $ac_word" >&5
-+echo "configure:109000: 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
-@@ -108712,7 +109028,7 @@
- # 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:108716: checking for $ac_word" >&5
-+echo "configure:109032: 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
-@@ -108798,7 +109114,7 @@
- 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:108802: checking for ${ac_tool_prefix}file" >&5
-+echo "configure:109118: 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
-@@ -108858,7 +109174,7 @@
- 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:108862: checking for file" >&5
-+echo "configure:109178: 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
-@@ -109017,7 +109333,7 @@
- # Check to make sure the static flag actually works.
- #
- echo $ac_n "checking if $compiler static flag $lt_prog_compiler_static works""... $ac_c" 1>&6
--echo "configure:109021: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-+echo "configure:109337: checking if $compiler static flag $lt_prog_compiler_static works" >&5
- if eval "test \"`echo '$''{'lt_prog_compiler_static_works'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -109067,7 +109383,7 @@
-
-
- echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
--echo "configure:109071: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo "configure:109387: 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
-@@ -109084,11 +109400,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"configure:109088: $lt_compile\"" >&5)
-+ (eval echo "\"configure:109404: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "configure:109092: \$? = $ac_status" >&5
-+ echo "configure:109408: \$? = $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.
-@@ -109117,7 +109433,7 @@
- lt_prog_compiler_static=
-
- echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
--echo "configure:109121: checking for $compiler option to produce PIC" >&5
-+echo "configure:109437: checking for $compiler option to produce PIC" >&5
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
-@@ -109328,7 +109644,7 @@
- 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:109332: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+echo "configure:109648: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- if eval "test \"`echo '$''{'lt_prog_compiler_pic_works'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -109345,11 +109661,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"configure:109349: $lt_compile\"" >&5)
-+ (eval echo "\"configure:109665: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "configure:109353: \$? = $ac_status" >&5
-+ echo "configure:109669: \$? = $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.
-@@ -109387,7 +109703,7 @@
- esac
-
- echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
--echo "configure:109391: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo "configure:109707: 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
-@@ -109407,11 +109723,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"configure:109411: $lt_compile\"" >&5)
-+ (eval echo "\"configure:109727: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "configure:109415: \$? = $ac_status" >&5
-+ echo "configure:109731: \$? = $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
-@@ -109441,7 +109757,7 @@
- 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:109445: checking if we can lock with hard links" >&5
-+echo "configure:109761: 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
-@@ -109458,7 +109774,7 @@
- fi
-
- echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
--echo "configure:109462: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo "configure:109778: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-
- runpath_var=
- allow_undefined_flag=
-@@ -109811,12 +110127,12 @@
- # Determine the default libpath from the value encoded in an empty executable.
-
- cat > conftest.$ac_ext <<EOF
--#line 109815 "configure"
-+#line 110131 "configure"
- #include "confdefs.h"
- int main() {
- ; return 0; }
- EOF
--if { (eval echo configure:109820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:110136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -109842,12 +110158,12 @@
- # Determine the default libpath from the value encoded in an empty executable.
-
- cat > conftest.$ac_ext <<EOF
--#line 109846 "configure"
-+#line 110162 "configure"
- #include "confdefs.h"
- int main() {
- ; return 0; }
- EOF
--if { (eval echo configure:109851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:110167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -110319,11 +110635,11 @@
- # 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:110323: checking whether -lc should be explicitly linked in" >&5
-+echo "configure:110639: checking whether -lc should be explicitly linked in" >&5
- $rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-- if { (eval echo configure:110327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
-+ if { (eval echo configure:110643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
-@@ -110336,7 +110652,7 @@
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag
- allow_undefined_flag=
-- if { (eval echo configure:110340: \"$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:110656: \"$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
-@@ -110355,7 +110671,7 @@
- esac
-
- echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
--echo "configure:110359: checking dynamic linker characteristics" >&5
-+echo "configure:110675: checking dynamic linker characteristics" >&5
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -110729,8 +111045,8 @@
- libsuff=
- case $host_cpu in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 110733 "configure"' > conftest.$ac_ext
-- if { (eval echo configure:110734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ echo '#line 111049 "configure"' > conftest.$ac_ext
-+ if { (eval echo configure:111050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
-@@ -110929,7 +111245,7 @@
- test "$dynamic_linker" = no && can_build_shared=no
-
- echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
--echo "configure:110933: checking how to hardcode library paths into programs" >&5
-+echo "configure:111249: checking how to hardcode library paths into programs" >&5
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var" || \
-@@ -110967,7 +111283,7 @@
- striplib=
- old_striplib=
- echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
--echo "configure:110971: checking whether stripping libraries is possible" >&5
-+echo "configure:111287: 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"
-@@ -111017,7 +111333,7 @@
- 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:111021: checking for dlopen in -ldl" >&5
-+echo "configure:111337: 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
-@@ -111025,7 +111341,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 111029 "configure"
-+#line 111345 "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
-@@ -111036,7 +111352,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:111040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:111356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -111065,12 +111381,12 @@
-
- *)
- echo $ac_n "checking for shl_load""... $ac_c" 1>&6
--echo "configure:111069: checking for shl_load" >&5
-+echo "configure:111385: checking for shl_load" >&5
- if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 111074 "configure"
-+#line 111390 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load(); below. */
-@@ -111093,7 +111409,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:111097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:111413: \"$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
-@@ -111111,7 +111427,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
--echo "configure:111115: checking for shl_load in -ldld" >&5
-+echo "configure:111431: 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
-@@ -111119,7 +111435,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldld $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 111123 "configure"
-+#line 111439 "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
-@@ -111130,7 +111446,7 @@
- shl_load()
- ; return 0; }
- EOF
--if { (eval echo configure:111134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:111450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -111149,12 +111465,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dlopen""... $ac_c" 1>&6
--echo "configure:111153: checking for dlopen" >&5
-+echo "configure:111469: checking for dlopen" >&5
- if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 111158 "configure"
-+#line 111474 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen(); below. */
-@@ -111177,7 +111493,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:111181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:111497: \"$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
-@@ -111195,7 +111511,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:111199: checking for dlopen in -ldl" >&5
-+echo "configure:111515: 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
-@@ -111203,7 +111519,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 111207 "configure"
-+#line 111523 "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
-@@ -111214,7 +111530,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:111218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:111534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -111233,7 +111549,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
--echo "configure:111237: checking for dlopen in -lsvld" >&5
-+echo "configure:111553: 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
-@@ -111241,7 +111557,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsvld $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 111245 "configure"
-+#line 111561 "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
-@@ -111252,7 +111568,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:111256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:111572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -111271,7 +111587,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
--echo "configure:111275: checking for dld_link in -ldld" >&5
-+echo "configure:111591: 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
-@@ -111279,7 +111595,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldld $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 111283 "configure"
-+#line 111599 "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
-@@ -111290,7 +111606,7 @@
- dld_link()
- ; return 0; }
- EOF
--if { (eval echo configure:111294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:111610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -111346,7 +111662,7 @@
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
--echo "configure:111350: checking whether a program can dlopen itself" >&5
-+echo "configure:111666: 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
-@@ -111356,7 +111672,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 111360 "configure"
-+#line 111676 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -111417,7 +111733,7 @@
- exit (status);
- }
- EOF
-- if { (eval echo configure:111421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ if { (eval echo configure:111737: \"$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
-@@ -111440,7 +111756,7 @@
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
--echo "configure:111444: checking whether a statically linked program can dlopen itself" >&5
-+echo "configure:111760: 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
-@@ -111450,7 +111766,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 111454 "configure"
-+#line 111770 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -111511,7 +111827,7 @@
- exit (status);
- }
- EOF
-- if { (eval echo configure:111515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ if { (eval echo configure:111831: \"$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
-@@ -111552,11 +111868,11 @@
-
- # Report which librarie types wil actually be built
- echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
--echo "configure:111556: checking if libtool supports shared libraries" >&5
-+echo "configure:111872: 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:111560: checking whether to build shared libraries" >&5
-+echo "configure:111876: 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
-@@ -111579,7 +111895,7 @@
- echo "$ac_t""$enable_shared" 1>&6
-
- echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
--echo "configure:111583: checking whether to build static libraries" >&5
-+echo "configure:111899: 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
-@@ -112248,7 +112564,7 @@
- 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:112252: checking for ld used by $CC" >&5
-+echo "configure:112568: checking for ld used by $CC" >&5
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
-@@ -112278,10 +112594,10 @@
- esac
- elif test "$with_gnu_ld" = yes; then
- echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
--echo "configure:112282: checking for GNU ld" >&5
-+echo "configure:112598: checking for GNU ld" >&5
- else
- echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
--echo "configure:112285: checking for non-GNU ld" >&5
-+echo "configure:112601: 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
-@@ -112320,7 +112636,7 @@
- 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:112324: checking if the linker ($LD) is GNU ld" >&5
-+echo "configure:112640: 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
-@@ -112386,7 +112702,7 @@
-
- # 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:112390: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo "configure:112706: checking whether the $compiler linker ($LD) supports shared libraries" >&5
- ld_shlibs_CXX=yes
- case $host_os in
- aix3*)
-@@ -112482,12 +112798,12 @@
- # Determine the default libpath from the value encoded in an empty executable.
-
- cat > conftest.$ac_ext <<EOF
--#line 112486 "configure"
-+#line 112802 "configure"
- #include "confdefs.h"
- int main() {
- ; return 0; }
- EOF
--if { (eval echo configure:112491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:112807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -112514,12 +112830,12 @@
- # Determine the default libpath from the value encoded in an empty executable.
-
- cat > conftest.$ac_ext <<EOF
--#line 112518 "configure"
-+#line 112834 "configure"
- #include "confdefs.h"
- int main() {
- ; return 0; }
- EOF
--if { (eval echo configure:112523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:112839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -113226,7 +113542,7 @@
- };
- EOF
-
--if { (eval echo configure:113230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:113546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
-
-@@ -113336,7 +113652,7 @@
- lt_prog_compiler_static_CXX=
-
- echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
--echo "configure:113340: checking for $compiler option to produce PIC" >&5
-+echo "configure:113656: checking for $compiler option to produce PIC" >&5
-
- # C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
-@@ -113611,7 +113927,7 @@
- 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:113615: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+echo "configure:113931: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
- if eval "test \"`echo '$''{'lt_prog_compiler_pic_works_CXX'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -113628,11 +113944,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"configure:113632: $lt_compile\"" >&5)
-+ (eval echo "\"configure:113948: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "configure:113636: \$? = $ac_status" >&5
-+ echo "configure:113952: \$? = $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.
-@@ -113670,7 +113986,7 @@
- esac
-
- echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
--echo "configure:113674: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo "configure:113990: 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
-@@ -113690,11 +114006,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"configure:113694: $lt_compile\"" >&5)
-+ (eval echo "\"configure:114010: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "configure:113698: \$? = $ac_status" >&5
-+ echo "configure:114014: \$? = $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
-@@ -113724,7 +114040,7 @@
- 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:113728: checking if we can lock with hard links" >&5
-+echo "configure:114044: 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
-@@ -113741,7 +114057,7 @@
- fi
-
- echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
--echo "configure:113745: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo "configure:114061: 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
-@@ -113791,11 +114107,11 @@
- # 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:113795: checking whether -lc should be explicitly linked in" >&5
-+echo "configure:114111: checking whether -lc should be explicitly linked in" >&5
- $rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-- if { (eval echo configure:113799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
-+ if { (eval echo configure:114115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
-@@ -113808,7 +114124,7 @@
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
- allow_undefined_flag_CXX=
-- if { (eval echo configure:113812: \"$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:114128: \"$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
-@@ -113827,7 +114143,7 @@
- esac
-
- echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
--echo "configure:113831: checking dynamic linker characteristics" >&5
-+echo "configure:114147: checking dynamic linker characteristics" >&5
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -114201,8 +114517,8 @@
- libsuff=
- case $host_cpu in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 114205 "configure"' > conftest.$ac_ext
-- if { (eval echo configure:114206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ echo '#line 114521 "configure"' > conftest.$ac_ext
-+ if { (eval echo configure:114522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
-@@ -114401,7 +114717,7 @@
- test "$dynamic_linker" = no && can_build_shared=no
-
- echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
--echo "configure:114405: checking how to hardcode library paths into programs" >&5
-+echo "configure:114721: 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" || \
-@@ -114439,7 +114755,7 @@
- striplib=
- old_striplib=
- echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
--echo "configure:114443: checking whether stripping libraries is possible" >&5
-+echo "configure:114759: 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"
-@@ -114489,7 +114805,7 @@
- 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:114493: checking for dlopen in -ldl" >&5
-+echo "configure:114809: 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
-@@ -114497,7 +114813,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 114501 "configure"
-+#line 114817 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -114511,7 +114827,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:114515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:114831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -114540,12 +114856,12 @@
-
- *)
- echo $ac_n "checking for shl_load""... $ac_c" 1>&6
--echo "configure:114544: checking for shl_load" >&5
-+echo "configure:114860: checking for shl_load" >&5
- if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 114549 "configure"
-+#line 114865 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load(); below. */
-@@ -114571,7 +114887,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:114575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:114891: \"$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
-@@ -114589,7 +114905,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
--echo "configure:114593: checking for shl_load in -ldld" >&5
-+echo "configure:114909: 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
-@@ -114597,7 +114913,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldld $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 114601 "configure"
-+#line 114917 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -114611,7 +114927,7 @@
- shl_load()
- ; return 0; }
- EOF
--if { (eval echo configure:114615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:114931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -114630,12 +114946,12 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dlopen""... $ac_c" 1>&6
--echo "configure:114634: checking for dlopen" >&5
-+echo "configure:114950: checking for dlopen" >&5
- if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 114639 "configure"
-+#line 114955 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen(); below. */
-@@ -114661,7 +114977,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:114665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:114981: \"$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
-@@ -114679,7 +114995,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:114683: checking for dlopen in -ldl" >&5
-+echo "configure:114999: 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
-@@ -114687,7 +115003,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 114691 "configure"
-+#line 115007 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -114701,7 +115017,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:114705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:115021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -114720,7 +115036,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
--echo "configure:114724: checking for dlopen in -lsvld" >&5
-+echo "configure:115040: 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
-@@ -114728,7 +115044,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsvld $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 114732 "configure"
-+#line 115048 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -114742,7 +115058,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:114746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:115062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -114761,7 +115077,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
--echo "configure:114765: checking for dld_link in -ldld" >&5
-+echo "configure:115081: 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
-@@ -114769,7 +115085,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-ldld $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 114773 "configure"
-+#line 115089 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -114783,7 +115099,7 @@
- dld_link()
- ; return 0; }
- EOF
--if { (eval echo configure:114787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:115103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -114839,7 +115155,7 @@
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
--echo "configure:114843: checking whether a program can dlopen itself" >&5
-+echo "configure:115159: 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
-@@ -114849,7 +115165,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 114853 "configure"
-+#line 115169 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -114910,7 +115226,7 @@
- exit (status);
- }
- EOF
-- if { (eval echo configure:114914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ if { (eval echo configure:115230: \"$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
-@@ -114933,7 +115249,7 @@
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
--echo "configure:114937: checking whether a statically linked program can dlopen itself" >&5
-+echo "configure:115253: 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
-@@ -114943,7 +115259,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 114947 "configure"
-+#line 115263 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -115004,7 +115320,7 @@
- exit (status);
- }
- EOF
-- if { (eval echo configure:115008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ if { (eval echo configure:115324: \"$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
-@@ -115579,7 +115895,7 @@
- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
- ;;
- *)
-- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
-+ install_targets="install-sapi $install_fpm $PHP_INSTALL_CLI_TARGET $install_targets"
- ;;
- esac
-
-@@ -116283,6 +116599,7 @@
- s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g
- s%@SHLIB_SUFFIX_NAME@%$SHLIB_SUFFIX_NAME%g
- s%@SHLIB_DL_SUFFIX_NAME@%$SHLIB_DL_SUFFIX_NAME%g
-+s%@XMLCONFIG@%$XMLCONFIG%g
- s%@PROG_SENDMAIL@%$PROG_SENDMAIL%g
- s%@LIBOBJS@%$LIBOBJS%g
- s%@ALLOCA@%$ALLOCA%g
-@@ -116331,6 +116648,8 @@
- s%@EXTRA_LDFLAGS@%$EXTRA_LDFLAGS%g
- s%@EXTRA_LDFLAGS_PROGRAM@%$EXTRA_LDFLAGS_PROGRAM%g
- s%@EXTRA_LIBS@%$EXTRA_LIBS%g
-+s%@SAPI_EXTRA_LIBS@%$SAPI_EXTRA_LIBS%g
-+s%@SAPI_EXTRA_DEPS@%$SAPI_EXTRA_DEPS%g
- s%@ZEND_EXTRA_LIBS@%$ZEND_EXTRA_LIBS%g
- s%@INCLUDES@%$INCLUDES%g
- s%@EXTRA_INCLUDES@%$EXTRA_INCLUDES%g
-diff -Nru php-5.2.4.vanilla/configure.in php-5.2.4.fpm/configure.in
---- php-5.2.4.vanilla/configure.in 2007-08-30 03:36:11.000000000 +0400
-+++ php-5.2.4.fpm/configure.in 2007-08-31 15:47:19.000000000 +0400
-@@ -267,6 +267,12 @@
- PTHREADS_FLAGS
- fi
-
-+if test "$PHP_FASTCGI" = "yes" -a "$PHP_FPM" = "yes"; then
-+ PHP_CONFIGURE_PART(Running FastCGI Process Manager checks)
-+ sinclude(sapi/cgi/fpm/acinclude.m4)
-+ sinclude(sapi/cgi/fpm/config.m4)
-+fi
++ if test -z "$PHP_FPM_CONF" -o "$PHP_FPM_CONF" = "yes"; then
++ case $host_os in
++ freebsd*|dragonfly*) php_fpm_conf_path="/usr/local/etc/php-fpm.conf" ;;
++ *) php_fpm_conf_path="/etc/php-fpm.conf" ;;
++ esac
++ elif test "$PHP_FPM_CONF" = "no"; then
++ php_fpm_conf_path=""
++ else
++ php_fpm_conf_path="$PHP_FPM_CONF"
++ fi
++ if test -z "$php_fpm_conf_path"; then
++ php_fpm_conf=""
++ php_fpm_conf_dir=""
++ else
++ php_fpm_conf=`basename $php_fpm_conf_path`
++ php_fpm_conf_dir=`dirname $php_fpm_conf_path`
++ fi
+
- divert(3)
-
- dnl ## In diversion 3 we check for compile-time options to the PHP
-@@ -476,6 +482,7 @@
- alphasort \
- asctime_r \
- chroot \
-+clearenv \
- ctime_r \
- cuserid \
- crypt \
-@@ -1197,6 +1204,8 @@
- PHP_SUBST_OLD(EXTRA_LDFLAGS)
- PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
- PHP_SUBST_OLD(EXTRA_LIBS)
-+PHP_SUBST_OLD(SAPI_EXTRA_LIBS)
-+PHP_SUBST_OLD(SAPI_EXTRA_DEPS)
- PHP_SUBST_OLD(ZEND_EXTRA_LIBS)
- PHP_SUBST_OLD(INCLUDES)
- PHP_SUBST_OLD(EXTRA_INCLUDES)
-@@ -1285,7 +1294,7 @@
- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
- ;;
- *)
-- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
-+ install_targets="install-sapi $install_fpm $PHP_INSTALL_CLI_TARGET $install_targets"
- ;;
- esac
-
-diff -Nru php-5.2.4.vanilla/libevent/acconfig.h php-5.2.4.fpm/libevent/acconfig.h
---- php-5.2.4.vanilla/libevent/acconfig.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/acconfig.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,67 @@
-+/* Define if kqueue works correctly with pipes */
-+#undef HAVE_WORKING_KQUEUE
-+
-+/* Define if timeradd is defined in <sys/time.h> */
-+#undef HAVE_TIMERADD
-+#ifndef HAVE_TIMERADD
-+#undef timersub
-+#define timeradd(tvp, uvp, vvp) \
-+ do { \
-+ (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
-+ (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \
-+ if ((vvp)->tv_usec >= 1000000) { \
-+ (vvp)->tv_sec++; \
-+ (vvp)->tv_usec -= 1000000; \
-+ } \
-+ } while (0)
-+#define timersub(tvp, uvp, vvp) \
-+ do { \
-+ (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
-+ (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
-+ if ((vvp)->tv_usec < 0) { \
-+ (vvp)->tv_sec--; \
-+ (vvp)->tv_usec += 1000000; \
-+ } \
-+ } while (0)
-+#endif /* !HAVE_TIMERADD */
++ if test -z "$PHP_FPM_INIT" -o "$PHP_FPM_INIT" = "yes"; then
++ case $host_os in
++ openbsd*) php_fpm_init_path="" ;;
++ netbsd*) php_fpm_init_path="/etc/rc.d/php-fpm" ;;
++ *bsd*|dragonfly*) php_fpm_init_path="/usr/local/etc/rc.d/php-fpm" ;;
++ *) php_fpm_init_path="/etc/init.d/php-fpm" ;;
++ esac
++ test -f /etc/arch-release && php_fpm_init_path="/etc/rc.d/php-fpm" # arch linux
+
-+#undef HAVE_TIMERCLEAR
-+#ifndef HAVE_TIMERCLEAR
-+#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0
-+#endif
++ elif test "$PHP_FPM_INIT" = "no"; then
++ php_fpm_init_path=""
++ else
++ php_fpm_init_path="$PHP_FPM_INIT"
++ fi
++ if test -z "$php_fpm_init_path"; then
++ php_fpm_init=""
++ php_fpm_init_dir=""
++ else
++ php_fpm_init=`basename $php_fpm_init_path`
++ php_fpm_init_dir=`dirname $php_fpm_init_path`
++ fi
+
-+#undef HAVE_TIMERCMP
-+#ifndef HAVE_TIMERCMP
-+#undef timercmp
-+#define timercmp(tvp, uvp, cmp) \
-+ (((tvp)->tv_sec == (uvp)->tv_sec) ? \
-+ ((tvp)->tv_usec cmp (uvp)->tv_usec) : \
-+ ((tvp)->tv_sec cmp (uvp)->tv_sec))
-+#endif
++ if test -z "$PHP_FPM_LOG" -o "$PHP_FPM_LOG" = "yes" -o "$PHP_FPM_LOG" = "no"; then
++ php_fpm_log_path="/var/log/php-fpm.log"
++ else
++ php_fpm_log_path="$PHP_FPM_LOG"
++ fi
++ php_fpm_log_dir=`dirname $php_fpm_log_path`
+
-+#undef HAVE_TIMERISSET
-+#ifndef HAVE_TIMERISSET
-+#undef timerisset
-+#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
-+#endif
++ if test -z "$PHP_FPM_PID" -o "$PHP_FPM_PID" = "yes" -o "$PHP_FPM_PID" = "no"; then
++ php_fpm_pid_path="/var/run/php-fpm.pid"
++ else
++ php_fpm_pid_path="$PHP_FPM_PID"
++ fi
++ php_fpm_pid_dir=`dirname $php_fpm_pid_path`
+
-+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
-+#undef HAVE_TAILQFOREACH
-+#ifndef HAVE_TAILQFOREACH
-+#define TAILQ_FIRST(head) ((head)->tqh_first)
-+#define TAILQ_END(head) NULL
-+#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-+#define TAILQ_FOREACH(var, head, field) \
-+ for((var) = TAILQ_FIRST(head); \
-+ (var) != TAILQ_END(head); \
-+ (var) = TAILQ_NEXT(var, field))
-+#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \
-+ (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \
-+ (elm)->field.tqe_next = (listelm); \
-+ *(listelm)->field.tqe_prev = (elm); \
-+ (listelm)->field.tqe_prev = &(elm)->field.tqe_next; \
-+} while (0)
-+#endif /* TAILQ_FOREACH */
-+
-+/* Define to __FUNCTION__ or __file__ if your compiler doesn't have __func__ */
-+#undef __func__
-diff -Nru php-5.2.4.vanilla/libevent/aclocal.m4 php-5.2.4.fpm/libevent/aclocal.m4
---- php-5.2.4.vanilla/libevent/aclocal.m4 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/aclocal.m4 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,6922 @@
-+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005 Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-+
-+# serial 47 AC_PROG_LIBTOOL
-+
-+
-+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-+# -----------------------------------------------------------
-+# If this macro is not defined by Autoconf, define it here.
-+m4_ifdef([AC_PROVIDE_IFELSE],
-+ [],
-+ [m4_define([AC_PROVIDE_IFELSE],
-+ [m4_ifdef([AC_PROVIDE_$1],
-+ [$2], [$3])])])
-+
-+
-+# AC_PROG_LIBTOOL
-+# ---------------
-+AC_DEFUN([AC_PROG_LIBTOOL],
-+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [AC_LIBTOOL_CXX],
-+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-+ ])])
-+dnl And a similar setup for Fortran 77 support
-+ AC_PROVIDE_IFELSE([AC_PROG_F77],
-+ [AC_LIBTOOL_F77],
-+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-+])])
-+
-+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-+ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [ifdef([AC_PROG_GCJ],
-+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+ ifdef([A][M_PROG_GCJ],
-+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+ ifdef([LT_AC_PROG_GCJ],
-+ [define([LT_AC_PROG_GCJ],
-+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-+])])# AC_PROG_LIBTOOL
-+
-+
-+# _AC_PROG_LIBTOOL
-+# ----------------
-+AC_DEFUN([_AC_PROG_LIBTOOL],
-+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
-+
-+# Prevent multiple expansion
-+define([AC_PROG_LIBTOOL], [])
-+])# _AC_PROG_LIBTOOL
-+
-+
-+# AC_LIBTOOL_SETUP
-+# ----------------
-+AC_DEFUN([AC_LIBTOOL_SETUP],
-+[AC_PREREQ(2.50)dnl
-+AC_REQUIRE([AC_ENABLE_SHARED])dnl
-+AC_REQUIRE([AC_ENABLE_STATIC])dnl
-+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_LD])dnl
-+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-+AC_REQUIRE([AC_PROG_NM])dnl
-+
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
-+dnl
++ if test -z "$PHP_FPM_USER" -o "$PHP_FPM_USER" = "yes" -o "$PHP_FPM_USER" = "no"; then
++ php_fpm_user="nobody"
++ else
++ php_fpm_user="$PHP_FPM_USER"
++ fi
+
-+AC_LIBTOOL_SYS_MAX_CMD_LEN
-+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+AC_LIBTOOL_OBJDIR
-+
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+_LT_AC_PROG_ECHO_BACKSLASH
-+
-+case $host_os in
-+aix3*)
-+ # AIX sometimes has problems with the GCC collect2 program. For some
-+ # reason, if we set the COLLECT_NAMES environment variable, the problems
-+ # vanish in a puff of smoke.
-+ if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+ fi
-+ ;;
-+esac
++ if test -z "$PHP_FPM_GROUP" -o "$PHP_FPM_GROUP" = "yes" -o "$PHP_FPM_GROUP" = "no"; then
++ php_fpm_group="nobody"
++ else
++ php_fpm_group="$PHP_FPM_GROUP"
++ fi
++
++
++ PHP_SUBST_OLD(fpm_version)
++ PHP_SUBST_OLD(php_fpm_bin)
++ PHP_SUBST_OLD(php_fpm_bin_dir)
++ PHP_SUBST_OLD(php_fpm_bin_path)
++ PHP_SUBST_OLD(php_fpm_port)
++ PHP_SUBST_OLD(php_fpm_conf)
++ PHP_SUBST_OLD(php_fpm_conf_dir)
++ PHP_SUBST_OLD(php_fpm_conf_path)
++ PHP_SUBST_OLD(php_fpm_init)
++ PHP_SUBST_OLD(php_fpm_init_dir)
++ PHP_SUBST_OLD(php_fpm_init_path)
++ PHP_SUBST_OLD(php_fpm_log_dir)
++ PHP_SUBST_OLD(php_fpm_log_path)
++ PHP_SUBST_OLD(php_fpm_pid_dir)
++ PHP_SUBST_OLD(php_fpm_pid_path)
++ PHP_SUBST_OLD(php_fpm_user)
++ PHP_SUBST_OLD(php_fpm_group)
++
++
++ AC_DEFINE_UNQUOTED(PHP_FPM_VERSION, "$fpm_version", [fpm version])
++ AC_DEFINE_UNQUOTED(PHP_FPM_BIN, "$php_fpm_bin", [fpm binary executable])
++ AC_DEFINE_UNQUOTED(PHP_FPM_BIN_DIR, "$php_fpm_bin_dir", [fpm binary dir])
++ AC_DEFINE_UNQUOTED(PHP_FPM_BIN_PATH, "$php_fpm_bin_path", [fpm bin file path])
++ AC_DEFINE_UNQUOTED(PHP_FPM_PORT, "$php_fpm_port", [tcp port])
++ AC_DEFINE_UNQUOTED(PHP_FPM_CONF, "$php_fpm_conf", [fpm conf file])
++ AC_DEFINE_UNQUOTED(PHP_FPM_CONF_DIR, "$php_fpm_conf_dir", [fpm conf dir])
++ AC_DEFINE_UNQUOTED(PHP_FPM_CONF_PATH, "$php_fpm_conf_path", [fpm conf file path])
++ AC_DEFINE_UNQUOTED(PHP_FPM_INIT, "$php_fpm_init", [fpm init file])
++ AC_DEFINE_UNQUOTED(PHP_FPM_INIT_DIR, "$php_fpm_init_dir", [fpm init dir])
++ AC_DEFINE_UNQUOTED(PHP_FPM_INIT_PATH, "$php_fpm_init_path", [fpm init file path])
++ AC_DEFINE_UNQUOTED(PHP_FPM_LOG_DIR, "$php_fpm_log_dir", [fpm log dir])
++ AC_DEFINE_UNQUOTED(PHP_FPM_LOG_PATH, "$php_fpm_log_path", [fpm log file path])
++ AC_DEFINE_UNQUOTED(PHP_FPM_PID_DIR, "$php_fpm_pid_dir", [fpm pid dir])
++ AC_DEFINE_UNQUOTED(PHP_FPM_PID_PATH, "$php_fpm_pid_path", [fpm pid file path])
++ AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
++ AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
+
-+# Sed substitution that helps us do robust quoting. It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
-+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-+
-+# Same as above, but do not quote variable references.
-+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except M$VC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+AC_CHECK_TOOL(AR, ar, false)
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+AC_CHECK_TOOL(STRIP, strip, :)
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$SED" && SED=sed
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+ case $host_os in
-+ openbsd*)
-+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+ ;;
-+ *)
-+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+ ;;
-+ esac
-+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
++])
+
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+ AC_PATH_MAGIC
-+ fi
-+ ;;
-+esac
++AC_DEFUN([AC_FPM_OUTPUT],
++[
++ PHP_OUTPUT(sapi/fpm/php_fpm.conf:sapi/fpm/conf/php-fpm.conf.in)
++ PHP_OUTPUT(sapi/fpm/init.d.php_fpm:sapi/fpm/conf/init.d.php-fpm.in)
++ PHP_OUTPUT(sapi/fpm/nginx-site-conf.sample:sapi/fpm/conf/nginx-site-conf.sample.in)
++ PHP_OUTPUT(sapi/fpm/$php_fpm_bin.1:sapi/fpm/man/php-fpm.1.in)
++])
+
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-+enable_win32_dll=yes, enable_win32_dll=no)
-+
-+AC_ARG_ENABLE([libtool-lock],
-+ [AC_HELP_STRING([--disable-libtool-lock],
-+ [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+AC_ARG_WITH([pic],
-+ [AC_HELP_STRING([--with-pic],
-+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+ [pic_mode="$withval"],
-+ [pic_mode=default])
-+test -z "$pic_mode" && pic_mode=default
-+
-+# Use C for the default configuration in the libtool script
-+tagname=
-+AC_LIBTOOL_LANG_C_CONFIG
-+_LT_AC_TAGCONFIG
-+])# AC_LIBTOOL_SETUP
-+
-+
-+# _LT_AC_SYS_COMPILER
-+# -------------------
-+AC_DEFUN([_LT_AC_SYS_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+])# _LT_AC_SYS_COMPILER
-+
-+
-+# _LT_AC_SYS_LIBPATH_AIX
-+# ----------------------
-+# Links a minimal program and checks the executable
-+# for the system default hardcoded library path. In most cases,
-+# this is /usr/lib:/lib, but when the MPI compilers are used
-+# the location of the communication and MPI libs are included too.
-+# If we don't find anything, use the default library path according
-+# to the aix ld manual.
-+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi],[])
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+])# _LT_AC_SYS_LIBPATH_AIX
-+
-+
-+# _LT_AC_SHELL_INIT(ARG)
-+# ----------------------
-+AC_DEFUN([_LT_AC_SHELL_INIT],
-+[ifdef([AC_DIVERSION_NOTICE],
-+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+ [AC_DIVERT_PUSH(NOTICE)])
-+$1
-+AC_DIVERT_POP
-+])# _LT_AC_SHELL_INIT
-+
-+
-+# _LT_AC_PROG_ECHO_BACKSLASH
-+# --------------------------
-+# Add some code to the start of the generated configure script which
-+# will find an echo command which doesn't interpret backslashes.
-+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-+[_LT_AC_SHELL_INIT([
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+ # Remove one level of quotation (which was required for Make).
-+ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+ ;;
-+esac
+
-+echo=${ECHO-echo}
-+if test "X[$]1" = X--no-reexec; then
-+ # Discard the --no-reexec flag, and continue.
-+ shift
-+elif test "X[$]1" = X--fallback-echo; then
-+ # Avoid inline document here, it may be left over
-+ :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-+ # Yippee, $echo works!
-+ :
-+else
-+ # Restart under the correct shell.
-+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+fi
++AC_DEFUN([AC_FPM_CONF],
++[
++ AC_FPM_ARGS
++ AC_FPM_VARS
++ AC_FPM_OUTPUT
++])
+
-+if test "X[$]1" = X--fallback-echo; then
-+ # used as fallback echo
-+ shift
-+ cat <<EOF
-+[$]*
-+EOF
-+ exit 0
-+fi
+diff -Naur php-src-vanilla/sapi/fpm/ac/fpm_libevent.m4 php-src/sapi/fpm/ac/fpm_libevent.m4
+--- php-src-vanilla/sapi/fpm/ac/fpm_libevent.m4 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/ac/fpm_libevent.m4 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,250 @@
++dnl @synopsis AC_LIB_EVENT([MINIMUM-VERSION],[REQUIRED-VERSION])
++dnl
++dnl Test for the libevent library of a particular version (or newer).
++dnl Source: http://svn.apache.org/repos/asf/incubator/thrift/trunk/aclocal/ax_lib_event.m4
++dnl Modified: This file was modified for autoconf-2.13 and the PHP_ARG_WITH macro.
++dnl
++dnl If no path to the installed libevent is given, the macro will first try
++dnl using no -I or -L flags, then searches under /usr, /usr/local, /opt,
++dnl and /opt/libevent.
++dnl If these all fail, it will try the $LIBEVENT_ROOT environment variable.
++dnl
++dnl This macro requires that #include <sys/types.h> works and defines u_char.
++dnl
++dnl This macro calls:
++dnl AC_SUBST(LIBEVENT_CFLAGS)
++dnl AC_SUBST(LIBEVENT_LIBS)
++dnl
++dnl And (if libevent is found):
++dnl AC_DEFINE(HAVE_LIBEVENT)
++dnl
++dnl It also leaves the shell variables "success" and "ac_have_libevent"
++dnl set to "yes" or "no".
++dnl
++dnl NOTE: This macro does not currently work for cross-compiling,
++dnl but it can be easily modified to allow it. (grep "cross").
++dnl
++dnl @category InstalledPackages
++dnl @category C
++dnl @version 2007-09-12
++dnl @license AllPermissive
++dnl
++dnl Copyright (C) 2009 David Reiss
++dnl Copying and distribution of this file, with or without modification,
++dnl are permitted in any medium without royalty provided the copyright
++dnl notice and this notice are preserved.
+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+ if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+ echo_test_string="`eval $cmd`" &&
-+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+ then
-+ break
-+ fi
-+ done
-+fi
++AC_DEFUN([AC_LIB_EVENT_DO_CHECK],
++[
++# Save our flags.
++CPPFLAGS_SAVED="$CPPFLAGS"
++LDFLAGS_SAVED="$LDFLAGS"
++LIBS_SAVED="$LIBS"
++LD_LIBRARY_PATH_SAVED="$LD_LIBRARY_PATH"
++
++# Set our flags if we are checking a specific directory.
++if test -n "$ac_libevent_path" ; then
++ LIBEVENT_CPPFLAGS="-I$ac_libevent_path/include"
++ LIBEVENT_LDFLAGS="-L$ac_libevent_path/lib"
++ LD_LIBRARY_PATH="$ac_libevent_path/lib:$LD_LIBRARY_PATH"
++else
++ LIBEVENT_CPPFLAGS=""
++ LIBEVENT_LDFLAGS=""
++fi
++
++# Required flag for libevent.
++LIBEVENT_LIBS="-levent"
++
++# Prepare the environment for compilation.
++CPPFLAGS="$CPPFLAGS $LIBEVENT_CPPFLAGS"
++LDFLAGS="$LDFLAGS $LIBEVENT_LDFLAGS"
++LIBS="$LIBS $LIBEVENT_LIBS"
++export CPPFLAGS
++export LDFLAGS
++export LIBS
++export LD_LIBRARY_PATH
++
++success=no
++
++# Compile, link, and run the program. This checks:
++# - event.h is available for including.
++# - event_get_version() is available for linking.
++# - The event version string is lexicographically greater
++# than the required version.
++AC_TRY_RUN([
++#include <sys/types.h>
++#include <event.h>
+
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ :
-+else
-+ # The Solaris, AIX, and Digital Unix default echo programs unquote
-+ # backslashes. This makes it impossible to quote backslashes using
-+ # echo "$something" | sed 's/\\/\\\\/g'
-+ #
-+ # So, first we look for a working echo in the user's PATH.
-+
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for dir in $PATH /usr/ucb; do
-+ IFS="$lt_save_ifs"
-+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ echo="$dir/echo"
-+ break
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+
-+ if test "X$echo" = Xecho; then
-+ # We didn't find a better echo, so look for alternatives.
-+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ # This shell has a builtin print -r that does the trick.
-+ echo='print -r'
-+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+ test "X$CONFIG_SHELL" != X/bin/ksh; then
-+ # If we have ksh, try running configure again with it.
-+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+ export ORIGINAL_CONFIG_SHELL
-+ CONFIG_SHELL=/bin/ksh
-+ export CONFIG_SHELL
-+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+ else
-+ # Try using printf.
-+ echo='printf %s\n'
-+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ # Cool, printf works
-+ :
-+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+ test "X$echo_testing_string" = 'X\t' &&
-+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+ export CONFIG_SHELL
-+ SHELL="$CONFIG_SHELL"
-+ export SHELL
-+ echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+ test "X$echo_testing_string" = 'X\t' &&
-+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ echo="$CONFIG_SHELL [$]0 --fallback-echo"
-+ else
-+ # maybe with a smaller string...
-+ prev=:
-+
-+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-+ then
-+ break
-+ fi
-+ prev="$cmd"
-+ done
++int main(int argc, char *argv[])
++{
++ const char* lib_version = event_get_version();
++ const char* wnt_version = "$WANT_LIBEVENT_VERSION";
++ for (;;) {
++ /* If we reached the end of the want version. We have it. */
++ if (*wnt_version == '\0' || *wnt_version == '-') {
++ return 0;
++ }
++ /* If the want version continues but the lib version does not, */
++ /* we are missing a letter. We don't have it. */
++ if (*lib_version == '\0' || *lib_version == '-') {
++ return 1;
++ }
+
-+ if test "$prev" != 'sed 50q "[$]0"'; then
-+ echo_test_string=`eval $prev`
-+ export echo_test_string
-+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-+ else
-+ # Oops. We lost completely, so just stick with echo.
-+ echo=echo
-+ fi
-+ fi
-+ fi
-+ fi
-+fi
-+fi
++ /* In the 1.4 version numbering style, if there are more digits */
++ /* in one version than the other, that one is higher. */
++ int lib_digits;
++ for (lib_digits = 0;
++ lib_version[lib_digits] >= '0' &&
++ lib_version[lib_digits] <= '9';
++ lib_digits++)
++ ;
++ int wnt_digits;
++ for (wnt_digits = 0;
++ wnt_version[wnt_digits] >= '0' &&
++ wnt_version[wnt_digits] <= '9';
++ wnt_digits++)
++ ;
++ if (lib_digits > wnt_digits) {
++ return 0;
++ }
++ if (lib_digits < wnt_digits) {
++ return 1;
++ }
++ /* If we have greater than what we want. We have it. */
++ if (*lib_version > *wnt_version) {
++ return 0;
++ }
++ /* If we have less, we don't. */
++ if (*lib_version < *wnt_version) {
++ return 1;
++ }
++ lib_version++;
++ wnt_version++;
++ }
++ return 0;
++}
++],[
++success=yes
++])
+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-+fi
++# Restore flags.
++LIBEVENT_LIBS=""
++CPPFLAGS="$CPPFLAGS_SAVED"
++LDFLAGS="$LDFLAGS_SAVED"
++LIBS="$LIBS_SAVED"
++LD_LIBRARY_PATH="$LD_LIBRARY_PATH_SAVED"
++])
+
-+AC_SUBST(ECHO)
-+])])# _LT_AC_PROG_ECHO_BACKSLASH
-+
-+
-+# _LT_AC_LOCK
-+# -----------
-+AC_DEFUN([_LT_AC_LOCK],
-+[AC_ARG_ENABLE([libtool-lock],
-+ [AC_HELP_STRING([--disable-libtool-lock],
-+ [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+ # Find out which ABI we are using.
-+ echo 'int i;' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *ELF-32*)
-+ HPUX_IA64_MODE="32"
-+ ;;
-+ *ELF-64*)
-+ HPUX_IA64_MODE="64"
-+ ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+*-*-irix6*)
-+ # Find out which ABI we are using.
-+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *32-bit*)
-+ LD="${LD-ld} -melf32bsmip"
-+ ;;
-+ *N32*)
-+ LD="${LD-ld} -melf32bmipn32"
-+ ;;
-+ *64-bit*)
-+ LD="${LD-ld} -melf64bmip"
-+ ;;
-+ esac
-+ else
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *32-bit*)
-+ LD="${LD-ld} -32"
-+ ;;
-+ *N32*)
-+ LD="${LD-ld} -n32"
-+ ;;
-+ *64-bit*)
-+ LD="${LD-ld} -64"
-+ ;;
-+ esac
-+ fi
-+ fi
-+ rm -rf conftest*
-+ ;;
-+
-+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+ # Find out which ABI we are using.
-+ echo 'int i;' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
-+ case "`/usr/bin/file conftest.o`" in
-+ *32-bit*)
-+ case $host in
-+ x86_64-*linux*)
-+ LD="${LD-ld} -m elf_i386"
-+ ;;
-+ ppc64-*linux*|powerpc64-*linux*)
-+ LD="${LD-ld} -m elf32ppclinux"
-+ ;;
-+ s390x-*linux*)
-+ LD="${LD-ld} -m elf_s390"
-+ ;;
-+ sparc64-*linux*)
-+ LD="${LD-ld} -m elf32_sparc"
-+ ;;
-+ esac
-+ ;;
-+ *64-bit*)
-+ case $host in
-+ x86_64-*linux*)
-+ LD="${LD-ld} -m elf_x86_64"
-+ ;;
-+ ppc*-*linux*|powerpc*-*linux*)
-+ LD="${LD-ld} -m elf64ppc"
-+ ;;
-+ s390*-*linux*)
-+ LD="${LD-ld} -m elf64_s390"
-+ ;;
-+ sparc*-*linux*)
-+ LD="${LD-ld} -m elf64_sparc"
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+
-+*-*-sco3.2v5*)
-+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+ SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS -belf"
-+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+ [AC_LANG_PUSH(C)
-+ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+ AC_LANG_POP])
-+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+ CFLAGS="$SAVE_CFLAGS"
-+ fi
-+ ;;
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+ AC_CHECK_TOOL(AS, as, false)
-+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+ ;;
-+ ])
-+esac
++AC_DEFUN([AC_LIB_EVENT],
++[
+
-+need_locks="$enable_libtool_lock"
-+
-+])# _LT_AC_LOCK
-+
-+
-+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-+[AC_REQUIRE([LT_AC_PROG_SED])
-+AC_CACHE_CHECK([$1], [$2],
-+ [$2=no
-+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ lt_compiler_flag="$3"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ # The option is referenced via a variable to avoid confusing sed.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&AS_MESSAGE_LOG_FD
-+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+ 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
-+ if test ! -s conftest.err; then
-+ $2=yes
-+ fi
-+ fi
-+ $rm conftest*
-+])
++PHP_ARG_WITH(libevent,,
++[ --with-libevent[=PATH] Path to the libevent, needed for fpm SAPI [/usr/local]], yes, yes)
+
-+if test x"[$]$2" = xyes; then
-+ ifelse([$5], , :, [$5])
-+else
-+ ifelse([$6], , :, [$6])
-+fi
-+])# AC_LIBTOOL_COMPILER_OPTION
-+
-+
-+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+# [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-+[AC_CACHE_CHECK([$1], [$2],
-+ [$2=no
-+ save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $3"
-+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ if test -s conftest.err; then
-+ # Append any errors to the config.log.
-+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+ else
-+ $2=yes
-+ fi
-+ fi
-+ $rm conftest*
-+ LDFLAGS="$save_LDFLAGS"
-+])
++if test "$PHP_LIBEVENT" != "no"; then
++ LIBEVENT_MIN_VERSION=ifelse([$1], ,1.4.3,$1)
++ LIBEVENT_REQ_VERSION=ifelse([$2], ,1.4.11,$2)
+
-+if test x"[$]$2" = xyes; then
-+ ifelse([$4], , :, [$4])
-+else
-+ ifelse([$5], , :, [$5])
-+fi
-+])# AC_LIBTOOL_LINKER_OPTION
-+
-+
-+# AC_LIBTOOL_SYS_MAX_CMD_LEN
-+# --------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-+[# find the maximum length of command line arguments
-+AC_MSG_CHECKING([the maximum length of command line arguments])
-+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-+ i=0
-+ teststring="ABCD"
-+
-+ case $build_os in
-+ msdosdjgpp*)
-+ # On DJGPP, this test can blow up pretty badly due to problems in libc
-+ # (any single argument exceeding 2000 bytes causes a buffer overrun
-+ # during glob expansion). Even if it were fixed, the result of this
-+ # check would be larger than it should be.
-+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
-+ ;;
-+
-+ gnu*)
-+ # Under GNU Hurd, this test is not required because there is
-+ # no limit to the length of command line arguments.
-+ # Libtool will interpret -1 as no limit whatsoever
-+ lt_cv_sys_max_cmd_len=-1;
-+ ;;
-+
-+ cygwin* | mingw*)
-+ # On Win9x/ME, this test blows up -- it succeeds, but takes
-+ # about 5 minutes as the teststring grows exponentially.
-+ # Worse, since 9x/ME are not pre-emptively multitasking,
-+ # you end up with a "frozen" computer, even though with patience
-+ # the test eventually succeeds (with a max line length of 256k).
-+ # Instead, let's just punt: use the minimum linelength reported by
-+ # all of the supported platforms: 8192 (on NT/2K/XP).
-+ lt_cv_sys_max_cmd_len=8192;
-+ ;;
-+
-+ amigaos*)
-+ # On AmigaOS with pdksh, this test takes hours, literally.
-+ # So we just punt and use a minimum line length of 8192.
-+ lt_cv_sys_max_cmd_len=8192;
-+ ;;
-+
-+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+ # This has been around since 386BSD, at least. Likely further.
-+ if test -x /sbin/sysctl; then
-+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+ elif test -x /usr/sbin/sysctl; then
-+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+ else
-+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
-+ fi
-+ # And add a safety zone
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ ;;
-+ osf*)
-+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+ # nice to cause kernel panics so lets avoid the loop below.
-+ # First set a reasonable default.
-+ lt_cv_sys_max_cmd_len=16384
-+ #
-+ if test -x /sbin/sysconfig; then
-+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+ esac
++ # Default library search paths ($sys_lib_search_path_spec)
++ AC_LIBTOOL_SYS_DYNAMIC_LINKER
++
++ libevent_prefix=$ac_default_prefix
++ if test $prefix != "NONE" -a $prefix != "" -a $prefix != "no" ; then
++ libevent_prefix=$prefix
++ fi
++
++ if test "$PHP_LIBEVENT" = "yes"; then
++ PHP_LIBEVENT=$libevent_prefix
+ fi
-+ ;;
-+ *)
-+ # If test is not a shell built-in, we'll probably end up computing a
-+ # maximum length that is only half of the actual maximum length, but
-+ # we can't tell.
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ = "XX$teststring") >/dev/null 2>&1 &&
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
++
++ AC_MSG_CHECKING(for libevent >= $LIBEVENT_REQ_VERSION)
++ for ac_libevent_path in "" $PHP_LIBEVENT /usr /usr/local /opt /opt/local /opt/libevent ; do
++ WANT_LIBEVENT_VERSION="$LIBEVENT_REQ_VERSION"
++ AC_LIB_EVENT_DO_CHECK
++ if test "$success" = "yes"; then
++ break;
++ fi
+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ ;;
-+ esac
-+])
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-+else
-+ AC_MSG_RESULT(none)
-+fi
-+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
++ if test "$success" = "no"; then
++
++ AC_MSG_RESULT(no)
++ AC_MSG_WARN([Could not find libevent $LIBEVENT_REQ_VERSION.])
++ AC_MSG_WARN([The use of earlier versions of libevent is not recommended])
++ AC_MSG_WARN([and can result in unspecified or unsupported behaviour.])
++
++ AC_MSG_CHECKING(for minimum libevent version >= $LIBEVENT_MIN_VERSION)
++ for ac_libevent_path in "" $PHP_LIBEVENT /usr /usr/local /opt /opt/local /opt/libevent ; do
++ WANT_LIBEVENT_VERSION="$LIBEVENT_MIN_VERSION"
++ AC_LIB_EVENT_DO_CHECK
++ if test "$success" = "yes"; then
++ break;
++ fi
++ done
++ if test "$success" = "no"; then
++ AC_MSG_RESULT(no)
++ LIBEVENT_LIBS=""
++ ac_have_libevent=no
++ AC_MSG_WARN([Syntax:])
++ AC_MSG_WARN([--with-libevent=yes|[path] - link to libevent.a (static library)])
++ AC_MSG_WARN([--with-libevent=shared[,path] - link to libevent.so (shared library)])
++ AC_MSG_ERROR([Libevent minimum version >= $LIBEVENT_MIN_VERSION could not be found.])
++ fi
++ fi
++
++ if test "$ext_shared" = "yes"; then
++ if test -n "$ac_libevent_path"; then
++ LIBEVENT_LIBS="-L$ac_libevent_path/lib -levent"
++ else
++ LIBEVENT_LIBS="-levent"
++ fi
++ else
++ libevent_a="libevent.a"
++ if test -n "$ac_libevent_path"; then
++ if test -f "$ac_libevent_path/lib/$libevent_a" ; then
++ LIBEVENT_LIBS="$ac_libevent_path/lib/$libevent_a"
++ fi
++ if test -z "$LIBEVENT_LIBS"; then
++ AC_MSG_RESULT(no)
++ AC_MSG_WARN([libevent.a could not be found. We looked in:])
++ AC_MSG_WARN([\"$ac_libevent_path\"])
++ fi
++ else
++ for search_path in $sys_lib_search_path_spec ; do
++ if test -f "$search_path$libevent_a" ; then
++ LIBEVENT_LIBS="$search_path$libevent_a"
++ break;
++ fi
++ done
++ if test -z "$LIBEVENT_LIBS"; then
++ AC_MSG_RESULT(no)
++ AC_MSG_WARN([libevent.a could not be found. We looked in:])
++ AC_MSG_WARN([\"$sys_lib_search_path_spec\"])
++ fi
++ fi
++ if test -z "$LIBEVENT_LIBS"; then
++ AC_MSG_WARN([Install libevent system-wide (make install)])
++ AC_MSG_WARN([Syntax:])
++ AC_MSG_WARN([--with-libevent=yes|[path] - link to libevent.a (static library)])
++ AC_MSG_WARN([--with-libevent=shared[,path] - link to libevent.so (shared library)])
++ AC_MSG_ERROR([libevent.a could not be found. Stop.])
++ fi
++ fi
+
++ if test "$success" = "yes" ; then
++ AC_MSG_RESULT(yes)
++ ac_have_libevent=yes
++ AC_DEFINE(HAVE_LIBEVENT, 1, [define if libevent is available])
++ fi
+
-+# _LT_AC_CHECK_DLFCN
-+# --------------------
-+AC_DEFUN([_LT_AC_CHECK_DLFCN],
-+[AC_CHECK_HEADERS(dlfcn.h)dnl
-+])# _LT_AC_CHECK_DLFCN
++ if test -n "$ac_libevent_path"; then
++ LIBEVENT_CFLAGS="-I$ac_libevent_path/include"
++ fi
+
++ AC_SUBST(LIBEVENT_CFLAGS)
++ AC_SUBST(LIBEVENT_LIBS)
+
-+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ------------------------------------------------------------------
-+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
-+ [$4]
+else
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LT_DLGLOBAL RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+# define LT_DLGLOBAL DL_GLOBAL
-+# else
-+# define LT_DLGLOBAL 0
-+# endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+ find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+# define LT_DLLAZY_OR_NOW RTLD_LAZY
-+# else
-+# ifdef DL_LAZY
-+# define LT_DLLAZY_OR_NOW DL_LAZY
-+# else
-+# ifdef RTLD_NOW
-+# define LT_DLLAZY_OR_NOW RTLD_NOW
-+# else
-+# ifdef DL_NOW
-+# define LT_DLLAZY_OR_NOW DL_NOW
-+# else
-+# define LT_DLLAZY_OR_NOW 0
-+# endif
-+# endif
-+# endif
-+# endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+ int status = $lt_dlunknown;
-+
-+ if (self)
-+ {
-+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+ /* dlclose (self); */
-+ }
-+
-+ exit (status);
-+}]
-+EOF
-+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+ (./conftest; exit; ) 2>/dev/null
-+ lt_status=$?
-+ case x$lt_status in
-+ x$lt_dlno_uscore) $1 ;;
-+ x$lt_dlneed_uscore) $2 ;;
-+ x$lt_unknown|x*) $3 ;;
-+ esac
-+ else :
-+ # compilation failed
-+ $3
-+ fi
-+fi
-+rm -fr conftest*
-+])# _LT_AC_TRY_DLOPEN_SELF
-+
-+
-+# AC_LIBTOOL_DLOPEN_SELF
-+# -------------------
-+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-+ enable_dlopen=unknown
-+ enable_dlopen_self=unknown
-+ enable_dlopen_self_static=unknown
-+else
-+ lt_cv_dlopen=no
-+ lt_cv_dlopen_libs=
-+
-+ case $host_os in
-+ beos*)
-+ lt_cv_dlopen="load_add_on"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ;;
-+
-+ mingw* | pw32*)
-+ lt_cv_dlopen="LoadLibrary"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ cygwin*)
-+ lt_cv_dlopen="dlopen"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ darwin*)
-+ # if libdl is installed we need to link against it
-+ AC_CHECK_LIB([dl], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+ lt_cv_dlopen="dyld"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ])
-+ ;;
-+
-+ *)
-+ AC_CHECK_FUNC([shl_load],
-+ [lt_cv_dlopen="shl_load"],
-+ [AC_CHECK_LIB([dld], [shl_load],
-+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+ [AC_CHECK_FUNC([dlopen],
-+ [lt_cv_dlopen="dlopen"],
-+ [AC_CHECK_LIB([dl], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+ [AC_CHECK_LIB([svld], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+ [AC_CHECK_LIB([dld], [dld_link],
-+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+ ])
-+ ])
-+ ])
-+ ])
-+ ])
-+ ;;
-+ esac
-+
-+ if test "x$lt_cv_dlopen" != xno; then
-+ enable_dlopen=yes
-+ else
-+ enable_dlopen=no
-+ fi
-+
-+ case $lt_cv_dlopen in
-+ dlopen)
-+ save_CPPFLAGS="$CPPFLAGS"
-+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+ save_LDFLAGS="$LDFLAGS"
-+ eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+ save_LIBS="$LIBS"
-+ LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+ AC_CACHE_CHECK([whether a program can dlopen itself],
-+ lt_cv_dlopen_self, [dnl
-+ _LT_AC_TRY_DLOPEN_SELF(
-+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+ ])
-+
-+ if test "x$lt_cv_dlopen_self" = xyes; then
-+ LDFLAGS="$LDFLAGS $link_static_flag"
-+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-+ lt_cv_dlopen_self_static, [dnl
-+ _LT_AC_TRY_DLOPEN_SELF(
-+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
-+ ])
-+ fi
-+
-+ CPPFLAGS="$save_CPPFLAGS"
-+ LDFLAGS="$save_LDFLAGS"
-+ LIBS="$save_LIBS"
-+ ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self in
-+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+ *) enable_dlopen_self=unknown ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self_static in
-+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+ *) enable_dlopen_self_static=unknown ;;
-+ esac
-+fi
-+])# AC_LIBTOOL_DLOPEN_SELF
-+
-+
-+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-+# ---------------------------------
-+# Check to see if options -c and -o are simultaneously supported by compiler
-+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&AS_MESSAGE_LOG_FD
-+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ if test ! -s out/conftest.err; then
-+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+ fi
-+ fi
-+ chmod u+w .
-+ $rm conftest*
-+ # SGI C++ compiler will create directory out/ii_files/ for
-+ # template instantiation
-+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+ $rm out/* && rmdir out
-+ cd ..
-+ rmdir conftest
-+ $rm conftest*
-+])
-+])# AC_LIBTOOL_PROG_CC_C_O
-+
-+
-+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-+# -----------------------------------------
-+# Check to see if we can do hard links to lock some files if needed
-+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-+[AC_REQUIRE([_LT_AC_LOCK])dnl
-+
-+hard_links="nottested"
-+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-+ # do not overwrite the value of need_locks provided by the user
-+ AC_MSG_CHECKING([if we can lock with hard links])
-+ hard_links=yes
-+ $rm conftest*
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ touch conftest.a
-+ ln conftest.a conftest.b 2>&5 || hard_links=no
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ AC_MSG_RESULT([$hard_links])
-+ if test "$hard_links" = no; then
-+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-+ need_locks=warn
-+ fi
-+else
-+ need_locks=no
-+fi
-+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-+
-+
-+# AC_LIBTOOL_OBJDIR
-+# -----------------
-+AC_DEFUN([AC_LIBTOOL_OBJDIR],
-+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-+[rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+ lt_cv_objdir=.libs
-+else
-+ # MS-DOS does not allow filenames that begin with a dot.
-+ lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
-+])# AC_LIBTOOL_OBJDIR
-+
-+
-+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-+# ----------------------------------------------
-+# Check hardcoding attributes.
-+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
-+_LT_AC_TAGVAR(hardcode_action, $1)=
-+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+
-+ # We can hardcode non-existant directories.
-+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+ # have to relink, otherwise we might link with an installed library
-+ # when we should be linking with a yet-to-be-installed one
-+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-+ # Linking always hardcodes the temporary library directory.
-+ _LT_AC_TAGVAR(hardcode_action, $1)=relink
-+ else
-+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-+ fi
-+else
-+ # We cannot hardcode anything, or else we can only hardcode existing
-+ # directories.
-+ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-+fi
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-+
-+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-+ # Fast installation is not supported
-+ enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+ test "$enable_shared" = no; then
-+ # Fast installation is not necessary
-+ enable_fast_install=needless
-+fi
-+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-+
-+
-+# AC_LIBTOOL_SYS_LIB_STRIP
-+# ------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-+[striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+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"
-+ AC_MSG_RESULT([yes])
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+ case $host_os in
-+ darwin*)
-+ if test -n "$STRIP" ; then
-+ striplib="$STRIP -x"
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+fi
-+ ;;
-+ *)
-+ AC_MSG_RESULT([no])
-+ ;;
-+ esac
-+fi
-+])# AC_LIBTOOL_SYS_LIB_STRIP
-+
-+
-+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
-+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-+[AC_MSG_CHECKING([dynamic linker characteristics])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
-+
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+
-+aix4* | aix5*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ hardcode_into_libs=yes
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 supports IA64
-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ else
-+ # With GCC up to 2.95.x, collect2 would create an import file
-+ # for dependence libraries. The import file would start with
-+ # the line `#! .'. This would cause the generated library to
-+ # depend on `.', always an invalid library. This was fixed in
-+ # development snapshots of GCC prior to 3.0.
-+ case $host_os in
-+ aix4 | aix4.[[01]] | aix4.[[01]].*)
-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+ echo ' yes '
-+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+ :
-+ else
-+ can_build_shared=no
-+ fi
-+ ;;
-+ esac
-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+ # soname into executable. Probably we can add versioning support to
-+ # collect2, so additional links can be useful in future.
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+ # instead of lib<name>.a to let people know that these are not
-+ # typical AIX shared libraries.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ else
-+ # We preserve .a as extension for shared libraries through AIX4.2
-+ # and later when we are not doing run time linking.
-+ library_names_spec='${libname}${release}.a $libname.a'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-+
-+amigaos*)
-+ library_names_spec='$libname.ixlibrary $libname.a'
-+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+ ;;
-+
-+beos*)
-+ library_names_spec='${libname}${shared_ext}'
-+ dynamic_linker="$host_os ld.so"
-+ shlibpath_var=LIBRARY_PATH
-+ ;;
-+
-+bsdi[[45]]*)
-+ version_type=linux
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+ # the default ld.so.conf also contains /usr/contrib/lib and
-+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+ # libtool to hard-code these into programs
-+ ;;
-+
-+cygwin* | mingw* | pw32*)
-+ version_type=windows
-+ shrext_cmds=".dll"
-+ need_version=no
-+ need_lib_prefix=no
-+
-+ case $GCC,$host_os in
-+ yes,cygwin* | yes,mingw* | yes,pw32*)
-+ library_names_spec='$libname.dll.a'
-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+ postinstall_cmds='base_file=`basename \${file}`~
-+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+ dldir=$destdir/`dirname \$dlpath`~
-+ test -d \$dldir || mkdir -p \$dldir~
-+ $install_prog $dir/$dlname \$dldir/$dlname'
-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+ dlpath=$dir/\$dldll~
-+ $rm \$dlpath'
-+ shlibpath_overrides_runpath=yes
-+
-+ case $host_os in
-+ cygwin*)
-+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+ ;;
-+ mingw*)
-+ # MinGW DLLs use traditional 'lib' prefix
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-+ # It is most probably a Windows format PATH printed by
-+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+ # path with ; separators, and with drive letters. We can handle the
-+ # drive letters (cygwin fileutils understands them), so leave them,
-+ # especially as we might pass files found there to a mingw objdump,
-+ # which wouldn't understand a cygwinified path. Ahh.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+ ;;
-+ pw32*)
-+ # pw32 DLLs use 'pw' prefix rather than 'lib'
-+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+ ;;
-+ esac
-+ ;;
-+
-+ *)
-+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+ ;;
-+ esac
-+ dynamic_linker='Win32 ld.exe'
-+ # FIXME: first we should search . and the directory the executable is in
-+ shlibpath_var=PATH
-+ ;;
-+
-+darwin* | rhapsody*)
-+ dynamic_linker="$host_os dyld"
-+ version_type=darwin
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+ soname_spec='${libname}${release}${major}$shared_ext'
-+ shlibpath_overrides_runpath=yes
-+ shlibpath_var=DYLD_LIBRARY_PATH
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+ if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+ else
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+ ;;
-+
-+dgux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd1*)
-+ dynamic_linker=no
-+ ;;
-+
-+kfreebsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
-+freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ need_version=no
-+ need_lib_prefix=no
-+ ;;
-+ freebsd-*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ need_version=yes
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_os in
-+ freebsd2*)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ *) # from 3.2 on
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+ esac
-+ ;;
-+
-+gnu*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+ # Give a soname corresponding to the major version so that dld.sl refuses to
-+ # link against other versions.
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ case "$host_cpu" in
-+ ia64*)
-+ shrext_cmds='.so'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.so"
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ if test "X$HPUX_IA64_MODE" = X32; then
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+ fi
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+ postinstall_cmds='chmod 555 $lib'
-+ ;;
-+
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
-+ esac
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-+
-+# This must be Linux ELF.
-+linux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ hardcode_into_libs=yes
-+
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-+
-+ # We used to test for /lib/ld.so.1 and disable shared libraries on
-+ # powerpc, because MkLinux only supported shared libraries with the
-+ # GNU dynamic linker. Since this was broken with cross compilers,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-+
-+knetbsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
-+ else
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+nto-qnx*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+openbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ case $host_os in
-+ openbsd2.[[89]] | openbsd2.[[89]].*)
-+ shlibpath_overrides_runpath=no
-+ ;;
-+ *)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ esac
-+ else
-+ shlibpath_overrides_runpath=yes
-+ fi
-+ ;;
-+
-+os2*)
-+ libname_spec='$name'
-+ shrext_cmds=".dll"
-+ need_lib_prefix=no
-+ library_names_spec='$libname${shared_ext} $libname.a'
-+ dynamic_linker='OS/2 ld.exe'
-+ shlibpath_var=LIBPATH
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ version_type=osf
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+ ;;
-+
-+sco3.2v5*)
-+ version_type=osf
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+solaris*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ # ldd complains unless libraries are executable
-+ postinstall_cmds='chmod +x $lib'
-+ ;;
-+
-+sunos4*)
-+ version_type=sunos
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ if test "$with_gnu_ld" = yes; then
-+ need_lib_prefix=no
-+ fi
-+ need_version=yes
-+ ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_vendor in
-+ sni)
-+ shlibpath_overrides_runpath=no
-+ need_lib_prefix=no
-+ export_dynamic_flag_spec='${wl}-Blargedynsym'
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+ siemens)
-+ need_lib_prefix=no
-+ ;;
-+ motorola)
-+ need_lib_prefix=no
-+ need_version=no
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+ ;;
-+ esac
-+ ;;
-+
-+sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ version_type=linux
-+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+ soname_spec='$libname${shared_ext}.$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ fi
-+ ;;
-+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+*)
-+ dynamic_linker=no
-+ ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
-+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-+
-+
-+# _LT_AC_TAGCONFIG
-+# ----------------
-+AC_DEFUN([_LT_AC_TAGCONFIG],
-+[AC_ARG_WITH([tags],
-+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-+ [include additional configurations @<:@automatic@:>@])],
-+ [tagnames="$withval"])
-+
-+if test -f "$ltmain" && test -n "$tagnames"; then
-+ if test ! -f "${ofile}"; then
-+ AC_MSG_WARN([output file `$ofile' does not exist])
-+ fi
-+
-+ if test -z "$LTCC"; then
-+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-+ if test -z "$LTCC"; then
-+ AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-+ else
-+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-+ fi
-+ fi
-+
-+ # Extract list of available tagged configurations in $ofile.
-+ # Note that this assumes the entire list is on one line.
-+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-+
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for tagname in $tagnames; do
-+ IFS="$lt_save_ifs"
-+ # Check whether tagname contains only valid characters
-+ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-+ "") ;;
-+ *) AC_MSG_ERROR([invalid tag name: $tagname])
-+ ;;
-+ esac
-+
-+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-+ then
-+ AC_MSG_ERROR([tag name \"$tagname\" already exists])
-+ fi
-+
-+ # Update the list of available tags.
-+ if test -n "$tagname"; then
-+ echo appending configuration tag \"$tagname\" to $ofile
-+
-+ case $tagname in
-+ CXX)
-+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+ (test "X$CXX" != "Xg++"))) ; then
-+ AC_LIBTOOL_LANG_CXX_CONFIG
-+ else
-+ tagname=""
-+ fi
-+ ;;
-+
-+ F77)
-+ if test -n "$F77" && test "X$F77" != "Xno"; then
-+ AC_LIBTOOL_LANG_F77_CONFIG
-+ else
-+ tagname=""
-+ fi
-+ ;;
-+
-+ GCJ)
-+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-+ AC_LIBTOOL_LANG_GCJ_CONFIG
-+ else
-+ tagname=""
-+ fi
-+ ;;
-+
-+ RC)
-+ AC_LIBTOOL_LANG_RC_CONFIG
-+ ;;
-+
-+ *)
-+ AC_MSG_ERROR([Unsupported tag name: $tagname])
-+ ;;
-+ esac
-+
-+ # Append the new tag name to the list of available tags.
-+ if test -n "$tagname" ; then
-+ available_tags="$available_tags $tagname"
-+ fi
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+
-+ # Now substitute the updated list of available tags.
-+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-+ mv "${ofile}T" "$ofile"
-+ chmod +x "$ofile"
-+ else
-+ rm -f "${ofile}T"
-+ AC_MSG_ERROR([unable to update list of available tagged configurations.])
-+ fi
-+fi
-+])# _LT_AC_TAGCONFIG
-+
-+
-+# AC_LIBTOOL_DLOPEN
-+# -----------------
-+# enable checks for dlopen support
-+AC_DEFUN([AC_LIBTOOL_DLOPEN],
-+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_DLOPEN
-+
-+
-+# AC_LIBTOOL_WIN32_DLL
-+# --------------------
-+# declare package support for building win32 dll's
-+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_WIN32_DLL
-+
-+
-+# AC_ENABLE_SHARED([DEFAULT])
-+# ---------------------------
-+# implement the --enable-shared flag
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([shared],
-+ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_shared=yes ;;
-+ no) enable_shared=no ;;
-+ *)
-+ enable_shared=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_shared=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-+])# AC_ENABLE_SHARED
-+
-+
-+# AC_DISABLE_SHARED
-+# -----------------
-+#- set the default shared flag to --disable-shared
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_SHARED(no)
-+])# AC_DISABLE_SHARED
-+
-+
-+# AC_ENABLE_STATIC([DEFAULT])
-+# ---------------------------
-+# implement the --enable-static flag
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([static],
-+ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_static=yes ;;
-+ no) enable_static=no ;;
-+ *)
-+ enable_static=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_static=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-+])# AC_ENABLE_STATIC
-+
-+
-+# AC_DISABLE_STATIC
-+# -----------------
-+# set the default static flag to --disable-static
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_STATIC(no)
-+])# AC_DISABLE_STATIC
-+
-+
-+# AC_ENABLE_FAST_INSTALL([DEFAULT])
-+# ---------------------------------
-+# implement the --enable-fast-install flag
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([fast-install],
-+ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_fast_install=yes ;;
-+ no) enable_fast_install=no ;;
-+ *)
-+ enable_fast_install=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_fast_install=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-+])# AC_ENABLE_FAST_INSTALL
-+
-+
-+# AC_DISABLE_FAST_INSTALL
-+# -----------------------
-+# set the default to --disable-fast-install
-+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_FAST_INSTALL(no)
-+])# AC_DISABLE_FAST_INSTALL
-+
-+
-+# AC_LIBTOOL_PICMODE([MODE])
-+# --------------------------
-+# implement the --with-pic flag
-+# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-+AC_DEFUN([AC_LIBTOOL_PICMODE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+pic_mode=ifelse($#,1,$1,default)
-+])# AC_LIBTOOL_PICMODE
-+
-+
-+# AC_PROG_EGREP
-+# -------------
-+# This is predefined starting with Autoconf 2.54, so this conditional
-+# definition can be removed once we require Autoconf 2.54 or later.
-+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-+ [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])
-+ EGREP=$ac_cv_prog_egrep
-+ AC_SUBST([EGREP])
-+])])
-+
-+
-+# AC_PATH_TOOL_PREFIX
-+# -------------------
-+# find a file program which can recognise shared library
-+AC_DEFUN([AC_PATH_TOOL_PREFIX],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+[[\\/*] | ?:[\\/]*])
-+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+ ;;
-+*)
-+ lt_save_MAGIC_CMD="$MAGIC_CMD"
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word. This closes a longstanding sh security hole.
-+ ac_dummy="ifelse([$2], , $PATH, [$2])"
-+ for ac_dir in $ac_dummy; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$1; then
-+ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+ if test -n "$file_magic_test_file"; then
-+ case $deplibs_check_method in
-+ "file_magic "*)
-+ file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+ $EGREP "$file_magic_regex" > /dev/null; then
-+ :
-+ else
-+ cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such. This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem. Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+ fi ;;
-+ esac
-+ fi
-+ break
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ MAGIC_CMD="$lt_save_MAGIC_CMD"
-+ ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+ AC_MSG_RESULT($MAGIC_CMD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+])# AC_PATH_TOOL_PREFIX
-+
-+
-+# AC_PATH_MAGIC
-+# -------------
-+# find a file program which can recognise a shared library
-+AC_DEFUN([AC_PATH_MAGIC],
-+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+ if test -n "$ac_tool_prefix"; then
-+ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+ else
-+ MAGIC_CMD=:
-+ fi
-+fi
-+])# AC_PATH_MAGIC
-+
-+
-+# AC_PROG_LD
-+# ----------
-+# find the pathname to the GNU or non-GNU linker
-+AC_DEFUN([AC_PROG_LD],
-+[AC_ARG_WITH([gnu-ld],
-+ [AC_HELP_STRING([--with-gnu-ld],
-+ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
-+ [test "$withval" = no || with_gnu_ld=yes],
-+ [with_gnu_ld=no])
-+AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+ # Check if gcc -print-prog-name=ld gives a path.
-+ AC_MSG_CHECKING([for ld used by $CC])
-+ case $host in
-+ *-*-mingw*)
-+ # gcc leaves a trailing carriage return which upsets mingw
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+ *)
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
-+ case $ac_prog in
-+ # Accept absolute paths.
-+ [[\\/]]* | ?:[[\\/]]*)
-+ re_direlt='/[[^/]][[^/]]*/\.\./'
-+ # Canonicalize the pathname of ld
-+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+ done
-+ test -z "$LD" && LD="$ac_prog"
-+ ;;
-+ "")
-+ # If it fails, then pretend we aren't using GCC.
-+ ac_prog=ld
-+ ;;
-+ *)
-+ # If it is relative, then search for the first ld in PATH.
-+ with_gnu_ld=unknown
-+ ;;
-+ esac
-+elif test "$with_gnu_ld" = yes; then
-+ AC_MSG_CHECKING([for GNU ld])
-+else
-+ AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+ lt_cv_path_LD="$ac_dir/$ac_prog"
-+ # Check to see if the program is GNU ld. I'd rather use --version,
-+ # but apparently some GNU ld's only accept -v.
-+ # Break only if it was the GNU/non-GNU ld that we prefer.
-+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+ *GNU* | *'with BFD'*)
-+ test "$with_gnu_ld" != no && break
-+ ;;
-+ *)
-+ test "$with_gnu_ld" != yes && break
-+ ;;
-+ esac
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+else
-+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+ AC_MSG_RESULT($LD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_PROG_LD_GNU
-+])# AC_PROG_LD
-+
-+
-+# AC_PROG_LD_GNU
-+# --------------
-+AC_DEFUN([AC_PROG_LD_GNU],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+ lt_cv_prog_gnu_ld=yes
-+ ;;
-+*)
-+ lt_cv_prog_gnu_ld=no
-+ ;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])# AC_PROG_LD_GNU
-+
-+
-+# AC_PROG_LD_RELOAD_FLAG
-+# ----------------------
-+# find reload flag for linker
-+# -- PORTME Some linkers may need a different reload flag.
-+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+ lt_cv_ld_reload_flag,
-+ [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+ darwin*)
-+ if test "$GCC" = yes; then
-+ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+ else
-+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+ fi
-+ ;;
-+esac
-+])# AC_PROG_LD_RELOAD_FLAG
-+
-+
-+# AC_DEPLIBS_CHECK_METHOD
-+# -----------------------
-+# how to check for library dependencies
-+# -- PORTME fill in with the dynamic library characteristics
-+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-+[AC_CACHE_CHECK([how to recognise dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+beos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+bsdi[[45]]*)
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+ lt_cv_file_magic_cmd='/usr/bin/file -L'
-+ lt_cv_file_magic_test_file=/shlib/libc.so
-+ ;;
-+
-+cygwin*)
-+ # func_win32_libid is a shell function defined in ltmain.sh
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ ;;
-+
-+mingw* | pw32*)
-+ # Base MSYS/MinGW do not provide the 'file' command needed by
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ ;;
-+
-+darwin* | rhapsody*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ case $host_cpu in
-+ i*86 )
-+ # Not sure whether the presence of OpenBSD here was a mistake.
-+ # Let's accept both of them until this is cleared up.
-+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+ ;;
-+ esac
-+ else
-+ lt_cv_deplibs_check_method=pass_all
-+ fi
-+ ;;
-+
-+gnu*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+hpux10.20* | hpux11*)
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ case "$host_cpu" in
-+ ia64*)
-+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-+ ;;
-+ hppa*64*)
-+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+ ;;
-+ *)
-+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+ ;;
-+ esac
-+ ;;
-+
-+irix5* | irix6* | nonstopux*)
-+ case $LD in
-+ *-32|*"-32 ") libmagic=32-bit;;
-+ *-n32|*"-n32 ") libmagic=N32;;
-+ *-64|*"-64 ") libmagic=64-bit;;
-+ *) libmagic=never-match;;
-+ esac
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+# This must be Linux ELF.
-+linux*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+ else
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-+ fi
-+ ;;
-+
-+newos6*)
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+ ;;
-+
-+nto-qnx*)
-+ lt_cv_deplibs_check_method=unknown
-+ ;;
-+
-+openbsd*)
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-+ else
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+ fi
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+sco3.2v5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+solaris*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ case $host_vendor in
-+ motorola)
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+ ;;
-+ ncr)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ sequent)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+ ;;
-+ sni)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+ lt_cv_file_magic_test_file=/lib/libc.so
-+ ;;
-+ siemens)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ esac
-+ ;;
-+
-+sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+esac
-+])
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+])# AC_DEPLIBS_CHECK_METHOD
-+
-+
-+# AC_PROG_NM
-+# ----------
-+# find the pathname to a BSD-compatible name lister
-+AC_DEFUN([AC_PROG_NM],
-+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-+[if test -n "$NM"; then
-+ # Let the user override the test.
-+ lt_cv_path_NM="$NM"
-+else
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+ # Check to see if the nm accepts a BSD-compat flag.
-+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+ # nm: unknown option "B" ignored
-+ # Tru64's nm complains that /dev/null is an invalid object file
-+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+ */dev/null* | *'Invalid file or object type'*)
-+ lt_cv_path_NM="$tmp_nm -B"
-+ break
-+ ;;
-+ *)
-+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+ */dev/null*)
-+ lt_cv_path_NM="$tmp_nm -p"
-+ break
-+ ;;
-+ *)
-+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+ continue # so that we can try to find one that supports BSD flags
-+ ;;
-+ esac
-+ esac
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi])
-+NM="$lt_cv_path_NM"
-+])# AC_PROG_NM
-+
-+
-+# AC_CHECK_LIBM
-+# -------------
-+# check for math library
-+AC_DEFUN([AC_CHECK_LIBM],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+ # These system don't have libm, or don't need it
-+ ;;
-+*-ncr-sysv4.3*)
-+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-+ ;;
-+*)
-+ AC_CHECK_LIB(m, cos, LIBM="-lm")
-+ ;;
-+esac
-+])# AC_CHECK_LIBM
-+
-+
-+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-+# -----------------------------------
-+# sets LIBLTDL to the link flags for the libltdl convenience library and
-+# LTDLINCL to the include flags for the libltdl header and adds
-+# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
-+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
-+# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
-+# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-+# '${top_srcdir}/' (note the single quotes!). If your package is not
-+# flat and you're not using automake, define top_builddir and
-+# top_srcdir appropriately in the Makefiles.
-+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+ case $enable_ltdl_convenience in
-+ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-+ "") enable_ltdl_convenience=yes
-+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-+ esac
-+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+ # For backwards non-gettext consistent compatibility...
-+ INCLTDL="$LTDLINCL"
-+])# AC_LIBLTDL_CONVENIENCE
-+
-+
-+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-+# -----------------------------------
-+# sets LIBLTDL to the link flags for the libltdl installable library and
-+# LTDLINCL to the include flags for the libltdl header and adds
-+# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
-+# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
-+# DIRECTORY is not provided and an installed libltdl is not found, it is
-+# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
-+# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-+# quotes!). If your package is not flat and you're not using automake,
-+# define top_builddir and top_srcdir appropriately in the Makefiles.
-+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+ AC_CHECK_LIB(ltdl, lt_dlinit,
-+ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-+ [if test x"$enable_ltdl_install" = xno; then
-+ AC_MSG_WARN([libltdl not installed, but installation disabled])
-+ else
-+ enable_ltdl_install=yes
-+ fi
-+ ])
-+ if test x"$enable_ltdl_install" = x"yes"; then
-+ ac_configure_args="$ac_configure_args --enable-ltdl-install"
-+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+ else
-+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-+ LIBLTDL="-lltdl"
-+ LTDLINCL=
-+ fi
-+ # For backwards non-gettext consistent compatibility...
-+ INCLTDL="$LTDLINCL"
-+])# AC_LIBLTDL_INSTALLABLE
-+
-+
-+# AC_LIBTOOL_CXX
-+# --------------
-+# enable support for C++ libraries
-+AC_DEFUN([AC_LIBTOOL_CXX],
-+[AC_REQUIRE([_LT_AC_LANG_CXX])
-+])# AC_LIBTOOL_CXX
-+
-+
-+# _LT_AC_LANG_CXX
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_CXX],
-+[AC_REQUIRE([AC_PROG_CXX])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-+])# _LT_AC_LANG_CXX
-+
-+# _LT_AC_PROG_CXXCPP
-+# ---------------
-+AC_DEFUN([_LT_AC_PROG_CXXCPP],
-+[
-+AC_REQUIRE([AC_PROG_CXX])
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+ (test "X$CXX" != "Xg++"))) ; then
-+ AC_PROG_CXXCPP
-+fi
-+])# _LT_AC_PROG_CXXCPP
-+
-+# AC_LIBTOOL_F77
-+# --------------
-+# enable support for Fortran 77 libraries
-+AC_DEFUN([AC_LIBTOOL_F77],
-+[AC_REQUIRE([_LT_AC_LANG_F77])
-+])# AC_LIBTOOL_F77
-+
-+
-+# _LT_AC_LANG_F77
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_F77],
-+[AC_REQUIRE([AC_PROG_F77])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-+])# _LT_AC_LANG_F77
-+
-+
-+# AC_LIBTOOL_GCJ
-+# --------------
-+# enable support for GCJ libraries
-+AC_DEFUN([AC_LIBTOOL_GCJ],
-+[AC_REQUIRE([_LT_AC_LANG_GCJ])
-+])# AC_LIBTOOL_GCJ
-+
-+
-+# _LT_AC_LANG_GCJ
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_GCJ],
-+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-+ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-+ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-+ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-+])# _LT_AC_LANG_GCJ
-+
-+
-+# AC_LIBTOOL_RC
-+# --------------
-+# enable support for Windows resource files
-+AC_DEFUN([AC_LIBTOOL_RC],
-+[AC_REQUIRE([LT_AC_PROG_RC])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-+])# AC_LIBTOOL_RC
-+
-+
-+# AC_LIBTOOL_LANG_C_CONFIG
-+# ------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined. Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-+[lt_save_CC="$CC"
-+AC_LANG_PUSH(C)
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}\n'
-+
-+_LT_AC_SYS_COMPILER
-+
-+#
-+# Check for any special shared library compilation flags.
-+#
-+_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-+if test "$GCC" = no; then
-+ case $host_os in
-+ sco3.2v5*)
-+ _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
-+ ;;
-+ esac
-+fi
-+if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
-+ AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-+ if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
-+ else
-+ AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
-+ _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-+ fi
-+fi
-+
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
-+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-+ $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
-+ [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-+
-+
-+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+AC_LIBTOOL_SYS_LIB_STRIP
-+AC_LIBTOOL_DLOPEN_SELF($1)
-+
-+# Report which librarie types wil actually be built
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-+
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
-+
-+aix4* | aix5*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+esac
-+AC_MSG_RESULT([$enable_shared])
-+
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_C_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_CXX_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined. Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-+[AC_LANG_PUSH(C++)
-+AC_REQUIRE([AC_PROG_CXX])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-+
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+_LT_AC_TAGVAR(always_export_symbols, $1)=no
-+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_direct, $1)=no
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+_LT_AC_TAGVAR(module_cmds, $1)=
-+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_AC_TAGVAR(no_undefined_flag, $1)=
-+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Dependencies to place before and after the object being linked:
-+_LT_AC_TAGVAR(predep_objects, $1)=
-+_LT_AC_TAGVAR(postdep_objects, $1)=
-+_LT_AC_TAGVAR(predeps, $1)=
-+_LT_AC_TAGVAR(postdeps, $1)=
-+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+
-+# Source file extension for C++ test sources.
-+ac_ext=cc
-+
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC=$CC
-+lt_save_LD=$LD
-+lt_save_GCC=$GCC
-+GCC=$GXX
-+lt_save_with_gnu_ld=$with_gnu_ld
-+lt_save_path_LD=$lt_cv_path_LD
-+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+else
-+ unset lt_cv_prog_gnu_ld
-+fi
-+if test -n "${lt_cv_path_LDCXX+set}"; then
-+ lt_cv_path_LD=$lt_cv_path_LDCXX
-+else
-+ unset lt_cv_path_LD
-+fi
-+test -z "${LDCXX+set}" || LD=$LDCXX
-+CC=${CXX-"c++"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+
-+# We don't want -fno-exception wen compiling C++ code, so set the
-+# no_builtin_flag separately
-+if test "$GXX" = yes; then
-+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+else
-+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+fi
-+
-+if test "$GXX" = yes; then
-+ # Set up default GNU C++ configuration
-+
-+ AC_PROG_LD
-+
-+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
-+ # archiving commands below assume that GNU ld is being used.
-+ if test "$with_gnu_ld" = yes; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+ # If archive_cmds runs LD, not CC, wlarc should be empty
-+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+ # investigate it a little bit more. (MM)
-+ wlarc='${wl}'
-+
-+ # ancient GNU ld didn't support --whole-archive et. al.
-+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-+ grep 'no-whole-archive' > /dev/null; then
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+ fi
-+ else
-+ with_gnu_ld=no
-+ wlarc=
-+
-+ # A generic and very simple default shared library creation
-+ # command for GNU C++ for the case where it uses the native
-+ # linker, instead of GNU ld. If possible, this setting should
-+ # overridden to take advantage of the native linker features on
-+ # the platform it is being used on.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ fi
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+else
-+ GXX=no
-+ with_gnu_ld=no
-+ wlarc=
-+fi
-+
-+# PORTME: fill in a description of your system's C++ link characteristics
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+case $host_os in
-+ aix3*)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ aix4* | aix5*)
-+ if test "$host_cpu" = ia64; then
-+ # On IA64, the linker does run time linking by default, so we don't
-+ # have to do anything special.
-+ aix_use_runtimelinking=no
-+ exp_sym_flag='-Bexport'
-+ no_entry_flag=""
-+ else
-+ aix_use_runtimelinking=no
-+
-+ # Test if we are trying to use run time linking or normal
-+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+ # need to do runtime linking.
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+ for ld_flag in $LDFLAGS; do
-+ case $ld_flag in
-+ *-brtl*)
-+ aix_use_runtimelinking=yes
-+ break
-+ ;;
-+ esac
-+ done
-+ esac
-+
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
-+
-+ # When large executables or shared objects are built, AIX ld can
-+ # have problems creating the table of contents. If linking a library
-+ # or program results in "error TOC overflow" add -mminimal-toc to
-+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+ _LT_AC_TAGVAR(archive_cmds, $1)=''
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+ if test "$GXX" = yes; then
-+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+ # We only want to do this on AIX 4.2 and lower, the check
-+ # below for broken collect2 doesn't work under 4.3+
-+ collect2name=`${CC} -print-prog-name=collect2`
-+ if test -f "$collect2name" && \
-+ strings "$collect2name" | grep resolve_lib_name >/dev/null
-+ then
-+ # We have reworked collect2
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ else
-+ # We have old collect2
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+ # It fails to find uninstalled libraries when the uninstalled
-+ # path is not listed in the libpath. Setting hardcode_minus_L
-+ # to unsupported forces relinking
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+ fi
-+ esac
-+ shared_flag='-shared'
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag="$shared_flag "'${wl}-G'
-+ fi
-+ else
-+ # not using gcc
-+ if test "$host_cpu" = ia64; then
-+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+ # chokes on -Wl,-G. The following line is correct:
-+ shared_flag='-G'
-+ else
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
-+ else
-+ shared_flag='${wl}-bM:SRE'
-+ fi
-+ fi
-+ fi
-+
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # Warning - without using the other runtime loading flags (-brtl),
-+ # -berok will link without error, but may produce a broken library.
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ _LT_AC_SYS_LIBPATH_AIX
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ else
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ _LT_AC_SYS_LIBPATH_AIX
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Warning - without using the other run time loading flags,
-+ # -berok will link without error, but may produce a broken library.
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+ # -bexpall does not export symbols beginning with underscore (_)
-+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+ # Exported symbols can be pulled into shared objects from archives
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+ # This is similar to how AIX traditionally builds it's shared libraries.
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ fi
-+ fi
-+ ;;
-+ chorus*)
-+ case $cc_basename in
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+
-+
-+ cygwin* | mingw* | pw32*)
-+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+ # as there is no search path for DLLs.
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ # If the export-symbols file already is a .def file (1st line
-+ # is EXPORTS), use it as is; otherwise, prepend...
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ echo EXPORTS > $output_objdir/$soname.def;
-+ cat $export_symbols >> $output_objdir/$soname.def;
-+ fi~
-+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ darwin* | rhapsody*)
-+ case "$host_os" in
-+ rhapsody* | darwin1.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+ if test "$GXX" = yes ; then
-+ lt_int_apple_cc_single_mod=no
-+ output_verbose_link_cmd='echo'
-+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+ lt_int_apple_cc_single_mod=yes
-+ fi
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ fi
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ fi
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ case "$cc_basename" in
-+ xlc*)
-+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ dgux*)
-+ case $cc_basename in
-+ ec++)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ ghcx)
-+ # Green Hills C++ Compiler
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+ freebsd[[12]]*)
-+ # C++ shared libraries reported to be fairly broken before switch to ELF
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ freebsd-elf*)
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ ;;
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
-+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+ # conventions
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+ ;;
-+ gnu*)
-+ ;;
-+ hpux9*)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+ # but as the default
-+ # location of the library.
-+
-+ case $cc_basename in
-+ CC)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ aCC)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ else
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ hpux10*|hpux11*)
-+ if test $with_gnu_ld = no; then
-+ case "$host_cpu" in
-+ hppa*64*)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ ;;
-+ ia64*)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ ;;
-+ esac
-+ fi
-+ case "$host_cpu" in
-+ hppa*64*)
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+ ia64*)
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+ # but as the default
-+ # location of the library.
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+ # but as the default
-+ # location of the library.
-+ ;;
-+ esac
-+
-+ case $cc_basename in
-+ CC)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ aCC)
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ esac
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ if test $with_gnu_ld = no; then
-+ case "$host_cpu" in
-+ ia64*|hppa*64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ esac
-+ fi
-+ else
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ irix5* | irix6*)
-+ case $cc_basename in
-+ CC)
-+ # SGI C++
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ if test "$with_gnu_ld" = no; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-+ fi
-+ fi
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+ esac
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ ;;
-+ linux*)
-+ case $cc_basename in
-+ KCC)
-+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+ # KCC will only create a shared library if the output file
-+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+ # to its proper name (with version) after linking.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+ ;;
-+ icpc)
-+ # Intel C++
-+ with_gnu_ld=yes
-+ # version 8.0 and above of icpc choke on multiply defined symbols
-+ # if we add $predep_objects and $postdep_objects, however 7.1 and
-+ # earlier do not add the objects themselves.
-+ case `$CC -V 2>&1` in
-+ *"Version 7."*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ ;;
-+ *) # Version 8.0 or newer
-+ tmp_idyn=
-+ case $host_cpu in
-+ ia64*) tmp_idyn=' -i_dynamic';;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+ ;;
-+ pgCC)
-+ # Portland Group C++ compiler
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ ;;
-+ cxx)
-+ # Compaq C++
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+
-+ runpath_var=LD_RUN_PATH
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ esac
-+ ;;
-+ lynxos*)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ m88k*)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ mvs*)
-+ case $cc_basename in
-+ cxx)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+ wlarc=
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ fi
-+ # Workaround some broken pre-1.5 toolchains
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+ ;;
-+ openbsd2*)
-+ # C++ shared libraries are fairly broken
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ openbsd*)
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd='echo'
-+ ;;
-+ osf3*)
-+ case $cc_basename in
-+ KCC)
-+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+ # KCC will only create a shared library if the output file
-+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+ # to its proper name (with version) after linking.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+
-+ ;;
-+ RCC)
-+ # Rational C++ 2.4.1
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ cxx)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ *)
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+ else
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ osf4* | osf5*)
-+ case $cc_basename in
-+ KCC)
-+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+ # KCC will only create a shared library if the output file
-+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+ # to its proper name (with version) after linking.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # Archives containing C++ object files must be created using
-+ # the KAI C++ compiler.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-+ ;;
-+ RCC)
-+ # Rational C++ 2.4.1
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ cxx)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+ echo "-hidden">> $lib.exp~
-+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
-+ $rm $lib.exp'
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ *)
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+ else
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ psos*)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ sco*)
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ case $cc_basename in
-+ CC)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+ sunos4*)
-+ case $cc_basename in
-+ CC)
-+ # Sun C++ 4.x
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ lcc)
-+ # Lucid
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+ solaris*)
-+ case $cc_basename in
-+ CC)
-+ # Sun C++ 4.2, 5.x and Centerline C++
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ # The C++ compiler is used as linker so we must use $wl
-+ # flag to pass the commands to the underlying system
-+ # linker.
-+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ gcx)
-+ # Green Hills C++ Compiler
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+
-+ # The C++ compiler must be used to create the archive.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+ ;;
-+ *)
-+ # GNU C++ compiler with Solaris linker
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-+ if $CC --version | grep -v '^2\.7' > /dev/null; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+ else
-+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+ # platform.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+ fi
-+
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ ;;
-+ tandem*)
-+ case $cc_basename in
-+ NCC)
-+ # NonStop-UX NCC 3.20
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-+ vxworks*)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+esac
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+_LT_AC_TAGVAR(GCC, $1)="$GXX"
-+_LT_AC_TAGVAR(LD, $1)="$LD"
-+
-+AC_LIBTOOL_POSTDEP_PREDEP($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+AC_LIBTOOL_SYS_LIB_STRIP
-+AC_LIBTOOL_DLOPEN_SELF($1)
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_POP
-+CC=$lt_save_CC
-+LDCXX=$LD
-+LD=$lt_save_LD
-+GCC=$lt_save_GCC
-+with_gnu_ldcxx=$with_gnu_ld
-+with_gnu_ld=$lt_save_with_gnu_ld
-+lt_cv_path_LDCXX=$lt_cv_path_LD
-+lt_cv_path_LD=$lt_save_path_LD
-+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+])# AC_LIBTOOL_LANG_CXX_CONFIG
-+
-+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-+# ------------------------
-+# Figure out "hidden" library dependencies from verbose
-+# compiler output when linking a shared library.
-+# Parse the compiler output and extract the necessary
-+# objects, libraries and library flags.
-+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-+dnl we can't use the lt_simple_compile_test_code here,
-+dnl because it contains code intended for an executable,
-+dnl not a library. It's possible we should let each
-+dnl tag define a new lt_????_link_test_code variable,
-+dnl but it's only used here...
-+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-+int a;
-+void foo (void) { a = 0; }
-+EOF
-+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-+class Foo
-+{
-+public:
-+ Foo (void) { a = 0; }
-+private:
-+ int a;
-+};
-+EOF
-+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-+ subroutine foo
-+ implicit none
-+ integer*4 a
-+ a=0
-+ return
-+ end
-+EOF
-+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-+public class foo {
-+ private int a;
-+ public void bar (void) {
-+ a = 0;
-+ }
-+};
-+EOF
-+])
-+dnl Parse the compiler output and extract the necessary
-+dnl objects, libraries and library flags.
-+if AC_TRY_EVAL(ac_compile); then
-+ # Parse the compiler output and extract the necessary
-+ # objects, libraries and library flags.
-+
-+ # Sentinel used to keep track of whether or not we are before
-+ # the conftest object file.
-+ pre_test_object_deps_done=no
-+
-+ # The `*' in the case matches for architectures that use `case' in
-+ # $output_verbose_cmd can trigger glob expansion during the loop
-+ # eval without this substitution.
-+ output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+
-+ for p in `eval $output_verbose_link_cmd`; do
-+ case $p in
-+
-+ -L* | -R* | -l*)
-+ # Some compilers place space between "-{L,R}" and the path.
-+ # Remove the space.
-+ if test $p = "-L" \
-+ || test $p = "-R"; then
-+ prev=$p
-+ continue
-+ else
-+ prev=
-+ fi
-+
-+ if test "$pre_test_object_deps_done" = no; then
-+ case $p in
-+ -L* | -R*)
-+ # Internal compiler library paths should come after those
-+ # provided the user. The postdeps already come after the
-+ # user supplied libs so there is no need to process them.
-+ if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-+ else
-+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-+ fi
-+ ;;
-+ # The "-l" case would never come before the object being
-+ # linked, so don't bother handling this case.
-+ esac
-+ else
-+ if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-+ _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-+ else
-+ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-+ fi
-+ fi
-+ ;;
-+
-+ *.$objext)
-+ # This assumes that the test object file only shows up
-+ # once in the compiler output.
-+ if test "$p" = "conftest.$objext"; then
-+ pre_test_object_deps_done=yes
-+ continue
-+ fi
-+
-+ if test "$pre_test_object_deps_done" = no; then
-+ if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-+ _LT_AC_TAGVAR(predep_objects, $1)="$p"
-+ else
-+ _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-+ fi
-+ else
-+ if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-+ _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-+ else
-+ _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-+ fi
-+ fi
-+ ;;
-+
-+ *) ;; # Ignore the rest.
-+
-+ esac
-+ done
-+
-+ # Clean up.
-+ rm -f a.out a.exe
-+else
-+ echo "libtool.m4: error: problem compiling $1 test program"
-+fi
-+
-+$rm -f confest.$objext
-+
-+case " $_LT_AC_TAGVAR(postdeps, $1) " in
-+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-+esac
-+])# AC_LIBTOOL_POSTDEP_PREDEP
-+
-+# AC_LIBTOOL_LANG_F77_CONFIG
-+# ------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined. Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-+[AC_REQUIRE([AC_PROG_F77])
-+AC_LANG_PUSH(Fortran 77)
-+
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+_LT_AC_TAGVAR(always_export_symbols, $1)=no
-+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_direct, $1)=no
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+_LT_AC_TAGVAR(module_cmds, $1)=
-+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_AC_TAGVAR(no_undefined_flag, $1)=
-+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for f77 test sources.
-+ac_ext=f
-+
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code=" program t\n end\n"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${F77-"f77"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-+
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
-+aix4* | aix5*)
-+ test "$enable_shared" = yes && enable_static=no
-+ ;;
-+esac
-+AC_MSG_RESULT([$enable_shared])
-+
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-+
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+_LT_AC_TAGVAR(GCC, $1)="$G77"
-+_LT_AC_TAGVAR(LD, $1)="$LD"
-+
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+AC_LIBTOOL_SYS_LIB_STRIP
-+
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_F77_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_GCJ_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined. Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-+[AC_LANG_SAVE
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+AC_LIBTOOL_SYS_LIB_STRIP
-+AC_LIBTOOL_DLOPEN_SELF($1)
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_GCJ_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_RC_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the Windows resource compiler are
-+# suitably defined. Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-+[AC_LANG_SAVE
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${RC-"windres"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_RC_CONFIG
-+
-+
-+# AC_LIBTOOL_CONFIG([TAGNAME])
-+# ----------------------------
-+# If TAGNAME is not passed, then create an initial libtool script
-+# with a default configuration from the untagged config vars. Otherwise
-+# add code to config.status for appending the configuration named by
-+# TAGNAME from the matching tagged config vars.
-+AC_DEFUN([AC_LIBTOOL_CONFIG],
-+[# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+ # See if we are running on zsh, and set the options which allow our commands through
-+ # without removal of \ escapes.
-+ if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+ fi
-+ # Now quote all the things that may contain metacharacters while being
-+ # careful not to overquote the AC_SUBSTed values. We take copies of the
-+ # variables and quote the copies for generation of the libtool script.
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
-+ SED SHELL STRIP \
-+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+ deplibs_check_method reload_flag reload_cmds need_locks \
-+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+ lt_cv_sys_global_symbol_to_c_name_address \
-+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+ old_postinstall_cmds old_postuninstall_cmds \
-+ _LT_AC_TAGVAR(compiler, $1) \
-+ _LT_AC_TAGVAR(CC, $1) \
-+ _LT_AC_TAGVAR(LD, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-+ _LT_AC_TAGVAR(old_archive_cmds, $1) \
-+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-+ _LT_AC_TAGVAR(predep_objects, $1) \
-+ _LT_AC_TAGVAR(postdep_objects, $1) \
-+ _LT_AC_TAGVAR(predeps, $1) \
-+ _LT_AC_TAGVAR(postdeps, $1) \
-+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-+ _LT_AC_TAGVAR(archive_cmds, $1) \
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
-+ _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-+ _LT_AC_TAGVAR(no_undefined_flag, $1) \
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-+ _LT_AC_TAGVAR(hardcode_automatic, $1) \
-+ _LT_AC_TAGVAR(module_cmds, $1) \
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-+ _LT_AC_TAGVAR(exclude_expsyms, $1) \
-+ _LT_AC_TAGVAR(include_expsyms, $1); do
-+
-+ case $var in
-+ _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-+ _LT_AC_TAGVAR(archive_cmds, $1) | \
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-+ _LT_AC_TAGVAR(module_cmds, $1) | \
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+ postinstall_cmds | postuninstall_cmds | \
-+ old_postinstall_cmds | old_postuninstall_cmds | \
-+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+ # Double-quote double-evaled strings.
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+ ;;
-+ *)
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ ;;
-+ esac
-+ done
-+
-+ case $lt_echo in
-+ *'\[$]0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-+ ;;
-+ esac
-+
-+ifelse([$1], [],
-+ [cfgfile="${ofile}T"
-+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-+ $rm -f "$cfgfile"
-+ AC_MSG_NOTICE([creating $ofile])],
-+ [cfgfile="$ofile"])
-+
-+ cat <<__EOF__ >> "$cfgfile"
-+ifelse([$1], [],
-+[#! $SHELL
-+
-+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Libtool:
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# A sed program that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="$SED -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+# The names of the tagged configurations supported by this script.
-+available_tags=
-+
-+# ### BEGIN LIBTOOL CONFIG],
-+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
-+# A language-specific compiler.
-+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS=$lt_AS
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-+
-+ifelse([$1],[],
-+[# ### END LIBTOOL CONFIG],
-+[# ### END LIBTOOL TAG CONFIG: $tagname])
-+
-+__EOF__
-+
-+ifelse([$1],[], [
-+ case $host_os in
-+ aix3*)
-+ cat <<\EOF >> "$cfgfile"
-+
-+# AIX sometimes has problems with the GCC collect2 program. For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+fi
-+EOF
-+ ;;
-+ esac
-+
-+ # We use sed instead of cat because bash on DJGPP gets confused if
-+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
-+ # text mode, it properly converts lines to CR/LF. This bash problem
-+ # is reportedly fixed, but why not run on old versions too?
-+ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-+
-+ mv -f "$cfgfile" "$ofile" || \
-+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+ chmod +x "$ofile"
-+])
-+else
-+ # If there is no Makefile yet, we rely on a make rule to execute
-+ # `config.status --recheck' to rerun these tests and create the
-+ # libtool script then.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
-+])# AC_LIBTOOL_CONFIG
-+
-+
-+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------------------
-+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+
-+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+
-+if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+
-+ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+ lt_cv_prog_compiler_rtti_exceptions,
-+ [-fno-rtti -fno-exceptions], [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
-+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-+
-+
-+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+# ---------------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-+[AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([AC_PROG_NM])
-+AC_REQUIRE([AC_OBJEXT])
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-+[
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+ symcode='[[BCDT]]'
-+ ;;
-+cygwin* | mingw* | pw32*)
-+ symcode='[[ABCDGISTW]]'
-+ ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+ if test "$host_cpu" = ia64; then
-+ symcode='[[ABCDEGRST]]'
-+ fi
-+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-+ ;;
-+linux*)
-+ if test "$host_cpu" = ia64; then
-+ symcode='[[ABCDGIRSTW]]'
-+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-+ fi
-+ ;;
-+irix* | nonstopux*)
-+ symcode='[[BCDEGRST]]'
-+ ;;
-+osf*)
-+ symcode='[[BCDEGQRST]]'
-+ ;;
-+solaris* | sysv5*)
-+ symcode='[[BDRT]]'
-+ ;;
-+sysv4)
-+ symcode='[[DFNSTU]]'
-+ ;;
-+esac
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+ ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+ symcode='[[ABCDGIRSTW]]' ;;
-+esac
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+ symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-+ # Write the raw and C identifiers.
-+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+
-+ # Check to see that the pipe works correctly.
-+ pipe_works=no
-+
-+ rm -f conftest*
-+ cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+ if AC_TRY_EVAL(ac_compile); then
-+ # Now try to grab the symbols.
-+ nlist=conftest.nm
-+ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+ # Try sorting and uniquifying the output.
-+ if sort "$nlist" | uniq > "$nlist"T; then
-+ mv -f "$nlist"T "$nlist"
-+ else
-+ rm -f "$nlist"T
-+ fi
-+
-+ # Make sure that we snagged all the symbols we need.
-+ if grep ' nm_test_var$' "$nlist" >/dev/null; then
-+ if grep ' nm_test_func$' "$nlist" >/dev/null; then
-+ cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+ # Now generate the symbol file.
-+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-+
-+ cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr_t void *
-+#else
-+# define lt_ptr_t char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+ const char *name;
-+ lt_ptr_t address;
-+}
-+lt_preloaded_symbols[[]] =
-+{
-+EOF
-+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-+ cat <<\EOF >> conftest.$ac_ext
-+ {0, (lt_ptr_t) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+ # Now try linking the two files.
-+ mv conftest.$ac_objext conftstm.$ac_objext
-+ lt_save_LIBS="$LIBS"
-+ lt_save_CFLAGS="$CFLAGS"
-+ LIBS="conftstm.$ac_objext"
-+ CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-+ pipe_works=yes
-+ fi
-+ LIBS="$lt_save_LIBS"
-+ CFLAGS="$lt_save_CFLAGS"
-+ else
-+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+ cat conftest.$ac_ext >&5
-+ fi
-+ rm -f conftest* conftst*
-+
-+ # Do not use the global_symbol_pipe unless it works.
-+ if test "$pipe_works" = yes; then
-+ break
-+ else
-+ lt_cv_sys_global_symbol_pipe=
-+ fi
-+done
-+])
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+ lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+ AC_MSG_RESULT(failed)
-+else
-+ AC_MSG_RESULT(ok)
-+fi
-+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+
-+
-+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-+# ---------------------------------------
-+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-+
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+ ifelse([$1],[CXX],[
-+ # C++ specific cases for pic, static, wl, etc.
-+ if test "$GXX" = yes; then
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+ ;;
-+ amigaos*)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+ ;;
-+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
-+ ;;
-+ mingw* | os2* | pw32*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+ ;;
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+ ;;
-+ *djgpp*)
-+ # DJGPP does not support shared libraries at all
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+ ;;
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+ fi
-+ ;;
-+ hpux*)
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ esac
-+ else
-+ case $host_os in
-+ aix4* | aix5*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ else
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+ fi
-+ ;;
-+ chorus*)
-+ case $cc_basename in
-+ cxch68)
-+ # Green Hills C++ Compiler
-+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-+ ;;
-+ esac
-+ ;;
-+ darwin*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ case "$cc_basename" in
-+ xlc*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ ;;
-+ esac
-+ ;;
-+ dgux*)
-+ case $cc_basename in
-+ ec++)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ ;;
-+ ghcx)
-+ # Green Hills C++ Compiler
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
-+ # FreeBSD uses GNU C++
-+ ;;
-+ hpux9* | hpux10* | hpux11*)
-+ case $cc_basename in
-+ CC)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-+ if test "$host_cpu" != ia64; then
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+ fi
-+ ;;
-+ aCC)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ irix5* | irix6* | nonstopux*)
-+ case $cc_basename in
-+ CC)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ # CC pic flag -KPIC is the default.
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ linux*)
-+ case $cc_basename in
-+ KCC)
-+ # KAI C++ Compiler
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ icpc* | ecpc*)
-+ # Intel C++
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ pgCC)
-+ # Portland Group C++ compiler.
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ cxx)
-+ # Compaq C++
-+ # Make sure the PIC flag is empty. It appears that all Alpha
-+ # Linux and Compaq Tru64 Unix objects are PIC.
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ lynxos*)
-+ ;;
-+ m88k*)
-+ ;;
-+ mvs*)
-+ case $cc_basename in
-+ cxx)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ netbsd*)
-+ ;;
-+ osf3* | osf4* | osf5*)
-+ case $cc_basename in
-+ KCC)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+ ;;
-+ RCC)
-+ # Rational C++ 2.4.1
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ ;;
-+ cxx)
-+ # Digital/Compaq C++
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # Make sure the PIC flag is empty. It appears that all Alpha
-+ # Linux and Compaq Tru64 Unix objects are PIC.
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ psos*)
-+ ;;
-+ sco*)
-+ case $cc_basename in
-+ CC)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ solaris*)
-+ case $cc_basename in
-+ CC)
-+ # Sun C++ 4.2, 5.x and Centerline C++
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ gcx)
-+ # Green Hills C++ Compiler
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ sunos4*)
-+ case $cc_basename in
-+ CC)
-+ # Sun C++ 4.x
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ lcc)
-+ # Lucid
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ tandem*)
-+ case $cc_basename in
-+ NCC)
-+ # NonStop-UX NCC 3.20
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ unixware*)
-+ ;;
-+ vxworks*)
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
-+ esac
-+ fi
-+],
-+[
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+ ;;
-+
-+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
-+ ;;
-+
-+ mingw* | pw32* | os2*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+ ;;
-+
-+ msdosdjgpp*)
-+ # Just because we use GCC doesn't mean we suddenly get shared libraries
-+ # on systems that don't support them.
-+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ enable_shared=no
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+ fi
-+ ;;
-+
-+ hpux*)
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ esac
-+ ;;
-+
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ esac
-+ else
-+ # PORTME Check for flag to pass linker flags through the system compiler.
-+ case $host_os in
-+ aix*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ else
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+ fi
-+ ;;
-+ darwin*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ case "$cc_basename" in
-+ xlc*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ ;;
-+ esac
-+ ;;
-+
-+ mingw* | pw32* | os2*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+ ;;
-+
-+ hpux9* | hpux10* | hpux11*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+ ;;
-+ esac
-+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # PIC (with -KPIC) is the default.
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
-+ newsos6)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ linux*)
-+ case $cc_basename in
-+ icc* | ecc*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ pgcc | pgf77 | pgf90)
-+ # Portland Group compilers (*not* the Pentium gcc compiler,
-+ # which looks to be a dead project)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ ccc*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # All Alpha code is PIC.
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+ esac
-+ ;;
-+
-+ osf3* | osf4* | osf5*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # All OSF/1 code is PIC.
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
-+ sco3.2v5*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
-+ ;;
-+
-+ solaris*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ sunos4*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+ ;;
-+
-+ unicos*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
-+
-+ uts4*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
-+ esac
-+ fi
-+])
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-+ "" | " "*) ;;
-+ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-+ esac],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+fi
-+case "$host_os" in
-+ # For platforms which do not support PIC, -DPIC is meaningless:
-+ *djgpp*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-+ ;;
-+esac
-+])
-+
-+
-+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-+# ------------------------------------
-+# See if the linker supports building shared libraries.
-+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-+[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+ifelse([$1],[CXX],[
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ case $host_os in
-+ aix4* | aix5*)
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+ fi
-+ ;;
-+ pw32*)
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-+ ;;
-+ cygwin* | mingw*)
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ ;;
-+ esac
-+],[
-+ runpath_var=
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)=
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+ _LT_AC_TAGVAR(module_cmds, $1)=
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ # include_expsyms should be a list of space-separated symbols to be *always*
-+ # included in the symbol list
-+ _LT_AC_TAGVAR(include_expsyms, $1)=
-+ # exclude_expsyms can be an extended regexp of symbols to exclude
-+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+ # as well as any symbol that contains `d'.
-+ _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+ # platforms (ab)use it in PIC code, but their linkers get confused if
-+ # the symbol is explicitly referenced. Since portable code cannot
-+ # rely on this symbol name, it's probably fine to never include it in
-+ # preloaded symbol tables.
-+ extract_expsyms_cmds=
-+
-+ case $host_os in
-+ cygwin* | mingw* | pw32*)
-+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ if test "$GCC" != yes; then
-+ with_gnu_ld=no
-+ fi
-+ ;;
-+ openbsd*)
-+ with_gnu_ld=no
-+ ;;
-+ esac
-+
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+ if test "$with_gnu_ld" = yes; then
-+ # If archive_cmds runs LD, not CC, wlarc should be empty
-+ wlarc='${wl}'
-+
-+ # See if GNU ld supports shared libraries.
-+ case $host_os in
-+ aix3* | aix4* | aix5*)
-+ # On AIX/PPC, the GNU linker is very broken
-+ if test "$host_cpu" != ia64; then
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support. If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+
-+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+ # that the semantics of dynamic libraries on AmigaOS, at least up
-+ # to version 4, is to share data among multiple programs linked
-+ # with the same dynamic library. Since this doesn't match the
-+ # behavior of shared libraries on other platforms, we can't use
-+ # them.
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+
-+ beos*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ cygwin* | mingw* | pw32*)
-+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+ # as there is no search path for DLLs.
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+
-+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ # If the export-symbols file already is a .def file (1st line
-+ # is EXPORTS), use it as is; otherwise, prepend...
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ echo EXPORTS > $output_objdir/$soname.def;
-+ cat $export_symbols >> $output_objdir/$soname.def;
-+ fi~
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+ wlarc=
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ fi
-+ ;;
-+
-+ solaris* | sysv5*)
-+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems. Therefore, libtool
-+*** is disabling shared libraries support. We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer. Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ sunos4*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ wlarc=
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_addflag=
-+ case $CC,$host_cpu in
-+ pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
-+ tmp_addflag=' -fpic' ;;
-+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
-+ tmp_addflag=' -i_dynamic' ;;
-+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
-+ tmp_addflag=' -i_dynamic -nofor_main' ;;
-+ ifc* | ifort*) # Intel Fortran compiler
-+ tmp_addflag=' -nofor_main' ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)=$_LT_AC_TAGVAR(archive_cmds, $1)
-+ fi
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
-+ *)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+
-+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
-+ runpath_var=LD_RUN_PATH
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ # ancient GNU ld didn't support --whole-archive et. al.
-+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+ fi
-+ fi
-+ else
-+ # PORTME fill in a description of your system's linker (not GNU ld)
-+ case $host_os in
-+ aix3*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+ # Note: this linker hardcodes the directories in LIBPATH if there
-+ # are no directories specified by -L.
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ if test "$GCC" = yes && test -z "$link_static_flag"; then
-+ # Neither direct hardcoding nor static linking is supported with a
-+ # broken collect2.
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+ fi
-+ ;;
-+
-+ aix4* | aix5*)
-+ if test "$host_cpu" = ia64; then
-+ # On IA64, the linker does run time linking by default, so we don't
-+ # have to do anything special.
-+ aix_use_runtimelinking=no
-+ exp_sym_flag='-Bexport'
-+ no_entry_flag=""
-+ else
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+ fi
-+ aix_use_runtimelinking=no
-+
-+ # Test if we are trying to use run time linking or normal
-+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+ # need to do runtime linking.
-+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+ for ld_flag in $LDFLAGS; do
-+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+ aix_use_runtimelinking=yes
-+ break
-+ fi
-+ done
-+ esac
-+
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
-+
-+ # When large executables or shared objects are built, AIX ld can
-+ # have problems creating the table of contents. If linking a library
-+ # or program results in "error TOC overflow" add -mminimal-toc to
-+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+ _LT_AC_TAGVAR(archive_cmds, $1)=''
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+ if test "$GCC" = yes; then
-+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+ # We only want to do this on AIX 4.2 and lower, the check
-+ # below for broken collect2 doesn't work under 4.3+
-+ collect2name=`${CC} -print-prog-name=collect2`
-+ if test -f "$collect2name" && \
-+ strings "$collect2name" | grep resolve_lib_name >/dev/null
-+ then
-+ # We have reworked collect2
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ else
-+ # We have old collect2
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+ # It fails to find uninstalled libraries when the uninstalled
-+ # path is not listed in the libpath. Setting hardcode_minus_L
-+ # to unsupported forces relinking
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+ fi
-+ esac
-+ shared_flag='-shared'
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag="$shared_flag "'${wl}-G'
-+ fi
-+ else
-+ # not using gcc
-+ if test "$host_cpu" = ia64; then
-+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+ # chokes on -Wl,-G. The following line is correct:
-+ shared_flag='-G'
-+ else
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
-+ else
-+ shared_flag='${wl}-bM:SRE'
-+ fi
-+ fi
-+ fi
-+
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # Warning - without using the other runtime loading flags (-brtl),
-+ # -berok will link without error, but may produce a broken library.
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ _LT_AC_SYS_LIBPATH_AIX
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ else
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ _LT_AC_SYS_LIBPATH_AIX
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Warning - without using the other run time loading flags,
-+ # -berok will link without error, but may produce a broken library.
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+ # -bexpall does not export symbols beginning with underscore (_)
-+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+ # Exported symbols can be pulled into shared objects from archives
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+ # This is similar to how AIX traditionally builds it's shared libraries.
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ fi
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ # see comment about different semantics on the GNU ld section
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+
-+ bsdi[[45]]*)
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-+ ;;
-+
-+ cygwin* | mingw* | pw32*)
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ # hardcode_libdir_flag_spec is actually meaningless, as there is
-+ # no search path for DLLs.
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ # Tell ltmain to make .lib files, not .a files.
-+ libext=lib
-+ # Tell ltmain to make .dll files, not .so files.
-+ shrext_cmds=".dll"
-+ # FIXME: Setting linknames here is a bad hack.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+ # The linker will automatically build a .lib file if we build a DLL.
-+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-+ # FIXME: Should let the user specify the lib program.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ case "$host_os" in
-+ rhapsody* | darwin1.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ if test "$GCC" = yes ; then
-+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ case "$cc_basename" in
-+ xlc*)
-+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ dgux*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ freebsd1*)
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+
-+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+ # support. Future versions do this automatically, but an explicit c++rt0.o
-+ # does not break anything, and helps significantly (at the cost of a little
-+ # extra space).
-+ freebsd2.2*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+ freebsd2*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ hpux9*)
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ ;;
-+
-+ hpux10* | hpux11*)
-+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ else
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ ;;
-+ esac
-+ fi
-+ if test "$with_gnu_ld" = no; then
-+ case "$host_cpu" in
-+ hppa*64*)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+ ia64*)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ newsos6)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ openbsd*)
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ os2*)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+ ;;
-+
-+ osf3*)
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ ;;
-+
-+ osf4* | osf5*) # as osf3* with the addition of -msym flag
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ else
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+ # Both c and cxx compiler support -rpath directly
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ ;;
-+
-+ sco3.2v5*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+ runpath_var=LD_RUN_PATH
-+ hardcode_runpath_var=yes
-+ ;;
-+
-+ solaris*)
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;;
-+ esac
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ ;;
-+
-+ sunos4*)
-+ if test "x$host_vendor" = xsequent; then
-+ # Use $CC to link under sequent, because it throws in some extra .o
-+ # files that make .init and .fini sections work.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ sysv4)
-+ case $host_vendor in
-+ sni)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-+ ;;
-+ siemens)
-+ ## LD is ld it makes a PLAMLIB
-+ ## CC just makes a GrossModule.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+ ;;
-+ motorola)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+ ;;
-+ esac
-+ runpath_var='LD_RUN_PATH'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ sysv4.3*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var=LD_RUN_PATH
-+ hardcode_runpath_var=yes
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+ fi
-+ ;;
-+
-+ sysv4.2uw2*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ hardcode_runpath_var=yes
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+
-+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
-+ runpath_var='LD_RUN_PATH'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ sysv5*)
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-+ # $CC -shared without GNU ld will not create a library from C++
-+ # object files and a static libstdc++, better avoid it by now
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var='LD_RUN_PATH'
-+ ;;
-+
-+ uts4*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-+
-+ *)
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ fi
-+])
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-+x|xyes)
-+ # Assume -lc should be added
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+
-+ if test "$enable_shared" = yes && test "$GCC" = yes; then
-+ case $_LT_AC_TAGVAR(archive_cmds, $1) in
-+ *'~'*)
-+ # FIXME: we may have to deal with multi-command sequences.
-+ ;;
-+ '$CC '*)
-+ # Test whether the compiler implicitly links with -lc since on some
-+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+ # to ld, don't add -lc before -lgcc.
-+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-+ $rm conftest*
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-+ soname=conftest
-+ lib=conftest
-+ libobjs=conftest.$ac_objext
-+ deplibs=
-+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-+ compiler_flags=-v
-+ linker_flags=-v
-+ verstring=
-+ output_objdir=.
-+ libname=conftest
-+ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-+ then
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ else
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+ fi
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+ else
-+ cat conftest.err 1>&5
-+ fi
-+ $rm conftest*
-+ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-+ ;;
-+ esac
-+ fi
-+ ;;
-+esac
-+])# AC_LIBTOOL_PROG_LD_SHLIBS
-+
-+
-+# _LT_AC_FILE_LTDLL_C
-+# -------------------
-+# Be careful that the start marker always follows a newline.
-+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
-+#
-+# #ifndef __CYGWIN__
-+# # ifdef __CYGWIN32__
-+# # define __CYGWIN__ __CYGWIN32__
-+# # endif
-+# #endif
-+#
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+# __hDllInstance_base = hInst;
-+# return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+])# _LT_AC_FILE_LTDLL_C
-+
-+
-+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-+# ---------------------------------
-+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-+
-+
-+# old names
-+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
-+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
-+
-+# This is just to silence aclocal about the macro not being used
-+ifelse([AC_DISABLE_FAST_INSTALL])
-+
-+AC_DEFUN([LT_AC_PROG_GCJ],
-+[AC_CHECK_TOOL(GCJ, gcj, no)
-+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+ AC_SUBST(GCJFLAGS)
-+])
-+
-+AC_DEFUN([LT_AC_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres, no)
-+])
-+
-+# NOTE: This macro has been submitted for inclusion into #
-+# GNU Autoconf as AC_PROG_SED. When it is available in #
-+# a released version of Autoconf we should remove this #
-+# macro and use it instead. #
-+# LT_AC_PROG_SED
-+# --------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible. Prefer GNU sed if found.
-+AC_DEFUN([LT_AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for lt_ac_prog in sed gsed; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$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
-+ done
-+ done
-+done
-+lt_ac_max=0
-+lt_ac_count=0
-+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+# along with /bin/sed that truncates output.
-+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+ test ! -f $lt_ac_sed && continue
-+ cat /dev/null > conftest.in
-+ lt_ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+ # Check for GNU sed and select it if it is found.
-+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+ lt_cv_path_SED=$lt_ac_sed
-+ break
-+ fi
-+ while true; do
-+ cat conftest.in conftest.in >conftest.tmp
-+ mv conftest.tmp conftest.in
-+ cp conftest.in conftest.nl
-+ echo >>conftest.nl
-+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+ cmp -s conftest.out conftest.nl || break
-+ # 10000 chars as input seems more than enough
-+ test $lt_ac_count -gt 10 && break
-+ lt_ac_count=`expr $lt_ac_count + 1`
-+ if test $lt_ac_count -gt $lt_ac_max; then
-+ lt_ac_max=$lt_ac_count
-+ lt_cv_path_SED=$lt_ac_sed
-+ fi
-+ done
-+done
-+])
-+SED=$lt_cv_path_SED
-+AC_MSG_RESULT([$SED])
-+])
-+
-+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+ [AM_AUTOMAKE_VERSION([1.9.5])])
-+
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory. The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run. This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+# fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+# fails if $ac_aux_dir is absolute,
-+# fails when called from a subdirectory in a VPATH build with
-+# a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir. In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+# MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH. The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 7
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])
-+AC_SUBST([$1_FALSE])
-+if $2; then
-+ $1_TRUE=
-+ $1_FALSE='#'
-+else
-+ $1_TRUE='#'
-+ $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+ AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery. Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
-+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
-+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
-+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
-+ [depcc="$$1" am_compiler_list=])
-+
-+AC_CACHE_CHECK([dependency style of $depcc],
-+ [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+ # We make a subdir and do the tests there. Otherwise we can end up
-+ # making bogus files that we don't know about and never remove. For
-+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
-+ mkdir conftest.dir
-+ # Copy depcomp to subdir because otherwise we won't find it if we're
-+ # using a relative directory.
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-+
-+ am_cv_$1_dependencies_compiler_type=none
-+ if test "$am_compiler_list" = ""; then
-+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+ fi
-+ for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
-+ # We need to recreate these files for each test, as the compiler may
-+ # overwrite some of them when testing with obscure command lines.
-+ # This happens at least with the AIX C compiler.
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+ case $depmode in
-+ nosideeffect)
-+ # after this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested
-+ if test "x$enable_dependency_tracking" = xyes; then
-+ continue
-+ else
-+ break
-+ fi
-+ ;;
-+ none) break ;;
-+ esac
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this.
-+ if depmode=$depmode \
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_$1_dependencies_compiler_type=$depmode
-+ break
-+ fi
-+ fi
-+ done
-+
-+ cd ..
-+ rm -rf conftest.dir
-+else
-+ am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-+
-+
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-+
-+
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[ --disable-dependency-tracking speeds up one-time build
-+ --enable-dependency-tracking do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+ am_depcomp="$ac_aux_dir/depcomp"
-+ AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])
-+])
-+
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+#serial 3
-+
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[for mf in $CONFIG_FILES; do
-+ # Strip MF so we end up with the name of the file.
-+ mf=`echo "$mf" | sed -e 's/:.*$//'`
-+ # Check whether this is an Automake generated Makefile or not.
-+ # We used to match only the files named `Makefile.in', but
-+ # some people rename them; so instead we look at the file content.
-+ # Grep'ing the first line is not enough: some people post-process
-+ # each Makefile.in and add a new line on top of each file to say so.
-+ # So let's grep whole file.
-+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+ dirpart=`AS_DIRNAME("$mf")`
-+ else
-+ continue
-+ fi
-+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+ test -z "$DEPDIR" && continue
-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+ test -z "am__include" && continue
-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+ # When using ansi2knr, U may be empty or an underscore; expand it
-+ U=`sed -n 's/^U = //p' < "$mf"`
-+ # Find all dependency output files, they are included files with
-+ # $(DEPDIR) in their names. We invoke sed twice because it is the
-+ # simplest approach to changing $(DEPDIR) to its actual value in the
-+ # expansion.
-+ for file in `sed -n "
-+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+ # Make sure the directory exists.
-+ test -f "$dirpart/$file" && continue
-+ fdir=`AS_DIRNAME(["$file"])`
-+ AS_MKDIR_P([$dirpart/$fdir])
-+ # echo "creating $dirpart/$file"
-+ echo '# dummy' > "$dirpart/$file"
-+ done
-+done
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled. FIXME. This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-+
-+# Do all the work for Automake. -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 12
-+
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out. PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition. After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.58])dnl
-+dnl Autoconf wants to disallow AM_ names. We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+ test -f $srcdir/config.status; then
-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+ if (cygpath --version) >/dev/null 2>/dev/null; then
-+ CYGPATH_W='cygpath -w'
-+ else
-+ CYGPATH_W=echo
-+ fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target. The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+ [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+ [_AM_DEPENDENCIES(CC)],
-+ [define([AC_PROG_CC],
-+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [_AM_DEPENDENCIES(CXX)],
-+ [define([AC_PROG_CXX],
-+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated. The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+ case $_am_header in
-+ $1 | $1:* )
-+ break ;;
-+ * )
-+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+ esac
-+done
-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot. For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+ am__leading_dot=.
-+else
-+ am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode is disabled by default
-+ AC_ARG_ENABLE(maintainer-mode,
-+[ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer],
-+ USE_MAINTAINER_MODE=$enableval,
-+ USE_MAINTAINER_MODE=no)
-+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+ MAINT=$MAINTAINER_MODE_TRUE
-+ AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+ @echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+ echo '.include "confinc"' > confmf
-+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ fi
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-+
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+ am_missing_run="$MISSING --run "
-+else
-+ am_missing_run=
-+ AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
-+
-+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-+#
-+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-+# created by `make install' are always world readable, even if the
-+# installer happens to have an overly restrictive umask (e.g. 077).
-+# This was a mistake. There are at least two reasons why we must not
-+# use `-m 0755':
-+# - it causes special bits like SGID to be ignored,
-+# - it may be too restrictive (some setups expect 775 directories).
-+#
-+# Do not use -m 0755 and let people choose whatever they expect by
-+# setting umask.
-+#
-+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-+# Some implementations (such as Solaris 8's) are not thread-safe: if a
-+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-+# concurrently, both version can detect that a/ is missing, but only
-+# one can create it and the other will error out. Consequently we
-+# restrict ourselves to GNU make (using the --version option ensures
-+# this.)
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+ # We used to keeping the `.' as first argument, in order to
-+ # allow $(mkdir_p) to be used without argument. As in
-+ # $(mkdir_p) $(somedir)
-+ # where $(somedir) is conditionally defined. However this is wrong
-+ # for two reasons:
-+ # 1. if the package is installed by a user who cannot write `.'
-+ # make install will fail,
-+ # 2. the above comment should most certainly read
-+ # $(mkdir_p) $(DESTDIR)$(somedir)
-+ # so it does not work when $(somedir) is undefined and
-+ # $(DESTDIR) is not.
-+ # To support the latter case, we have to write
-+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+ # so the `.' trick is pointless.
-+ mkdir_p='mkdir -p --'
-+else
-+ # On NextStep and OpenStep, the `mkdir' command does not
-+ # recognize any option. It will interpret all options as
-+ # directories to create, and then abort because `.' already
-+ # exists.
-+ for d in ./-p ./--version;
-+ do
-+ test -d $d && rmdir $d
-+ done
-+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+ if test -f "$ac_aux_dir/mkinstalldirs"; then
-+ mkdir_p='$(mkinstalldirs)'
-+ else
-+ mkdir_p='$(install_sh) -d'
-+ fi
-+fi
-+AC_SUBST([mkdir_p])])
-+
-+# Helper functions for option handling. -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME. Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+
-+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments. Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+ if test "$[*]" = "X"; then
-+ # -L didn't work.
-+ set X `ls -t $srcdir/configure conftest.file`
-+ fi
-+ rm -f conftest.file
-+ if test "$[*]" != "X $srcdir/configure conftest.file" \
-+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+ # If neither matched, then we have a broken ls. This can happen
-+ # if, for instance, CONFIG_SHELL is bash and it inherits a
-+ # broken ls alias from the environment. This has actually
-+ # happened. Such a system could not be considered "sane".
-+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-+alias in your environment])
-+ fi
-+
-+ test "$[2]" = conftest.file
-+ )
-+then
-+ # Ok.
-+ :
-+else
-+ AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries. This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'. However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+ AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
-+# Check how to create a tarball. -*- Autoconf -*-
-+
-+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+# tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+# $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+ [m4_case([$1], [ustar],, [pax],,
-+ [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+ case $_am_tool in
-+ gnutar)
-+ for _am_tar in tar gnutar gtar;
-+ do
-+ AM_RUN_LOG([$_am_tar --version]) && break
-+ done
-+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+ am__untar="$_am_tar -xf -"
-+ ;;
-+ plaintar)
-+ # Must skip GNU tar: if it does not support --format= it doesn't create
-+ # ustar tarball either.
-+ (tar --version) >/dev/null 2>&1 && continue
-+ am__tar='tar chf - "$$tardir"'
-+ am__tar_='tar chf - "$tardir"'
-+ am__untar='tar xf -'
-+ ;;
-+ pax)
-+ am__tar='pax -L -x $1 -w "$$tardir"'
-+ am__tar_='pax -L -x $1 -w "$tardir"'
-+ am__untar='pax -r'
-+ ;;
-+ cpio)
-+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+ am__untar='cpio -i -H $1 -d'
-+ ;;
-+ none)
-+ am__tar=false
-+ am__tar_=false
-+ am__untar=false
-+ ;;
-+ esac
-+
-+ # If the value was cached, stop now. We just wanted to have am__tar
-+ # and am__untar set.
-+ test -n "${am_cv_prog_tar_$1}" && break
-+
-+ # tar/untar a dummy directory, and stop if the command works
-+ rm -rf conftest.dir
-+ mkdir conftest.dir
-+ echo GrepMe > conftest.dir/file
-+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+ rm -rf conftest.dir
-+ if test -s conftest.tar; then
-+ AM_RUN_LOG([$am__untar <conftest.tar])
-+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+ fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
-diff -Nru php-5.2.4.vanilla/libevent/autogen.sh php-5.2.4.fpm/libevent/autogen.sh
---- php-5.2.4.vanilla/libevent/autogen.sh 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/autogen.sh 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,10 @@
-+#!/bin/sh
-+LIBTOOLIZE=libtoolize
-+if [ "$(uname)" == "Darwin" ] ; then
-+ LIBTOOLIZE=glibtoolize
-+fi
-+aclocal && \
-+ autoheader && \
-+ $LIBTOOLIZE --copy --force && \
-+ autoconf && \
-+ automake --add-missing --copy
-diff -Nru php-5.2.4.vanilla/libevent/buffer.c php-5.2.4.fpm/libevent/buffer.c
---- php-5.2.4.vanilla/libevent/buffer.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/buffer.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,460 @@
-+/*
-+ * Copyright (c) 2002, 2003 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#ifdef HAVE_VASPRINTF
-+/* If we have vasprintf, we need to define this before we include stdio.h. */
-+#define _GNU_SOURCE
-+#endif
-+
-+#include <sys/types.h>
-+
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
-+
-+#ifdef HAVE_SYS_IOCTL_H
-+#include <sys/ioctl.h>
-+#endif
-+
-+#include <assert.h>
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#ifdef HAVE_STDARG_H
-+#include <stdarg.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "event.h"
-+
-+struct evbuffer *
-+evbuffer_new(void)
-+{
-+ struct evbuffer *buffer;
-+
-+ buffer = calloc(1, sizeof(struct evbuffer));
-+
-+ return (buffer);
-+}
-+
-+void
-+evbuffer_free(struct evbuffer *buffer)
-+{
-+ if (buffer->orig_buffer != NULL)
-+ free(buffer->orig_buffer);
-+ free(buffer);
-+}
-+
-+/*
-+ * This is a destructive add. The data from one buffer moves into
-+ * the other buffer.
-+ */
-+
-+#define SWAP(x,y) do { \
-+ (x)->buffer = (y)->buffer; \
-+ (x)->orig_buffer = (y)->orig_buffer; \
-+ (x)->misalign = (y)->misalign; \
-+ (x)->totallen = (y)->totallen; \
-+ (x)->off = (y)->off; \
-+} while (0)
-+
-+int
-+evbuffer_add_buffer(struct evbuffer *outbuf, struct evbuffer *inbuf)
-+{
-+ int res;
-+
-+ /* Short cut for better performance */
-+ if (outbuf->off == 0) {
-+ struct evbuffer tmp;
-+ size_t oldoff = inbuf->off;
-+
-+ /* Swap them directly */
-+ SWAP(&tmp, outbuf);
-+ SWAP(outbuf, inbuf);
-+ SWAP(inbuf, &tmp);
-+
-+ /*
-+ * Optimization comes with a price; we need to notify the
-+ * buffer if necessary of the changes. oldoff is the amount
-+ * of data that we tranfered from inbuf to outbuf
-+ */
-+ if (inbuf->off != oldoff && inbuf->cb != NULL)
-+ (*inbuf->cb)(inbuf, oldoff, inbuf->off, inbuf->cbarg);
-+ if (oldoff && outbuf->cb != NULL)
-+ (*outbuf->cb)(outbuf, 0, oldoff, outbuf->cbarg);
-+
-+ return (0);
-+ }
-+
-+ res = evbuffer_add(outbuf, inbuf->buffer, inbuf->off);
-+ if (res == 0) {
-+ /* We drain the input buffer on success */
-+ evbuffer_drain(inbuf, inbuf->off);
-+ }
-+
-+ return (res);
-+}
-+
-+int
-+evbuffer_add_vprintf(struct evbuffer *buf, const char *fmt, va_list ap)
-+{
-+ char *buffer;
-+ size_t space;
-+ size_t oldoff = buf->off;
-+ int sz;
-+ va_list aq;
-+
-+ /* make sure that at least some space is available */
-+ evbuffer_expand(buf, 64);
-+ for (;;) {
-+ size_t used = buf->misalign + buf->off;
-+ buffer = (char *)buf->buffer + buf->off;
-+ assert(buf->totallen >= used);
-+ space = buf->totallen - used;
-+
-+#ifndef va_copy
-+#define va_copy(dst, src) memcpy(&(dst), &(src), sizeof(va_list))
-+#endif
-+ va_copy(aq, ap);
-+
-+#ifdef WIN32
-+ sz = vsnprintf(buffer, space - 1, fmt, aq);
-+ buffer[space - 1] = '\0';
-+#else
-+ sz = vsnprintf(buffer, space, fmt, aq);
-+#endif
-+
-+ va_end(aq);
-+
-+ if (sz < 0)
-+ return (-1);
-+ if (sz < space) {
-+ buf->off += sz;
-+ if (buf->cb != NULL)
-+ (*buf->cb)(buf, oldoff, buf->off, buf->cbarg);
-+ return (sz);
-+ }
-+ if (evbuffer_expand(buf, sz + 1) == -1)
-+ return (-1);
-+
-+ }
-+ /* NOTREACHED */
-+}
-+
-+int
-+evbuffer_add_printf(struct evbuffer *buf, const char *fmt, ...)
-+{
-+ int res = -1;
-+ va_list ap;
-+
-+ va_start(ap, fmt);
-+ res = evbuffer_add_vprintf(buf, fmt, ap);
-+ va_end(ap);
-+
-+ return (res);
-+}
-+
-+/* Reads data from an event buffer and drains the bytes read */
-+
-+int
-+evbuffer_remove(struct evbuffer *buf, void *data, size_t datlen)
-+{
-+ size_t nread = datlen;
-+ if (nread >= buf->off)
-+ nread = buf->off;
-+
-+ memcpy(data, buf->buffer, nread);
-+ evbuffer_drain(buf, nread);
-+
-+ return (nread);
-+}
-+
-+/*
-+ * Reads a line terminated by either '\r\n', '\n\r' or '\r' or '\n'.
-+ * The returned buffer needs to be freed by the called.
-+ */
-+
-+char *
-+evbuffer_readline(struct evbuffer *buffer)
-+{
-+ u_char *data = EVBUFFER_DATA(buffer);
-+ size_t len = EVBUFFER_LENGTH(buffer);
-+ char *line;
-+ unsigned int i;
-+
-+ for (i = 0; i < len; i++) {
-+ if (data[i] == '\r' || data[i] == '\n')
-+ break;
-+ }
-+
-+ if (i == len)
-+ return (NULL);
-+
-+ if ((line = malloc(i + 1)) == NULL) {
-+ fprintf(stderr, "%s: out of memory\n", __func__);
-+ evbuffer_drain(buffer, i);
-+ return (NULL);
-+ }
-+
-+ memcpy(line, data, i);
-+ line[i] = '\0';
-+
-+ /*
-+ * Some protocols terminate a line with '\r\n', so check for
-+ * that, too.
-+ */
-+ if ( i < len - 1 ) {
-+ char fch = data[i], sch = data[i+1];
-+
-+ /* Drain one more character if needed */
-+ if ( (sch == '\r' || sch == '\n') && sch != fch )
-+ i += 1;
-+ }
-+
-+ evbuffer_drain(buffer, i + 1);
-+
-+ return (line);
-+}
-+
-+/* Adds data to an event buffer */
-+
-+static inline void
-+evbuffer_align(struct evbuffer *buf)
-+{
-+ memmove(buf->orig_buffer, buf->buffer, buf->off);
-+ buf->buffer = buf->orig_buffer;
-+ buf->misalign = 0;
-+}
-+
-+/* Expands the available space in the event buffer to at least datlen */
-+
-+int
-+evbuffer_expand(struct evbuffer *buf, size_t datlen)
-+{
-+ size_t need = buf->misalign + buf->off + datlen;
-+
-+ /* If we can fit all the data, then we don't have to do anything */
-+ if (buf->totallen >= need)
-+ return (0);
-+
-+ /*
-+ * If the misalignment fulfills our data needs, we just force an
-+ * alignment to happen. Afterwards, we have enough space.
-+ */
-+ if (buf->misalign >= datlen) {
-+ evbuffer_align(buf);
-+ } else {
-+ void *newbuf;
-+ size_t length = buf->totallen;
-+
-+ if (length < 256)
-+ length = 256;
-+ while (length < need)
-+ length <<= 1;
-+
-+ if (buf->orig_buffer != buf->buffer)
-+ evbuffer_align(buf);
-+ if ((newbuf = realloc(buf->buffer, length)) == NULL)
-+ return (-1);
-+
-+ buf->orig_buffer = buf->buffer = newbuf;
-+ buf->totallen = length;
-+ }
-+
-+ return (0);
-+}
-+
-+int
-+evbuffer_add(struct evbuffer *buf, const void *data, size_t datlen)
-+{
-+ size_t need = buf->misalign + buf->off + datlen;
-+ size_t oldoff = buf->off;
-+
-+ if (buf->totallen < need) {
-+ if (evbuffer_expand(buf, datlen) == -1)
-+ return (-1);
-+ }
-+
-+ memcpy(buf->buffer + buf->off, data, datlen);
-+ buf->off += datlen;
-+
-+ if (datlen && buf->cb != NULL)
-+ (*buf->cb)(buf, oldoff, buf->off, buf->cbarg);
-+
-+ return (0);
-+}
-+
-+void
-+evbuffer_drain(struct evbuffer *buf, size_t len)
-+{
-+ size_t oldoff = buf->off;
-+
-+ if (len >= buf->off) {
-+ buf->off = 0;
-+ buf->buffer = buf->orig_buffer;
-+ buf->misalign = 0;
-+ goto done;
-+ }
-+
-+ buf->buffer += len;
-+ buf->misalign += len;
-+
-+ buf->off -= len;
-+
-+ done:
-+ /* Tell someone about changes in this buffer */
-+ if (buf->off != oldoff && buf->cb != NULL)
-+ (*buf->cb)(buf, oldoff, buf->off, buf->cbarg);
-+
-+}
-+
-+/*
-+ * Reads data from a file descriptor into a buffer.
-+ */
-+
-+#define EVBUFFER_MAX_READ 4096
-+
-+int
-+evbuffer_read(struct evbuffer *buf, int fd, int howmuch)
-+{
-+ u_char *p;
-+ size_t oldoff = buf->off;
-+ int n = EVBUFFER_MAX_READ;
-+#ifdef WIN32
-+ DWORD dwBytesRead;
-+#endif
-+
-+#ifdef FIONREAD
-+ if (ioctl(fd, FIONREAD, &n) == -1 || n == 0) {
-+ n = EVBUFFER_MAX_READ;
-+ } else if (n > EVBUFFER_MAX_READ && n > howmuch) {
-+ /*
-+ * It's possible that a lot of data is available for
-+ * reading. We do not want to exhaust resources
-+ * before the reader has a chance to do something
-+ * about it. If the reader does not tell us how much
-+ * data we should read, we artifically limit it.
-+ */
-+ if (n > buf->totallen << 2)
-+ n = buf->totallen << 2;
-+ if (n < EVBUFFER_MAX_READ)
-+ n = EVBUFFER_MAX_READ;
-+ }
-+#endif
-+ if (howmuch < 0 || howmuch > n)
-+ howmuch = n;
-+
-+ /* If we don't have FIONREAD, we might waste some space here */
-+ if (evbuffer_expand(buf, howmuch) == -1)
-+ return (-1);
-+
-+ /* We can append new data at this point */
-+ p = buf->buffer + buf->off;
-+
-+#ifndef WIN32
-+ n = read(fd, p, howmuch);
-+ if (n == -1)
-+ return (-1);
-+ if (n == 0)
-+ return (0);
-+#else
-+ n = ReadFile((HANDLE)fd, p, howmuch, &dwBytesRead, NULL);
-+ if (n == 0)
-+ return (-1);
-+ if (dwBytesRead == 0)
-+ return (0);
-+ n = dwBytesRead;
-+#endif
-+
-+ buf->off += n;
-+
-+ /* Tell someone about changes in this buffer */
-+ if (buf->off != oldoff && buf->cb != NULL)
-+ (*buf->cb)(buf, oldoff, buf->off, buf->cbarg);
-+
-+ return (n);
-+}
-+
-+int
-+evbuffer_write(struct evbuffer *buffer, int fd)
-+{
-+ int n;
-+#ifdef WIN32
-+ DWORD dwBytesWritten;
-+#endif
-+
-+#ifndef WIN32
-+ n = write(fd, buffer->buffer, buffer->off);
-+ if (n == -1)
-+ return (-1);
-+ if (n == 0)
-+ return (0);
-+#else
-+ n = WriteFile((HANDLE)fd, buffer->buffer, buffer->off, &dwBytesWritten, NULL);
-+ if (n == 0)
-+ return (-1);
-+ if (dwBytesWritten == 0)
-+ return (0);
-+ n = dwBytesWritten;
-+#endif
-+ evbuffer_drain(buffer, n);
-+
-+ return (n);
-+}
-+
-+u_char *
-+evbuffer_find(struct evbuffer *buffer, const u_char *what, size_t len)
-+{
-+ u_char *search = buffer->buffer, *end = search + buffer->off;
-+ u_char *p;
-+
-+ while (search < end &&
-+ (p = memchr(search, *what, end - search)) != NULL) {
-+ if (p + len > end)
-+ break;
-+ if (memcmp(p, what, len) == 0)
-+ return (p);
-+ search = p + 1;
-+ }
-+
-+ return (NULL);
-+}
-+
-+void evbuffer_setcb(struct evbuffer *buffer,
-+ void (*cb)(struct evbuffer *, size_t, size_t, void *),
-+ void *cbarg)
-+{
-+ buffer->cb = cb;
-+ buffer->cbarg = cbarg;
-+}
-diff -Nru php-5.2.4.vanilla/libevent/compat/sys/queue.h php-5.2.4.fpm/libevent/compat/sys/queue.h
---- php-5.2.4.vanilla/libevent/compat/sys/queue.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/compat/sys/queue.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,488 @@
-+/* $OpenBSD: queue.h,v 1.16 2000/09/07 19:47:59 art Exp $ */
-+/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */
-+
-+/*
-+ * Copyright (c) 1991, 1993
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ * @(#)queue.h 8.5 (Berkeley) 8/20/94
-+ */
-+
-+#ifndef _SYS_QUEUE_H_
-+#define _SYS_QUEUE_H_
-+
-+/*
-+ * This file defines five types of data structures: singly-linked lists,
-+ * lists, simple queues, tail queues, and circular queues.
-+ *
-+ *
-+ * A singly-linked list is headed by a single forward pointer. The elements
-+ * are singly linked for minimum space and pointer manipulation overhead at
-+ * the expense of O(n) removal for arbitrary elements. New elements can be
-+ * added to the list after an existing element or at the head of the list.
-+ * Elements being removed from the head of the list should use the explicit
-+ * macro for this purpose for optimum efficiency. A singly-linked list may
-+ * only be traversed in the forward direction. Singly-linked lists are ideal
-+ * for applications with large datasets and few or no removals or for
-+ * implementing a LIFO queue.
-+ *
-+ * A list is headed by a single forward pointer (or an array of forward
-+ * pointers for a hash table header). The elements are doubly linked
-+ * so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before
-+ * or after an existing element or at the head of the list. A list
-+ * may only be traversed in the forward direction.
-+ *
-+ * A simple queue is headed by a pair of pointers, one the head of the
-+ * list and the other to the tail of the list. The elements are singly
-+ * linked to save space, so elements can only be removed from the
-+ * head of the list. New elements can be added to the list before or after
-+ * an existing element, at the head of the list, or at the end of the
-+ * list. A simple queue may only be traversed in the forward direction.
-+ *
-+ * A tail queue is headed by a pair of pointers, one to the head of the
-+ * list and the other to the tail of the list. The elements are doubly
-+ * linked so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before or
-+ * after an existing element, at the head of the list, or at the end of
-+ * the list. A tail queue may be traversed in either direction.
-+ *
-+ * A circle queue is headed by a pair of pointers, one to the head of the
-+ * list and the other to the tail of the list. The elements are doubly
-+ * linked so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before or after
-+ * an existing element, at the head of the list, or at the end of the list.
-+ * A circle queue may be traversed in either direction, but has a more
-+ * complex end of list detection.
-+ *
-+ * For details on the use of these macros, see the queue(3) manual page.
-+ */
-+
-+/*
-+ * Singly-linked List definitions.
-+ */
-+#define SLIST_HEAD(name, type) \
-+struct name { \
-+ struct type *slh_first; /* first element */ \
-+}
-+
-+#define SLIST_HEAD_INITIALIZER(head) \
-+ { NULL }
-+
-+#ifndef WIN32
-+#define SLIST_ENTRY(type) \
-+struct { \
-+ struct type *sle_next; /* next element */ \
-+}
-+#endif
-+
-+/*
-+ * Singly-linked List access methods.
-+ */
-+#define SLIST_FIRST(head) ((head)->slh_first)
-+#define SLIST_END(head) NULL
-+#define SLIST_EMPTY(head) (SLIST_FIRST(head) == SLIST_END(head))
-+#define SLIST_NEXT(elm, field) ((elm)->field.sle_next)
-+
-+#define SLIST_FOREACH(var, head, field) \
-+ for((var) = SLIST_FIRST(head); \
-+ (var) != SLIST_END(head); \
-+ (var) = SLIST_NEXT(var, field))
-+
-+/*
-+ * Singly-linked List functions.
-+ */
-+#define SLIST_INIT(head) { \
-+ SLIST_FIRST(head) = SLIST_END(head); \
-+}
-+
-+#define SLIST_INSERT_AFTER(slistelm, elm, field) do { \
-+ (elm)->field.sle_next = (slistelm)->field.sle_next; \
-+ (slistelm)->field.sle_next = (elm); \
-+} while (0)
-+
-+#define SLIST_INSERT_HEAD(head, elm, field) do { \
-+ (elm)->field.sle_next = (head)->slh_first; \
-+ (head)->slh_first = (elm); \
-+} while (0)
-+
-+#define SLIST_REMOVE_HEAD(head, field) do { \
-+ (head)->slh_first = (head)->slh_first->field.sle_next; \
-+} while (0)
-+
-+/*
-+ * List definitions.
-+ */
-+#define LIST_HEAD(name, type) \
-+struct name { \
-+ struct type *lh_first; /* first element */ \
-+}
-+
-+#define LIST_HEAD_INITIALIZER(head) \
-+ { NULL }
-+
-+#define LIST_ENTRY(type) \
-+struct { \
-+ struct type *le_next; /* next element */ \
-+ struct type **le_prev; /* address of previous next element */ \
-+}
-+
-+/*
-+ * List access methods
-+ */
-+#define LIST_FIRST(head) ((head)->lh_first)
-+#define LIST_END(head) NULL
-+#define LIST_EMPTY(head) (LIST_FIRST(head) == LIST_END(head))
-+#define LIST_NEXT(elm, field) ((elm)->field.le_next)
-+
-+#define LIST_FOREACH(var, head, field) \
-+ for((var) = LIST_FIRST(head); \
-+ (var)!= LIST_END(head); \
-+ (var) = LIST_NEXT(var, field))
-+
-+/*
-+ * List functions.
-+ */
-+#define LIST_INIT(head) do { \
-+ LIST_FIRST(head) = LIST_END(head); \
-+} while (0)
-+
-+#define LIST_INSERT_AFTER(listelm, elm, field) do { \
-+ if (((elm)->field.le_next = (listelm)->field.le_next) != NULL) \
-+ (listelm)->field.le_next->field.le_prev = \
-+ &(elm)->field.le_next; \
-+ (listelm)->field.le_next = (elm); \
-+ (elm)->field.le_prev = &(listelm)->field.le_next; \
-+} while (0)
-+
-+#define LIST_INSERT_BEFORE(listelm, elm, field) do { \
-+ (elm)->field.le_prev = (listelm)->field.le_prev; \
-+ (elm)->field.le_next = (listelm); \
-+ *(listelm)->field.le_prev = (elm); \
-+ (listelm)->field.le_prev = &(elm)->field.le_next; \
-+} while (0)
-+
-+#define LIST_INSERT_HEAD(head, elm, field) do { \
-+ if (((elm)->field.le_next = (head)->lh_first) != NULL) \
-+ (head)->lh_first->field.le_prev = &(elm)->field.le_next;\
-+ (head)->lh_first = (elm); \
-+ (elm)->field.le_prev = &(head)->lh_first; \
-+} while (0)
-+
-+#define LIST_REMOVE(elm, field) do { \
-+ if ((elm)->field.le_next != NULL) \
-+ (elm)->field.le_next->field.le_prev = \
-+ (elm)->field.le_prev; \
-+ *(elm)->field.le_prev = (elm)->field.le_next; \
-+} while (0)
-+
-+#define LIST_REPLACE(elm, elm2, field) do { \
-+ if (((elm2)->field.le_next = (elm)->field.le_next) != NULL) \
-+ (elm2)->field.le_next->field.le_prev = \
-+ &(elm2)->field.le_next; \
-+ (elm2)->field.le_prev = (elm)->field.le_prev; \
-+ *(elm2)->field.le_prev = (elm2); \
-+} while (0)
-+
-+/*
-+ * Simple queue definitions.
-+ */
-+#define SIMPLEQ_HEAD(name, type) \
-+struct name { \
-+ struct type *sqh_first; /* first element */ \
-+ struct type **sqh_last; /* addr of last next element */ \
-+}
-+
-+#define SIMPLEQ_HEAD_INITIALIZER(head) \
-+ { NULL, &(head).sqh_first }
-+
-+#define SIMPLEQ_ENTRY(type) \
-+struct { \
-+ struct type *sqe_next; /* next element */ \
-+}
-+
-+/*
-+ * Simple queue access methods.
-+ */
-+#define SIMPLEQ_FIRST(head) ((head)->sqh_first)
-+#define SIMPLEQ_END(head) NULL
-+#define SIMPLEQ_EMPTY(head) (SIMPLEQ_FIRST(head) == SIMPLEQ_END(head))
-+#define SIMPLEQ_NEXT(elm, field) ((elm)->field.sqe_next)
-+
-+#define SIMPLEQ_FOREACH(var, head, field) \
-+ for((var) = SIMPLEQ_FIRST(head); \
-+ (var) != SIMPLEQ_END(head); \
-+ (var) = SIMPLEQ_NEXT(var, field))
-+
-+/*
-+ * Simple queue functions.
-+ */
-+#define SIMPLEQ_INIT(head) do { \
-+ (head)->sqh_first = NULL; \
-+ (head)->sqh_last = &(head)->sqh_first; \
-+} while (0)
-+
-+#define SIMPLEQ_INSERT_HEAD(head, elm, field) do { \
-+ if (((elm)->field.sqe_next = (head)->sqh_first) == NULL) \
-+ (head)->sqh_last = &(elm)->field.sqe_next; \
-+ (head)->sqh_first = (elm); \
-+} while (0)
-+
-+#define SIMPLEQ_INSERT_TAIL(head, elm, field) do { \
-+ (elm)->field.sqe_next = NULL; \
-+ *(head)->sqh_last = (elm); \
-+ (head)->sqh_last = &(elm)->field.sqe_next; \
-+} while (0)
-+
-+#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do { \
-+ if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
-+ (head)->sqh_last = &(elm)->field.sqe_next; \
-+ (listelm)->field.sqe_next = (elm); \
-+} while (0)
-+
-+#define SIMPLEQ_REMOVE_HEAD(head, elm, field) do { \
-+ if (((head)->sqh_first = (elm)->field.sqe_next) == NULL) \
-+ (head)->sqh_last = &(head)->sqh_first; \
-+} while (0)
-+
-+/*
-+ * Tail queue definitions.
-+ */
-+#define TAILQ_HEAD(name, type) \
-+struct name { \
-+ struct type *tqh_first; /* first element */ \
-+ struct type **tqh_last; /* addr of last next element */ \
-+}
-+
-+#define TAILQ_HEAD_INITIALIZER(head) \
-+ { NULL, &(head).tqh_first }
-+
-+#define TAILQ_ENTRY(type) \
-+struct { \
-+ struct type *tqe_next; /* next element */ \
-+ struct type **tqe_prev; /* address of previous next element */ \
-+}
-+
-+/*
-+ * tail queue access methods
-+ */
-+#define TAILQ_FIRST(head) ((head)->tqh_first)
-+#define TAILQ_END(head) NULL
-+#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-+#define TAILQ_LAST(head, headname) \
-+ (*(((struct headname *)((head)->tqh_last))->tqh_last))
-+/* XXX */
-+#define TAILQ_PREV(elm, headname, field) \
-+ (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-+#define TAILQ_EMPTY(head) \
-+ (TAILQ_FIRST(head) == TAILQ_END(head))
-+
-+#define TAILQ_FOREACH(var, head, field) \
-+ for((var) = TAILQ_FIRST(head); \
-+ (var) != TAILQ_END(head); \
-+ (var) = TAILQ_NEXT(var, field))
-+
-+#define TAILQ_FOREACH_REVERSE(var, head, field, headname) \
-+ for((var) = TAILQ_LAST(head, headname); \
-+ (var) != TAILQ_END(head); \
-+ (var) = TAILQ_PREV(var, headname, field))
-+
-+/*
-+ * Tail queue functions.
-+ */
-+#define TAILQ_INIT(head) do { \
-+ (head)->tqh_first = NULL; \
-+ (head)->tqh_last = &(head)->tqh_first; \
-+} while (0)
-+
-+#define TAILQ_INSERT_HEAD(head, elm, field) do { \
-+ if (((elm)->field.tqe_next = (head)->tqh_first) != NULL) \
-+ (head)->tqh_first->field.tqe_prev = \
-+ &(elm)->field.tqe_next; \
-+ else \
-+ (head)->tqh_last = &(elm)->field.tqe_next; \
-+ (head)->tqh_first = (elm); \
-+ (elm)->field.tqe_prev = &(head)->tqh_first; \
-+} while (0)
-+
-+#define TAILQ_INSERT_TAIL(head, elm, field) do { \
-+ (elm)->field.tqe_next = NULL; \
-+ (elm)->field.tqe_prev = (head)->tqh_last; \
-+ *(head)->tqh_last = (elm); \
-+ (head)->tqh_last = &(elm)->field.tqe_next; \
-+} while (0)
-+
-+#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \
-+ if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
-+ (elm)->field.tqe_next->field.tqe_prev = \
-+ &(elm)->field.tqe_next; \
-+ else \
-+ (head)->tqh_last = &(elm)->field.tqe_next; \
-+ (listelm)->field.tqe_next = (elm); \
-+ (elm)->field.tqe_prev = &(listelm)->field.tqe_next; \
-+} while (0)
-+
-+#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \
-+ (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \
-+ (elm)->field.tqe_next = (listelm); \
-+ *(listelm)->field.tqe_prev = (elm); \
-+ (listelm)->field.tqe_prev = &(elm)->field.tqe_next; \
-+} while (0)
-+
-+#define TAILQ_REMOVE(head, elm, field) do { \
-+ if (((elm)->field.tqe_next) != NULL) \
-+ (elm)->field.tqe_next->field.tqe_prev = \
-+ (elm)->field.tqe_prev; \
-+ else \
-+ (head)->tqh_last = (elm)->field.tqe_prev; \
-+ *(elm)->field.tqe_prev = (elm)->field.tqe_next; \
-+} while (0)
-+
-+#define TAILQ_REPLACE(head, elm, elm2, field) do { \
-+ if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != NULL) \
-+ (elm2)->field.tqe_next->field.tqe_prev = \
-+ &(elm2)->field.tqe_next; \
-+ else \
-+ (head)->tqh_last = &(elm2)->field.tqe_next; \
-+ (elm2)->field.tqe_prev = (elm)->field.tqe_prev; \
-+ *(elm2)->field.tqe_prev = (elm2); \
-+} while (0)
-+
-+/*
-+ * Circular queue definitions.
-+ */
-+#define CIRCLEQ_HEAD(name, type) \
-+struct name { \
-+ struct type *cqh_first; /* first element */ \
-+ struct type *cqh_last; /* last element */ \
-+}
-+
-+#define CIRCLEQ_HEAD_INITIALIZER(head) \
-+ { CIRCLEQ_END(&head), CIRCLEQ_END(&head) }
-+
-+#define CIRCLEQ_ENTRY(type) \
-+struct { \
-+ struct type *cqe_next; /* next element */ \
-+ struct type *cqe_prev; /* previous element */ \
-+}
-+
-+/*
-+ * Circular queue access methods
-+ */
-+#define CIRCLEQ_FIRST(head) ((head)->cqh_first)
-+#define CIRCLEQ_LAST(head) ((head)->cqh_last)
-+#define CIRCLEQ_END(head) ((void *)(head))
-+#define CIRCLEQ_NEXT(elm, field) ((elm)->field.cqe_next)
-+#define CIRCLEQ_PREV(elm, field) ((elm)->field.cqe_prev)
-+#define CIRCLEQ_EMPTY(head) \
-+ (CIRCLEQ_FIRST(head) == CIRCLEQ_END(head))
-+
-+#define CIRCLEQ_FOREACH(var, head, field) \
-+ for((var) = CIRCLEQ_FIRST(head); \
-+ (var) != CIRCLEQ_END(head); \
-+ (var) = CIRCLEQ_NEXT(var, field))
-+
-+#define CIRCLEQ_FOREACH_REVERSE(var, head, field) \
-+ for((var) = CIRCLEQ_LAST(head); \
-+ (var) != CIRCLEQ_END(head); \
-+ (var) = CIRCLEQ_PREV(var, field))
-+
-+/*
-+ * Circular queue functions.
-+ */
-+#define CIRCLEQ_INIT(head) do { \
-+ (head)->cqh_first = CIRCLEQ_END(head); \
-+ (head)->cqh_last = CIRCLEQ_END(head); \
-+} while (0)
-+
-+#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do { \
-+ (elm)->field.cqe_next = (listelm)->field.cqe_next; \
-+ (elm)->field.cqe_prev = (listelm); \
-+ if ((listelm)->field.cqe_next == CIRCLEQ_END(head)) \
-+ (head)->cqh_last = (elm); \
-+ else \
-+ (listelm)->field.cqe_next->field.cqe_prev = (elm); \
-+ (listelm)->field.cqe_next = (elm); \
-+} while (0)
-+
-+#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do { \
-+ (elm)->field.cqe_next = (listelm); \
-+ (elm)->field.cqe_prev = (listelm)->field.cqe_prev; \
-+ if ((listelm)->field.cqe_prev == CIRCLEQ_END(head)) \
-+ (head)->cqh_first = (elm); \
-+ else \
-+ (listelm)->field.cqe_prev->field.cqe_next = (elm); \
-+ (listelm)->field.cqe_prev = (elm); \
-+} while (0)
-+
-+#define CIRCLEQ_INSERT_HEAD(head, elm, field) do { \
-+ (elm)->field.cqe_next = (head)->cqh_first; \
-+ (elm)->field.cqe_prev = CIRCLEQ_END(head); \
-+ if ((head)->cqh_last == CIRCLEQ_END(head)) \
-+ (head)->cqh_last = (elm); \
-+ else \
-+ (head)->cqh_first->field.cqe_prev = (elm); \
-+ (head)->cqh_first = (elm); \
-+} while (0)
-+
-+#define CIRCLEQ_INSERT_TAIL(head, elm, field) do { \
-+ (elm)->field.cqe_next = CIRCLEQ_END(head); \
-+ (elm)->field.cqe_prev = (head)->cqh_last; \
-+ if ((head)->cqh_first == CIRCLEQ_END(head)) \
-+ (head)->cqh_first = (elm); \
-+ else \
-+ (head)->cqh_last->field.cqe_next = (elm); \
-+ (head)->cqh_last = (elm); \
-+} while (0)
-+
-+#define CIRCLEQ_REMOVE(head, elm, field) do { \
-+ if ((elm)->field.cqe_next == CIRCLEQ_END(head)) \
-+ (head)->cqh_last = (elm)->field.cqe_prev; \
-+ else \
-+ (elm)->field.cqe_next->field.cqe_prev = \
-+ (elm)->field.cqe_prev; \
-+ if ((elm)->field.cqe_prev == CIRCLEQ_END(head)) \
-+ (head)->cqh_first = (elm)->field.cqe_next; \
-+ else \
-+ (elm)->field.cqe_prev->field.cqe_next = \
-+ (elm)->field.cqe_next; \
-+} while (0)
-+
-+#define CIRCLEQ_REPLACE(head, elm, elm2, field) do { \
-+ if (((elm2)->field.cqe_next = (elm)->field.cqe_next) == \
-+ CIRCLEQ_END(head)) \
-+ (head).cqh_last = (elm2); \
-+ else \
-+ (elm2)->field.cqe_next->field.cqe_prev = (elm2); \
-+ if (((elm2)->field.cqe_prev = (elm)->field.cqe_prev) == \
-+ CIRCLEQ_END(head)) \
-+ (head).cqh_first = (elm2); \
-+ else \
-+ (elm2)->field.cqe_prev->field.cqe_next = (elm2); \
-+} while (0)
-+
-+#endif /* !_SYS_QUEUE_H_ */
-diff -Nru php-5.2.4.vanilla/libevent/compat/sys/_time.h php-5.2.4.fpm/libevent/compat/sys/_time.h
---- php-5.2.4.vanilla/libevent/compat/sys/_time.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/compat/sys/_time.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,163 @@
-+/* $OpenBSD: time.h,v 1.11 2000/10/10 13:36:48 itojun Exp $ */
-+/* $NetBSD: time.h,v 1.18 1996/04/23 10:29:33 mycroft Exp $ */
-+
-+/*
-+ * Copyright (c) 1982, 1986, 1993
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ * @(#)time.h 8.2 (Berkeley) 7/10/94
-+ */
-+
-+#ifndef _SYS_TIME_H_
-+#define _SYS_TIME_H_
-+
-+#include <sys/types.h>
-+
-+/*
-+ * Structure returned by gettimeofday(2) system call,
-+ * and used in other calls.
-+ */
-+struct timeval {
-+ long tv_sec; /* seconds */
-+ long tv_usec; /* and microseconds */
-+};
-+
-+/*
-+ * Structure defined by POSIX.1b to be like a timeval.
-+ */
-+struct timespec {
-+ time_t tv_sec; /* seconds */
-+ long tv_nsec; /* and nanoseconds */
-+};
-+
-+#define TIMEVAL_TO_TIMESPEC(tv, ts) { \
-+ (ts)->tv_sec = (tv)->tv_sec; \
-+ (ts)->tv_nsec = (tv)->tv_usec * 1000; \
-+}
-+#define TIMESPEC_TO_TIMEVAL(tv, ts) { \
-+ (tv)->tv_sec = (ts)->tv_sec; \
-+ (tv)->tv_usec = (ts)->tv_nsec / 1000; \
-+}
-+
-+struct timezone {
-+ int tz_minuteswest; /* minutes west of Greenwich */
-+ int tz_dsttime; /* type of dst correction */
-+};
-+#define DST_NONE 0 /* not on dst */
-+#define DST_USA 1 /* USA style dst */
-+#define DST_AUST 2 /* Australian style dst */
-+#define DST_WET 3 /* Western European dst */
-+#define DST_MET 4 /* Middle European dst */
-+#define DST_EET 5 /* Eastern European dst */
-+#define DST_CAN 6 /* Canada */
-+
-+/* Operations on timevals. */
-+#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0
-+#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
-+#define timercmp(tvp, uvp, cmp) \
-+ (((tvp)->tv_sec == (uvp)->tv_sec) ? \
-+ ((tvp)->tv_usec cmp (uvp)->tv_usec) : \
-+ ((tvp)->tv_sec cmp (uvp)->tv_sec))
-+#define timeradd(tvp, uvp, vvp) \
-+ do { \
-+ (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
-+ (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \
-+ if ((vvp)->tv_usec >= 1000000) { \
-+ (vvp)->tv_sec++; \
-+ (vvp)->tv_usec -= 1000000; \
-+ } \
-+ } while (0)
-+#define timersub(tvp, uvp, vvp) \
-+ do { \
-+ (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
-+ (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
-+ if ((vvp)->tv_usec < 0) { \
-+ (vvp)->tv_sec--; \
-+ (vvp)->tv_usec += 1000000; \
-+ } \
-+ } while (0)
-+
-+/* Operations on timespecs. */
-+#define timespecclear(tsp) (tsp)->tv_sec = (tsp)->tv_nsec = 0
-+#define timespecisset(tsp) ((tsp)->tv_sec || (tsp)->tv_nsec)
-+#define timespeccmp(tsp, usp, cmp) \
-+ (((tsp)->tv_sec == (usp)->tv_sec) ? \
-+ ((tsp)->tv_nsec cmp (usp)->tv_nsec) : \
-+ ((tsp)->tv_sec cmp (usp)->tv_sec))
-+#define timespecadd(tsp, usp, vsp) \
-+ do { \
-+ (vsp)->tv_sec = (tsp)->tv_sec + (usp)->tv_sec; \
-+ (vsp)->tv_nsec = (tsp)->tv_nsec + (usp)->tv_nsec; \
-+ if ((vsp)->tv_nsec >= 1000000000L) { \
-+ (vsp)->tv_sec++; \
-+ (vsp)->tv_nsec -= 1000000000L; \
-+ } \
-+ } while (0)
-+#define timespecsub(tsp, usp, vsp) \
-+ do { \
-+ (vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec; \
-+ (vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec; \
-+ if ((vsp)->tv_nsec < 0) { \
-+ (vsp)->tv_sec--; \
-+ (vsp)->tv_nsec += 1000000000L; \
-+ } \
-+ } while (0)
-+
-+/*
-+ * Names of the interval timers, and structure
-+ * defining a timer setting.
-+ */
-+#define ITIMER_REAL 0
-+#define ITIMER_VIRTUAL 1
-+#define ITIMER_PROF 2
-+
-+struct itimerval {
-+ struct timeval it_interval; /* timer interval */
-+ struct timeval it_value; /* current value */
-+};
-+
-+/*
-+ * Getkerninfo clock information structure
-+ */
-+struct clockinfo {
-+ int hz; /* clock frequency */
-+ int tick; /* micro-seconds per hz tick */
-+ int tickadj; /* clock skew rate for adjtime() */
-+ int stathz; /* statistics clock frequency */
-+ int profhz; /* profiling clock frequency */
-+};
-+
-+#define CLOCK_REALTIME 0
-+#define CLOCK_VIRTUAL 1
-+#define CLOCK_PROF 2
-+
-+#define TIMER_RELTIME 0x0 /* relative timer */
-+#define TIMER_ABSTIME 0x1 /* absolute timer */
-+
-+/* --- stuff got cut here - niels --- */
-+
-+#endif /* !_SYS_TIME_H_ */
-diff -Nru php-5.2.4.vanilla/libevent/compat/sys/tree.h php-5.2.4.fpm/libevent/compat/sys/tree.h
---- php-5.2.4.vanilla/libevent/compat/sys/tree.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/compat/sys/tree.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,677 @@
-+/* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */
-+/*
-+ * Copyright 2002 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifndef _SYS_TREE_H_
-+#define _SYS_TREE_H_
-+
-+/*
-+ * This file defines data structures for different types of trees:
-+ * splay trees and red-black trees.
-+ *
-+ * A splay tree is a self-organizing data structure. Every operation
-+ * on the tree causes a splay to happen. The splay moves the requested
-+ * node to the root of the tree and partly rebalances it.
-+ *
-+ * This has the benefit that request locality causes faster lookups as
-+ * the requested nodes move to the top of the tree. On the other hand,
-+ * every lookup causes memory writes.
-+ *
-+ * The Balance Theorem bounds the total access time for m operations
-+ * and n inserts on an initially empty tree as O((m + n)lg n). The
-+ * amortized cost for a sequence of m accesses to a splay tree is O(lg n);
-+ *
-+ * A red-black tree is a binary search tree with the node color as an
-+ * extra attribute. It fulfills a set of conditions:
-+ * - every search path from the root to a leaf consists of the
-+ * same number of black nodes,
-+ * - each red node (except for the root) has a black parent,
-+ * - each leaf node is black.
-+ *
-+ * Every operation on a red-black tree is bounded as O(lg n).
-+ * The maximum height of a red-black tree is 2lg (n+1).
-+ */
-+
-+#define SPLAY_HEAD(name, type) \
-+struct name { \
-+ struct type *sph_root; /* root of the tree */ \
-+}
-+
-+#define SPLAY_INITIALIZER(root) \
-+ { NULL }
-+
-+#define SPLAY_INIT(root) do { \
-+ (root)->sph_root = NULL; \
-+} while (0)
-+
-+#define SPLAY_ENTRY(type) \
-+struct { \
-+ struct type *spe_left; /* left element */ \
-+ struct type *spe_right; /* right element */ \
-+}
-+
-+#define SPLAY_LEFT(elm, field) (elm)->field.spe_left
-+#define SPLAY_RIGHT(elm, field) (elm)->field.spe_right
-+#define SPLAY_ROOT(head) (head)->sph_root
-+#define SPLAY_EMPTY(head) (SPLAY_ROOT(head) == NULL)
-+
-+/* SPLAY_ROTATE_{LEFT,RIGHT} expect that tmp hold SPLAY_{RIGHT,LEFT} */
-+#define SPLAY_ROTATE_RIGHT(head, tmp, field) do { \
-+ SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field); \
-+ SPLAY_RIGHT(tmp, field) = (head)->sph_root; \
-+ (head)->sph_root = tmp; \
-+} while (0)
-+
-+#define SPLAY_ROTATE_LEFT(head, tmp, field) do { \
-+ SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field); \
-+ SPLAY_LEFT(tmp, field) = (head)->sph_root; \
-+ (head)->sph_root = tmp; \
-+} while (0)
-+
-+#define SPLAY_LINKLEFT(head, tmp, field) do { \
-+ SPLAY_LEFT(tmp, field) = (head)->sph_root; \
-+ tmp = (head)->sph_root; \
-+ (head)->sph_root = SPLAY_LEFT((head)->sph_root, field); \
-+} while (0)
-+
-+#define SPLAY_LINKRIGHT(head, tmp, field) do { \
-+ SPLAY_RIGHT(tmp, field) = (head)->sph_root; \
-+ tmp = (head)->sph_root; \
-+ (head)->sph_root = SPLAY_RIGHT((head)->sph_root, field); \
-+} while (0)
-+
-+#define SPLAY_ASSEMBLE(head, node, left, right, field) do { \
-+ SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field); \
-+ SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\
-+ SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field); \
-+ SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field); \
-+} while (0)
-+
-+/* Generates prototypes and inline functions */
-+
-+#define SPLAY_PROTOTYPE(name, type, field, cmp) \
-+void name##_SPLAY(struct name *, struct type *); \
-+void name##_SPLAY_MINMAX(struct name *, int); \
-+struct type *name##_SPLAY_INSERT(struct name *, struct type *); \
-+struct type *name##_SPLAY_REMOVE(struct name *, struct type *); \
-+ \
-+/* Finds the node with the same key as elm */ \
-+static __inline struct type * \
-+name##_SPLAY_FIND(struct name *head, struct type *elm) \
-+{ \
-+ if (SPLAY_EMPTY(head)) \
-+ return(NULL); \
-+ name##_SPLAY(head, elm); \
-+ if ((cmp)(elm, (head)->sph_root) == 0) \
-+ return (head->sph_root); \
-+ return (NULL); \
-+} \
-+ \
-+static __inline struct type * \
-+name##_SPLAY_NEXT(struct name *head, struct type *elm) \
-+{ \
-+ name##_SPLAY(head, elm); \
-+ if (SPLAY_RIGHT(elm, field) != NULL) { \
-+ elm = SPLAY_RIGHT(elm, field); \
-+ while (SPLAY_LEFT(elm, field) != NULL) { \
-+ elm = SPLAY_LEFT(elm, field); \
-+ } \
-+ } else \
-+ elm = NULL; \
-+ return (elm); \
-+} \
-+ \
-+static __inline struct type * \
-+name##_SPLAY_MIN_MAX(struct name *head, int val) \
-+{ \
-+ name##_SPLAY_MINMAX(head, val); \
-+ return (SPLAY_ROOT(head)); \
-+}
-+
-+/* Main splay operation.
-+ * Moves node close to the key of elm to top
-+ */
-+#define SPLAY_GENERATE(name, type, field, cmp) \
-+struct type * \
-+name##_SPLAY_INSERT(struct name *head, struct type *elm) \
-+{ \
-+ if (SPLAY_EMPTY(head)) { \
-+ SPLAY_LEFT(elm, field) = SPLAY_RIGHT(elm, field) = NULL; \
-+ } else { \
-+ int __comp; \
-+ name##_SPLAY(head, elm); \
-+ __comp = (cmp)(elm, (head)->sph_root); \
-+ if(__comp < 0) { \
-+ SPLAY_LEFT(elm, field) = SPLAY_LEFT((head)->sph_root, field);\
-+ SPLAY_RIGHT(elm, field) = (head)->sph_root; \
-+ SPLAY_LEFT((head)->sph_root, field) = NULL; \
-+ } else if (__comp > 0) { \
-+ SPLAY_RIGHT(elm, field) = SPLAY_RIGHT((head)->sph_root, field);\
-+ SPLAY_LEFT(elm, field) = (head)->sph_root; \
-+ SPLAY_RIGHT((head)->sph_root, field) = NULL; \
-+ } else \
-+ return ((head)->sph_root); \
-+ } \
-+ (head)->sph_root = (elm); \
-+ return (NULL); \
-+} \
-+ \
-+struct type * \
-+name##_SPLAY_REMOVE(struct name *head, struct type *elm) \
-+{ \
-+ struct type *__tmp; \
-+ if (SPLAY_EMPTY(head)) \
-+ return (NULL); \
-+ name##_SPLAY(head, elm); \
-+ if ((cmp)(elm, (head)->sph_root) == 0) { \
-+ if (SPLAY_LEFT((head)->sph_root, field) == NULL) { \
-+ (head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);\
-+ } else { \
-+ __tmp = SPLAY_RIGHT((head)->sph_root, field); \
-+ (head)->sph_root = SPLAY_LEFT((head)->sph_root, field);\
-+ name##_SPLAY(head, elm); \
-+ SPLAY_RIGHT((head)->sph_root, field) = __tmp; \
-+ } \
-+ return (elm); \
-+ } \
-+ return (NULL); \
-+} \
-+ \
-+void \
-+name##_SPLAY(struct name *head, struct type *elm) \
-+{ \
-+ struct type __node, *__left, *__right, *__tmp; \
-+ int __comp; \
-+\
-+ SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
-+ __left = __right = &__node; \
-+\
-+ while ((__comp = (cmp)(elm, (head)->sph_root))) { \
-+ if (__comp < 0) { \
-+ __tmp = SPLAY_LEFT((head)->sph_root, field); \
-+ if (__tmp == NULL) \
-+ break; \
-+ if ((cmp)(elm, __tmp) < 0){ \
-+ SPLAY_ROTATE_RIGHT(head, __tmp, field); \
-+ if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
-+ break; \
-+ } \
-+ SPLAY_LINKLEFT(head, __right, field); \
-+ } else if (__comp > 0) { \
-+ __tmp = SPLAY_RIGHT((head)->sph_root, field); \
-+ if (__tmp == NULL) \
-+ break; \
-+ if ((cmp)(elm, __tmp) > 0){ \
-+ SPLAY_ROTATE_LEFT(head, __tmp, field); \
-+ if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
-+ break; \
-+ } \
-+ SPLAY_LINKRIGHT(head, __left, field); \
-+ } \
-+ } \
-+ SPLAY_ASSEMBLE(head, &__node, __left, __right, field); \
-+} \
-+ \
-+/* Splay with either the minimum or the maximum element \
-+ * Used to find minimum or maximum element in tree. \
-+ */ \
-+void name##_SPLAY_MINMAX(struct name *head, int __comp) \
-+{ \
-+ struct type __node, *__left, *__right, *__tmp; \
-+\
-+ SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
-+ __left = __right = &__node; \
-+\
-+ while (1) { \
-+ if (__comp < 0) { \
-+ __tmp = SPLAY_LEFT((head)->sph_root, field); \
-+ if (__tmp == NULL) \
-+ break; \
-+ if (__comp < 0){ \
-+ SPLAY_ROTATE_RIGHT(head, __tmp, field); \
-+ if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
-+ break; \
-+ } \
-+ SPLAY_LINKLEFT(head, __right, field); \
-+ } else if (__comp > 0) { \
-+ __tmp = SPLAY_RIGHT((head)->sph_root, field); \
-+ if (__tmp == NULL) \
-+ break; \
-+ if (__comp > 0) { \
-+ SPLAY_ROTATE_LEFT(head, __tmp, field); \
-+ if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
-+ break; \
-+ } \
-+ SPLAY_LINKRIGHT(head, __left, field); \
-+ } \
-+ } \
-+ SPLAY_ASSEMBLE(head, &__node, __left, __right, field); \
-+}
-+
-+#define SPLAY_NEGINF -1
-+#define SPLAY_INF 1
-+
-+#define SPLAY_INSERT(name, x, y) name##_SPLAY_INSERT(x, y)
-+#define SPLAY_REMOVE(name, x, y) name##_SPLAY_REMOVE(x, y)
-+#define SPLAY_FIND(name, x, y) name##_SPLAY_FIND(x, y)
-+#define SPLAY_NEXT(name, x, y) name##_SPLAY_NEXT(x, y)
-+#define SPLAY_MIN(name, x) (SPLAY_EMPTY(x) ? NULL \
-+ : name##_SPLAY_MIN_MAX(x, SPLAY_NEGINF))
-+#define SPLAY_MAX(name, x) (SPLAY_EMPTY(x) ? NULL \
-+ : name##_SPLAY_MIN_MAX(x, SPLAY_INF))
-+
-+#define SPLAY_FOREACH(x, name, head) \
-+ for ((x) = SPLAY_MIN(name, head); \
-+ (x) != NULL; \
-+ (x) = SPLAY_NEXT(name, head, x))
-+
-+/* Macros that define a red-back tree */
-+#define RB_HEAD(name, type) \
-+struct name { \
-+ struct type *rbh_root; /* root of the tree */ \
-+}
-+
-+#define RB_INITIALIZER(root) \
-+ { NULL }
-+
-+#define RB_INIT(root) do { \
-+ (root)->rbh_root = NULL; \
-+} while (0)
-+
-+#define RB_BLACK 0
-+#define RB_RED 1
-+#define RB_ENTRY(type) \
-+struct { \
-+ struct type *rbe_left; /* left element */ \
-+ struct type *rbe_right; /* right element */ \
-+ struct type *rbe_parent; /* parent element */ \
-+ int rbe_color; /* node color */ \
-+}
-+
-+#define RB_LEFT(elm, field) (elm)->field.rbe_left
-+#define RB_RIGHT(elm, field) (elm)->field.rbe_right
-+#define RB_PARENT(elm, field) (elm)->field.rbe_parent
-+#define RB_COLOR(elm, field) (elm)->field.rbe_color
-+#define RB_ROOT(head) (head)->rbh_root
-+#define RB_EMPTY(head) (RB_ROOT(head) == NULL)
-+
-+#define RB_SET(elm, parent, field) do { \
-+ RB_PARENT(elm, field) = parent; \
-+ RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL; \
-+ RB_COLOR(elm, field) = RB_RED; \
-+} while (0)
-+
-+#define RB_SET_BLACKRED(black, red, field) do { \
-+ RB_COLOR(black, field) = RB_BLACK; \
-+ RB_COLOR(red, field) = RB_RED; \
-+} while (0)
-+
-+#ifndef RB_AUGMENT
-+#define RB_AUGMENT(x)
-+#endif
-+
-+#define RB_ROTATE_LEFT(head, elm, tmp, field) do { \
-+ (tmp) = RB_RIGHT(elm, field); \
-+ if ((RB_RIGHT(elm, field) = RB_LEFT(tmp, field))) { \
-+ RB_PARENT(RB_LEFT(tmp, field), field) = (elm); \
-+ } \
-+ RB_AUGMENT(elm); \
-+ if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) { \
-+ if ((elm) == RB_LEFT(RB_PARENT(elm, field), field)) \
-+ RB_LEFT(RB_PARENT(elm, field), field) = (tmp); \
-+ else \
-+ RB_RIGHT(RB_PARENT(elm, field), field) = (tmp); \
-+ } else \
-+ (head)->rbh_root = (tmp); \
-+ RB_LEFT(tmp, field) = (elm); \
-+ RB_PARENT(elm, field) = (tmp); \
-+ RB_AUGMENT(tmp); \
-+ if ((RB_PARENT(tmp, field))) \
-+ RB_AUGMENT(RB_PARENT(tmp, field)); \
-+} while (0)
-+
-+#define RB_ROTATE_RIGHT(head, elm, tmp, field) do { \
-+ (tmp) = RB_LEFT(elm, field); \
-+ if ((RB_LEFT(elm, field) = RB_RIGHT(tmp, field))) { \
-+ RB_PARENT(RB_RIGHT(tmp, field), field) = (elm); \
-+ } \
-+ RB_AUGMENT(elm); \
-+ if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) { \
-+ if ((elm) == RB_LEFT(RB_PARENT(elm, field), field)) \
-+ RB_LEFT(RB_PARENT(elm, field), field) = (tmp); \
-+ else \
-+ RB_RIGHT(RB_PARENT(elm, field), field) = (tmp); \
-+ } else \
-+ (head)->rbh_root = (tmp); \
-+ RB_RIGHT(tmp, field) = (elm); \
-+ RB_PARENT(elm, field) = (tmp); \
-+ RB_AUGMENT(tmp); \
-+ if ((RB_PARENT(tmp, field))) \
-+ RB_AUGMENT(RB_PARENT(tmp, field)); \
-+} while (0)
-+
-+/* Generates prototypes and inline functions */
-+#define RB_PROTOTYPE(name, type, field, cmp) \
-+void name##_RB_INSERT_COLOR(struct name *, struct type *); \
-+void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
-+struct type *name##_RB_REMOVE(struct name *, struct type *); \
-+struct type *name##_RB_INSERT(struct name *, struct type *); \
-+struct type *name##_RB_FIND(struct name *, struct type *); \
-+struct type *name##_RB_NEXT(struct type *); \
-+struct type *name##_RB_MINMAX(struct name *, int); \
-+ \
-+
-+/* Main rb operation.
-+ * Moves node close to the key of elm to top
-+ */
-+#define RB_GENERATE(name, type, field, cmp) \
-+void \
-+name##_RB_INSERT_COLOR(struct name *head, struct type *elm) \
-+{ \
-+ struct type *parent, *gparent, *tmp; \
-+ while ((parent = RB_PARENT(elm, field)) && \
-+ RB_COLOR(parent, field) == RB_RED) { \
-+ gparent = RB_PARENT(parent, field); \
-+ if (parent == RB_LEFT(gparent, field)) { \
-+ tmp = RB_RIGHT(gparent, field); \
-+ if (tmp && RB_COLOR(tmp, field) == RB_RED) { \
-+ RB_COLOR(tmp, field) = RB_BLACK; \
-+ RB_SET_BLACKRED(parent, gparent, field);\
-+ elm = gparent; \
-+ continue; \
-+ } \
-+ if (RB_RIGHT(parent, field) == elm) { \
-+ RB_ROTATE_LEFT(head, parent, tmp, field);\
-+ tmp = parent; \
-+ parent = elm; \
-+ elm = tmp; \
-+ } \
-+ RB_SET_BLACKRED(parent, gparent, field); \
-+ RB_ROTATE_RIGHT(head, gparent, tmp, field); \
-+ } else { \
-+ tmp = RB_LEFT(gparent, field); \
-+ if (tmp && RB_COLOR(tmp, field) == RB_RED) { \
-+ RB_COLOR(tmp, field) = RB_BLACK; \
-+ RB_SET_BLACKRED(parent, gparent, field);\
-+ elm = gparent; \
-+ continue; \
-+ } \
-+ if (RB_LEFT(parent, field) == elm) { \
-+ RB_ROTATE_RIGHT(head, parent, tmp, field);\
-+ tmp = parent; \
-+ parent = elm; \
-+ elm = tmp; \
-+ } \
-+ RB_SET_BLACKRED(parent, gparent, field); \
-+ RB_ROTATE_LEFT(head, gparent, tmp, field); \
-+ } \
-+ } \
-+ RB_COLOR(head->rbh_root, field) = RB_BLACK; \
-+} \
-+ \
-+void \
-+name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \
-+{ \
-+ struct type *tmp; \
-+ while ((elm == NULL || RB_COLOR(elm, field) == RB_BLACK) && \
-+ elm != RB_ROOT(head)) { \
-+ if (RB_LEFT(parent, field) == elm) { \
-+ tmp = RB_RIGHT(parent, field); \
-+ if (RB_COLOR(tmp, field) == RB_RED) { \
-+ RB_SET_BLACKRED(tmp, parent, field); \
-+ RB_ROTATE_LEFT(head, parent, tmp, field);\
-+ tmp = RB_RIGHT(parent, field); \
-+ } \
-+ if ((RB_LEFT(tmp, field) == NULL || \
-+ RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
-+ (RB_RIGHT(tmp, field) == NULL || \
-+ RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
-+ RB_COLOR(tmp, field) = RB_RED; \
-+ elm = parent; \
-+ parent = RB_PARENT(elm, field); \
-+ } else { \
-+ if (RB_RIGHT(tmp, field) == NULL || \
-+ RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK) {\
-+ struct type *oleft; \
-+ if ((oleft = RB_LEFT(tmp, field)))\
-+ RB_COLOR(oleft, field) = RB_BLACK;\
-+ RB_COLOR(tmp, field) = RB_RED; \
-+ RB_ROTATE_RIGHT(head, tmp, oleft, field);\
-+ tmp = RB_RIGHT(parent, field); \
-+ } \
-+ RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
-+ RB_COLOR(parent, field) = RB_BLACK; \
-+ if (RB_RIGHT(tmp, field)) \
-+ RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK;\
-+ RB_ROTATE_LEFT(head, parent, tmp, field);\
-+ elm = RB_ROOT(head); \
-+ break; \
-+ } \
-+ } else { \
-+ tmp = RB_LEFT(parent, field); \
-+ if (RB_COLOR(tmp, field) == RB_RED) { \
-+ RB_SET_BLACKRED(tmp, parent, field); \
-+ RB_ROTATE_RIGHT(head, parent, tmp, field);\
-+ tmp = RB_LEFT(parent, field); \
-+ } \
-+ if ((RB_LEFT(tmp, field) == NULL || \
-+ RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
-+ (RB_RIGHT(tmp, field) == NULL || \
-+ RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
-+ RB_COLOR(tmp, field) = RB_RED; \
-+ elm = parent; \
-+ parent = RB_PARENT(elm, field); \
-+ } else { \
-+ if (RB_LEFT(tmp, field) == NULL || \
-+ RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) {\
-+ struct type *oright; \
-+ if ((oright = RB_RIGHT(tmp, field)))\
-+ RB_COLOR(oright, field) = RB_BLACK;\
-+ RB_COLOR(tmp, field) = RB_RED; \
-+ RB_ROTATE_LEFT(head, tmp, oright, field);\
-+ tmp = RB_LEFT(parent, field); \
-+ } \
-+ RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
-+ RB_COLOR(parent, field) = RB_BLACK; \
-+ if (RB_LEFT(tmp, field)) \
-+ RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK;\
-+ RB_ROTATE_RIGHT(head, parent, tmp, field);\
-+ elm = RB_ROOT(head); \
-+ break; \
-+ } \
-+ } \
-+ } \
-+ if (elm) \
-+ RB_COLOR(elm, field) = RB_BLACK; \
-+} \
-+ \
-+struct type * \
-+name##_RB_REMOVE(struct name *head, struct type *elm) \
-+{ \
-+ struct type *child, *parent, *old = elm; \
-+ int color; \
-+ if (RB_LEFT(elm, field) == NULL) \
-+ child = RB_RIGHT(elm, field); \
-+ else if (RB_RIGHT(elm, field) == NULL) \
-+ child = RB_LEFT(elm, field); \
-+ else { \
-+ struct type *left; \
-+ elm = RB_RIGHT(elm, field); \
-+ while ((left = RB_LEFT(elm, field))) \
-+ elm = left; \
-+ child = RB_RIGHT(elm, field); \
-+ parent = RB_PARENT(elm, field); \
-+ color = RB_COLOR(elm, field); \
-+ if (child) \
-+ RB_PARENT(child, field) = parent; \
-+ if (parent) { \
-+ if (RB_LEFT(parent, field) == elm) \
-+ RB_LEFT(parent, field) = child; \
-+ else \
-+ RB_RIGHT(parent, field) = child; \
-+ RB_AUGMENT(parent); \
-+ } else \
-+ RB_ROOT(head) = child; \
-+ if (RB_PARENT(elm, field) == old) \
-+ parent = elm; \
-+ (elm)->field = (old)->field; \
-+ if (RB_PARENT(old, field)) { \
-+ if (RB_LEFT(RB_PARENT(old, field), field) == old)\
-+ RB_LEFT(RB_PARENT(old, field), field) = elm;\
-+ else \
-+ RB_RIGHT(RB_PARENT(old, field), field) = elm;\
-+ RB_AUGMENT(RB_PARENT(old, field)); \
-+ } else \
-+ RB_ROOT(head) = elm; \
-+ RB_PARENT(RB_LEFT(old, field), field) = elm; \
-+ if (RB_RIGHT(old, field)) \
-+ RB_PARENT(RB_RIGHT(old, field), field) = elm; \
-+ if (parent) { \
-+ left = parent; \
-+ do { \
-+ RB_AUGMENT(left); \
-+ } while ((left = RB_PARENT(left, field))); \
-+ } \
-+ goto color; \
-+ } \
-+ parent = RB_PARENT(elm, field); \
-+ color = RB_COLOR(elm, field); \
-+ if (child) \
-+ RB_PARENT(child, field) = parent; \
-+ if (parent) { \
-+ if (RB_LEFT(parent, field) == elm) \
-+ RB_LEFT(parent, field) = child; \
-+ else \
-+ RB_RIGHT(parent, field) = child; \
-+ RB_AUGMENT(parent); \
-+ } else \
-+ RB_ROOT(head) = child; \
-+color: \
-+ if (color == RB_BLACK) \
-+ name##_RB_REMOVE_COLOR(head, parent, child); \
-+ return (old); \
-+} \
-+ \
-+/* Inserts a node into the RB tree */ \
-+struct type * \
-+name##_RB_INSERT(struct name *head, struct type *elm) \
-+{ \
-+ struct type *tmp; \
-+ struct type *parent = NULL; \
-+ int comp = 0; \
-+ tmp = RB_ROOT(head); \
-+ while (tmp) { \
-+ parent = tmp; \
-+ comp = (cmp)(elm, parent); \
-+ if (comp < 0) \
-+ tmp = RB_LEFT(tmp, field); \
-+ else if (comp > 0) \
-+ tmp = RB_RIGHT(tmp, field); \
-+ else \
-+ return (tmp); \
-+ } \
-+ RB_SET(elm, parent, field); \
-+ if (parent != NULL) { \
-+ if (comp < 0) \
-+ RB_LEFT(parent, field) = elm; \
-+ else \
-+ RB_RIGHT(parent, field) = elm; \
-+ RB_AUGMENT(parent); \
-+ } else \
-+ RB_ROOT(head) = elm; \
-+ name##_RB_INSERT_COLOR(head, elm); \
-+ return (NULL); \
-+} \
-+ \
-+/* Finds the node with the same key as elm */ \
-+struct type * \
-+name##_RB_FIND(struct name *head, struct type *elm) \
-+{ \
-+ struct type *tmp = RB_ROOT(head); \
-+ int comp; \
-+ while (tmp) { \
-+ comp = cmp(elm, tmp); \
-+ if (comp < 0) \
-+ tmp = RB_LEFT(tmp, field); \
-+ else if (comp > 0) \
-+ tmp = RB_RIGHT(tmp, field); \
-+ else \
-+ return (tmp); \
-+ } \
-+ return (NULL); \
-+} \
-+ \
-+struct type * \
-+name##_RB_NEXT(struct type *elm) \
-+{ \
-+ if (RB_RIGHT(elm, field)) { \
-+ elm = RB_RIGHT(elm, field); \
-+ while (RB_LEFT(elm, field)) \
-+ elm = RB_LEFT(elm, field); \
-+ } else { \
-+ if (RB_PARENT(elm, field) && \
-+ (elm == RB_LEFT(RB_PARENT(elm, field), field))) \
-+ elm = RB_PARENT(elm, field); \
-+ else { \
-+ while (RB_PARENT(elm, field) && \
-+ (elm == RB_RIGHT(RB_PARENT(elm, field), field)))\
-+ elm = RB_PARENT(elm, field); \
-+ elm = RB_PARENT(elm, field); \
-+ } \
-+ } \
-+ return (elm); \
-+} \
-+ \
-+struct type * \
-+name##_RB_MINMAX(struct name *head, int val) \
-+{ \
-+ struct type *tmp = RB_ROOT(head); \
-+ struct type *parent = NULL; \
-+ while (tmp) { \
-+ parent = tmp; \
-+ if (val < 0) \
-+ tmp = RB_LEFT(tmp, field); \
-+ else \
-+ tmp = RB_RIGHT(tmp, field); \
-+ } \
-+ return (parent); \
-+}
-+
-+#define RB_NEGINF -1
-+#define RB_INF 1
-+
-+#define RB_INSERT(name, x, y) name##_RB_INSERT(x, y)
-+#define RB_REMOVE(name, x, y) name##_RB_REMOVE(x, y)
-+#define RB_FIND(name, x, y) name##_RB_FIND(x, y)
-+#define RB_NEXT(name, x, y) name##_RB_NEXT(y)
-+#define RB_MIN(name, x) name##_RB_MINMAX(x, RB_NEGINF)
-+#define RB_MAX(name, x) name##_RB_MINMAX(x, RB_INF)
-+
-+#define RB_FOREACH(x, name, head) \
-+ for ((x) = RB_MIN(name, head); \
-+ (x) != NULL; \
-+ (x) = name##_RB_NEXT(x))
-+
-+#endif /* _SYS_TREE_H_ */
-diff -Nru php-5.2.4.vanilla/libevent/config.guess php-5.2.4.fpm/libevent/config.guess
---- php-5.2.4.vanilla/libevent/config.guess 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/config.guess 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,1469 @@
-+#! /bin/sh
-+# Attempt to guess a canonical system name.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+
-+timestamp='2005-02-10'
-+
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Per Bothner <per@bothner.com>.
-+# Please send patches to <config-patches@gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# This script attempts to guess a canonical system name similar to
-+# config.sub. If it succeeds, it prints the system name on stdout, and
-+# exits with 0. Otherwise, it exits with 1.
-+#
-+# The plan is that this can be called by configure scripts if you
-+# don't specify an explicit build system type.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION]
-+
-+Output the configuration name of the system \`$me' is run on.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.guess ($timestamp)
-+
-+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help" >&2
-+ exit 1 ;;
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+if test $# != 0; then
-+ echo "$me: too many arguments$help" >&2
-+ exit 1
-+fi
-+
-+trap 'exit 1' 1 2 15
-+
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
-+
-+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-+# use `HOST_CC' if defined, but it is deprecated.
-+
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-+case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,) echo "int x;" > $dummy.c ;
-+ for c in cc gcc c89 c99 ; do
-+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+ CC_FOR_BUILD="$c"; break ;
-+ fi ;
-+ done ;
-+ if test x"$CC_FOR_BUILD" = x ; then
-+ CC_FOR_BUILD=no_compiler_found ;
-+ fi
-+ ;;
-+ ,,*) CC_FOR_BUILD=$CC ;;
-+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-+esac ;'
-+
-+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-+# (ghazi@noc.rutgers.edu 1994-08-24)
-+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-+ PATH=$PATH:/.attbin ; export PATH
-+fi
-+
-+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-+
-+case "${UNAME_MACHINE}" in
-+ i?86)
-+ test -z "$VENDOR" && VENDOR=pc
-+ ;;
-+ *)
-+ test -z "$VENDOR" && VENDOR=unknown
-+ ;;
-+esac
-+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
-+
-+# Note: order is significant - the case branches are not exclusive.
-+
-+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+ *:NetBSD:*:*)
-+ # NetBSD (nbsd) targets should (where applicable) match one or
-+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
-+ # switched to ELF, *-*-netbsd* would select the old
-+ # object file format. This provides both forward
-+ # compatibility and a consistent mechanism for selecting the
-+ # object file format.
-+ #
-+ # Note: NetBSD doesn't particularly care about the vendor
-+ # portion of the name. We always set it to "unknown".
-+ sysctl="sysctl -n hw.machine_arch"
-+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+ case "${UNAME_MACHINE_ARCH}" in
-+ armeb) machine=armeb-unknown ;;
-+ arm*) machine=arm-unknown ;;
-+ sh3el) machine=shl-unknown ;;
-+ sh3eb) machine=sh-unknown ;;
-+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+ esac
-+ # The Operating System including object format, if it has switched
-+ # to ELF recently, or will in the future.
-+ case "${UNAME_MACHINE_ARCH}" in
-+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+ eval $set_cc_for_build
-+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep __ELF__ >/dev/null
-+ then
-+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+ # Return netbsd for either. FIX?
-+ os=netbsd
-+ else
-+ os=netbsdelf
-+ fi
-+ ;;
-+ *)
-+ os=netbsd
-+ ;;
-+ esac
-+ # The OS release
-+ # Debian GNU/NetBSD machines have a different userland, and
-+ # thus, need a distinct triplet. However, they do not need
-+ # kernel version information, so it can be replaced with a
-+ # suitable tag, in the style of linux-gnu.
-+ case "${UNAME_VERSION}" in
-+ Debian*)
-+ release='-gnu'
-+ ;;
-+ *)
-+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ ;;
-+ esac
-+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-+ # contains redundant information, the shorter form:
-+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-+ echo "${machine}-${os}${release}"
-+ exit 0 ;;
-+ amd64:OpenBSD:*:*)
-+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ amiga:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ cats:OpenBSD:*:*)
-+ echo arm-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ hp300:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ luna88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mac68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvmeppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sgi:OpenBSD:*:*)
-+ echo mips64-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun3:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:OpenBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:ekkoBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:MirBSD:*:*)
-+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:MirBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ alpha:OSF1:*:*)
-+ case $UNAME_RELEASE in
-+ *4.0)
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-+ ;;
-+ *5.*)
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ ;;
-+ esac
-+ # According to Compaq, /usr/sbin/psrinfo has been available on
-+ # OSF/1 and Tru64 systems produced since 1995. I hope that
-+ # covers most systems running today. This code pipes the CPU
-+ # types through head -n 1, so we only detect the type of CPU 0.
-+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+ case "$ALPHA_CPU_TYPE" in
-+ "EV4 (21064)")
-+ UNAME_MACHINE="alpha" ;;
-+ "EV4.5 (21064)")
-+ UNAME_MACHINE="alpha" ;;
-+ "LCA4 (21066/21068)")
-+ UNAME_MACHINE="alpha" ;;
-+ "EV5 (21164)")
-+ UNAME_MACHINE="alphaev5" ;;
-+ "EV5.6 (21164A)")
-+ UNAME_MACHINE="alphaev56" ;;
-+ "EV5.6 (21164PC)")
-+ UNAME_MACHINE="alphapca56" ;;
-+ "EV5.7 (21164PC)")
-+ UNAME_MACHINE="alphapca57" ;;
-+ "EV6 (21264)")
-+ UNAME_MACHINE="alphaev6" ;;
-+ "EV6.7 (21264A)")
-+ UNAME_MACHINE="alphaev67" ;;
-+ "EV6.8CB (21264C)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.8AL (21264B)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.8CX (21264D)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.9A (21264/EV69A)")
-+ UNAME_MACHINE="alphaev69" ;;
-+ "EV7 (21364)")
-+ UNAME_MACHINE="alphaev7" ;;
-+ "EV7.9 (21364A)")
-+ UNAME_MACHINE="alphaev79" ;;
-+ esac
-+ # A Pn.n version is a patched version.
-+ # A Vn.n version is a released version.
-+ # A Tn.n version is a released field test version.
-+ # A Xn.n version is an unreleased experimental baselevel.
-+ # 1.2 uses "1.2" for uname -r.
-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ exit 0 ;;
-+ Alpha\ *:Windows_NT*:*)
-+ # How do we know it's Interix rather than the generic POSIX subsystem?
-+ # Should we change UNAME_MACHINE based on the output of uname instead
-+ # of the specific Alpha model?
-+ echo alpha-pc-interix
-+ exit 0 ;;
-+ 21064:Windows_NT:50:3)
-+ echo alpha-dec-winnt3.5
-+ exit 0 ;;
-+ Amiga*:UNIX_System_V:4.0:*)
-+ echo m68k-unknown-sysv4
-+ exit 0;;
-+ *:[Aa]miga[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-amigaos
-+ exit 0 ;;
-+ *:[Mm]orph[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-morphos
-+ exit 0 ;;
-+ *:OS/390:*:*)
-+ echo i370-ibm-openedition
-+ exit 0 ;;
-+ *:z/VM:*:*)
-+ echo s390-ibm-zvmoe
-+ exit 0 ;;
-+ *:OS400:*:*)
-+ echo powerpc-ibm-os400
-+ exit 0 ;;
-+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-+ echo arm-acorn-riscix${UNAME_RELEASE}
-+ exit 0;;
-+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-+ echo hppa1.1-hitachi-hiuxmpp
-+ exit 0;;
-+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+ echo pyramid-pyramid-sysv3
-+ else
-+ echo pyramid-pyramid-bsd
-+ fi
-+ exit 0 ;;
-+ NILE*:*:*:dcosx)
-+ echo pyramid-pyramid-svr4
-+ exit 0 ;;
-+ DRS?6000:unix:4.0:6*)
-+ echo sparc-icl-nx6
-+ exit 0 ;;
-+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-+ case `/usr/bin/uname -p` in
-+ sparc) echo sparc-icl-nx7 && exit 0 ;;
-+ esac ;;
-+ sun4H:SunOS:5.*:*)
-+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ i86pc:SunOS:5.*:*)
-+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ sun4*:SunOS:6*:*)
-+ # According to config.sub, this is the proper way to canonicalize
-+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
-+ # it's likely to be more like Solaris than SunOS4.
-+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ sun4*:SunOS:*:*)
-+ case "`/usr/bin/arch -k`" in
-+ Series*|S4*)
-+ UNAME_RELEASE=`uname -v`
-+ ;;
-+ esac
-+ # Japanese Language versions have a version number like `4.1.3-JL'.
-+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-+ exit 0 ;;
-+ sun3*:SunOS:*:*)
-+ echo m68k-sun-sunos${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun*:*:4.2BSD:*)
-+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+ case "`/bin/arch`" in
-+ sun3)
-+ echo m68k-sun-sunos${UNAME_RELEASE}
-+ ;;
-+ sun4)
-+ echo sparc-sun-sunos${UNAME_RELEASE}
-+ ;;
-+ esac
-+ exit 0 ;;
-+ aushp:SunOS:*:*)
-+ echo sparc-auspex-sunos${UNAME_RELEASE}
-+ exit 0 ;;
-+ # The situation for MiNT is a little confusing. The machine name
-+ # can be virtually everything (everything which is not
-+ # "atarist" or "atariste" at least should have a processor
-+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
-+ # to the lowercase version "mint" (or "freemint"). Finally
-+ # the system name "TOS" denotes a system which is actually not
-+ # MiNT. But MiNT is downward compatible to TOS, so this should
-+ # be no problem.
-+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+ echo m68k-milan-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+ echo m68k-hades-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+ echo m68k-unknown-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ m68k:machten:*:*)
-+ echo m68k-apple-machten${UNAME_RELEASE}
-+ exit 0 ;;
-+ powerpc:machten:*:*)
-+ echo powerpc-apple-machten${UNAME_RELEASE}
-+ exit 0 ;;
-+ RISC*:Mach:*:*)
-+ echo mips-dec-mach_bsd4.3
-+ exit 0 ;;
-+ RISC*:ULTRIX:*:*)
-+ echo mips-dec-ultrix${UNAME_RELEASE}
-+ exit 0 ;;
-+ VAX*:ULTRIX*:*:*)
-+ echo vax-dec-ultrix${UNAME_RELEASE}
-+ exit 0 ;;
-+ 2020:CLIX:*:* | 2430:CLIX:*:*)
-+ echo clipper-intergraph-clix${UNAME_RELEASE}
-+ exit 0 ;;
-+ mips:*:*:UMIPS | mips:*:*:RISCos)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+#ifdef __cplusplus
-+#include <stdio.h> /* for printf() prototype */
-+ int main (int argc, char *argv[]) {
-+#else
-+ int main (argc, argv) int argc; char *argv[]; {
-+#endif
-+ #if defined (host_mips) && defined (MIPSEB)
-+ #if defined (SYSTYPE_SYSV)
-+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-+ #endif
-+ #if defined (SYSTYPE_SVR4)
-+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-+ #endif
-+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-+ #endif
-+ #endif
-+ exit (-1);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c \
-+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+ && exit 0
-+ echo mips-mips-riscos${UNAME_RELEASE}
-+ exit 0 ;;
-+ Motorola:PowerMAX_OS:*:*)
-+ echo powerpc-motorola-powermax
-+ exit 0 ;;
-+ Motorola:*:4.3:PL8-*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
-+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
-+ Night_Hawk:Power_UNIX:*:*)
-+ echo powerpc-harris-powerunix
-+ exit 0 ;;
-+ m88k:CX/UX:7*:*)
-+ echo m88k-harris-cxux7
-+ exit 0 ;;
-+ m88k:*:4*:R4*)
-+ echo m88k-motorola-sysv4
-+ exit 0 ;;
-+ m88k:*:3*:R3*)
-+ echo m88k-motorola-sysv3
-+ exit 0 ;;
-+ AViiON:dgux:*:*)
-+ # DG/UX returns AViiON for all architectures
-+ UNAME_PROCESSOR=`/usr/bin/uname -p`
-+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+ then
-+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+ [ ${TARGET_BINARY_INTERFACE}x = x ]
-+ then
-+ echo m88k-dg-dgux${UNAME_RELEASE}
-+ else
-+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+ fi
-+ else
-+ echo i586-dg-dgux${UNAME_RELEASE}
-+ fi
-+ exit 0 ;;
-+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
-+ echo m88k-dolphin-sysv3
-+ exit 0 ;;
-+ M88*:*:R3*:*)
-+ # Delta 88k system running SVR3
-+ echo m88k-motorola-sysv3
-+ exit 0 ;;
-+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-+ echo m88k-tektronix-sysv3
-+ exit 0 ;;
-+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-+ echo m68k-tektronix-bsd
-+ exit 0 ;;
-+ *:IRIX*:*:*)
-+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+ exit 0 ;;
-+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
-+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
-+ i*86:AIX:*:*)
-+ echo i386-ibm-aix
-+ exit 0 ;;
-+ ia64:AIX:*:*)
-+ if [ -x /usr/bin/oslevel ] ; then
-+ IBM_REV=`/usr/bin/oslevel`
-+ else
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ fi
-+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+ exit 0 ;;
-+ *:AIX:2:3)
-+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <sys/systemcfg.h>
-+
-+ main()
-+ {
-+ if (!__power_pc())
-+ exit(1);
-+ puts("powerpc-ibm-aix3.2.5");
-+ exit(0);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+ echo rs6000-ibm-aix3.2.5
-+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-+ echo rs6000-ibm-aix3.2.4
-+ else
-+ echo rs6000-ibm-aix3.2
-+ fi
-+ exit 0 ;;
-+ *:AIX:*:[45])
-+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+ IBM_ARCH=rs6000
-+ else
-+ IBM_ARCH=powerpc
-+ fi
-+ if [ -x /usr/bin/oslevel ] ; then
-+ IBM_REV=`/usr/bin/oslevel`
-+ else
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ fi
-+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+ exit 0 ;;
-+ *:AIX:*:*)
-+ echo rs6000-ibm-aix
-+ exit 0 ;;
-+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+ echo romp-ibm-bsd4.4
-+ exit 0 ;;
-+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
-+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
-+ exit 0 ;; # report: romp-ibm BSD 4.3
-+ *:BOSX:*:*)
-+ echo rs6000-bull-bosx
-+ exit 0 ;;
-+ DPX/2?00:B.O.S.:*:*)
-+ echo m68k-bull-sysv3
-+ exit 0 ;;
-+ 9000/[34]??:4.3bsd:1.*:*)
-+ echo m68k-hp-bsd
-+ exit 0 ;;
-+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-+ echo m68k-hp-bsd4.4
-+ exit 0 ;;
-+ 9000/[34678]??:HP-UX:*:*)
-+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+ case "${UNAME_MACHINE}" in
-+ 9000/31? ) HP_ARCH=m68000 ;;
-+ 9000/[34]?? ) HP_ARCH=m68k ;;
-+ 9000/[678][0-9][0-9])
-+ if [ -x /usr/bin/getconf ]; then
-+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+ case "${sc_cpu_version}" in
-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ case "${sc_kernel_bits}" in
-+ 32) HP_ARCH="hppa2.0n" ;;
-+ 64) HP_ARCH="hppa2.0w" ;;
-+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-+ esac ;;
-+ esac
-+ fi
-+ if [ "${HP_ARCH}" = "" ]; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+
-+ #define _HPUX_SOURCE
-+ #include <stdlib.h>
-+ #include <unistd.h>
-+
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+ case CPU_PA_RISC2_0:
-+ #if defined(_SC_KERNEL_BITS)
-+ switch (bits)
-+ {
-+ case 64: puts ("hppa2.0w"); break;
-+ case 32: puts ("hppa2.0n"); break;
-+ default: puts ("hppa2.0"); break;
-+ } break;
-+ #else /* !defined(_SC_KERNEL_BITS) */
-+ puts ("hppa2.0"); break;
-+ #endif
-+ default: puts ("hppa1.0"); break;
-+ }
-+ exit (0);
-+ }
-+EOF
-+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+ test -z "$HP_ARCH" && HP_ARCH=hppa
-+ fi ;;
-+ esac
-+ if [ ${HP_ARCH} = "hppa2.0w" ]
-+ then
-+ # avoid double evaluation of $set_cc_for_build
-+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+ then
-+ HP_ARCH="hppa2.0w"
-+ else
-+ HP_ARCH="hppa64"
-+ fi
-+ fi
-+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+ exit 0 ;;
-+ ia64:HP-UX:*:*)
-+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+ echo ia64-hp-hpux${HPUX_REV}
-+ exit 0 ;;
-+ 3050*:HI-UX:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <unistd.h>
-+ int
-+ main ()
-+ {
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
-+ results, however. */
-+ if (CPU_IS_PA_RISC (cpu))
-+ {
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-+ default: puts ("hppa-hitachi-hiuxwe2"); break;
-+ }
-+ }
-+ else if (CPU_IS_HP_MC68K (cpu))
-+ puts ("m68k-hitachi-hiuxwe2");
-+ else puts ("unknown-hitachi-hiuxwe2");
-+ exit (0);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+ echo unknown-hitachi-hiuxwe2
-+ exit 0 ;;
-+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+ echo hppa1.1-hp-bsd
-+ exit 0 ;;
-+ 9000/8??:4.3bsd:*:*)
-+ echo hppa1.0-hp-bsd
-+ exit 0 ;;
-+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-+ echo hppa1.0-hp-mpeix
-+ exit 0 ;;
-+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+ echo hppa1.1-hp-osf
-+ exit 0 ;;
-+ hp8??:OSF1:*:*)
-+ echo hppa1.0-hp-osf
-+ exit 0 ;;
-+ i*86:OSF1:*:*)
-+ if [ -x /usr/sbin/sysversion ] ; then
-+ echo ${UNAME_MACHINE}-unknown-osf1mk
-+ else
-+ echo ${UNAME_MACHINE}-unknown-osf1
-+ fi
-+ exit 0 ;;
-+ parisc*:Lites*:*:*)
-+ echo hppa1.1-hp-lites
-+ exit 0 ;;
-+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-+ echo c1-convex-bsd
-+ exit 0 ;;
-+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-+ if getsysinfo -f scalar_acc
-+ then echo c32-convex-bsd
-+ else echo c2-convex-bsd
-+ fi
-+ exit 0 ;;
-+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-+ echo c34-convex-bsd
-+ exit 0 ;;
-+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-+ echo c38-convex-bsd
-+ exit 0 ;;
-+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-+ echo c4-convex-bsd
-+ exit 0 ;;
-+ CRAY*Y-MP:*:*:*)
-+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*[A-Z]90:*:*:*)
-+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+ -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*TS:*:*:*)
-+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*T3E:*:*:*)
-+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*SV1:*:*:*)
-+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ *:UNICOS/mp:*:*)
-+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit 0 ;;
-+ 5000:UNIX_System_V:4.*:*)
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit 0 ;;
-+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ sparc*:BSD/OS:*:*)
-+ echo sparc-unknown-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:BSD/OS:*:*)
-+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:FreeBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ exit 0 ;;
-+ i*:CYGWIN*:*)
-+ echo ${UNAME_MACHINE}-pc-cygwin
-+ exit 0 ;;
-+ i*:MINGW*:*)
-+ echo ${UNAME_MACHINE}-pc-mingw32
-+ exit 0 ;;
-+ i*:PW*:*)
-+ echo ${UNAME_MACHINE}-pc-pw32
-+ exit 0 ;;
-+ x86:Interix*:[34]*)
-+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+ exit 0 ;;
-+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ echo i${UNAME_MACHINE}-pc-mks
-+ exit 0 ;;
-+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-+ # How do we know it's Interix rather than the generic POSIX subsystem?
-+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-+ # UNAME_MACHINE based on the output of uname instead of i386?
-+ echo i586-pc-interix
-+ exit 0 ;;
-+ i*:UWIN*:*)
-+ echo ${UNAME_MACHINE}-pc-uwin
-+ exit 0 ;;
-+ amd64:CYGWIN*:*:*)
-+ echo x86_64-unknown-cygwin
-+ exit 0 ;;
-+ p*:CYGWIN*:*)
-+ echo powerpcle-unknown-cygwin
-+ exit 0 ;;
-+ prep*:SunOS:5.*:*)
-+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ *:GNU:*:*)
-+ # the GNU system
-+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+ exit 0 ;;
-+ *:GNU/*:*:*)
-+ # other systems with GNU libc and userland
-+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+ exit 0 ;;
-+ i*86:Minix:*:*)
-+ echo ${UNAME_MACHINE}-pc-minix
-+ exit 0 ;;
-+ arm*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ exit 0 ;;
-+ cris:Linux:*:*)
-+ echo cris-axis-linux
-+ exit 0 ;;
-+ crisv32:Linux:*:*)
-+ echo crisv32-axis-linux
-+ exit 0 ;;
-+ frv:Linux:*:*)
-+ echo frv-${VENDOR}-linux
-+ exit 0 ;;
-+ ia64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ exit 0 ;;
-+ m32r*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ exit 0 ;;
-+ m68*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ exit 0 ;;
-+ mips:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips
-+ #undef mipsel
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mipsel
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips
-+ #else
-+ CPU=
-+ #endif
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
-+ ;;
-+ mips64:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips64
-+ #undef mips64el
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mips64el
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips64
-+ #else
-+ CPU=
-+ #endif
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
-+ ;;
-+ ppc:Linux:*:*)
-+ echo powerpc-${VENDOR}-linux
-+ exit 0 ;;
-+ ppc64:Linux:*:*)
-+ echo powerpc64-${VENDOR}-linux
-+ exit 0 ;;
-+ alpha:Linux:*:*)
-+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ EV5) UNAME_MACHINE=alphaev5 ;;
-+ EV56) UNAME_MACHINE=alphaev56 ;;
-+ PCA56) UNAME_MACHINE=alphapca56 ;;
-+ PCA57) UNAME_MACHINE=alphapca56 ;;
-+ EV6) UNAME_MACHINE=alphaev6 ;;
-+ EV67) UNAME_MACHINE=alphaev67 ;;
-+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
-+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
-+ exit 0 ;;
-+ parisc:Linux:*:* | hppa:Linux:*:*)
-+ # Look for CPU level
-+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+ PA7*) echo hppa1.1-${VENDOR}-linux ;;
-+ PA8*) echo hppa2.0-${VENDOR}-linux ;;
-+ *) echo hppa-${VENDOR}-linux ;;
-+ esac
-+ exit 0 ;;
-+ parisc64:Linux:*:* | hppa64:Linux:*:*)
-+ echo hppa64-${VENDOR}-linux
-+ exit 0 ;;
-+ s390:Linux:*:* | s390x:Linux:*:*)
-+ echo ${UNAME_MACHINE}-ibm-linux
-+ exit 0 ;;
-+ sh64*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ exit 0 ;;
-+ sh*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ exit 0 ;;
-+ sparc:Linux:*:* | sparc64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-${VENDOR}-linux
-+ exit 0 ;;
-+ x86_64:Linux:*:*)
-+ echo x86_64-${VENDOR}-linux
-+ exit 0 ;;
-+ i*86:Linux:*:*)
-+ # The BFD linker knows what the default object file format is, so
-+ # first see if it will tell us. cd to the root directory to prevent
-+ # problems with other programs or directories called `ld' in the path.
-+ # Set LC_ALL=C to ensure ld outputs messages in English.
-+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+ | sed -ne '/supported targets:/!d
-+ s/[ ][ ]*/ /g
-+ s/.*supported targets: *//
-+ s/ .*//
-+ p'`
-+ case "$ld_supported_targets" in
-+ elf32-i386)
-+ TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
-+ ;;
-+ a.out-i386-linux)
-+ echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
-+ exit 0 ;;
-+ coff-i386)
-+ echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
-+ exit 0 ;;
-+ "")
-+ # Either a pre-BFD a.out linker (linuxoldld) or
-+ # one that does not give us useful --help.
-+ echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
-+ exit 0 ;;
-+ esac
-+ # Determine whether the default compiler is a.out or elf
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <features.h>
-+ #ifdef __ELF__
-+ # ifdef __GLIBC__
-+ # if __GLIBC__ >= 2
-+ LIBC=gnu
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ #else
-+ #ifdef __INTEL_COMPILER
-+ LIBC=gnu
-+ #else
-+ LIBC=gnuaout
-+ #endif
-+ #endif
-+ #ifdef __dietlibc__
-+ LIBC=dietlibc
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
-+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+ ;;
-+ i*86:DYNIX/ptx:4*:*)
-+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+ # earlier versions are messed up and put the nodename in both
-+ # sysname and nodename.
-+ echo i386-sequent-sysv4
-+ exit 0 ;;
-+ i*86:UNIX_SV:4.2MP:2.*)
-+ # Unixware is an offshoot of SVR4, but it has its own version
-+ # number series starting with 2...
-+ # I am not positive that other SVR4 systems won't match this,
-+ # I just have to hope. -- rms.
-+ # Use sysv4.2uw... so that sysv4* matches it.
-+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+ exit 0 ;;
-+ i*86:OS/2:*:*)
-+ # If we were able to find `uname', then EMX Unix compatibility
-+ # is probably installed.
-+ echo ${UNAME_MACHINE}-pc-os2-emx
-+ exit 0 ;;
-+ i*86:XTS-300:*:STOP)
-+ echo ${UNAME_MACHINE}-unknown-stop
-+ exit 0 ;;
-+ i*86:atheos:*:*)
-+ echo ${UNAME_MACHINE}-unknown-atheos
-+ exit 0 ;;
-+ i*86:syllable:*:*)
-+ echo ${UNAME_MACHINE}-pc-syllable
-+ exit 0 ;;
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ echo i386-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ i*86:*DOS:*:*)
-+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+ exit 0 ;;
-+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-+ else
-+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+ fi
-+ exit 0 ;;
-+ i*86:*:5:[78]*)
-+ case `/bin/uname -X | grep "^Machine"` in
-+ *486*) UNAME_MACHINE=i486 ;;
-+ *Pentium) UNAME_MACHINE=i586 ;;
-+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+ esac
-+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+ exit 0 ;;
-+ i*86:*:3.2:*)
-+ if test -f /usr/options/cb.name; then
-+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
-+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-+ && UNAME_MACHINE=i586
-+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-+ && UNAME_MACHINE=i686
-+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-+ && UNAME_MACHINE=i686
-+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-+ else
-+ echo ${UNAME_MACHINE}-pc-sysv32
-+ fi
-+ exit 0 ;;
-+ pc:*:*:*)
-+ # Left here for compatibility:
-+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
-+ # the processor, so we play safe by assuming i386.
-+ echo i386-pc-msdosdjgpp
-+ exit 0 ;;
-+ Intel:Mach:3*:*)
-+ echo i386-pc-mach3
-+ exit 0 ;;
-+ paragon:*:*:*)
-+ echo i860-intel-osf1
-+ exit 0 ;;
-+ i860:*:4.*:*) # i860-SVR4
-+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-+ else # Add other i860-SVR4 vendors below as they are discovered.
-+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
-+ fi
-+ exit 0 ;;
-+ mini*:CTIX:SYS*5:*)
-+ # "miniframe"
-+ echo m68010-convergent-sysv
-+ exit 0 ;;
-+ mc68k:UNIX:SYSTEM5:3.51m)
-+ echo m68k-convergent-sysv
-+ exit 0 ;;
-+ M680?0:D-NIX:5.3:*)
-+ echo m68k-diab-dnix
-+ exit 0 ;;
-+ M68*:*:R3V[5678]*:*)
-+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-+ OS_REL=''
-+ test -r /etc/.relid \
-+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && echo i486-ncr-sysv4 && exit 0 ;;
-+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-+ echo m68k-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ mc68030:UNIX_System_V:4.*:*)
-+ echo m68k-atari-sysv4
-+ exit 0 ;;
-+ TSUNAMI:LynxOS:2.*:*)
-+ echo sparc-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ rs6000:LynxOS:2.*:*)
-+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ SM[BE]S:UNIX_SV:*:*)
-+ echo mips-dde-sysv${UNAME_RELEASE}
-+ exit 0 ;;
-+ RM*:ReliantUNIX-*:*:*)
-+ echo mips-sni-sysv4
-+ exit 0 ;;
-+ RM*:SINIX-*:*:*)
-+ echo mips-sni-sysv4
-+ exit 0 ;;
-+ *:SINIX-*:*:*)
-+ if uname -p 2>/dev/null >/dev/null ; then
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ echo ${UNAME_MACHINE}-sni-sysv4
-+ else
-+ echo ns32k-sni-sysv
-+ fi
-+ exit 0 ;;
-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+ # says <Richard.M.Bartel@ccMail.Census.GOV>
-+ echo i586-unisys-sysv4
-+ exit 0 ;;
-+ *:UNIX_System_V:4*:FTX*)
-+ # From Gerald Hewes <hewes@openmarket.com>.
-+ # How about differentiating between stratus architectures? -djm
-+ echo hppa1.1-stratus-sysv4
-+ exit 0 ;;
-+ *:*:*:FTX*)
-+ # From seanf@swdc.stratus.com.
-+ echo i860-stratus-sysv4
-+ exit 0 ;;
-+ *:VOS:*:*)
-+ # From Paul.Green@stratus.com.
-+ echo hppa1.1-stratus-vos
-+ exit 0 ;;
-+ mc68*:A/UX:*:*)
-+ echo m68k-apple-aux${UNAME_RELEASE}
-+ exit 0 ;;
-+ news*:NEWS-OS:6*:*)
-+ echo mips-sony-newsos6
-+ exit 0 ;;
-+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-+ if [ -d /usr/nec ]; then
-+ echo mips-nec-sysv${UNAME_RELEASE}
-+ else
-+ echo mips-unknown-sysv${UNAME_RELEASE}
-+ fi
-+ exit 0 ;;
-+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
-+ echo powerpc-be-beos
-+ exit 0 ;;
-+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
-+ echo powerpc-apple-beos
-+ exit 0 ;;
-+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
-+ echo i586-pc-beos
-+ exit 0 ;;
-+ SX-4:SUPER-UX:*:*)
-+ echo sx4-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-5:SUPER-UX:*:*)
-+ echo sx5-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-6:SUPER-UX:*:*)
-+ echo sx6-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ Power*:Rhapsody:*:*)
-+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Rhapsody:*:*)
-+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Darwin:*:*)
-+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+ case $UNAME_PROCESSOR in
-+ *86) UNAME_PROCESSOR=i686 ;;
-+ unknown) UNAME_PROCESSOR=powerpc ;;
-+ esac
-+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+ UNAME_PROCESSOR=`uname -p`
-+ if test "$UNAME_PROCESSOR" = "x86"; then
-+ UNAME_PROCESSOR=i386
-+ UNAME_MACHINE=pc
-+ fi
-+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:QNX:*:4*)
-+ echo i386-pc-qnx
-+ exit 0 ;;
-+ NSE-?:NONSTOP_KERNEL:*:*)
-+ echo nse-tandem-nsk${UNAME_RELEASE}
-+ exit 0 ;;
-+ NSR-?:NONSTOP_KERNEL:*:*)
-+ echo nsr-tandem-nsk${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:NonStop-UX:*:*)
-+ echo mips-compaq-nonstopux
-+ exit 0 ;;
-+ BS2000:POSIX*:*:*)
-+ echo bs2000-siemens-sysv
-+ exit 0 ;;
-+ DS/*:UNIX_System_V:*:*)
-+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Plan9:*:*)
-+ # "uname -m" is not consistent, so use $cputype instead. 386
-+ # is converted to i386 for consistency with other x86
-+ # operating systems.
-+ if test "$cputype" = "386"; then
-+ UNAME_MACHINE=i386
-+ else
-+ UNAME_MACHINE="$cputype"
-+ fi
-+ echo ${UNAME_MACHINE}-unknown-plan9
-+ exit 0 ;;
-+ *:TOPS-10:*:*)
-+ echo pdp10-unknown-tops10
-+ exit 0 ;;
-+ *:TENEX:*:*)
-+ echo pdp10-unknown-tenex
-+ exit 0 ;;
-+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+ echo pdp10-dec-tops20
-+ exit 0 ;;
-+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+ echo pdp10-xkl-tops20
-+ exit 0 ;;
-+ *:TOPS-20:*:*)
-+ echo pdp10-unknown-tops20
-+ exit 0 ;;
-+ *:ITS:*:*)
-+ echo pdp10-unknown-its
-+ exit 0 ;;
-+ SEI:*:*:SEIUX)
-+ echo mips-sei-seiux${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:DragonFly:*:*)
-+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ exit 0 ;;
-+ *:*VMS:*:*)
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ case "${UNAME_MACHINE}" in
-+ A*) echo alpha-dec-vms && exit 0 ;;
-+ I*) echo ia64-dec-vms && exit 0 ;;
-+ V*) echo vax-dec-vms && exit 0 ;;
-+ esac ;;
-+ *:XENIX:*:SysV)
-+ echo i386-pc-xenix
-+ exit 0 ;;
-+esac
-+
-+#echo '(No uname command or uname output not recognized.)' 1>&2
-+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-+
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
-+#ifdef _SEQUENT_
-+# include <sys/types.h>
-+# include <sys/utsname.h>
-+#endif
-+main ()
-+{
-+#if defined (sony)
-+#if defined (MIPSEB)
-+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
-+ I don't know.... */
-+ printf ("mips-sony-bsd\n"); exit (0);
-+#else
-+#include <sys/param.h>
-+ printf ("m68k-sony-newsos%s\n",
-+#ifdef NEWSOS4
-+ "4"
-+#else
-+ ""
-+#endif
-+ ); exit (0);
-+#endif
-+#endif
-+
-+#if defined (__arm) && defined (__acorn) && defined (__unix)
-+ printf ("arm-acorn-riscix"); exit (0);
-+#endif
-+
-+#if defined (hp300) && !defined (hpux)
-+ printf ("m68k-hp-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (NeXT)
-+#if !defined (__ARCHITECTURE__)
-+#define __ARCHITECTURE__ "m68k"
-+#endif
-+ int version;
-+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-+ if (version < 4)
-+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+ else
-+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-+ exit (0);
-+#endif
-+
-+#if defined (MULTIMAX) || defined (n16)
-+#if defined (UMAXV)
-+ printf ("ns32k-encore-sysv\n"); exit (0);
-+#else
-+#if defined (CMU)
-+ printf ("ns32k-encore-mach\n"); exit (0);
-+#else
-+ printf ("ns32k-encore-bsd\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (__386BSD__)
-+ printf ("i386-pc-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (sequent)
-+#if defined (i386)
-+ printf ("i386-sequent-dynix\n"); exit (0);
-+#endif
-+#if defined (ns32000)
-+ printf ("ns32k-sequent-dynix\n"); exit (0);
-+#endif
-+#endif
-+
-+#if defined (_SEQUENT_)
-+ struct utsname un;
-+
-+ uname(&un);
-+
-+ if (strncmp(un.version, "V2", 2) == 0) {
-+ printf ("i386-sequent-ptx2\n"); exit (0);
-+ }
-+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-+ printf ("i386-sequent-ptx1\n"); exit (0);
-+ }
-+ printf ("i386-sequent-ptx\n"); exit (0);
-+
-+#endif
-+
-+#if defined (vax)
-+# if !defined (ultrix)
-+# include <sys/param.h>
-+# if defined (BSD)
-+# if BSD == 43
-+ printf ("vax-dec-bsd4.3\n"); exit (0);
-+# else
-+# if BSD == 199006
-+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# endif
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# else
-+ printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
-+#endif
-+
-+#if defined (alliant) && defined (i860)
-+ printf ("i860-alliant-bsd\n"); exit (0);
-+#endif
-+
-+ exit (1);
-+}
-+EOF
-+
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+
-+# Apollos put the system type in the environment.
-+
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+
-+# Convex versions that predate uname can use getsysinfo(1)
-+
-+if [ -x /usr/convex/getsysinfo ]
-+then
-+ case `getsysinfo -f cpu_type` in
-+ c1*)
-+ echo c1-convex-bsd
-+ exit 0 ;;
-+ c2*)
-+ if getsysinfo -f scalar_acc
-+ then echo c32-convex-bsd
-+ else echo c2-convex-bsd
-+ fi
-+ exit 0 ;;
-+ c34*)
-+ echo c34-convex-bsd
-+ exit 0 ;;
-+ c38*)
-+ echo c38-convex-bsd
-+ exit 0 ;;
-+ c4*)
-+ echo c4-convex-bsd
-+ exit 0 ;;
-+ esac
-+fi
-+
-+cat >&2 <<EOF
-+$0: unable to guess system type
-+
-+This script, last modified $timestamp, has failed to recognize
-+the operating system you are using. It is advised that you
-+download the most up to date version of the config scripts from
-+
-+ ftp://ftp.gnu.org/pub/gnu/config/
-+
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches@gnu.org> in order to provide the needed
-+information to handle your system.
-+
-+config.guess timestamp = $timestamp
-+
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-+
-+hostinfo = `(hostinfo) 2>/dev/null`
-+/bin/universe = `(/bin/universe) 2>/dev/null`
-+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-+/bin/arch = `(/bin/arch) 2>/dev/null`
-+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
-+
-+exit 1
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff -Nru php-5.2.4.vanilla/libevent/config.h.in php-5.2.4.fpm/libevent/config.h.in
---- php-5.2.4.vanilla/libevent/config.h.in 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/config.h.in 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,281 @@
-+/* config.h.in. Generated from configure.in by autoheader. */
-+/* Define if kqueue works correctly with pipes */
-+#undef HAVE_WORKING_KQUEUE
-+
-+/* Define if timeradd is defined in <sys/time.h> */
-+#undef HAVE_TIMERADD
-+#ifndef HAVE_TIMERADD
-+#undef timersub
-+#define timeradd(tvp, uvp, vvp) \
-+ do { \
-+ (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
-+ (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \
-+ if ((vvp)->tv_usec >= 1000000) { \
-+ (vvp)->tv_sec++; \
-+ (vvp)->tv_usec -= 1000000; \
-+ } \
-+ } while (0)
-+#define timersub(tvp, uvp, vvp) \
-+ do { \
-+ (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
-+ (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
-+ if ((vvp)->tv_usec < 0) { \
-+ (vvp)->tv_sec--; \
-+ (vvp)->tv_usec += 1000000; \
-+ } \
-+ } while (0)
-+#endif /* !HAVE_TIMERADD */
-+
-+#undef HAVE_TIMERCLEAR
-+#ifndef HAVE_TIMERCLEAR
-+#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0
-+#endif
-+
-+#undef HAVE_TIMERCMP
-+#ifndef HAVE_TIMERCMP
-+#undef timercmp
-+#define timercmp(tvp, uvp, cmp) \
-+ (((tvp)->tv_sec == (uvp)->tv_sec) ? \
-+ ((tvp)->tv_usec cmp (uvp)->tv_usec) : \
-+ ((tvp)->tv_sec cmp (uvp)->tv_sec))
-+#endif
-+
-+#undef HAVE_TIMERISSET
-+#ifndef HAVE_TIMERISSET
-+#undef timerisset
-+#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
-+#endif
-+
-+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
-+#undef HAVE_TAILQFOREACH
-+#ifndef HAVE_TAILQFOREACH
-+#define TAILQ_FIRST(head) ((head)->tqh_first)
-+#define TAILQ_END(head) NULL
-+#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-+#define TAILQ_FOREACH(var, head, field) \
-+ for((var) = TAILQ_FIRST(head); \
-+ (var) != TAILQ_END(head); \
-+ (var) = TAILQ_NEXT(var, field))
-+#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \
-+ (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \
-+ (elm)->field.tqe_next = (listelm); \
-+ *(listelm)->field.tqe_prev = (elm); \
-+ (listelm)->field.tqe_prev = &(elm)->field.tqe_next; \
-+} while (0)
-+#endif /* TAILQ_FOREACH */
-+
-+/* Define to __FUNCTION__ or __file__ if your compiler doesn't have __func__ */
-+#undef __func__
-+
-+/* Define if clock_gettime is available in libc */
-+#undef DNS_USE_CPU_CLOCK_FOR_ID
-+
-+/* Define is no secure id variant is available */
-+#undef DNS_USE_GETTIMEOFDAY_FOR_ID
-+
-+/* Define to 1 if you have the `clock_gettime' function. */
-+#undef HAVE_CLOCK_GETTIME
-+
-+/* Define if /dev/poll is available */
-+#undef HAVE_DEVPOLL
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define if your system supports the epoll system calls */
-+#undef HAVE_EPOLL
-+
-+/* Define to 1 if you have the `epoll_ctl' function. */
-+#undef HAVE_EPOLL_CTL
-+
-+/* Define if your system supports event ports */
-+#undef HAVE_EVENT_PORTS
-+
-+/* Define to 1 if you have the `fcntl' function. */
-+#undef HAVE_FCNTL
-+
-+/* Define to 1 if you have the <fcntl.h> header file. */
-+#undef HAVE_FCNTL_H
-+
-+/* Define to 1 if you have the `getaddrinfo' function. */
-+#undef HAVE_GETADDRINFO
-+
-+/* Define to 1 if you have the `getnameinfo' function. */
-+#undef HAVE_GETNAMEINFO
-+
-+/* Define to 1 if you have the `gettimeofday' function. */
-+#undef HAVE_GETTIMEOFDAY
-+
-+/* Define to 1 if you have the `inet_ntop' function. */
-+#undef HAVE_INET_NTOP
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if you have the `kqueue' function. */
-+#undef HAVE_KQUEUE
-+
-+/* Define to 1 if you have the `resolv' library (-lresolv). */
-+#undef HAVE_LIBRESOLV
-+
-+/* Define to 1 if you have the `socket' library (-lsocket). */
-+#undef HAVE_LIBSOCKET
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the <netinet/in6.h> header file. */
-+#undef HAVE_NETINET_IN6_H
-+
-+/* Define to 1 if you have the `poll' function. */
-+#undef HAVE_POLL
-+
-+/* Define to 1 if you have the <poll.h> header file. */
-+#undef HAVE_POLL_H
-+
-+/* Define to 1 if you have the `port_create' function. */
-+#undef HAVE_PORT_CREATE
-+
-+/* Define to 1 if you have the <port.h> header file. */
-+#undef HAVE_PORT_H
-+
-+/* Define if your system supports POSIX realtime signals */
-+#undef HAVE_RTSIG
-+
-+/* Define to 1 if you have the `select' function. */
-+#undef HAVE_SELECT
-+
-+/* Define if F_SETFD is defined in <fcntl.h> */
-+#undef HAVE_SETFD
-+
-+/* Define to 1 if you have the <signal.h> header file. */
-+#undef HAVE_SIGNAL_H
-+
-+/* Define to 1 if you have the `sigtimedwait' function. */
-+#undef HAVE_SIGTIMEDWAIT
-+
-+/* Define to 1 if you have the <stdarg.h> header file. */
-+#undef HAVE_STDARG_H
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the `strlcpy' function. */
-+#undef HAVE_STRLCPY
-+
-+/* Define to 1 if you have the `strsep' function. */
-+#undef HAVE_STRSEP
-+
-+/* Define to 1 if you have the `strtok_r' function. */
-+#undef HAVE_STRTOK_R
-+
-+/* Define to 1 if the system has the type `struct in6_addr'. */
-+#undef HAVE_STRUCT_IN6_ADDR
-+
-+/* Define to 1 if you have the <sys/devpoll.h> header file. */
-+#undef HAVE_SYS_DEVPOLL_H
-+
-+/* Define to 1 if you have the <sys/epoll.h> header file. */
-+#undef HAVE_SYS_EPOLL_H
-+
-+/* Define to 1 if you have the <sys/event.h> header file. */
-+#undef HAVE_SYS_EVENT_H
-+
-+/* Define to 1 if you have the <sys/ioctl.h> header file. */
-+#undef HAVE_SYS_IOCTL_H
-+
-+/* Define to 1 if you have the <sys/queue.h> header file. */
-+#undef HAVE_SYS_QUEUE_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
-+#undef HAVE_TAILQFOREACH
-+
-+/* Define if timeradd is defined in <sys/time.h> */
-+#undef HAVE_TIMERADD
-+
-+/* Define if timerclear is defined in <sys/time.h> */
-+#undef HAVE_TIMERCLEAR
-+
-+/* Define if timercmp is defined in <sys/time.h> */
-+#undef HAVE_TIMERCMP
-+
-+/* Define if timerisset is defined in <sys/time.h> */
-+#undef HAVE_TIMERISSET
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Define to 1 if you have the `vasprintf' function. */
-+#undef HAVE_VASPRINTF
-+
-+/* Define if kqueue works correctly with pipes */
-+#undef HAVE_WORKING_KQUEUE
-+
-+/* Define if realtime signals work on pipes */
-+#undef HAVE_WORKING_RTSIG
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#undef TIME_WITH_SYS_TIME
-+
-+/* Version number of package */
-+#undef VERSION
-+
-+/* Define to appropriate substitue if compiler doesnt have __func__ */
-+#undef __func__
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const
-+
-+/* 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
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+#undef pid_t
-+
-+/* Define to `unsigned' if <sys/types.h> does not define. */
-+#undef size_t
-+
-+/* Define to unsigned int if you dont have it */
-+#undef socklen_t
-diff -Nru php-5.2.4.vanilla/libevent/config.sub php-5.2.4.fpm/libevent/config.sub
---- php-5.2.4.vanilla/libevent/config.sub 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/config.sub 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,1563 @@
-+#! /bin/sh
-+# Configuration validation subroutine script.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+
-+timestamp='2005-02-10'
-+
-+# This file is (in principle) common to ALL GNU software.
-+# The presence of a machine in this file suggests that SOME GNU software
-+# can handle that machine. It does not imply ALL GNU software can.
-+#
-+# This file is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330,
-+# Boston, MA 02111-1307, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Please send patches to <config-patches@gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# Configuration subroutine to validate and canonicalize a configuration type.
-+# Supply the specified configuration type as an argument.
-+# If it is invalid, we print an error message on stderr and exit with code 1.
-+# Otherwise, we print the canonical config type on stdout and succeed.
-+
-+# This file is supposed to be the same for all GNU packages
-+# and recognize all the CPU types, system types and aliases
-+# that are meaningful with *any* GNU software.
-+# Each package is responsible for reporting which valid configurations
-+# it does not support. The user should be able to distinguish
-+# a failure to support a valid configuration from a meaningless
-+# configuration.
-+
-+# The goal of this file is to map all the various variations of a given
-+# machine specification into a single specification in the form:
-+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or in some cases, the newer four-part form:
-+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# It is wrong to echo any other type of specification.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+ $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help"
-+ exit 1 ;;
-+
-+ *local*)
-+ # First pass through any local machine types.
-+ echo $1
-+ exit 0;;
-+
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+ exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+ exit 1;;
-+esac
-+
-+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-+# Here we must recognize all the valid KERNEL-OS combinations.
-+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-+case $maybe_os in
-+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+ os=-$maybe_os
-+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-+ ;;
-+ *)
-+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-+ if [ $basic_machine != $1 ]
-+ then os=`echo $1 | sed 's/.*-/-/'`
-+ else os=; fi
-+ ;;
-+esac
-+
-+### Let's recognize common machines as not being operating systems so
-+### that things like config.sub decstation-3100 work. We also
-+### recognize some manufacturers as not being operating systems, so we
-+### can provide default operating systems below.
-+case $os in
-+ -sun*os*)
-+ # Prevent following clause from handling this invalid input.
-+ ;;
-+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-+ -apple | -axis | -knuth | -cray)
-+ os=
-+ basic_machine=$1
-+ ;;
-+ -sim | -cisco | -oki | -wec | -winbond)
-+ os=
-+ basic_machine=$1
-+ ;;
-+ -scout)
-+ ;;
-+ -wrs)
-+ os=-vxworks
-+ basic_machine=$1
-+ ;;
-+ -chorusos*)
-+ os=-chorusos
-+ basic_machine=$1
-+ ;;
-+ -chorusrdb)
-+ os=-chorusrdb
-+ basic_machine=$1
-+ ;;
-+ -hiux*)
-+ os=-hiuxwe2
-+ ;;
-+ -sco5)
-+ os=-sco3.2v5
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco4)
-+ os=-sco3.2v4
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco3.2.[4-9]*)
-+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco3.2v[4-9]*)
-+ # Don't forget version if it is 3.2v4 or newer.
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco*)
-+ os=-sco3.2v2
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -udk*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -isc)
-+ os=-isc2.2
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -clix*)
-+ basic_machine=clipper-intergraph
-+ ;;
-+ -isc*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -lynx*)
-+ os=-lynxos
-+ ;;
-+ -ptx*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-+ ;;
-+ -windowsnt*)
-+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
-+ ;;
-+ -psos*)
-+ os=-psos
-+ ;;
-+ -mint | -mint[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
-+ ;;
-+esac
-+
-+# Decode aliases for certain CPU-COMPANY combinations.
-+case $basic_machine in
-+ # Recognize the basic CPU types without company name.
-+ # Some are omitted here because they have special meanings below.
-+ 1750a | 580 \
-+ | a29k \
-+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+ | am33_2.0 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+ | c4x | clipper \
-+ | d10v | d30v | dlx | dsp16xx \
-+ | fr30 | frv \
-+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ | i370 | i860 | i960 | ia64 \
-+ | ip2k | iq2000 \
-+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-+ | mips | mipsbe | mipseb | mipsel | mipsle \
-+ | mips16 \
-+ | mips64 | mips64el \
-+ | mips64vr | mips64vrel \
-+ | mips64orion | mips64orionel \
-+ | mips64vr4100 | mips64vr4100el \
-+ | mips64vr4300 | mips64vr4300el \
-+ | mips64vr5000 | mips64vr5000el \
-+ | mipsisa32 | mipsisa32el \
-+ | mipsisa32r2 | mipsisa32r2el \
-+ | mipsisa64 | mipsisa64el \
-+ | mipsisa64r2 | mipsisa64r2el \
-+ | mipsisa64sb1 | mipsisa64sb1el \
-+ | mipsisa64sr71k | mipsisa64sr71kel \
-+ | mipstx39 | mipstx39el \
-+ | mn10200 | mn10300 \
-+ | msp430 \
-+ | ns16k | ns32k \
-+ | openrisc | or32 \
-+ | pdp10 | pdp11 | pj | pjl \
-+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ | pyramid \
-+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh64 | sh64le \
-+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-+ | strongarm \
-+ | tahoe | thumb | tic4x | tic80 | tron \
-+ | v850 | v850e \
-+ | we32k \
-+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | z8k)
-+ basic_machine=$basic_machine-unknown
-+ ;;
-+ m6811 | m68hc11 | m6812 | m68hc12)
-+ # Motorola 68HC11/12.
-+ basic_machine=$basic_machine-unknown
-+ os=-none
-+ ;;
-+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+ ;;
-+
-+ # We use `pc' rather than `unknown'
-+ # because (1) that's what they normally are, and
-+ # (2) the word "unknown" tends to confuse beginning users.
-+ i*86 | x86_64)
-+ basic_machine=$basic_machine-pc
-+ ;;
-+ # Object if more than one company name word.
-+ *-*-*)
-+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+ exit 1
-+ ;;
-+ # Recognize the basic CPU types with company name.
-+ 580-* \
-+ | a29k-* \
-+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | avr-* \
-+ | bs2000-* \
-+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+ | clipper-* | craynv-* | cydra-* \
-+ | d10v-* | d30v-* | dlx-* \
-+ | elxsi-* \
-+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | h8300-* | h8500-* \
-+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+ | i*86-* | i860-* | i960-* | ia64-* \
-+ | ip2k-* | iq2000-* \
-+ | m32r-* | m32rle-* \
-+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* \
-+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+ | mips16-* \
-+ | mips64-* | mips64el-* \
-+ | mips64vr-* | mips64vrel-* \
-+ | mips64orion-* | mips64orionel-* \
-+ | mips64vr4100-* | mips64vr4100el-* \
-+ | mips64vr4300-* | mips64vr4300el-* \
-+ | mips64vr5000-* | mips64vr5000el-* \
-+ | mipsisa32-* | mipsisa32el-* \
-+ | mipsisa32r2-* | mipsisa32r2el-* \
-+ | mipsisa64-* | mipsisa64el-* \
-+ | mipsisa64r2-* | mipsisa64r2el-* \
-+ | mipsisa64sb1-* | mipsisa64sb1el-* \
-+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+ | mipstx39-* | mipstx39el-* \
-+ | mmix-* \
-+ | msp430-* \
-+ | none-* | np1-* | ns16k-* | ns32k-* \
-+ | orion-* \
-+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ | pyramid-* \
-+ | romp-* | rs6000-* \
-+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | tahoe-* | thumb-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tron-* \
-+ | v850-* | v850e-* | vax-* \
-+ | we32k-* \
-+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | xstormy16-* | xtensa-* \
-+ | ymp-* \
-+ | z8k-*)
-+ ;;
-+ # Recognize the various machine names and aliases which stand
-+ # for a CPU type and a company and sometimes even an OS.
-+ 386bsd)
-+ basic_machine=i386-unknown
-+ os=-bsd
-+ ;;
-+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-+ basic_machine=m68000-att
-+ ;;
-+ 3b*)
-+ basic_machine=we32k-att
-+ ;;
-+ a29khif)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ abacus)
-+ basic_machine=abacus-unknown
-+ ;;
-+ adobe68k)
-+ basic_machine=m68010-adobe
-+ os=-scout
-+ ;;
-+ alliant | fx80)
-+ basic_machine=fx80-alliant
-+ ;;
-+ altos | altos3068)
-+ basic_machine=m68k-altos
-+ ;;
-+ am29k)
-+ basic_machine=a29k-none
-+ os=-bsd
-+ ;;
-+ amd64)
-+ basic_machine=x86_64-pc
-+ ;;
-+ amd64-*)
-+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ amdahl)
-+ basic_machine=580-amdahl
-+ os=-sysv
-+ ;;
-+ amiga | amiga-*)
-+ basic_machine=m68k-unknown
-+ ;;
-+ amigaos | amigados)
-+ basic_machine=m68k-unknown
-+ os=-amigaos
-+ ;;
-+ amigaunix | amix)
-+ basic_machine=m68k-unknown
-+ os=-sysv4
-+ ;;
-+ apollo68)
-+ basic_machine=m68k-apollo
-+ os=-sysv
-+ ;;
-+ apollo68bsd)
-+ basic_machine=m68k-apollo
-+ os=-bsd
-+ ;;
-+ aux)
-+ basic_machine=m68k-apple
-+ os=-aux
-+ ;;
-+ balance)
-+ basic_machine=ns32k-sequent
-+ os=-dynix
-+ ;;
-+ c90)
-+ basic_machine=c90-cray
-+ os=-unicos
-+ ;;
-+ convex-c1)
-+ basic_machine=c1-convex
-+ os=-bsd
-+ ;;
-+ convex-c2)
-+ basic_machine=c2-convex
-+ os=-bsd
-+ ;;
-+ convex-c32)
-+ basic_machine=c32-convex
-+ os=-bsd
-+ ;;
-+ convex-c34)
-+ basic_machine=c34-convex
-+ os=-bsd
-+ ;;
-+ convex-c38)
-+ basic_machine=c38-convex
-+ os=-bsd
-+ ;;
-+ cray | j90)
-+ basic_machine=j90-cray
-+ os=-unicos
-+ ;;
-+ craynv)
-+ basic_machine=craynv-cray
-+ os=-unicosmp
-+ ;;
-+ cr16c)
-+ basic_machine=cr16c-unknown
-+ os=-elf
-+ ;;
-+ crds | unos)
-+ basic_machine=m68k-crds
-+ ;;
-+ crisv32 | crisv32-* | etraxfs*)
-+ basic_machine=crisv32-axis
-+ ;;
-+ cris | cris-* | etrax*)
-+ basic_machine=cris-axis
-+ ;;
-+ crx)
-+ basic_machine=crx-unknown
-+ os=-elf
-+ ;;
-+ da30 | da30-*)
-+ basic_machine=m68k-da30
-+ ;;
-+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-+ basic_machine=mips-dec
-+ ;;
-+ decsystem10* | dec10*)
-+ basic_machine=pdp10-dec
-+ os=-tops10
-+ ;;
-+ decsystem20* | dec20*)
-+ basic_machine=pdp10-dec
-+ os=-tops20
-+ ;;
-+ delta | 3300 | motorola-3300 | motorola-delta \
-+ | 3300-motorola | delta-motorola)
-+ basic_machine=m68k-motorola
-+ ;;
-+ delta88)
-+ basic_machine=m88k-motorola
-+ os=-sysv3
-+ ;;
-+ djgpp)
-+ basic_machine=i586-pc
-+ os=-msdosdjgpp
-+ ;;
-+ dpx20 | dpx20-*)
-+ basic_machine=rs6000-bull
-+ os=-bosx
-+ ;;
-+ dpx2* | dpx2*-bull)
-+ basic_machine=m68k-bull
-+ os=-sysv3
-+ ;;
-+ ebmon29k)
-+ basic_machine=a29k-amd
-+ os=-ebmon
-+ ;;
-+ elxsi)
-+ basic_machine=elxsi-elxsi
-+ os=-bsd
-+ ;;
-+ encore | umax | mmax)
-+ basic_machine=ns32k-encore
-+ ;;
-+ es1800 | OSE68k | ose68k | ose | OSE)
-+ basic_machine=m68k-ericsson
-+ os=-ose
-+ ;;
-+ fx2800)
-+ basic_machine=i860-alliant
-+ ;;
-+ genix)
-+ basic_machine=ns32k-ns
-+ ;;
-+ gmicro)
-+ basic_machine=tron-gmicro
-+ os=-sysv
-+ ;;
-+ go32)
-+ basic_machine=i386-pc
-+ os=-go32
-+ ;;
-+ h3050r* | hiux*)
-+ basic_machine=hppa1.1-hitachi
-+ os=-hiuxwe2
-+ ;;
-+ h8300hms)
-+ basic_machine=h8300-hitachi
-+ os=-hms
-+ ;;
-+ h8300xray)
-+ basic_machine=h8300-hitachi
-+ os=-xray
-+ ;;
-+ h8500hms)
-+ basic_machine=h8500-hitachi
-+ os=-hms
-+ ;;
-+ harris)
-+ basic_machine=m88k-harris
-+ os=-sysv3
-+ ;;
-+ hp300-*)
-+ basic_machine=m68k-hp
-+ ;;
-+ hp300bsd)
-+ basic_machine=m68k-hp
-+ os=-bsd
-+ ;;
-+ hp300hpux)
-+ basic_machine=m68k-hp
-+ os=-hpux
-+ ;;
-+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hp9k2[0-9][0-9] | hp9k31[0-9])
-+ basic_machine=m68000-hp
-+ ;;
-+ hp9k3[2-9][0-9])
-+ basic_machine=m68k-hp
-+ ;;
-+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k78[0-9] | hp78[0-9])
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[0-9][13679] | hp8[0-9][13679])
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hppa-next)
-+ os=-nextstep3
-+ ;;
-+ hppaosf)
-+ basic_machine=hppa1.1-hp
-+ os=-osf
-+ ;;
-+ hppro)
-+ basic_machine=hppa1.1-hp
-+ os=-proelf
-+ ;;
-+ i370-ibm* | ibm*)
-+ basic_machine=i370-ibm
-+ ;;
-+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
-+ i*86v32)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv32
-+ ;;
-+ i*86v4*)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv4
-+ ;;
-+ i*86v)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv
-+ ;;
-+ i*86sol2)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-solaris2
-+ ;;
-+ i386mach)
-+ basic_machine=i386-mach
-+ os=-mach
-+ ;;
-+ i386-vsta | vsta)
-+ basic_machine=i386-unknown
-+ os=-vsta
-+ ;;
-+ iris | iris4d)
-+ basic_machine=mips-sgi
-+ case $os in
-+ -irix*)
-+ ;;
-+ *)
-+ os=-irix4
-+ ;;
-+ esac
-+ ;;
-+ isi68 | isi)
-+ basic_machine=m68k-isi
-+ os=-sysv
-+ ;;
-+ m88k-omron*)
-+ basic_machine=m88k-omron
-+ ;;
-+ magnum | m3230)
-+ basic_machine=mips-mips
-+ os=-sysv
-+ ;;
-+ merlin)
-+ basic_machine=ns32k-utek
-+ os=-sysv
-+ ;;
-+ mingw32)
-+ basic_machine=i386-pc
-+ os=-mingw32
-+ ;;
-+ miniframe)
-+ basic_machine=m68000-convergent
-+ ;;
-+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
-+ ;;
-+ mips3*-*)
-+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+ ;;
-+ mips3*)
-+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+ ;;
-+ monitor)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
-+ morphos)
-+ basic_machine=powerpc-unknown
-+ os=-morphos
-+ ;;
-+ msdos)
-+ basic_machine=i386-pc
-+ os=-msdos
-+ ;;
-+ mvs)
-+ basic_machine=i370-ibm
-+ os=-mvs
-+ ;;
-+ ncr3000)
-+ basic_machine=i486-ncr
-+ os=-sysv4
-+ ;;
-+ netbsd386)
-+ basic_machine=i386-unknown
-+ os=-netbsd
-+ ;;
-+ netwinder)
-+ basic_machine=armv4l-rebel
-+ os=-linux
-+ ;;
-+ news | news700 | news800 | news900)
-+ basic_machine=m68k-sony
-+ os=-newsos
-+ ;;
-+ news1000)
-+ basic_machine=m68030-sony
-+ os=-newsos
-+ ;;
-+ news-3600 | risc-news)
-+ basic_machine=mips-sony
-+ os=-newsos
-+ ;;
-+ necv70)
-+ basic_machine=v70-nec
-+ os=-sysv
-+ ;;
-+ next | m*-next )
-+ basic_machine=m68k-next
-+ case $os in
-+ -nextstep* )
-+ ;;
-+ -ns2*)
-+ os=-nextstep2
-+ ;;
-+ *)
-+ os=-nextstep3
-+ ;;
-+ esac
-+ ;;
-+ nh3000)
-+ basic_machine=m68k-harris
-+ os=-cxux
-+ ;;
-+ nh[45]000)
-+ basic_machine=m88k-harris
-+ os=-cxux
-+ ;;
-+ nindy960)
-+ basic_machine=i960-intel
-+ os=-nindy
-+ ;;
-+ mon960)
-+ basic_machine=i960-intel
-+ os=-mon960
-+ ;;
-+ nonstopux)
-+ basic_machine=mips-compaq
-+ os=-nonstopux
-+ ;;
-+ np1)
-+ basic_machine=np1-gould
-+ ;;
-+ nsr-tandem)
-+ basic_machine=nsr-tandem
-+ ;;
-+ op50n-* | op60c-*)
-+ basic_machine=hppa1.1-oki
-+ os=-proelf
-+ ;;
-+ or32 | or32-*)
-+ basic_machine=or32-unknown
-+ os=-coff
-+ ;;
-+ os400)
-+ basic_machine=powerpc-ibm
-+ os=-os400
-+ ;;
-+ OSE68000 | ose68000)
-+ basic_machine=m68000-ericsson
-+ os=-ose
-+ ;;
-+ os68k)
-+ basic_machine=m68k-none
-+ os=-os68k
-+ ;;
-+ pa-hitachi)
-+ basic_machine=hppa1.1-hitachi
-+ os=-hiuxwe2
-+ ;;
-+ paragon)
-+ basic_machine=i860-intel
-+ os=-osf
-+ ;;
-+ pbd)
-+ basic_machine=sparc-tti
-+ ;;
-+ pbb)
-+ basic_machine=m68k-tti
-+ ;;
-+ pc532 | pc532-*)
-+ basic_machine=ns32k-pc532
-+ ;;
-+ pentium | p5 | k5 | k6 | nexgen | viac3)
-+ basic_machine=i586-pc
-+ ;;
-+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
-+ basic_machine=i686-pc
-+ ;;
-+ pentiumii | pentium2 | pentiumiii | pentium3)
-+ basic_machine=i686-pc
-+ ;;
-+ pentium4)
-+ basic_machine=i786-pc
-+ ;;
-+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
-+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pentium4-*)
-+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ pn)
-+ basic_machine=pn-gould
-+ ;;
-+ power) basic_machine=power-ibm
-+ ;;
-+ ppc) basic_machine=powerpc-unknown
-+ ;;
-+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppcle | powerpclittle | ppc-le | powerpc-little)
-+ basic_machine=powerpcle-unknown
-+ ;;
-+ ppcle-* | powerpclittle-*)
-+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppc64) basic_machine=powerpc64-unknown
-+ ;;
-+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+ basic_machine=powerpc64le-unknown
-+ ;;
-+ ppc64le-* | powerpc64little-*)
-+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ps2)
-+ basic_machine=i386-ibm
-+ ;;
-+ pw32)
-+ basic_machine=i586-unknown
-+ os=-pw32
-+ ;;
-+ rom68k)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
-+ rm[46]00)
-+ basic_machine=mips-siemens
-+ ;;
-+ rtpc | rtpc-*)
-+ basic_machine=romp-ibm
-+ ;;
-+ s390 | s390-*)
-+ basic_machine=s390-ibm
-+ ;;
-+ s390x | s390x-*)
-+ basic_machine=s390x-ibm
-+ ;;
-+ sa29200)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ sb1)
-+ basic_machine=mipsisa64sb1-unknown
-+ ;;
-+ sb1el)
-+ basic_machine=mipsisa64sb1el-unknown
-+ ;;
-+ sei)
-+ basic_machine=mips-sei
-+ os=-seiux
-+ ;;
-+ sequent)
-+ basic_machine=i386-sequent
-+ ;;
-+ sh)
-+ basic_machine=sh-hitachi
-+ os=-hms
-+ ;;
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparclite-wrs | simso-wrs)
-+ basic_machine=sparclite-wrs
-+ os=-vxworks
-+ ;;
-+ sps7)
-+ basic_machine=m68k-bull
-+ os=-sysv2
-+ ;;
-+ spur)
-+ basic_machine=spur-unknown
-+ ;;
-+ st2000)
-+ basic_machine=m68k-tandem
-+ ;;
-+ stratus)
-+ basic_machine=i860-stratus
-+ os=-sysv4
-+ ;;
-+ sun2)
-+ basic_machine=m68000-sun
-+ ;;
-+ sun2os3)
-+ basic_machine=m68000-sun
-+ os=-sunos3
-+ ;;
-+ sun2os4)
-+ basic_machine=m68000-sun
-+ os=-sunos4
-+ ;;
-+ sun3os3)
-+ basic_machine=m68k-sun
-+ os=-sunos3
-+ ;;
-+ sun3os4)
-+ basic_machine=m68k-sun
-+ os=-sunos4
-+ ;;
-+ sun4os3)
-+ basic_machine=sparc-sun
-+ os=-sunos3
-+ ;;
-+ sun4os4)
-+ basic_machine=sparc-sun
-+ os=-sunos4
-+ ;;
-+ sun4sol2)
-+ basic_machine=sparc-sun
-+ os=-solaris2
-+ ;;
-+ sun3 | sun3-*)
-+ basic_machine=m68k-sun
-+ ;;
-+ sun4)
-+ basic_machine=sparc-sun
-+ ;;
-+ sun386 | sun386i | roadrunner)
-+ basic_machine=i386-sun
-+ ;;
-+ sv1)
-+ basic_machine=sv1-cray
-+ os=-unicos
-+ ;;
-+ symmetry)
-+ basic_machine=i386-sequent
-+ os=-dynix
-+ ;;
-+ t3e)
-+ basic_machine=alphaev5-cray
-+ os=-unicos
-+ ;;
-+ t90)
-+ basic_machine=t90-cray
-+ os=-unicos
-+ ;;
-+ tic54x | c54x*)
-+ basic_machine=tic54x-unknown
-+ os=-coff
-+ ;;
-+ tic55x | c55x*)
-+ basic_machine=tic55x-unknown
-+ os=-coff
-+ ;;
-+ tic6x | c6x*)
-+ basic_machine=tic6x-unknown
-+ os=-coff
-+ ;;
-+ tx39)
-+ basic_machine=mipstx39-unknown
-+ ;;
-+ tx39el)
-+ basic_machine=mipstx39el-unknown
-+ ;;
-+ toad1)
-+ basic_machine=pdp10-xkl
-+ os=-tops20
-+ ;;
-+ tower | tower-32)
-+ basic_machine=m68k-ncr
-+ ;;
-+ tpf)
-+ basic_machine=s390x-ibm
-+ os=-tpf
-+ ;;
-+ udi29k)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ ultra3)
-+ basic_machine=a29k-nyu
-+ os=-sym1
-+ ;;
-+ v810 | necv810)
-+ basic_machine=v810-nec
-+ os=-none
-+ ;;
-+ vaxv)
-+ basic_machine=vax-dec
-+ os=-sysv
-+ ;;
-+ vms)
-+ basic_machine=vax-dec
-+ os=-vms
-+ ;;
-+ vpp*|vx|vx-*)
-+ basic_machine=f301-fujitsu
-+ ;;
-+ vxworks960)
-+ basic_machine=i960-wrs
-+ os=-vxworks
-+ ;;
-+ vxworks68)
-+ basic_machine=m68k-wrs
-+ os=-vxworks
-+ ;;
-+ vxworks29k)
-+ basic_machine=a29k-wrs
-+ os=-vxworks
-+ ;;
-+ w65*)
-+ basic_machine=w65-wdc
-+ os=-none
-+ ;;
-+ w89k-*)
-+ basic_machine=hppa1.1-winbond
-+ os=-proelf
-+ ;;
-+ xbox)
-+ basic_machine=i686-pc
-+ os=-mingw32
-+ ;;
-+ xps | xps100)
-+ basic_machine=xps100-honeywell
-+ ;;
-+ ymp)
-+ basic_machine=ymp-cray
-+ os=-unicos
-+ ;;
-+ z8k-*-coff)
-+ basic_machine=z8k-unknown
-+ os=-sim
-+ ;;
-+ none)
-+ basic_machine=none-none
-+ os=-none
-+ ;;
-+
-+# Here we handle the default manufacturer of certain CPU types. It is in
-+# some cases the only manufacturer, in others, it is the most popular.
-+ w89k)
-+ basic_machine=hppa1.1-winbond
-+ ;;
-+ op50n)
-+ basic_machine=hppa1.1-oki
-+ ;;
-+ op60c)
-+ basic_machine=hppa1.1-oki
-+ ;;
-+ romp)
-+ basic_machine=romp-ibm
-+ ;;
-+ mmix)
-+ basic_machine=mmix-knuth
-+ ;;
-+ rs6000)
-+ basic_machine=rs6000-ibm
-+ ;;
-+ vax)
-+ basic_machine=vax-dec
-+ ;;
-+ pdp10)
-+ # there are many clones, so DEC is not a safe bet
-+ basic_machine=pdp10-unknown
-+ ;;
-+ pdp11)
-+ basic_machine=pdp11-dec
-+ ;;
-+ we32k)
-+ basic_machine=we32k-att
-+ ;;
-+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+ basic_machine=sh-unknown
-+ ;;
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparc | sparcv8 | sparcv9 | sparcv9b)
-+ basic_machine=sparc-sun
-+ ;;
-+ cydra)
-+ basic_machine=cydra-cydrome
-+ ;;
-+ orion)
-+ basic_machine=orion-highlevel
-+ ;;
-+ orion105)
-+ basic_machine=clipper-highlevel
-+ ;;
-+ mac | mpw | mac-mpw)
-+ basic_machine=m68k-apple
-+ ;;
-+ pmac | pmac-mpw)
-+ basic_machine=powerpc-apple
-+ ;;
-+ *-unknown)
-+ # Make sure to match an already-canonicalized machine name.
-+ ;;
-+ *)
-+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+ exit 1
-+ ;;
-+esac
-+
-+# Here we canonicalize certain aliases for manufacturers.
-+case $basic_machine in
-+ *-digital*)
-+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-+ ;;
-+ *-commodore*)
-+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-+ ;;
-+ *)
-+ ;;
-+esac
-+
-+# Decode manufacturer-specific aliases for certain operating systems.
-+
-+if [ x"$os" != x"" ]
-+then
-+case $os in
-+ # First match some system type aliases
-+ # that might get confused with valid system types.
-+ # -solaris* is a basic system type, with this one exception.
-+ -solaris1 | -solaris1.*)
-+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
-+ ;;
-+ -solaris)
-+ os=-solaris2
-+ ;;
-+ -svr4*)
-+ os=-sysv4
-+ ;;
-+ -unixware*)
-+ os=-sysv4.2uw
-+ ;;
-+ -gnu/linux*)
-+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-+ ;;
-+ # First accept the basic system types.
-+ # The portable systems comes first.
-+ # Each alternative MUST END IN A *, to match a version number.
-+ # -sysv* is not here because it comes later, after sysvr4.
-+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+ | -aos* \
-+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+ | -chorusos* | -chorusrdb* \
-+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+ | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-+ # Remember, each alternative MUST END IN *, to match a version number.
-+ ;;
-+ -qnx*)
-+ case $basic_machine in
-+ x86-* | i*86-*)
-+ ;;
-+ *)
-+ os=-nto$os
-+ ;;
-+ esac
-+ ;;
-+ -nto-qnx*)
-+ ;;
-+ -nto*)
-+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+ ;;
-+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+ ;;
-+ -mac*)
-+ os=`echo $os | sed -e 's|mac|macos|'`
-+ ;;
-+ -linux-dietlibc)
-+ os=-linux-dietlibc
-+ ;;
-+ -sunos5*)
-+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
-+ ;;
-+ -sunos6*)
-+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
-+ ;;
-+ -opened*)
-+ os=-openedition
-+ ;;
-+ -os400*)
-+ os=-os400
-+ ;;
-+ -wince*)
-+ os=-wince
-+ ;;
-+ -osfrose*)
-+ os=-osfrose
-+ ;;
-+ -osf*)
-+ os=-osf
-+ ;;
-+ -utek*)
-+ os=-bsd
-+ ;;
-+ -dynix*)
-+ os=-bsd
-+ ;;
-+ -acis*)
-+ os=-aos
-+ ;;
-+ -atheos*)
-+ os=-atheos
-+ ;;
-+ -syllable*)
-+ os=-syllable
-+ ;;
-+ -386bsd)
-+ os=-bsd
-+ ;;
-+ -ctix* | -uts*)
-+ os=-sysv
-+ ;;
-+ -nova*)
-+ os=-rtmk-nova
-+ ;;
-+ -ns2 )
-+ os=-nextstep2
-+ ;;
-+ -nsk*)
-+ os=-nsk
-+ ;;
-+ # Preserve the version number of sinix5.
-+ -sinix5.*)
-+ os=`echo $os | sed -e 's|sinix|sysv|'`
-+ ;;
-+ -sinix*)
-+ os=-sysv4
-+ ;;
-+ -tpf*)
-+ os=-tpf
-+ ;;
-+ -triton*)
-+ os=-sysv3
-+ ;;
-+ -oss*)
-+ os=-sysv3
-+ ;;
-+ -svr4)
-+ os=-sysv4
-+ ;;
-+ -svr3)
-+ os=-sysv3
-+ ;;
-+ -sysvr4)
-+ os=-sysv4
-+ ;;
-+ # This must come after -sysvr4.
-+ -sysv*)
-+ ;;
-+ -ose*)
-+ os=-ose
-+ ;;
-+ -es1800*)
-+ os=-ose
-+ ;;
-+ -xenix)
-+ os=-xenix
-+ ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ os=-mint
-+ ;;
-+ -aros*)
-+ os=-aros
-+ ;;
-+ -kaos*)
-+ os=-kaos
-+ ;;
-+ -zvmoe)
-+ os=-zvmoe
-+ ;;
-+ -none)
-+ ;;
-+ *)
-+ # Get rid of the `-' at the beginning of $os.
-+ os=`echo $os | sed 's/[^-]*-//'`
-+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-+ exit 1
-+ ;;
-+esac
-+else
-+
-+# Here we handle the default operating systems that come with various machines.
-+# The value should be what the vendor currently ships out the door with their
-+# machine or put another way, the most popular os provided with the machine.
-+
-+# Note that if you're going to try to match "-MANUFACTURER" here (say,
-+# "-sun"), then you have to tell the case statement up towards the top
-+# that MANUFACTURER isn't an operating system. Otherwise, code above
-+# will signal an error saying that MANUFACTURER isn't an operating
-+# system, and we'll never get to this point.
-+
-+case $basic_machine in
-+ *-acorn)
-+ os=-riscix1.2
-+ ;;
-+ arm*-rebel)
-+ os=-linux
-+ ;;
-+ arm*-semi)
-+ os=-aout
-+ ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
-+ # This must come before the *-dec entry.
-+ pdp10-*)
-+ os=-tops20
-+ ;;
-+ pdp11-*)
-+ os=-none
-+ ;;
-+ *-dec | vax-*)
-+ os=-ultrix4.2
-+ ;;
-+ m68*-apollo)
-+ os=-domain
-+ ;;
-+ i386-sun)
-+ os=-sunos4.0.2
-+ ;;
-+ m68000-sun)
-+ os=-sunos3
-+ # This also exists in the configure program, but was not the
-+ # default.
-+ # os=-sunos4
-+ ;;
-+ m68*-cisco)
-+ os=-aout
-+ ;;
-+ mips*-cisco)
-+ os=-elf
-+ ;;
-+ mips*-*)
-+ os=-elf
-+ ;;
-+ or32-*)
-+ os=-coff
-+ ;;
-+ *-tti) # must be before sparc entry or we get the wrong os.
-+ os=-sysv3
-+ ;;
-+ sparc-* | *-sun)
-+ os=-sunos4.1.1
-+ ;;
-+ *-be)
-+ os=-beos
-+ ;;
-+ *-ibm)
-+ os=-aix
-+ ;;
-+ *-knuth)
-+ os=-mmixware
-+ ;;
-+ *-wec)
-+ os=-proelf
-+ ;;
-+ *-winbond)
-+ os=-proelf
-+ ;;
-+ *-oki)
-+ os=-proelf
-+ ;;
-+ *-hp)
-+ os=-hpux
-+ ;;
-+ *-hitachi)
-+ os=-hiux
-+ ;;
-+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-+ os=-sysv
-+ ;;
-+ *-cbm)
-+ os=-amigaos
-+ ;;
-+ *-dg)
-+ os=-dgux
-+ ;;
-+ *-dolphin)
-+ os=-sysv3
-+ ;;
-+ m68k-ccur)
-+ os=-rtu
-+ ;;
-+ m88k-omron*)
-+ os=-luna
-+ ;;
-+ *-next )
-+ os=-nextstep
-+ ;;
-+ *-sequent)
-+ os=-ptx
-+ ;;
-+ *-crds)
-+ os=-unos
-+ ;;
-+ *-ns)
-+ os=-genix
-+ ;;
-+ i370-*)
-+ os=-mvs
-+ ;;
-+ *-next)
-+ os=-nextstep3
-+ ;;
-+ *-gould)
-+ os=-sysv
-+ ;;
-+ *-highlevel)
-+ os=-bsd
-+ ;;
-+ *-encore)
-+ os=-bsd
-+ ;;
-+ *-sgi)
-+ os=-irix
-+ ;;
-+ *-siemens)
-+ os=-sysv4
-+ ;;
-+ *-masscomp)
-+ os=-rtu
-+ ;;
-+ f30[01]-fujitsu | f700-fujitsu)
-+ os=-uxpv
-+ ;;
-+ *-rom68k)
-+ os=-coff
-+ ;;
-+ *-*bug)
-+ os=-coff
-+ ;;
-+ *-apple)
-+ os=-macos
-+ ;;
-+ *-atari*)
-+ os=-mint
-+ ;;
-+ *)
-+ os=-none
-+ ;;
-+esac
-+fi
-+
-+# Here we handle the case where we know the os, and the CPU type, but not the
-+# manufacturer. We pick the logical manufacturer.
-+vendor=unknown
-+case $basic_machine in
-+ *-unknown)
-+ case $os in
-+ -riscix*)
-+ vendor=acorn
-+ ;;
-+ -sunos*)
-+ vendor=sun
-+ ;;
-+ -aix*)
-+ vendor=ibm
-+ ;;
-+ -beos*)
-+ vendor=be
-+ ;;
-+ -hpux*)
-+ vendor=hp
-+ ;;
-+ -mpeix*)
-+ vendor=hp
-+ ;;
-+ -hiux*)
-+ vendor=hitachi
-+ ;;
-+ -unos*)
-+ vendor=crds
-+ ;;
-+ -dgux*)
-+ vendor=dg
-+ ;;
-+ -luna*)
-+ vendor=omron
-+ ;;
-+ -genix*)
-+ vendor=ns
-+ ;;
-+ -mvs* | -opened*)
-+ vendor=ibm
-+ ;;
-+ -os400*)
-+ vendor=ibm
-+ ;;
-+ -ptx*)
-+ vendor=sequent
-+ ;;
-+ -tpf*)
-+ vendor=ibm
-+ ;;
-+ -vxsim* | -vxworks* | -windiss*)
-+ vendor=wrs
-+ ;;
-+ -aux*)
-+ vendor=apple
-+ ;;
-+ -hms*)
-+ vendor=hitachi
-+ ;;
-+ -mpw* | -macos*)
-+ vendor=apple
-+ ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ vendor=atari
-+ ;;
-+ -vos*)
-+ vendor=stratus
-+ ;;
-+ esac
-+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+ ;;
-+esac
-+
-+echo $basic_machine$os
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff -Nru php-5.2.4.vanilla/libevent/configure php-5.2.4.fpm/libevent/configure
---- php-5.2.4.vanilla/libevent/configure 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/configure 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,23380 @@
-+#! /bin/sh
-+# Guess values for system-dependent variables and create Makefiles.
-+# Generated by GNU Autoconf 2.59.
-+#
-+# Copyright (C) 2003 Free Software Foundation, Inc.
-+# This configure script is free software; the Free Software Foundation
-+# gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization. ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+ set -o posix
-+fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-+
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+$as_unset ENV MAIL MAILPATH
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+ as_basename=basename
-+else
-+ as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)$' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+ /^X\/\(\/\/\)$/{ s//\1/; q; }
-+ /^X\/\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+
-+
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
-+fi
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" || {
-+ # Find who we are. Look in the path if we contain no path at all
-+ # relative or not.
-+ case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+
-+ ;;
-+ esac
-+ # We did not find ourselves, most probably we were run as `sh COMMAND'
-+ # in which case we are not to be found in the path.
-+ if test "x$as_myself" = x; then
-+ as_myself=$0
-+ fi
-+ if test ! -f "$as_myself"; then
-+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-+ { (exit 1); exit 1; }; }
-+ fi
-+ case $CONFIG_SHELL in
-+ '')
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for as_base in sh bash ksh sh5; do
-+ case $as_dir in
-+ /*)
-+ if ("$as_dir/$as_base" -c '
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-+ CONFIG_SHELL=$as_dir/$as_base
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-+ fi;;
-+ esac
-+ done
-+done
-+;;
-+ esac
-+
-+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+ # uniformly replaced by the line number. The first 'sed' inserts a
-+ # line-number line before each line; the second 'sed' does the real
-+ # work. The second script uses 'N' to pair each line-number line
-+ # with the numbered line, and appends trailing '-' during
-+ # substitution so that $LINENO is not a special case at line end.
-+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-+ sed '=' <$as_myself |
-+ sed '
-+ N
-+ s,$,-,
-+ : loop
-+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ t loop
-+ s,-$,,
-+ s,^['$as_cr_digits']*\n,,
-+ ' >$as_me.lineno &&
-+ chmod +x $as_me.lineno ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+ { (exit 1); exit 1; }; }
-+
-+ # Don't try to exec as it changes $[0], causing all sort of problems
-+ # (the dirname of $[0] is not the place where we might find the
-+ # original and so on. Autoconf is especially sensible to this).
-+ . ./$as_me.lineno
-+ # Exit status is that of the last command.
-+ exit
-+}
-+
-+
-+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-+ *c*,-n*) ECHO_N= ECHO_C='
-+' ECHO_T=' ' ;;
-+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ # We could just check for DJGPP; but this test a) works b) is more generic
-+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-+ if test -f conf$$.exe; then
-+ # Don't use ln at all; we don't have any links
-+ as_ln_s='cp -p'
-+ else
-+ as_ln_s='ln -s'
-+ fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
-+else
-+ as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.file
-+
-+if mkdir -p . 2>/dev/null; then
-+ as_mkdir_p=:
-+else
-+ test -d ./-p && rmdir ./-p
-+ as_mkdir_p=false
-+fi
-+
-+as_executable_p="test -f"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" $as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+
-+
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+ # Remove one level of quotation (which was required for Make).
-+ ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-+ ;;
-+esac
-+
-+echo=${ECHO-echo}
-+if test "X$1" = X--no-reexec; then
-+ # Discard the --no-reexec flag, and continue.
-+ shift
-+elif test "X$1" = X--fallback-echo; then
-+ # Avoid inline document here, it may be left over
-+ :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-+ # Yippee, $echo works!
-+ :
-+else
-+ # Restart under the correct shell.
-+ exec $SHELL "$0" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+ # used as fallback echo
-+ shift
-+ cat <<EOF
-+$*
-+EOF
-+ exit 0
-+fi
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+ if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-+ echo_test_string="`eval $cmd`" &&
-+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+ then
-+ break
-+ fi
-+ done
-+fi
-+
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ :
-+else
-+ # The Solaris, AIX, and Digital Unix default echo programs unquote
-+ # backslashes. This makes it impossible to quote backslashes using
-+ # echo "$something" | sed 's/\\/\\\\/g'
-+ #
-+ # So, first we look for a working echo in the user's PATH.
-+
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for dir in $PATH /usr/ucb; do
-+ IFS="$lt_save_ifs"
-+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ echo="$dir/echo"
-+ break
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+
-+ if test "X$echo" = Xecho; then
-+ # We didn't find a better echo, so look for alternatives.
-+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ # This shell has a builtin print -r that does the trick.
-+ echo='print -r'
-+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-+ test "X$CONFIG_SHELL" != X/bin/ksh; then
-+ # If we have ksh, try running configure again with it.
-+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+ export ORIGINAL_CONFIG_SHELL
-+ CONFIG_SHELL=/bin/ksh
-+ export CONFIG_SHELL
-+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-+ else
-+ # Try using printf.
-+ echo='printf %s\n'
-+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ # Cool, printf works
-+ :
-+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+ test "X$echo_testing_string" = 'X\t' &&
-+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+ export CONFIG_SHELL
-+ SHELL="$CONFIG_SHELL"
-+ export SHELL
-+ echo="$CONFIG_SHELL $0 --fallback-echo"
-+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-+ test "X$echo_testing_string" = 'X\t' &&
-+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ echo="$CONFIG_SHELL $0 --fallback-echo"
-+ else
-+ # maybe with a smaller string...
-+ prev=:
-+
-+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-+ then
-+ break
-+ fi
-+ prev="$cmd"
-+ done
-+
-+ if test "$prev" != 'sed 50q "$0"'; then
-+ echo_test_string=`eval $prev`
-+ export echo_test_string
-+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+ else
-+ # Oops. We lost completely, so just stick with echo.
-+ echo=echo
-+ fi
-+ fi
-+ fi
-+ fi
-+fi
-+fi
-+
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-+ ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-+fi
-+
-+
-+
-+
-+tagnames=${tagnames+${tagnames},}CXX
-+
-+tagnames=${tagnames+${tagnames},}F77
-+
-+# Name of the host.
-+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+exec 6>&1
-+
-+#
-+# Initializations.
-+#
-+ac_default_prefix=/usr/local
-+ac_config_libobj_dir=.
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+# Maximum number of lines to put in a shell here document.
-+# This variable seems obsolete. It should probably be removed, and
-+# only ac_max_sed_lines should be used.
-+: ${ac_max_here_lines=38}
-+
-+# Identity of this package.
-+PACKAGE_NAME=
-+PACKAGE_TARNAME=
-+PACKAGE_VERSION=
-+PACKAGE_STRING=
-+PACKAGE_BUGREPORT=
-+
-+ac_unique_file="event.c"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#if HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#if HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#if STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# if HAVE_STDLIB_H
-+# include <stdlib.h>
-+# endif
-+#endif
-+#if HAVE_STRING_H
-+# if !STDC_HEADERS && HAVE_MEMORY_H
-+# include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#if HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#if HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#else
-+# if HAVE_STDINT_H
-+# include <stdint.h>
-+# endif
-+#endif
-+#if HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-+
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS BUILD_WIN32_TRUE BUILD_WIN32_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_files=''
-+
-+# Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+cache_file=/dev/null
-+exec_prefix=NONE
-+no_create=
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# and all the variables that are supposed to be based on exec_prefix
-+# by default will actually change.
-+# Use braces instead of parens because sh, perl, etc. also accept them.
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
-+datadir='${prefix}/share'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+libdir='${exec_prefix}/lib'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
-+infodir='${prefix}/info'
-+mandir='${prefix}/man'
-+
-+ac_prev=
-+for ac_option
-+do
-+ # If the previous option needs an argument, assign it.
-+ if test -n "$ac_prev"; then
-+ eval "$ac_prev=\$ac_option"
-+ ac_prev=
-+ continue
-+ fi
-+
-+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+
-+ # Accept the important Cygnus configure options, so we can diagnose typos.
-+
-+ case $ac_option in
-+
-+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
-+ ac_prev=bindir ;;
-+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-+ bindir=$ac_optarg ;;
-+
-+ -build | --build | --buil | --bui | --bu)
-+ ac_prev=build_alias ;;
-+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+ build_alias=$ac_optarg ;;
-+
-+ -cache-file | --cache-file | --cache-fil | --cache-fi \
-+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+ ac_prev=cache_file ;;
-+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+ cache_file=$ac_optarg ;;
-+
-+ --config-cache | -C)
-+ cache_file=config.cache ;;
-+
-+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+ ac_prev=datadir ;;
-+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-+ | --da=*)
-+ datadir=$ac_optarg ;;
-+
-+ -disable-* | --disable-*)
-+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ eval "enable_$ac_feature=no" ;;
-+
-+ -enable-* | --enable-*)
-+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+ case $ac_option in
-+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-+ *) ac_optarg=yes ;;
-+ esac
-+ eval "enable_$ac_feature='$ac_optarg'" ;;
-+
-+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-+ | --exec | --exe | --ex)
-+ ac_prev=exec_prefix ;;
-+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-+ | --exec=* | --exe=* | --ex=*)
-+ exec_prefix=$ac_optarg ;;
-+
-+ -gas | --gas | --ga | --g)
-+ # Obsolete; use --with-gas.
-+ with_gas=yes ;;
-+
-+ -help | --help | --hel | --he | -h)
-+ ac_init_help=long ;;
-+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+ ac_init_help=recursive ;;
-+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+ ac_init_help=short ;;
-+
-+ -host | --host | --hos | --ho)
-+ ac_prev=host_alias ;;
-+ -host=* | --host=* | --hos=* | --ho=*)
-+ host_alias=$ac_optarg ;;
-+
-+ -includedir | --includedir | --includedi | --included | --include \
-+ | --includ | --inclu | --incl | --inc)
-+ ac_prev=includedir ;;
-+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-+ | --includ=* | --inclu=* | --incl=* | --inc=*)
-+ includedir=$ac_optarg ;;
-+
-+ -infodir | --infodir | --infodi | --infod | --info | --inf)
-+ ac_prev=infodir ;;
-+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-+ infodir=$ac_optarg ;;
-+
-+ -libdir | --libdir | --libdi | --libd)
-+ ac_prev=libdir ;;
-+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
-+ libdir=$ac_optarg ;;
-+
-+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-+ | --libexe | --libex | --libe)
-+ ac_prev=libexecdir ;;
-+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-+ | --libexe=* | --libex=* | --libe=*)
-+ libexecdir=$ac_optarg ;;
-+
-+ -localstatedir | --localstatedir | --localstatedi | --localstated \
-+ | --localstate | --localstat | --localsta | --localst \
-+ | --locals | --local | --loca | --loc | --lo)
-+ ac_prev=localstatedir ;;
-+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+ localstatedir=$ac_optarg ;;
-+
-+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-+ ac_prev=mandir ;;
-+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-+ mandir=$ac_optarg ;;
-+
-+ -nfp | --nfp | --nf)
-+ # Obsolete; use --without-fp.
-+ with_fp=no ;;
-+
-+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+ | --no-cr | --no-c | -n)
-+ no_create=yes ;;
-+
-+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+ no_recursion=yes ;;
-+
-+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-+ | --oldin | --oldi | --old | --ol | --o)
-+ ac_prev=oldincludedir ;;
-+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-+ oldincludedir=$ac_optarg ;;
-+
-+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+ ac_prev=prefix ;;
-+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+ prefix=$ac_optarg ;;
-+
-+ -program-prefix | --program-prefix | --program-prefi | --program-pref \
-+ | --program-pre | --program-pr | --program-p)
-+ ac_prev=program_prefix ;;
-+ -program-prefix=* | --program-prefix=* | --program-prefi=* \
-+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-+ program_prefix=$ac_optarg ;;
-+
-+ -program-suffix | --program-suffix | --program-suffi | --program-suff \
-+ | --program-suf | --program-su | --program-s)
-+ ac_prev=program_suffix ;;
-+ -program-suffix=* | --program-suffix=* | --program-suffi=* \
-+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-+ program_suffix=$ac_optarg ;;
-+
-+ -program-transform-name | --program-transform-name \
-+ | --program-transform-nam | --program-transform-na \
-+ | --program-transform-n | --program-transform- \
-+ | --program-transform | --program-transfor \
-+ | --program-transfo | --program-transf \
-+ | --program-trans | --program-tran \
-+ | --progr-tra | --program-tr | --program-t)
-+ ac_prev=program_transform_name ;;
-+ -program-transform-name=* | --program-transform-name=* \
-+ | --program-transform-nam=* | --program-transform-na=* \
-+ | --program-transform-n=* | --program-transform-=* \
-+ | --program-transform=* | --program-transfor=* \
-+ | --program-transfo=* | --program-transf=* \
-+ | --program-trans=* | --program-tran=* \
-+ | --progr-tra=* | --program-tr=* | --program-t=*)
-+ program_transform_name=$ac_optarg ;;
-+
-+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+ | -silent | --silent | --silen | --sile | --sil)
-+ silent=yes ;;
-+
-+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-+ ac_prev=sbindir ;;
-+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-+ | --sbi=* | --sb=*)
-+ sbindir=$ac_optarg ;;
-+
-+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
-+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-+ | --sharedst | --shareds | --shared | --share | --shar \
-+ | --sha | --sh)
-+ ac_prev=sharedstatedir ;;
-+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-+ | --sha=* | --sh=*)
-+ sharedstatedir=$ac_optarg ;;
-+
-+ -site | --site | --sit)
-+ ac_prev=site ;;
-+ -site=* | --site=* | --sit=*)
-+ site=$ac_optarg ;;
-+
-+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+ ac_prev=srcdir ;;
-+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+ srcdir=$ac_optarg ;;
-+
-+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-+ | --syscon | --sysco | --sysc | --sys | --sy)
-+ ac_prev=sysconfdir ;;
-+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-+ sysconfdir=$ac_optarg ;;
-+
-+ -target | --target | --targe | --targ | --tar | --ta | --t)
-+ ac_prev=target_alias ;;
-+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+ target_alias=$ac_optarg ;;
-+
-+ -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+ verbose=yes ;;
-+
-+ -version | --version | --versio | --versi | --vers | -V)
-+ ac_init_version=: ;;
-+
-+ -with-* | --with-*)
-+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_package=`echo $ac_package| sed 's/-/_/g'`
-+ case $ac_option in
-+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-+ *) ac_optarg=yes ;;
-+ esac
-+ eval "with_$ac_package='$ac_optarg'" ;;
-+
-+ -without-* | --without-*)
-+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid package name: $ac_package" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_package=`echo $ac_package | sed 's/-/_/g'`
-+ eval "with_$ac_package=no" ;;
-+
-+ --x)
-+ # Obsolete; use --with-x.
-+ with_x=yes ;;
-+
-+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-+ | --x-incl | --x-inc | --x-in | --x-i)
-+ ac_prev=x_includes ;;
-+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-+ x_includes=$ac_optarg ;;
-+
-+ -x-libraries | --x-libraries | --x-librarie | --x-librari \
-+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-+ ac_prev=x_libraries ;;
-+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-+ x_libraries=$ac_optarg ;;
-+
-+ -*) { echo "$as_me: error: unrecognized option: $ac_option
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; }
-+ ;;
-+
-+ *=*)
-+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-+ # Reject names that are not valid shell variable names.
-+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+ { (exit 1); exit 1; }; }
-+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-+ eval "$ac_envvar='$ac_optarg'"
-+ export $ac_envvar ;;
-+
-+ *)
-+ # FIXME: should be removed in autoconf 3.0.
-+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+ ;;
-+
-+ esac
-+done
-+
-+if test -n "$ac_prev"; then
-+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-+ { echo "$as_me: error: missing argument to $ac_option" >&2
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+# Be sure to have absolute paths.
-+for ac_var in exec_prefix prefix
-+do
-+ eval ac_val=$`echo $ac_var`
-+ case $ac_val in
-+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; };;
-+ esac
-+done
-+
-+# Be sure to have absolute paths.
-+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-+ localstatedir libdir includedir oldincludedir infodir mandir
-+do
-+ eval ac_val=$`echo $ac_var`
-+ case $ac_val in
-+ [\\/$]* | ?:[\\/]* ) ;;
-+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; };;
-+ esac
-+done
-+
-+# There might be people who depend on the old broken behavior: `$host'
-+# used to hold the argument of --host etc.
-+# FIXME: To remove some day.
-+build=$build_alias
-+host=$host_alias
-+target=$target_alias
-+
-+# FIXME: To remove some day.
-+if test "x$host_alias" != x; then
-+ if test "x$build_alias" = x; then
-+ cross_compiling=maybe
-+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+ If a cross compiler is detected then cross compile mode will be used." >&2
-+ elif test "x$build_alias" != "x$host_alias"; then
-+ cross_compiling=yes
-+ fi
-+fi
-+
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+test "$silent" = yes && exec 6>/dev/null
-+
-+
-+# Find the source files, if location was not specified.
-+if test -z "$srcdir"; then
-+ ac_srcdir_defaulted=yes
-+ # Try the directory containing this script, then its parent.
-+ ac_confdir=`(dirname "$0") 2>/dev/null ||
-+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$0" : 'X\(//\)[^/]' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$0" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ srcdir=$ac_confdir
-+ if test ! -r $srcdir/$ac_unique_file; then
-+ srcdir=..
-+ fi
-+else
-+ ac_srcdir_defaulted=no
-+fi
-+if test ! -r $srcdir/$ac_unique_file; then
-+ if test "$ac_srcdir_defaulted" = yes; then
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-+ { (exit 1); exit 1; }; }
-+ else
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { (exit 1); exit 1; }; }
-+ fi
-+fi
-+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-+ { (exit 1); exit 1; }; }
-+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-+ac_env_build_alias_set=${build_alias+set}
-+ac_env_build_alias_value=$build_alias
-+ac_cv_env_build_alias_set=${build_alias+set}
-+ac_cv_env_build_alias_value=$build_alias
-+ac_env_host_alias_set=${host_alias+set}
-+ac_env_host_alias_value=$host_alias
-+ac_cv_env_host_alias_set=${host_alias+set}
-+ac_cv_env_host_alias_value=$host_alias
-+ac_env_target_alias_set=${target_alias+set}
-+ac_env_target_alias_value=$target_alias
-+ac_cv_env_target_alias_set=${target_alias+set}
-+ac_cv_env_target_alias_value=$target_alias
-+ac_env_CC_set=${CC+set}
-+ac_env_CC_value=$CC
-+ac_cv_env_CC_set=${CC+set}
-+ac_cv_env_CC_value=$CC
-+ac_env_CFLAGS_set=${CFLAGS+set}
-+ac_env_CFLAGS_value=$CFLAGS
-+ac_cv_env_CFLAGS_set=${CFLAGS+set}
-+ac_cv_env_CFLAGS_value=$CFLAGS
-+ac_env_LDFLAGS_set=${LDFLAGS+set}
-+ac_env_LDFLAGS_value=$LDFLAGS
-+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-+ac_cv_env_LDFLAGS_value=$LDFLAGS
-+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-+ac_env_CPPFLAGS_value=$CPPFLAGS
-+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-+ac_env_CPP_set=${CPP+set}
-+ac_env_CPP_value=$CPP
-+ac_cv_env_CPP_set=${CPP+set}
-+ac_cv_env_CPP_value=$CPP
-+ac_env_CXX_set=${CXX+set}
-+ac_env_CXX_value=$CXX
-+ac_cv_env_CXX_set=${CXX+set}
-+ac_cv_env_CXX_value=$CXX
-+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-+ac_env_CXXFLAGS_value=$CXXFLAGS
-+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-+ac_env_CXXCPP_set=${CXXCPP+set}
-+ac_env_CXXCPP_value=$CXXCPP
-+ac_cv_env_CXXCPP_set=${CXXCPP+set}
-+ac_cv_env_CXXCPP_value=$CXXCPP
-+ac_env_F77_set=${F77+set}
-+ac_env_F77_value=$F77
-+ac_cv_env_F77_set=${F77+set}
-+ac_cv_env_F77_value=$F77
-+ac_env_FFLAGS_set=${FFLAGS+set}
-+ac_env_FFLAGS_value=$FFLAGS
-+ac_cv_env_FFLAGS_set=${FFLAGS+set}
-+ac_cv_env_FFLAGS_value=$FFLAGS
-+
-+#
-+# Report the --help message.
-+#
-+if test "$ac_init_help" = "long"; then
-+ # Omit some internal or obsolete options to make the list less imposing.
-+ # This message is too long to be a string in the A/UX 3.1 sh.
-+ cat <<_ACEOF
-+\`configure' configures this package to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE. See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+ -h, --help display this help and exit
-+ --help=short display options specific to this package
-+ --help=recursive display the short help of all the included packages
-+ -V, --version display version information and exit
-+ -q, --quiet, --silent do not print \`checking...' messages
-+ --cache-file=FILE cache test results in FILE [disabled]
-+ -C, --config-cache alias for \`--cache-file=config.cache'
-+ -n, --no-create do not create output files
-+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
-+
-+_ACEOF
-+
-+ cat <<_ACEOF
-+Installation directories:
-+ --prefix=PREFIX install architecture-independent files in PREFIX
-+ [$ac_default_prefix]
-+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
-+ [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+For better control, use the options below.
-+
-+Fine tuning of the installation directories:
-+ --bindir=DIR user executables [EPREFIX/bin]
-+ --sbindir=DIR system admin executables [EPREFIX/sbin]
-+ --libexecdir=DIR program executables [EPREFIX/libexec]
-+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
-+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
-+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
-+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-+ --libdir=DIR object code libraries [EPREFIX/lib]
-+ --includedir=DIR C header files [PREFIX/include]
-+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
-+ --infodir=DIR info documentation [PREFIX/info]
-+ --mandir=DIR man documentation [PREFIX/man]
-+_ACEOF
-+
-+ cat <<\_ACEOF
-+
-+Program names:
-+ --program-prefix=PREFIX prepend PREFIX to installed program names
-+ --program-suffix=SUFFIX append SUFFIX to installed program names
-+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names
-+
-+System types:
-+ --build=BUILD configure for building on BUILD [guessed]
-+ --host=HOST cross-compile to build programs to run on HOST [BUILD]
-+_ACEOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+
-+ cat <<\_ACEOF
-+
-+Optional Features:
-+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
-+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
-+ --enable-maintainer-mode enable make rules and dependencies not useful
-+ (and sometimes confusing) to the casual installer
-+ --disable-dependency-tracking speeds up one-time build
-+ --enable-dependency-tracking do not reject slow dependency extractors
-+ --enable-shared[=PKGS]
-+ build shared libraries [default=yes]
-+ --enable-static[=PKGS]
-+ build static libraries [default=yes]
-+ --enable-fast-install[=PKGS]
-+ optimize for fast installation [default=yes]
-+ --disable-libtool-lock avoid locking (might break parallel builds)
-+
-+Optional Packages:
-+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
-+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
-+ --with-pic try to use only PIC/non-PIC objects [default=use
-+ both]
-+ --with-tags[=TAGS]
-+ include additional configurations [automatic]
-+ --with-rtsig compile with support for real time signals (experimental)
-+
-+Some influential environment variables:
-+ CC C compiler command
-+ CFLAGS C compiler flags
-+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
-+ nonstandard directory <lib dir>
-+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
-+ headers in a nonstandard directory <include dir>
-+ CPP C preprocessor
-+ CXX C++ compiler command
-+ CXXFLAGS C++ compiler flags
-+ CXXCPP C++ preprocessor
-+ F77 Fortran 77 compiler command
-+ FFLAGS Fortran 77 compiler flags
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+_ACEOF
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+ # If there are subdirs, report their specific --help.
-+ ac_popdir=`pwd`
-+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+ test -d $ac_dir || continue
-+ ac_builddir=.
-+
-+if test "$ac_dir" != .; then
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ # A "../" for each directory in $ac_dir_suffix.
-+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
-+ *) # Relative path.
-+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-+
-+ cd $ac_dir
-+ # Check for guested configure; otherwise get Cygnus style configure.
-+ if test -f $ac_srcdir/configure.gnu; then
-+ echo
-+ $SHELL $ac_srcdir/configure.gnu --help=recursive
-+ elif test -f $ac_srcdir/configure; then
-+ echo
-+ $SHELL $ac_srcdir/configure --help=recursive
-+ elif test -f $ac_srcdir/configure.ac ||
-+ test -f $ac_srcdir/configure.in; then
-+ echo
-+ $ac_configure --help
-+ else
-+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+ fi
-+ cd $ac_popdir
-+ done
-+fi
-+
-+test -n "$ac_init_help" && exit 0
-+if $ac_init_version; then
-+ cat <<\_ACEOF
-+
-+Copyright (C) 2003 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+ exit 0
-+fi
-+exec 5>config.log
-+cat >&5 <<_ACEOF
-+This file contains any messages produced by compilers while
-+running configure, to aid debugging if configure makes a mistake.
-+
-+It was created by $as_me, which was
-+generated by GNU Autoconf 2.59. Invocation command line was
-+
-+ $ $0 $@
-+
-+_ACEOF
-+{
-+cat <<_ASUNAME
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-+
-+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
-+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-+
-+_ASUNAME
-+
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ echo "PATH: $as_dir"
-+done
-+
-+} >&5
-+
-+cat >&5 <<_ACEOF
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+_ACEOF
-+
-+
-+# Keep a trace of the command line.
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_sep=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+ for ac_arg
-+ do
-+ case $ac_arg in
-+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+ | -silent | --silent | --silen | --sile | --sil)
-+ continue ;;
-+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ esac
-+ case $ac_pass in
-+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+ 2)
-+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+ if test $ac_must_keep_next = true; then
-+ ac_must_keep_next=false # Got value, back to normal.
-+ else
-+ case $ac_arg in
-+ *=* | --config-cache | -C | -disable-* | --disable-* \
-+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+ | -with-* | --with-* | -without-* | --without-* | --x)
-+ case "$ac_configure_args0 " in
-+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+ esac
-+ ;;
-+ -* ) ac_must_keep_next=true ;;
-+ esac
-+ fi
-+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-+ # Get rid of the leading space.
-+ ac_sep=" "
-+ ;;
-+ esac
-+ done
-+done
-+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-+
-+# When interrupted or exit'd, cleanup temporary files, and complete
-+# config.log. We remove comments because anyway the quotes in there
-+# would cause problems or look ugly.
-+# WARNING: Be sure not to use single quotes in there, as some shells,
-+# such as our DU 5.0 friend, will then `close' the trap.
-+trap 'exit_status=$?
-+ # Save into config.log some information that might help in debugging.
-+ {
-+ echo
-+
-+ cat <<\_ASBOX
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+_ASBOX
-+ echo
-+ # The following way of writing the cache mishandles newlines in values,
-+{
-+ (set) 2>&1 |
-+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-+ *ac_space=\ *)
-+ sed -n \
-+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-+ ;;
-+ *)
-+ sed -n \
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ ;;
-+ esac;
-+}
-+ echo
-+
-+ cat <<\_ASBOX
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+_ASBOX
-+ echo
-+ for ac_var in $ac_subst_vars
-+ do
-+ eval ac_val=$`echo $ac_var`
-+ echo "$ac_var='"'"'$ac_val'"'"'"
-+ done | sort
-+ echo
-+
-+ if test -n "$ac_subst_files"; then
-+ cat <<\_ASBOX
-+## ------------- ##
-+## Output files. ##
-+## ------------- ##
-+_ASBOX
-+ echo
-+ for ac_var in $ac_subst_files
-+ do
-+ eval ac_val=$`echo $ac_var`
-+ echo "$ac_var='"'"'$ac_val'"'"'"
-+ done | sort
-+ echo
-+ fi
-+
-+ if test -s confdefs.h; then
-+ cat <<\_ASBOX
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+_ASBOX
-+ echo
-+ sed "/^$/d" confdefs.h | sort
-+ echo
-+ fi
-+ test "$ac_signal" != 0 &&
-+ echo "$as_me: caught signal $ac_signal"
-+ echo "$as_me: exit $exit_status"
-+ } >&5
-+ rm -f core *.core &&
-+ rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+ exit $exit_status
-+ ' 0
-+for ac_signal in 1 2 13 15; do
-+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-+done
-+ac_signal=0
-+
-+# confdefs.h avoids OS command line length limits that DEFS can exceed.
-+rm -rf conftest* confdefs.h
-+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-+echo >confdefs.h
-+
-+# Predefined preprocessor variables.
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_NAME "$PACKAGE_NAME"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_VERSION "$PACKAGE_VERSION"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_STRING "$PACKAGE_STRING"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-+_ACEOF
-+
-+
-+# Let the site file select an alternate cache file if it wants to.
-+# Prefer explicitly selected file to automatically selected ones.
-+if test -z "$CONFIG_SITE"; then
-+ if test "x$prefix" != xNONE; then
-+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+ else
-+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+ fi
-+fi
-+for ac_site_file in $CONFIG_SITE; do
-+ if test -r "$ac_site_file"; then
-+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+echo "$as_me: loading site script $ac_site_file" >&6;}
-+ sed 's/^/| /' "$ac_site_file" >&5
-+ . "$ac_site_file"
-+ fi
-+done
-+
-+if test -r "$cache_file"; then
-+ # Some versions of bash will fail to source /dev/null (special
-+ # files actually), so we avoid doing that.
-+ if test -f "$cache_file"; then
-+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+echo "$as_me: loading cache $cache_file" >&6;}
-+ case $cache_file in
-+ [\\/]* | ?:[\\/]* ) . $cache_file;;
-+ *) . ./$cache_file;;
-+ esac
-+ fi
-+else
-+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+echo "$as_me: creating cache $cache_file" >&6;}
-+ >$cache_file
-+fi
-+
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
-+for ac_var in `(set) 2>&1 |
-+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+ eval ac_new_set=\$ac_env_${ac_var}_set
-+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-+ eval ac_new_val="\$ac_env_${ac_var}_value"
-+ case $ac_old_set,$ac_new_set in
-+ set,)
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+ ac_cache_corrupted=: ;;
-+ ,set)
-+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+ ac_cache_corrupted=: ;;
-+ ,);;
-+ *)
-+ if test "x$ac_old_val" != "x$ac_new_val"; then
-+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-+echo "$as_me: former value: $ac_old_val" >&2;}
-+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-+echo "$as_me: current value: $ac_new_val" >&2;}
-+ ac_cache_corrupted=:
-+ fi;;
-+ esac
-+ # Pass precious variables to config.status.
-+ if test "$ac_new_set" = set; then
-+ case $ac_new_val in
-+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ *) ac_arg=$ac_var=$ac_new_val ;;
-+ esac
-+ case " $ac_configure_args " in
-+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
-+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+ esac
-+ fi
-+done
-+if $ac_cache_corrupted; then
-+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+am__api_version="1.9"
-+ac_aux_dir=
-+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-+ if test -f $ac_dir/install-sh; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/install-sh -c"
-+ break
-+ elif test -f $ac_dir/install.sh; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/install.sh -c"
-+ break
-+ elif test -f $ac_dir/shtool; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/shtool install -c"
-+ break
-+ fi
-+done
-+if test -z "$ac_aux_dir"; then
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-+
-+# Find a good install program. We prefer a C program (faster),
-+# so one script is as good as another. But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# OS/2's system install, which has a completely different semantic
-+# ./install, which can be erroneously created by make from ./install.sh.
-+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in
-+ ./ | .// | /cC/* | \
-+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-+ /usr/ucb/* ) ;;
-+ *)
-+ # OSF1 and SCO ODT 3.0 have their own names for install.
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ if test $ac_prog = install &&
-+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # AIX install. It has an incompatible calling convention.
-+ :
-+ elif test $ac_prog = install &&
-+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # program-specific install script used by HP pwplus--don't use.
-+ :
-+ else
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
-+ fi
-+ fi
-+ done
-+ done
-+ ;;
-+esac
-+done
-+
-+
-+fi
-+ if test "${ac_cv_path_install+set}" = set; then
-+ INSTALL=$ac_cv_path_install
-+ else
-+ # As a last resort, use the slow shell script. We don't cache a
-+ # path for INSTALL within a source directory, because that will
-+ # break other packages using the cache if that directory is
-+ # removed, or if the path is relative.
-+ INSTALL=$ac_install_sh
-+ fi
-+fi
-+echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6
-+
-+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments. Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+ if test "$*" = "X"; then
-+ # -L didn't work.
-+ set X `ls -t $srcdir/configure conftest.file`
-+ fi
-+ rm -f conftest.file
-+ if test "$*" != "X $srcdir/configure conftest.file" \
-+ && test "$*" != "X conftest.file $srcdir/configure"; then
-+
-+ # If neither matched, then we have a broken ls. This can happen
-+ # if, for instance, CONFIG_SHELL is bash and it inherits a
-+ # broken ls alias from the environment. This has actually
-+ # happened. Such a system could not be considered "sane".
-+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-+alias in your environment" >&5
-+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-+alias in your environment" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+
-+ test "$2" = conftest.file
-+ )
-+then
-+ # Ok.
-+ :
-+else
-+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-+Check your system clock" >&5
-+echo "$as_me: error: newly created file is older than distributed files!
-+Check your system clock" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+test "$program_prefix" != NONE &&
-+ program_transform_name="s,^,$program_prefix,;$program_transform_name"
-+# Use a double $ so make ignores it.
-+test "$program_suffix" != NONE &&
-+ program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-+# Double any \ or $. echo might interpret backslashes.
-+# By default was `s,x,x', remove it if useless.
-+cat <<\_ACEOF >conftest.sed
-+s/[\\$]/&&/g;s/;s,x,x,$//
-+_ACEOF
-+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-+rm conftest.sed
-+
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+ am_missing_run="$MISSING --run "
-+else
-+ am_missing_run=
-+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+fi
-+
-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+ # We used to keeping the `.' as first argument, in order to
-+ # allow $(mkdir_p) to be used without argument. As in
-+ # $(mkdir_p) $(somedir)
-+ # where $(somedir) is conditionally defined. However this is wrong
-+ # for two reasons:
-+ # 1. if the package is installed by a user who cannot write `.'
-+ # make install will fail,
-+ # 2. the above comment should most certainly read
-+ # $(mkdir_p) $(DESTDIR)$(somedir)
-+ # so it does not work when $(somedir) is undefined and
-+ # $(DESTDIR) is not.
-+ # To support the latter case, we have to write
-+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+ # so the `.' trick is pointless.
-+ mkdir_p='mkdir -p --'
-+else
-+ # On NextStep and OpenStep, the `mkdir' command does not
-+ # recognize any option. It will interpret all options as
-+ # directories to create, and then abort because `.' already
-+ # exists.
-+ for d in ./-p ./--version;
-+ do
-+ test -d $d && rmdir $d
-+ done
-+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+ if test -f "$ac_aux_dir/mkinstalldirs"; then
-+ mkdir_p='$(mkinstalldirs)'
-+ else
-+ mkdir_p='$(install_sh) -d'
-+ fi
-+fi
-+
-+for ac_prog in gawk mawk nawk awk
-+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 "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_AWK+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$AWK"; then
-+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_AWK="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+ echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ test -n "$AWK" && break
-+done
-+
-+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.make <<\_ACEOF
-+all:
-+ @echo 'ac_maketemp="$(MAKE)"'
-+_ACEOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-+if test -n "$ac_maketemp"; then
-+ eval ac_cv_prog_make_${ac_make}_set=yes
-+else
-+ eval ac_cv_prog_make_${ac_make}_set=no
-+fi
-+rm -f conftest.make
-+fi
-+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ SET_MAKE=
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+ am__leading_dot=.
-+else
-+ am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+ test -f $srcdir/config.status; then
-+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+ if (cygpath --version) >/dev/null 2>/dev/null; then
-+ CYGPATH_W='cygpath -w'
-+ else
-+ CYGPATH_W=echo
-+ fi
-+fi
-+
-+
-+# Define the identity of the package.
-+ PACKAGE=libevent
-+ VERSION=1.3b
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE "$PACKAGE"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define VERSION "$VERSION"
-+_ACEOF
-+
-+# Some tools Automake needs.
-+
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-+
-+
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-+
-+
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+
-+
-+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-+
-+
-+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'. However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+ if test -n "$ac_tool_prefix"; then
-+ # 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 "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_STRIP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$STRIP"; then
-+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+ echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+ ac_ct_STRIP=$STRIP
-+ # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_STRIP"; then
-+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_STRIP="strip"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ STRIP=$ac_ct_STRIP
-+else
-+ STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+
-+# We need awk for the "check" target. The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-+
-+
-+
-+ ac_config_headers="$ac_config_headers config.h"
-+
-+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then
-+ enableval="$enable_maintainer_mode"
-+ USE_MAINTAINER_MODE=$enableval
-+else
-+ USE_MAINTAINER_MODE=no
-+fi;
-+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-+
-+
-+if test $USE_MAINTAINER_MODE = yes; then
-+ MAINTAINER_MODE_TRUE=
-+ MAINTAINER_MODE_FALSE='#'
-+else
-+ MAINTAINER_MODE_TRUE='#'
-+ MAINTAINER_MODE_FALSE=
-+fi
-+
-+ MAINT=$MAINTAINER_MODE_TRUE
-+
-+
-+
-+if test "$prefix" = "NONE"; then
-+ prefix="/usr/local"
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}gcc; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ ac_ct_CC=$CC
-+ # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_CC="gcc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ CC=$ac_ct_CC
-+else
-+ CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_CC="${ac_tool_prefix}cc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+ ac_ct_CC=$CC
-+ # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_CC="cc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ CC=$ac_ct_CC
-+else
-+ CC="$ac_cv_prog_CC"
-+fi
-+
-+fi
-+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 "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+ ac_prog_rejected=yes
-+ continue
-+ fi
-+ ac_cv_prog_CC="cc"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+if test $ac_prog_rejected = yes; then
-+ # We found a bogon in the path, so make sure we never use it.
-+ set dummy $ac_cv_prog_CC
-+ shift
-+ if test $# != 0; then
-+ # We chose a different compiler from the bogus one.
-+ # However, it has the same basename, so the bogon will be chosen
-+ # first if we set CC to just the basename; use the full file name.
-+ shift
-+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+ fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ for ac_prog in cl
-+ do
-+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ test -n "$CC" && break
-+ done
-+fi
-+if test -z "$CC"; then
-+ ac_ct_CC=$CC
-+ for ac_prog in cl
-+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 "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_CC="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ test -n "$ac_ct_CC" && break
-+done
-+
-+ CC=$ac_ct_CC
-+fi
-+
-+fi
-+
-+
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+# Provide some information about the compiler.
-+echo "$as_me:$LINENO:" \
-+ "checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-+ (eval $ac_compiler --version </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-+ (eval $ac_compiler -v </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-+ (eval $ac_compiler -V </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+# Try to create an executable without -o first, disregard a.out.
-+# It will help us diagnose broken compilers, and finding out an intuition
-+# of exeext.
-+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-+ (eval $ac_link_default) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # Find the output, starting from the most likely. This scheme is
-+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-+# resort.
-+
-+# Be careful to initialize this variable, since it used to be cached.
-+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-+ac_cv_exeext=
-+# b.out is created by i960 compilers.
-+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-+ ;;
-+ conftest.$ac_ext )
-+ # This is the source file.
-+ ;;
-+ [ab].out )
-+ # We found the default executable, but exeext='' is most
-+ # certainly right.
-+ break;;
-+ *.* )
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ # FIXME: I believe we export ac_cv_exeext for Libtool,
-+ # but it would be cool to find out if it's true. Does anybody
-+ # maintain Libtool? --akim.
-+ export ac_cv_exeext
-+ break;;
-+ * )
-+ break;;
-+ esac
-+done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C compiler cannot create executables
-+See \`config.log' for more details." >&2;}
-+ { (exit 77); exit 77; }; }
-+fi
-+
-+ac_exeext=$ac_cv_exeext
-+echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6
-+
-+# Check the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-+# If not cross compiling, check that we can run a simple program.
-+if test "$cross_compiling" != yes; then
-+ if { ac_try='./$ac_file'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ cross_compiling=no
-+ else
-+ if test "$cross_compiling" = maybe; then
-+ cross_compiling=yes
-+ else
-+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ fi
-+fi
-+echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+ac_clean_files=$ac_clean_files_save
-+# Check the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-+echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6
-+
-+echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
-+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-+# work properly (i.e., refer to `conftest.exe'), while it won't with
-+# `rm'.
-+for ac_file in conftest.exe conftest conftest.*; do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ export ac_cv_exeext
-+ break;;
-+ * ) break;;
-+ esac
-+done
-+else
-+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest$ac_cv_exeext
-+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
-+echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+if test "${ac_cv_objext+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+ break;;
-+ esac
-+done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest.$ac_cv_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6
-+OBJEXT=$ac_cv_objext
-+ac_objext=$OBJEXT
-+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+ choke me
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_compiler_gnu=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_compiler_gnu=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+GCC=`test $ac_compiler_gnu = yes && echo yes`
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+CFLAGS="-g"
-+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+if test "${ac_cv_prog_cc_g+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_prog_cc_g=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-g"
-+ fi
-+else
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
-+fi
-+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-+if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_prog_cc_stdc=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std1 is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std1. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+# Don't try gcc -ansi; that turns off useful extensions and
-+# breaks some systems' header files.
-+# AIX -qlanglvl=ansi
-+# Ultrix and OSF/1 -std1
-+# HP-UX 10.20 and later -Ae
-+# HP-UX older versions -Aa -D_HPUX_SOURCE
-+# SVR4 -Xc -D__EXTENSIONS__
-+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_prog_cc_stdc=$ac_arg
-+break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext
-+done
-+rm -f conftest.$ac_ext conftest.$ac_objext
-+CC=$ac_save_CC
-+
-+fi
-+
-+case "x$ac_cv_prog_cc_stdc" in
-+ x|xno)
-+ echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6 ;;
-+ *)
-+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-+ CC="$CC $ac_cv_prog_cc_stdc" ;;
-+esac
-+
-+# Some people use a C++ compiler to compile C. Since we use `exit',
-+# in C++ we need to declare it. In case someone uses the same compiler
-+# for both compiling C and C++ we need to have the C++ compiler decide
-+# the declaration of exit, since it's the most demanding environment.
-+cat >conftest.$ac_ext <<_ACEOF
-+#ifndef __cplusplus
-+ choke me
-+#endif
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ for ac_declaration in \
-+ '' \
-+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
-+ 'extern "C" void std::exit (int); using std::exit;' \
-+ 'extern "C" void exit (int) throw ();' \
-+ 'extern "C" void exit (int);' \
-+ 'void exit (int);'
-+do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+rm -f conftest*
-+if test -n "$ac_declaration"; then
-+ echo '#ifdef __cplusplus' >>confdefs.h
-+ echo $ac_declaration >>confdefs.h
-+ echo '#endif' >>confdefs.h
-+fi
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+DEPDIR="${am__leading_dot}deps"
-+
-+ ac_config_commands="$ac_config_commands depfiles"
-+
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+ @echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+ echo '.include "confinc"' > confmf
-+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ fi
-+fi
-+
-+
-+echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6
-+rm -f confinc confmf
-+
-+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then
-+ enableval="$enable_dependency_tracking"
-+
-+fi;
-+if test "x$enable_dependency_tracking" != xno; then
-+ am_depcomp="$ac_aux_dir/depcomp"
-+ AMDEPBACKSLASH='\'
-+fi
-+
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+ AMDEP_TRUE=
-+ AMDEP_FALSE='#'
-+else
-+ AMDEP_TRUE='#'
-+ AMDEP_FALSE=
-+fi
-+
-+
-+
-+
-+depcc="$CC" am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+ # We make a subdir and do the tests there. Otherwise we can end up
-+ # making bogus files that we don't know about and never remove. For
-+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
-+ mkdir conftest.dir
-+ # Copy depcomp to subdir because otherwise we won't find it if we're
-+ # using a relative directory.
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-+
-+ am_cv_CC_dependencies_compiler_type=none
-+ if test "$am_compiler_list" = ""; then
-+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+ fi
-+ for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
-+ # We need to recreate these files for each test, as the compiler may
-+ # overwrite some of them when testing with obscure command lines.
-+ # This happens at least with the AIX C compiler.
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+ case $depmode in
-+ nosideeffect)
-+ # after this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested
-+ if test "x$enable_dependency_tracking" = xyes; then
-+ continue
-+ else
-+ break
-+ fi
-+ ;;
-+ none) break ;;
-+ esac
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this.
-+ if depmode=$depmode \
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_CC_dependencies_compiler_type=$depmode
-+ break
-+ fi
-+ fi
-+ done
-+
-+ cd ..
-+ rm -rf conftest.dir
-+else
-+ am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-+
-+
-+
-+if
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+ am__fastdepCC_TRUE=
-+ am__fastdepCC_FALSE='#'
-+else
-+ am__fastdepCC_TRUE='#'
-+ am__fastdepCC_FALSE=
-+fi
-+
-+
-+# Find a good install program. We prefer a C program (faster),
-+# so one script is as good as another. But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# OS/2's system install, which has a completely different semantic
-+# ./install, which can be erroneously created by make from ./install.sh.
-+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+if test -z "$INSTALL"; then
-+if test "${ac_cv_path_install+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in
-+ ./ | .// | /cC/* | \
-+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-+ /usr/ucb/* ) ;;
-+ *)
-+ # OSF1 and SCO ODT 3.0 have their own names for install.
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ if test $ac_prog = install &&
-+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # AIX install. It has an incompatible calling convention.
-+ :
-+ elif test $ac_prog = install &&
-+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+ # program-specific install script used by HP pwplus--don't use.
-+ :
-+ else
-+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+ break 3
-+ fi
-+ fi
-+ done
-+ done
-+ ;;
-+esac
-+done
-+
-+
-+fi
-+ if test "${ac_cv_path_install+set}" = set; then
-+ INSTALL=$ac_cv_path_install
-+ else
-+ # As a last resort, use the slow shell script. We don't cache a
-+ # path for INSTALL within a source directory, because that will
-+ # break other packages using the cache if that directory is
-+ # removed, or if the path is relative.
-+ INSTALL=$ac_install_sh
-+ fi
-+fi
-+echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6
-+
-+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+LN_S=$as_ln_s
-+if test "$LN_S" = "ln -s"; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6
-+fi
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+ CPP=
-+fi
-+if test -z "$CPP"; then
-+ if test "${ac_cv_prog_CPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Double quotes because CPP needs to be expanded
-+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+ do
-+ ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
-+ # On the NeXT, cc -E runs the code through the compiler's parser,
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether non-existent headers
-+ # can be detected and how.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ # Broken: success on invalid input.
-+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+ break
-+fi
-+
-+ done
-+ ac_cv_prog_CPP=$CPP
-+
-+fi
-+ CPP=$ac_cv_prog_CPP
-+else
-+ ac_cv_prog_CPP=$CPP
-+fi
-+echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
-+ # On the NeXT, cc -E runs the code through the compiler's parser,
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether non-existent headers
-+ # can be detected and how.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ # Broken: success on invalid input.
-+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+ :
-+else
-+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-+if test "${ac_cv_prog_egrep+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&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
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-+ EGREP=$ac_cv_prog_egrep
-+
-+
-+if test $ac_cv_c_compiler_gnu = yes; then
-+ echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
-+echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
-+if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_pattern="Autoconf.*'x'"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sgtty.h>
-+Autoconf TIOCGETP
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "$ac_pattern" >/dev/null 2>&1; then
-+ ac_cv_prog_gcc_traditional=yes
-+else
-+ ac_cv_prog_gcc_traditional=no
-+fi
-+rm -f conftest*
-+
-+
-+ if test $ac_cv_prog_gcc_traditional = no; then
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <termio.h>
-+Autoconf TCGETA
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "$ac_pattern" >/dev/null 2>&1; then
-+ ac_cv_prog_gcc_traditional=yes
-+fi
-+rm -f conftest*
-+
-+ fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
-+ if test $ac_cv_prog_gcc_traditional = yes; then
-+ CC="$CC -traditional"
-+ fi
-+fi
-+
-+if test "$GCC" = yes ; then
-+ CFLAGS="$CFLAGS -Wall"
-+fi
-+
-+# Check whether --enable-shared or --disable-shared was given.
-+if test "${enable_shared+set}" = set; then
-+ enableval="$enable_shared"
-+ p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_shared=yes ;;
-+ no) enable_shared=no ;;
-+ *)
-+ enable_shared=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_shared=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac
-+else
-+ enable_shared=yes
-+fi;
-+
-+# Check whether --enable-static or --disable-static was given.
-+if test "${enable_static+set}" = set; then
-+ enableval="$enable_static"
-+ p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_static=yes ;;
-+ no) enable_static=no ;;
-+ *)
-+ enable_static=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_static=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac
-+else
-+ enable_static=yes
-+fi;
-+
-+# Check whether --enable-fast-install or --disable-fast-install was given.
-+if test "${enable_fast_install+set}" = set; then
-+ enableval="$enable_fast_install"
-+ p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_fast_install=yes ;;
-+ no) enable_fast_install=no ;;
-+ *)
-+ enable_fast_install=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_fast_install=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac
-+else
-+ enable_fast_install=yes
-+fi;
-+
-+# Make sure we can run config.sub.
-+$ac_config_sub sun4 >/dev/null 2>&1 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+if test "${ac_cv_build+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_build_alias=$build_alias
-+test -z "$ac_cv_build_alias" &&
-+ ac_cv_build_alias=`$ac_config_guess`
-+test -z "$ac_cv_build_alias" &&
-+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-+ { (exit 1); exit 1; }; }
-+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6
-+build=$ac_cv_build
-+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+
-+
-+echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+if test "${ac_cv_host+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_host_alias=$host_alias
-+test -z "$ac_cv_host_alias" &&
-+ ac_cv_host_alias=$ac_cv_build_alias
-+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6
-+host=$ac_cv_host
-+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+
-+
-+echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-+if test "${lt_cv_path_SED+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for lt_ac_prog in sed gsed; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$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
-+ done
-+ done
-+done
-+lt_ac_max=0
-+lt_ac_count=0
-+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+# along with /bin/sed that truncates output.
-+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+ test ! -f $lt_ac_sed && continue
-+ cat /dev/null > conftest.in
-+ lt_ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+ # Check for GNU sed and select it if it is found.
-+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+ lt_cv_path_SED=$lt_ac_sed
-+ break
-+ fi
-+ while true; do
-+ cat conftest.in conftest.in >conftest.tmp
-+ mv conftest.tmp conftest.in
-+ cp conftest.in conftest.nl
-+ echo >>conftest.nl
-+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+ cmp -s conftest.out conftest.nl || break
-+ # 10000 chars as input seems more than enough
-+ test $lt_ac_count -gt 10 && break
-+ lt_ac_count=`expr $lt_ac_count + 1`
-+ if test $lt_ac_count -gt $lt_ac_max; then
-+ lt_ac_max=$lt_ac_count
-+ lt_cv_path_SED=$lt_ac_sed
-+ fi
-+ done
-+done
-+
-+fi
-+
-+SED=$lt_cv_path_SED
-+echo "$as_me:$LINENO: result: $SED" >&5
-+echo "${ECHO_T}$SED" >&6
-+
-+
-+# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then
-+ withval="$with_gnu_ld"
-+ test "$withval" = no || with_gnu_ld=yes
-+else
-+ with_gnu_ld=no
-+fi;
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+ # Check if gcc -print-prog-name=ld gives a path.
-+ echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+ case $host in
-+ *-*-mingw*)
-+ # gcc leaves a trailing carriage return which upsets mingw
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+ *)
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
-+ case $ac_prog in
-+ # Accept absolute paths.
-+ [\\/]* | ?:[\\/]*)
-+ re_direlt='/[^/][^/]*/\.\./'
-+ # Canonicalize the pathname of ld
-+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+ done
-+ test -z "$LD" && LD="$ac_prog"
-+ ;;
-+ "")
-+ # If it fails, then pretend we aren't using GCC.
-+ ac_prog=ld
-+ ;;
-+ *)
-+ # If it is relative, then search for the first ld in PATH.
-+ with_gnu_ld=unknown
-+ ;;
-+ esac
-+elif test "$with_gnu_ld" = yes; then
-+ echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+fi
-+if test "${lt_cv_path_LD+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -z "$LD"; then
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+ lt_cv_path_LD="$ac_dir/$ac_prog"
-+ # Check to see if the program is GNU ld. I'd rather use --version,
-+ # but apparently some GNU ld's only accept -v.
-+ # Break only if it was the GNU/non-GNU ld that we prefer.
-+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+ *GNU* | *'with BFD'*)
-+ test "$with_gnu_ld" != no && break
-+ ;;
-+ *)
-+ test "$with_gnu_ld" != yes && break
-+ ;;
-+ esac
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+else
-+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
-+fi
-+
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+ echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+ { (exit 1); exit 1; }; }
-+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+ lt_cv_prog_gnu_ld=yes
-+ ;;
-+*)
-+ lt_cv_prog_gnu_ld=no
-+ ;;
-+esac
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+
-+
-+echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-+if test "${lt_cv_ld_reload_flag+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_ld_reload_flag='-r'
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+ darwin*)
-+ if test "$GCC" = yes; then
-+ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+ else
-+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+ fi
-+ ;;
-+esac
-+
-+echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-+if test "${lt_cv_path_NM+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$NM"; then
-+ # Let the user override the test.
-+ lt_cv_path_NM="$NM"
-+else
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+ # Check to see if the nm accepts a BSD-compat flag.
-+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+ # nm: unknown option "B" ignored
-+ # Tru64's nm complains that /dev/null is an invalid object file
-+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+ */dev/null* | *'Invalid file or object type'*)
-+ lt_cv_path_NM="$tmp_nm -B"
-+ break
-+ ;;
-+ *)
-+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+ */dev/null*)
-+ lt_cv_path_NM="$tmp_nm -p"
-+ break
-+ ;;
-+ *)
-+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+ continue # so that we can try to find one that supports BSD flags
-+ ;;
-+ esac
-+ esac
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+echo "${ECHO_T}$lt_cv_path_NM" >&6
-+NM="$lt_cv_path_NM"
-+
-+echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
-+if test "${lt_cv_deplibs_check_method+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+beos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+bsdi[45]*)
-+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-+ lt_cv_file_magic_cmd='/usr/bin/file -L'
-+ lt_cv_file_magic_test_file=/shlib/libc.so
-+ ;;
-+
-+cygwin*)
-+ # func_win32_libid is a shell function defined in ltmain.sh
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ ;;
-+
-+mingw* | pw32*)
-+ # Base MSYS/MinGW do not provide the 'file' command needed by
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ ;;
-+
-+darwin* | rhapsody*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ case $host_cpu in
-+ i*86 )
-+ # Not sure whether the presence of OpenBSD here was a mistake.
-+ # Let's accept both of them until this is cleared up.
-+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+ ;;
-+ esac
-+ else
-+ lt_cv_deplibs_check_method=pass_all
-+ fi
-+ ;;
-+
-+gnu*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+hpux10.20* | hpux11*)
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ case "$host_cpu" in
-+ ia64*)
-+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-+ ;;
-+ hppa*64*)
-+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+ ;;
-+ *)
-+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+ ;;
-+ esac
-+ ;;
-+
-+irix5* | irix6* | nonstopux*)
-+ case $LD in
-+ *-32|*"-32 ") libmagic=32-bit;;
-+ *-n32|*"-n32 ") libmagic=N32;;
-+ *-64|*"-64 ") libmagic=64-bit;;
-+ *) libmagic=never-match;;
-+ esac
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+# This must be Linux ELF.
-+linux*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-+ else
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-+ fi
-+ ;;
-+
-+newos6*)
-+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+ ;;
-+
-+nto-qnx*)
-+ lt_cv_deplibs_check_method=unknown
-+ ;;
-+
-+openbsd*)
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-+ else
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-+ fi
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+sco3.2v5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+solaris*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ case $host_vendor in
-+ motorola)
-+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+ ;;
-+ ncr)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ sequent)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+ ;;
-+ sni)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-+ lt_cv_file_magic_test_file=/lib/libc.so
-+ ;;
-+ siemens)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ esac
-+ ;;
-+
-+sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+esac
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+
-+
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then
-+ enableval="$enable_libtool_lock"
-+
-+fi;
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+ # Find out which ABI we are using.
-+ echo 'int i;' > conftest.$ac_ext
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *ELF-32*)
-+ HPUX_IA64_MODE="32"
-+ ;;
-+ *ELF-64*)
-+ HPUX_IA64_MODE="64"
-+ ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+*-*-irix6*)
-+ # Find out which ABI we are using.
-+ echo '#line 4048 "configure"' > conftest.$ac_ext
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *32-bit*)
-+ LD="${LD-ld} -melf32bsmip"
-+ ;;
-+ *N32*)
-+ LD="${LD-ld} -melf32bmipn32"
-+ ;;
-+ *64-bit*)
-+ LD="${LD-ld} -melf64bmip"
-+ ;;
-+ esac
-+ else
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *32-bit*)
-+ LD="${LD-ld} -32"
-+ ;;
-+ *N32*)
-+ LD="${LD-ld} -n32"
-+ ;;
-+ *64-bit*)
-+ LD="${LD-ld} -64"
-+ ;;
-+ esac
-+ fi
-+ fi
-+ rm -rf conftest*
-+ ;;
-+
-+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+ # Find out which ABI we are using.
-+ echo 'int i;' > conftest.$ac_ext
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ case "`/usr/bin/file conftest.o`" in
-+ *32-bit*)
-+ case $host in
-+ x86_64-*linux*)
-+ LD="${LD-ld} -m elf_i386"
-+ ;;
-+ ppc64-*linux*|powerpc64-*linux*)
-+ LD="${LD-ld} -m elf32ppclinux"
-+ ;;
-+ s390x-*linux*)
-+ LD="${LD-ld} -m elf_s390"
-+ ;;
-+ sparc64-*linux*)
-+ LD="${LD-ld} -m elf32_sparc"
-+ ;;
-+ esac
-+ ;;
-+ *64-bit*)
-+ case $host in
-+ x86_64-*linux*)
-+ LD="${LD-ld} -m elf_x86_64"
-+ ;;
-+ ppc*-*linux*|powerpc*-*linux*)
-+ LD="${LD-ld} -m elf64ppc"
-+ ;;
-+ s390*-*linux*)
-+ LD="${LD-ld} -m elf64_s390"
-+ ;;
-+ sparc*-*linux*)
-+ LD="${LD-ld} -m elf64_sparc"
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ fi
-+ rm -rf conftest*
-+ ;;
-+
-+*-*-sco3.2v5*)
-+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+ SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS -belf"
-+ echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-+if test "${lt_cv_cc_needs_belf+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ lt_cv_cc_needs_belf=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+lt_cv_cc_needs_belf=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+ CFLAGS="$SAVE_CFLAGS"
-+ fi
-+ ;;
-+
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+
-+
-+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+if test "${ac_cv_header_stdc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_header_stdc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_stdc=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "memchr" >/dev/null 2>&1; then
-+ :
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+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 <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "free" >/dev/null 2>&1; then
-+ :
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+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
-+ :
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ctype.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#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);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ :
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_header_stdc=no
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+if test $ac_cv_header_stdc = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define STDC_HEADERS 1
-+_ACEOF
-+
-+fi
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+ inttypes.h stdint.h unistd.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_Header=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_Header=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+
-+for ac_header in dlfcn.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+ do
-+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$CXX"; then
-+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+CXX=$ac_cv_prog_CXX
-+if test -n "$CXX"; then
-+ echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ test -n "$CXX" && break
-+ done
-+fi
-+if test -z "$CXX"; then
-+ ac_ct_CXX=$CXX
-+ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+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 "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CXX"; then
-+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_CXX="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+if test -n "$ac_ct_CXX"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+echo "${ECHO_T}$ac_ct_CXX" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ test -n "$ac_ct_CXX" && break
-+done
-+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-+
-+ CXX=$ac_ct_CXX
-+fi
-+
-+
-+# Provide some information about the compiler.
-+echo "$as_me:$LINENO:" \
-+ "checking for C++ compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-+ (eval $ac_compiler --version </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-+ (eval $ac_compiler -v </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-+ (eval $ac_compiler -V </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+
-+echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+ choke me
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_compiler_gnu=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_compiler_gnu=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-+GXX=`test $ac_compiler_gnu = yes && echo yes`
-+ac_test_CXXFLAGS=${CXXFLAGS+set}
-+ac_save_CXXFLAGS=$CXXFLAGS
-+CXXFLAGS="-g"
-+echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-+if test "${ac_cv_prog_cxx_g+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_prog_cxx_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_prog_cxx_g=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-+if test "$ac_test_CXXFLAGS" = set; then
-+ CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+ if test "$GXX" = yes; then
-+ CXXFLAGS="-g -O2"
-+ else
-+ CXXFLAGS="-g"
-+ fi
-+else
-+ if test "$GXX" = yes; then
-+ CXXFLAGS="-O2"
-+ else
-+ CXXFLAGS=
-+ fi
-+fi
-+for ac_declaration in \
-+ '' \
-+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
-+ 'extern "C" void std::exit (int); using std::exit;' \
-+ 'extern "C" void exit (int) throw ();' \
-+ 'extern "C" void exit (int);' \
-+ 'void exit (int);'
-+do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_declaration
-+int
-+main ()
-+{
-+exit (42);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+rm -f conftest*
-+if test -n "$ac_declaration"; then
-+ echo '#ifdef __cplusplus' >>confdefs.h
-+ echo $ac_declaration >>confdefs.h
-+ echo '#endif' >>confdefs.h
-+fi
-+
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+depcc="$CXX" am_compiler_list=
-+
-+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+ # We make a subdir and do the tests there. Otherwise we can end up
-+ # making bogus files that we don't know about and never remove. For
-+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
-+ mkdir conftest.dir
-+ # Copy depcomp to subdir because otherwise we won't find it if we're
-+ # using a relative directory.
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-+
-+ am_cv_CXX_dependencies_compiler_type=none
-+ if test "$am_compiler_list" = ""; then
-+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+ fi
-+ for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
-+ # We need to recreate these files for each test, as the compiler may
-+ # overwrite some of them when testing with obscure command lines.
-+ # This happens at least with the AIX C compiler.
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+ case $depmode in
-+ nosideeffect)
-+ # after this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested
-+ if test "x$enable_dependency_tracking" = xyes; then
-+ continue
-+ else
-+ break
-+ fi
-+ ;;
-+ none) break ;;
-+ esac
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this.
-+ if depmode=$depmode \
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_CXX_dependencies_compiler_type=$depmode
-+ break
-+ fi
-+ fi
-+ done
-+
-+ cd ..
-+ rm -rf conftest.dir
-+else
-+ am_cv_CXX_dependencies_compiler_type=none
-+fi
-+
-+fi
-+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-+
-+
-+
-+if
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+ am__fastdepCXX_TRUE=
-+ am__fastdepCXX_FALSE='#'
-+else
-+ am__fastdepCXX_TRUE='#'
-+ am__fastdepCXX_FALSE=
-+fi
-+
-+
-+
-+
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+ (test "X$CXX" != "Xg++"))) ; then
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-+if test -z "$CXXCPP"; then
-+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # Double quotes because CXXCPP needs to be expanded
-+ for CXXCPP in "$CXX -E" "/lib/cpp"
-+ do
-+ ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
-+ # On the NeXT, cc -E runs the code through the compiler's parser,
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether non-existent headers
-+ # can be detected and how.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ # Broken: success on invalid input.
-+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+ break
-+fi
-+
-+ done
-+ ac_cv_prog_CXXCPP=$CXXCPP
-+
-+fi
-+ CXXCPP=$ac_cv_prog_CXXCPP
-+else
-+ ac_cv_prog_CXXCPP=$CXXCPP
-+fi
-+echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6
-+ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+ # Use a header file that comes with gcc, so configuring glibc
-+ # with a fresh cross-compiler works.
-+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ # <limits.h> exists even on freestanding compilers.
-+ # On the NeXT, cc -E runs the code through the compiler's parser,
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+ # OK, works on sane cases. Now check whether non-existent headers
-+ # can be detected and how.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_cxx_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ # Broken: success on invalid input.
-+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then
-+ :
-+else
-+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+fi
-+
-+
-+ac_ext=f
-+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+ for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-+ do
-+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$F77"; then
-+ ac_cv_prog_F77="$F77" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+F77=$ac_cv_prog_F77
-+if test -n "$F77"; then
-+ echo "$as_me:$LINENO: result: $F77" >&5
-+echo "${ECHO_T}$F77" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ test -n "$F77" && break
-+ done
-+fi
-+if test -z "$F77"; then
-+ ac_ct_F77=$F77
-+ for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-+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 "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_F77"; then
-+ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_F77="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+ac_ct_F77=$ac_cv_prog_ac_ct_F77
-+if test -n "$ac_ct_F77"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-+echo "${ECHO_T}$ac_ct_F77" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ test -n "$ac_ct_F77" && break
-+done
-+
-+ F77=$ac_ct_F77
-+fi
-+
-+
-+# Provide some information about the compiler.
-+echo "$as_me:5392:" \
-+ "checking for Fortran 77 compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-+ (eval $ac_compiler --version </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-+ (eval $ac_compiler -v </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-+ (eval $ac_compiler -V </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+rm -f a.out
-+
-+# If we don't use `.F' as extension, the preprocessor is not run on the
-+# input file. (Note that this only needs to work for GNU compilers.)
-+ac_save_ext=$ac_ext
-+ac_ext=F
-+echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
-+if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+ program main
-+#ifndef __GNUC__
-+ choke me
-+#endif
-+
-+ end
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_f77_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_compiler_gnu=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_compiler_gnu=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
-+ac_ext=$ac_save_ext
-+ac_test_FFLAGS=${FFLAGS+set}
-+ac_save_FFLAGS=$FFLAGS
-+FFLAGS=
-+echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
-+if test "${ac_cv_prog_f77_g+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ FFLAGS=-g
-+cat >conftest.$ac_ext <<_ACEOF
-+ program main
-+
-+ end
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_f77_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_prog_f77_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_prog_f77_g=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
-+if test "$ac_test_FFLAGS" = set; then
-+ FFLAGS=$ac_save_FFLAGS
-+elif test $ac_cv_prog_f77_g = yes; then
-+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-+ FFLAGS="-g -O2"
-+ else
-+ FFLAGS="-g"
-+ fi
-+else
-+ if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-+ FFLAGS="-O2"
-+ else
-+ FFLAGS=
-+ fi
-+fi
-+
-+G77=`test $ac_compiler_gnu = yes && echo yes`
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+
-+# find the maximum length of command line arguments
-+echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
-+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ i=0
-+ teststring="ABCD"
-+
-+ case $build_os in
-+ msdosdjgpp*)
-+ # On DJGPP, this test can blow up pretty badly due to problems in libc
-+ # (any single argument exceeding 2000 bytes causes a buffer overrun
-+ # during glob expansion). Even if it were fixed, the result of this
-+ # check would be larger than it should be.
-+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
-+ ;;
-+
-+ gnu*)
-+ # Under GNU Hurd, this test is not required because there is
-+ # no limit to the length of command line arguments.
-+ # Libtool will interpret -1 as no limit whatsoever
-+ lt_cv_sys_max_cmd_len=-1;
-+ ;;
-+
-+ cygwin* | mingw*)
-+ # On Win9x/ME, this test blows up -- it succeeds, but takes
-+ # about 5 minutes as the teststring grows exponentially.
-+ # Worse, since 9x/ME are not pre-emptively multitasking,
-+ # you end up with a "frozen" computer, even though with patience
-+ # the test eventually succeeds (with a max line length of 256k).
-+ # Instead, let's just punt: use the minimum linelength reported by
-+ # all of the supported platforms: 8192 (on NT/2K/XP).
-+ lt_cv_sys_max_cmd_len=8192;
-+ ;;
-+
-+ amigaos*)
-+ # On AmigaOS with pdksh, this test takes hours, literally.
-+ # So we just punt and use a minimum line length of 8192.
-+ lt_cv_sys_max_cmd_len=8192;
-+ ;;
-+
-+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+ # This has been around since 386BSD, at least. Likely further.
-+ if test -x /sbin/sysctl; then
-+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+ elif test -x /usr/sbin/sysctl; then
-+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+ else
-+ lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
-+ fi
-+ # And add a safety zone
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ ;;
-+ osf*)
-+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+ # nice to cause kernel panics so lets avoid the loop below.
-+ # First set a reasonable default.
-+ lt_cv_sys_max_cmd_len=16384
-+ #
-+ if test -x /sbin/sysconfig; then
-+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+ esac
-+ fi
-+ ;;
-+ *)
-+ # If test is not a shell built-in, we'll probably end up computing a
-+ # maximum length that is only half of the actual maximum length, but
-+ # we can't tell.
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ = "XX$teststring") >/dev/null 2>&1 &&
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ ;;
-+ esac
-+
-+fi
-+
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+ echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
-+else
-+ echo "$as_me:$LINENO: result: none" >&5
-+echo "${ECHO_T}none" >&6
-+fi
-+
-+
-+
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[BCDEGRST]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+ symcode='[BCDT]'
-+ ;;
-+cygwin* | mingw* | pw32*)
-+ symcode='[ABCDGISTW]'
-+ ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+ if test "$host_cpu" = ia64; then
-+ symcode='[ABCDEGRST]'
-+ fi
-+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-+ ;;
-+linux*)
-+ if test "$host_cpu" = ia64; then
-+ symcode='[ABCDGIRSTW]'
-+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-+ fi
-+ ;;
-+irix* | nonstopux*)
-+ symcode='[BCDEGRST]'
-+ ;;
-+osf*)
-+ symcode='[BCDEGQRST]'
-+ ;;
-+solaris* | sysv5*)
-+ symcode='[BDRT]'
-+ ;;
-+sysv4)
-+ symcode='[DFNSTU]'
-+ ;;
-+esac
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+ ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+ symcode='[ABCDGIRSTW]' ;;
-+esac
-+
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+ symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-+ # Write the raw and C identifiers.
-+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+
-+ # Check to see that the pipe works correctly.
-+ pipe_works=no
-+
-+ rm -f conftest*
-+ cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
-+
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # Now try to grab the symbols.
-+ nlist=conftest.nm
-+ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s "$nlist"; then
-+ # Try sorting and uniquifying the output.
-+ if sort "$nlist" | uniq > "$nlist"T; then
-+ mv -f "$nlist"T "$nlist"
-+ else
-+ rm -f "$nlist"T
-+ fi
-+
-+ # Make sure that we snagged all the symbols we need.
-+ if grep ' nm_test_var$' "$nlist" >/dev/null; then
-+ if grep ' nm_test_func$' "$nlist" >/dev/null; then
-+ cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+EOF
-+ # Now generate the symbol file.
-+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-+
-+ cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr_t void *
-+#else
-+# define lt_ptr_t char *
-+# define const
-+#endif
-+
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+ const char *name;
-+ lt_ptr_t address;
-+}
-+lt_preloaded_symbols[] =
-+{
-+EOF
-+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-+ cat <<\EOF >> conftest.$ac_ext
-+ {0, (lt_ptr_t) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+ # Now try linking the two files.
-+ mv conftest.$ac_objext conftstm.$ac_objext
-+ lt_save_LIBS="$LIBS"
-+ lt_save_CFLAGS="$CFLAGS"
-+ LIBS="conftstm.$ac_objext"
-+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest${ac_exeext}; then
-+ pipe_works=yes
-+ fi
-+ LIBS="$lt_save_LIBS"
-+ CFLAGS="$lt_save_CFLAGS"
-+ else
-+ echo "cannot find nm_test_func in $nlist" >&5
-+ fi
-+ else
-+ echo "cannot find nm_test_var in $nlist" >&5
-+ fi
-+ else
-+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-+ fi
-+ else
-+ echo "$progname: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ fi
-+ rm -f conftest* conftst*
-+
-+ # Do not use the global_symbol_pipe unless it works.
-+ if test "$pipe_works" = yes; then
-+ break
-+ else
-+ lt_cv_sys_global_symbol_pipe=
-+ fi
-+done
-+
-+fi
-+
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+ lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+ echo "$as_me:$LINENO: result: failed" >&5
-+echo "${ECHO_T}failed" >&6
-+else
-+ echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6
-+fi
-+
-+echo "$as_me:$LINENO: checking for objdir" >&5
-+echo $ECHO_N "checking for objdir... $ECHO_C" >&6
-+if test "${lt_cv_objdir+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+ lt_cv_objdir=.libs
-+else
-+ # MS-DOS does not allow filenames that begin with a dot.
-+ lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+echo "${ECHO_T}$lt_cv_objdir" >&6
-+objdir=$lt_cv_objdir
-+
-+
-+
-+
-+
-+case $host_os in
-+aix3*)
-+ # AIX sometimes has problems with the GCC collect2 program. For some
-+ # reason, if we set the COLLECT_NAMES environment variable, the problems
-+ # vanish in a puff of smoke.
-+ if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+ fi
-+ ;;
-+esac
-+
-+# Sed substitution that helps us do robust quoting. It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e s/^X//'
-+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-+
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except M$VC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+if test -n "$ac_tool_prefix"; then
-+ # 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 "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_AR+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$AR"; then
-+ ac_cv_prog_AR="$AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_AR="${ac_tool_prefix}ar"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+ echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_AR"; then
-+ ac_ct_AR=$AR
-+ # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_AR"; then
-+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_AR="ar"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
-+fi
-+fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ AR=$ac_ct_AR
-+else
-+ AR="$ac_cv_prog_AR"
-+fi
-+
-+if test -n "$ac_tool_prefix"; then
-+ # 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 "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$RANLIB"; then
-+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+ echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+ ac_ct_RANLIB=$RANLIB
-+ # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_RANLIB"; then
-+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_RANLIB="ranlib"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ RANLIB=$ac_ct_RANLIB
-+else
-+ RANLIB="$ac_cv_prog_RANLIB"
-+fi
-+
-+if test -n "$ac_tool_prefix"; then
-+ # 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 "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_STRIP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$STRIP"; then
-+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+ echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+ ac_ct_STRIP=$STRIP
-+ # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_STRIP"; then
-+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_STRIP="strip"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+ echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ STRIP=$ac_ct_STRIP
-+else
-+ STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$SED" && SED=sed
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+ case $host_os in
-+ openbsd*)
-+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-+ ;;
-+ *)
-+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+ ;;
-+ esac
-+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+ echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $MAGIC_CMD in
-+[\\/*] | ?:[\\/]*)
-+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+ ;;
-+*)
-+ lt_save_MAGIC_CMD="$MAGIC_CMD"
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+ for ac_dir in $ac_dummy; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/${ac_tool_prefix}file; then
-+ lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-+ if test -n "$file_magic_test_file"; then
-+ case $deplibs_check_method in
-+ "file_magic "*)
-+ file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+ $EGREP "$file_magic_regex" > /dev/null; then
-+ :
-+ else
-+ cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such. This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem. Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+ fi ;;
-+ esac
-+ fi
-+ break
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ MAGIC_CMD="$lt_save_MAGIC_CMD"
-+ ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+ echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+ if test -n "$ac_tool_prefix"; then
-+ echo "$as_me:$LINENO: checking for file" >&5
-+echo $ECHO_N "checking for file... $ECHO_C" >&6
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $MAGIC_CMD in
-+[\\/*] | ?:[\\/]*)
-+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+ ;;
-+*)
-+ lt_save_MAGIC_CMD="$MAGIC_CMD"
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+ for ac_dir in $ac_dummy; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/file; then
-+ lt_cv_path_MAGIC_CMD="$ac_dir/file"
-+ if test -n "$file_magic_test_file"; then
-+ case $deplibs_check_method in
-+ "file_magic "*)
-+ file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+ $EGREP "$file_magic_regex" > /dev/null; then
-+ :
-+ else
-+ cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such. This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem. Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool@gnu.org
-+
-+EOF
-+ fi ;;
-+ esac
-+ fi
-+ break
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ MAGIC_CMD="$lt_save_MAGIC_CMD"
-+ ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+ echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ else
-+ MAGIC_CMD=:
-+ fi
-+fi
-+
-+ fi
-+ ;;
-+esac
-+
-+enable_dlopen=no
-+enable_win32_dll=no
-+
-+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then
-+ enableval="$enable_libtool_lock"
-+
-+fi;
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+
-+# Check whether --with-pic or --without-pic was given.
-+if test "${with_pic+set}" = set; then
-+ withval="$with_pic"
-+ pic_mode="$withval"
-+else
-+ pic_mode=default
-+fi;
-+test -z "$pic_mode" && pic_mode=default
-+
-+# Use C for the default configuration in the libtool script
-+tagname=
-+lt_save_CC="$CC"
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+objext=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}\n'
-+
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
-+#
-+# Check for any special shared library compilation flags.
-+#
-+lt_prog_cc_shlib=
-+if test "$GCC" = no; then
-+ case $host_os in
-+ sco3.2v5*)
-+ lt_prog_cc_shlib='-belf'
-+ ;;
-+ esac
-+fi
-+if test -n "$lt_prog_cc_shlib"; then
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-+echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
-+ if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then :
-+ else
-+ { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-+echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-+ lt_cv_prog_cc_can_build_shared=no
-+ fi
-+fi
-+
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-+echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_static_works+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_prog_compiler_static_works=no
-+ save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ if test -s conftest.err; then
-+ # Append any errors to the config.log.
-+ cat conftest.err 1>&5
-+ else
-+ lt_prog_compiler_static_works=yes
-+ fi
-+ fi
-+ $rm conftest*
-+ LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-+
-+if test x"$lt_prog_compiler_static_works" = xyes; then
-+ :
-+else
-+ lt_prog_compiler_static=
-+fi
-+
-+
-+
-+
-+lt_prog_compiler_no_builtin_flag=
-+
-+if test "$GCC" = yes; then
-+ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-+
-+
-+echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_rtti_exceptions=no
-+ ac_outfile=conftest.$ac_objext
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ lt_compiler_flag="-fno-rtti -fno-exceptions"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ # The option is referenced via a variable to avoid confusing sed.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:6461: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+ echo "$as_me:6465: \$? = $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
-+ if test ! -s conftest.err; then
-+ lt_cv_prog_compiler_rtti_exceptions=yes
-+ fi
-+ fi
-+ $rm conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-+
-+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-+else
-+ :
-+fi
-+
-+fi
-+
-+lt_prog_compiler_wl=
-+lt_prog_compiler_pic=
-+lt_prog_compiler_static=
-+
-+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+
-+ if test "$GCC" = yes; then
-+ lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_static='-static'
-+
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ lt_prog_compiler_static='-Bstatic'
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-+ ;;
-+
-+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
-+ ;;
-+
-+ mingw* | pw32* | os2*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ lt_prog_compiler_pic='-DDLL_EXPORT'
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ lt_prog_compiler_pic='-fno-common'
-+ ;;
-+
-+ msdosdjgpp*)
-+ # Just because we use GCC doesn't mean we suddenly get shared libraries
-+ # on systems that don't support them.
-+ lt_prog_compiler_can_build_shared=no
-+ enable_shared=no
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ lt_prog_compiler_pic=-Kconform_pic
-+ fi
-+ ;;
-+
-+ hpux*)
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ lt_prog_compiler_pic='-fPIC'
-+ ;;
-+ esac
-+ ;;
-+
-+ *)
-+ lt_prog_compiler_pic='-fPIC'
-+ ;;
-+ esac
-+ else
-+ # PORTME Check for flag to pass linker flags through the system compiler.
-+ case $host_os in
-+ aix*)
-+ lt_prog_compiler_wl='-Wl,'
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ lt_prog_compiler_static='-Bstatic'
-+ else
-+ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-+ fi
-+ ;;
-+ darwin*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ case "$cc_basename" in
-+ xlc*)
-+ lt_prog_compiler_pic='-qnocommon'
-+ lt_prog_compiler_wl='-Wl,'
-+ ;;
-+ esac
-+ ;;
-+
-+ mingw* | pw32* | os2*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ lt_prog_compiler_pic='-DDLL_EXPORT'
-+ ;;
-+
-+ hpux9* | hpux10* | hpux11*)
-+ lt_prog_compiler_wl='-Wl,'
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ lt_prog_compiler_pic='+Z'
-+ ;;
-+ esac
-+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+ lt_prog_compiler_static='${wl}-a ${wl}archive'
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ lt_prog_compiler_wl='-Wl,'
-+ # PIC (with -KPIC) is the default.
-+ lt_prog_compiler_static='-non_shared'
-+ ;;
-+
-+ newsos6)
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ ;;
-+
-+ linux*)
-+ case $cc_basename in
-+ icc* | ecc*)
-+ lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-static'
-+ ;;
-+ pgcc | pgf77 | pgf90)
-+ # Portland Group compilers (*not* the Pentium gcc compiler,
-+ # which looks to be a dead project)
-+ lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_pic='-fpic'
-+ lt_prog_compiler_static='-static'
-+ ;;
-+ ccc*)
-+ lt_prog_compiler_wl='-Wl,'
-+ # All Alpha code is PIC.
-+ lt_prog_compiler_static='-non_shared'
-+ ;;
-+ esac
-+ ;;
-+
-+ osf3* | osf4* | osf5*)
-+ lt_prog_compiler_wl='-Wl,'
-+ # All OSF/1 code is PIC.
-+ lt_prog_compiler_static='-non_shared'
-+ ;;
-+
-+ sco3.2v5*)
-+ lt_prog_compiler_pic='-Kpic'
-+ lt_prog_compiler_static='-dn'
-+ ;;
-+
-+ solaris*)
-+ lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ ;;
-+
-+ sunos4*)
-+ lt_prog_compiler_wl='-Qoption ld '
-+ lt_prog_compiler_pic='-PIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ ;;
-+
-+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ lt_prog_compiler_pic='-Kconform_pic'
-+ lt_prog_compiler_static='-Bstatic'
-+ fi
-+ ;;
-+
-+ unicos*)
-+ lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_can_build_shared=no
-+ ;;
-+
-+ uts4*)
-+ lt_prog_compiler_pic='-pic'
-+ lt_prog_compiler_static='-Bstatic'
-+ ;;
-+
-+ *)
-+ lt_prog_compiler_can_build_shared=no
-+ ;;
-+ esac
-+ fi
-+
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic" >&6
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic"; then
-+
-+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_pic_works+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_prog_compiler_pic_works=no
-+ ac_outfile=conftest.$ac_objext
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ # The option is referenced via a variable to avoid confusing sed.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:6716: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+ echo "$as_me:6720: \$? = $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
-+ if test ! -s conftest.err; then
-+ lt_prog_compiler_pic_works=yes
-+ fi
-+ fi
-+ $rm conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
-+
-+if test x"$lt_prog_compiler_pic_works" = xyes; then
-+ case $lt_prog_compiler_pic in
-+ "" | " "*) ;;
-+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-+ esac
-+else
-+ lt_prog_compiler_pic=
-+ lt_prog_compiler_can_build_shared=no
-+fi
-+
-+fi
-+case "$host_os" in
-+ # For platforms which do not support PIC, -DPIC is meaningless:
-+ *djgpp*)
-+ lt_prog_compiler_pic=
-+ ;;
-+ *)
-+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-+ ;;
-+esac
-+
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_c_o=no
-+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:6776: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+ echo "$as_me:6780: \$? = $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
-+ # So say no if there are warnings
-+ if test ! -s out/conftest.err; then
-+ lt_cv_prog_compiler_c_o=yes
-+ fi
-+ fi
-+ chmod u+w .
-+ $rm conftest*
-+ # SGI C++ compiler will create directory out/ii_files/ for
-+ # template instantiation
-+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+ $rm out/* && rmdir out
-+ cd ..
-+ rmdir conftest
-+ $rm conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-+
-+
-+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 "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+ hard_links=yes
-+ $rm conftest*
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ touch conftest.a
-+ ln conftest.a conftest.b 2>&5 || hard_links=no
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6
-+ if test "$hard_links" = no; then
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ need_locks=warn
-+ fi
-+else
-+ need_locks=no
-+fi
-+
-+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+
-+ runpath_var=
-+ allow_undefined_flag=
-+ enable_shared_with_static_runtimes=no
-+ archive_cmds=
-+ archive_expsym_cmds=
-+ old_archive_From_new_cmds=
-+ old_archive_from_expsyms_cmds=
-+ export_dynamic_flag_spec=
-+ whole_archive_flag_spec=
-+ thread_safe_flag_spec=
-+ hardcode_libdir_flag_spec=
-+ hardcode_libdir_flag_spec_ld=
-+ hardcode_libdir_separator=
-+ hardcode_direct=no
-+ hardcode_minus_L=no
-+ hardcode_shlibpath_var=unsupported
-+ link_all_deplibs=unknown
-+ hardcode_automatic=no
-+ module_cmds=
-+ module_expsym_cmds=
-+ always_export_symbols=no
-+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ # include_expsyms should be a list of space-separated symbols to be *always*
-+ # included in the symbol list
-+ include_expsyms=
-+ # exclude_expsyms can be an extended regexp of symbols to exclude
-+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+ # as well as any symbol that contains `d'.
-+ exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+ # platforms (ab)use it in PIC code, but their linkers get confused if
-+ # the symbol is explicitly referenced. Since portable code cannot
-+ # rely on this symbol name, it's probably fine to never include it in
-+ # preloaded symbol tables.
-+ extract_expsyms_cmds=
-+
-+ case $host_os in
-+ cygwin* | mingw* | pw32*)
-+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ if test "$GCC" != yes; then
-+ with_gnu_ld=no
-+ fi
-+ ;;
-+ openbsd*)
-+ with_gnu_ld=no
-+ ;;
-+ esac
-+
-+ ld_shlibs=yes
-+ if test "$with_gnu_ld" = yes; then
-+ # If archive_cmds runs LD, not CC, wlarc should be empty
-+ wlarc='${wl}'
-+
-+ # See if GNU ld supports shared libraries.
-+ case $host_os in
-+ aix3* | aix4* | aix5*)
-+ # On AIX/PPC, the GNU linker is very broken
-+ if test "$host_cpu" != ia64; then
-+ ld_shlibs=no
-+ cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support. If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ hardcode_libdir_flag_spec='-L$libdir'
-+ hardcode_minus_L=yes
-+
-+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+ # that the semantics of dynamic libraries on AmigaOS, at least up
-+ # to version 4, is to share data among multiple programs linked
-+ # with the same dynamic library. Since this doesn't match the
-+ # behavior of shared libraries on other platforms, we can't use
-+ # them.
-+ ld_shlibs=no
-+ ;;
-+
-+ beos*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ allow_undefined_flag=unsupported
-+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ ld_shlibs=no
-+ fi
-+ ;;
-+
-+ cygwin* | mingw* | pw32*)
-+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-+ # as there is no search path for DLLs.
-+ hardcode_libdir_flag_spec='-L$libdir'
-+ allow_undefined_flag=unsupported
-+ always_export_symbols=no
-+ enable_shared_with_static_runtimes=yes
-+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+
-+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ # If the export-symbols file already is a .def file (1st line
-+ # is EXPORTS), use it as is; otherwise, prepend...
-+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ echo EXPORTS > $output_objdir/$soname.def;
-+ cat $export_symbols >> $output_objdir/$soname.def;
-+ fi~
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ else
-+ ld_shlibs=no
-+ fi
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+ wlarc=
-+ else
-+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ fi
-+ ;;
-+
-+ solaris* | sysv5*)
-+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+ ld_shlibs=no
-+ cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems. Therefore, libtool
-+*** is disabling shared libraries support. We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer. Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ ld_shlibs=no
-+ fi
-+ ;;
-+
-+ sunos4*)
-+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ wlarc=
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_addflag=
-+ case $CC,$host_cpu in
-+ pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
-+ tmp_addflag=' -fpic' ;;
-+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
-+ tmp_addflag=' -i_dynamic' ;;
-+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
-+ tmp_addflag=' -i_dynamic -nofor_main' ;;
-+ ifc* | ifort*) # Intel Fortran compiler
-+ tmp_addflag=' -nofor_main' ;;
-+ esac
-+ archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ archive_expsym_cmds=$archive_cmds
-+ fi
-+ else
-+ ld_shlibs=no
-+ fi
-+ ;;
-+
-+ *)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ ld_shlibs=no
-+ fi
-+ ;;
-+ esac
-+
-+ if test "$ld_shlibs" = yes; then
-+ runpath_var=LD_RUN_PATH
-+ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+ export_dynamic_flag_spec='${wl}--export-dynamic'
-+ # ancient GNU ld didn't support --whole-archive et. al.
-+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ whole_archive_flag_spec=
-+ fi
-+ fi
-+ else
-+ # PORTME fill in a description of your system's linker (not GNU ld)
-+ case $host_os in
-+ aix3*)
-+ allow_undefined_flag=unsupported
-+ always_export_symbols=yes
-+ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+ # Note: this linker hardcodes the directories in LIBPATH if there
-+ # are no directories specified by -L.
-+ hardcode_minus_L=yes
-+ if test "$GCC" = yes && test -z "$link_static_flag"; then
-+ # Neither direct hardcoding nor static linking is supported with a
-+ # broken collect2.
-+ hardcode_direct=unsupported
-+ fi
-+ ;;
-+
-+ aix4* | aix5*)
-+ if test "$host_cpu" = ia64; then
-+ # On IA64, the linker does run time linking by default, so we don't
-+ # have to do anything special.
-+ aix_use_runtimelinking=no
-+ exp_sym_flag='-Bexport'
-+ no_entry_flag=""
-+ else
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+ fi
-+ aix_use_runtimelinking=no
-+
-+ # Test if we are trying to use run time linking or normal
-+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+ # need to do runtime linking.
-+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ for ld_flag in $LDFLAGS; do
-+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+ aix_use_runtimelinking=yes
-+ break
-+ fi
-+ done
-+ esac
-+
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
-+
-+ # When large executables or shared objects are built, AIX ld can
-+ # have problems creating the table of contents. If linking a library
-+ # or program results in "error TOC overflow" add -mminimal-toc to
-+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+ archive_cmds=''
-+ hardcode_direct=yes
-+ hardcode_libdir_separator=':'
-+ link_all_deplibs=yes
-+
-+ if test "$GCC" = yes; then
-+ case $host_os in aix4.[012]|aix4.[012].*)
-+ # We only want to do this on AIX 4.2 and lower, the check
-+ # below for broken collect2 doesn't work under 4.3+
-+ collect2name=`${CC} -print-prog-name=collect2`
-+ if test -f "$collect2name" && \
-+ strings "$collect2name" | grep resolve_lib_name >/dev/null
-+ then
-+ # We have reworked collect2
-+ hardcode_direct=yes
-+ else
-+ # We have old collect2
-+ hardcode_direct=unsupported
-+ # It fails to find uninstalled libraries when the uninstalled
-+ # path is not listed in the libpath. Setting hardcode_minus_L
-+ # to unsupported forces relinking
-+ hardcode_minus_L=yes
-+ hardcode_libdir_flag_spec='-L$libdir'
-+ hardcode_libdir_separator=
-+ fi
-+ esac
-+ shared_flag='-shared'
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag="$shared_flag "'${wl}-G'
-+ fi
-+ else
-+ # not using gcc
-+ if test "$host_cpu" = ia64; then
-+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+ # chokes on -Wl,-G. The following line is correct:
-+ shared_flag='-G'
-+ else
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
-+ else
-+ shared_flag='${wl}-bM:SRE'
-+ fi
-+ fi
-+ fi
-+
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ always_export_symbols=yes
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # Warning - without using the other runtime loading flags (-brtl),
-+ # -berok will link without error, but may produce a broken library.
-+ allow_undefined_flag='-berok'
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+ allow_undefined_flag="-z nodefs"
-+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ else
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Warning - without using the other run time loading flags,
-+ # -berok will link without error, but may produce a broken library.
-+ no_undefined_flag=' ${wl}-bernotok'
-+ allow_undefined_flag=' ${wl}-berok'
-+ # -bexpall does not export symbols beginning with underscore (_)
-+ always_export_symbols=yes
-+ # Exported symbols can be pulled into shared objects from archives
-+ whole_archive_flag_spec=' '
-+ archive_cmds_need_lc=yes
-+ # This is similar to how AIX traditionally builds it's shared libraries.
-+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ fi
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ hardcode_libdir_flag_spec='-L$libdir'
-+ hardcode_minus_L=yes
-+ # see comment about different semantics on the GNU ld section
-+ ld_shlibs=no
-+ ;;
-+
-+ bsdi[45]*)
-+ export_dynamic_flag_spec=-rdynamic
-+ ;;
-+
-+ cygwin* | mingw* | pw32*)
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ # hardcode_libdir_flag_spec is actually meaningless, as there is
-+ # no search path for DLLs.
-+ hardcode_libdir_flag_spec=' '
-+ allow_undefined_flag=unsupported
-+ # Tell ltmain to make .lib files, not .a files.
-+ libext=lib
-+ # Tell ltmain to make .dll files, not .so files.
-+ shrext_cmds=".dll"
-+ # FIXME: Setting linknames here is a bad hack.
-+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+ # The linker will automatically build a .lib file if we build a DLL.
-+ old_archive_From_new_cmds='true'
-+ # FIXME: Should let the user specify the lib program.
-+ old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ fix_srcfile_path='`cygpath -w "$srcfile"`'
-+ enable_shared_with_static_runtimes=yes
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ case "$host_os" in
-+ rhapsody* | darwin1.[012])
-+ allow_undefined_flag='${wl}-undefined ${wl}suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ archive_cmds_need_lc=no
-+ hardcode_direct=no
-+ hardcode_automatic=yes
-+ hardcode_shlibpath_var=unsupported
-+ whole_archive_flag_spec=''
-+ link_all_deplibs=yes
-+ if test "$GCC" = yes ; then
-+ output_verbose_link_cmd='echo'
-+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ case "$cc_basename" in
-+ xlc*)
-+ output_verbose_link_cmd='echo'
-+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ ;;
-+ *)
-+ ld_shlibs=no
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ dgux*)
-+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec='-L$libdir'
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ freebsd1*)
-+ ld_shlibs=no
-+ ;;
-+
-+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+ # support. Future versions do this automatically, but an explicit c++rt0.o
-+ # does not break anything, and helps significantly (at the cost of a little
-+ # extra space).
-+ freebsd2.2*)
-+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+ freebsd2*)
-+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct=yes
-+ hardcode_minus_L=yes
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
-+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ hpux9*)
-+ if test "$GCC" = yes; then
-+ archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ else
-+ archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ fi
-+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator=:
-+ hardcode_direct=yes
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L=yes
-+ export_dynamic_flag_spec='${wl}-E'
-+ ;;
-+
-+ hpux10* | hpux11*)
-+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ else
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ ;;
-+ *)
-+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ ;;
-+ esac
-+ fi
-+ if test "$with_gnu_ld" = no; then
-+ case "$host_cpu" in
-+ hppa*64*)
-+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_flag_spec_ld='+b $libdir'
-+ hardcode_libdir_separator=:
-+ hardcode_direct=no
-+ hardcode_shlibpath_var=no
-+ ;;
-+ ia64*)
-+ hardcode_libdir_flag_spec='-L$libdir'
-+ hardcode_direct=no
-+ hardcode_shlibpath_var=no
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L=yes
-+ ;;
-+ *)
-+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator=:
-+ hardcode_direct=yes
-+ export_dynamic_flag_spec='${wl}-E'
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L=yes
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ if test "$GCC" = yes; then
-+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ hardcode_libdir_flag_spec_ld='-rpath $libdir'
-+ fi
-+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator=:
-+ link_all_deplibs=yes
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-+ else
-+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-+ fi
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ newsos6)
-+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct=yes
-+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator=:
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ openbsd*)
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ os2*)
-+ hardcode_libdir_flag_spec='-L$libdir'
-+ hardcode_minus_L=yes
-+ allow_undefined_flag=unsupported
-+ archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+ old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+ ;;
-+
-+ osf3*)
-+ if test "$GCC" = yes; then
-+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ allow_undefined_flag=' -expect_unresolved \*'
-+ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ fi
-+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator=:
-+ ;;
-+
-+ osf4* | osf5*) # as osf3* with the addition of -msym flag
-+ if test "$GCC" = yes; then
-+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+ else
-+ allow_undefined_flag=' -expect_unresolved \*'
-+ archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+ # Both c and cxx compiler support -rpath directly
-+ hardcode_libdir_flag_spec='-rpath $libdir'
-+ fi
-+ hardcode_libdir_separator=:
-+ ;;
-+
-+ sco3.2v5*)
-+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_shlibpath_var=no
-+ export_dynamic_flag_spec='${wl}-Bexport'
-+ runpath_var=LD_RUN_PATH
-+ hardcode_runpath_var=yes
-+ ;;
-+
-+ solaris*)
-+ no_undefined_flag=' -z text'
-+ if test "$GCC" = yes; then
-+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+ else
-+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+ fi
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ hardcode_shlibpath_var=no
-+ case $host_os in
-+ solaris2.[0-5] | solaris2.[0-5].*) ;;
-+ *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;;
-+ esac
-+ link_all_deplibs=yes
-+ ;;
-+
-+ sunos4*)
-+ if test "x$host_vendor" = xsequent; then
-+ # Use $CC to link under sequent, because it throws in some extra .o
-+ # files that make .init and .fini sections work.
-+ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+ fi
-+ hardcode_libdir_flag_spec='-L$libdir'
-+ hardcode_direct=yes
-+ hardcode_minus_L=yes
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ sysv4)
-+ case $host_vendor in
-+ sni)
-+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct=yes # is this really true???
-+ ;;
-+ siemens)
-+ ## LD is ld it makes a PLAMLIB
-+ ## CC just makes a GrossModule.
-+ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ reload_cmds='$CC -r -o $output$reload_objs'
-+ hardcode_direct=no
-+ ;;
-+ motorola)
-+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+ ;;
-+ esac
-+ runpath_var='LD_RUN_PATH'
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ sysv4.3*)
-+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_shlibpath_var=no
-+ export_dynamic_flag_spec='-Bexport'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_shlibpath_var=no
-+ runpath_var=LD_RUN_PATH
-+ hardcode_runpath_var=yes
-+ ld_shlibs=yes
-+ fi
-+ ;;
-+
-+ sysv4.2uw2*)
-+ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct=yes
-+ hardcode_minus_L=no
-+ hardcode_shlibpath_var=no
-+ hardcode_runpath_var=yes
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+
-+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-+ no_undefined_flag='${wl}-z ${wl}text'
-+ if test "$GCC" = yes; then
-+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
-+ runpath_var='LD_RUN_PATH'
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ sysv5*)
-+ no_undefined_flag=' -z text'
-+ # $CC -shared without GNU ld will not create a library from C++
-+ # object files and a static libstdc++, better avoid it by now
-+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+ hardcode_libdir_flag_spec=
-+ hardcode_shlibpath_var=no
-+ runpath_var='LD_RUN_PATH'
-+ ;;
-+
-+ uts4*)
-+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec='-L$libdir'
-+ hardcode_shlibpath_var=no
-+ ;;
-+
-+ *)
-+ ld_shlibs=no
-+ ;;
-+ esac
-+ fi
-+
-+echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+echo "${ECHO_T}$ld_shlibs" >&6
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc" in
-+x|xyes)
-+ # Assume -lc should be added
-+ archive_cmds_need_lc=yes
-+
-+ if test "$enable_shared" = yes && test "$GCC" = yes; then
-+ case $archive_cmds in
-+ *'~'*)
-+ # FIXME: we may have to deal with multi-command sequences.
-+ ;;
-+ '$CC '*)
-+ # Test whether the compiler implicitly links with -lc since on some
-+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+ # to ld, don't add -lc before -lgcc.
-+ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+ $rm conftest*
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } 2>conftest.err; then
-+ soname=conftest
-+ lib=conftest
-+ libobjs=conftest.$ac_objext
-+ deplibs=
-+ wl=$lt_prog_compiler_wl
-+ compiler_flags=-v
-+ linker_flags=-v
-+ verstring=
-+ output_objdir=.
-+ libname=conftest
-+ lt_save_allow_undefined_flag=$allow_undefined_flag
-+ allow_undefined_flag=
-+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+ (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+ then
-+ archive_cmds_need_lc=no
-+ else
-+ archive_cmds_need_lc=yes
-+ fi
-+ allow_undefined_flag=$lt_save_allow_undefined_flag
-+ else
-+ cat conftest.err 1>&5
-+ fi
-+ $rm conftest*
-+ echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc" >&6
-+ ;;
-+ esac
-+ fi
-+ ;;
-+esac
-+
-+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
-+
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+
-+aix4* | aix5*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ hardcode_into_libs=yes
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 supports IA64
-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ else
-+ # With GCC up to 2.95.x, collect2 would create an import file
-+ # for dependence libraries. The import file would start with
-+ # the line `#! .'. This would cause the generated library to
-+ # depend on `.', always an invalid library. This was fixed in
-+ # development snapshots of GCC prior to 3.0.
-+ case $host_os in
-+ aix4 | aix4.[01] | aix4.[01].*)
-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+ echo ' yes '
-+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+ :
-+ else
-+ can_build_shared=no
-+ fi
-+ ;;
-+ esac
-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+ # soname into executable. Probably we can add versioning support to
-+ # collect2, so additional links can be useful in future.
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+ # instead of lib<name>.a to let people know that these are not
-+ # typical AIX shared libraries.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ else
-+ # We preserve .a as extension for shared libraries through AIX4.2
-+ # and later when we are not doing run time linking.
-+ library_names_spec='${libname}${release}.a $libname.a'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-+
-+amigaos*)
-+ library_names_spec='$libname.ixlibrary $libname.a'
-+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+ ;;
-+
-+beos*)
-+ library_names_spec='${libname}${shared_ext}'
-+ dynamic_linker="$host_os ld.so"
-+ shlibpath_var=LIBRARY_PATH
-+ ;;
-+
-+bsdi[45]*)
-+ version_type=linux
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+ # the default ld.so.conf also contains /usr/contrib/lib and
-+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+ # libtool to hard-code these into programs
-+ ;;
-+
-+cygwin* | mingw* | pw32*)
-+ version_type=windows
-+ shrext_cmds=".dll"
-+ need_version=no
-+ need_lib_prefix=no
-+
-+ case $GCC,$host_os in
-+ yes,cygwin* | yes,mingw* | yes,pw32*)
-+ library_names_spec='$libname.dll.a'
-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+ postinstall_cmds='base_file=`basename \${file}`~
-+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+ dldir=$destdir/`dirname \$dlpath`~
-+ test -d \$dldir || mkdir -p \$dldir~
-+ $install_prog $dir/$dlname \$dldir/$dlname'
-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+ dlpath=$dir/\$dldll~
-+ $rm \$dlpath'
-+ shlibpath_overrides_runpath=yes
-+
-+ case $host_os in
-+ cygwin*)
-+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+ ;;
-+ mingw*)
-+ # MinGW DLLs use traditional 'lib' prefix
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+ # It is most probably a Windows format PATH printed by
-+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+ # path with ; separators, and with drive letters. We can handle the
-+ # drive letters (cygwin fileutils understands them), so leave them,
-+ # especially as we might pass files found there to a mingw objdump,
-+ # which wouldn't understand a cygwinified path. Ahh.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+ ;;
-+ pw32*)
-+ # pw32 DLLs use 'pw' prefix rather than 'lib'
-+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ ;;
-+ esac
-+ ;;
-+
-+ *)
-+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+ ;;
-+ esac
-+ dynamic_linker='Win32 ld.exe'
-+ # FIXME: first we should search . and the directory the executable is in
-+ shlibpath_var=PATH
-+ ;;
-+
-+darwin* | rhapsody*)
-+ dynamic_linker="$host_os dyld"
-+ version_type=darwin
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+ soname_spec='${libname}${release}${major}$shared_ext'
-+ shlibpath_overrides_runpath=yes
-+ shlibpath_var=DYLD_LIBRARY_PATH
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+ if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+ else
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+ ;;
-+
-+dgux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd1*)
-+ dynamic_linker=no
-+ ;;
-+
-+kfreebsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
-+freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ need_version=no
-+ need_lib_prefix=no
-+ ;;
-+ freebsd-*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ need_version=yes
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_os in
-+ freebsd2*)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ freebsd3.[01]* | freebsdelf3.[01]*)
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ *) # from 3.2 on
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+ esac
-+ ;;
-+
-+gnu*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+ # Give a soname corresponding to the major version so that dld.sl refuses to
-+ # link against other versions.
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ case "$host_cpu" in
-+ ia64*)
-+ shrext_cmds='.so'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.so"
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ if test "X$HPUX_IA64_MODE" = X32; then
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+ fi
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+ postinstall_cmds='chmod 555 $lib'
-+ ;;
-+
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
-+ esac
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-+
-+# This must be Linux ELF.
-+linux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ hardcode_into_libs=yes
-+
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-+
-+ # We used to test for /lib/ld.so.1 and disable shared libraries on
-+ # powerpc, because MkLinux only supported shared libraries with the
-+ # GNU dynamic linker. Since this was broken with cross compilers,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-+
-+knetbsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
-+ else
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+nto-qnx*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+openbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ case $host_os in
-+ openbsd2.[89] | openbsd2.[89].*)
-+ shlibpath_overrides_runpath=no
-+ ;;
-+ *)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ esac
-+ else
-+ shlibpath_overrides_runpath=yes
-+ fi
-+ ;;
-+
-+os2*)
-+ libname_spec='$name'
-+ shrext_cmds=".dll"
-+ need_lib_prefix=no
-+ library_names_spec='$libname${shared_ext} $libname.a'
-+ dynamic_linker='OS/2 ld.exe'
-+ shlibpath_var=LIBPATH
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ version_type=osf
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+ ;;
-+
-+sco3.2v5*)
-+ version_type=osf
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+solaris*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ # ldd complains unless libraries are executable
-+ postinstall_cmds='chmod +x $lib'
-+ ;;
-+
-+sunos4*)
-+ version_type=sunos
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ if test "$with_gnu_ld" = yes; then
-+ need_lib_prefix=no
-+ fi
-+ need_version=yes
-+ ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_vendor in
-+ sni)
-+ shlibpath_overrides_runpath=no
-+ need_lib_prefix=no
-+ export_dynamic_flag_spec='${wl}-Blargedynsym'
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+ siemens)
-+ need_lib_prefix=no
-+ ;;
-+ motorola)
-+ need_lib_prefix=no
-+ need_version=no
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+ ;;
-+ esac
-+ ;;
-+
-+sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ version_type=linux
-+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+ soname_spec='$libname${shared_ext}.$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ fi
-+ ;;
-+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+*)
-+ dynamic_linker=no
-+ ;;
-+esac
-+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+hardcode_action=
-+if test -n "$hardcode_libdir_flag_spec" || \
-+ test -n "$runpath_var" || \
-+ test "X$hardcode_automatic" = "Xyes" ; then
-+
-+ # We can hardcode non-existant directories.
-+ if test "$hardcode_direct" != no &&
-+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+ # have to relink, otherwise we might link with an installed library
-+ # when we should be linking with a yet-to-be-installed one
-+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
-+ test "$hardcode_minus_L" != no; then
-+ # Linking always hardcodes the temporary library directory.
-+ hardcode_action=relink
-+ else
-+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+ hardcode_action=immediate
-+ fi
-+else
-+ # We cannot hardcode anything, or else we can only hardcode existing
-+ # directories.
-+ hardcode_action=unsupported
-+fi
-+echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+echo "${ECHO_T}$hardcode_action" >&6
-+
-+if test "$hardcode_action" = relink; then
-+ # Fast installation is not supported
-+ enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+ test "$enable_shared" = no; then
-+ # Fast installation is not necessary
-+ enable_fast_install=needless
-+fi
-+
-+striplib=
-+old_striplib=
-+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+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"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+ case $host_os in
-+ darwin*)
-+ if test -n "$STRIP" ; then
-+ striplib="$STRIP -x"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+ ;;
-+ *)
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ ;;
-+ esac
-+fi
-+
-+if test "x$enable_dlopen" != xyes; then
-+ enable_dlopen=unknown
-+ enable_dlopen_self=unknown
-+ enable_dlopen_self_static=unknown
-+else
-+ lt_cv_dlopen=no
-+ lt_cv_dlopen_libs=
-+
-+ case $host_os in
-+ beos*)
-+ lt_cv_dlopen="load_add_on"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ;;
-+
-+ mingw* | pw32*)
-+ lt_cv_dlopen="LoadLibrary"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ cygwin*)
-+ lt_cv_dlopen="dlopen"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ darwin*)
-+ # if libdl is installed we need to link against it
-+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dl_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+
-+ lt_cv_dlopen="dyld"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+
-+fi
-+
-+ ;;
-+
-+ *)
-+ echo "$as_me:$LINENO: checking for shl_load" >&5
-+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-+if test "${ac_cv_func_shl_load+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define shl_load innocuous_shl_load
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char shl_load (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef shl_load
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char shl_load ();
-+/* 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_shl_load) || defined (__stub___shl_load)
-+choke me
-+#else
-+char (*f) () = shl_load;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != shl_load;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func_shl_load=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_shl_load=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-+if test $ac_cv_func_shl_load = yes; then
-+ lt_cv_dlopen="shl_load"
-+else
-+ echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char shl_load ();
-+int
-+main ()
-+{
-+shl_load ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dld_shl_load=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dld_shl_load=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-+if test $ac_cv_lib_dld_shl_load = yes; then
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+else
-+ echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-+if test "${ac_cv_func_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define dlopen innocuous_dlopen
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char dlopen (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef dlopen
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+/* 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_dlopen) || defined (__stub___dlopen)
-+choke me
-+#else
-+char (*f) () = dlopen;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != dlopen;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-+if test $ac_cv_func_dlopen = yes; then
-+ lt_cv_dlopen="dlopen"
-+else
-+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dl_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+ echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_svld_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_svld_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-+if test $ac_cv_lib_svld_dlopen = yes; then
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
-+ echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dld_link ();
-+int
-+main ()
-+{
-+dld_link ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dld_dld_link=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dld_dld_link=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-+if test $ac_cv_lib_dld_dld_link = yes; then
-+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+ ;;
-+ esac
-+
-+ if test "x$lt_cv_dlopen" != xno; then
-+ enable_dlopen=yes
-+ else
-+ enable_dlopen=no
-+ fi
-+
-+ case $lt_cv_dlopen in
-+ dlopen)
-+ save_CPPFLAGS="$CPPFLAGS"
-+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+ save_LDFLAGS="$LDFLAGS"
-+ eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+ save_LIBS="$LIBS"
-+ LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+ echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-+if test "${lt_cv_dlopen_self+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$cross_compiling" = yes; then :
-+ lt_cv_dlopen_self=cross
-+else
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-+#line 8976 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LT_DLGLOBAL RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+# define LT_DLGLOBAL DL_GLOBAL
-+# else
-+# define LT_DLGLOBAL 0
-+# endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+ find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+# define LT_DLLAZY_OR_NOW RTLD_LAZY
-+# else
-+# ifdef DL_LAZY
-+# define LT_DLLAZY_OR_NOW DL_LAZY
-+# else
-+# ifdef RTLD_NOW
-+# define LT_DLLAZY_OR_NOW RTLD_NOW
-+# else
-+# ifdef DL_NOW
-+# define LT_DLLAZY_OR_NOW DL_NOW
-+# else
-+# define LT_DLLAZY_OR_NOW 0
-+# endif
-+# endif
-+# endif
-+# endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+ int status = $lt_dlunknown;
-+
-+ if (self)
-+ {
-+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+ /* dlclose (self); */
-+ }
-+
-+ exit (status);
-+}
-+EOF
-+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ (./conftest; exit; ) 2>/dev/null
-+ lt_status=$?
-+ case x$lt_status in
-+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-+ x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-+ esac
-+ else :
-+ # compilation failed
-+ lt_cv_dlopen_self=no
-+ fi
-+fi
-+rm -fr conftest*
-+
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+
-+ if test "x$lt_cv_dlopen_self" = xyes; then
-+ LDFLAGS="$LDFLAGS $link_static_flag"
-+ echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-+if test "${lt_cv_dlopen_self_static+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$cross_compiling" = yes; then :
-+ lt_cv_dlopen_self_static=cross
-+else
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-+#line 9074 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LT_DLGLOBAL RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+# define LT_DLGLOBAL DL_GLOBAL
-+# else
-+# define LT_DLGLOBAL 0
-+# endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+ find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+# define LT_DLLAZY_OR_NOW RTLD_LAZY
-+# else
-+# ifdef DL_LAZY
-+# define LT_DLLAZY_OR_NOW DL_LAZY
-+# else
-+# ifdef RTLD_NOW
-+# define LT_DLLAZY_OR_NOW RTLD_NOW
-+# else
-+# ifdef DL_NOW
-+# define LT_DLLAZY_OR_NOW DL_NOW
-+# else
-+# define LT_DLLAZY_OR_NOW 0
-+# endif
-+# endif
-+# endif
-+# endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+ int status = $lt_dlunknown;
-+
-+ if (self)
-+ {
-+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+ /* dlclose (self); */
-+ }
-+
-+ exit (status);
-+}
-+EOF
-+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ (./conftest; exit; ) 2>/dev/null
-+ lt_status=$?
-+ case x$lt_status in
-+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-+ x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+ esac
-+ else :
-+ # compilation failed
-+ lt_cv_dlopen_self_static=no
-+ fi
-+fi
-+rm -fr conftest*
-+
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-+ fi
-+
-+ CPPFLAGS="$save_CPPFLAGS"
-+ LDFLAGS="$save_LDFLAGS"
-+ LIBS="$save_LIBS"
-+ ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self in
-+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+ *) enable_dlopen_self=unknown ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self_static in
-+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+ *) enable_dlopen_self_static=unknown ;;
-+ esac
-+fi
-+
-+
-+# Report which librarie types wil actually be built
-+echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-+echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6
-+
-+echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
-+
-+aix4* | aix5*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+esac
-+echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6
-+
-+echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6
-+
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+ # See if we are running on zsh, and set the options which allow our commands through
-+ # without removal of \ escapes.
-+ if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+ fi
-+ # Now quote all the things that may contain metacharacters while being
-+ # careful not to overquote the AC_SUBSTed values. We take copies of the
-+ # variables and quote the copies for generation of the libtool script.
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
-+ SED SHELL STRIP \
-+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+ deplibs_check_method reload_flag reload_cmds need_locks \
-+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+ lt_cv_sys_global_symbol_to_c_name_address \
-+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+ old_postinstall_cmds old_postuninstall_cmds \
-+ compiler \
-+ CC \
-+ LD \
-+ lt_prog_compiler_wl \
-+ lt_prog_compiler_pic \
-+ lt_prog_compiler_static \
-+ lt_prog_compiler_no_builtin_flag \
-+ export_dynamic_flag_spec \
-+ thread_safe_flag_spec \
-+ whole_archive_flag_spec \
-+ enable_shared_with_static_runtimes \
-+ old_archive_cmds \
-+ old_archive_from_new_cmds \
-+ predep_objects \
-+ postdep_objects \
-+ predeps \
-+ postdeps \
-+ compiler_lib_search_path \
-+ archive_cmds \
-+ archive_expsym_cmds \
-+ postinstall_cmds \
-+ postuninstall_cmds \
-+ old_archive_from_expsyms_cmds \
-+ allow_undefined_flag \
-+ no_undefined_flag \
-+ export_symbols_cmds \
-+ hardcode_libdir_flag_spec \
-+ hardcode_libdir_flag_spec_ld \
-+ hardcode_libdir_separator \
-+ hardcode_automatic \
-+ module_cmds \
-+ module_expsym_cmds \
-+ lt_cv_prog_compiler_c_o \
-+ exclude_expsyms \
-+ include_expsyms; do
-+
-+ case $var in
-+ old_archive_cmds | \
-+ old_archive_from_new_cmds | \
-+ archive_cmds | \
-+ archive_expsym_cmds | \
-+ module_cmds | \
-+ module_expsym_cmds | \
-+ old_archive_from_expsyms_cmds | \
-+ export_symbols_cmds | \
-+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+ postinstall_cmds | postuninstall_cmds | \
-+ old_postinstall_cmds | old_postuninstall_cmds | \
-+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+ # Double-quote double-evaled strings.
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+ ;;
-+ *)
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ ;;
-+ esac
-+ done
-+
-+ case $lt_echo in
-+ *'\$0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+ ;;
-+ esac
-+
-+cfgfile="${ofile}T"
-+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-+ $rm -f "$cfgfile"
-+ { echo "$as_me:$LINENO: creating $ofile" >&5
-+echo "$as_me: creating $ofile" >&6;}
-+
-+ cat <<__EOF__ >> "$cfgfile"
-+#! $SHELL
-+
-+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Libtool:
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# A sed program that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="$SED -e s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+# The names of the tagged configurations supported by this script.
-+available_tags=
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
-+# A language-specific compiler.
-+CC=$lt_compiler
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_LD
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS=$lt_AS
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds
-+module_expsym_cmds=$lt_module_expsym_cmds
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
-+
-+# ### END LIBTOOL CONFIG
-+
-+__EOF__
-+
-+
-+ case $host_os in
-+ aix3*)
-+ cat <<\EOF >> "$cfgfile"
-+
-+# AIX sometimes has problems with the GCC collect2 program. For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+fi
-+EOF
-+ ;;
-+ esac
-+
-+ # We use sed instead of cat because bash on DJGPP gets confused if
-+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
-+ # text mode, it properly converts lines to CR/LF. This bash problem
-+ # is reportedly fixed, but why not run on old versions too?
-+ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-+
-+ mv -f "$cfgfile" "$ofile" || \
-+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+ chmod +x "$ofile"
-+
-+else
-+ # If there is no Makefile yet, we rely on a make rule to execute
-+ # `config.status --recheck' to rerun these tests and create the
-+ # libtool script then.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC="$lt_save_CC"
-+
-+
-+# Check whether --with-tags or --without-tags was given.
-+if test "${with_tags+set}" = set; then
-+ withval="$with_tags"
-+ tagnames="$withval"
-+fi;
-+
-+if test -f "$ltmain" && test -n "$tagnames"; then
-+ if test ! -f "${ofile}"; then
-+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-+ fi
-+
-+ if test -z "$LTCC"; then
-+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-+ if test -z "$LTCC"; then
-+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-+ else
-+ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-+ fi
-+ fi
-+
-+ # Extract list of available tagged configurations in $ofile.
-+ # Note that this assumes the entire list is on one line.
-+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-+
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for tagname in $tagnames; do
-+ IFS="$lt_save_ifs"
-+ # Check whether tagname contains only valid characters
-+ case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-+ "") ;;
-+ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-+echo "$as_me: error: invalid tag name: $tagname" >&2;}
-+ { (exit 1); exit 1; }; }
-+ ;;
-+ esac
-+
-+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-+ then
-+ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+
-+ # Update the list of available tags.
-+ if test -n "$tagname"; then
-+ echo appending configuration tag \"$tagname\" to $ofile
-+
-+ case $tagname in
-+ CXX)
-+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+ (test "X$CXX" != "Xg++"))) ; then
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+
-+
-+archive_cmds_need_lc_CXX=no
-+allow_undefined_flag_CXX=
-+always_export_symbols_CXX=no
-+archive_expsym_cmds_CXX=
-+export_dynamic_flag_spec_CXX=
-+hardcode_direct_CXX=no
-+hardcode_libdir_flag_spec_CXX=
-+hardcode_libdir_flag_spec_ld_CXX=
-+hardcode_libdir_separator_CXX=
-+hardcode_minus_L_CXX=no
-+hardcode_automatic_CXX=no
-+module_cmds_CXX=
-+module_expsym_cmds_CXX=
-+link_all_deplibs_CXX=unknown
-+old_archive_cmds_CXX=$old_archive_cmds
-+no_undefined_flag_CXX=
-+whole_archive_flag_spec_CXX=
-+enable_shared_with_static_runtimes_CXX=no
-+
-+# Dependencies to place before and after the object being linked:
-+predep_objects_CXX=
-+postdep_objects_CXX=
-+predeps_CXX=
-+postdeps_CXX=
-+compiler_lib_search_path_CXX=
-+
-+# Source file extension for C++ test sources.
-+ac_ext=cc
-+
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+objext_CXX=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC=$CC
-+lt_save_LD=$LD
-+lt_save_GCC=$GCC
-+GCC=$GXX
-+lt_save_with_gnu_ld=$with_gnu_ld
-+lt_save_path_LD=$lt_cv_path_LD
-+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+else
-+ unset lt_cv_prog_gnu_ld
-+fi
-+if test -n "${lt_cv_path_LDCXX+set}"; then
-+ lt_cv_path_LD=$lt_cv_path_LDCXX
-+else
-+ unset lt_cv_path_LD
-+fi
-+test -z "${LDCXX+set}" || LD=$LDCXX
-+CC=${CXX-"c++"}
-+compiler=$CC
-+compiler_CXX=$CC
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+
-+# We don't want -fno-exception wen compiling C++ code, so set the
-+# no_builtin_flag separately
-+if test "$GXX" = yes; then
-+ lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-+else
-+ lt_prog_compiler_no_builtin_flag_CXX=
-+fi
-+
-+if test "$GXX" = yes; then
-+ # Set up default GNU C++ configuration
-+
-+
-+# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then
-+ withval="$with_gnu_ld"
-+ test "$withval" = no || with_gnu_ld=yes
-+else
-+ with_gnu_ld=no
-+fi;
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+ # Check if gcc -print-prog-name=ld gives a path.
-+ echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+ case $host in
-+ *-*-mingw*)
-+ # gcc leaves a trailing carriage return which upsets mingw
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+ *)
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
-+ case $ac_prog in
-+ # Accept absolute paths.
-+ [\\/]* | ?:[\\/]*)
-+ re_direlt='/[^/][^/]*/\.\./'
-+ # Canonicalize the pathname of ld
-+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+ done
-+ test -z "$LD" && LD="$ac_prog"
-+ ;;
-+ "")
-+ # If it fails, then pretend we aren't using GCC.
-+ ac_prog=ld
-+ ;;
-+ *)
-+ # If it is relative, then search for the first ld in PATH.
-+ with_gnu_ld=unknown
-+ ;;
-+ esac
-+elif test "$with_gnu_ld" = yes; then
-+ echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+else
-+ echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+fi
-+if test "${lt_cv_path_LD+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -z "$LD"; then
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+ lt_cv_path_LD="$ac_dir/$ac_prog"
-+ # Check to see if the program is GNU ld. I'd rather use --version,
-+ # but apparently some GNU ld's only accept -v.
-+ # Break only if it was the GNU/non-GNU ld that we prefer.
-+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+ *GNU* | *'with BFD'*)
-+ test "$with_gnu_ld" != no && break
-+ ;;
-+ *)
-+ test "$with_gnu_ld" != yes && break
-+ ;;
-+ esac
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+else
-+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
-+fi
-+
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+ echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+ { (exit 1); exit 1; }; }
-+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+ lt_cv_prog_gnu_ld=yes
-+ ;;
-+*)
-+ lt_cv_prog_gnu_ld=no
-+ ;;
-+esac
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+
-+
-+
-+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
-+ # archiving commands below assume that GNU ld is being used.
-+ if test "$with_gnu_ld" = yes; then
-+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+
-+ # If archive_cmds runs LD, not CC, wlarc should be empty
-+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+ # investigate it a little bit more. (MM)
-+ wlarc='${wl}'
-+
-+ # ancient GNU ld didn't support --whole-archive et. al.
-+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-+ grep 'no-whole-archive' > /dev/null; then
-+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ whole_archive_flag_spec_CXX=
-+ fi
-+ else
-+ with_gnu_ld=no
-+ wlarc=
-+
-+ # A generic and very simple default shared library creation
-+ # command for GNU C++ for the case where it uses the native
-+ # linker, instead of GNU ld. If possible, this setting should
-+ # overridden to take advantage of the native linker features on
-+ # the platform it is being used on.
-+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ fi
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+else
-+ GXX=no
-+ with_gnu_ld=no
-+ wlarc=
-+fi
-+
-+# PORTME: fill in a description of your system's C++ link characteristics
-+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+ld_shlibs_CXX=yes
-+case $host_os in
-+ aix3*)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ aix4* | aix5*)
-+ if test "$host_cpu" = ia64; then
-+ # On IA64, the linker does run time linking by default, so we don't
-+ # have to do anything special.
-+ aix_use_runtimelinking=no
-+ exp_sym_flag='-Bexport'
-+ no_entry_flag=""
-+ else
-+ aix_use_runtimelinking=no
-+
-+ # Test if we are trying to use run time linking or normal
-+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+ # need to do runtime linking.
-+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ for ld_flag in $LDFLAGS; do
-+ case $ld_flag in
-+ *-brtl*)
-+ aix_use_runtimelinking=yes
-+ break
-+ ;;
-+ esac
-+ done
-+ esac
-+
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
-+
-+ # When large executables or shared objects are built, AIX ld can
-+ # have problems creating the table of contents. If linking a library
-+ # or program results in "error TOC overflow" add -mminimal-toc to
-+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+ archive_cmds_CXX=''
-+ hardcode_direct_CXX=yes
-+ hardcode_libdir_separator_CXX=':'
-+ link_all_deplibs_CXX=yes
-+
-+ if test "$GXX" = yes; then
-+ case $host_os in aix4.[012]|aix4.[012].*)
-+ # We only want to do this on AIX 4.2 and lower, the check
-+ # below for broken collect2 doesn't work under 4.3+
-+ collect2name=`${CC} -print-prog-name=collect2`
-+ if test -f "$collect2name" && \
-+ strings "$collect2name" | grep resolve_lib_name >/dev/null
-+ then
-+ # We have reworked collect2
-+ hardcode_direct_CXX=yes
-+ else
-+ # We have old collect2
-+ hardcode_direct_CXX=unsupported
-+ # It fails to find uninstalled libraries when the uninstalled
-+ # path is not listed in the libpath. Setting hardcode_minus_L
-+ # to unsupported forces relinking
-+ hardcode_minus_L_CXX=yes
-+ hardcode_libdir_flag_spec_CXX='-L$libdir'
-+ hardcode_libdir_separator_CXX=
-+ fi
-+ esac
-+ shared_flag='-shared'
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag="$shared_flag "'${wl}-G'
-+ fi
-+ else
-+ # not using gcc
-+ if test "$host_cpu" = ia64; then
-+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+ # chokes on -Wl,-G. The following line is correct:
-+ shared_flag='-G'
-+ else
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
-+ else
-+ shared_flag='${wl}-bM:SRE'
-+ fi
-+ fi
-+ fi
-+
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ always_export_symbols_CXX=yes
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # Warning - without using the other runtime loading flags (-brtl),
-+ # -berok will link without error, but may produce a broken library.
-+ allow_undefined_flag_CXX='-berok'
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
-+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-+ allow_undefined_flag_CXX="-z nodefs"
-+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ else
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Warning - without using the other run time loading flags,
-+ # -berok will link without error, but may produce a broken library.
-+ no_undefined_flag_CXX=' ${wl}-bernotok'
-+ allow_undefined_flag_CXX=' ${wl}-berok'
-+ # -bexpall does not export symbols beginning with underscore (_)
-+ always_export_symbols_CXX=yes
-+ # Exported symbols can be pulled into shared objects from archives
-+ whole_archive_flag_spec_CXX=' '
-+ archive_cmds_need_lc_CXX=yes
-+ # This is similar to how AIX traditionally builds it's shared libraries.
-+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ fi
-+ fi
-+ ;;
-+ chorus*)
-+ case $cc_basename in
-+ *)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ esac
-+ ;;
-+
-+
-+ cygwin* | mingw* | pw32*)
-+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-+ # as there is no search path for DLLs.
-+ hardcode_libdir_flag_spec_CXX='-L$libdir'
-+ allow_undefined_flag_CXX=unsupported
-+ always_export_symbols_CXX=no
-+ enable_shared_with_static_runtimes_CXX=yes
-+
-+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ # If the export-symbols file already is a .def file (1st line
-+ # is EXPORTS), use it as is; otherwise, prepend...
-+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ echo EXPORTS > $output_objdir/$soname.def;
-+ cat $export_symbols >> $output_objdir/$soname.def;
-+ fi~
-+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ else
-+ ld_shlibs_CXX=no
-+ fi
-+ ;;
-+ darwin* | rhapsody*)
-+ case "$host_os" in
-+ rhapsody* | darwin1.[012])
-+ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ archive_cmds_need_lc_CXX=no
-+ hardcode_direct_CXX=no
-+ hardcode_automatic_CXX=yes
-+ hardcode_shlibpath_var_CXX=unsupported
-+ whole_archive_flag_spec_CXX=''
-+ link_all_deplibs_CXX=yes
-+
-+ if test "$GXX" = yes ; then
-+ lt_int_apple_cc_single_mod=no
-+ output_verbose_link_cmd='echo'
-+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+ lt_int_apple_cc_single_mod=yes
-+ fi
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ else
-+ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ fi
-+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ fi
-+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ case "$cc_basename" in
-+ xlc*)
-+ output_verbose_link_cmd='echo'
-+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ ;;
-+ *)
-+ ld_shlibs_CXX=no
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ dgux*)
-+ case $cc_basename in
-+ ec++)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ ghcx)
-+ # Green Hills C++ Compiler
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ esac
-+ ;;
-+ freebsd[12]*)
-+ # C++ shared libraries reported to be fairly broken before switch to ELF
-+ ld_shlibs_CXX=no
-+ ;;
-+ freebsd-elf*)
-+ archive_cmds_need_lc_CXX=no
-+ ;;
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
-+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+ # conventions
-+ ld_shlibs_CXX=yes
-+ ;;
-+ gnu*)
-+ ;;
-+ hpux9*)
-+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_CXX=:
-+ export_dynamic_flag_spec_CXX='${wl}-E'
-+ hardcode_direct_CXX=yes
-+ hardcode_minus_L_CXX=yes # Not in the search PATH,
-+ # but as the default
-+ # location of the library.
-+
-+ case $cc_basename in
-+ CC)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ aCC)
-+ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ else
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ hpux10*|hpux11*)
-+ if test $with_gnu_ld = no; then
-+ case "$host_cpu" in
-+ hppa*64*)
-+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-+ hardcode_libdir_separator_CXX=:
-+ ;;
-+ ia64*)
-+ hardcode_libdir_flag_spec_CXX='-L$libdir'
-+ ;;
-+ *)
-+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_CXX=:
-+ export_dynamic_flag_spec_CXX='${wl}-E'
-+ ;;
-+ esac
-+ fi
-+ case "$host_cpu" in
-+ hppa*64*)
-+ hardcode_direct_CXX=no
-+ hardcode_shlibpath_var_CXX=no
-+ ;;
-+ ia64*)
-+ hardcode_direct_CXX=no
-+ hardcode_shlibpath_var_CXX=no
-+ hardcode_minus_L_CXX=yes # Not in the search PATH,
-+ # but as the default
-+ # location of the library.
-+ ;;
-+ *)
-+ hardcode_direct_CXX=yes
-+ hardcode_minus_L_CXX=yes # Not in the search PATH,
-+ # but as the default
-+ # location of the library.
-+ ;;
-+ esac
-+
-+ case $cc_basename in
-+ CC)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ aCC)
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+ ;;
-+ *)
-+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ esac
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ if test $with_gnu_ld = no; then
-+ case "$host_cpu" in
-+ ia64*|hppa*64*)
-+ archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-+ ;;
-+ *)
-+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ ;;
-+ esac
-+ fi
-+ else
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ irix5* | irix6*)
-+ case $cc_basename in
-+ CC)
-+ # SGI C++
-+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+ ;;
-+ *)
-+ if test "$GXX" = yes; then
-+ if test "$with_gnu_ld" = no; then
-+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ else
-+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-+ fi
-+ fi
-+ link_all_deplibs_CXX=yes
-+ ;;
-+ esac
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_CXX=:
-+ ;;
-+ linux*)
-+ case $cc_basename in
-+ KCC)
-+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+ # KCC will only create a shared library if the output file
-+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+ # to its proper name (with version) after linking.
-+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+
-+ hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
-+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-+ ;;
-+ icpc)
-+ # Intel C++
-+ with_gnu_ld=yes
-+ # version 8.0 and above of icpc choke on multiply defined symbols
-+ # if we add $predep_objects and $postdep_objects, however 7.1 and
-+ # earlier do not add the objects themselves.
-+ case `$CC -V 2>&1` in
-+ *"Version 7."*)
-+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ ;;
-+ *) # Version 8.0 or newer
-+ tmp_idyn=
-+ case $host_cpu in
-+ ia64*) tmp_idyn=' -i_dynamic';;
-+ esac
-+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ ;;
-+ esac
-+ archive_cmds_need_lc_CXX=no
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+ ;;
-+ pgCC)
-+ # Portland Group C++ compiler
-+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+ ;;
-+ cxx)
-+ # Compaq C++
-+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+
-+ runpath_var=LD_RUN_PATH
-+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-+ hardcode_libdir_separator_CXX=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ esac
-+ ;;
-+ lynxos*)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ m88k*)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ mvs*)
-+ case $cc_basename in
-+ cxx)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ esac
-+ ;;
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+ wlarc=
-+ hardcode_libdir_flag_spec_CXX='-R$libdir'
-+ hardcode_direct_CXX=yes
-+ hardcode_shlibpath_var_CXX=no
-+ fi
-+ # Workaround some broken pre-1.5 toolchains
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+ ;;
-+ openbsd2*)
-+ # C++ shared libraries are fairly broken
-+ ld_shlibs_CXX=no
-+ ;;
-+ openbsd*)
-+ hardcode_direct_CXX=yes
-+ hardcode_shlibpath_var_CXX=no
-+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ export_dynamic_flag_spec_CXX='${wl}-E'
-+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd='echo'
-+ ;;
-+ osf3*)
-+ case $cc_basename in
-+ KCC)
-+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+ # KCC will only create a shared library if the output file
-+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+ # to its proper name (with version) after linking.
-+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+ hardcode_libdir_separator_CXX=:
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-+
-+ ;;
-+ RCC)
-+ # Rational C++ 2.4.1
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ cxx)
-+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_CXX=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ *)
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_CXX=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+ else
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ osf4* | osf5*)
-+ case $cc_basename in
-+ KCC)
-+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+ # KCC will only create a shared library if the output file
-+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+ # to its proper name (with version) after linking.
-+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+ hardcode_libdir_separator_CXX=:
-+
-+ # Archives containing C++ object files must be created using
-+ # the KAI C++ compiler.
-+ old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
-+ ;;
-+ RCC)
-+ # Rational C++ 2.4.1
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ cxx)
-+ allow_undefined_flag_CXX=' -expect_unresolved \*'
-+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+ echo "-hidden">> $lib.exp~
-+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
-+ $rm $lib.exp'
-+
-+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-+ hardcode_libdir_separator_CXX=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ *)
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_CXX=:
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+ else
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ psos*)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ sco*)
-+ archive_cmds_need_lc_CXX=no
-+ case $cc_basename in
-+ CC)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ esac
-+ ;;
-+ sunos4*)
-+ case $cc_basename in
-+ CC)
-+ # Sun C++ 4.x
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ lcc)
-+ # Lucid
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ esac
-+ ;;
-+ solaris*)
-+ case $cc_basename in
-+ CC)
-+ # Sun C++ 4.2, 5.x and Centerline C++
-+ no_undefined_flag_CXX=' -zdefs'
-+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+ hardcode_libdir_flag_spec_CXX='-R$libdir'
-+ hardcode_shlibpath_var_CXX=no
-+ case $host_os in
-+ solaris2.[0-5] | solaris2.[0-5].*) ;;
-+ *)
-+ # The C++ compiler is used as linker so we must use $wl
-+ # flag to pass the commands to the underlying system
-+ # linker.
-+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
-+ link_all_deplibs_CXX=yes
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ gcx)
-+ # Green Hills C++ Compiler
-+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+
-+ # The C++ compiler must be used to create the archive.
-+ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+ ;;
-+ *)
-+ # GNU C++ compiler with Solaris linker
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-+ if $CC --version | grep -v '^2\.7' > /dev/null; then
-+ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+ else
-+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+ # platform.
-+ archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+ fi
-+
-+ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-+ archive_cmds_need_lc_CXX=no
-+ ;;
-+ tandem*)
-+ case $cc_basename in
-+ NCC)
-+ # NonStop-UX NCC 3.20
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ esac
-+ ;;
-+ vxworks*)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+ *)
-+ # FIXME: insert proper C++ library support
-+ ld_shlibs_CXX=no
-+ ;;
-+esac
-+echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6
-+test "$ld_shlibs_CXX" = no && can_build_shared=no
-+
-+GCC_CXX="$GXX"
-+LD_CXX="$LD"
-+
-+
-+cat > conftest.$ac_ext <<EOF
-+class Foo
-+{
-+public:
-+ Foo (void) { a = 0; }
-+private:
-+ int a;
-+};
-+EOF
-+
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # Parse the compiler output and extract the necessary
-+ # objects, libraries and library flags.
-+
-+ # Sentinel used to keep track of whether or not we are before
-+ # the conftest object file.
-+ pre_test_object_deps_done=no
-+
-+ # The `*' in the case matches for architectures that use `case' in
-+ # $output_verbose_cmd can trigger glob expansion during the loop
-+ # eval without this substitution.
-+ output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+
-+ for p in `eval $output_verbose_link_cmd`; do
-+ case $p in
-+
-+ -L* | -R* | -l*)
-+ # Some compilers place space between "-{L,R}" and the path.
-+ # Remove the space.
-+ if test $p = "-L" \
-+ || test $p = "-R"; then
-+ prev=$p
-+ continue
-+ else
-+ prev=
-+ fi
-+
-+ if test "$pre_test_object_deps_done" = no; then
-+ case $p in
-+ -L* | -R*)
-+ # Internal compiler library paths should come after those
-+ # provided the user. The postdeps already come after the
-+ # user supplied libs so there is no need to process them.
-+ if test -z "$compiler_lib_search_path_CXX"; then
-+ compiler_lib_search_path_CXX="${prev}${p}"
-+ else
-+ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-+ fi
-+ ;;
-+ # The "-l" case would never come before the object being
-+ # linked, so don't bother handling this case.
-+ esac
-+ else
-+ if test -z "$postdeps_CXX"; then
-+ postdeps_CXX="${prev}${p}"
-+ else
-+ postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-+ fi
-+ fi
-+ ;;
-+
-+ *.$objext)
-+ # This assumes that the test object file only shows up
-+ # once in the compiler output.
-+ if test "$p" = "conftest.$objext"; then
-+ pre_test_object_deps_done=yes
-+ continue
-+ fi
-+
-+ if test "$pre_test_object_deps_done" = no; then
-+ if test -z "$predep_objects_CXX"; then
-+ predep_objects_CXX="$p"
-+ else
-+ predep_objects_CXX="$predep_objects_CXX $p"
-+ fi
-+ else
-+ if test -z "$postdep_objects_CXX"; then
-+ postdep_objects_CXX="$p"
-+ else
-+ postdep_objects_CXX="$postdep_objects_CXX $p"
-+ fi
-+ fi
-+ ;;
-+
-+ *) ;; # Ignore the rest.
-+
-+ esac
-+ done
-+
-+ # Clean up.
-+ rm -f a.out a.exe
-+else
-+ echo "libtool.m4: error: problem compiling CXX test program"
-+fi
-+
-+$rm -f confest.$objext
-+
-+case " $postdeps_CXX " in
-+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-+esac
-+
-+lt_prog_compiler_wl_CXX=
-+lt_prog_compiler_pic_CXX=
-+lt_prog_compiler_static_CXX=
-+
-+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+
-+ # C++ specific cases for pic, static, wl, etc.
-+ if test "$GXX" = yes; then
-+ lt_prog_compiler_wl_CXX='-Wl,'
-+ lt_prog_compiler_static_CXX='-static'
-+
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ lt_prog_compiler_static_CXX='-Bstatic'
-+ fi
-+ ;;
-+ amigaos*)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-+ ;;
-+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
-+ ;;
-+ mingw* | os2* | pw32*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-+ ;;
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ lt_prog_compiler_pic_CXX='-fno-common'
-+ ;;
-+ *djgpp*)
-+ # DJGPP does not support shared libraries at all
-+ lt_prog_compiler_pic_CXX=
-+ ;;
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ lt_prog_compiler_pic_CXX=-Kconform_pic
-+ fi
-+ ;;
-+ hpux*)
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_CXX='-fPIC'
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_CXX='-fPIC'
-+ ;;
-+ esac
-+ else
-+ case $host_os in
-+ aix4* | aix5*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ lt_prog_compiler_static_CXX='-Bstatic'
-+ else
-+ lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-+ fi
-+ ;;
-+ chorus*)
-+ case $cc_basename in
-+ cxch68)
-+ # Green Hills C++ Compiler
-+ # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-+ ;;
-+ esac
-+ ;;
-+ darwin*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ case "$cc_basename" in
-+ xlc*)
-+ lt_prog_compiler_pic_CXX='-qnocommon'
-+ lt_prog_compiler_wl_CXX='-Wl,'
-+ ;;
-+ esac
-+ ;;
-+ dgux*)
-+ case $cc_basename in
-+ ec++)
-+ lt_prog_compiler_pic_CXX='-KPIC'
-+ ;;
-+ ghcx)
-+ # Green Hills C++ Compiler
-+ lt_prog_compiler_pic_CXX='-pic'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
-+ # FreeBSD uses GNU C++
-+ ;;
-+ hpux9* | hpux10* | hpux11*)
-+ case $cc_basename in
-+ CC)
-+ lt_prog_compiler_wl_CXX='-Wl,'
-+ lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-+ if test "$host_cpu" != ia64; then
-+ lt_prog_compiler_pic_CXX='+Z'
-+ fi
-+ ;;
-+ aCC)
-+ lt_prog_compiler_wl_CXX='-Wl,'
-+ lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_CXX='+Z'
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ irix5* | irix6* | nonstopux*)
-+ case $cc_basename in
-+ CC)
-+ lt_prog_compiler_wl_CXX='-Wl,'
-+ lt_prog_compiler_static_CXX='-non_shared'
-+ # CC pic flag -KPIC is the default.
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ linux*)
-+ case $cc_basename in
-+ KCC)
-+ # KAI C++ Compiler
-+ lt_prog_compiler_wl_CXX='--backend -Wl,'
-+ lt_prog_compiler_pic_CXX='-fPIC'
-+ ;;
-+ icpc* | ecpc*)
-+ # Intel C++
-+ lt_prog_compiler_wl_CXX='-Wl,'
-+ lt_prog_compiler_pic_CXX='-KPIC'
-+ lt_prog_compiler_static_CXX='-static'
-+ ;;
-+ pgCC)
-+ # Portland Group C++ compiler.
-+ lt_prog_compiler_wl_CXX='-Wl,'
-+ lt_prog_compiler_pic_CXX='-fpic'
-+ lt_prog_compiler_static_CXX='-static'
-+ ;;
-+ cxx)
-+ # Compaq C++
-+ # Make sure the PIC flag is empty. It appears that all Alpha
-+ # Linux and Compaq Tru64 Unix objects are PIC.
-+ lt_prog_compiler_pic_CXX=
-+ lt_prog_compiler_static_CXX='-non_shared'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ lynxos*)
-+ ;;
-+ m88k*)
-+ ;;
-+ mvs*)
-+ case $cc_basename in
-+ cxx)
-+ lt_prog_compiler_pic_CXX='-W c,exportall'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ netbsd*)
-+ ;;
-+ osf3* | osf4* | osf5*)
-+ case $cc_basename in
-+ KCC)
-+ lt_prog_compiler_wl_CXX='--backend -Wl,'
-+ ;;
-+ RCC)
-+ # Rational C++ 2.4.1
-+ lt_prog_compiler_pic_CXX='-pic'
-+ ;;
-+ cxx)
-+ # Digital/Compaq C++
-+ lt_prog_compiler_wl_CXX='-Wl,'
-+ # Make sure the PIC flag is empty. It appears that all Alpha
-+ # Linux and Compaq Tru64 Unix objects are PIC.
-+ lt_prog_compiler_pic_CXX=
-+ lt_prog_compiler_static_CXX='-non_shared'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ psos*)
-+ ;;
-+ sco*)
-+ case $cc_basename in
-+ CC)
-+ lt_prog_compiler_pic_CXX='-fPIC'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ solaris*)
-+ case $cc_basename in
-+ CC)
-+ # Sun C++ 4.2, 5.x and Centerline C++
-+ lt_prog_compiler_pic_CXX='-KPIC'
-+ lt_prog_compiler_static_CXX='-Bstatic'
-+ lt_prog_compiler_wl_CXX='-Qoption ld '
-+ ;;
-+ gcx)
-+ # Green Hills C++ Compiler
-+ lt_prog_compiler_pic_CXX='-PIC'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ sunos4*)
-+ case $cc_basename in
-+ CC)
-+ # Sun C++ 4.x
-+ lt_prog_compiler_pic_CXX='-pic'
-+ lt_prog_compiler_static_CXX='-Bstatic'
-+ ;;
-+ lcc)
-+ # Lucid
-+ lt_prog_compiler_pic_CXX='-pic'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ tandem*)
-+ case $cc_basename in
-+ NCC)
-+ # NonStop-UX NCC 3.20
-+ lt_prog_compiler_pic_CXX='-KPIC'
-+ ;;
-+ *)
-+ ;;
-+ esac
-+ ;;
-+ unixware*)
-+ ;;
-+ vxworks*)
-+ ;;
-+ *)
-+ lt_prog_compiler_can_build_shared_CXX=no
-+ ;;
-+ esac
-+ fi
-+
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic_CXX"; then
-+
-+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_prog_compiler_pic_works_CXX=no
-+ ac_outfile=conftest.$ac_objext
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ # The option is referenced via a variable to avoid confusing sed.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:11294: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+ echo "$as_me:11298: \$? = $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
-+ if test ! -s conftest.err; then
-+ lt_prog_compiler_pic_works_CXX=yes
-+ fi
-+ fi
-+ $rm conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
-+
-+if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-+ case $lt_prog_compiler_pic_CXX in
-+ "" | " "*) ;;
-+ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-+ esac
-+else
-+ lt_prog_compiler_pic_CXX=
-+ lt_prog_compiler_can_build_shared_CXX=no
-+fi
-+
-+fi
-+case "$host_os" in
-+ # For platforms which do not support PIC, -DPIC is meaningless:
-+ *djgpp*)
-+ lt_prog_compiler_pic_CXX=
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-+ ;;
-+esac
-+
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_c_o_CXX=no
-+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:11354: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+ echo "$as_me:11358: \$? = $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
-+ # So say no if there are warnings
-+ if test ! -s out/conftest.err; then
-+ lt_cv_prog_compiler_c_o_CXX=yes
-+ fi
-+ fi
-+ chmod u+w .
-+ $rm conftest*
-+ # SGI C++ compiler will create directory out/ii_files/ for
-+ # template instantiation
-+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+ $rm out/* && rmdir out
-+ cd ..
-+ rmdir conftest
-+ $rm conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
-+
-+
-+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 "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+ hard_links=yes
-+ $rm conftest*
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ touch conftest.a
-+ ln conftest.a conftest.b 2>&5 || hard_links=no
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6
-+ if test "$hard_links" = no; then
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ need_locks=warn
-+ fi
-+else
-+ need_locks=no
-+fi
-+
-+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+
-+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ case $host_os in
-+ aix4* | aix5*)
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+ fi
-+ ;;
-+ pw32*)
-+ export_symbols_cmds_CXX="$ltdll_cmds"
-+ ;;
-+ cygwin* | mingw*)
-+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ ;;
-+ *)
-+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ ;;
-+ esac
-+
-+echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6
-+test "$ld_shlibs_CXX" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc_CXX" in
-+x|xyes)
-+ # Assume -lc should be added
-+ archive_cmds_need_lc_CXX=yes
-+
-+ if test "$enable_shared" = yes && test "$GCC" = yes; then
-+ case $archive_cmds_CXX in
-+ *'~'*)
-+ # FIXME: we may have to deal with multi-command sequences.
-+ ;;
-+ '$CC '*)
-+ # Test whether the compiler implicitly links with -lc since on some
-+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+ # to ld, don't add -lc before -lgcc.
-+ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+ $rm conftest*
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } 2>conftest.err; then
-+ soname=conftest
-+ lib=conftest
-+ libobjs=conftest.$ac_objext
-+ deplibs=
-+ wl=$lt_prog_compiler_wl_CXX
-+ compiler_flags=-v
-+ linker_flags=-v
-+ verstring=
-+ output_objdir=.
-+ libname=conftest
-+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-+ allow_undefined_flag_CXX=
-+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+ (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+ then
-+ archive_cmds_need_lc_CXX=no
-+ else
-+ archive_cmds_need_lc_CXX=yes
-+ fi
-+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-+ else
-+ cat conftest.err 1>&5
-+ fi
-+ $rm conftest*
-+ echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
-+ ;;
-+ esac
-+ fi
-+ ;;
-+esac
-+
-+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
-+
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+
-+aix4* | aix5*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ hardcode_into_libs=yes
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 supports IA64
-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ else
-+ # With GCC up to 2.95.x, collect2 would create an import file
-+ # for dependence libraries. The import file would start with
-+ # the line `#! .'. This would cause the generated library to
-+ # depend on `.', always an invalid library. This was fixed in
-+ # development snapshots of GCC prior to 3.0.
-+ case $host_os in
-+ aix4 | aix4.[01] | aix4.[01].*)
-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+ echo ' yes '
-+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+ :
-+ else
-+ can_build_shared=no
-+ fi
-+ ;;
-+ esac
-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+ # soname into executable. Probably we can add versioning support to
-+ # collect2, so additional links can be useful in future.
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+ # instead of lib<name>.a to let people know that these are not
-+ # typical AIX shared libraries.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ else
-+ # We preserve .a as extension for shared libraries through AIX4.2
-+ # and later when we are not doing run time linking.
-+ library_names_spec='${libname}${release}.a $libname.a'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-+
-+amigaos*)
-+ library_names_spec='$libname.ixlibrary $libname.a'
-+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+ ;;
-+
-+beos*)
-+ library_names_spec='${libname}${shared_ext}'
-+ dynamic_linker="$host_os ld.so"
-+ shlibpath_var=LIBRARY_PATH
-+ ;;
-+
-+bsdi[45]*)
-+ version_type=linux
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+ # the default ld.so.conf also contains /usr/contrib/lib and
-+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+ # libtool to hard-code these into programs
-+ ;;
-+
-+cygwin* | mingw* | pw32*)
-+ version_type=windows
-+ shrext_cmds=".dll"
-+ need_version=no
-+ need_lib_prefix=no
-+
-+ case $GCC,$host_os in
-+ yes,cygwin* | yes,mingw* | yes,pw32*)
-+ library_names_spec='$libname.dll.a'
-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+ postinstall_cmds='base_file=`basename \${file}`~
-+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+ dldir=$destdir/`dirname \$dlpath`~
-+ test -d \$dldir || mkdir -p \$dldir~
-+ $install_prog $dir/$dlname \$dldir/$dlname'
-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+ dlpath=$dir/\$dldll~
-+ $rm \$dlpath'
-+ shlibpath_overrides_runpath=yes
-+
-+ case $host_os in
-+ cygwin*)
-+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+ ;;
-+ mingw*)
-+ # MinGW DLLs use traditional 'lib' prefix
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+ # It is most probably a Windows format PATH printed by
-+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+ # path with ; separators, and with drive letters. We can handle the
-+ # drive letters (cygwin fileutils understands them), so leave them,
-+ # especially as we might pass files found there to a mingw objdump,
-+ # which wouldn't understand a cygwinified path. Ahh.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+ ;;
-+ pw32*)
-+ # pw32 DLLs use 'pw' prefix rather than 'lib'
-+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ ;;
-+ esac
-+ ;;
-+
-+ *)
-+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+ ;;
-+ esac
-+ dynamic_linker='Win32 ld.exe'
-+ # FIXME: first we should search . and the directory the executable is in
-+ shlibpath_var=PATH
-+ ;;
-+
-+darwin* | rhapsody*)
-+ dynamic_linker="$host_os dyld"
-+ version_type=darwin
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+ soname_spec='${libname}${release}${major}$shared_ext'
-+ shlibpath_overrides_runpath=yes
-+ shlibpath_var=DYLD_LIBRARY_PATH
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+ if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+ else
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+ ;;
-+
-+dgux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd1*)
-+ dynamic_linker=no
-+ ;;
-+
-+kfreebsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
-+freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ need_version=no
-+ need_lib_prefix=no
-+ ;;
-+ freebsd-*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ need_version=yes
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_os in
-+ freebsd2*)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ freebsd3.[01]* | freebsdelf3.[01]*)
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ *) # from 3.2 on
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+ esac
-+ ;;
-+
-+gnu*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+ # Give a soname corresponding to the major version so that dld.sl refuses to
-+ # link against other versions.
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ case "$host_cpu" in
-+ ia64*)
-+ shrext_cmds='.so'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.so"
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ if test "X$HPUX_IA64_MODE" = X32; then
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+ fi
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+ postinstall_cmds='chmod 555 $lib'
-+ ;;
-+
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
-+ esac
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-+
-+# This must be Linux ELF.
-+linux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ hardcode_into_libs=yes
-+
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-+
-+ # We used to test for /lib/ld.so.1 and disable shared libraries on
-+ # powerpc, because MkLinux only supported shared libraries with the
-+ # GNU dynamic linker. Since this was broken with cross compilers,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-+
-+knetbsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
-+ else
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+nto-qnx*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+openbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ case $host_os in
-+ openbsd2.[89] | openbsd2.[89].*)
-+ shlibpath_overrides_runpath=no
-+ ;;
-+ *)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ esac
-+ else
-+ shlibpath_overrides_runpath=yes
-+ fi
-+ ;;
-+
-+os2*)
-+ libname_spec='$name'
-+ shrext_cmds=".dll"
-+ need_lib_prefix=no
-+ library_names_spec='$libname${shared_ext} $libname.a'
-+ dynamic_linker='OS/2 ld.exe'
-+ shlibpath_var=LIBPATH
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ version_type=osf
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+ ;;
-+
-+sco3.2v5*)
-+ version_type=osf
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+solaris*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ # ldd complains unless libraries are executable
-+ postinstall_cmds='chmod +x $lib'
-+ ;;
-+
-+sunos4*)
-+ version_type=sunos
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ if test "$with_gnu_ld" = yes; then
-+ need_lib_prefix=no
-+ fi
-+ need_version=yes
-+ ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_vendor in
-+ sni)
-+ shlibpath_overrides_runpath=no
-+ need_lib_prefix=no
-+ export_dynamic_flag_spec='${wl}-Blargedynsym'
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+ siemens)
-+ need_lib_prefix=no
-+ ;;
-+ motorola)
-+ need_lib_prefix=no
-+ need_version=no
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+ ;;
-+ esac
-+ ;;
-+
-+sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ version_type=linux
-+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+ soname_spec='$libname${shared_ext}.$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ fi
-+ ;;
-+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+*)
-+ dynamic_linker=no
-+ ;;
-+esac
-+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+hardcode_action_CXX=
-+if test -n "$hardcode_libdir_flag_spec_CXX" || \
-+ test -n "$runpath_var_CXX" || \
-+ test "X$hardcode_automatic_CXX" = "Xyes" ; then
-+
-+ # We can hardcode non-existant directories.
-+ if test "$hardcode_direct_CXX" != no &&
-+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+ # have to relink, otherwise we might link with an installed library
-+ # when we should be linking with a yet-to-be-installed one
-+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-+ test "$hardcode_minus_L_CXX" != no; then
-+ # Linking always hardcodes the temporary library directory.
-+ hardcode_action_CXX=relink
-+ else
-+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+ hardcode_action_CXX=immediate
-+ fi
-+else
-+ # We cannot hardcode anything, or else we can only hardcode existing
-+ # directories.
-+ hardcode_action_CXX=unsupported
-+fi
-+echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-+echo "${ECHO_T}$hardcode_action_CXX" >&6
-+
-+if test "$hardcode_action_CXX" = relink; then
-+ # Fast installation is not supported
-+ enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+ test "$enable_shared" = no; then
-+ # Fast installation is not necessary
-+ enable_fast_install=needless
-+fi
-+
-+striplib=
-+old_striplib=
-+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+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"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+ case $host_os in
-+ darwin*)
-+ if test -n "$STRIP" ; then
-+ striplib="$STRIP -x"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+ ;;
-+ *)
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ ;;
-+ esac
-+fi
-+
-+if test "x$enable_dlopen" != xyes; then
-+ enable_dlopen=unknown
-+ enable_dlopen_self=unknown
-+ enable_dlopen_self_static=unknown
-+else
-+ lt_cv_dlopen=no
-+ lt_cv_dlopen_libs=
-+
-+ case $host_os in
-+ beos*)
-+ lt_cv_dlopen="load_add_on"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ;;
-+
-+ mingw* | pw32*)
-+ lt_cv_dlopen="LoadLibrary"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ cygwin*)
-+ lt_cv_dlopen="dlopen"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ darwin*)
-+ # if libdl is installed we need to link against it
-+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dl_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+
-+ lt_cv_dlopen="dyld"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+
-+fi
-+
-+ ;;
-+
-+ *)
-+ echo "$as_me:$LINENO: checking for shl_load" >&5
-+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-+if test "${ac_cv_func_shl_load+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define shl_load innocuous_shl_load
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char shl_load (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef shl_load
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char shl_load ();
-+/* 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_shl_load) || defined (__stub___shl_load)
-+choke me
-+#else
-+char (*f) () = shl_load;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != shl_load;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func_shl_load=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_shl_load=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-+if test $ac_cv_func_shl_load = yes; then
-+ lt_cv_dlopen="shl_load"
-+else
-+ echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char shl_load ();
-+int
-+main ()
-+{
-+shl_load ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dld_shl_load=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dld_shl_load=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-+if test $ac_cv_lib_dld_shl_load = yes; then
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+else
-+ echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-+if test "${ac_cv_func_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define dlopen innocuous_dlopen
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char dlopen (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef dlopen
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+/* 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_dlopen) || defined (__stub___dlopen)
-+choke me
-+#else
-+char (*f) () = dlopen;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != dlopen;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-+if test $ac_cv_func_dlopen = yes; then
-+ lt_cv_dlopen="dlopen"
-+else
-+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dl_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+ echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_svld_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_svld_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-+if test $ac_cv_lib_svld_dlopen = yes; then
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
-+ echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dld_link ();
-+int
-+main ()
-+{
-+dld_link ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_cxx_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dld_dld_link=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dld_dld_link=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-+if test $ac_cv_lib_dld_dld_link = yes; then
-+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+ ;;
-+ esac
-+
-+ if test "x$lt_cv_dlopen" != xno; then
-+ enable_dlopen=yes
-+ else
-+ enable_dlopen=no
-+ fi
-+
-+ case $lt_cv_dlopen in
-+ dlopen)
-+ save_CPPFLAGS="$CPPFLAGS"
-+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+ save_LDFLAGS="$LDFLAGS"
-+ eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+ save_LIBS="$LIBS"
-+ LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+ echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-+if test "${lt_cv_dlopen_self+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$cross_compiling" = yes; then :
-+ lt_cv_dlopen_self=cross
-+else
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-+#line 12717 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LT_DLGLOBAL RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+# define LT_DLGLOBAL DL_GLOBAL
-+# else
-+# define LT_DLGLOBAL 0
-+# endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+ find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+# define LT_DLLAZY_OR_NOW RTLD_LAZY
-+# else
-+# ifdef DL_LAZY
-+# define LT_DLLAZY_OR_NOW DL_LAZY
-+# else
-+# ifdef RTLD_NOW
-+# define LT_DLLAZY_OR_NOW RTLD_NOW
-+# else
-+# ifdef DL_NOW
-+# define LT_DLLAZY_OR_NOW DL_NOW
-+# else
-+# define LT_DLLAZY_OR_NOW 0
-+# endif
-+# endif
-+# endif
-+# endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+ int status = $lt_dlunknown;
-+
-+ if (self)
-+ {
-+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+ /* dlclose (self); */
-+ }
-+
-+ exit (status);
-+}
-+EOF
-+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ (./conftest; exit; ) 2>/dev/null
-+ lt_status=$?
-+ case x$lt_status in
-+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-+ x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-+ esac
-+ else :
-+ # compilation failed
-+ lt_cv_dlopen_self=no
-+ fi
-+fi
-+rm -fr conftest*
-+
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+
-+ if test "x$lt_cv_dlopen_self" = xyes; then
-+ LDFLAGS="$LDFLAGS $link_static_flag"
-+ echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-+if test "${lt_cv_dlopen_self_static+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$cross_compiling" = yes; then :
-+ lt_cv_dlopen_self_static=cross
-+else
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-+#line 12815 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LT_DLGLOBAL RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+# define LT_DLGLOBAL DL_GLOBAL
-+# else
-+# define LT_DLGLOBAL 0
-+# endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+ find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+# define LT_DLLAZY_OR_NOW RTLD_LAZY
-+# else
-+# ifdef DL_LAZY
-+# define LT_DLLAZY_OR_NOW DL_LAZY
-+# else
-+# ifdef RTLD_NOW
-+# define LT_DLLAZY_OR_NOW RTLD_NOW
-+# else
-+# ifdef DL_NOW
-+# define LT_DLLAZY_OR_NOW DL_NOW
-+# else
-+# define LT_DLLAZY_OR_NOW 0
-+# endif
-+# endif
-+# endif
-+# endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+ int status = $lt_dlunknown;
-+
-+ if (self)
-+ {
-+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+ /* dlclose (self); */
-+ }
-+
-+ exit (status);
-+}
-+EOF
-+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ (./conftest; exit; ) 2>/dev/null
-+ lt_status=$?
-+ case x$lt_status in
-+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-+ x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+ esac
-+ else :
-+ # compilation failed
-+ lt_cv_dlopen_self_static=no
-+ fi
-+fi
-+rm -fr conftest*
-+
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-+ fi
-+
-+ CPPFLAGS="$save_CPPFLAGS"
-+ LDFLAGS="$save_LDFLAGS"
-+ LIBS="$save_LIBS"
-+ ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self in
-+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+ *) enable_dlopen_self=unknown ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self_static in
-+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+ *) enable_dlopen_self_static=unknown ;;
-+ esac
-+fi
-+
-+
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+ # See if we are running on zsh, and set the options which allow our commands through
-+ # without removal of \ escapes.
-+ if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+ fi
-+ # Now quote all the things that may contain metacharacters while being
-+ # careful not to overquote the AC_SUBSTed values. We take copies of the
-+ # variables and quote the copies for generation of the libtool script.
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
-+ SED SHELL STRIP \
-+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+ deplibs_check_method reload_flag reload_cmds need_locks \
-+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+ lt_cv_sys_global_symbol_to_c_name_address \
-+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+ old_postinstall_cmds old_postuninstall_cmds \
-+ compiler_CXX \
-+ CC_CXX \
-+ LD_CXX \
-+ lt_prog_compiler_wl_CXX \
-+ lt_prog_compiler_pic_CXX \
-+ lt_prog_compiler_static_CXX \
-+ lt_prog_compiler_no_builtin_flag_CXX \
-+ export_dynamic_flag_spec_CXX \
-+ thread_safe_flag_spec_CXX \
-+ whole_archive_flag_spec_CXX \
-+ enable_shared_with_static_runtimes_CXX \
-+ old_archive_cmds_CXX \
-+ old_archive_from_new_cmds_CXX \
-+ predep_objects_CXX \
-+ postdep_objects_CXX \
-+ predeps_CXX \
-+ postdeps_CXX \
-+ compiler_lib_search_path_CXX \
-+ archive_cmds_CXX \
-+ archive_expsym_cmds_CXX \
-+ postinstall_cmds_CXX \
-+ postuninstall_cmds_CXX \
-+ old_archive_from_expsyms_cmds_CXX \
-+ allow_undefined_flag_CXX \
-+ no_undefined_flag_CXX \
-+ export_symbols_cmds_CXX \
-+ hardcode_libdir_flag_spec_CXX \
-+ hardcode_libdir_flag_spec_ld_CXX \
-+ hardcode_libdir_separator_CXX \
-+ hardcode_automatic_CXX \
-+ module_cmds_CXX \
-+ module_expsym_cmds_CXX \
-+ lt_cv_prog_compiler_c_o_CXX \
-+ exclude_expsyms_CXX \
-+ include_expsyms_CXX; do
-+
-+ case $var in
-+ old_archive_cmds_CXX | \
-+ old_archive_from_new_cmds_CXX | \
-+ archive_cmds_CXX | \
-+ archive_expsym_cmds_CXX | \
-+ module_cmds_CXX | \
-+ module_expsym_cmds_CXX | \
-+ old_archive_from_expsyms_cmds_CXX | \
-+ export_symbols_cmds_CXX | \
-+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+ postinstall_cmds | postuninstall_cmds | \
-+ old_postinstall_cmds | old_postuninstall_cmds | \
-+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+ # Double-quote double-evaled strings.
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+ ;;
-+ *)
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ ;;
-+ esac
-+ done
-+
-+ case $lt_echo in
-+ *'\$0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+ ;;
-+ esac
-+
-+cfgfile="$ofile"
-+
-+ cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS=$lt_AS
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_CXX
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_CXX
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_CXX
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_CXX
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_CXX
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_CXX"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_CXX
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_CXX
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
-+
-+# ### END LIBTOOL TAG CONFIG: $tagname
-+
-+__EOF__
-+
-+
-+else
-+ # If there is no Makefile yet, we rely on a make rule to execute
-+ # `config.status --recheck' to rerun these tests and create the
-+ # libtool script then.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC=$lt_save_CC
-+LDCXX=$LD
-+LD=$lt_save_LD
-+GCC=$lt_save_GCC
-+with_gnu_ldcxx=$with_gnu_ld
-+with_gnu_ld=$lt_save_with_gnu_ld
-+lt_cv_path_LDCXX=$lt_cv_path_LD
-+lt_cv_path_LD=$lt_save_path_LD
-+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+
-+ else
-+ tagname=""
-+ fi
-+ ;;
-+
-+ F77)
-+ if test -n "$F77" && test "X$F77" != "Xno"; then
-+
-+ac_ext=f
-+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-+
-+
-+archive_cmds_need_lc_F77=no
-+allow_undefined_flag_F77=
-+always_export_symbols_F77=no
-+archive_expsym_cmds_F77=
-+export_dynamic_flag_spec_F77=
-+hardcode_direct_F77=no
-+hardcode_libdir_flag_spec_F77=
-+hardcode_libdir_flag_spec_ld_F77=
-+hardcode_libdir_separator_F77=
-+hardcode_minus_L_F77=no
-+hardcode_automatic_F77=no
-+module_cmds_F77=
-+module_expsym_cmds_F77=
-+link_all_deplibs_F77=unknown
-+old_archive_cmds_F77=$old_archive_cmds
-+no_undefined_flag_F77=
-+whole_archive_flag_spec_F77=
-+enable_shared_with_static_runtimes_F77=no
-+
-+# Source file extension for f77 test sources.
-+ac_ext=f
-+
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+objext_F77=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code=" program t\n end\n"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${F77-"f77"}
-+compiler=$CC
-+compiler_F77=$CC
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+
-+echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-+echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6
-+
-+echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case "$host_os" in
-+aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
-+ fi
-+ ;;
-+aix4* | aix5*)
-+ test "$enable_shared" = yes && enable_static=no
-+ ;;
-+esac
-+echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6
-+
-+echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6
-+
-+test "$ld_shlibs_F77" = no && can_build_shared=no
-+
-+GCC_F77="$G77"
-+LD_F77="$LD"
-+
-+lt_prog_compiler_wl_F77=
-+lt_prog_compiler_pic_F77=
-+lt_prog_compiler_static_F77=
-+
-+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+
-+ if test "$GCC" = yes; then
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_static_F77='-static'
-+
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-+ ;;
-+
-+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
-+ ;;
-+
-+ mingw* | pw32* | os2*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ lt_prog_compiler_pic_F77='-fno-common'
-+ ;;
-+
-+ msdosdjgpp*)
-+ # Just because we use GCC doesn't mean we suddenly get shared libraries
-+ # on systems that don't support them.
-+ lt_prog_compiler_can_build_shared_F77=no
-+ enable_shared=no
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ lt_prog_compiler_pic_F77=-Kconform_pic
-+ fi
-+ ;;
-+
-+ hpux*)
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_F77='-fPIC'
-+ ;;
-+ esac
-+ ;;
-+
-+ *)
-+ lt_prog_compiler_pic_F77='-fPIC'
-+ ;;
-+ esac
-+ else
-+ # PORTME Check for flag to pass linker flags through the system compiler.
-+ case $host_os in
-+ aix*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ else
-+ lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-+ fi
-+ ;;
-+ darwin*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ case "$cc_basename" in
-+ xlc*)
-+ lt_prog_compiler_pic_F77='-qnocommon'
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ ;;
-+ esac
-+ ;;
-+
-+ mingw* | pw32* | os2*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-+ ;;
-+
-+ hpux9* | hpux10* | hpux11*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_F77='+Z'
-+ ;;
-+ esac
-+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+ lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ # PIC (with -KPIC) is the default.
-+ lt_prog_compiler_static_F77='-non_shared'
-+ ;;
-+
-+ newsos6)
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-+
-+ linux*)
-+ case $cc_basename in
-+ icc* | ecc*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-static'
-+ ;;
-+ pgcc | pgf77 | pgf90)
-+ # Portland Group compilers (*not* the Pentium gcc compiler,
-+ # which looks to be a dead project)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_pic_F77='-fpic'
-+ lt_prog_compiler_static_F77='-static'
-+ ;;
-+ ccc*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ # All Alpha code is PIC.
-+ lt_prog_compiler_static_F77='-non_shared'
-+ ;;
-+ esac
-+ ;;
-+
-+ osf3* | osf4* | osf5*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ # All OSF/1 code is PIC.
-+ lt_prog_compiler_static_F77='-non_shared'
-+ ;;
-+
-+ sco3.2v5*)
-+ lt_prog_compiler_pic_F77='-Kpic'
-+ lt_prog_compiler_static_F77='-dn'
-+ ;;
-+
-+ solaris*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-+
-+ sunos4*)
-+ lt_prog_compiler_wl_F77='-Qoption ld '
-+ lt_prog_compiler_pic_F77='-PIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-+
-+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ lt_prog_compiler_pic_F77='-Kconform_pic'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ fi
-+ ;;
-+
-+ unicos*)
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ lt_prog_compiler_can_build_shared_F77=no
-+ ;;
-+
-+ uts4*)
-+ lt_prog_compiler_pic_F77='-pic'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ ;;
-+
-+ *)
-+ lt_prog_compiler_can_build_shared_F77=no
-+ ;;
-+ esac
-+ fi
-+
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic_F77"; then
-+
-+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_prog_compiler_pic_works_F77=no
-+ ac_outfile=conftest.$ac_objext
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ lt_compiler_flag="$lt_prog_compiler_pic_F77"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ # The option is referenced via a variable to avoid confusing sed.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:13670: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+ echo "$as_me:13674: \$? = $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
-+ if test ! -s conftest.err; then
-+ lt_prog_compiler_pic_works_F77=yes
-+ fi
-+ fi
-+ $rm conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
-+
-+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-+ case $lt_prog_compiler_pic_F77 in
-+ "" | " "*) ;;
-+ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-+ esac
-+else
-+ lt_prog_compiler_pic_F77=
-+ lt_prog_compiler_can_build_shared_F77=no
-+fi
-+
-+fi
-+case "$host_os" in
-+ # For platforms which do not support PIC, -DPIC is meaningless:
-+ *djgpp*)
-+ lt_prog_compiler_pic_F77=
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-+ ;;
-+esac
-+
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_c_o_F77=no
-+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:13730: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+ echo "$as_me:13734: \$? = $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
-+ # So say no if there are warnings
-+ if test ! -s out/conftest.err; then
-+ lt_cv_prog_compiler_c_o_F77=yes
-+ fi
-+ fi
-+ chmod u+w .
-+ $rm conftest*
-+ # SGI C++ compiler will create directory out/ii_files/ for
-+ # template instantiation
-+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+ $rm out/* && rmdir out
-+ cd ..
-+ rmdir conftest
-+ $rm conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
-+
-+
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-+ # do not overwrite the value of need_locks provided by the user
-+ echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+ hard_links=yes
-+ $rm conftest*
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ touch conftest.a
-+ ln conftest.a conftest.b 2>&5 || hard_links=no
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6
-+ if test "$hard_links" = no; then
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ need_locks=warn
-+ fi
-+else
-+ need_locks=no
-+fi
-+
-+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+
-+ runpath_var=
-+ allow_undefined_flag_F77=
-+ enable_shared_with_static_runtimes_F77=no
-+ archive_cmds_F77=
-+ archive_expsym_cmds_F77=
-+ old_archive_From_new_cmds_F77=
-+ old_archive_from_expsyms_cmds_F77=
-+ export_dynamic_flag_spec_F77=
-+ whole_archive_flag_spec_F77=
-+ thread_safe_flag_spec_F77=
-+ hardcode_libdir_flag_spec_F77=
-+ hardcode_libdir_flag_spec_ld_F77=
-+ hardcode_libdir_separator_F77=
-+ hardcode_direct_F77=no
-+ hardcode_minus_L_F77=no
-+ hardcode_shlibpath_var_F77=unsupported
-+ link_all_deplibs_F77=unknown
-+ hardcode_automatic_F77=no
-+ module_cmds_F77=
-+ module_expsym_cmds_F77=
-+ always_export_symbols_F77=no
-+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ # include_expsyms should be a list of space-separated symbols to be *always*
-+ # included in the symbol list
-+ include_expsyms_F77=
-+ # exclude_expsyms can be an extended regexp of symbols to exclude
-+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+ # as well as any symbol that contains `d'.
-+ exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+ # platforms (ab)use it in PIC code, but their linkers get confused if
-+ # the symbol is explicitly referenced. Since portable code cannot
-+ # rely on this symbol name, it's probably fine to never include it in
-+ # preloaded symbol tables.
-+ extract_expsyms_cmds=
-+
-+ case $host_os in
-+ cygwin* | mingw* | pw32*)
-+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ if test "$GCC" != yes; then
-+ with_gnu_ld=no
-+ fi
-+ ;;
-+ openbsd*)
-+ with_gnu_ld=no
-+ ;;
-+ esac
-+
-+ ld_shlibs_F77=yes
-+ if test "$with_gnu_ld" = yes; then
-+ # If archive_cmds runs LD, not CC, wlarc should be empty
-+ wlarc='${wl}'
-+
-+ # See if GNU ld supports shared libraries.
-+ case $host_os in
-+ aix3* | aix4* | aix5*)
-+ # On AIX/PPC, the GNU linker is very broken
-+ if test "$host_cpu" != ia64; then
-+ ld_shlibs_F77=no
-+ cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support. If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_minus_L_F77=yes
-+
-+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+ # that the semantics of dynamic libraries on AmigaOS, at least up
-+ # to version 4, is to share data among multiple programs linked
-+ # with the same dynamic library. Since this doesn't match the
-+ # behavior of shared libraries on other platforms, we can't use
-+ # them.
-+ ld_shlibs_F77=no
-+ ;;
-+
-+ beos*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ allow_undefined_flag_F77=unsupported
-+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
-+ cygwin* | mingw* | pw32*)
-+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-+ # as there is no search path for DLLs.
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ allow_undefined_flag_F77=unsupported
-+ always_export_symbols_F77=no
-+ enable_shared_with_static_runtimes_F77=yes
-+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+
-+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ # If the export-symbols file already is a .def file (1st line
-+ # is EXPORTS), use it as is; otherwise, prepend...
-+ archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ echo EXPORTS > $output_objdir/$soname.def;
-+ cat $export_symbols >> $output_objdir/$soname.def;
-+ fi~
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ else
-+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+ wlarc=
-+ else
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ fi
-+ ;;
-+
-+ solaris* | sysv5*)
-+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+ ld_shlibs_F77=no
-+ cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems. Therefore, libtool
-+*** is disabling shared libraries support. We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer. Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
-+ sunos4*)
-+ archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ wlarc=
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_addflag=
-+ case $CC,$host_cpu in
-+ pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
-+ tmp_addflag=' -fpic' ;;
-+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
-+ tmp_addflag=' -i_dynamic' ;;
-+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
-+ tmp_addflag=' -i_dynamic -nofor_main' ;;
-+ ifc* | ifort*) # Intel Fortran compiler
-+ tmp_addflag=' -nofor_main' ;;
-+ esac
-+ archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ archive_expsym_cmds_F77=$archive_cmds_F77
-+ fi
-+ else
-+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
-+ *)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+ esac
-+
-+ if test "$ld_shlibs_F77" = yes; then
-+ runpath_var=LD_RUN_PATH
-+ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-+ export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-+ # ancient GNU ld didn't support --whole-archive et. al.
-+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ whole_archive_flag_spec_F77=
-+ fi
-+ fi
-+ else
-+ # PORTME fill in a description of your system's linker (not GNU ld)
-+ case $host_os in
-+ aix3*)
-+ allow_undefined_flag_F77=unsupported
-+ always_export_symbols_F77=yes
-+ archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+ # Note: this linker hardcodes the directories in LIBPATH if there
-+ # are no directories specified by -L.
-+ hardcode_minus_L_F77=yes
-+ if test "$GCC" = yes && test -z "$link_static_flag"; then
-+ # Neither direct hardcoding nor static linking is supported with a
-+ # broken collect2.
-+ hardcode_direct_F77=unsupported
-+ fi
-+ ;;
-+
-+ aix4* | aix5*)
-+ if test "$host_cpu" = ia64; then
-+ # On IA64, the linker does run time linking by default, so we don't
-+ # have to do anything special.
-+ aix_use_runtimelinking=no
-+ exp_sym_flag='-Bexport'
-+ no_entry_flag=""
-+ else
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+ export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+ fi
-+ aix_use_runtimelinking=no
-+
-+ # Test if we are trying to use run time linking or normal
-+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+ # need to do runtime linking.
-+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ for ld_flag in $LDFLAGS; do
-+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+ aix_use_runtimelinking=yes
-+ break
-+ fi
-+ done
-+ esac
-+
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
-+
-+ # When large executables or shared objects are built, AIX ld can
-+ # have problems creating the table of contents. If linking a library
-+ # or program results in "error TOC overflow" add -mminimal-toc to
-+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+ archive_cmds_F77=''
-+ hardcode_direct_F77=yes
-+ hardcode_libdir_separator_F77=':'
-+ link_all_deplibs_F77=yes
-+
-+ if test "$GCC" = yes; then
-+ case $host_os in aix4.[012]|aix4.[012].*)
-+ # We only want to do this on AIX 4.2 and lower, the check
-+ # below for broken collect2 doesn't work under 4.3+
-+ collect2name=`${CC} -print-prog-name=collect2`
-+ if test -f "$collect2name" && \
-+ strings "$collect2name" | grep resolve_lib_name >/dev/null
-+ then
-+ # We have reworked collect2
-+ hardcode_direct_F77=yes
-+ else
-+ # We have old collect2
-+ hardcode_direct_F77=unsupported
-+ # It fails to find uninstalled libraries when the uninstalled
-+ # path is not listed in the libpath. Setting hardcode_minus_L
-+ # to unsupported forces relinking
-+ hardcode_minus_L_F77=yes
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_libdir_separator_F77=
-+ fi
-+ esac
-+ shared_flag='-shared'
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag="$shared_flag "'${wl}-G'
-+ fi
-+ else
-+ # not using gcc
-+ if test "$host_cpu" = ia64; then
-+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+ # chokes on -Wl,-G. The following line is correct:
-+ shared_flag='-G'
-+ else
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
-+ else
-+ shared_flag='${wl}-bM:SRE'
-+ fi
-+ fi
-+ fi
-+
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ always_export_symbols_F77=yes
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # Warning - without using the other runtime loading flags (-brtl),
-+ # -berok will link without error, but may produce a broken library.
-+ allow_undefined_flag_F77='-berok'
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ cat >conftest.$ac_ext <<_ACEOF
-+ program main
-+
-+ end
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_f77_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-+ allow_undefined_flag_F77="-z nodefs"
-+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ else
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ cat >conftest.$ac_ext <<_ACEOF
-+ program main
-+
-+ end
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_f77_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Warning - without using the other run time loading flags,
-+ # -berok will link without error, but may produce a broken library.
-+ no_undefined_flag_F77=' ${wl}-bernotok'
-+ allow_undefined_flag_F77=' ${wl}-berok'
-+ # -bexpall does not export symbols beginning with underscore (_)
-+ always_export_symbols_F77=yes
-+ # Exported symbols can be pulled into shared objects from archives
-+ whole_archive_flag_spec_F77=' '
-+ archive_cmds_need_lc_F77=yes
-+ # This is similar to how AIX traditionally builds it's shared libraries.
-+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ fi
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_minus_L_F77=yes
-+ # see comment about different semantics on the GNU ld section
-+ ld_shlibs_F77=no
-+ ;;
-+
-+ bsdi[45]*)
-+ export_dynamic_flag_spec_F77=-rdynamic
-+ ;;
-+
-+ cygwin* | mingw* | pw32*)
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ # hardcode_libdir_flag_spec is actually meaningless, as there is
-+ # no search path for DLLs.
-+ hardcode_libdir_flag_spec_F77=' '
-+ allow_undefined_flag_F77=unsupported
-+ # Tell ltmain to make .lib files, not .a files.
-+ libext=lib
-+ # Tell ltmain to make .dll files, not .so files.
-+ shrext_cmds=".dll"
-+ # FIXME: Setting linknames here is a bad hack.
-+ archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+ # The linker will automatically build a .lib file if we build a DLL.
-+ old_archive_From_new_cmds_F77='true'
-+ # FIXME: Should let the user specify the lib program.
-+ old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-+ enable_shared_with_static_runtimes_F77=yes
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ case "$host_os" in
-+ rhapsody* | darwin1.[012])
-+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ archive_cmds_need_lc_F77=no
-+ hardcode_direct_F77=no
-+ hardcode_automatic_F77=yes
-+ hardcode_shlibpath_var_F77=unsupported
-+ whole_archive_flag_spec_F77=''
-+ link_all_deplibs_F77=yes
-+ if test "$GCC" = yes ; then
-+ output_verbose_link_cmd='echo'
-+ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ case "$cc_basename" in
-+ xlc*)
-+ output_verbose_link_cmd='echo'
-+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ ;;
-+ *)
-+ ld_shlibs_F77=no
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ dgux*)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+
-+ freebsd1*)
-+ ld_shlibs_F77=no
-+ ;;
-+
-+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+ # support. Future versions do this automatically, but an explicit c++rt0.o
-+ # does not break anything, and helps significantly (at the cost of a little
-+ # extra space).
-+ freebsd2.2*)
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+
-+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+ freebsd2*)
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_F77=yes
-+ hardcode_minus_L_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
-+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+
-+ hpux9*)
-+ if test "$GCC" = yes; then
-+ archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ else
-+ archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ fi
-+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-+ hardcode_direct_F77=yes
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L_F77=yes
-+ export_dynamic_flag_spec_F77='${wl}-E'
-+ ;;
-+
-+ hpux10* | hpux11*)
-+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ else
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ ;;
-+ *)
-+ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ ;;
-+ esac
-+ fi
-+ if test "$with_gnu_ld" = no; then
-+ case "$host_cpu" in
-+ hppa*64*)
-+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-+ hardcode_libdir_separator_F77=:
-+ hardcode_direct_F77=no
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+ ia64*)
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_direct_F77=no
-+ hardcode_shlibpath_var_F77=no
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L_F77=yes
-+ ;;
-+ *)
-+ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-+ hardcode_direct_F77=yes
-+ export_dynamic_flag_spec_F77='${wl}-E'
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L_F77=yes
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ if test "$GCC" = yes; then
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-+ fi
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-+ link_all_deplibs_F77=yes
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-+ else
-+ archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-+ fi
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+
-+ newsos6)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_F77=yes
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+
-+ openbsd*)
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_F77='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ os2*)
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_minus_L_F77=yes
-+ allow_undefined_flag_F77=unsupported
-+ archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+ old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+ ;;
-+
-+ osf3*)
-+ if test "$GCC" = yes; then
-+ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ allow_undefined_flag_F77=' -expect_unresolved \*'
-+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ fi
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_F77=:
-+ ;;
-+
-+ osf4* | osf5*) # as osf3* with the addition of -msym flag
-+ if test "$GCC" = yes; then
-+ allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-+ else
-+ allow_undefined_flag_F77=' -expect_unresolved \*'
-+ archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+ # Both c and cxx compiler support -rpath directly
-+ hardcode_libdir_flag_spec_F77='-rpath $libdir'
-+ fi
-+ hardcode_libdir_separator_F77=:
-+ ;;
-+
-+ sco3.2v5*)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_shlibpath_var_F77=no
-+ export_dynamic_flag_spec_F77='${wl}-Bexport'
-+ runpath_var=LD_RUN_PATH
-+ hardcode_runpath_var=yes
-+ ;;
-+
-+ solaris*)
-+ no_undefined_flag_F77=' -z text'
-+ if test "$GCC" = yes; then
-+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+ else
-+ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+ fi
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ hardcode_shlibpath_var_F77=no
-+ case $host_os in
-+ solaris2.[0-5] | solaris2.[0-5].*) ;;
-+ *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;;
-+ esac
-+ link_all_deplibs_F77=yes
-+ ;;
-+
-+ sunos4*)
-+ if test "x$host_vendor" = xsequent; then
-+ # Use $CC to link under sequent, because it throws in some extra .o
-+ # files that make .init and .fini sections work.
-+ archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+ fi
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_direct_F77=yes
-+ hardcode_minus_L_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+
-+ sysv4)
-+ case $host_vendor in
-+ sni)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_F77=yes # is this really true???
-+ ;;
-+ siemens)
-+ ## LD is ld it makes a PLAMLIB
-+ ## CC just makes a GrossModule.
-+ archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ reload_cmds_F77='$CC -r -o $output$reload_objs'
-+ hardcode_direct_F77=no
-+ ;;
-+ motorola)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-+ ;;
-+ esac
-+ runpath_var='LD_RUN_PATH'
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+
-+ sysv4.3*)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_shlibpath_var_F77=no
-+ export_dynamic_flag_spec_F77='-Bexport'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_shlibpath_var_F77=no
-+ runpath_var=LD_RUN_PATH
-+ hardcode_runpath_var=yes
-+ ld_shlibs_F77=yes
-+ fi
-+ ;;
-+
-+ sysv4.2uw2*)
-+ archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_F77=yes
-+ hardcode_minus_L_F77=no
-+ hardcode_shlibpath_var_F77=no
-+ hardcode_runpath_var=yes
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+
-+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-+ no_undefined_flag_F77='${wl}-z ${wl}text'
-+ if test "$GCC" = yes; then
-+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
-+ runpath_var='LD_RUN_PATH'
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+
-+ sysv5*)
-+ no_undefined_flag_F77=' -z text'
-+ # $CC -shared without GNU ld will not create a library from C++
-+ # object files and a static libstdc++, better avoid it by now
-+ archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+ hardcode_libdir_flag_spec_F77=
-+ hardcode_shlibpath_var_F77=no
-+ runpath_var='LD_RUN_PATH'
-+ ;;
-+
-+ uts4*)
-+ archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_F77='-L$libdir'
-+ hardcode_shlibpath_var_F77=no
-+ ;;
-+
-+ *)
-+ ld_shlibs_F77=no
-+ ;;
-+ esac
-+ fi
-+
-+echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-+echo "${ECHO_T}$ld_shlibs_F77" >&6
-+test "$ld_shlibs_F77" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc_F77" in
-+x|xyes)
-+ # Assume -lc should be added
-+ archive_cmds_need_lc_F77=yes
-+
-+ if test "$enable_shared" = yes && test "$GCC" = yes; then
-+ case $archive_cmds_F77 in
-+ *'~'*)
-+ # FIXME: we may have to deal with multi-command sequences.
-+ ;;
-+ '$CC '*)
-+ # Test whether the compiler implicitly links with -lc since on some
-+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+ # to ld, don't add -lc before -lgcc.
-+ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+ $rm conftest*
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } 2>conftest.err; then
-+ soname=conftest
-+ lib=conftest
-+ libobjs=conftest.$ac_objext
-+ deplibs=
-+ wl=$lt_prog_compiler_wl_F77
-+ compiler_flags=-v
-+ linker_flags=-v
-+ verstring=
-+ output_objdir=.
-+ libname=conftest
-+ lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-+ allow_undefined_flag_F77=
-+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+ (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+ then
-+ archive_cmds_need_lc_F77=no
-+ else
-+ archive_cmds_need_lc_F77=yes
-+ fi
-+ allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-+ else
-+ cat conftest.err 1>&5
-+ fi
-+ $rm conftest*
-+ echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
-+ ;;
-+ esac
-+ fi
-+ ;;
-+esac
-+
-+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
-+
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+
-+aix4* | aix5*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ hardcode_into_libs=yes
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 supports IA64
-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ else
-+ # With GCC up to 2.95.x, collect2 would create an import file
-+ # for dependence libraries. The import file would start with
-+ # the line `#! .'. This would cause the generated library to
-+ # depend on `.', always an invalid library. This was fixed in
-+ # development snapshots of GCC prior to 3.0.
-+ case $host_os in
-+ aix4 | aix4.[01] | aix4.[01].*)
-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+ echo ' yes '
-+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+ :
-+ else
-+ can_build_shared=no
-+ fi
-+ ;;
-+ esac
-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+ # soname into executable. Probably we can add versioning support to
-+ # collect2, so additional links can be useful in future.
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+ # instead of lib<name>.a to let people know that these are not
-+ # typical AIX shared libraries.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ else
-+ # We preserve .a as extension for shared libraries through AIX4.2
-+ # and later when we are not doing run time linking.
-+ library_names_spec='${libname}${release}.a $libname.a'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-+
-+amigaos*)
-+ library_names_spec='$libname.ixlibrary $libname.a'
-+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+ ;;
-+
-+beos*)
-+ library_names_spec='${libname}${shared_ext}'
-+ dynamic_linker="$host_os ld.so"
-+ shlibpath_var=LIBRARY_PATH
-+ ;;
-+
-+bsdi[45]*)
-+ version_type=linux
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+ # the default ld.so.conf also contains /usr/contrib/lib and
-+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+ # libtool to hard-code these into programs
-+ ;;
-+
-+cygwin* | mingw* | pw32*)
-+ version_type=windows
-+ shrext_cmds=".dll"
-+ need_version=no
-+ need_lib_prefix=no
-+
-+ case $GCC,$host_os in
-+ yes,cygwin* | yes,mingw* | yes,pw32*)
-+ library_names_spec='$libname.dll.a'
-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+ postinstall_cmds='base_file=`basename \${file}`~
-+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+ dldir=$destdir/`dirname \$dlpath`~
-+ test -d \$dldir || mkdir -p \$dldir~
-+ $install_prog $dir/$dlname \$dldir/$dlname'
-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+ dlpath=$dir/\$dldll~
-+ $rm \$dlpath'
-+ shlibpath_overrides_runpath=yes
-+
-+ case $host_os in
-+ cygwin*)
-+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+ ;;
-+ mingw*)
-+ # MinGW DLLs use traditional 'lib' prefix
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+ # It is most probably a Windows format PATH printed by
-+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+ # path with ; separators, and with drive letters. We can handle the
-+ # drive letters (cygwin fileutils understands them), so leave them,
-+ # especially as we might pass files found there to a mingw objdump,
-+ # which wouldn't understand a cygwinified path. Ahh.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+ ;;
-+ pw32*)
-+ # pw32 DLLs use 'pw' prefix rather than 'lib'
-+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ ;;
-+ esac
-+ ;;
-+
-+ *)
-+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+ ;;
-+ esac
-+ dynamic_linker='Win32 ld.exe'
-+ # FIXME: first we should search . and the directory the executable is in
-+ shlibpath_var=PATH
-+ ;;
-+
-+darwin* | rhapsody*)
-+ dynamic_linker="$host_os dyld"
-+ version_type=darwin
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+ soname_spec='${libname}${release}${major}$shared_ext'
-+ shlibpath_overrides_runpath=yes
-+ shlibpath_var=DYLD_LIBRARY_PATH
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+ if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+ else
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+ ;;
-+
-+dgux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd1*)
-+ dynamic_linker=no
-+ ;;
-+
-+kfreebsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
-+freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ need_version=no
-+ need_lib_prefix=no
-+ ;;
-+ freebsd-*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ need_version=yes
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_os in
-+ freebsd2*)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ freebsd3.[01]* | freebsdelf3.[01]*)
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ *) # from 3.2 on
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+ esac
-+ ;;
-+
-+gnu*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+ # Give a soname corresponding to the major version so that dld.sl refuses to
-+ # link against other versions.
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ case "$host_cpu" in
-+ ia64*)
-+ shrext_cmds='.so'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.so"
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ if test "X$HPUX_IA64_MODE" = X32; then
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+ fi
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+ postinstall_cmds='chmod 555 $lib'
-+ ;;
-+
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
-+ esac
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-+
-+# This must be Linux ELF.
-+linux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ hardcode_into_libs=yes
-+
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-+
-+ # We used to test for /lib/ld.so.1 and disable shared libraries on
-+ # powerpc, because MkLinux only supported shared libraries with the
-+ # GNU dynamic linker. Since this was broken with cross compilers,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-+
-+knetbsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
-+ else
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+nto-qnx*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+openbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ case $host_os in
-+ openbsd2.[89] | openbsd2.[89].*)
-+ shlibpath_overrides_runpath=no
-+ ;;
-+ *)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ esac
-+ else
-+ shlibpath_overrides_runpath=yes
-+ fi
-+ ;;
-+
-+os2*)
-+ libname_spec='$name'
-+ shrext_cmds=".dll"
-+ need_lib_prefix=no
-+ library_names_spec='$libname${shared_ext} $libname.a'
-+ dynamic_linker='OS/2 ld.exe'
-+ shlibpath_var=LIBPATH
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ version_type=osf
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+ ;;
-+
-+sco3.2v5*)
-+ version_type=osf
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+solaris*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ # ldd complains unless libraries are executable
-+ postinstall_cmds='chmod +x $lib'
-+ ;;
-+
-+sunos4*)
-+ version_type=sunos
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ if test "$with_gnu_ld" = yes; then
-+ need_lib_prefix=no
-+ fi
-+ need_version=yes
-+ ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_vendor in
-+ sni)
-+ shlibpath_overrides_runpath=no
-+ need_lib_prefix=no
-+ export_dynamic_flag_spec='${wl}-Blargedynsym'
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+ siemens)
-+ need_lib_prefix=no
-+ ;;
-+ motorola)
-+ need_lib_prefix=no
-+ need_version=no
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+ ;;
-+ esac
-+ ;;
-+
-+sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ version_type=linux
-+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+ soname_spec='$libname${shared_ext}.$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ fi
-+ ;;
-+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+*)
-+ dynamic_linker=no
-+ ;;
-+esac
-+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+hardcode_action_F77=
-+if test -n "$hardcode_libdir_flag_spec_F77" || \
-+ test -n "$runpath_var_F77" || \
-+ test "X$hardcode_automatic_F77" = "Xyes" ; then
-+
-+ # We can hardcode non-existant directories.
-+ if test "$hardcode_direct_F77" != no &&
-+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+ # have to relink, otherwise we might link with an installed library
-+ # when we should be linking with a yet-to-be-installed one
-+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-+ test "$hardcode_minus_L_F77" != no; then
-+ # Linking always hardcodes the temporary library directory.
-+ hardcode_action_F77=relink
-+ else
-+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+ hardcode_action_F77=immediate
-+ fi
-+else
-+ # We cannot hardcode anything, or else we can only hardcode existing
-+ # directories.
-+ hardcode_action_F77=unsupported
-+fi
-+echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-+echo "${ECHO_T}$hardcode_action_F77" >&6
-+
-+if test "$hardcode_action_F77" = relink; then
-+ # Fast installation is not supported
-+ enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+ test "$enable_shared" = no; then
-+ # Fast installation is not necessary
-+ enable_fast_install=needless
-+fi
-+
-+striplib=
-+old_striplib=
-+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+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"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+ case $host_os in
-+ darwin*)
-+ if test -n "$STRIP" ; then
-+ striplib="$STRIP -x"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+ ;;
-+ *)
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ ;;
-+ esac
-+fi
-+
-+
-+
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+ # See if we are running on zsh, and set the options which allow our commands through
-+ # without removal of \ escapes.
-+ if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+ fi
-+ # Now quote all the things that may contain metacharacters while being
-+ # careful not to overquote the AC_SUBSTed values. We take copies of the
-+ # variables and quote the copies for generation of the libtool script.
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
-+ SED SHELL STRIP \
-+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+ deplibs_check_method reload_flag reload_cmds need_locks \
-+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+ lt_cv_sys_global_symbol_to_c_name_address \
-+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+ old_postinstall_cmds old_postuninstall_cmds \
-+ compiler_F77 \
-+ CC_F77 \
-+ LD_F77 \
-+ lt_prog_compiler_wl_F77 \
-+ lt_prog_compiler_pic_F77 \
-+ lt_prog_compiler_static_F77 \
-+ lt_prog_compiler_no_builtin_flag_F77 \
-+ export_dynamic_flag_spec_F77 \
-+ thread_safe_flag_spec_F77 \
-+ whole_archive_flag_spec_F77 \
-+ enable_shared_with_static_runtimes_F77 \
-+ old_archive_cmds_F77 \
-+ old_archive_from_new_cmds_F77 \
-+ predep_objects_F77 \
-+ postdep_objects_F77 \
-+ predeps_F77 \
-+ postdeps_F77 \
-+ compiler_lib_search_path_F77 \
-+ archive_cmds_F77 \
-+ archive_expsym_cmds_F77 \
-+ postinstall_cmds_F77 \
-+ postuninstall_cmds_F77 \
-+ old_archive_from_expsyms_cmds_F77 \
-+ allow_undefined_flag_F77 \
-+ no_undefined_flag_F77 \
-+ export_symbols_cmds_F77 \
-+ hardcode_libdir_flag_spec_F77 \
-+ hardcode_libdir_flag_spec_ld_F77 \
-+ hardcode_libdir_separator_F77 \
-+ hardcode_automatic_F77 \
-+ module_cmds_F77 \
-+ module_expsym_cmds_F77 \
-+ lt_cv_prog_compiler_c_o_F77 \
-+ exclude_expsyms_F77 \
-+ include_expsyms_F77; do
-+
-+ case $var in
-+ old_archive_cmds_F77 | \
-+ old_archive_from_new_cmds_F77 | \
-+ archive_cmds_F77 | \
-+ archive_expsym_cmds_F77 | \
-+ module_cmds_F77 | \
-+ module_expsym_cmds_F77 | \
-+ old_archive_from_expsyms_cmds_F77 | \
-+ export_symbols_cmds_F77 | \
-+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+ postinstall_cmds | postuninstall_cmds | \
-+ old_postinstall_cmds | old_postuninstall_cmds | \
-+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+ # Double-quote double-evaled strings.
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+ ;;
-+ *)
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ ;;
-+ esac
-+ done
-+
-+ case $lt_echo in
-+ *'\$0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+ ;;
-+ esac
-+
-+cfgfile="$ofile"
-+
-+ cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_F77
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
-+# A language-specific compiler.
-+CC=$lt_compiler_F77
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_F77
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_LD_F77
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS=$lt_AS
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_F77
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_F77
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_F77
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_F77
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_F77
-+archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_F77
-+module_expsym_cmds=$lt_module_expsym_cmds_F77
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_F77
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_F77
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_F77
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_F77
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_F77
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_F77
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_F77
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_F77
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_F77
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_F77
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_F77
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_F77"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_F77
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_F77
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_F77
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_F77
-+
-+# ### END LIBTOOL TAG CONFIG: $tagname
-+
-+__EOF__
-+
-+
-+else
-+ # If there is no Makefile yet, we rely on a make rule to execute
-+ # `config.status --recheck' to rerun these tests and create the
-+ # libtool script then.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC="$lt_save_CC"
-+
-+ else
-+ tagname=""
-+ fi
-+ ;;
-+
-+ GCJ)
-+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-+
-+
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+objext_GCJ=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+compiler_GCJ=$CC
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+archive_cmds_need_lc_GCJ=no
-+
-+
-+lt_prog_compiler_no_builtin_flag_GCJ=
-+
-+if test "$GCC" = yes; then
-+ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-+
-+
-+echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_rtti_exceptions=no
-+ ac_outfile=conftest.$ac_objext
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ lt_compiler_flag="-fno-rtti -fno-exceptions"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ # The option is referenced via a variable to avoid confusing sed.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:15786: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+ echo "$as_me:15790: \$? = $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
-+ if test ! -s conftest.err; then
-+ lt_cv_prog_compiler_rtti_exceptions=yes
-+ fi
-+ fi
-+ $rm conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-+
-+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-+ lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-+else
-+ :
-+fi
-+
-+fi
-+
-+lt_prog_compiler_wl_GCJ=
-+lt_prog_compiler_pic_GCJ=
-+lt_prog_compiler_static_GCJ=
-+
-+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+
-+ if test "$GCC" = yes; then
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ lt_prog_compiler_static_GCJ='-static'
-+
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-+ ;;
-+
-+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
-+ ;;
-+
-+ mingw* | pw32* | os2*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ lt_prog_compiler_pic_GCJ='-fno-common'
-+ ;;
-+
-+ msdosdjgpp*)
-+ # Just because we use GCC doesn't mean we suddenly get shared libraries
-+ # on systems that don't support them.
-+ lt_prog_compiler_can_build_shared_GCJ=no
-+ enable_shared=no
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ lt_prog_compiler_pic_GCJ=-Kconform_pic
-+ fi
-+ ;;
-+
-+ hpux*)
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_GCJ='-fPIC'
-+ ;;
-+ esac
-+ ;;
-+
-+ *)
-+ lt_prog_compiler_pic_GCJ='-fPIC'
-+ ;;
-+ esac
-+ else
-+ # PORTME Check for flag to pass linker flags through the system compiler.
-+ case $host_os in
-+ aix*)
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ else
-+ lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-+ fi
-+ ;;
-+ darwin*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ case "$cc_basename" in
-+ xlc*)
-+ lt_prog_compiler_pic_GCJ='-qnocommon'
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ ;;
-+ esac
-+ ;;
-+
-+ mingw* | pw32* | os2*)
-+ # This hack is so that the source file can tell whether it is being
-+ # built for inclusion in a dll (and should export symbols for example).
-+ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+ ;;
-+
-+ hpux9* | hpux10* | hpux11*)
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_GCJ='+Z'
-+ ;;
-+ esac
-+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+ lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ # PIC (with -KPIC) is the default.
-+ lt_prog_compiler_static_GCJ='-non_shared'
-+ ;;
-+
-+ newsos6)
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ ;;
-+
-+ linux*)
-+ case $cc_basename in
-+ icc* | ecc*)
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-static'
-+ ;;
-+ pgcc | pgf77 | pgf90)
-+ # Portland Group compilers (*not* the Pentium gcc compiler,
-+ # which looks to be a dead project)
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ lt_prog_compiler_pic_GCJ='-fpic'
-+ lt_prog_compiler_static_GCJ='-static'
-+ ;;
-+ ccc*)
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ # All Alpha code is PIC.
-+ lt_prog_compiler_static_GCJ='-non_shared'
-+ ;;
-+ esac
-+ ;;
-+
-+ osf3* | osf4* | osf5*)
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ # All OSF/1 code is PIC.
-+ lt_prog_compiler_static_GCJ='-non_shared'
-+ ;;
-+
-+ sco3.2v5*)
-+ lt_prog_compiler_pic_GCJ='-Kpic'
-+ lt_prog_compiler_static_GCJ='-dn'
-+ ;;
-+
-+ solaris*)
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ ;;
-+
-+ sunos4*)
-+ lt_prog_compiler_wl_GCJ='-Qoption ld '
-+ lt_prog_compiler_pic_GCJ='-PIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ ;;
-+
-+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ lt_prog_compiler_pic_GCJ='-Kconform_pic'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ fi
-+ ;;
-+
-+ unicos*)
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ lt_prog_compiler_can_build_shared_GCJ=no
-+ ;;
-+
-+ uts4*)
-+ lt_prog_compiler_pic_GCJ='-pic'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ ;;
-+
-+ *)
-+ lt_prog_compiler_can_build_shared_GCJ=no
-+ ;;
-+ esac
-+ fi
-+
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic_GCJ"; then
-+
-+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
-+if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_prog_compiler_pic_works_GCJ=no
-+ ac_outfile=conftest.$ac_objext
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ # The option is referenced via a variable to avoid confusing sed.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:16041: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+ echo "$as_me:16045: \$? = $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
-+ if test ! -s conftest.err; then
-+ lt_prog_compiler_pic_works_GCJ=yes
-+ fi
-+ fi
-+ $rm conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-+
-+if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-+ case $lt_prog_compiler_pic_GCJ in
-+ "" | " "*) ;;
-+ *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-+ esac
-+else
-+ lt_prog_compiler_pic_GCJ=
-+ lt_prog_compiler_can_build_shared_GCJ=no
-+fi
-+
-+fi
-+case "$host_os" in
-+ # For platforms which do not support PIC, -DPIC is meaningless:
-+ *djgpp*)
-+ lt_prog_compiler_pic_GCJ=
-+ ;;
-+ *)
-+ lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-+ ;;
-+esac
-+
-+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-+if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ lt_cv_prog_compiler_c_o_GCJ=no
-+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+ (eval echo "\"\$as_me:16101: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+ echo "$as_me:16105: \$? = $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
-+ # So say no if there are warnings
-+ if test ! -s out/conftest.err; then
-+ lt_cv_prog_compiler_c_o_GCJ=yes
-+ fi
-+ fi
-+ chmod u+w .
-+ $rm conftest*
-+ # SGI C++ compiler will create directory out/ii_files/ for
-+ # template instantiation
-+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+ $rm out/* && rmdir out
-+ cd ..
-+ rmdir conftest
-+ $rm conftest*
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
-+
-+
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-+ # do not overwrite the value of need_locks provided by the user
-+ echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+ hard_links=yes
-+ $rm conftest*
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ touch conftest.a
-+ ln conftest.a conftest.b 2>&5 || hard_links=no
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6
-+ if test "$hard_links" = no; then
-+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+ need_locks=warn
-+ fi
-+else
-+ need_locks=no
-+fi
-+
-+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+
-+ runpath_var=
-+ allow_undefined_flag_GCJ=
-+ enable_shared_with_static_runtimes_GCJ=no
-+ archive_cmds_GCJ=
-+ archive_expsym_cmds_GCJ=
-+ old_archive_From_new_cmds_GCJ=
-+ old_archive_from_expsyms_cmds_GCJ=
-+ export_dynamic_flag_spec_GCJ=
-+ whole_archive_flag_spec_GCJ=
-+ thread_safe_flag_spec_GCJ=
-+ hardcode_libdir_flag_spec_GCJ=
-+ hardcode_libdir_flag_spec_ld_GCJ=
-+ hardcode_libdir_separator_GCJ=
-+ hardcode_direct_GCJ=no
-+ hardcode_minus_L_GCJ=no
-+ hardcode_shlibpath_var_GCJ=unsupported
-+ link_all_deplibs_GCJ=unknown
-+ hardcode_automatic_GCJ=no
-+ module_cmds_GCJ=
-+ module_expsym_cmds_GCJ=
-+ always_export_symbols_GCJ=no
-+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+ # include_expsyms should be a list of space-separated symbols to be *always*
-+ # included in the symbol list
-+ include_expsyms_GCJ=
-+ # exclude_expsyms can be an extended regexp of symbols to exclude
-+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+ # as well as any symbol that contains `d'.
-+ exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+ # platforms (ab)use it in PIC code, but their linkers get confused if
-+ # the symbol is explicitly referenced. Since portable code cannot
-+ # rely on this symbol name, it's probably fine to never include it in
-+ # preloaded symbol tables.
-+ extract_expsyms_cmds=
-+
-+ case $host_os in
-+ cygwin* | mingw* | pw32*)
-+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ if test "$GCC" != yes; then
-+ with_gnu_ld=no
-+ fi
-+ ;;
-+ openbsd*)
-+ with_gnu_ld=no
-+ ;;
-+ esac
-+
-+ ld_shlibs_GCJ=yes
-+ if test "$with_gnu_ld" = yes; then
-+ # If archive_cmds runs LD, not CC, wlarc should be empty
-+ wlarc='${wl}'
-+
-+ # See if GNU ld supports shared libraries.
-+ case $host_os in
-+ aix3* | aix4* | aix5*)
-+ # On AIX/PPC, the GNU linker is very broken
-+ if test "$host_cpu" != ia64; then
-+ ld_shlibs_GCJ=no
-+ cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support. If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+ hardcode_minus_L_GCJ=yes
-+
-+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+ # that the semantics of dynamic libraries on AmigaOS, at least up
-+ # to version 4, is to share data among multiple programs linked
-+ # with the same dynamic library. Since this doesn't match the
-+ # behavior of shared libraries on other platforms, we can't use
-+ # them.
-+ ld_shlibs_GCJ=no
-+ ;;
-+
-+ beos*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ allow_undefined_flag_GCJ=unsupported
-+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
-+ cygwin* | mingw* | pw32*)
-+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-+ # as there is no search path for DLLs.
-+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+ allow_undefined_flag_GCJ=unsupported
-+ always_export_symbols_GCJ=no
-+ enable_shared_with_static_runtimes_GCJ=yes
-+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+
-+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ # If the export-symbols file already is a .def file (1st line
-+ # is EXPORTS), use it as is; otherwise, prepend...
-+ archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+ cp $export_symbols $output_objdir/$soname.def;
-+ else
-+ echo EXPORTS > $output_objdir/$soname.def;
-+ cat $export_symbols >> $output_objdir/$soname.def;
-+ fi~
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ else
-+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+ wlarc=
-+ else
-+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ fi
-+ ;;
-+
-+ solaris* | sysv5*)
-+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+ ld_shlibs_GCJ=no
-+ cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems. Therefore, libtool
-+*** is disabling shared libraries support. We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer. Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
-+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
-+ sunos4*)
-+ archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ wlarc=
-+ hardcode_direct_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_addflag=
-+ case $CC,$host_cpu in
-+ pgf77* | pgf90* ) # Portland Group f77 and f90 compilers
-+ tmp_addflag=' -fpic' ;;
-+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
-+ tmp_addflag=' -i_dynamic' ;;
-+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
-+ tmp_addflag=' -i_dynamic -nofor_main' ;;
-+ ifc* | ifort*) # Intel Fortran compiler
-+ tmp_addflag=' -nofor_main' ;;
-+ esac
-+ archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ archive_expsym_cmds_GCJ=$archive_cmds_GCJ
-+ fi
-+ else
-+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
-+ *)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ else
-+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+ esac
-+
-+ if test "$ld_shlibs_GCJ" = yes; then
-+ runpath_var=LD_RUN_PATH
-+ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-+ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-+ # ancient GNU ld didn't support --whole-archive et. al.
-+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ else
-+ whole_archive_flag_spec_GCJ=
-+ fi
-+ fi
-+ else
-+ # PORTME fill in a description of your system's linker (not GNU ld)
-+ case $host_os in
-+ aix3*)
-+ allow_undefined_flag_GCJ=unsupported
-+ always_export_symbols_GCJ=yes
-+ archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+ # Note: this linker hardcodes the directories in LIBPATH if there
-+ # are no directories specified by -L.
-+ hardcode_minus_L_GCJ=yes
-+ if test "$GCC" = yes && test -z "$link_static_flag"; then
-+ # Neither direct hardcoding nor static linking is supported with a
-+ # broken collect2.
-+ hardcode_direct_GCJ=unsupported
-+ fi
-+ ;;
-+
-+ aix4* | aix5*)
-+ if test "$host_cpu" = ia64; then
-+ # On IA64, the linker does run time linking by default, so we don't
-+ # have to do anything special.
-+ aix_use_runtimelinking=no
-+ exp_sym_flag='-Bexport'
-+ no_entry_flag=""
-+ else
-+ # If we're using GNU nm, then we don't want the "-C" option.
-+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+ export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+ else
-+ export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+ fi
-+ aix_use_runtimelinking=no
-+
-+ # Test if we are trying to use run time linking or normal
-+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+ # need to do runtime linking.
-+ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+ for ld_flag in $LDFLAGS; do
-+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+ aix_use_runtimelinking=yes
-+ break
-+ fi
-+ done
-+ esac
-+
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
-+
-+ # When large executables or shared objects are built, AIX ld can
-+ # have problems creating the table of contents. If linking a library
-+ # or program results in "error TOC overflow" add -mminimal-toc to
-+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
-+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+ archive_cmds_GCJ=''
-+ hardcode_direct_GCJ=yes
-+ hardcode_libdir_separator_GCJ=':'
-+ link_all_deplibs_GCJ=yes
-+
-+ if test "$GCC" = yes; then
-+ case $host_os in aix4.[012]|aix4.[012].*)
-+ # We only want to do this on AIX 4.2 and lower, the check
-+ # below for broken collect2 doesn't work under 4.3+
-+ collect2name=`${CC} -print-prog-name=collect2`
-+ if test -f "$collect2name" && \
-+ strings "$collect2name" | grep resolve_lib_name >/dev/null
-+ then
-+ # We have reworked collect2
-+ hardcode_direct_GCJ=yes
-+ else
-+ # We have old collect2
-+ hardcode_direct_GCJ=unsupported
-+ # It fails to find uninstalled libraries when the uninstalled
-+ # path is not listed in the libpath. Setting hardcode_minus_L
-+ # to unsupported forces relinking
-+ hardcode_minus_L_GCJ=yes
-+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+ hardcode_libdir_separator_GCJ=
-+ fi
-+ esac
-+ shared_flag='-shared'
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag="$shared_flag "'${wl}-G'
-+ fi
-+ else
-+ # not using gcc
-+ if test "$host_cpu" = ia64; then
-+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+ # chokes on -Wl,-G. The following line is correct:
-+ shared_flag='-G'
-+ else
-+ if test "$aix_use_runtimelinking" = yes; then
-+ shared_flag='${wl}-G'
-+ else
-+ shared_flag='${wl}-bM:SRE'
-+ fi
-+ fi
-+ fi
-+
-+ # It seems that -bexpall does not export symbols beginning with
-+ # underscore (_), so it is better to generate a list of symbols to export.
-+ always_export_symbols_GCJ=yes
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # Warning - without using the other runtime loading flags (-brtl),
-+ # -berok will link without error, but may produce a broken library.
-+ allow_undefined_flag_GCJ='-berok'
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-+ allow_undefined_flag_GCJ="-z nodefs"
-+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ else
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+
-+ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Warning - without using the other run time loading flags,
-+ # -berok will link without error, but may produce a broken library.
-+ no_undefined_flag_GCJ=' ${wl}-bernotok'
-+ allow_undefined_flag_GCJ=' ${wl}-berok'
-+ # -bexpall does not export symbols beginning with underscore (_)
-+ always_export_symbols_GCJ=yes
-+ # Exported symbols can be pulled into shared objects from archives
-+ whole_archive_flag_spec_GCJ=' '
-+ archive_cmds_need_lc_GCJ=yes
-+ # This is similar to how AIX traditionally builds it's shared libraries.
-+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ fi
-+ fi
-+ ;;
-+
-+ amigaos*)
-+ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+ hardcode_minus_L_GCJ=yes
-+ # see comment about different semantics on the GNU ld section
-+ ld_shlibs_GCJ=no
-+ ;;
-+
-+ bsdi[45]*)
-+ export_dynamic_flag_spec_GCJ=-rdynamic
-+ ;;
-+
-+ cygwin* | mingw* | pw32*)
-+ # When not using gcc, we currently assume that we are using
-+ # Microsoft Visual C++.
-+ # hardcode_libdir_flag_spec is actually meaningless, as there is
-+ # no search path for DLLs.
-+ hardcode_libdir_flag_spec_GCJ=' '
-+ allow_undefined_flag_GCJ=unsupported
-+ # Tell ltmain to make .lib files, not .a files.
-+ libext=lib
-+ # Tell ltmain to make .dll files, not .so files.
-+ shrext_cmds=".dll"
-+ # FIXME: Setting linknames here is a bad hack.
-+ archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+ # The linker will automatically build a .lib file if we build a DLL.
-+ old_archive_From_new_cmds_GCJ='true'
-+ # FIXME: Should let the user specify the lib program.
-+ old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-+ enable_shared_with_static_runtimes_GCJ=yes
-+ ;;
-+
-+ darwin* | rhapsody*)
-+ case "$host_os" in
-+ rhapsody* | darwin1.[012])
-+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[012])
-+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+ ;;
-+ 10.*)
-+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
-+ archive_cmds_need_lc_GCJ=no
-+ hardcode_direct_GCJ=no
-+ hardcode_automatic_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=unsupported
-+ whole_archive_flag_spec_GCJ=''
-+ link_all_deplibs_GCJ=yes
-+ if test "$GCC" = yes ; then
-+ output_verbose_link_cmd='echo'
-+ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ else
-+ case "$cc_basename" in
-+ xlc*)
-+ output_verbose_link_cmd='echo'
-+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ ;;
-+ *)
-+ ld_shlibs_GCJ=no
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ dgux*)
-+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ freebsd1*)
-+ ld_shlibs_GCJ=no
-+ ;;
-+
-+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+ # support. Future versions do this automatically, but an explicit c++rt0.o
-+ # does not break anything, and helps significantly (at the cost of a little
-+ # extra space).
-+ freebsd2.2*)
-+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+ hardcode_direct_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+ freebsd2*)
-+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_GCJ=yes
-+ hardcode_minus_L_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
-+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+ hardcode_direct_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ hpux9*)
-+ if test "$GCC" = yes; then
-+ archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ else
-+ archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+ fi
-+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_GCJ=:
-+ hardcode_direct_GCJ=yes
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L_GCJ=yes
-+ export_dynamic_flag_spec_GCJ='${wl}-E'
-+ ;;
-+
-+ hpux10* | hpux11*)
-+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ *)
-+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ else
-+ case "$host_cpu" in
-+ hppa*64*|ia64*)
-+ archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ ;;
-+ *)
-+ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+ ;;
-+ esac
-+ fi
-+ if test "$with_gnu_ld" = no; then
-+ case "$host_cpu" in
-+ hppa*64*)
-+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-+ hardcode_libdir_separator_GCJ=:
-+ hardcode_direct_GCJ=no
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+ ia64*)
-+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+ hardcode_direct_GCJ=no
-+ hardcode_shlibpath_var_GCJ=no
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L_GCJ=yes
-+ ;;
-+ *)
-+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-+ hardcode_libdir_separator_GCJ=:
-+ hardcode_direct_GCJ=yes
-+ export_dynamic_flag_spec_GCJ='${wl}-E'
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ hardcode_minus_L_GCJ=yes
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ irix5* | irix6* | nonstopux*)
-+ if test "$GCC" = yes; then
-+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-+ fi
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_GCJ=:
-+ link_all_deplibs_GCJ=yes
-+ ;;
-+
-+ netbsd*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-+ else
-+ archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-+ fi
-+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+ hardcode_direct_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ newsos6)
-+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_GCJ=yes
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_GCJ=:
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ openbsd*)
-+ hardcode_direct_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_GCJ='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+
-+ os2*)
-+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+ hardcode_minus_L_GCJ=yes
-+ allow_undefined_flag_GCJ=unsupported
-+ archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+ old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+ ;;
-+
-+ osf3*)
-+ if test "$GCC" = yes; then
-+ allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-+ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ else
-+ allow_undefined_flag_GCJ=' -expect_unresolved \*'
-+ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ fi
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-+ hardcode_libdir_separator_GCJ=:
-+ ;;
-+
-+ osf4* | osf5*) # as osf3* with the addition of -msym flag
-+ if test "$GCC" = yes; then
-+ allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-+ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-+ else
-+ allow_undefined_flag_GCJ=' -expect_unresolved \*'
-+ archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+
-+ # Both c and cxx compiler support -rpath directly
-+ hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-+ fi
-+ hardcode_libdir_separator_GCJ=:
-+ ;;
-+
-+ sco3.2v5*)
-+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_shlibpath_var_GCJ=no
-+ export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-+ runpath_var=LD_RUN_PATH
-+ hardcode_runpath_var=yes
-+ ;;
-+
-+ solaris*)
-+ no_undefined_flag_GCJ=' -z text'
-+ if test "$GCC" = yes; then
-+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+ else
-+ archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+ fi
-+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+ hardcode_shlibpath_var_GCJ=no
-+ case $host_os in
-+ solaris2.[0-5] | solaris2.[0-5].*) ;;
-+ *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;;
-+ esac
-+ link_all_deplibs_GCJ=yes
-+ ;;
-+
-+ sunos4*)
-+ if test "x$host_vendor" = xsequent; then
-+ # Use $CC to link under sequent, because it throws in some extra .o
-+ # files that make .init and .fini sections work.
-+ archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+ fi
-+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+ hardcode_direct_GCJ=yes
-+ hardcode_minus_L_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ sysv4)
-+ case $host_vendor in
-+ sni)
-+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_GCJ=yes # is this really true???
-+ ;;
-+ siemens)
-+ ## LD is ld it makes a PLAMLIB
-+ ## CC just makes a GrossModule.
-+ archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-+ hardcode_direct_GCJ=no
-+ ;;
-+ motorola)
-+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-+ ;;
-+ esac
-+ runpath_var='LD_RUN_PATH'
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ sysv4.3*)
-+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_shlibpath_var_GCJ=no
-+ export_dynamic_flag_spec_GCJ='-Bexport'
-+ ;;
-+
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_shlibpath_var_GCJ=no
-+ runpath_var=LD_RUN_PATH
-+ hardcode_runpath_var=yes
-+ ld_shlibs_GCJ=yes
-+ fi
-+ ;;
-+
-+ sysv4.2uw2*)
-+ archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_direct_GCJ=yes
-+ hardcode_minus_L_GCJ=no
-+ hardcode_shlibpath_var_GCJ=no
-+ hardcode_runpath_var=yes
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+
-+ sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-+ no_undefined_flag_GCJ='${wl}-z ${wl}text'
-+ if test "$GCC" = yes; then
-+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ else
-+ archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ fi
-+ runpath_var='LD_RUN_PATH'
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ sysv5*)
-+ no_undefined_flag_GCJ=' -z text'
-+ # $CC -shared without GNU ld will not create a library from C++
-+ # object files and a static libstdc++, better avoid it by now
-+ archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+ hardcode_libdir_flag_spec_GCJ=
-+ hardcode_shlibpath_var_GCJ=no
-+ runpath_var='LD_RUN_PATH'
-+ ;;
-+
-+ uts4*)
-+ archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-+
-+ *)
-+ ld_shlibs_GCJ=no
-+ ;;
-+ esac
-+ fi
-+
-+echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+echo "${ECHO_T}$ld_shlibs_GCJ" >&6
-+test "$ld_shlibs_GCJ" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc_GCJ" in
-+x|xyes)
-+ # Assume -lc should be added
-+ archive_cmds_need_lc_GCJ=yes
-+
-+ if test "$enable_shared" = yes && test "$GCC" = yes; then
-+ case $archive_cmds_GCJ in
-+ *'~'*)
-+ # FIXME: we may have to deal with multi-command sequences.
-+ ;;
-+ '$CC '*)
-+ # Test whether the compiler implicitly links with -lc since on some
-+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+ # to ld, don't add -lc before -lgcc.
-+ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+ $rm conftest*
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } 2>conftest.err; then
-+ soname=conftest
-+ lib=conftest
-+ libobjs=conftest.$ac_objext
-+ deplibs=
-+ wl=$lt_prog_compiler_wl_GCJ
-+ compiler_flags=-v
-+ linker_flags=-v
-+ verstring=
-+ output_objdir=.
-+ libname=conftest
-+ lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-+ allow_undefined_flag_GCJ=
-+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+ (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+ then
-+ archive_cmds_need_lc_GCJ=no
-+ else
-+ archive_cmds_need_lc_GCJ=yes
-+ fi
-+ allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-+ else
-+ cat conftest.err 1>&5
-+ fi
-+ $rm conftest*
-+ echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
-+ ;;
-+ esac
-+ fi
-+ ;;
-+esac
-+
-+echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+else
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
-+
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+
-+aix4* | aix5*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ hardcode_into_libs=yes
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 supports IA64
-+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ else
-+ # With GCC up to 2.95.x, collect2 would create an import file
-+ # for dependence libraries. The import file would start with
-+ # the line `#! .'. This would cause the generated library to
-+ # depend on `.', always an invalid library. This was fixed in
-+ # development snapshots of GCC prior to 3.0.
-+ case $host_os in
-+ aix4 | aix4.[01] | aix4.[01].*)
-+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+ echo ' yes '
-+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+ :
-+ else
-+ can_build_shared=no
-+ fi
-+ ;;
-+ esac
-+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+ # soname into executable. Probably we can add versioning support to
-+ # collect2, so additional links can be useful in future.
-+ if test "$aix_use_runtimelinking" = yes; then
-+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+ # instead of lib<name>.a to let people know that these are not
-+ # typical AIX shared libraries.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ else
-+ # We preserve .a as extension for shared libraries through AIX4.2
-+ # and later when we are not doing run time linking.
-+ library_names_spec='${libname}${release}.a $libname.a'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ fi
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-+
-+amigaos*)
-+ library_names_spec='$libname.ixlibrary $libname.a'
-+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+ ;;
-+
-+beos*)
-+ library_names_spec='${libname}${shared_ext}'
-+ dynamic_linker="$host_os ld.so"
-+ shlibpath_var=LIBRARY_PATH
-+ ;;
-+
-+bsdi[45]*)
-+ version_type=linux
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+ # the default ld.so.conf also contains /usr/contrib/lib and
-+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+ # libtool to hard-code these into programs
-+ ;;
-+
-+cygwin* | mingw* | pw32*)
-+ version_type=windows
-+ shrext_cmds=".dll"
-+ need_version=no
-+ need_lib_prefix=no
-+
-+ case $GCC,$host_os in
-+ yes,cygwin* | yes,mingw* | yes,pw32*)
-+ library_names_spec='$libname.dll.a'
-+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+ postinstall_cmds='base_file=`basename \${file}`~
-+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+ dldir=$destdir/`dirname \$dlpath`~
-+ test -d \$dldir || mkdir -p \$dldir~
-+ $install_prog $dir/$dlname \$dldir/$dlname'
-+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+ dlpath=$dir/\$dldll~
-+ $rm \$dlpath'
-+ shlibpath_overrides_runpath=yes
-+
-+ case $host_os in
-+ cygwin*)
-+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+ ;;
-+ mingw*)
-+ # MinGW DLLs use traditional 'lib' prefix
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+ # It is most probably a Windows format PATH printed by
-+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+ # path with ; separators, and with drive letters. We can handle the
-+ # drive letters (cygwin fileutils understands them), so leave them,
-+ # especially as we might pass files found there to a mingw objdump,
-+ # which wouldn't understand a cygwinified path. Ahh.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+ ;;
-+ pw32*)
-+ # pw32 DLLs use 'pw' prefix rather than 'lib'
-+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-+ ;;
-+ esac
-+ ;;
-+
-+ *)
-+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+ ;;
-+ esac
-+ dynamic_linker='Win32 ld.exe'
-+ # FIXME: first we should search . and the directory the executable is in
-+ shlibpath_var=PATH
-+ ;;
-+
-+darwin* | rhapsody*)
-+ dynamic_linker="$host_os dyld"
-+ version_type=darwin
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+ soname_spec='${libname}${release}${major}$shared_ext'
-+ shlibpath_overrides_runpath=yes
-+ shlibpath_var=DYLD_LIBRARY_PATH
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+ if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+ else
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+ ;;
-+
-+dgux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+freebsd1*)
-+ dynamic_linker=no
-+ ;;
-+
-+kfreebsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
-+freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ need_version=no
-+ need_lib_prefix=no
-+ ;;
-+ freebsd-*)
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+ need_version=yes
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_os in
-+ freebsd2*)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ freebsd3.[01]* | freebsdelf3.[01]*)
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ *) # from 3.2 on
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
-+ esac
-+ ;;
-+
-+gnu*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+ # Give a soname corresponding to the major version so that dld.sl refuses to
-+ # link against other versions.
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ case "$host_cpu" in
-+ ia64*)
-+ shrext_cmds='.so'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.so"
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ if test "X$HPUX_IA64_MODE" = X32; then
-+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+ else
-+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+ fi
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+ postinstall_cmds='chmod 555 $lib'
-+ ;;
-+
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
-+ *)
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
-+ esac
-+ ;;
-+ esac
-+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ hardcode_into_libs=yes
-+ ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-+
-+# This must be Linux ELF.
-+linux*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ hardcode_into_libs=yes
-+
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-+
-+ # We used to test for /lib/ld.so.1 and disable shared libraries on
-+ # powerpc, because MkLinux only supported shared libraries with the
-+ # GNU dynamic linker. Since this was broken with cross compilers,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
-+ ;;
-+
-+knetbsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ dynamic_linker='GNU ld.so'
-+ ;;
-+
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ dynamic_linker='NetBSD (a.out) ld.so'
-+ else
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+nto-qnx*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+
-+openbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ case $host_os in
-+ openbsd2.[89] | openbsd2.[89].*)
-+ shlibpath_overrides_runpath=no
-+ ;;
-+ *)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ esac
-+ else
-+ shlibpath_overrides_runpath=yes
-+ fi
-+ ;;
-+
-+os2*)
-+ libname_spec='$name'
-+ shrext_cmds=".dll"
-+ need_lib_prefix=no
-+ library_names_spec='$libname${shared_ext} $libname.a'
-+ dynamic_linker='OS/2 ld.exe'
-+ shlibpath_var=LIBPATH
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ version_type=osf
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+ ;;
-+
-+sco3.2v5*)
-+ version_type=osf
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+solaris*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ # ldd complains unless libraries are executable
-+ postinstall_cmds='chmod +x $lib'
-+ ;;
-+
-+sunos4*)
-+ version_type=sunos
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ if test "$with_gnu_ld" = yes; then
-+ need_lib_prefix=no
-+ fi
-+ need_version=yes
-+ ;;
-+
-+sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ case $host_vendor in
-+ sni)
-+ shlibpath_overrides_runpath=no
-+ need_lib_prefix=no
-+ export_dynamic_flag_spec='${wl}-Blargedynsym'
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+ siemens)
-+ need_lib_prefix=no
-+ ;;
-+ motorola)
-+ need_lib_prefix=no
-+ need_version=no
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+ ;;
-+ esac
-+ ;;
-+
-+sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ version_type=linux
-+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+ soname_spec='$libname${shared_ext}.$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ fi
-+ ;;
-+
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-+
-+*)
-+ dynamic_linker=no
-+ ;;
-+esac
-+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-+hardcode_action_GCJ=
-+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-+ test -n "$runpath_var_GCJ" || \
-+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-+
-+ # We can hardcode non-existant directories.
-+ if test "$hardcode_direct_GCJ" != no &&
-+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+ # have to relink, otherwise we might link with an installed library
-+ # when we should be linking with a yet-to-be-installed one
-+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-+ test "$hardcode_minus_L_GCJ" != no; then
-+ # Linking always hardcodes the temporary library directory.
-+ hardcode_action_GCJ=relink
-+ else
-+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+ hardcode_action_GCJ=immediate
-+ fi
-+else
-+ # We cannot hardcode anything, or else we can only hardcode existing
-+ # directories.
-+ hardcode_action_GCJ=unsupported
-+fi
-+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6
-+
-+if test "$hardcode_action_GCJ" = relink; then
-+ # Fast installation is not supported
-+ enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+ test "$enable_shared" = no; then
-+ # Fast installation is not necessary
-+ enable_fast_install=needless
-+fi
-+
-+striplib=
-+old_striplib=
-+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+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"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+ case $host_os in
-+ darwin*)
-+ if test -n "$STRIP" ; then
-+ striplib="$STRIP -x"
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+ ;;
-+ *)
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ ;;
-+ esac
-+fi
-+
-+if test "x$enable_dlopen" != xyes; then
-+ enable_dlopen=unknown
-+ enable_dlopen_self=unknown
-+ enable_dlopen_self_static=unknown
-+else
-+ lt_cv_dlopen=no
-+ lt_cv_dlopen_libs=
-+
-+ case $host_os in
-+ beos*)
-+ lt_cv_dlopen="load_add_on"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ;;
-+
-+ mingw* | pw32*)
-+ lt_cv_dlopen="LoadLibrary"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ cygwin*)
-+ lt_cv_dlopen="dlopen"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ darwin*)
-+ # if libdl is installed we need to link against it
-+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dl_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+
-+ lt_cv_dlopen="dyld"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+
-+fi
-+
-+ ;;
-+
-+ *)
-+ echo "$as_me:$LINENO: checking for shl_load" >&5
-+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-+if test "${ac_cv_func_shl_load+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define shl_load innocuous_shl_load
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char shl_load (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef shl_load
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char shl_load ();
-+/* 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_shl_load) || defined (__stub___shl_load)
-+choke me
-+#else
-+char (*f) () = shl_load;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != shl_load;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func_shl_load=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_shl_load=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-+if test $ac_cv_func_shl_load = yes; then
-+ lt_cv_dlopen="shl_load"
-+else
-+ echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char shl_load ();
-+int
-+main ()
-+{
-+shl_load ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dld_shl_load=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dld_shl_load=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-+if test $ac_cv_lib_dld_shl_load = yes; then
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+else
-+ echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-+if test "${ac_cv_func_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define dlopen innocuous_dlopen
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char dlopen (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef dlopen
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+/* 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_dlopen) || defined (__stub___dlopen)
-+choke me
-+#else
-+char (*f) () = dlopen;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != dlopen;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_func_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_func_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-+if test $ac_cv_func_dlopen = yes; then
-+ lt_cv_dlopen="dlopen"
-+else
-+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dl_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dl_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+if test $ac_cv_lib_dl_dlopen = yes; then
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+ echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dlopen ();
-+int
-+main ()
-+{
-+dlopen ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_svld_dlopen=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_svld_dlopen=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-+if test $ac_cv_lib_svld_dlopen = yes; then
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
-+ echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char dld_link ();
-+int
-+main ()
-+{
-+dld_link ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_dld_dld_link=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_dld_dld_link=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-+if test $ac_cv_lib_dld_dld_link = yes; then
-+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+ ;;
-+ esac
-+
-+ if test "x$lt_cv_dlopen" != xno; then
-+ enable_dlopen=yes
-+ else
-+ enable_dlopen=no
-+ fi
-+
-+ case $lt_cv_dlopen in
-+ dlopen)
-+ save_CPPFLAGS="$CPPFLAGS"
-+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+ save_LDFLAGS="$LDFLAGS"
-+ eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+ save_LIBS="$LIBS"
-+ LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+ echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-+if test "${lt_cv_dlopen_self+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$cross_compiling" = yes; then :
-+ lt_cv_dlopen_self=cross
-+else
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-+#line 18301 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LT_DLGLOBAL RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+# define LT_DLGLOBAL DL_GLOBAL
-+# else
-+# define LT_DLGLOBAL 0
-+# endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+ find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+# define LT_DLLAZY_OR_NOW RTLD_LAZY
-+# else
-+# ifdef DL_LAZY
-+# define LT_DLLAZY_OR_NOW DL_LAZY
-+# else
-+# ifdef RTLD_NOW
-+# define LT_DLLAZY_OR_NOW RTLD_NOW
-+# else
-+# ifdef DL_NOW
-+# define LT_DLLAZY_OR_NOW DL_NOW
-+# else
-+# define LT_DLLAZY_OR_NOW 0
-+# endif
-+# endif
-+# endif
-+# endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+ int status = $lt_dlunknown;
-+
-+ if (self)
-+ {
-+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+ /* dlclose (self); */
-+ }
-+
-+ exit (status);
-+}
-+EOF
-+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ (./conftest; exit; ) 2>/dev/null
-+ lt_status=$?
-+ case x$lt_status in
-+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-+ x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-+ esac
-+ else :
-+ # compilation failed
-+ lt_cv_dlopen_self=no
-+ fi
-+fi
-+rm -fr conftest*
-+
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+
-+ if test "x$lt_cv_dlopen_self" = xyes; then
-+ LDFLAGS="$LDFLAGS $link_static_flag"
-+ echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-+if test "${lt_cv_dlopen_self_static+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$cross_compiling" = yes; then :
-+ lt_cv_dlopen_self_static=cross
-+else
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-+#line 18399 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+# define LT_DLGLOBAL RTLD_GLOBAL
-+#else
-+# ifdef DL_GLOBAL
-+# define LT_DLGLOBAL DL_GLOBAL
-+# else
-+# define LT_DLGLOBAL 0
-+# endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+ find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+# ifdef RTLD_LAZY
-+# define LT_DLLAZY_OR_NOW RTLD_LAZY
-+# else
-+# ifdef DL_LAZY
-+# define LT_DLLAZY_OR_NOW DL_LAZY
-+# else
-+# ifdef RTLD_NOW
-+# define LT_DLLAZY_OR_NOW RTLD_NOW
-+# else
-+# ifdef DL_NOW
-+# define LT_DLLAZY_OR_NOW DL_NOW
-+# else
-+# define LT_DLLAZY_OR_NOW 0
-+# endif
-+# endif
-+# endif
-+# endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+ int status = $lt_dlunknown;
-+
-+ if (self)
-+ {
-+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+ /* dlclose (self); */
-+ }
-+
-+ exit (status);
-+}
-+EOF
-+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+ (./conftest; exit; ) 2>/dev/null
-+ lt_status=$?
-+ case x$lt_status in
-+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-+ x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-+ esac
-+ else :
-+ # compilation failed
-+ lt_cv_dlopen_self_static=no
-+ fi
-+fi
-+rm -fr conftest*
-+
-+
-+fi
-+echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-+ fi
-+
-+ CPPFLAGS="$save_CPPFLAGS"
-+ LDFLAGS="$save_LDFLAGS"
-+ LIBS="$save_LIBS"
-+ ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self in
-+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+ *) enable_dlopen_self=unknown ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self_static in
-+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+ *) enable_dlopen_self_static=unknown ;;
-+ esac
-+fi
-+
-+
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+ # See if we are running on zsh, and set the options which allow our commands through
-+ # without removal of \ escapes.
-+ if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+ fi
-+ # Now quote all the things that may contain metacharacters while being
-+ # careful not to overquote the AC_SUBSTed values. We take copies of the
-+ # variables and quote the copies for generation of the libtool script.
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
-+ SED SHELL STRIP \
-+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+ deplibs_check_method reload_flag reload_cmds need_locks \
-+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+ lt_cv_sys_global_symbol_to_c_name_address \
-+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+ old_postinstall_cmds old_postuninstall_cmds \
-+ compiler_GCJ \
-+ CC_GCJ \
-+ LD_GCJ \
-+ lt_prog_compiler_wl_GCJ \
-+ lt_prog_compiler_pic_GCJ \
-+ lt_prog_compiler_static_GCJ \
-+ lt_prog_compiler_no_builtin_flag_GCJ \
-+ export_dynamic_flag_spec_GCJ \
-+ thread_safe_flag_spec_GCJ \
-+ whole_archive_flag_spec_GCJ \
-+ enable_shared_with_static_runtimes_GCJ \
-+ old_archive_cmds_GCJ \
-+ old_archive_from_new_cmds_GCJ \
-+ predep_objects_GCJ \
-+ postdep_objects_GCJ \
-+ predeps_GCJ \
-+ postdeps_GCJ \
-+ compiler_lib_search_path_GCJ \
-+ archive_cmds_GCJ \
-+ archive_expsym_cmds_GCJ \
-+ postinstall_cmds_GCJ \
-+ postuninstall_cmds_GCJ \
-+ old_archive_from_expsyms_cmds_GCJ \
-+ allow_undefined_flag_GCJ \
-+ no_undefined_flag_GCJ \
-+ export_symbols_cmds_GCJ \
-+ hardcode_libdir_flag_spec_GCJ \
-+ hardcode_libdir_flag_spec_ld_GCJ \
-+ hardcode_libdir_separator_GCJ \
-+ hardcode_automatic_GCJ \
-+ module_cmds_GCJ \
-+ module_expsym_cmds_GCJ \
-+ lt_cv_prog_compiler_c_o_GCJ \
-+ exclude_expsyms_GCJ \
-+ include_expsyms_GCJ; do
-+
-+ case $var in
-+ old_archive_cmds_GCJ | \
-+ old_archive_from_new_cmds_GCJ | \
-+ archive_cmds_GCJ | \
-+ archive_expsym_cmds_GCJ | \
-+ module_cmds_GCJ | \
-+ module_expsym_cmds_GCJ | \
-+ old_archive_from_expsyms_cmds_GCJ | \
-+ export_symbols_cmds_GCJ | \
-+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+ postinstall_cmds | postuninstall_cmds | \
-+ old_postinstall_cmds | old_postuninstall_cmds | \
-+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+ # Double-quote double-evaled strings.
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+ ;;
-+ *)
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ ;;
-+ esac
-+ done
-+
-+ case $lt_echo in
-+ *'\$0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+ ;;
-+ esac
-+
-+cfgfile="$ofile"
-+
-+ cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
-+# A language-specific compiler.
-+CC=$lt_compiler_GCJ
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_GCJ
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_LD_GCJ
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS=$lt_AS
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_GCJ
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_GCJ
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_GCJ
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_GCJ
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_GCJ
-+archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_GCJ
-+module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_GCJ
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_GCJ
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_GCJ
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_GCJ
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_GCJ
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_GCJ
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_GCJ
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_GCJ
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_GCJ
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_GCJ
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_GCJ"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_GCJ
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_GCJ
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_GCJ
-+
-+# ### END LIBTOOL TAG CONFIG: $tagname
-+
-+__EOF__
-+
-+
-+else
-+ # If there is no Makefile yet, we rely on a make rule to execute
-+ # `config.status --recheck' to rerun these tests and create the
-+ # libtool script then.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC="$lt_save_CC"
-+
-+ else
-+ tagname=""
-+ fi
-+ ;;
-+
-+ RC)
-+
-+
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+objext_RC=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${RC-"windres"}
-+compiler=$CC
-+compiler_RC=$CC
-+lt_cv_prog_compiler_c_o_RC=yes
-+
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+ # See if we are running on zsh, and set the options which allow our commands through
-+ # without removal of \ escapes.
-+ if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+ fi
-+ # Now quote all the things that may contain metacharacters while being
-+ # careful not to overquote the AC_SUBSTed values. We take copies of the
-+ # variables and quote the copies for generation of the libtool script.
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
-+ SED SHELL STRIP \
-+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+ deplibs_check_method reload_flag reload_cmds need_locks \
-+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+ lt_cv_sys_global_symbol_to_c_name_address \
-+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+ old_postinstall_cmds old_postuninstall_cmds \
-+ compiler_RC \
-+ CC_RC \
-+ LD_RC \
-+ lt_prog_compiler_wl_RC \
-+ lt_prog_compiler_pic_RC \
-+ lt_prog_compiler_static_RC \
-+ lt_prog_compiler_no_builtin_flag_RC \
-+ export_dynamic_flag_spec_RC \
-+ thread_safe_flag_spec_RC \
-+ whole_archive_flag_spec_RC \
-+ enable_shared_with_static_runtimes_RC \
-+ old_archive_cmds_RC \
-+ old_archive_from_new_cmds_RC \
-+ predep_objects_RC \
-+ postdep_objects_RC \
-+ predeps_RC \
-+ postdeps_RC \
-+ compiler_lib_search_path_RC \
-+ archive_cmds_RC \
-+ archive_expsym_cmds_RC \
-+ postinstall_cmds_RC \
-+ postuninstall_cmds_RC \
-+ old_archive_from_expsyms_cmds_RC \
-+ allow_undefined_flag_RC \
-+ no_undefined_flag_RC \
-+ export_symbols_cmds_RC \
-+ hardcode_libdir_flag_spec_RC \
-+ hardcode_libdir_flag_spec_ld_RC \
-+ hardcode_libdir_separator_RC \
-+ hardcode_automatic_RC \
-+ module_cmds_RC \
-+ module_expsym_cmds_RC \
-+ lt_cv_prog_compiler_c_o_RC \
-+ exclude_expsyms_RC \
-+ include_expsyms_RC; do
-+
-+ case $var in
-+ old_archive_cmds_RC | \
-+ old_archive_from_new_cmds_RC | \
-+ archive_cmds_RC | \
-+ archive_expsym_cmds_RC | \
-+ module_cmds_RC | \
-+ module_expsym_cmds_RC | \
-+ old_archive_from_expsyms_cmds_RC | \
-+ export_symbols_cmds_RC | \
-+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+ postinstall_cmds | postuninstall_cmds | \
-+ old_postinstall_cmds | old_postuninstall_cmds | \
-+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+ # Double-quote double-evaled strings.
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+ ;;
-+ *)
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ ;;
-+ esac
-+ done
-+
-+ case $lt_echo in
-+ *'\$0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+ ;;
-+ esac
-+
-+cfgfile="$ofile"
-+
-+ cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_RC
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
-+# A language-specific compiler.
-+CC=$lt_compiler_RC
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_RC
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
-+
-+# The linker used to build libraries.
-+LD=$lt_LD_RC
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
-+STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS=$lt_AS
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_RC
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_RC
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-+
-+# Must we lock files when doing compilation ?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_RC
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_RC
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_RC
-+archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_RC
-+module_expsym_cmds=$lt_module_expsym_cmds_RC
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_RC
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_RC
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_RC
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_RC
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_RC
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_RC
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_RC
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_RC
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_RC
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_RC
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_RC
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_RC"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_RC
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_RC
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_RC
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_RC
-+
-+# ### END LIBTOOL TAG CONFIG: $tagname
-+
-+__EOF__
-+
-+
-+else
-+ # If there is no Makefile yet, we rely on a make rule to execute
-+ # `config.status --recheck' to rerun these tests and create the
-+ # libtool script then.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+CC="$lt_save_CC"
-+
-+ ;;
-+
-+ *)
-+ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-+ { (exit 1); exit 1; }; }
-+ ;;
-+ esac
-+
-+ # Append the new tag name to the list of available tags.
-+ if test -n "$tagname" ; then
-+ available_tags="$available_tags $tagname"
-+ fi
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+
-+ # Now substitute the updated list of available tags.
-+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-+ mv "${ofile}T" "$ofile"
-+ chmod +x "$ofile"
-+ else
-+ rm -f "${ofile}T"
-+ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-+echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+fi
-+
-+
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+
-+# Prevent multiple expansion
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# Check whether --with-rtsig or --without-rtsig was given.
-+if test "${with_rtsig+set}" = set; then
-+ withval="$with_rtsig"
-+ usertsig=yes
-+else
-+ usertsig=no
-+fi;
-+
-+
-+echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
-+if test "${ac_cv_lib_socket_socket+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsocket $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char socket ();
-+int
-+main ()
-+{
-+socket ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_socket_socket=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_socket_socket=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
-+if test $ac_cv_lib_socket_socket = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSOCKET 1
-+_ACEOF
-+
-+ LIBS="-lsocket $LIBS"
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: checking for inet_aton in -lresolv" >&5
-+echo $ECHO_N "checking for inet_aton in -lresolv... $ECHO_C" >&6
-+if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lresolv $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char inet_aton ();
-+int
-+main ()
-+{
-+inet_aton ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_resolv_inet_aton=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_resolv_inet_aton=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_aton" >&5
-+echo "${ECHO_T}$ac_cv_lib_resolv_inet_aton" >&6
-+if test $ac_cv_lib_resolv_inet_aton = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBRESOLV 1
-+_ACEOF
-+
-+ LIBS="-lresolv $LIBS"
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+if test "${ac_cv_header_stdc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_header_stdc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_stdc=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test $ac_cv_header_stdc = yes; then
-+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <string.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "memchr" >/dev/null 2>&1; then
-+ :
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+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 <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdlib.h>
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "free" >/dev/null 2>&1; then
-+ :
-+else
-+ ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
-+
-+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
-+ :
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <ctype.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+ (('a' <= (c) && (c) <= 'i') \
-+ || ('j' <= (c) && (c) <= 'r') \
-+ || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#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);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ :
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_header_stdc=no
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+if test $ac_cv_header_stdc = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define STDC_HEADERS 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_header in fcntl.h stdarg.h inttypes.h stdint.h poll.h signal.h unistd.h sys/epoll.h sys/time.h sys/queue.h sys/event.h sys/ioctl.h sys/devpoll.h port.h netinet/in6.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+if test "x$ac_cv_header_sys_queue_h" = "xyes"; then
-+ echo "$as_me:$LINENO: checking for TAILQ_FOREACH in sys/queue.h" >&5
-+echo $ECHO_N "checking for TAILQ_FOREACH in sys/queue.h... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <sys/queue.h>
-+#ifdef TAILQ_FOREACH
-+ yes
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "yes" >/dev/null 2>&1; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_TAILQFOREACH 1
-+_ACEOF
-+
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-+ echo "$as_me:$LINENO: checking for timeradd in sys/time.h" >&5
-+echo $ECHO_N "checking for timeradd in sys/time.h... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <sys/time.h>
-+#ifdef timeradd
-+ yes
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "yes" >/dev/null 2>&1; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_TIMERADD 1
-+_ACEOF
-+
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-+ echo "$as_me:$LINENO: checking for timercmp in sys/time.h" >&5
-+echo $ECHO_N "checking for timercmp in sys/time.h... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <sys/time.h>
-+#ifdef timercmp
-+ yes
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "yes" >/dev/null 2>&1; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_TIMERCMP 1
-+_ACEOF
-+
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-+ echo "$as_me:$LINENO: checking for timerclear in sys/time.h" >&5
-+echo $ECHO_N "checking for timerclear in sys/time.h... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <sys/time.h>
-+#ifdef timerclear
-+ yes
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "yes" >/dev/null 2>&1; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_TIMERCLEAR 1
-+_ACEOF
-+
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-+ echo "$as_me:$LINENO: checking for timerisset in sys/time.h" >&5
-+echo $ECHO_N "checking for timerisset in sys/time.h... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#include <sys/time.h>
-+#ifdef timerisset
-+ yes
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "yes" >/dev/null 2>&1; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_TIMERISSET 1
-+_ACEOF
-+
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+echo "$as_me:$LINENO: checking for WIN32" >&5
-+echo $ECHO_N "checking for WIN32... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ #ifndef WIN32
-+ #error
-+ #endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ bwin32=true; echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+bwin32=false; echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+
-+if test x$bwin32 = xtrue; then
-+ BUILD_WIN32_TRUE=
-+ BUILD_WIN32_FALSE='#'
-+else
-+ BUILD_WIN32_TRUE='#'
-+ BUILD_WIN32_FALSE=
-+fi
-+
-+
-+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+if test "${ac_cv_c_const+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+ /* Ultrix mips cc rejects this. */
-+ typedef int charset[2];
-+ const charset x;
-+ /* SunOS 4.1.1 cc rejects this. */
-+ char const *const *ccp;
-+ char **p;
-+ /* NEC SVR4.0.2 mips cc rejects this. */
-+ struct point {int x, y;};
-+ static struct point const zero = {0,0};
-+ /* AIX XL C 1.02.0.0 rejects this.
-+ It does not let you subtract one const X* pointer from another in
-+ an arm of an if-expression whose if-part is not a constant
-+ expression */
-+ const char *g = "string";
-+ ccp = &g + (g ? g-g : 0);
-+ /* HPUX 7.0 cc rejects these. */
-+ ++ccp;
-+ p = (char**) ccp;
-+ ccp = (char const *const *) p;
-+ { /* SCO 3.2v4 cc rejects this. */
-+ char *t;
-+ char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+ *t++ = 0;
-+ }
-+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
-+ int x[] = {25, 17};
-+ const int *foo = &x[0];
-+ ++foo;
-+ }
-+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+ typedef const int *iptr;
-+ iptr p = 0;
-+ ++p;
-+ }
-+ { /* AIX XL C 1.02.0.0 rejects this saying
-+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+ struct s { int j; const int *ap[3]; };
-+ struct s *b; b->j = 5;
-+ }
-+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+ const int foo = 10;
-+ }
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_c_const=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_c_const=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6
-+if test $ac_cv_c_const = no; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define const
-+_ACEOF
-+
-+fi
-+
-+echo "$as_me:$LINENO: checking for inline" >&5
-+echo $ECHO_N "checking for inline... $ECHO_C" >&6
-+if test "${ac_cv_c_inline+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_c_inline=no
-+for ac_kw in inline __inline__ __inline; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifndef __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
-+#endif
-+
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_c_inline=$ac_kw; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6
-+
-+
-+case $ac_cv_c_inline in
-+ inline | yes) ;;
-+ *)
-+ case $ac_cv_c_inline in
-+ no) ac_val=;;
-+ *) ac_val=$ac_cv_c_inline;;
-+ esac
-+ cat >>confdefs.h <<_ACEOF
-+#ifndef __cplusplus
-+#define inline $ac_val
-+#endif
-+_ACEOF
-+ ;;
-+esac
-+
-+echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-+if test "${ac_cv_header_time+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <time.h>
-+
-+int
-+main ()
-+{
-+if ((struct tm *) 0)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_header_time=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_header_time=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-+echo "${ECHO_T}$ac_cv_header_time" >&6
-+if test $ac_cv_header_time = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define TIME_WITH_SYS_TIME 1
-+_ACEOF
-+
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+for ac_func in gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* 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 ();
-+/* 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
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+if test "x$ac_cv_func_clock_gettime" = "xyes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define DNS_USE_CPU_CLOCK_FOR_ID 1
-+_ACEOF
-+
-+else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define DNS_USE_GETTIMEOFDAY_FOR_ID 1
-+_ACEOF
-+
-+fi
-+
-+echo "$as_me:$LINENO: checking for F_SETFD in fcntl.h" >&5
-+echo $ECHO_N "checking for F_SETFD in fcntl.h... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+#ifdef F_SETFD
-+yes
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "yes" >/dev/null 2>&1; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_SETFD 1
-+_ACEOF
-+
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+rm -f conftest*
-+
-+
-+needsignal=no
-+haveselect=no
-+
-+for ac_func in select
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* 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 ();
-+/* 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
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ haveselect=yes
-+fi
-+done
-+
-+if test "x$haveselect" = "xyes" ; then
-+ case $LIBOBJS in
-+ "select.$ac_objext" | \
-+ *" select.$ac_objext" | \
-+ "select.$ac_objext "* | \
-+ *" select.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS select.$ac_objext" ;;
-+esac
-+
-+ needsignal=yes
-+fi
-+
-+havepoll=no
-+havertsig=no
-+
-+for ac_func in poll
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* 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 ();
-+/* 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
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ havepoll=yes
-+fi
-+done
-+
-+if test "x$havepoll" = "xyes" ; then
-+ case $LIBOBJS in
-+ "poll.$ac_objext" | \
-+ *" poll.$ac_objext" | \
-+ "poll.$ac_objext "* | \
-+ *" poll.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS poll.$ac_objext" ;;
-+esac
-+
-+ needsignal=yes
-+
-+ if test "x$usertsig" = "xyes" ; then
-+
-+for ac_func in sigtimedwait
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* 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 ();
-+/* 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
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ havertsig=yes
-+fi
-+done
-+
-+ fi
-+fi
-+if test "x$havertsig" = "xyes" ; then
-+ echo "$as_me:$LINENO: checking for F_SETSIG in fcntl.h" >&5
-+echo $ECHO_N "checking for F_SETSIG in fcntl.h... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+#ifdef F_SETSIG
-+yes
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "yes" >/dev/null 2>&1; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; havertsig=no
-+fi
-+rm -f conftest*
-+
-+fi
-+if test "x$havertsig" = "xyes" ; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_RTSIG 1
-+_ACEOF
-+
-+ case $LIBOBJS in
-+ "rtsig.$ac_objext" | \
-+ *" rtsig.$ac_objext" | \
-+ "rtsig.$ac_objext "* | \
-+ *" rtsig.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS rtsig.$ac_objext" ;;
-+esac
-+
-+ echo "$as_me:$LINENO: checking for working rtsig on pipes" >&5
-+echo $ECHO_N "checking for working rtsig on pipes... $ECHO_C" >&6
-+ if test "$cross_compiling" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run test program while cross compiling
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+#include <signal.h>
-+#include <unistd.h>
-+
-+int sigio()
-+{
-+ exit(0);
-+}
-+
-+int main()
-+{
-+ int fd[2];
-+
-+ pipe(fd);
-+ signal(SIGIO, sigio);
-+ fcntl(fd[0], F_SETOWN, getpid());
-+ fcntl(fd[0], F_SETSIG, SIGIO);
-+ fcntl(fd[0], F_SETFL, fcntl(fd[0], F_GETFL) | O_ASYNC);
-+ write(fd[1], "", 1);
-+ return 1;
-+}
-+
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_WORKING_RTSIG 1
-+_ACEOF
-+
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+fi
-+
-+haveepoll=no
-+
-+for ac_func in epoll_ctl
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* 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 ();
-+/* 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
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ haveepoll=yes
-+fi
-+done
-+
-+if test "x$haveepoll" = "xyes" ; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_EPOLL 1
-+_ACEOF
-+
-+ case $LIBOBJS in
-+ "epoll.$ac_objext" | \
-+ *" epoll.$ac_objext" | \
-+ "epoll.$ac_objext "* | \
-+ *" epoll.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS epoll.$ac_objext" ;;
-+esac
-+
-+ needsignal=yes
-+fi
-+
-+havedevpoll=no
-+if test "x$ac_cv_header_sys_devpoll_h" = "xyes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_DEVPOLL 1
-+_ACEOF
-+
-+ case $LIBOBJS in
-+ "devpoll.$ac_objext" | \
-+ *" devpoll.$ac_objext" | \
-+ "devpoll.$ac_objext "* | \
-+ *" devpoll.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS devpoll.$ac_objext" ;;
-+esac
-+
-+fi
-+
-+havekqueue=no
-+if test "x$ac_cv_header_sys_event_h" = "xyes"; then
-+
-+for ac_func in kqueue
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* 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 ();
-+/* 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
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ havekqueue=yes
-+fi
-+done
-+
-+ if test "x$havekqueue" = "xyes" ; then
-+ echo "$as_me:$LINENO: checking for working kqueue" >&5
-+echo $ECHO_N "checking for working kqueue... $ECHO_C" >&6
-+ if test "$cross_compiling" = yes; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <sys/event.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+
-+int
-+main(int argc, char **argv)
-+{
-+ int kq;
-+ int n;
-+ int fd[2];
-+ struct kevent ev;
-+ struct timespec ts;
-+ char buf[8000];
-+
-+ if (pipe(fd) == -1)
-+ exit(1);
-+ if (fcntl(fd[1], F_SETFL, O_NONBLOCK) == -1)
-+ exit(1);
-+
-+ while ((n = write(fd[1], buf, sizeof(buf))) == sizeof(buf))
-+ ;
-+
-+ if ((kq = kqueue()) == -1)
-+ exit(1);
-+
-+ ev.ident = fd[1];
-+ ev.filter = EVFILT_WRITE;
-+ ev.flags = EV_ADD | EV_ENABLE;
-+ n = kevent(kq, &ev, 1, NULL, 0, NULL);
-+ if (n == -1)
-+ exit(1);
-+
-+ read(fd[0], buf, sizeof(buf));
-+
-+ ts.tv_sec = 0;
-+ ts.tv_nsec = 0;
-+ n = kevent(kq, NULL, 0, &ev, 1, &ts);
-+ if (n == -1 || n == 0)
-+ exit(1);
-+
-+ exit(0);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_WORKING_KQUEUE 1
-+_ACEOF
-+
-+ case $LIBOBJS in
-+ "kqueue.$ac_objext" | \
-+ *" kqueue.$ac_objext" | \
-+ "kqueue.$ac_objext "* | \
-+ *" kqueue.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS kqueue.$ac_objext" ;;
-+esac
-+
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+ fi
-+fi
-+
-+haveepollsyscall=no
-+if test "x$ac_cv_header_sys_epoll_h" = "xyes"; then
-+ if test "x$haveepoll" = "xno" ; then
-+ echo "$as_me:$LINENO: checking for epoll system call" >&5
-+echo $ECHO_N "checking for epoll system call... $ECHO_C" >&6
-+ if test "$cross_compiling" = yes; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdint.h>
-+#include <sys/param.h>
-+#include <sys/types.h>
-+#include <sys/syscall.h>
-+#include <sys/epoll.h>
-+#include <unistd.h>
-+
-+int
-+epoll_create(int size)
-+{
-+ return (syscall(__NR_epoll_create, size));
-+}
-+
-+int
-+main(int argc, char **argv)
-+{
-+ int epfd;
-+
-+ epfd = epoll_create(256);
-+ exit (epfd == -1 ? 1 : 0);
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_EPOLL 1
-+_ACEOF
-+
-+ needsignal=yes
-+ case $LIBOBJS in
-+ "epoll_sub.$ac_objext" | \
-+ *" epoll_sub.$ac_objext" | \
-+ "epoll_sub.$ac_objext "* | \
-+ *" epoll_sub.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS epoll_sub.$ac_objext" ;;
-+esac
-+
-+ case $LIBOBJS in
-+ "epoll.$ac_objext" | \
-+ *" epoll.$ac_objext" | \
-+ "epoll.$ac_objext "* | \
-+ *" epoll.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS epoll.$ac_objext" ;;
-+esac
-+
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+ fi
-+fi
-+
-+haveeventports=no
-+
-+for ac_func in port_create
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* 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 ();
-+/* 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
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ eval "$as_ac_var=yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+ haveeventports=yes
-+fi
-+done
-+
-+if test "x$haveeventports" = "xyes" ; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_EVENT_PORTS 1
-+_ACEOF
-+
-+ case $LIBOBJS in
-+ "evport.$ac_objext" | \
-+ *" evport.$ac_objext" | \
-+ "evport.$ac_objext "* | \
-+ *" evport.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS evport.$ac_objext" ;;
-+esac
-+
-+ needsignal=yes
-+fi
-+if test "x$needsignal" = "xyes" ; then
-+ case $LIBOBJS in
-+ "signal.$ac_objext" | \
-+ *" signal.$ac_objext" | \
-+ "signal.$ac_objext "* | \
-+ *" signal.$ac_objext "* ) ;;
-+ *) LIBOBJS="$LIBOBJS signal.$ac_objext" ;;
-+esac
-+
-+fi
-+
-+echo "$as_me:$LINENO: checking for pid_t" >&5
-+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-+if test "${ac_cv_type_pid_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((pid_t *) 0)
-+ return 0;
-+if (sizeof (pid_t))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_pid_t=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_pid_t=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-+echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-+if test $ac_cv_type_pid_t = yes; then
-+ :
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define pid_t int
-+_ACEOF
-+
-+fi
-+
-+echo "$as_me:$LINENO: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-+if test "${ac_cv_type_size_t+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if ((size_t *) 0)
-+ return 0;
-+if (sizeof (size_t))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_size_t=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_size_t=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6
-+if test $ac_cv_type_size_t = yes; then
-+ :
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned
-+_ACEOF
-+
-+fi
-+
-+echo "$as_me:$LINENO: checking for struct in6_addr" >&5
-+echo $ECHO_N "checking for struct in6_addr... $ECHO_C" >&6
-+if test "${ac_cv_type_struct_in6_addr+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <sys/socket.h>
-+#endif
-+#ifdef HAVE_NETINET_IN6_H
-+#include <netinet/in6.h>
-+#endif
-+
-+int
-+main ()
-+{
-+if ((struct in6_addr *) 0)
-+ return 0;
-+if (sizeof (struct in6_addr))
-+ return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_struct_in6_addr=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_struct_in6_addr=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_type_struct_in6_addr" >&5
-+echo "${ECHO_T}$ac_cv_type_struct_in6_addr" >&6
-+if test $ac_cv_type_struct_in6_addr = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_IN6_ADDR 1
-+_ACEOF
-+
-+
-+fi
-+
-+
-+echo "$as_me:$LINENO: checking for socklen_t" >&5
-+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-+int
-+main ()
-+{
-+socklen_t x;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define socklen_t unsigned int
-+_ACEOF
-+
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+echo "$as_me:$LINENO: checking whether our compiler supports __func__" >&5
-+echo $ECHO_N "checking whether our compiler supports __func__... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+void foo() { const char *cp = __func__; }
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ echo "$as_me:$LINENO: checking whether our compiler supports __FUNCTION__" >&5
-+echo $ECHO_N "checking whether our compiler supports __FUNCTION__... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+void foo() { const char *cp = __FUNCTION__; }
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define __func__ __FUNCTION__
-+_ACEOF
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define __func__ __FILE__
-+_ACEOF
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+ ac_config_files="$ac_config_files Makefile"
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems. If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, don't put newlines in cache variables' values.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+{
-+ (set) 2>&1 |
-+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
-+ *ac_space=\ *)
-+ # `set' does not quote correctly, so add quotes (double-quote
-+ # substitution turns \\\\ into \\, and sed turns \\ into \).
-+ sed -n \
-+ "s/'/'\\\\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+ ;;
-+ *)
-+ # `set' quotes correctly as required by POSIX, so do not add quotes.
-+ sed -n \
-+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ ;;
-+ esac;
-+} |
-+ sed '
-+ t clear
-+ : clear
-+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+ t end
-+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ : end' >>confcache
-+if diff $cache_file confcache >/dev/null 2>&1; then :; else
-+ if test -w $cache_file; then
-+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+ cat confcache >$cache_file
-+ else
-+ echo "not updating unwritable cache $cache_file"
-+ fi
-+fi
-+rm -f confcache
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/;
-+s/:*\${srcdir}:*/:/;
-+s/:*@srcdir@:*/:/;
-+s/^\([^=]*=[ ]*\):*/\1/;
-+s/:*$//;
-+s/^[^=]*=[ ]*$//;
-+}'
-+fi
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-+ # 1. Remove the extension, and $U if already installed.
-+ ac_i=`echo "$ac_i" |
-+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-+ # 2. Add them.
-+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+done
-+LIBOBJS=$ac_libobjs
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${BUILD_WIN32_TRUE}" && test -z "${BUILD_WIN32_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_WIN32\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"BUILD_WIN32\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+: ${CONFIG_STATUS=./config.status}
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
-+
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+## --------------------- ##
-+## M4sh Initialization. ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+ set -o posix
-+fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+# Support unset when possible.
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-+
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+$as_unset ENV MAIL MAILPATH
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+ as_basename=basename
-+else
-+ as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)$' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+ /^X\/\(\/\/\)$/{ s//\1/; q; }
-+ /^X\/\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+
-+
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
-+fi
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" || {
-+ # Find who we are. Look in the path if we contain no path at all
-+ # relative or not.
-+ case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+
-+ ;;
-+ esac
-+ # We did not find ourselves, most probably we were run as `sh COMMAND'
-+ # in which case we are not to be found in the path.
-+ if test "x$as_myself" = x; then
-+ as_myself=$0
-+ fi
-+ if test ! -f "$as_myself"; then
-+ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ case $CONFIG_SHELL in
-+ '')
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for as_base in sh bash ksh sh5; do
-+ case $as_dir in
-+ /*)
-+ if ("$as_dir/$as_base" -c '
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-+ CONFIG_SHELL=$as_dir/$as_base
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-+ fi;;
-+ esac
-+ done
-+done
-+;;
-+ esac
-+
-+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-+ # uniformly replaced by the line number. The first 'sed' inserts a
-+ # line-number line before each line; the second 'sed' does the real
-+ # work. The second script uses 'N' to pair each line-number line
-+ # with the numbered line, and appends trailing '-' during
-+ # substitution so that $LINENO is not a special case at line end.
-+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-+ sed '=' <$as_myself |
-+ sed '
-+ N
-+ s,$,-,
-+ : loop
-+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ t loop
-+ s,-$,,
-+ s,^['$as_cr_digits']*\n,,
-+ ' >$as_me.lineno &&
-+ chmod +x $as_me.lineno ||
-+ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+ # Don't try to exec as it changes $[0], causing all sort of problems
-+ # (the dirname of $[0] is not the place where we might find the
-+ # original and so on. Autoconf is especially sensible to this).
-+ . ./$as_me.lineno
-+ # Exit status is that of the last command.
-+ exit
-+}
-+
-+
-+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-+ *c*,-n*) ECHO_N= ECHO_C='
-+' ECHO_T=' ' ;;
-+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+esac
-+
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+echo >conf$$.file
-+if ln -s conf$$.file conf$$ 2>/dev/null; then
-+ # We could just check for DJGPP; but this test a) works b) is more generic
-+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-+ if test -f conf$$.exe; then
-+ # Don't use ln at all; we don't have any links
-+ as_ln_s='cp -p'
-+ else
-+ as_ln_s='ln -s'
-+ fi
-+elif ln conf$$.file conf$$ 2>/dev/null; then
-+ as_ln_s=ln
-+else
-+ as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.file
-+
-+if mkdir -p . 2>/dev/null; then
-+ as_mkdir_p=:
-+else
-+ test -d ./-p && rmdir ./-p
-+ as_mkdir_p=false
-+fi
-+
-+as_executable_p="test -f"
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.
-+as_nl='
-+'
-+IFS=" $as_nl"
-+
-+# CDPATH.
-+$as_unset CDPATH
-+
-+exec 6>&1
-+
-+# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# report actual input values of CONFIG_FILES etc. instead of their
-+# values after options handling. Logging --version etc. is OK.
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+} >&5
-+cat >&5 <<_CSEOF
-+
-+This file was extended by $as_me, which was
-+generated by GNU Autoconf 2.59. Invocation command line was
-+
-+ CONFIG_FILES = $CONFIG_FILES
-+ CONFIG_HEADERS = $CONFIG_HEADERS
-+ CONFIG_LINKS = $CONFIG_LINKS
-+ CONFIG_COMMANDS = $CONFIG_COMMANDS
-+ $ $0 $@
-+
-+_CSEOF
-+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-+echo >&5
-+_ACEOF
-+
-+# Files that config.status was made for.
-+if test -n "$ac_config_files"; then
-+ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_headers"; then
-+ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_links"; then
-+ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-+fi
-+
-+if test -n "$ac_config_commands"; then
-+ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-+fi
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+ac_cs_usage="\
-+\`$as_me' instantiates files from templates according to the
-+current configuration.
-+
-+Usage: $0 [OPTIONS] [FILE]...
-+
-+ -h, --help print this help, then exit
-+ -V, --version print version number, then exit
-+ -q, --quiet do not print progress messages
-+ -d, --debug don't remove temporary files
-+ --recheck update $as_me by reconfiguring in the same conditions
-+ --file=FILE[:TEMPLATE]
-+ instantiate the configuration file FILE
-+ --header=FILE[:TEMPLATE]
-+ instantiate the configuration header FILE
-+
-+Configuration files:
-+$config_files
-+
-+Configuration headers:
-+$config_headers
-+
-+Configuration commands:
-+$config_commands
-+
-+Report bugs to <bug-autoconf@gnu.org>."
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ac_cs_version="\\
-+config.status
-+configured by $0, generated by GNU Autoconf 2.59,
-+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+
-+Copyright (C) 2003 Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
-+srcdir=$srcdir
-+INSTALL="$INSTALL"
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If no file are specified by the user, then we need to provide default
-+# value. By we need to know if files were specified by the user.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+ case $1 in
-+ --*=*)
-+ ac_option=`expr "x$1" : 'x\([^=]*\)='`
-+ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+ ac_shift=:
-+ ;;
-+ -*)
-+ ac_option=$1
-+ ac_optarg=$2
-+ ac_shift=shift
-+ ;;
-+ *) # This is not an option, so the user has probably given explicit
-+ # arguments.
-+ ac_option=$1
-+ ac_need_defaults=false;;
-+ esac
-+
-+ case $ac_option in
-+ # Handling of the options.
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+ ac_cs_recheck=: ;;
-+ --version | --vers* | -V )
-+ echo "$ac_cs_version"; exit 0 ;;
-+ --he | --h)
-+ # Conflict between --help and --header
-+ { { echo "$as_me:$LINENO: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&5
-+echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ --help | --hel | -h )
-+ echo "$ac_cs_usage"; exit 0 ;;
-+ --debug | --d* | -d )
-+ debug=: ;;
-+ --file | --fil | --fi | --f )
-+ $ac_shift
-+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+ ac_need_defaults=false;;
-+ --header | --heade | --head | --hea )
-+ $ac_shift
-+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+ ac_need_defaults=false;;
-+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+ ac_cs_silent=: ;;
-+
-+ # This is an error.
-+ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&5
-+echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+
-+ *) ac_config_targets="$ac_config_targets $1" ;;
-+
-+ esac
-+ shift
-+done
-+
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+ exec 6>/dev/null
-+ ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+if \$ac_cs_recheck; then
-+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+fi
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+#
-+# INIT-COMMANDS section.
-+#
-+
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-+
-+_ACEOF
-+
-+
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+for ac_config_target in $ac_config_targets
-+do
-+ case "$ac_config_target" in
-+ # Handling of arguments.
-+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+done
-+
-+# If the user did not use the arguments to specify the items to instantiate,
-+# then the envvar interface is used. Set only those that are not.
-+# We use the long form for the default assignment because of an extremely
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-+fi
-+
-+# Have a temporary directory for convenience. Make it in the build tree
-+# simply because there is no reason to put it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# Create a temporary directory, and hook for its removal unless debugging.
-+$debug ||
-+{
-+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ trap '{ (exit 1); exit 1; }' 1 2 13 15
-+}
-+
-+# Create a (secure) tmp directory for tmp files.
-+
-+{
-+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+ test -n "$tmp" && test -d "$tmp"
-+} ||
-+{
-+ tmp=./confstat$$-$RANDOM
-+ (umask 077 && mkdir $tmp)
-+} ||
-+{
-+ echo "$me: cannot create a temporary directory in ." >&2
-+ { (exit 1); exit 1; }
-+}
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+
-+#
-+# CONFIG_FILES section.
-+#
-+
-+# No need to generate the scripts if there are no CONFIG_FILES.
-+# This happens for instance when ./config.status config.h
-+if test -n "\$CONFIG_FILES"; then
-+ # Protect against being on the right side of a sed subst in config.status.
-+ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-+ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-+s,@SHELL@,$SHELL,;t t
-+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-+s,@exec_prefix@,$exec_prefix,;t t
-+s,@prefix@,$prefix,;t t
-+s,@program_transform_name@,$program_transform_name,;t t
-+s,@bindir@,$bindir,;t t
-+s,@sbindir@,$sbindir,;t t
-+s,@libexecdir@,$libexecdir,;t t
-+s,@datadir@,$datadir,;t t
-+s,@sysconfdir@,$sysconfdir,;t t
-+s,@sharedstatedir@,$sharedstatedir,;t t
-+s,@localstatedir@,$localstatedir,;t t
-+s,@libdir@,$libdir,;t t
-+s,@includedir@,$includedir,;t t
-+s,@oldincludedir@,$oldincludedir,;t t
-+s,@infodir@,$infodir,;t t
-+s,@mandir@,$mandir,;t t
-+s,@build_alias@,$build_alias,;t t
-+s,@host_alias@,$host_alias,;t t
-+s,@target_alias@,$target_alias,;t t
-+s,@DEFS@,$DEFS,;t t
-+s,@ECHO_C@,$ECHO_C,;t t
-+s,@ECHO_N@,$ECHO_N,;t t
-+s,@ECHO_T@,$ECHO_T,;t t
-+s,@LIBS@,$LIBS,;t t
-+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-+s,@CYGPATH_W@,$CYGPATH_W,;t t
-+s,@PACKAGE@,$PACKAGE,;t t
-+s,@VERSION@,$VERSION,;t t
-+s,@ACLOCAL@,$ACLOCAL,;t t
-+s,@AUTOCONF@,$AUTOCONF,;t t
-+s,@AUTOMAKE@,$AUTOMAKE,;t t
-+s,@AUTOHEADER@,$AUTOHEADER,;t t
-+s,@MAKEINFO@,$MAKEINFO,;t t
-+s,@install_sh@,$install_sh,;t t
-+s,@STRIP@,$STRIP,;t t
-+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-+s,@mkdir_p@,$mkdir_p,;t t
-+s,@AWK@,$AWK,;t t
-+s,@SET_MAKE@,$SET_MAKE,;t t
-+s,@am__leading_dot@,$am__leading_dot,;t t
-+s,@AMTAR@,$AMTAR,;t t
-+s,@am__tar@,$am__tar,;t t
-+s,@am__untar@,$am__untar,;t t
-+s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-+s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-+s,@MAINT@,$MAINT,;t t
-+s,@CC@,$CC,;t t
-+s,@CFLAGS@,$CFLAGS,;t t
-+s,@LDFLAGS@,$LDFLAGS,;t t
-+s,@CPPFLAGS@,$CPPFLAGS,;t t
-+s,@ac_ct_CC@,$ac_ct_CC,;t t
-+s,@EXEEXT@,$EXEEXT,;t t
-+s,@OBJEXT@,$OBJEXT,;t t
-+s,@DEPDIR@,$DEPDIR,;t t
-+s,@am__include@,$am__include,;t t
-+s,@am__quote@,$am__quote,;t t
-+s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-+s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-+s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-+s,@CCDEPMODE@,$CCDEPMODE,;t t
-+s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-+s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-+s,@LN_S@,$LN_S,;t t
-+s,@CPP@,$CPP,;t t
-+s,@EGREP@,$EGREP,;t t
-+s,@build@,$build,;t t
-+s,@build_cpu@,$build_cpu,;t t
-+s,@build_vendor@,$build_vendor,;t t
-+s,@build_os@,$build_os,;t t
-+s,@host@,$host,;t t
-+s,@host_cpu@,$host_cpu,;t t
-+s,@host_vendor@,$host_vendor,;t t
-+s,@host_os@,$host_os,;t t
-+s,@ECHO@,$ECHO,;t t
-+s,@AR@,$AR,;t t
-+s,@ac_ct_AR@,$ac_ct_AR,;t t
-+s,@RANLIB@,$RANLIB,;t t
-+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-+s,@CXX@,$CXX,;t t
-+s,@CXXFLAGS@,$CXXFLAGS,;t t
-+s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-+s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-+s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-+s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-+s,@CXXCPP@,$CXXCPP,;t t
-+s,@F77@,$F77,;t t
-+s,@FFLAGS@,$FFLAGS,;t t
-+s,@ac_ct_F77@,$ac_ct_F77,;t t
-+s,@LIBTOOL@,$LIBTOOL,;t t
-+s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
-+s,@BUILD_WIN32_TRUE@,$BUILD_WIN32_TRUE,;t t
-+s,@BUILD_WIN32_FALSE@,$BUILD_WIN32_FALSE,;t t
-+s,@LIBOBJS@,$LIBOBJS,;t t
-+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-+CEOF
-+
-+_ACEOF
-+
-+ cat >>$CONFIG_STATUS <<\_ACEOF
-+ # Split the substitutions into bite-sized pieces for seds with
-+ # small command number limits, like on Digital OSF/1 and HP-UX.
-+ ac_max_sed_lines=48
-+ ac_sed_frag=1 # Number of current file.
-+ ac_beg=1 # First line for current file.
-+ ac_end=$ac_max_sed_lines # Line after last line for current file.
-+ ac_more_lines=:
-+ ac_sed_cmds=
-+ while $ac_more_lines; do
-+ if test $ac_beg -gt 1; then
-+ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+ else
-+ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+ fi
-+ if test ! -s $tmp/subs.frag; then
-+ ac_more_lines=false
-+ else
-+ # The purpose of the label and of the branching condition is to
-+ # speed up the sed processing (if there are no `@' at all, there
-+ # is no need to browse any of the substitutions).
-+ # These are the two extra sed commands mentioned above.
-+ (echo ':t
-+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+ if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+ else
-+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+ fi
-+ ac_sed_frag=`expr $ac_sed_frag + 1`
-+ ac_beg=$ac_end
-+ ac_end=`expr $ac_end + $ac_max_sed_lines`
-+ fi
-+ done
-+ if test -z "$ac_sed_cmds"; then
-+ ac_sed_cmds=cat
-+ fi
-+fi # test -n "$CONFIG_FILES"
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+ case $ac_file in
-+ - | *:- | *:-:* ) # input from stdin
-+ cat >$tmp/stdin
-+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ * ) ac_file_in=$ac_file.in ;;
-+ esac
-+
-+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_file" : 'X\(//\)[^/]' \| \
-+ X"$ac_file" : 'X\(//\)$' \| \
-+ X"$ac_file" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$ac_file" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ { if $as_mkdir_p; then
-+ mkdir -p "$ac_dir"
-+ else
-+ as_dir="$ac_dir"
-+ as_dirs=
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ done
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+
-+ ac_builddir=.
-+
-+if test "$ac_dir" != .; then
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ # A "../" for each directory in $ac_dir_suffix.
-+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
-+ *) # Relative path.
-+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-+
-+
-+ case $INSTALL in
-+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+ esac
-+
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
-+ # Let's still pretend it is `configure' which instantiates (i.e., don't
-+ # use $as_me), people would be surprised to read:
-+ # /* config.h. Generated by config.status. */
-+ if test x"$ac_file" = x-; then
-+ configure_input=
-+ else
-+ configure_input="$ac_file. "
-+ fi
-+ configure_input=$configure_input"Generated from `echo $ac_file_in |
-+ sed 's,.*/,,'` by configure."
-+
-+ # First look for the input files in the build tree, otherwise in the
-+ # src tree.
-+ ac_file_inputs=`IFS=:
-+ for f in $ac_file_in; do
-+ case $f in
-+ -) echo $tmp/stdin ;;
-+ [\\/$]*)
-+ # Absolute (can't be DOS-style, as IFS=:)
-+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ echo "$f";;
-+ *) # Relative
-+ if test -f "$f"; then
-+ # Build tree
-+ echo "$f"
-+ elif test -f "$srcdir/$f"; then
-+ # Source tree
-+ echo "$srcdir/$f"
-+ else
-+ # /dev/null tree
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi;;
-+ esac
-+ done` || { (exit 1); exit 1; }
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+ sed "$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s,@configure_input@,$configure_input,;t t
-+s,@srcdir@,$ac_srcdir,;t t
-+s,@abs_srcdir@,$ac_abs_srcdir,;t t
-+s,@top_srcdir@,$ac_top_srcdir,;t t
-+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-+s,@builddir@,$ac_builddir,;t t
-+s,@abs_builddir@,$ac_abs_builddir,;t t
-+s,@top_builddir@,$ac_top_builddir,;t t
-+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-+s,@INSTALL@,$ac_INSTALL,;t t
-+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-+ rm -f $tmp/stdin
-+ if test x"$ac_file" != x-; then
-+ mv $tmp/out $ac_file
-+ else
-+ cat $tmp/out
-+ rm -f $tmp/out
-+ fi
-+
-+done
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+#
-+# CONFIG_HEADER section.
-+#
-+
-+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-+# NAME is the cpp macro being defined and VALUE is the value it is being given.
-+#
-+# ac_d sets the value in "#define NAME VALUE" lines.
-+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-+ac_dB='[ ].*$,\1#\2'
-+ac_dC=' '
-+ac_dD=',;t'
-+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-+ac_uB='$,\1#\2define\3'
-+ac_uC=' '
-+ac_uD=',;t'
-+
-+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+ case $ac_file in
-+ - | *:- | *:-:* ) # input from stdin
-+ cat >$tmp/stdin
-+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+ * ) ac_file_in=$ac_file.in ;;
-+ esac
-+
-+ test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+
-+ # First look for the input files in the build tree, otherwise in the
-+ # src tree.
-+ ac_file_inputs=`IFS=:
-+ for f in $ac_file_in; do
-+ case $f in
-+ -) echo $tmp/stdin ;;
-+ [\\/$]*)
-+ # Absolute (can't be DOS-style, as IFS=:)
-+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ # Do quote $f, to prevent DOS paths from being IFS'd.
-+ echo "$f";;
-+ *) # Relative
-+ if test -f "$f"; then
-+ # Build tree
-+ echo "$f"
-+ elif test -f "$srcdir/$f"; then
-+ # Source tree
-+ echo "$srcdir/$f"
-+ else
-+ # /dev/null tree
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+echo "$as_me: error: cannot find input file: $f" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi;;
-+ esac
-+ done` || { (exit 1); exit 1; }
-+ # Remove the trailing spaces.
-+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-+
-+_ACEOF
-+
-+# Transform confdefs.h into two sed scripts, `conftest.defines' and
-+# `conftest.undefs', that substitutes the proper values into
-+# config.h.in to produce config.h. The first handles `#define'
-+# templates, and the second `#undef' templates.
-+# And first: Protect against being on the right side of a sed subst in
-+# config.status. Protect against being in an unquoted here document
-+# in config.status.
-+rm -f conftest.defines conftest.undefs
-+# Using a here document instead of a string reduces the quoting nightmare.
-+# Putting comments in sed scripts is not portable.
-+#
-+# `end' is used to avoid that the second main sed command (meant for
-+# 0-ary CPP macros) applies to n-ary macro definitions.
-+# See the Autoconf documentation for `clear'.
-+cat >confdef2sed.sed <<\_ACEOF
-+s/[\\&,]/\\&/g
-+s,[\\$`],\\&,g
-+t clear
-+: clear
-+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-+t end
-+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-+: end
-+_ACEOF
-+# If some macros were called several times there might be several times
-+# the same #defines, which is useless. Nevertheless, we may not want to
-+# sort them, since we want the *last* AC-DEFINE to be honored.
-+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-+rm -f confdef2sed.sed
-+
-+# This sed command replaces #undef with comments. This is necessary, for
-+# example, in the case of _POSIX_SOURCE, which is predefined and required
-+# on some systems where configure will not decide to define it.
-+cat >>conftest.undefs <<\_ACEOF
-+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-+_ACEOF
-+
-+# Break up conftest.defines because some shells have a limit on the size
-+# of here documents, and old seds have small limits too (100 cmds).
-+echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-+echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-+echo ' :' >>$CONFIG_STATUS
-+rm -f conftest.tail
-+while grep . conftest.defines >/dev/null
-+do
-+ # Write a limited-size here document to $tmp/defines.sed.
-+ echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-+ # Speed up: don't consider the non `#define' lines.
-+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
-+ # Work around the forget-to-reset-the-flag bug.
-+ echo 't clr' >>$CONFIG_STATUS
-+ echo ': clr' >>$CONFIG_STATUS
-+ sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+ echo 'CEOF
-+ sed -f $tmp/defines.sed $tmp/in >$tmp/out
-+ rm -f $tmp/in
-+ mv $tmp/out $tmp/in
-+' >>$CONFIG_STATUS
-+ sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+ rm -f conftest.defines
-+ mv conftest.tail conftest.defines
-+done
-+rm -f conftest.defines
-+echo ' fi # grep' >>$CONFIG_STATUS
-+echo >>$CONFIG_STATUS
-+
-+# Break up conftest.undefs because some shells have a limit on the size
-+# of here documents, and old seds have small limits too (100 cmds).
-+echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
-+rm -f conftest.tail
-+while grep . conftest.undefs >/dev/null
-+do
-+ # Write a limited-size here document to $tmp/undefs.sed.
-+ echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-+ # Speed up: don't consider the non `#undef'
-+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
-+ # Work around the forget-to-reset-the-flag bug.
-+ echo 't clr' >>$CONFIG_STATUS
-+ echo ': clr' >>$CONFIG_STATUS
-+ sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-+ echo 'CEOF
-+ sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-+ rm -f $tmp/in
-+ mv $tmp/out $tmp/in
-+' >>$CONFIG_STATUS
-+ sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-+ rm -f conftest.undefs
-+ mv conftest.tail conftest.undefs
-+done
-+rm -f conftest.undefs
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+ # Let's still pretend it is `configure' which instantiates (i.e., don't
-+ # use $as_me), people would be surprised to read:
-+ # /* config.h. Generated by config.status. */
-+ if test x"$ac_file" = x-; then
-+ echo "/* Generated by configure. */" >$tmp/config.h
-+ else
-+ echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
-+ fi
-+ cat $tmp/in >>$tmp/config.h
-+ rm -f $tmp/in
-+ if test x"$ac_file" != x-; then
-+ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-+echo "$as_me: $ac_file is unchanged" >&6;}
-+ else
-+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_file" : 'X\(//\)[^/]' \| \
-+ X"$ac_file" : 'X\(//\)$' \| \
-+ X"$ac_file" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$ac_file" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ { if $as_mkdir_p; then
-+ mkdir -p "$ac_dir"
-+ else
-+ as_dir="$ac_dir"
-+ as_dirs=
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ done
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+
-+ rm -f $ac_file
-+ mv $tmp/config.h $ac_file
-+ fi
-+ else
-+ cat $tmp/config.h
-+ rm -f $tmp/config.h
-+ fi
-+# Compute $ac_file's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+ case $_am_header in
-+ $ac_file | $ac_file:* )
-+ break ;;
-+ * )
-+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+ esac
-+done
-+echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X$ac_file : 'X\(//\)[^/]' \| \
-+ X$ac_file : 'X\(//\)$' \| \
-+ X$ac_file : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X$ac_file |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`/stamp-h$_am_stamp_count
-+done
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+#
-+# CONFIG_COMMANDS section.
-+#
-+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+ ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_dest" : 'X\(//\)[^/]' \| \
-+ X"$ac_dest" : 'X\(//\)$' \| \
-+ X"$ac_dest" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$ac_dest" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ { if $as_mkdir_p; then
-+ mkdir -p "$ac_dir"
-+ else
-+ as_dir="$ac_dir"
-+ as_dirs=
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ done
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+
-+ ac_builddir=.
-+
-+if test "$ac_dir" != .; then
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+ # A "../" for each directory in $ac_dir_suffix.
-+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+else
-+ ac_dir_suffix= ac_top_builddir=
-+fi
-+
-+case $srcdir in
-+ .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+ if test -z "$ac_top_builddir"; then
-+ ac_top_srcdir=.
-+ else
-+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+ fi ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+ ac_top_srcdir=$srcdir ;;
-+ *) # Relative path.
-+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+esac
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-+
-+
-+ { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-+echo "$as_me: executing $ac_dest commands" >&6;}
-+ case $ac_dest in
-+ depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+ # Strip MF so we end up with the name of the file.
-+ mf=`echo "$mf" | sed -e 's/:.*$//'`
-+ # Check whether this is an Automake generated Makefile or not.
-+ # We used to match only the files named `Makefile.in', but
-+ # some people rename them; so instead we look at the file content.
-+ # Grep'ing the first line is not enough: some people post-process
-+ # each Makefile.in and add a new line on top of each file to say so.
-+ # So let's grep whole file.
-+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+ dirpart=`(dirname "$mf") 2>/dev/null ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$mf" : 'X\(//\)[^/]' \| \
-+ X"$mf" : 'X\(//\)$' \| \
-+ X"$mf" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$mf" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ else
-+ continue
-+ fi
-+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+ test -z "$DEPDIR" && continue
-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+ test -z "am__include" && continue
-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+ # When using ansi2knr, U may be empty or an underscore; expand it
-+ U=`sed -n 's/^U = //p' < "$mf"`
-+ # Find all dependency output files, they are included files with
-+ # $(DEPDIR) in their names. We invoke sed twice because it is the
-+ # simplest approach to changing $(DEPDIR) to its actual value in the
-+ # expansion.
-+ for file in `sed -n "
-+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+ # Make sure the directory exists.
-+ test -f "$dirpart/$file" && continue
-+ fdir=`(dirname "$file") 2>/dev/null ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$file" : 'X\(//\)[^/]' \| \
-+ X"$file" : 'X\(//\)$' \| \
-+ X"$file" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$file" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ { if $as_mkdir_p; then
-+ mkdir -p $dirpart/$fdir
-+ else
-+ as_dir=$dirpart/$fdir
-+ as_dirs=
-+ while test ! -d "$as_dir"; do
-+ as_dirs="$as_dir $as_dirs"
-+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+ X"$as_dir" : 'X\(/\)' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X"$as_dir" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+ /^X\(\/\/\)$/{ s//\1/; q; }
-+ /^X\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+ done
-+ test ! -n "$as_dirs" || mkdir $as_dirs
-+ fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+
-+ # echo "creating $dirpart/$file"
-+ echo '# dummy' > "$dirpart/$file"
-+ done
-+done
-+ ;;
-+ esac
-+done
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+{ (exit 0); exit 0; }
-+_ACEOF
-+chmod +x $CONFIG_STATUS
-+ac_clean_files=$ac_clean_files_save
-+
-+
-+# configure is writing to config.log, and then calls config.status.
-+# config.status does its own redirection, appending to config.log.
-+# Unfortunately, on DOS this fails, as config.log is still kept open
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded. So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status. When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+ ac_cs_success=:
-+ ac_config_status_args=
-+ test "$silent" = yes &&
-+ ac_config_status_args="$ac_config_status_args --quiet"
-+ exec 5>/dev/null
-+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-+ exec 5>>config.log
-+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-+ # would make configure fail if this is the last instruction.
-+ $ac_cs_success || { (exit 1); exit 1; }
-+fi
-+
-diff -Nru php-5.2.4.vanilla/libevent/configure.in php-5.2.4.fpm/libevent/configure.in
---- php-5.2.4.vanilla/libevent/configure.in 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/configure.in 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,379 @@
-+dnl configure.in for libevent
-+dnl Dug Song <dugsong@monkey.org>
-+AC_INIT(event.c)
-+
-+AM_INIT_AUTOMAKE(libevent,1.3b)
-+AM_CONFIG_HEADER(config.h)
-+AM_MAINTAINER_MODE
-+
-+dnl Initialize prefix.
-+if test "$prefix" = "NONE"; then
-+ prefix="/usr/local"
-+fi
-+
-+dnl Checks for programs.
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+
-+AC_PROG_GCC_TRADITIONAL
-+if test "$GCC" = yes ; then
-+ CFLAGS="$CFLAGS -Wall"
-+fi
-+
-+AC_PROG_LIBTOOL
-+
-+dnl Uncomment "AC_DISABLE_SHARED" to make shared librraries not get
-+dnl built by default. You can also turn shared libs on and off from
-+dnl the command line with --enable-shared and --disable-shared.
-+dnl AC_DISABLE_SHARED
-+AC_SUBST(LIBTOOL_DEPS)
-+
-+dnl Check for optional stuff
-+AC_ARG_WITH(rtsig,
-+ [ --with-rtsig compile with support for real time signals (experimental)],
-+ [usertsig=yes], [usertsig=no])
-+
-+dnl Checks for libraries.
-+AC_CHECK_LIB(socket, socket)
-+AC_CHECK_LIB(resolv, inet_aton)
-+
-+dnl Checks for header files.
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS(fcntl.h stdarg.h inttypes.h stdint.h poll.h signal.h unistd.h sys/epoll.h sys/time.h sys/queue.h sys/event.h sys/ioctl.h sys/devpoll.h port.h netinet/in6.h)
-+if test "x$ac_cv_header_sys_queue_h" = "xyes"; then
-+ AC_MSG_CHECKING(for TAILQ_FOREACH in sys/queue.h)
-+ AC_EGREP_CPP(yes,
-+[
-+#include <sys/queue.h>
-+#ifdef TAILQ_FOREACH
-+ yes
-+#endif
-+], [AC_MSG_RESULT(yes)
-+ AC_DEFINE(HAVE_TAILQFOREACH, 1,
-+ [Define if TAILQ_FOREACH is defined in <sys/queue.h>])],
-+ AC_MSG_RESULT(no)
-+ )
-+fi
-+
-+if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-+ AC_MSG_CHECKING(for timeradd in sys/time.h)
-+ AC_EGREP_CPP(yes,
-+[
-+#include <sys/time.h>
-+#ifdef timeradd
-+ yes
-+#endif
-+], [ AC_DEFINE(HAVE_TIMERADD, 1,
-+ [Define if timeradd is defined in <sys/time.h>])
-+ AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
-+)
-+fi
-+
-+if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-+ AC_MSG_CHECKING(for timercmp in sys/time.h)
-+ AC_EGREP_CPP(yes,
-+[
-+#include <sys/time.h>
-+#ifdef timercmp
-+ yes
-+#endif
-+], [ AC_DEFINE(HAVE_TIMERCMP, 1,
-+ [Define if timercmp is defined in <sys/time.h>])
-+ AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
-+)
-+fi
-+
-+if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-+ AC_MSG_CHECKING(for timerclear in sys/time.h)
-+ AC_EGREP_CPP(yes,
-+[
-+#include <sys/time.h>
-+#ifdef timerclear
-+ yes
-+#endif
-+], [ AC_DEFINE(HAVE_TIMERCLEAR, 1,
-+ [Define if timerclear is defined in <sys/time.h>])
-+ AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
-+)
-+fi
-+
-+if test "x$ac_cv_header_sys_time_h" = "xyes"; then
-+ AC_MSG_CHECKING(for timerisset in sys/time.h)
-+ AC_EGREP_CPP(yes,
-+[
-+#include <sys/time.h>
-+#ifdef timerisset
-+ yes
-+#endif
-+], [ AC_DEFINE(HAVE_TIMERISSET, 1,
-+ [Define if timerisset is defined in <sys/time.h>])
-+ AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
-+)
-+fi
-+
-+dnl - check if the macro WIN32 is defined on this compiler.
-+dnl - (this is how we check for a windows version of GCC)
-+AC_MSG_CHECKING(for WIN32)
-+AC_TRY_COMPILE(,
-+ [
-+ #ifndef WIN32
-+ #error
-+ #endif
-+ ],
-+ bwin32=true; AC_MSG_RESULT(yes),
-+ bwin32=false; AC_MSG_RESULT(no),
-+)
-+
-+AM_CONDITIONAL(BUILD_WIN32, test x$bwin32 = xtrue)
-+
-+dnl Checks for typedefs, structures, and compiler characteristics.
-+AC_C_CONST
-+AC_C_INLINE
-+AC_HEADER_TIME
-+
-+dnl Checks for library functions.
-+AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop)
-+
-+if test "x$ac_cv_func_clock_gettime" = "xyes"; then
-+ AC_DEFINE(DNS_USE_CPU_CLOCK_FOR_ID, 1, [Define if clock_gettime is available in libc])
-+else
-+ AC_DEFINE(DNS_USE_GETTIMEOFDAY_FOR_ID, 1, [Define is no secure id variant is available])
-+fi
-+
-+AC_MSG_CHECKING(for F_SETFD in fcntl.h)
-+AC_EGREP_CPP(yes,
-+[
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+#ifdef F_SETFD
-+yes
-+#endif
-+], [ AC_DEFINE(HAVE_SETFD, 1,
-+ [Define if F_SETFD is defined in <fcntl.h>])
-+ AC_MSG_RESULT(yes) ], AC_MSG_RESULT(no))
-+
-+needsignal=no
-+haveselect=no
-+AC_CHECK_FUNCS(select, [haveselect=yes], )
-+if test "x$haveselect" = "xyes" ; then
-+ AC_LIBOBJ(select)
-+ needsignal=yes
-+fi
-+
-+havepoll=no
-+havertsig=no
-+AC_CHECK_FUNCS(poll, [havepoll=yes], )
-+if test "x$havepoll" = "xyes" ; then
-+ AC_LIBOBJ(poll)
-+ needsignal=yes
-+
-+ if test "x$usertsig" = "xyes" ; then
-+ AC_CHECK_FUNCS(sigtimedwait, [havertsig=yes], )
-+ fi
-+fi
-+if test "x$havertsig" = "xyes" ; then
-+ AC_MSG_CHECKING(for F_SETSIG in fcntl.h)
-+ AC_EGREP_CPP(yes,
-+[
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+#ifdef F_SETSIG
-+yes
-+#endif
-+], [ AC_MSG_RESULT(yes) ], [ AC_MSG_RESULT(no); havertsig=no])
-+fi
-+if test "x$havertsig" = "xyes" ; then
-+ AC_DEFINE(HAVE_RTSIG, 1, [Define if your system supports POSIX realtime signals])
-+ AC_LIBOBJ(rtsig)
-+ AC_MSG_CHECKING(for working rtsig on pipes)
-+ AC_TRY_RUN(
-+[
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+#include <signal.h>
-+#include <unistd.h>
-+
-+int sigio()
-+{
-+ exit(0);
-+}
-+
-+int main()
-+{
-+ int fd[2];
-+
-+ pipe(fd);
-+ signal(SIGIO, sigio);
-+ fcntl(fd[0], F_SETOWN, getpid());
-+ fcntl(fd[0], F_SETSIG, SIGIO);
-+ fcntl(fd[0], F_SETFL, fcntl(fd[0], F_GETFL) | O_ASYNC);
-+ write(fd[1], "", 1);
-+ return 1;
-+}
-+], [ AC_MSG_RESULT(yes)
-+ AC_DEFINE(HAVE_WORKING_RTSIG, 1, [Define if realtime signals work on pipes])],
-+ AC_MSG_RESULT(no))
-+fi
-+
-+haveepoll=no
-+AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], )
-+if test "x$haveepoll" = "xyes" ; then
-+ AC_DEFINE(HAVE_EPOLL, 1,
-+ [Define if your system supports the epoll system calls])
-+ AC_LIBOBJ(epoll)
-+ needsignal=yes
-+fi
-+
-+havedevpoll=no
-+if test "x$ac_cv_header_sys_devpoll_h" = "xyes"; then
-+ AC_DEFINE(HAVE_DEVPOLL, 1,
-+ [Define if /dev/poll is available])
-+ AC_LIBOBJ(devpoll)
-+fi
-+
-+havekqueue=no
-+if test "x$ac_cv_header_sys_event_h" = "xyes"; then
-+ AC_CHECK_FUNCS(kqueue, [havekqueue=yes], )
-+ if test "x$havekqueue" = "xyes" ; then
-+ AC_MSG_CHECKING(for working kqueue)
-+ AC_TRY_RUN(
-+#include <sys/types.h>
-+#include <sys/time.h>
-+#include <sys/event.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+
-+int
-+main(int argc, char **argv)
-+{
-+ int kq;
-+ int n;
-+ int fd[[2]];
-+ struct kevent ev;
-+ struct timespec ts;
-+ char buf[[8000]];
-+
-+ if (pipe(fd) == -1)
-+ exit(1);
-+ if (fcntl(fd[[1]], F_SETFL, O_NONBLOCK) == -1)
-+ exit(1);
-+
-+ while ((n = write(fd[[1]], buf, sizeof(buf))) == sizeof(buf))
-+ ;
-+
-+ if ((kq = kqueue()) == -1)
-+ exit(1);
-+
-+ ev.ident = fd[[1]];
-+ ev.filter = EVFILT_WRITE;
-+ ev.flags = EV_ADD | EV_ENABLE;
-+ n = kevent(kq, &ev, 1, NULL, 0, NULL);
-+ if (n == -1)
-+ exit(1);
-+
-+ read(fd[[0]], buf, sizeof(buf));
-+
-+ ts.tv_sec = 0;
-+ ts.tv_nsec = 0;
-+ n = kevent(kq, NULL, 0, &ev, 1, &ts);
-+ if (n == -1 || n == 0)
-+ exit(1);
-+
-+ exit(0);
-+}, [AC_MSG_RESULT(yes)
-+ AC_DEFINE(HAVE_WORKING_KQUEUE, 1,
-+ [Define if kqueue works correctly with pipes])
-+ AC_LIBOBJ(kqueue)], AC_MSG_RESULT(no), AC_MSG_RESULT(no))
-+ fi
-+fi
-+
-+haveepollsyscall=no
-+if test "x$ac_cv_header_sys_epoll_h" = "xyes"; then
-+ if test "x$haveepoll" = "xno" ; then
-+ AC_MSG_CHECKING(for epoll system call)
-+ AC_TRY_RUN(
-+#include <stdint.h>
-+#include <sys/param.h>
-+#include <sys/types.h>
-+#include <sys/syscall.h>
-+#include <sys/epoll.h>
-+#include <unistd.h>
-+
-+int
-+epoll_create(int size)
-+{
-+ return (syscall(__NR_epoll_create, size));
-+}
-+
-+int
-+main(int argc, char **argv)
-+{
-+ int epfd;
-+
-+ epfd = epoll_create(256);
-+ exit (epfd == -1 ? 1 : 0);
-+}, [AC_MSG_RESULT(yes)
-+ AC_DEFINE(HAVE_EPOLL, 1,
-+ [Define if your system supports the epoll system calls])
-+ needsignal=yes
-+ AC_LIBOBJ(epoll_sub)
-+ AC_LIBOBJ(epoll)], AC_MSG_RESULT(no), AC_MSG_RESULT(no))
-+ fi
-+fi
-+
-+haveeventports=no
-+AC_CHECK_FUNCS(port_create, [haveeventports=yes], )
-+if test "x$haveeventports" = "xyes" ; then
-+ AC_DEFINE(HAVE_EVENT_PORTS, 1,
-+ [Define if your system supports event ports])
-+ AC_LIBOBJ(evport)
-+ needsignal=yes
-+fi
-+if test "x$needsignal" = "xyes" ; then
-+ AC_LIBOBJ(signal)
-+fi
-+
-+AC_TYPE_PID_T
-+AC_TYPE_SIZE_T
-+AC_CHECK_TYPES([struct in6_addr], , ,
-+[#ifdef WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <sys/socket.h>
-+#endif
-+#ifdef HAVE_NETINET_IN6_H
-+#include <netinet/in6.h>
-+#endif])
-+
-+AC_MSG_CHECKING([for socklen_t])
-+AC_TRY_COMPILE([
-+ #include <sys/types.h>
-+ #include <sys/socket.h>],
-+ [socklen_t x;],
-+ AC_MSG_RESULT([yes]),
-+ [AC_MSG_RESULT([no])
-+ AC_DEFINE(socklen_t, unsigned int,
-+ [Define to unsigned int if you dont have it])]
-+)
-+
-+AC_MSG_CHECKING([whether our compiler supports __func__])
-+AC_TRY_COMPILE([],
-+ [void foo() { const char *cp = __func__; }],
-+ AC_MSG_RESULT([yes]),
-+ AC_MSG_RESULT([no])
-+ AC_MSG_CHECKING([whether our compiler supports __FUNCTION__])
-+ AC_TRY_COMPILE([],
-+ [void foo() { const char *cp = __FUNCTION__; }],
-+ AC_MSG_RESULT([yes])
-+ AC_DEFINE(__func__, __FUNCTION__,
-+ [Define to appropriate substitue if compiler doesnt have __func__]),
-+ AC_MSG_RESULT([no])
-+ AC_DEFINE(__func__, __FILE__,
-+ [Define to appropriate substitue if compiler doesnt have __func__])))
-+
-+
-+AC_OUTPUT(Makefile)
-diff -Nru php-5.2.4.vanilla/libevent/depcomp php-5.2.4.fpm/libevent/depcomp
---- php-5.2.4.vanilla/libevent/depcomp 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/depcomp 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,529 @@
-+#! /bin/sh
-+# depcomp - compile a program generating dependencies as side-effects
-+
-+scriptversion=2005-02-09.22
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-+
-+case $1 in
-+ '')
-+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
-+ exit 1;
-+ ;;
-+ -h | --h*)
-+ cat <<\EOF
-+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-+
-+Run PROGRAMS ARGS to compile a file, generating dependencies
-+as side-effects.
-+
-+Environment variables:
-+ depmode Dependency tracking mode.
-+ source Source file read by `PROGRAMS ARGS'.
-+ object Object file output by `PROGRAMS ARGS'.
-+ DEPDIR directory where to store dependencies.
-+ depfile Dependency file to output.
-+ tmpdepfile Temporary file to use when outputing dependencies.
-+ libtool Whether libtool is used (yes/no).
-+
-+Report bugs to <bug-automake@gnu.org>.
-+EOF
-+ exit $?
-+ ;;
-+ -v | --v*)
-+ echo "depcomp $scriptversion"
-+ exit $?
-+ ;;
-+esac
-+
-+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
-+ exit 1
-+fi
-+
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-+
-+rm -f "$tmpdepfile"
-+
-+# Some modes work just like other modes, but use different flags. We
-+# parameterize here, but still list the modes in the big case below,
-+# to make depend.m4 easier to write. Note that we *cannot* use a case
-+# here, because this file can only contain one case statement.
-+if test "$depmode" = hp; then
-+ # HP compiler uses -M and no extra arg.
-+ gccflag=-M
-+ depmode=gcc
-+fi
-+
-+if test "$depmode" = dashXmstdout; then
-+ # This is just like dashmstdout with a different argument.
-+ dashmflag=-xM
-+ depmode=dashmstdout
-+fi
-+
-+case "$depmode" in
-+gcc3)
-+## gcc 3 implements dependency tracking that does exactly what
-+## we want. Yay! Note: for some reason libtool 1.4 doesn't like
-+## it if -MD -MP comes after the -MF stuff. Hmm.
-+ "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile"
-+ exit $stat
-+ fi
-+ mv "$tmpdepfile" "$depfile"
-+ ;;
-+
-+gcc)
-+## There are various ways to get dependency output from gcc. Here's
-+## why we pick this rather obscure method:
-+## - Don't want to use -MD because we'd like the dependencies to end
-+## up in a subdir. Having to rename by hand is ugly.
-+## (We might end up doing this anyway to support other compilers.)
-+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-+## -MM, not -M (despite what the docs say).
-+## - Using -M directly means running the compiler twice (even worse
-+## than renaming).
-+ if test -z "$gccflag"; then
-+ gccflag=-MD,
-+ fi
-+ "$@" -Wp,"$gccflag$tmpdepfile"
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile"
-+ exit $stat
-+ fi
-+ rm -f "$depfile"
-+ echo "$object : \\" > "$depfile"
-+ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-+## The second -e expression handles DOS-style file names with drive letters.
-+ sed -e 's/^[^:]*: / /' \
-+ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-+## This next piece of magic avoids the `deleted header file' problem.
-+## The problem is that when a header file which appears in a .P file
-+## is deleted, the dependency causes make to die (because there is
-+## typically no way to rebuild the header). We avoid this by adding
-+## dummy dependencies for each header file. Too bad gcc doesn't do
-+## this for us directly.
-+ tr ' ' '
-+' < "$tmpdepfile" |
-+## Some versions of gcc put a space before the `:'. On the theory
-+## that the space means something, we add a space to the output as
-+## well.
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly. Breaking it into two sed invocations is a workaround.
-+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+ rm -f "$tmpdepfile"
-+ ;;
-+
-+hp)
-+ # This case exists only to let depend.m4 do its work. It works by
-+ # looking at the text of this script. This case will never be run,
-+ # since it is checked for above.
-+ exit 1
-+ ;;
-+
-+sgi)
-+ if test "$libtool" = yes; then
-+ "$@" "-Wp,-MDupdate,$tmpdepfile"
-+ else
-+ "$@" -MDupdate "$tmpdepfile"
-+ fi
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile"
-+ exit $stat
-+ fi
-+ rm -f "$depfile"
-+
-+ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
-+ echo "$object : \\" > "$depfile"
-+
-+ # Clip off the initial element (the dependent). Don't try to be
-+ # clever and replace this with sed code, as IRIX sed won't handle
-+ # lines with more than a fixed number of characters (4096 in
-+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
-+ # the IRIX cc adds comments like `#:fec' to the end of the
-+ # dependency line.
-+ tr ' ' '
-+' < "$tmpdepfile" \
-+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-+ tr '
-+' ' ' >> $depfile
-+ echo >> $depfile
-+
-+ # The second pass generates a dummy entry for each header file.
-+ tr ' ' '
-+' < "$tmpdepfile" \
-+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-+ >> $depfile
-+ else
-+ # The sourcefile does not contain any dependencies, so just
-+ # store a dummy comment line, to avoid errors with the Makefile
-+ # "include basename.Plo" scheme.
-+ echo "#dummy" > "$depfile"
-+ fi
-+ rm -f "$tmpdepfile"
-+ ;;
-+
-+aix)
-+ # The C for AIX Compiler uses -M and outputs the dependencies
-+ # in a .u file. In older versions, this file always lives in the
-+ # current directory. Also, the AIX compiler puts `$object:' at the
-+ # start of each line; $object doesn't have directory information.
-+ # Version 6 uses the directory in both cases.
-+ stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-+ tmpdepfile="$stripped.u"
-+ if test "$libtool" = yes; then
-+ "$@" -Wc,-M
-+ else
-+ "$@" -M
-+ fi
-+ stat=$?
-+
-+ if test -f "$tmpdepfile"; then :
-+ else
-+ stripped=`echo "$stripped" | sed 's,^.*/,,'`
-+ tmpdepfile="$stripped.u"
-+ fi
-+
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile"
-+ exit $stat
-+ fi
-+
-+ if test -f "$tmpdepfile"; then
-+ outname="$stripped.o"
-+ # Each line is of the form `foo.o: dependent.h'.
-+ # Do two passes, one to just change these to
-+ # `$object: dependent.h' and one to simply `dependent.h:'.
-+ sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-+ sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+ else
-+ # The sourcefile does not contain any dependencies, so just
-+ # store a dummy comment line, to avoid errors with the Makefile
-+ # "include basename.Plo" scheme.
-+ echo "#dummy" > "$depfile"
-+ fi
-+ rm -f "$tmpdepfile"
-+ ;;
-+
-+icc)
-+ # Intel's C compiler understands `-MD -MF file'. However on
-+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-+ # ICC 7.0 will fill foo.d with something like
-+ # foo.o: sub/foo.c
-+ # foo.o: sub/foo.h
-+ # which is wrong. We want:
-+ # sub/foo.o: sub/foo.c
-+ # sub/foo.o: sub/foo.h
-+ # sub/foo.c:
-+ # sub/foo.h:
-+ # ICC 7.1 will output
-+ # foo.o: sub/foo.c sub/foo.h
-+ # and will wrap long lines using \ :
-+ # foo.o: sub/foo.c ... \
-+ # sub/foo.h ... \
-+ # ...
-+
-+ "$@" -MD -MF "$tmpdepfile"
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile"
-+ exit $stat
-+ fi
-+ rm -f "$depfile"
-+ # Each line is of the form `foo.o: dependent.h',
-+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-+ # Do two passes, one to just change these to
-+ # `$object: dependent.h' and one to simply `dependent.h:'.
-+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+ # Some versions of the HPUX 10.20 sed can't process this invocation
-+ # correctly. Breaking it into two sed invocations is a workaround.
-+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+ sed -e 's/$/ :/' >> "$depfile"
-+ rm -f "$tmpdepfile"
-+ ;;
-+
-+tru64)
-+ # The Tru64 compiler uses -MD to generate dependencies as a side
-+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-+ # dependencies in `foo.d' instead, so we check for that too.
-+ # Subdirectories are respected.
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+
-+ if test "$libtool" = yes; then
-+ # With Tru64 cc, shared objects can also be used to make a
-+ # static library. This mecanism is used in libtool 1.4 series to
-+ # handle both shared and static libraries in a single compilation.
-+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+ #
-+ # With libtool 1.5 this exception was removed, and libtool now
-+ # generates 2 separate objects for the 2 libraries. These two
-+ # compilations output dependencies in in $dir.libs/$base.o.d and
-+ # in $dir$base.o.d. We have to check for both files, because
-+ # one of the two compilations can be disabled. We should prefer
-+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+ # automatically cleaned when .libs/ is deleted, while ignoring
-+ # the former would cause a distcleancheck panic.
-+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
-+ tmpdepfile2=$dir$base.o.d # libtool 1.5
-+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
-+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
-+ "$@" -Wc,-MD
-+ else
-+ tmpdepfile1=$dir$base.o.d
-+ tmpdepfile2=$dir$base.d
-+ tmpdepfile3=$dir$base.d
-+ tmpdepfile4=$dir$base.d
-+ "$@" -MD
-+ fi
-+
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+ exit $stat
-+ fi
-+
-+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+ do
-+ test -f "$tmpdepfile" && break
-+ done
-+ if test -f "$tmpdepfile"; then
-+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+ # That's a tab and a space in the [].
-+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+ else
-+ echo "#dummy" > "$depfile"
-+ fi
-+ rm -f "$tmpdepfile"
-+ ;;
-+
-+#nosideeffect)
-+ # This comment above is used by automake to tell side-effect
-+ # dependency tracking mechanisms from slower ones.
-+
-+dashmstdout)
-+ # Important note: in order to support this mode, a compiler *must*
-+ # always write the preprocessed file to stdout, regardless of -o.
-+ "$@" || exit $?
-+
-+ # Remove the call to Libtool.
-+ if test "$libtool" = yes; then
-+ while test $1 != '--mode=compile'; do
-+ shift
-+ done
-+ shift
-+ fi
-+
-+ # Remove `-o $object'.
-+ IFS=" "
-+ for arg
-+ do
-+ case $arg in
-+ -o)
-+ shift
-+ ;;
-+ $object)
-+ shift
-+ ;;
-+ *)
-+ set fnord "$@" "$arg"
-+ shift # fnord
-+ shift # $arg
-+ ;;
-+ esac
-+ done
-+
-+ test -z "$dashmflag" && dashmflag=-M
-+ # Require at least two characters before searching for `:'
-+ # in the target name. This is to cope with DOS-style filenames:
-+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+ "$@" $dashmflag |
-+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
-+ rm -f "$depfile"
-+ cat < "$tmpdepfile" > "$depfile"
-+ tr ' ' '
-+' < "$tmpdepfile" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly. Breaking it into two sed invocations is a workaround.
-+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+ rm -f "$tmpdepfile"
-+ ;;
-+
-+dashXmstdout)
-+ # This case only exists to satisfy depend.m4. It is never actually
-+ # run, as this mode is specially recognized in the preamble.
-+ exit 1
-+ ;;
-+
-+makedepend)
-+ "$@" || exit $?
-+ # Remove any Libtool call
-+ if test "$libtool" = yes; then
-+ while test $1 != '--mode=compile'; do
-+ shift
-+ done
-+ shift
-+ fi
-+ # X makedepend
-+ shift
-+ cleared=no
-+ for arg in "$@"; do
-+ case $cleared in
-+ no)
-+ set ""; shift
-+ cleared=yes ;;
-+ esac
-+ case "$arg" in
-+ -D*|-I*)
-+ set fnord "$@" "$arg"; shift ;;
-+ # Strip any option that makedepend may not understand. Remove
-+ # the object too, otherwise makedepend will parse it as a source file.
-+ -*|$object)
-+ ;;
-+ *)
-+ set fnord "$@" "$arg"; shift ;;
-+ esac
-+ done
-+ obj_suffix="`echo $object | sed 's/^.*\././'`"
-+ touch "$tmpdepfile"
-+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-+ rm -f "$depfile"
-+ cat < "$tmpdepfile" > "$depfile"
-+ sed '1,2d' "$tmpdepfile" | tr ' ' '
-+' | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly. Breaking it into two sed invocations is a workaround.
-+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+ rm -f "$tmpdepfile" "$tmpdepfile".bak
-+ ;;
-+
-+cpp)
-+ # Important note: in order to support this mode, a compiler *must*
-+ # always write the preprocessed file to stdout.
-+ "$@" || exit $?
-+
-+ # Remove the call to Libtool.
-+ if test "$libtool" = yes; then
-+ while test $1 != '--mode=compile'; do
-+ shift
-+ done
-+ shift
-+ fi
-+
-+ # Remove `-o $object'.
-+ IFS=" "
-+ for arg
-+ do
-+ case $arg in
-+ -o)
-+ shift
-+ ;;
-+ $object)
-+ shift
-+ ;;
-+ *)
-+ set fnord "$@" "$arg"
-+ shift # fnord
-+ shift # $arg
-+ ;;
-+ esac
-+ done
-+
-+ "$@" -E |
-+ sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+ sed '$ s: \\$::' > "$tmpdepfile"
-+ rm -f "$depfile"
-+ echo "$object : \\" > "$depfile"
-+ cat < "$tmpdepfile" >> "$depfile"
-+ sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-+ rm -f "$tmpdepfile"
-+ ;;
-+
-+msvisualcpp)
-+ # Important note: in order to support this mode, a compiler *must*
-+ # always write the preprocessed file to stdout, regardless of -o,
-+ # because we must use -o when running libtool.
-+ "$@" || exit $?
-+ IFS=" "
-+ for arg
-+ do
-+ case "$arg" in
-+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-+ set fnord "$@"
-+ shift
-+ shift
-+ ;;
-+ *)
-+ set fnord "$@" "$arg"
-+ shift
-+ shift
-+ ;;
-+ esac
-+ done
-+ "$@" -E |
-+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-+ rm -f "$depfile"
-+ echo "$object : \\" > "$depfile"
-+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
-+ echo " " >> "$depfile"
-+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+ rm -f "$tmpdepfile"
-+ ;;
-+
-+none)
-+ exec "$@"
-+ ;;
-+
-+*)
-+ echo "Unknown depmode $depmode" 1>&2
-+ exit 1
-+ ;;
-+esac
-+
-+exit 0
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nru php-5.2.4.vanilla/libevent/devpoll.c php-5.2.4.fpm/libevent/devpoll.c
---- php-5.2.4.vanilla/libevent/devpoll.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/devpoll.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,418 @@
-+/*
-+ * Copyright 2000-2004 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <sys/types.h>
-+#include <sys/resource.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <sys/_time.h>
-+#endif
-+#include <sys/queue.h>
-+#include <sys/tree.h>
-+#include <sys/devpoll.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <errno.h>
-+#include <assert.h>
-+
-+#include "event.h"
-+#include "event-internal.h"
-+#include "evsignal.h"
-+#include "log.h"
-+
-+/* due to limitations in the devpoll interface, we need to keep track of
-+ * all file descriptors outself.
-+ */
-+struct evdevpoll {
-+ struct event *evread;
-+ struct event *evwrite;
-+};
-+
-+struct devpollop {
-+ struct evdevpoll *fds;
-+ int nfds;
-+ struct pollfd *events;
-+ int nevents;
-+ int dpfd;
-+ struct pollfd *changes;
-+ int nchanges;
-+};
-+
-+void *devpoll_init (struct event_base *);
-+int devpoll_add (void *, struct event *);
-+int devpoll_del (void *, struct event *);
-+int devpoll_recalc (struct event_base *, void *, int);
-+int devpoll_dispatch (struct event_base *, void *, struct timeval *);
-+void devpoll_dealloc (struct event_base *, void *);
-+
-+struct eventop devpollops = {
-+ "devpoll",
-+ devpoll_init,
-+ devpoll_add,
-+ devpoll_del,
-+ devpoll_recalc,
-+ devpoll_dispatch,
-+ devpoll_dealloc
-+};
-+
-+#define NEVENT 32000
-+
-+static int
-+devpoll_commit(struct devpollop *devpollop)
-+{
-+ /*
-+ * Due to a bug in Solaris, we have to use pwrite with an offset of 0.
-+ * Write is limited to 2GB of data, until it will fail.
-+ */
-+ if (pwrite(devpollop->dpfd, devpollop->changes,
-+ sizeof(struct pollfd) * devpollop->nchanges, 0) == -1)
-+ return(-1);
-+
-+ devpollop->nchanges = 0;
-+ return(0);
-+}
-+
-+static int
-+devpoll_queue(struct devpollop *devpollop, int fd, int events) {
-+ struct pollfd *pfd;
-+
-+ if (devpollop->nchanges >= devpollop->nevents) {
-+ /*
-+ * Change buffer is full, must commit it to /dev/poll before
-+ * adding more
-+ */
-+ if (devpoll_commit(devpollop) != 0)
-+ return(-1);
-+ }
-+
-+ pfd = &devpollop->changes[devpollop->nchanges++];
-+ pfd->fd = fd;
-+ pfd->events = events;
-+ pfd->revents = 0;
-+
-+ return(0);
-+}
-+
-+void *
-+devpoll_init(struct event_base *base)
-+{
-+ int dpfd, nfiles = NEVENT;
-+ struct rlimit rl;
-+ struct devpollop *devpollop;
-+
-+ /* Disable devpoll when this environment variable is set */
-+ if (getenv("EVENT_NODEVPOLL"))
-+ return (NULL);
-+
-+ if (!(devpollop = calloc(1, sizeof(struct devpollop))))
-+ return (NULL);
-+
-+ if (getrlimit(RLIMIT_NOFILE, &rl) == 0 &&
-+ rl.rlim_cur != RLIM_INFINITY)
-+ nfiles = rl.rlim_cur - 1;
-+
-+ /* Initialize the kernel queue */
-+ if ((dpfd = open("/dev/poll", O_RDWR)) == -1) {
-+ event_warn("open: /dev/poll");
-+ free(devpollop);
-+ return (NULL);
-+ }
-+
-+ devpollop->dpfd = dpfd;
-+
-+ /* Initialize fields */
-+ devpollop->events = calloc(nfiles, sizeof(struct pollfd));
-+ if (devpollop->events == NULL) {
-+ free(devpollop);
-+ close(dpfd);
-+ return (NULL);
-+ }
-+ devpollop->nevents = nfiles;
-+
-+ devpollop->fds = calloc(nfiles, sizeof(struct evdevpoll));
-+ if (devpollop->fds == NULL) {
-+ free(devpollop->events);
-+ free(devpollop);
-+ close(dpfd);
-+ return (NULL);
-+ }
-+ devpollop->nfds = nfiles;
-+
-+ devpollop->changes = calloc(nfiles, sizeof(struct pollfd));
-+ if (devpollop->changes == NULL) {
-+ free(devpollop->fds);
-+ free(devpollop->events);
-+ free(devpollop);
-+ close(dpfd);
-+ return (NULL);
-+ }
-+
-+ evsignal_init(base);
-+
-+ return (devpollop);
-+}
-+
-+int
-+devpoll_recalc(struct event_base *base, void *arg, int max)
-+{
-+ struct devpollop *devpollop = arg;
-+
-+ if (max > devpollop->nfds) {
-+ struct evdevpoll *fds;
-+ int nfds;
-+
-+ nfds = devpollop->nfds;
-+ while (nfds < max)
-+ nfds <<= 1;
-+
-+ fds = realloc(devpollop->fds, nfds * sizeof(struct evdevpoll));
-+ if (fds == NULL) {
-+ event_warn("realloc");
-+ return (-1);
-+ }
-+ devpollop->fds = fds;
-+ memset(fds + devpollop->nfds, 0,
-+ (nfds - devpollop->nfds) * sizeof(struct evdevpoll));
-+ devpollop->nfds = nfds;
-+ }
-+
-+ return (0);
-+}
-+
-+int
-+devpoll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
-+{
-+ struct devpollop *devpollop = arg;
-+ struct pollfd *events = devpollop->events;
-+ struct dvpoll dvp;
-+ struct evdevpoll *evdp;
-+ int i, res, timeout;
-+
-+ if (devpollop->nchanges)
-+ devpoll_commit(devpollop);
-+
-+ timeout = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000;
-+
-+ dvp.dp_fds = devpollop->events;
-+ dvp.dp_nfds = devpollop->nevents;
-+ dvp.dp_timeout = timeout;
-+
-+ res = ioctl(devpollop->dpfd, DP_POLL, &dvp);
-+
-+ if (res == -1) {
-+ if (errno != EINTR) {
-+ event_warn("ioctl: DP_POLL");
-+ return (-1);
-+ }
-+
-+ evsignal_process(base);
-+ return (0);
-+ } else if (base->sig.evsignal_caught) {
-+ evsignal_process(base);
-+ }
-+
-+ event_debug(("%s: devpoll_wait reports %d", __func__, res));
-+
-+ for (i = 0; i < res; i++) {
-+ int which = 0;
-+ int what = events[i].revents;
-+ struct event *evread = NULL, *evwrite = NULL;
-+
-+ assert(events[i].fd < devpollop->nfds);
-+ evdp = &devpollop->fds[events[i].fd];
-+
-+ if (what & POLLHUP)
-+ what |= POLLIN | POLLOUT;
-+ else if (what & POLLERR)
-+ what |= POLLIN | POLLOUT;
-+
-+ if (what & POLLIN) {
-+ evread = evdp->evread;
-+ which |= EV_READ;
-+ }
-+
-+ if (what & POLLOUT) {
-+ evwrite = evdp->evwrite;
-+ which |= EV_WRITE;
-+ }
-+
-+ if (!which)
-+ continue;
-+
-+ if (evread != NULL && !(evread->ev_events & EV_PERSIST))
-+ event_del(evread);
-+ if (evwrite != NULL && evwrite != evread &&
-+ !(evwrite->ev_events & EV_PERSIST))
-+ event_del(evwrite);
-+
-+ if (evread != NULL)
-+ event_active(evread, EV_READ, 1);
-+ if (evwrite != NULL)
-+ event_active(evwrite, EV_WRITE, 1);
-+ }
-+
-+ return (0);
-+}
-+
-+
-+int
-+devpoll_add(void *arg, struct event *ev)
-+{
-+ struct devpollop *devpollop = arg;
-+ struct evdevpoll *evdp;
-+ int fd, events;
-+
-+ if (ev->ev_events & EV_SIGNAL)
-+ return (evsignal_add(ev));
-+
-+ fd = ev->ev_fd;
-+ if (fd >= devpollop->nfds) {
-+ /* Extend the file descriptor array as necessary */
-+ if (devpoll_recalc(ev->ev_base, devpollop, fd) == -1)
-+ return (-1);
-+ }
-+ evdp = &devpollop->fds[fd];
-+
-+ /*
-+ * It's not necessary to OR the existing read/write events that we
-+ * are currently interested in with the new event we are adding.
-+ * The /dev/poll driver ORs any new events with the existing events
-+ * that it has cached for the fd.
-+ */
-+
-+ events = 0;
-+ if (ev->ev_events & EV_READ) {
-+ if (evdp->evread && evdp->evread != ev) {
-+ /* There is already a different read event registered */
-+ return(-1);
-+ }
-+ events |= POLLIN;
-+ }
-+
-+ if (ev->ev_events & EV_WRITE) {
-+ if (evdp->evwrite && evdp->evwrite != ev) {
-+ /* There is already a different write event registered */
-+ return(-1);
-+ }
-+ events |= POLLOUT;
-+ }
-+
-+ if (devpoll_queue(devpollop, fd, events) != 0)
-+ return(-1);
-+
-+ /* Update events responsible */
-+ if (ev->ev_events & EV_READ)
-+ evdp->evread = ev;
-+ if (ev->ev_events & EV_WRITE)
-+ evdp->evwrite = ev;
-+
-+ return (0);
-+}
-+
-+int
-+devpoll_del(void *arg, struct event *ev)
-+{
-+ struct devpollop *devpollop = arg;
-+ struct evdevpoll *evdp;
-+ int fd, events;
-+ int needwritedelete = 1, needreaddelete = 1;
-+
-+ if (ev->ev_events & EV_SIGNAL)
-+ return (evsignal_del(ev));
-+
-+ fd = ev->ev_fd;
-+ if (fd >= devpollop->nfds)
-+ return (0);
-+ evdp = &devpollop->fds[fd];
-+
-+ events = 0;
-+ if (ev->ev_events & EV_READ)
-+ events |= POLLIN;
-+ if (ev->ev_events & EV_WRITE)
-+ events |= POLLOUT;
-+
-+ /*
-+ * The only way to remove an fd from the /dev/poll monitored set is
-+ * to use POLLREMOVE by itself. This removes ALL events for the fd
-+ * provided so if we care about two events and are only removing one
-+ * we must re-add the other event after POLLREMOVE.
-+ */
-+
-+ if (devpoll_queue(devpollop, fd, POLLREMOVE) != 0)
-+ return(-1);
-+
-+ if ((events & (POLLIN|POLLOUT)) != (POLLIN|POLLOUT)) {
-+ /*
-+ * We're not deleting all events, so we must resubmit the
-+ * event that we are still interested in if one exists.
-+ */
-+
-+ if ((events & POLLIN) && evdp->evwrite != NULL) {
-+ /* Deleting read, still care about write */
-+ devpoll_queue(devpollop, fd, POLLOUT);
-+ needwritedelete = 0;
-+ } else if ((events & POLLOUT) && evdp->evread != NULL) {
-+ /* Deleting write, still care about read */
-+ devpoll_queue(devpollop, fd, POLLIN);
-+ needreaddelete = 0;
-+ }
-+ }
-+
-+ if (needreaddelete)
-+ evdp->evread = NULL;
-+ if (needwritedelete)
-+ evdp->evwrite = NULL;
-+
-+ return (0);
-+}
-+
-+void
-+devpoll_dealloc(struct event_base *base, void *arg)
-+{
-+ struct devpollop *devpollop = arg;
-+
-+ evsignal_dealloc(base);
-+ if (devpollop->fds)
-+ free(devpollop->fds);
-+ if (devpollop->events)
-+ free(devpollop->events);
-+ if (devpollop->changes)
-+ free(devpollop->changes);
-+ if (devpollop->dpfd >= 0)
-+ close(devpollop->dpfd);
-+
-+ memset(devpollop, 0, sizeof(struct devpollop));
-+ free(devpollop);
-+}
-diff -Nru php-5.2.4.vanilla/libevent/epoll.c php-5.2.4.fpm/libevent/epoll.c
---- php-5.2.4.vanilla/libevent/epoll.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/epoll.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,364 @@
-+/*
-+ * Copyright 2000-2003 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <stdint.h>
-+#include <sys/types.h>
-+#include <sys/tree.h>
-+#include <sys/resource.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <sys/_time.h>
-+#endif
-+#include <sys/queue.h>
-+#include <sys/epoll.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#ifdef HAVE_FCNTL_H
-+#include <fcntl.h>
-+#endif
-+
-+#include "event.h"
-+#include "event-internal.h"
-+#include "evsignal.h"
-+#include "log.h"
-+
-+/* due to limitations in the epoll interface, we need to keep track of
-+ * all file descriptors outself.
-+ */
-+struct evepoll {
-+ struct event *evread;
-+ struct event *evwrite;
-+};
-+
-+struct epollop {
-+ struct evepoll *fds;
-+ int nfds;
-+ struct epoll_event *events;
-+ int nevents;
-+ int epfd;
-+};
-+
-+void *epoll_init (struct event_base *);
-+int epoll_add (void *, struct event *);
-+int epoll_del (void *, struct event *);
-+int epoll_recalc (struct event_base *, void *, int);
-+int epoll_dispatch (struct event_base *, void *, struct timeval *);
-+void epoll_dealloc (struct event_base *, void *);
-+
-+struct eventop epollops = {
-+ "epoll",
-+ epoll_init,
-+ epoll_add,
-+ epoll_del,
-+ epoll_recalc,
-+ epoll_dispatch,
-+ epoll_dealloc
-+};
-+
-+#ifdef HAVE_SETFD
-+#define FD_CLOSEONEXEC(x) do { \
-+ if (fcntl(x, F_SETFD, 1) == -1) \
-+ event_warn("fcntl(%d, F_SETFD)", x); \
-+} while (0)
-+#else
-+#define FD_CLOSEONEXEC(x)
-+#endif
-+
-+#define NEVENT 32000
-+
-+void *
-+epoll_init(struct event_base *base)
-+{
-+ int epfd, nfiles = NEVENT;
-+ struct rlimit rl;
-+ struct epollop *epollop;
-+
-+ /* Disable epollueue when this environment variable is set */
-+ if (getenv("EVENT_NOEPOLL"))
-+ return (NULL);
-+
-+ if (getrlimit(RLIMIT_NOFILE, &rl) == 0 &&
-+ rl.rlim_cur != RLIM_INFINITY) {
-+ /*
-+ * Solaris is somewhat retarded - it's important to drop
-+ * backwards compatibility when making changes. So, don't
-+ * dare to put rl.rlim_cur here.
-+ */
-+ nfiles = rl.rlim_cur - 1;
-+ }
-+
-+ /* Initalize the kernel queue */
-+
-+ if ((epfd = epoll_create(nfiles)) == -1) {
-+ event_warn("epoll_create");
-+ return (NULL);
-+ }
-+
-+ FD_CLOSEONEXEC(epfd);
-+
-+ if (!(epollop = calloc(1, sizeof(struct epollop))))
-+ return (NULL);
-+
-+ epollop->epfd = epfd;
-+
-+ /* Initalize fields */
-+ epollop->events = malloc(nfiles * sizeof(struct epoll_event));
-+ if (epollop->events == NULL) {
-+ free(epollop);
-+ return (NULL);
-+ }
-+ epollop->nevents = nfiles;
-+
-+ epollop->fds = calloc(nfiles, sizeof(struct evepoll));
-+ if (epollop->fds == NULL) {
-+ free(epollop->events);
-+ free(epollop);
-+ return (NULL);
-+ }
-+ epollop->nfds = nfiles;
-+
-+ evsignal_init(base);
-+
-+ return (epollop);
-+}
-+
-+int
-+epoll_recalc(struct event_base *base, void *arg, int max)
-+{
-+ struct epollop *epollop = arg;
-+
-+ if (max > epollop->nfds) {
-+ struct evepoll *fds;
-+ int nfds;
-+
-+ nfds = epollop->nfds;
-+ while (nfds < max)
-+ nfds <<= 1;
-+
-+ fds = realloc(epollop->fds, nfds * sizeof(struct evepoll));
-+ if (fds == NULL) {
-+ event_warn("realloc");
-+ return (-1);
-+ }
-+ epollop->fds = fds;
-+ memset(fds + epollop->nfds, 0,
-+ (nfds - epollop->nfds) * sizeof(struct evepoll));
-+ epollop->nfds = nfds;
-+ }
-+
-+ return (0);
-+}
-+
-+int
-+epoll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
-+{
-+ struct epollop *epollop = arg;
-+ struct epoll_event *events = epollop->events;
-+ struct evepoll *evep;
-+ int i, res, timeout;
-+
-+ timeout = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000;
-+ res = epoll_wait(epollop->epfd, events, epollop->nevents, timeout);
-+
-+ if (res == -1) {
-+ if (errno != EINTR) {
-+ event_warn("epoll_wait");
-+ return (-1);
-+ }
-+
-+ evsignal_process(base);
-+ return (0);
-+ } else if (base->sig.evsignal_caught) {
-+ evsignal_process(base);
-+ }
-+
-+ event_debug(("%s: epoll_wait reports %d", __func__, res));
-+
-+ for (i = 0; i < res; i++) {
-+ int which = 0;
-+ int what = events[i].events;
-+ struct event *evread = NULL, *evwrite = NULL;
-+
-+ evep = (struct evepoll *)events[i].data.ptr;
-+
-+ if (what & EPOLLHUP)
-+ what |= EPOLLIN | EPOLLOUT;
-+ else if (what & EPOLLERR)
-+ what |= EPOLLIN | EPOLLOUT;
-+
-+ if (what & EPOLLIN) {
-+ evread = evep->evread;
-+ which |= EV_READ;
-+ }
-+
-+ if (what & EPOLLOUT) {
-+ evwrite = evep->evwrite;
-+ which |= EV_WRITE;
-+ }
-+
-+ if (!which)
-+ continue;
-+
-+ if (evread != NULL && !(evread->ev_events & EV_PERSIST))
-+ event_del(evread);
-+ if (evwrite != NULL && evwrite != evread &&
-+ !(evwrite->ev_events & EV_PERSIST))
-+ event_del(evwrite);
-+
-+ if (evread != NULL)
-+ event_active(evread, EV_READ, 1);
-+ if (evwrite != NULL)
-+ event_active(evwrite, EV_WRITE, 1);
-+ }
-+
-+ return (0);
-+}
-+
-+
-+int
-+epoll_add(void *arg, struct event *ev)
-+{
-+ struct epollop *epollop = arg;
-+ struct epoll_event epev = {0, {0}};
-+ struct evepoll *evep;
-+ int fd, op, events;
-+
-+ if (ev->ev_events & EV_SIGNAL)
-+ return (evsignal_add(ev));
-+
-+ fd = ev->ev_fd;
-+ if (fd >= epollop->nfds) {
-+ /* Extent the file descriptor array as necessary */
-+ if (epoll_recalc(ev->ev_base, epollop, fd) == -1)
-+ return (-1);
-+ }
-+ evep = &epollop->fds[fd];
-+ op = EPOLL_CTL_ADD;
-+ events = 0;
-+ if (evep->evread != NULL) {
-+ events |= EPOLLIN;
-+ op = EPOLL_CTL_MOD;
-+ }
-+ if (evep->evwrite != NULL) {
-+ events |= EPOLLOUT;
-+ op = EPOLL_CTL_MOD;
-+ }
-+
-+ if (ev->ev_events & EV_READ)
-+ events |= EPOLLIN;
-+ if (ev->ev_events & EV_WRITE)
-+ events |= EPOLLOUT;
-+
-+ epev.data.ptr = evep;
-+ epev.events = events;
-+ if (epoll_ctl(epollop->epfd, op, ev->ev_fd, &epev) == -1)
-+ return (-1);
-+
-+ /* Update events responsible */
-+ if (ev->ev_events & EV_READ)
-+ evep->evread = ev;
-+ if (ev->ev_events & EV_WRITE)
-+ evep->evwrite = ev;
-+
-+ return (0);
-+}
-+
-+int
-+epoll_del(void *arg, struct event *ev)
-+{
-+ struct epollop *epollop = arg;
-+ struct epoll_event epev = {0, {0}};
-+ struct evepoll *evep;
-+ int fd, events, op;
-+ int needwritedelete = 1, needreaddelete = 1;
-+
-+ if (ev->ev_events & EV_SIGNAL)
-+ return (evsignal_del(ev));
-+
-+ fd = ev->ev_fd;
-+ if (fd >= epollop->nfds)
-+ return (0);
-+ evep = &epollop->fds[fd];
-+
-+ op = EPOLL_CTL_DEL;
-+ events = 0;
-+
-+ if (ev->ev_events & EV_READ)
-+ events |= EPOLLIN;
-+ if (ev->ev_events & EV_WRITE)
-+ events |= EPOLLOUT;
-+
-+ if ((events & (EPOLLIN|EPOLLOUT)) != (EPOLLIN|EPOLLOUT)) {
-+ if ((events & EPOLLIN) && evep->evwrite != NULL) {
-+ needwritedelete = 0;
-+ events = EPOLLOUT;
-+ op = EPOLL_CTL_MOD;
-+ } else if ((events & EPOLLOUT) && evep->evread != NULL) {
-+ needreaddelete = 0;
-+ events = EPOLLIN;
-+ op = EPOLL_CTL_MOD;
-+ }
-+ }
-+
-+ epev.events = events;
-+ epev.data.ptr = evep;
-+
-+ if (needreaddelete)
-+ evep->evread = NULL;
-+ if (needwritedelete)
-+ evep->evwrite = NULL;
-+
-+ if (epoll_ctl(epollop->epfd, op, fd, &epev) == -1)
-+ return (-1);
-+
-+ return (0);
-+}
-+
-+void
-+epoll_dealloc(struct event_base *base, void *arg)
-+{
-+ struct epollop *epollop = arg;
-+
-+ evsignal_dealloc(base);
-+ if (epollop->fds)
-+ free(epollop->fds);
-+ if (epollop->events)
-+ free(epollop->events);
-+ if (epollop->epfd >= 0)
-+ close(epollop->epfd);
-+
-+ memset(epollop, 0, sizeof(struct epollop));
-+ free(epollop);
-+}
-diff -Nru php-5.2.4.vanilla/libevent/epoll_sub.c php-5.2.4.fpm/libevent/epoll_sub.c
---- php-5.2.4.vanilla/libevent/epoll_sub.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/epoll_sub.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,52 @@
-+/*
-+ * Copyright 2003 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#include <stdint.h>
-+
-+#include <sys/param.h>
-+#include <sys/types.h>
-+#include <sys/syscall.h>
-+#include <sys/epoll.h>
-+#include <unistd.h>
-+
-+int
-+epoll_create(int size)
-+{
-+ return (syscall(__NR_epoll_create, size));
-+}
-+
-+int
-+epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
-+{
-+
-+ return (syscall(__NR_epoll_ctl, epfd, op, fd, event));
-+}
-+
-+int
-+epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
-+{
-+ return (syscall(__NR_epoll_wait, epfd, events, maxevents, timeout));
-+}
-diff -Nru php-5.2.4.vanilla/libevent/evbuffer.c php-5.2.4.fpm/libevent/evbuffer.c
---- php-5.2.4.vanilla/libevent/evbuffer.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/evbuffer.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,413 @@
-+/*
-+ * Copyright (c) 2002-2004 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <sys/types.h>
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
-+
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#ifdef HAVE_STDARG_H
-+#include <stdarg.h>
-+#endif
-+
-+#include "event.h"
-+
-+/* prototypes */
-+
-+void bufferevent_setwatermark(struct bufferevent *, short, size_t, size_t);
-+void bufferevent_read_pressure_cb(struct evbuffer *, size_t, size_t, void *);
-+
-+static int
-+bufferevent_add(struct event *ev, int timeout)
-+{
-+ struct timeval tv, *ptv = NULL;
-+
-+ if (timeout) {
-+ timerclear(&tv);
-+ tv.tv_sec = timeout;
-+ ptv = &tv;
-+ }
-+
-+ return (event_add(ev, ptv));
-+}
-+
-+/*
-+ * This callback is executed when the size of the input buffer changes.
-+ * We use it to apply back pressure on the reading side.
-+ */
-+
-+void
-+bufferevent_read_pressure_cb(struct evbuffer *buf, size_t old, size_t now,
-+ void *arg) {
-+ struct bufferevent *bufev = arg;
-+ /*
-+ * If we are below the watermark then reschedule reading if it's
-+ * still enabled.
-+ */
-+ if (bufev->wm_read.high == 0 || now < bufev->wm_read.high) {
-+ evbuffer_setcb(buf, NULL, NULL);
-+
-+ if (bufev->enabled & EV_READ)
-+ bufferevent_add(&bufev->ev_read, bufev->timeout_read);
-+ }
-+}
-+
-+static void
-+bufferevent_readcb(int fd, short event, void *arg)
-+{
-+ struct bufferevent *bufev = arg;
-+ int res = 0;
-+ short what = EVBUFFER_READ;
-+ size_t len;
-+ int howmuch = -1;
-+
-+ if (event == EV_TIMEOUT) {
-+ what |= EVBUFFER_TIMEOUT;
-+ goto error;
-+ }
-+
-+ /*
-+ * If we have a high watermark configured then we don't want to
-+ * read more data than would make us reach the watermark.
-+ */
-+ if (bufev->wm_read.high != 0)
-+ howmuch = bufev->wm_read.high;
-+
-+ res = evbuffer_read(bufev->input, fd, howmuch);
-+ if (res == -1) {
-+ if (errno == EAGAIN || errno == EINTR)
-+ goto reschedule;
-+ /* error case */
-+ what |= EVBUFFER_ERROR;
-+ } else if (res == 0) {
-+ /* eof case */
-+ what |= EVBUFFER_EOF;
-+ }
-+
-+ if (res <= 0)
-+ goto error;
-+
-+ bufferevent_add(&bufev->ev_read, bufev->timeout_read);
-+
-+ /* See if this callbacks meets the water marks */
-+ len = EVBUFFER_LENGTH(bufev->input);
-+ if (bufev->wm_read.low != 0 && len < bufev->wm_read.low)
-+ return;
-+ if (bufev->wm_read.high != 0 && len > bufev->wm_read.high) {
-+ struct evbuffer *buf = bufev->input;
-+ event_del(&bufev->ev_read);
-+
-+ /* Now schedule a callback for us */
-+ evbuffer_setcb(buf, bufferevent_read_pressure_cb, bufev);
-+ return;
-+ }
-+
-+ /* Invoke the user callback - must always be called last */
-+ if (bufev->readcb != NULL)
-+ (*bufev->readcb)(bufev, bufev->cbarg);
-+ return;
-+
-+ reschedule:
-+ bufferevent_add(&bufev->ev_read, bufev->timeout_read);
-+ return;
-+
-+ error:
-+ (*bufev->errorcb)(bufev, what, bufev->cbarg);
-+}
-+
-+static void
-+bufferevent_writecb(int fd, short event, void *arg)
-+{
-+ struct bufferevent *bufev = arg;
-+ int res = 0;
-+ short what = EVBUFFER_WRITE;
-+
-+ if (event == EV_TIMEOUT) {
-+ what |= EVBUFFER_TIMEOUT;
-+ goto error;
-+ }
-+
-+ if (EVBUFFER_LENGTH(bufev->output)) {
-+ res = evbuffer_write(bufev->output, fd);
-+ if (res == -1) {
-+#ifndef WIN32
-+/*todo. evbuffer uses WriteFile when WIN32 is set. WIN32 system calls do not
-+ *set errno. thus this error checking is not portable*/
-+ if (errno == EAGAIN ||
-+ errno == EINTR ||
-+ errno == EINPROGRESS)
-+ goto reschedule;
-+ /* error case */
-+ what |= EVBUFFER_ERROR;
-+
-+#else
-+ goto reschedule;
-+#endif
-+
-+ } else if (res == 0) {
-+ /* eof case */
-+ what |= EVBUFFER_EOF;
-+ }
-+ if (res <= 0)
-+ goto error;
-+ }
-+
-+ if (EVBUFFER_LENGTH(bufev->output) != 0)
-+ bufferevent_add(&bufev->ev_write, bufev->timeout_write);
-+
-+ /*
-+ * Invoke the user callback if our buffer is drained or below the
-+ * low watermark.
-+ */
-+ if (bufev->writecb != NULL &&
-+ EVBUFFER_LENGTH(bufev->output) <= bufev->wm_write.low)
-+ (*bufev->writecb)(bufev, bufev->cbarg);
-+
-+ return;
-+
-+ reschedule:
-+ if (EVBUFFER_LENGTH(bufev->output) != 0)
-+ bufferevent_add(&bufev->ev_write, bufev->timeout_write);
-+ return;
-+
-+ error:
-+ (*bufev->errorcb)(bufev, what, bufev->cbarg);
-+}
-+
-+/*
-+ * Create a new buffered event object.
-+ *
-+ * The read callback is invoked whenever we read new data.
-+ * The write callback is invoked whenever the output buffer is drained.
-+ * The error callback is invoked on a write/read error or on EOF.
-+ *
-+ * Both read and write callbacks maybe NULL. The error callback is not
-+ * allowed to be NULL and have to be provided always.
-+ */
-+
-+struct bufferevent *
-+bufferevent_new(int fd, evbuffercb readcb, evbuffercb writecb,
-+ everrorcb errorcb, void *cbarg)
-+{
-+ struct bufferevent *bufev;
-+
-+ if ((bufev = calloc(1, sizeof(struct bufferevent))) == NULL)
-+ return (NULL);
-+
-+ if ((bufev->input = evbuffer_new()) == NULL) {
-+ free(bufev);
-+ return (NULL);
-+ }
-+
-+ if ((bufev->output = evbuffer_new()) == NULL) {
-+ evbuffer_free(bufev->input);
-+ free(bufev);
-+ return (NULL);
-+ }
-+
-+ event_set(&bufev->ev_read, fd, EV_READ, bufferevent_readcb, bufev);
-+ event_set(&bufev->ev_write, fd, EV_WRITE, bufferevent_writecb, bufev);
-+
-+ bufev->readcb = readcb;
-+ bufev->writecb = writecb;
-+ bufev->errorcb = errorcb;
-+
-+ bufev->cbarg = cbarg;
-+
-+ /*
-+ * Set to EV_WRITE so that using bufferevent_write is going to
-+ * trigger a callback. Reading needs to be explicitly enabled
-+ * because otherwise no data will be available.
-+ */
-+ bufev->enabled = EV_WRITE;
-+
-+ return (bufev);
-+}
-+
-+int
-+bufferevent_priority_set(struct bufferevent *bufev, int priority)
-+{
-+ if (event_priority_set(&bufev->ev_read, priority) == -1)
-+ return (-1);
-+ if (event_priority_set(&bufev->ev_write, priority) == -1)
-+ return (-1);
-+
-+ return (0);
-+}
-+
-+/* Closing the file descriptor is the responsibility of the caller */
-+
-+void
-+bufferevent_free(struct bufferevent *bufev)
-+{
-+ event_del(&bufev->ev_read);
-+ event_del(&bufev->ev_write);
-+
-+ evbuffer_free(bufev->input);
-+ evbuffer_free(bufev->output);
-+
-+ free(bufev);
-+}
-+
-+/*
-+ * Returns 0 on success;
-+ * -1 on failure.
-+ */
-+
-+int
-+bufferevent_write(struct bufferevent *bufev, void *data, size_t size)
-+{
-+ int res;
-+
-+ res = evbuffer_add(bufev->output, data, size);
-+
-+ if (res == -1)
-+ return (res);
-+
-+ /* If everything is okay, we need to schedule a write */
-+ if (size > 0 && (bufev->enabled & EV_WRITE))
-+ bufferevent_add(&bufev->ev_write, bufev->timeout_write);
-+
-+ return (res);
-+}
-+
-+int
-+bufferevent_write_buffer(struct bufferevent *bufev, struct evbuffer *buf)
-+{
-+ int res;
-+
-+ res = bufferevent_write(bufev, buf->buffer, buf->off);
-+ if (res != -1)
-+ evbuffer_drain(buf, buf->off);
-+
-+ return (res);
-+}
-+
-+size_t
-+bufferevent_read(struct bufferevent *bufev, void *data, size_t size)
-+{
-+ struct evbuffer *buf = bufev->input;
-+
-+ if (buf->off < size)
-+ size = buf->off;
-+
-+ /* Copy the available data to the user buffer */
-+ memcpy(data, buf->buffer, size);
-+
-+ if (size)
-+ evbuffer_drain(buf, size);
-+
-+ return (size);
-+}
-+
-+int
-+bufferevent_enable(struct bufferevent *bufev, short event)
-+{
-+ if (event & EV_READ) {
-+ if (bufferevent_add(&bufev->ev_read, bufev->timeout_read) == -1)
-+ return (-1);
-+ }
-+ if (event & EV_WRITE) {
-+ if (bufferevent_add(&bufev->ev_write, bufev->timeout_write) == -1)
-+ return (-1);
-+ }
-+
-+ bufev->enabled |= event;
-+ return (0);
-+}
-+
-+int
-+bufferevent_disable(struct bufferevent *bufev, short event)
-+{
-+ if (event & EV_READ) {
-+ if (event_del(&bufev->ev_read) == -1)
-+ return (-1);
-+ }
-+ if (event & EV_WRITE) {
-+ if (event_del(&bufev->ev_write) == -1)
-+ return (-1);
-+ }
-+
-+ bufev->enabled &= ~event;
-+ return (0);
-+}
-+
-+/*
-+ * Sets the read and write timeout for a buffered event.
-+ */
-+
-+void
-+bufferevent_settimeout(struct bufferevent *bufev,
-+ int timeout_read, int timeout_write) {
-+ bufev->timeout_read = timeout_read;
-+ bufev->timeout_write = timeout_write;
-+}
-+
-+/*
-+ * Sets the water marks
-+ */
-+
-+void
-+bufferevent_setwatermark(struct bufferevent *bufev, short events,
-+ size_t lowmark, size_t highmark)
-+{
-+ if (events & EV_READ) {
-+ bufev->wm_read.low = lowmark;
-+ bufev->wm_read.high = highmark;
-+ }
-+
-+ if (events & EV_WRITE) {
-+ bufev->wm_write.low = lowmark;
-+ bufev->wm_write.high = highmark;
-+ }
-+
-+ /* If the watermarks changed then see if we should call read again */
-+ bufferevent_read_pressure_cb(bufev->input,
-+ 0, EVBUFFER_LENGTH(bufev->input), bufev);
-+}
-+
-+int
-+bufferevent_base_set(struct event_base *base, struct bufferevent *bufev)
-+{
-+ int res;
-+
-+ res = event_base_set(base, &bufev->ev_read);
-+ if (res == -1)
-+ return (res);
-+
-+ res = event_base_set(base, &bufev->ev_write);
-+ return (res);
-+}
-diff -Nru php-5.2.4.vanilla/libevent/evdns.3 php-5.2.4.fpm/libevent/evdns.3
---- php-5.2.4.vanilla/libevent/evdns.3 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/evdns.3 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,322 @@
-+.\"
-+.\" Copyright (c) 2006 Niels Provos <provos@citi.umich.edu>
-+.\" All rights reserved.
-+.\"
-+.\" Redistribution and use in source and binary forms, with or without
-+.\" modification, are permitted provided that the following conditions
-+.\" are met:
-+.\"
-+.\" 1. Redistributions of source code must retain the above copyright
-+.\" notice, this list of conditions and the following disclaimer.
-+.\" 2. Redistributions in binary form must reproduce the above copyright
-+.\" notice, this list of conditions and the following disclaimer in the
-+.\" documentation and/or other materials provided with the distribution.
-+.\" 3. The name of the author may not be used to endorse or promote products
-+.\" derived from this software without specific prior written permission.
-+.\"
-+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-+.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-+.\" AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-+.\" THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+.\" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-+.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-+.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-+.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+.\"
-+.Dd October 7, 2006
-+.Dt EVDNS 3
-+.Os
-+.Sh NAME
-+.Nm evdns_init
-+.Nm evdns_shutdown
-+.Nm evdns_err_to_string
-+.Nm evdns_nameserver_add
-+.Nm evdns_count_nameservers
-+.Nm evdns_clear_nameservers_and_suspend
-+.Nm evdns_resume
-+.Nm evdns_nameserver_ip_add
-+.Nm evdns_resolve_ipv4
-+.Nm evdns_resolve_reverse
-+.Nm evdns_resolv_conf_parse
-+.Nm evdns_config_windows_nameservers
-+.Nm evdns_search_clear
-+.Nm evdns_search_add
-+.Nm evdns_search_ndots_set
-+.Nm evdns_set_log_fn
-+.Nd asynchronous functions for DNS resolution.
-+.Sh SYNOPSIS
-+.Fd #include <sys/time.h>
-+.Fd #include <event.h>
-+.Fd #include <evdns.h>
-+.Ft int
-+.Fn evdns_init
-+.Ft void
-+.Fn evdns_shutdown "int fail_requests"
-+.Ft "const char *"
-+.Fn evdns_err_to_string "int err"
-+.Ft int
-+.Fn evdns_nameserver_add "unsigned long int address"
-+.Ft int
-+.Fn evdns_count_nameservers
-+.Ft int
-+.Fn evdns_clear_nameservers_and_suspend
-+.Ft int
-+.Fn evdns_resume
-+.Ft int
-+.Fn evdns_nameserver_ip_add(const char *ip_as_string);
-+.Ft int
-+.Fn evdns_resolve_ipv4 "const char *name" "int flags" "evdns_callback_type callback" "void *ptr"
-+.Ft int
-+.Fn evdns_resolve_reverse "struct in_addr *in" "int flags" "evdns_callback_type callback" "void *ptr"
-+.Ft int
-+.Fn evdns_resolv_conf_parse "int flags" "const char *"
-+.Ft void
-+.Fn evdns_search_clear
-+.Ft void
-+.Fn evdns_search_add "const char *domain"
-+.Ft void
-+.Fn evdns_search_ndots_set "const int ndots"
-+.Ft void
-+.Fn evdns_set_log_fn "evdns_debug_log_fn_type fn"
-+.Ft int
-+.Fn evdns_config_windows_nameservers
-+.Sh DESCRIPTION
-+Welcome, gentle reader
-+.Pp
-+Async DNS lookups are really a whole lot harder than they should be,
-+mostly stemming from the fact that the libc resolver has never been
-+very good at them. Before you use this library you should see if libc
-+can do the job for you with the modern async call getaddrinfo_a
-+(see http://www.imperialviolet.org/page25.html#e498). Otherwise,
-+please continue.
-+.Pp
-+This code is based on libevent and you must call event_init before
-+any of the APIs in this file. You must also seed the OpenSSL random
-+source if you are using OpenSSL for ids (see below).
-+.Pp
-+This library is designed to be included and shipped with your source
-+code. You statically link with it. You should also test for the
-+existence of strtok_r and define HAVE_STRTOK_R if you have it.
-+.Pp
-+The DNS protocol requires a good source of id numbers and these
-+numbers should be unpredictable for spoofing reasons. There are
-+three methods for generating them here and you must define exactly
-+one of them. In increasing order of preference:
-+.Pp
-+.Bl -tag -width "DNS_USE_GETTIMEOFDAY_FOR_ID" -compact -offset indent
-+.It DNS_USE_GETTIMEOFDAY_FOR_ID
-+Using the bottom 16 bits of the usec result from gettimeofday. This
-+is a pretty poor solution but should work anywhere.
-+.It DNS_USE_CPU_CLOCK_FOR_ID
-+Using the bottom 16 bits of the nsec result from the CPU's time
-+counter. This is better, but may not work everywhere. Requires
-+POSIX realtime support and you'll need to link against -lrt on
-+glibc systems at least.
-+.It DNS_USE_OPENSSL_FOR_ID
-+Uses the OpenSSL RAND_bytes call to generate the data. You must
-+have seeded the pool before making any calls to this library.
-+.El
-+.Pp
-+The library keeps track of the state of nameservers and will avoid
-+them when they go down. Otherwise it will round robin between them.
-+.Pp
-+Quick start guide:
-+ #include "evdns.h"
-+ void callback(int result, char type, int count, int ttl,
-+ void *addresses, void *arg);
-+ evdns_resolv_conf_parse(DNS_OPTIONS_ALL, "/etc/resolv.conf");
-+ evdns_resolve("www.hostname.com", 0, callback, NULL);
-+.Pp
-+When the lookup is complete the callback function is called. The
-+first argument will be one of the DNS_ERR_* defines in evdns.h.
-+Hopefully it will be DNS_ERR_NONE, in which case type will be
-+DNS_IPv4_A, count will be the number of IP addresses, ttl is the time
-+which the data can be cached for (in seconds), addresses will point
-+to an array of uint32_t's and arg will be whatever you passed to
-+evdns_resolve.
-+.Pp
-+Searching:
-+.Pp
-+In order for this library to be a good replacement for glibc's resolver it
-+supports searching. This involves setting a list of default domains, in
-+which names will be queried for. The number of dots in the query name
-+determines the order in which this list is used.
-+.Pp
-+Searching appears to be a single lookup from the point of view of the API,
-+although many DNS queries may be generated from a single call to
-+evdns_resolve. Searching can also drastically slow down the resolution
-+of names.
-+.Pp
-+To disable searching:
-+.Bl -enum -compact -offset indent
-+.It
-+Never set it up. If you never call
-+.Fn evdns_resolv_conf_parse,
-+.Fn evdns_init,
-+or
-+.Fn evdns_search_add
-+then no searching will occur.
-+.It
-+If you do call
-+.Fn evdns_resolv_conf_parse
-+then don't pass
-+.Va DNS_OPTION_SEARCH
-+(or
-+.Va DNS_OPTIONS_ALL,
-+which implies it).
-+.It
-+When calling
-+.Fn evdns_resolve,
-+pass the
-+.Va DNS_QUERY_NO_SEARCH
-+flag.
-+.El
-+.Pp
-+The order of searches depends on the number of dots in the name. If the
-+number is greater than the ndots setting then the names is first tried
-+globally. Otherwise each search domain is appended in turn.
-+.Pp
-+The ndots setting can either be set from a resolv.conf, or by calling
-+evdns_search_ndots_set.
-+.Pp
-+For example, with ndots set to 1 (the default) and a search domain list of
-+["myhome.net"]:
-+ Query: www
-+ Order: www.myhome.net, www.
-+.Pp
-+ Query: www.abc
-+ Order: www.abc., www.abc.myhome.net
-+.Pp
-+.Sh API reference
-+.Pp
-+.Bl -tag -width 0123456
-+.It Ft int Fn evdns_init
-+Initializes support for non-blocking name resolution by calling
-+.Fn evdns_resolv_conf_parse
-+on UNIX and
-+.Fn evdns_config_windows_nameservers
-+on Windows.
-+.It Ft int Fn evdns_nameserver_add "unsigned long int address"
-+Add a nameserver. The address should be an IP address in
-+network byte order. The type of address is chosen so that
-+it matches in_addr.s_addr.
-+Returns non-zero on error.
-+.It Ft int Fn evdns_nameserver_ip_add "const char *ip_as_string"
-+This wraps the above function by parsing a string as an IP
-+address and adds it as a nameserver.
-+Returns non-zero on error
-+.It Ft int Fn evdns_resolve "const char *name" "int flags" "evdns_callback_type callback" "void *ptr"
-+Resolve a name. The name parameter should be a DNS name.
-+The flags parameter should be 0, or DNS_QUERY_NO_SEARCH
-+which disables searching for this query. (see defn of
-+searching above).
-+.Pp
-+The callback argument is a function which is called when
-+this query completes and ptr is an argument which is passed
-+to that callback function.
-+.Pp
-+Returns non-zero on error
-+.It Ft void Fn evdns_search_clear
-+Clears the list of search domains
-+.It Ft void Fn evdns_search_add "const char *domain"
-+Add a domain to the list of search domains
-+.It Ft void Fn evdns_search_ndots_set "int ndots"
-+Set the number of dots which, when found in a name, causes
-+the first query to be without any search domain.
-+.It Ft int Fn evdns_count_nameservers "void"
-+Return the number of configured nameservers (not necessarily the
-+number of running nameservers). This is useful for double-checking
-+whether our calls to the various nameserver configuration functions
-+have been successful.
-+.It Ft int Fn evdns_clear_nameservers_and_suspend "void"
-+Remove all currently configured nameservers, and suspend all pending
-+resolves. Resolves will not necessarily be re-attempted until
-+evdns_resume() is called.
-+.It Ft int Fn evdns_resume "void"
-+Re-attempt resolves left in limbo after an earlier call to
-+evdns_clear_nameservers_and_suspend().
-+.It Ft int Fn evdns_config_windows_nameservers "void"
-+Attempt to configure a set of nameservers based on platform settings on
-+a win32 host. Preferentially tries to use GetNetworkParams; if that fails,
-+looks in the registry. Returns 0 on success, nonzero on failure.
-+.It Ft int Fn evdns_resolv_conf_parse "int flags" "const char *filename"
-+Parse a resolv.conf like file from the given filename.
-+.Pp
-+See the man page for resolv.conf for the format of this file.
-+The flags argument determines what information is parsed from
-+this file:
-+.Bl -tag -width "DNS_OPTION_NAMESERVERS" -offset indent -compact -nested
-+.It DNS_OPTION_SEARCH
-+domain, search and ndots options
-+.It DNS_OPTION_NAMESERVERS
-+nameserver lines
-+.It DNS_OPTION_MISC
-+timeout and attempts options
-+.It DNS_OPTIONS_ALL
-+all of the above
-+.El
-+.Pp
-+The following directives are not parsed from the file:
-+ sortlist, rotate, no-check-names, inet6, debug
-+.Pp
-+Returns non-zero on error:
-+.Bl -tag -width "0" -offset indent -compact -nested
-+.It 0
-+no errors
-+.It 1
-+failed to open file
-+.It 2
-+failed to stat file
-+.It 3
-+file too large
-+.It 4
-+out of memory
-+.It 5
-+short read from file
-+.El
-+.El
-+.Sh Internals:
-+Requests are kept in two queues. The first is the inflight queue. In
-+this queue requests have an allocated transaction id and nameserver.
-+They will soon be transmitted if they haven't already been.
-+.Pp
-+The second is the waiting queue. The size of the inflight ring is
-+limited and all other requests wait in waiting queue for space. This
-+bounds the number of concurrent requests so that we don't flood the
-+nameserver. Several algorithms require a full walk of the inflight
-+queue and so bounding its size keeps thing going nicely under huge
-+(many thousands of requests) loads.
-+.Pp
-+If a nameserver loses too many requests it is considered down and we
-+try not to use it. After a while we send a probe to that nameserver
-+(a lookup for google.com) and, if it replies, we consider it working
-+again. If the nameserver fails a probe we wait longer to try again
-+with the next probe.
-+.Sh SEE ALSO
-+.Xr event 3 ,
-+.Xr gethostbyname 3 ,
-+.Xr resolv.conf 5
-+.Sh HISTORY
-+The
-+.Nm evdns
-+API was developed by Adam Langley on top of the
-+.Nm libevent
-+API.
-+The code was integrate into
-+.Nm Tor
-+by Nick Mathewson and finally put into
-+.Nm libevent
-+itself by Niels Provos.
-+.Sh AUTHORS
-+The
-+.Nm evdns
-+API and code was written by Adam Langley with significant
-+contributions by Nick Mathewson.
-+.Sh BUGS
-+This documentation is neither complete nor authoritative.
-+If you are in doubt about the usage of this API then
-+check the source code to find out how it works, write
-+up the missing piece of documentation and send it to
-+me for inclusion in this man page.
-diff -Nru php-5.2.4.vanilla/libevent/evdns.c php-5.2.4.fpm/libevent/evdns.c
---- php-5.2.4.vanilla/libevent/evdns.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/evdns.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,3114 @@
-+/* $Id$ */
-+
-+/* The original version of this module was written by Adam Langley; for
-+ * a history of modifications, check out the subversion logs.
-+ *
-+ * When editing this module, try to keep it re-mergeable by Adam. Don't
-+ * reformat the whitespace, add Tor dependencies, or so on.
-+ *
-+ * TODO:
-+ * - Support IPv6 and PTR records.
-+ * - Replace all externally visible magic numbers with #defined constants.
-+ * - Write doccumentation for APIs of all external functions.
-+ */
-+
-+/* Async DNS Library
-+ * Adam Langley <agl@imperialviolet.org>
-+ * http://www.imperialviolet.org/eventdns.html
-+ * Public Domain code
-+ *
-+ * This software is Public Domain. To view a copy of the public domain dedication,
-+ * visit http://creativecommons.org/licenses/publicdomain/ or send a letter to
-+ * Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
-+ *
-+ * I ask and expect, but do not require, that all derivative works contain an
-+ * attribution similar to:
-+ * Parts developed by Adam Langley <agl@imperialviolet.org>
-+ *
-+ * You may wish to replace the word "Parts" with something else depending on
-+ * the amount of original code.
-+ *
-+ * (Derivative works does not include programs which link against, run or include
-+ * the source verbatim in their source distributions)
-+ *
-+ * Version: 0.1b
-+ */
-+
-+#include <sys/types.h>
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#ifdef WIN32
-+#include "misc.h"
-+#endif
-+
-+//#define NDEBUG
-+
-+#ifndef DNS_USE_CPU_CLOCK_FOR_ID
-+#ifndef DNS_USE_GETTIMEOFDAY_FOR_ID
-+#ifndef DNS_USE_OPENSSL_FOR_ID
-+#error Must configure at least one id generation method.
-+#error Please see the documentation.
-+#endif
-+#endif
-+#endif
-+
-+// #define _POSIX_C_SOURCE 200507
-+#define _GNU_SOURCE
-+
-+#ifdef DNS_USE_CPU_CLOCK_FOR_ID
-+#ifdef DNS_USE_OPENSSL_FOR_ID
-+#error Multiple id options selected
-+#endif
-+#ifdef DNS_USE_GETTIMEOFDAY_FOR_ID
-+#error Multiple id options selected
-+#endif
-+#include <time.h>
-+#endif
-+
-+#ifdef DNS_USE_OPENSSL_FOR_ID
-+#ifdef DNS_USE_GETTIMEOFDAY_FOR_ID
-+#error Multiple id options selected
-+#endif
-+#include <openssl/rand.h>
-+#endif
-+
-+#define _FORTIFY_SOURCE 3
-+
-+#include <string.h>
-+#include <fcntl.h>
-+#include <sys/time.h>
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <assert.h>
-+#include <unistd.h>
-+#include <limits.h>
-+#include <sys/stat.h>
-+#include <ctype.h>
-+#include <stdio.h>
-+#include <stdarg.h>
-+
-+#include "evdns.h"
-+#include "log.h"
-+#ifdef WIN32
-+#include <windows.h>
-+#include <winsock2.h>
-+#include <iphlpapi.h>
-+#else
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#endif
-+
-+#ifdef HAVE_NETINET_IN6_H
-+#include <netinet/in6.h>
-+#endif
-+
-+#ifdef WIN32
-+typedef int socklen_t;
-+#endif
-+
-+#define EVDNS_LOG_DEBUG 0
-+#define EVDNS_LOG_WARN 1
-+
-+#ifndef HOST_NAME_MAX
-+#define HOST_NAME_MAX 255
-+#endif
-+
-+#ifndef NDEBUG
-+#include <stdio.h>
-+#endif
-+
-+#undef MIN
-+#define MIN(a,b) ((a)<(b)?(a):(b))
-+
-+#ifdef __USE_ISOC99B
-+// libevent doesn't work without this
-+typedef uint8_t u_char;
-+typedef unsigned int uint;
-+#endif
-+#include <event.h>
-+
-+#define u64 uint64_t
-+#define u32 uint32_t
-+#define u16 uint16_t
-+#define u8 uint8_t
-+
-+#define MAX_ADDRS 4 // maximum number of addresses from a single packet
-+// which we bother recording
-+
-+#define TYPE_A EVDNS_TYPE_A
-+#define TYPE_CNAME 5
-+#define TYPE_PTR EVDNS_TYPE_PTR
-+#define TYPE_AAAA EVDNS_TYPE_AAAA
-+
-+#define CLASS_INET EVDNS_CLASS_INET
-+
-+struct request {
-+ u8 *request; // the dns packet data
-+ unsigned int request_len;
-+ int reissue_count;
-+ int tx_count; // the number of times that this packet has been sent
-+ unsigned int request_type; // TYPE_PTR or TYPE_A
-+ void *user_pointer; // the pointer given to us for this request
-+ evdns_callback_type user_callback;
-+ struct nameserver *ns; // the server which we last sent it
-+
-+ // elements used by the searching code
-+ int search_index;
-+ struct search_state *search_state;
-+ char *search_origname; // needs to be free()ed
-+ int search_flags;
-+
-+ // these objects are kept in a circular list
-+ struct request *next, *prev;
-+
-+ struct event timeout_event;
-+
-+ u16 trans_id; // the transaction id
-+ char request_appended; // true if the request pointer is data which follows this struct
-+ char transmit_me; // needs to be transmitted
-+};
-+
-+#ifndef HAVE_STRUCT_IN6_ADDR
-+struct in6_addr {
-+ u8 s6_addr[16];
-+};
-+#endif
-+
-+struct reply {
-+ unsigned int type;
-+ unsigned int have_answer;
-+ union {
-+ struct {
-+ u32 addrcount;
-+ u32 addresses[MAX_ADDRS];
-+ } a;
-+ struct {
-+ u32 addrcount;
-+ struct in6_addr addresses[MAX_ADDRS];
-+ } aaaa;
-+ struct {
-+ char name[HOST_NAME_MAX];
-+ } ptr;
-+ } data;
-+};
-+
-+struct nameserver {
-+ int socket; // a connected UDP socket
-+ u32 address;
-+ int failed_times; // number of times which we have given this server a chance
-+ int timedout; // number of times in a row a request has timed out
-+ struct event event;
-+ // these objects are kept in a circular list
-+ struct nameserver *next, *prev;
-+ struct event timeout_event; // used to keep the timeout for
-+ // when we next probe this server.
-+ // Valid if state == 0
-+ char state; // zero if we think that this server is down
-+ char choked; // true if we have an EAGAIN from this server's socket
-+ char write_waiting; // true if we are waiting for EV_WRITE events
-+};
-+
-+static struct request *req_head = NULL, *req_waiting_head = NULL;
-+static struct nameserver *server_head = NULL;
-+
-+// Represents a local port where we're listening for DNS requests. Right now,
-+// only UDP is supported.
-+struct evdns_server_port {
-+ int socket; // socket we use to read queries and write replies.
-+ int refcnt; // reference count.
-+ char choked; // Are we currently blocked from writing?
-+ char closing; // Are we trying to close this port, pending writes?
-+ evdns_request_callback_fn_type user_callback; // Fn to handle requests
-+ void *user_data; // Opaque pointer passed to user_callback
-+ struct event event; // Read/write event
-+ // circular list of replies that we want to write.
-+ struct server_request *pending_replies;
-+};
-+
-+// Represents part of a reply being built. (That is, a single RR.)
-+struct server_reply_item {
-+ struct server_reply_item *next; // next item in sequence.
-+ char *name; // name part of the RR
-+ u16 type : 16; // The RR type
-+ u16 class : 16; // The RR class (usually CLASS_INET)
-+ u32 ttl; // The RR TTL
-+ char is_name; // True iff data is a label
-+ u16 datalen; // Length of data; -1 if data is a label
-+ void *data; // The contents of the RR
-+};
-+
-+// Represents a request that we've received as a DNS server, and holds
-+// the components of the reply as we're constructing it.
-+struct server_request {
-+ // Pointers to the next and previous entries on the list of replies
-+ // that we're waiting to write. Only set if we have tried to respond
-+ // and gotten EAGAIN.
-+ struct server_request *next_pending;
-+ struct server_request *prev_pending;
-+
-+ u16 trans_id; // Transaction id.
-+ struct evdns_server_port *port; // Which port received this request on?
-+ struct sockaddr_storage addr; // Where to send the response
-+ socklen_t addrlen; // length of addr
-+
-+ int n_answer; // how many answer RRs have been set?
-+ int n_authority; // how many authority RRs have been set?
-+ int n_additional; // how many additional RRs have been set?
-+
-+ struct server_reply_item *answer; // linked list of answer RRs
-+ struct server_reply_item *authority; // linked list of authority RRs
-+ struct server_reply_item *additional; // linked list of additional RRs
-+
-+ // Constructed response. Only set once we're ready to send a reply.
-+ // Once this is set, the RR fields are cleared, and no more should be set.
-+ char *response;
-+ size_t response_len;
-+
-+ // Caller-visible fields: flags, questions.
-+ struct evdns_server_request base;
-+};
-+
-+// helper macro
-+#define OFFSET_OF(st, member) ((off_t) (((char*)&((st*)0)->member)-(char*)0))
-+
-+// Given a pointer to an evdns_server_request, get the corresponding
-+// server_request.
-+#define TO_SERVER_REQUEST(base_ptr) \
-+ ((struct server_request*) \
-+ (((char*)(base_ptr) - OFFSET_OF(struct server_request, base))))
-+
-+// The number of good nameservers that we have
-+static int global_good_nameservers = 0;
-+
-+// inflight requests are contained in the req_head list
-+// and are actually going out across the network
-+static int global_requests_inflight = 0;
-+// requests which aren't inflight are in the waiting list
-+// and are counted here
-+static int global_requests_waiting = 0;
-+
-+static int global_max_requests_inflight = 64;
-+
-+static struct timeval global_timeout = {5, 0}; // 5 seconds
-+static int global_max_reissues = 1; // a reissue occurs when we get some errors from the server
-+static int global_max_retransmits = 3; // number of times we'll retransmit a request which timed out
-+// number of timeouts in a row before we consider this server to be down
-+static int global_max_nameserver_timeout = 3;
-+
-+// These are the timeout values for nameservers. If we find a nameserver is down
-+// we try to probe it at intervals as given below. Values are in seconds.
-+static const struct timeval global_nameserver_timeouts[] = {{10, 0}, {60, 0}, {300, 0}, {900, 0}, {3600, 0}};
-+static const int global_nameserver_timeouts_length = sizeof(global_nameserver_timeouts)/sizeof(struct timeval);
-+
-+static const char *const evdns_error_strings[] = {"no error", "The name server was unable to interpret the query", "The name server suffered an internal error", "The requested domain name does not exist", "The name server refused to reply to the request"};
-+
-+static struct nameserver *nameserver_pick(void);
-+static void evdns_request_insert(struct request *req, struct request **head);
-+static void nameserver_ready_callback(int fd, short events, void *arg);
-+static int evdns_transmit(void);
-+static int evdns_request_transmit(struct request *req);
-+static void nameserver_send_probe(struct nameserver *const ns);
-+static void search_request_finished(struct request *const);
-+static int search_try_next(struct request *const req);
-+static int search_request_new(int type, const char *const name, int flags, evdns_callback_type user_callback, void *user_arg);
-+static void evdns_requests_pump_waiting_queue(void);
-+static u16 transaction_id_pick(void);
-+static struct request *request_new(int type, const char *name, int flags, evdns_callback_type callback, void *ptr);
-+static void request_submit(struct request *req);
-+
-+static int server_request_free(struct server_request *req);
-+static void server_request_free_answers(struct server_request *req);
-+static void server_port_free(struct evdns_server_port *port);
-+static void server_port_ready_callback(int fd, short events, void *arg);
-+
-+static int strtoint(const char *const str);
-+
-+#ifdef WIN32
-+static int
-+last_error(int sock)
-+{
-+ int optval, optvallen=sizeof(optval);
-+ int err = WSAGetLastError();
-+ if (err == WSAEWOULDBLOCK && sock >= 0) {
-+ if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (void*)&optval,
-+ &optvallen))
-+ return err;
-+ if (optval)
-+ return optval;
-+ }
-+ return err;
-+
-+}
-+static int
-+error_is_eagain(int err)
-+{
-+ return err == EAGAIN || err == WSAEWOULDBLOCK;
-+}
-+static int
-+inet_aton(const char *c, struct in_addr *addr)
-+{
-+ uint32_t r;
-+ if (strcmp(c, "255.255.255.255") == 0) {
-+ addr->s_addr = 0xffffffffu;
-+ } else {
-+ r = inet_addr(c);
-+ if (r == INADDR_NONE)
-+ return 0;
-+ addr->s_addr = r;
-+ }
-+ return 1;
-+}
-+#define CLOSE_SOCKET(x) closesocket(x)
-+#else
-+#define last_error(sock) (errno)
-+#define error_is_eagain(err) ((err) == EAGAIN)
-+#define CLOSE_SOCKET(x) close(x)
-+#endif
-+
-+#define ISSPACE(c) isspace((int)(unsigned char)(c))
-+#define ISDIGIT(c) isdigit((int)(unsigned char)(c))
-+
-+#ifndef NDEBUG
-+static const char *
-+debug_ntoa(u32 address)
-+{
-+ static char buf[32];
-+ u32 a = ntohl(address);
-+ snprintf(buf, sizeof(buf), "%d.%d.%d.%d",
-+ (int)(u8)((a>>24)&0xff),
-+ (int)(u8)((a>>16)&0xff),
-+ (int)(u8)((a>>8 )&0xff),
-+ (int)(u8)((a )&0xff));
-+ return buf;
-+}
-+#endif
-+
-+static evdns_debug_log_fn_type evdns_log_fn = NULL;
-+
-+void
-+evdns_set_log_fn(evdns_debug_log_fn_type fn)
-+{
-+ evdns_log_fn = fn;
-+}
-+
-+#ifdef __GNUC__
-+#define EVDNS_LOG_CHECK __attribute__ ((format(printf, 2, 3)))
-+#else
-+#define EVDNS_LOG_CHECK
-+#endif
-+
-+static void _evdns_log(int warn, const char *fmt, ...) EVDNS_LOG_CHECK;
-+static void
-+_evdns_log(int warn, const char *fmt, ...)
-+{
-+ va_list args;
-+ static char buf[512];
-+ if (!evdns_log_fn)
-+ return;
-+ va_start(args,fmt);
-+#ifdef WIN32
-+ _vsnprintf(buf, sizeof(buf), fmt, args);
-+#else
-+ vsnprintf(buf, sizeof(buf), fmt, args);
-+#endif
-+ buf[sizeof(buf)-1] = '\0';
-+ evdns_log_fn(warn, buf);
-+ va_end(args);
-+}
-+
-+#define log _evdns_log
-+
-+// This walks the list of inflight requests to find the
-+// one with a matching transaction id. Returns NULL on
-+// failure
-+static struct request *
-+request_find_from_trans_id(u16 trans_id) {
-+ struct request *req = req_head, *const started_at = req_head;
-+
-+ if (req) {
-+ do {
-+ if (req->trans_id == trans_id) return req;
-+ req = req->next;
-+ } while (req != started_at);
-+ }
-+
-+ return NULL;
-+}
-+
-+// a libevent callback function which is called when a nameserver
-+// has gone down and we want to test if it has came back to life yet
-+static void
-+nameserver_prod_callback(int fd, short events, void *arg) {
-+ struct nameserver *const ns = (struct nameserver *) arg;
-+ (void)fd;
-+ (void)events;
-+
-+ nameserver_send_probe(ns);
-+}
-+
-+// a libevent callback which is called when a nameserver probe (to see if
-+// it has come back to life) times out. We increment the count of failed_times
-+// and wait longer to send the next probe packet.
-+static void
-+nameserver_probe_failed(struct nameserver *const ns) {
-+ const struct timeval * timeout;
-+ (void) evtimer_del(&ns->timeout_event);
-+ if (ns->state == 1) {
-+ // This can happen if the nameserver acts in a way which makes us mark
-+ // it as bad and then starts sending good replies.
-+ return;
-+ }
-+
-+ timeout =
-+ &global_nameserver_timeouts[MIN(ns->failed_times,
-+ global_nameserver_timeouts_length - 1)];
-+ ns->failed_times++;
-+
-+ evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
-+ if (evtimer_add(&ns->timeout_event, (struct timeval *) timeout) < 0) {
-+ log(EVDNS_LOG_WARN,
-+ "Error from libevent when adding timer event for %s",
-+ debug_ntoa(ns->address));
-+ // ???? Do more?
-+ }
-+}
-+
-+// called when a nameserver has been deemed to have failed. For example, too
-+// many packets have timed out etc
-+static void
-+nameserver_failed(struct nameserver *const ns, const char *msg) {
-+ struct request *req, *started_at;
-+ // if this nameserver has already been marked as failed
-+ // then don't do anything
-+ if (!ns->state) return;
-+
-+ log(EVDNS_LOG_WARN, "Nameserver %s has failed: %s",
-+ debug_ntoa(ns->address), msg);
-+ global_good_nameservers--;
-+ assert(global_good_nameservers >= 0);
-+ if (global_good_nameservers == 0) {
-+ log(EVDNS_LOG_WARN, "All nameservers have failed");
-+ }
-+
-+ ns->state = 0;
-+ ns->failed_times = 1;
-+
-+ evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
-+ if (evtimer_add(&ns->timeout_event, (struct timeval *) &global_nameserver_timeouts[0]) < 0) {
-+ log(EVDNS_LOG_WARN,
-+ "Error from libevent when adding timer event for %s",
-+ debug_ntoa(ns->address));
-+ // ???? Do more?
-+ }
-+
-+ // walk the list of inflight requests to see if any can be reassigned to
-+ // a different server. Requests in the waiting queue don't have a
-+ // nameserver assigned yet
-+
-+ // if we don't have *any* good nameservers then there's no point
-+ // trying to reassign requests to one
-+ if (!global_good_nameservers) return;
-+
-+ req = req_head;
-+ started_at = req_head;
-+ if (req) {
-+ do {
-+ if (req->tx_count == 0 && req->ns == ns) {
-+ // still waiting to go out, can be moved
-+ // to another server
-+ req->ns = nameserver_pick();
-+ }
-+ req = req->next;
-+ } while (req != started_at);
-+ }
-+}
-+
-+static void
-+nameserver_up(struct nameserver *const ns) {
-+ if (ns->state) return;
-+ log(EVDNS_LOG_WARN, "Nameserver %s is back up",
-+ debug_ntoa(ns->address));
-+ evtimer_del(&ns->timeout_event);
-+ ns->state = 1;
-+ ns->failed_times = 0;
-+ ns->timedout = 0;
-+ global_good_nameservers++;
-+}
-+
-+static void
-+request_trans_id_set(struct request *const req, const u16 trans_id) {
-+ req->trans_id = trans_id;
-+ *((u16 *) req->request) = htons(trans_id);
-+}
-+
-+// Called to remove a request from a list and dealloc it.
-+// head is a pointer to the head of the list it should be
-+// removed from or NULL if the request isn't in a list.
-+static void
-+request_finished(struct request *const req, struct request **head) {
-+ if (head) {
-+ if (req->next == req) {
-+ // only item in the list
-+ *head = NULL;
-+ } else {
-+ req->next->prev = req->prev;
-+ req->prev->next = req->next;
-+ if (*head == req) *head = req->next;
-+ }
-+ }
-+
-+ log(EVDNS_LOG_DEBUG, "Removing timeout for request %lx",
-+ (unsigned long) req);
-+ evtimer_del(&req->timeout_event);
-+
-+ search_request_finished(req);
-+ global_requests_inflight--;
-+
-+ if (!req->request_appended) {
-+ // need to free the request data on it's own
-+ free(req->request);
-+ } else {
-+ // the request data is appended onto the header
-+ // so everything gets free()ed when we:
-+ }
-+
-+ free(req);
-+
-+ evdns_requests_pump_waiting_queue();
-+}
-+
-+// This is called when a server returns a funny error code.
-+// We try the request again with another server.
-+//
-+// return:
-+// 0 ok
-+// 1 failed/reissue is pointless
-+static int
-+request_reissue(struct request *req) {
-+ const struct nameserver *const last_ns = req->ns;
-+ // the last nameserver should have been marked as failing
-+ // by the caller of this function, therefore pick will try
-+ // not to return it
-+ req->ns = nameserver_pick();
-+ if (req->ns == last_ns) {
-+ // ... but pick did return it
-+ // not a lot of point in trying again with the
-+ // same server
-+ return 1;
-+ }
-+
-+ req->reissue_count++;
-+ req->tx_count = 0;
-+ req->transmit_me = 1;
-+
-+ return 0;
-+}
-+
-+// this function looks for space on the inflight queue and promotes
-+// requests from the waiting queue if it can.
-+static void
-+evdns_requests_pump_waiting_queue(void) {
-+ while (global_requests_inflight < global_max_requests_inflight &&
-+ global_requests_waiting) {
-+ struct request *req;
-+ // move a request from the waiting queue to the inflight queue
-+ assert(req_waiting_head);
-+ if (req_waiting_head->next == req_waiting_head) {
-+ // only one item in the queue
-+ req = req_waiting_head;
-+ req_waiting_head = NULL;
-+ } else {
-+ req = req_waiting_head;
-+ req->next->prev = req->prev;
-+ req->prev->next = req->next;
-+ req_waiting_head = req->next;
-+ }
-+
-+ global_requests_waiting--;
-+ global_requests_inflight++;
-+
-+ req->ns = nameserver_pick();
-+ request_trans_id_set(req, transaction_id_pick());
-+
-+ evdns_request_insert(req, &req_head);
-+ evdns_request_transmit(req);
-+ evdns_transmit();
-+ }
-+}
-+
-+static void
-+reply_callback(struct request *const req, u32 ttl, u32 err, struct reply *reply) {
-+ switch (req->request_type) {
-+ case TYPE_A:
-+ if (reply)
-+ req->user_callback(DNS_ERR_NONE, DNS_IPv4_A,
-+ reply->data.a.addrcount, ttl,
-+ reply->data.a.addresses,
-+ req->user_pointer);
-+ else
-+ req->user_callback(err, 0, 0, 0, NULL, req->user_pointer);
-+ return;
-+ case TYPE_PTR:
-+ if (reply) {
-+ char *name = reply->data.ptr.name;
-+ req->user_callback(DNS_ERR_NONE, DNS_PTR, 1, ttl,
-+ &name, req->user_pointer);
-+ } else {
-+ req->user_callback(err, 0, 0, 0, NULL,
-+ req->user_pointer);
-+ }
-+ return;
-+ case TYPE_AAAA:
-+ if (reply)
-+ req->user_callback(DNS_ERR_NONE, DNS_IPv6_AAAA,
-+ reply->data.aaaa.addrcount, ttl,
-+ reply->data.aaaa.addresses,
-+ req->user_pointer);
-+ else
-+ req->user_callback(err, 0, 0, 0, NULL, req->user_pointer);
-+ return;
-+ }
-+ assert(0);
-+}
-+
-+// this processes a parsed reply packet
-+static void
-+reply_handle(struct request *const req, u16 flags, u32 ttl, struct reply *reply) {
-+ int error;
-+ static const int error_codes[] = {DNS_ERR_FORMAT, DNS_ERR_SERVERFAILED, DNS_ERR_NOTEXIST, DNS_ERR_NOTIMPL, DNS_ERR_REFUSED};
-+
-+ if (flags & 0x020f || !reply || !reply->have_answer) {
-+ // there was an error
-+ if (flags & 0x0200) {
-+ error = DNS_ERR_TRUNCATED;
-+ } else {
-+ u16 error_code = (flags & 0x000f) - 1;
-+ if (error_code > 4) {
-+ error = DNS_ERR_UNKNOWN;
-+ } else {
-+ error = error_codes[error_code];
-+ }
-+ }
-+
-+ switch(error) {
-+ case DNS_ERR_NOTIMPL:
-+ case DNS_ERR_REFUSED:
-+ // we regard these errors as marking a bad nameserver
-+ if (req->reissue_count < global_max_reissues) {
-+ char msg[64];
-+ snprintf(msg, sizeof(msg), "Bad response %d (%s)",
-+ error, evdns_err_to_string(error));
-+ nameserver_failed(req->ns, msg);
-+ if (!request_reissue(req)) return;
-+ }
-+ break;
-+ case DNS_ERR_SERVERFAILED:
-+ // rcode 2 (servfailed) sometimes means "we are broken" and
-+ // sometimes (with some binds) means "that request was very
-+ // confusing." Treat this as a timeout, not a failure.
-+ log(EVDNS_LOG_DEBUG, "Got a SERVERFAILED from nameserver %s; "
-+ "will allow the request to time out.",
-+ debug_ntoa(req->ns->address));
-+ break;
-+ default:
-+ // we got a good reply from the nameserver
-+ nameserver_up(req->ns);
-+ }
-+
-+ if (req->search_state && req->request_type != TYPE_PTR) {
-+ // if we have a list of domains to search in, try the next one
-+ if (!search_try_next(req)) {
-+ // a new request was issued so this request is finished and
-+ // the user callback will be made when that request (or a
-+ // child of it) finishes.
-+ request_finished(req, &req_head);
-+ return;
-+ }
-+ }
-+
-+ // all else failed. Pass the failure up
-+ reply_callback(req, 0, error, NULL);
-+ request_finished(req, &req_head);
-+ } else {
-+ // all ok, tell the user
-+ reply_callback(req, ttl, 0, reply);
-+ nameserver_up(req->ns);
-+ request_finished(req, &req_head);
-+ }
-+}
-+
-+static inline int
-+name_parse(u8 *packet, int length, int *idx, char *name_out, int name_out_len) {
-+ int name_end = -1;
-+ int j = *idx;
-+ int ptr_count = 0;
-+#define GET32(x) do { if (j + 4 > length) goto err; memcpy(&_t32, packet + j, 4); j += 4; x = ntohl(_t32); } while(0);
-+#define GET16(x) do { if (j + 2 > length) goto err; memcpy(&_t, packet + j, 2); j += 2; x = ntohs(_t); } while(0);
-+#define GET8(x) do { if (j >= length) goto err; x = packet[j++]; } while(0);
-+
-+ char *cp = name_out;
-+ const char *const end = name_out + name_out_len;
-+
-+ // Normally, names are a series of length prefixed strings terminated
-+ // with a length of 0 (the lengths are u8's < 63).
-+ // However, the length can start with a pair of 1 bits and that
-+ // means that the next 14 bits are a pointer within the current
-+ // packet.
-+
-+ for(;;) {
-+ u8 label_len;
-+ if (j >= length) return -1;
-+ GET8(label_len);
-+ if (!label_len) break;
-+ if (label_len & 0xc0) {
-+ u8 ptr_low;
-+ GET8(ptr_low);
-+ if (name_end < 0) name_end = j;
-+ j = (((int)label_len & 0x3f) << 8) + ptr_low;
-+ /* Make sure that the target offset is in-bounds. */
-+ if (j < 0 || j >= length) return -1;
-+ /* If we've jumped more times than there are characters in the
-+ * message, we must have a loop. */
-+ if (++ptr_count > length) return -1;
-+ continue;
-+ }
-+ if (label_len > 63) return -1;
-+ if (cp != name_out) {
-+ if (cp + 1 >= end) return -1;
-+ *cp++ = '.';
-+ }
-+ if (cp + label_len >= end) return -1;
-+ memcpy(cp, packet + j, label_len);
-+ cp += label_len;
-+ j += label_len;
-+ }
-+ if (cp >= end) return -1;
-+ *cp = '\0';
-+ if (name_end < 0)
-+ *idx = j;
-+ else
-+ *idx = name_end;
-+ return 0;
-+ err:
-+ return -1;
-+}
-+
-+// parses a raw request from a nameserver
-+static int
-+reply_parse(u8 *packet, int length) {
-+ int j = 0; // index into packet
-+ u16 _t; // used by the macros
-+ u32 _t32; // used by the macros
-+ char tmp_name[256]; // used by the macros
-+
-+ u16 trans_id, questions, answers, authority, additional, datalength;
-+ u16 flags = 0;
-+ u32 ttl, ttl_r = 0xffffffff;
-+ struct reply reply;
-+ struct request *req = NULL;
-+ unsigned int i;
-+
-+ GET16(trans_id);
-+ GET16(flags);
-+ GET16(questions);
-+ GET16(answers);
-+ GET16(authority);
-+ GET16(additional);
-+ (void) authority; /* suppress "unused variable" warnings. */
-+ (void) additional; /* suppress "unused variable" warnings. */
-+
-+ req = request_find_from_trans_id(trans_id);
-+ if (!req) return -1;
-+
-+ memset(&reply, 0, sizeof(reply));
-+
-+ // If it's not an answer, it doesn't correspond to any request.
-+ if (!(flags & 0x8000)) return -1; // must be an answer
-+ if (flags & 0x020f) {
-+ // there was an error
-+ goto err;
-+ }
-+ // if (!answers) return; // must have an answer of some form
-+
-+ // This macro skips a name in the DNS reply.
-+#define SKIP_NAME \
-+ do { tmp_name[0] = '\0'; \
-+ if (name_parse(packet, length, &j, tmp_name, sizeof(tmp_name))<0) \
-+ goto err; \
-+ } while(0);
-+
-+ reply.type = req->request_type;
-+
-+ // skip over each question in the reply
-+ for (i = 0; i < questions; ++i) {
-+ // the question looks like
-+ // <label:name><u16:type><u16:class>
-+ SKIP_NAME;
-+ j += 4;
-+ if (j >= length) goto err;
-+ }
-+
-+ // now we have the answer section which looks like
-+ // <label:name><u16:type><u16:class><u32:ttl><u16:len><data...>
-+
-+ for (i = 0; i < answers; ++i) {
-+ u16 type, class;
-+
-+ SKIP_NAME;
-+ GET16(type);
-+ GET16(class);
-+ GET32(ttl);
-+ GET16(datalength);
-+
-+ if (type == TYPE_A && class == CLASS_INET) {
-+ int addrcount, addrtocopy;
-+ if (req->request_type != TYPE_A) {
-+ j += datalength; continue;
-+ }
-+ if ((datalength & 3) != 0) /* not an even number of As. */
-+ goto err;
-+ addrcount = datalength >> 2;
-+ addrtocopy = MIN(MAX_ADDRS - reply.data.a.addrcount, (unsigned)addrcount);
-+
-+ ttl_r = MIN(ttl_r, ttl);
-+ // we only bother with the first four addresses.
-+ if (j + 4*addrtocopy > length) goto err;
-+ memcpy(&reply.data.a.addresses[reply.data.a.addrcount],
-+ packet + j, 4*addrtocopy);
-+ j += 4*addrtocopy;
-+ reply.data.a.addrcount += addrtocopy;
-+ reply.have_answer = 1;
-+ if (reply.data.a.addrcount == MAX_ADDRS) break;
-+ } else if (type == TYPE_PTR && class == CLASS_INET) {
-+ if (req->request_type != TYPE_PTR) {
-+ j += datalength; continue;
-+ }
-+ if (name_parse(packet, length, &j, reply.data.ptr.name,
-+ sizeof(reply.data.ptr.name))<0)
-+ goto err;
-+ ttl_r = MIN(ttl_r, ttl);
-+ reply.have_answer = 1;
-+ break;
-+ } else if (type == TYPE_AAAA && class == CLASS_INET) {
-+ int addrcount, addrtocopy;
-+ if (req->request_type != TYPE_AAAA) {
-+ j += datalength; continue;
-+ }
-+ if ((datalength & 15) != 0) /* not an even number of AAAAs. */
-+ goto err;
-+ addrcount = datalength >> 4; // each address is 16 bytes long
-+ addrtocopy = MIN(MAX_ADDRS - reply.data.aaaa.addrcount, (unsigned)addrcount);
-+ ttl_r = MIN(ttl_r, ttl);
-+
-+ // we only bother with the first four addresses.
-+ if (j + 16*addrtocopy > length) goto err;
-+ memcpy(&reply.data.aaaa.addresses[reply.data.aaaa.addrcount],
-+ packet + j, 16*addrtocopy);
-+ reply.data.aaaa.addrcount += addrtocopy;
-+ j += 16*addrtocopy;
-+ reply.have_answer = 1;
-+ if (reply.data.aaaa.addrcount == MAX_ADDRS) break;
-+ } else {
-+ // skip over any other type of resource
-+ j += datalength;
-+ }
-+ }
-+
-+ reply_handle(req, flags, ttl_r, &reply);
-+ return 0;
-+ err:
-+ if (req)
-+ reply_handle(req, flags, 0, NULL);
-+ return -1;
-+}
-+
-+// Parse a raw request (packet,length) sent to a nameserver port (port) from
-+// a DNS client (addr,addrlen), and if it's well-formed, call the corresponding
-+// callback.
-+static int
-+request_parse(u8 *packet, int length, struct evdns_server_port *port, struct sockaddr *addr, socklen_t addrlen)
-+{
-+ int j = 0; // index into packet
-+ u16 _t; // used by the macros
-+ char tmp_name[256]; // used by the macros
-+
-+ int i;
-+ u16 trans_id, flags, questions, answers, authority, additional;
-+ struct server_request *server_req = NULL;
-+
-+ // Get the header fields
-+ GET16(trans_id);
-+ GET16(flags);
-+ GET16(questions);
-+ GET16(answers);
-+ GET16(authority);
-+ GET16(additional);
-+
-+ if (flags & 0x8000) return -1; // Must not be an answer.
-+ if (flags & 0x7800) return -1; // only standard queries are supported
-+ flags &= 0x0300; // Only TC and RD get preserved.
-+
-+ server_req = malloc(sizeof(struct server_request));
-+ if (server_req == NULL) return -1;
-+ memset(server_req, 0, sizeof(struct server_request));
-+
-+ server_req->trans_id = trans_id;
-+ memcpy(&server_req->addr, addr, addrlen);
-+ server_req->addrlen = addrlen;
-+
-+ server_req->base.flags = flags;
-+ server_req->base.nquestions = 0;
-+ server_req->base.questions = malloc(sizeof(struct evdns_server_question *) * questions);
-+ if (server_req->base.questions == NULL)
-+ goto err;
-+
-+ for (i = 0; i < questions; ++i) {
-+ u16 type, class;
-+ struct evdns_server_question *q;
-+ int namelen;
-+ if (name_parse(packet, length, &j, tmp_name, sizeof(tmp_name))<0)
-+ goto err;
-+ GET16(type);
-+ GET16(class);
-+ namelen = strlen(tmp_name);
-+ q = malloc(sizeof(struct evdns_server_question) + namelen);
-+ if (!q)
-+ goto err;
-+ q->type = type;
-+ q->class = class;
-+ memcpy(q->name, tmp_name, namelen+1);
-+ server_req->base.questions[server_req->base.nquestions++] = q;
-+ }
-+
-+ // Ignore answers, authority, and additional.
-+
-+ server_req->port = port;
-+ port->refcnt++;
-+ port->user_callback(&(server_req->base), port->user_data);
-+
-+ return 0;
-+err:
-+ if (server_req) {
-+ if (server_req->base.questions) {
-+ for (i = 0; i < server_req->base.nquestions; ++i)
-+ free(server_req->base.questions[i]);
-+ free(server_req->base.questions);
-+ }
-+ free(server_req);
-+ }
-+ return -1;
-+
-+#undef SKIP_NAME
-+#undef GET32
-+#undef GET16
-+#undef GET8
-+}
-+
-+// Try to choose a strong transaction id which isn't already in flight
-+static u16
-+transaction_id_pick(void) {
-+ for (;;) {
-+ const struct request *req = req_head, *started_at;
-+#ifdef DNS_USE_CPU_CLOCK_FOR_ID
-+ struct timespec ts;
-+ u16 trans_id;
-+#ifdef CLOCK_MONOTONIC
-+ if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1)
-+#else
-+ if (clock_gettime(CLOCK_REALTIME, &ts) == -1)
-+#endif
-+ event_err(1, "clock_gettime");
-+ trans_id = ts.tv_nsec & 0xffff;
-+#endif
-+
-+#ifdef DNS_USE_GETTIMEOFDAY_FOR_ID
-+ struct timeval tv;
-+ u16 trans_id;
-+ gettimeofday(&tv, NULL);
-+ trans_id = tv.tv_usec & 0xffff;
-+#endif
-+
-+#ifdef DNS_USE_OPENSSL_FOR_ID
-+ u16 trans_id;
-+ if (RAND_pseudo_bytes((u8 *) &trans_id, 2) == -1) {
-+ /* // in the case that the RAND call fails we back
-+ // down to using gettimeofday.
-+ struct timeval tv;
-+ gettimeofday(&tv, NULL);
-+ trans_id = tv.tv_usec & 0xffff; */
-+ abort();
-+ }
-+#endif
-+
-+ if (trans_id == 0xffff) continue;
-+ // now check to see if that id is already inflight
-+ req = started_at = req_head;
-+ if (req) {
-+ do {
-+ if (req->trans_id == trans_id) break;
-+ req = req->next;
-+ } while (req != started_at);
-+ }
-+ // we didn't find it, so this is a good id
-+ if (req == started_at) return trans_id;
-+ }
-+}
-+
-+// choose a namesever to use. This function will try to ignore
-+// nameservers which we think are down and load balance across the rest
-+// by updating the server_head global each time.
-+static struct nameserver *
-+nameserver_pick(void) {
-+ struct nameserver *started_at = server_head, *picked;
-+ if (!server_head) return NULL;
-+
-+ // if we don't have any good nameservers then there's no
-+ // point in trying to find one.
-+ if (!global_good_nameservers) {
-+ server_head = server_head->next;
-+ return server_head;
-+ }
-+
-+ // remember that nameservers are in a circular list
-+ for (;;) {
-+ if (server_head->state) {
-+ // we think this server is currently good
-+ picked = server_head;
-+ server_head = server_head->next;
-+ return picked;
-+ }
-+
-+ server_head = server_head->next;
-+ if (server_head == started_at) {
-+ // all the nameservers seem to be down
-+ // so we just return this one and hope for the
-+ // best
-+ assert(global_good_nameservers == 0);
-+ picked = server_head;
-+ server_head = server_head->next;
-+ return picked;
-+ }
-+ }
-+}
-+
-+// this is called when a namesever socket is ready for reading
-+static void
-+nameserver_read(struct nameserver *ns) {
-+ u8 packet[1500];
-+
-+ for (;;) {
-+ const int r = recv(ns->socket, packet, sizeof(packet), 0);
-+ if (r < 0) {
-+ int err = last_error(ns->socket);
-+ if (error_is_eagain(err)) return;
-+ nameserver_failed(ns, strerror(err));
-+ return;
-+ }
-+ ns->timedout = 0;
-+ reply_parse(packet, r);
-+ }
-+}
-+
-+// Read a packet from a DNS client on a server port s, parse it, and
-+// act accordingly.
-+static void
-+server_port_read(struct evdns_server_port *s) {
-+ u8 packet[1500];
-+ struct sockaddr_storage addr;
-+ socklen_t addrlen;
-+ int r;
-+
-+ for (;;) {
-+ addrlen = sizeof(struct sockaddr_storage);
-+ r = recvfrom(s->socket, packet, sizeof(packet), 0,
-+ (struct sockaddr*) &addr, &addrlen);
-+ if (r < 0) {
-+ int err = last_error(s->socket);
-+ if (error_is_eagain(err)) return;
-+ log(EVDNS_LOG_WARN, "Error %s (%d) while reading request.",
-+ strerror(err), err);
-+ return;
-+ }
-+ request_parse(packet, r, s, (struct sockaddr*) &addr, addrlen);
-+ }
-+}
-+
-+// Try to write all pending replies on a given DNS server port.
-+static void
-+server_port_flush(struct evdns_server_port *port)
-+{
-+ while (port->pending_replies) {
-+ struct server_request *req = port->pending_replies;
-+ int r = sendto(port->socket, req->response, req->response_len, 0,
-+ (struct sockaddr*) &req->addr, req->addrlen);
-+ if (r < 0) {
-+ int err = last_error(port->socket);
-+ if (error_is_eagain(err))
-+ return;
-+ log(EVDNS_LOG_WARN, "Error %s (%d) while writing response to port; dropping", strerror(err), err);
-+ }
-+ if (server_request_free(req)) {
-+ // we released the last reference to req->port.
-+ return;
-+ }
-+ }
-+
-+ // We have no more pending requests; stop listening for 'writeable' events.
-+ (void) event_del(&port->event);
-+ event_set(&port->event, port->socket, EV_READ | EV_PERSIST,
-+ server_port_ready_callback, port);
-+ if (event_add(&port->event, NULL) < 0) {
-+ log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server.");
-+ // ???? Do more?
-+ }
-+}
-+
-+// set if we are waiting for the ability to write to this server.
-+// if waiting is true then we ask libevent for EV_WRITE events, otherwise
-+// we stop these events.
-+static void
-+nameserver_write_waiting(struct nameserver *ns, char waiting) {
-+ if (ns->write_waiting == waiting) return;
-+
-+ ns->write_waiting = waiting;
-+ (void) event_del(&ns->event);
-+ event_set(&ns->event, ns->socket, EV_READ | (waiting ? EV_WRITE : 0) | EV_PERSIST,
-+ nameserver_ready_callback, ns);
-+ if (event_add(&ns->event, NULL) < 0) {
-+ log(EVDNS_LOG_WARN, "Error from libevent when adding event for %s",
-+ debug_ntoa(ns->address));
-+ // ???? Do more?
-+ }
-+}
-+
-+// a callback function. Called by libevent when the kernel says that
-+// a nameserver socket is ready for writing or reading
-+static void
-+nameserver_ready_callback(int fd, short events, void *arg) {
-+ struct nameserver *ns = (struct nameserver *) arg;
-+ (void)fd;
-+
-+ if (events & EV_WRITE) {
-+ ns->choked = 0;
-+ if (!evdns_transmit()) {
-+ nameserver_write_waiting(ns, 0);
-+ }
-+ }
-+ if (events & EV_READ) {
-+ nameserver_read(ns);
-+ }
-+}
-+
-+// a callback function. Called by libevent when the kernel says that
-+// a server socket is ready for writing or reading.
-+static void
-+server_port_ready_callback(int fd, short events, void *arg) {
-+ struct evdns_server_port *port = (struct evdns_server_port *) arg;
-+ (void) fd;
-+
-+ if (events & EV_WRITE) {
-+ port->choked = 0;
-+ server_port_flush(port);
-+ }
-+ if (events & EV_READ) {
-+ server_port_read(port);
-+ }
-+}
-+
-+/* This is an inefficient representation; only use it via the dnslabel_table_*
-+ * functions, so that is can be safely replaced with something smarter later. */
-+#define MAX_LABELS 128
-+// Structures used to implement name compression
-+struct dnslabel_entry { char *v; int pos; };
-+struct dnslabel_table {
-+ int n_labels; // number of current entries
-+ // map from name to position in message
-+ struct dnslabel_entry labels[MAX_LABELS];
-+};
-+
-+// Initialize dnslabel_table.
-+static void
-+dnslabel_table_init(struct dnslabel_table *table)
-+{
-+ table->n_labels = 0;
-+}
-+
-+// Free all storage held by table, but not the table itself.
-+static void
-+dnslabel_clear(struct dnslabel_table *table)
-+{
-+ int i;
-+ for (i = 0; i < table->n_labels; ++i)
-+ free(table->labels[i].v);
-+ table->n_labels = 0;
-+}
-+
-+// return the position of the label in the current message, or -1 if the label
-+// hasn't been used yet.
-+static int
-+dnslabel_table_get_pos(const struct dnslabel_table *table, const char *label)
-+{
-+ int i;
-+ for (i = 0; i < table->n_labels; ++i) {
-+ if (!strcmp(label, table->labels[i].v))
-+ return table->labels[i].pos;
-+ }
-+ return -1;
-+}
-+
-+// remember that we've used the label at position pos
-+static int
-+dnslabel_table_add(struct dnslabel_table *table, const char *label, int pos)
-+{
-+ char *v;
-+ int p;
-+ if (table->n_labels == MAX_LABELS)
-+ return (-1);
-+ v = strdup(label);
-+ if (v == NULL)
-+ return (-1);
-+ p = table->n_labels++;
-+ table->labels[p].v = v;
-+ table->labels[p].pos = pos;
-+
-+ return (0);
-+}
-+
-+// Converts a string to a length-prefixed set of DNS labels, starting
-+// at buf[j]. name and buf must not overlap. name_len should be the length
-+// of name. table is optional, and is used for compression.
-+//
-+// Input: abc.def
-+// Output: <3>abc<3>def<0>
-+//
-+// Returns the first index after the encoded name, or negative on error.
-+// -1 label was > 63 bytes
-+// -2 name too long to fit in buffer.
-+//
-+static off_t
-+dnsname_to_labels(u8 *const buf, size_t buf_len, off_t j,
-+ const char *name, const int name_len,
-+ struct dnslabel_table *table) {
-+ const char *end = name + name_len;
-+ int ref = 0;
-+ u16 _t;
-+
-+#define APPEND16(x) do { \
-+ if (j + 2 > (off_t)buf_len) \
-+ goto overflow; \
-+ _t = htons(x); \
-+ memcpy(buf + j, &_t, 2); \
-+ j += 2; \
-+ } while (0)
-+#define APPEND32(x) do { \
-+ if (j + 4 > (off_t)buf_len) \
-+ goto overflow; \
-+ _t32 = htonl(x); \
-+ memcpy(buf + j, &_t32, 4); \
-+ j += 4; \
-+ } while (0)
-+
-+ if (name_len > 255) return -2;
-+
-+ for (;;) {
-+ const char *const start = name;
-+ if (table && (ref = dnslabel_table_get_pos(table, name)) >= 0) {
-+ APPEND16(ref | 0xc000);
-+ return j;
-+ }
-+ name = strchr(name, '.');
-+ if (!name) {
-+ const unsigned int label_len = end - start;
-+ if (label_len > 63) return -1;
-+ if ((size_t)(j+label_len+1) > buf_len) return -2;
-+ if (table) dnslabel_table_add(table, start, j);
-+ buf[j++] = label_len;
-+
-+ memcpy(buf + j, start, end - start);
-+ j += end - start;
-+ break;
-+ } else {
-+ // append length of the label.
-+ const unsigned int label_len = name - start;
-+ if (label_len > 63) return -1;
-+ if ((size_t)(j+label_len+1) > buf_len) return -2;
-+ if (table) dnslabel_table_add(table, start, j);
-+ buf[j++] = label_len;
-+
-+ memcpy(buf + j, start, name - start);
-+ j += name - start;
-+ // hop over the '.'
-+ name++;
-+ }
-+ }
-+
-+ // the labels must be terminated by a 0.
-+ // It's possible that the name ended in a .
-+ // in which case the zero is already there
-+ if (!j || buf[j-1]) buf[j++] = 0;
-+ return j;
-+ overflow:
-+ return (-2);
-+}
-+
-+// Finds the length of a dns request for a DNS name of the given
-+// length. The actual request may be smaller than the value returned
-+// here
-+static int
-+evdns_request_len(const int name_len) {
-+ return 96 + // length of the DNS standard header
-+ name_len + 2 +
-+ 4; // space for the resource type
-+}
-+
-+// build a dns request packet into buf. buf should be at least as long
-+// as evdns_request_len told you it should be.
-+//
-+// Returns the amount of space used. Negative on error.
-+static int
-+evdns_request_data_build(const char *const name, const int name_len,
-+ const u16 trans_id, const u16 type, const u16 class,
-+ u8 *const buf, size_t buf_len) {
-+ off_t j = 0; // current offset into buf
-+ u16 _t; // used by the macros
-+
-+ APPEND16(trans_id);
-+ APPEND16(0x0100); // standard query, recusion needed
-+ APPEND16(1); // one question
-+ APPEND16(0); // no answers
-+ APPEND16(0); // no authority
-+ APPEND16(0); // no additional
-+
-+ j = dnsname_to_labels(buf, buf_len, j, name, name_len, NULL);
-+ if (j < 0) {
-+ return (int)j;
-+ }
-+
-+ APPEND16(type);
-+ APPEND16(class);
-+
-+ return (int)j;
-+ overflow:
-+ return (-1);
-+}
-+
-+// exported function
-+struct evdns_server_port *
-+evdns_add_server_port(int socket, int is_tcp, evdns_request_callback_fn_type cb, void *user_data)
-+{
-+ struct evdns_server_port *port;
-+ if (!(port = malloc(sizeof(struct evdns_server_port))))
-+ return NULL;
-+ memset(port, 0, sizeof(struct evdns_server_port));
-+
-+ assert(!is_tcp); // TCP sockets not yet implemented
-+ port->socket = socket;
-+ port->refcnt = 1;
-+ port->choked = 0;
-+ port->closing = 0;
-+ port->user_callback = cb;
-+ port->user_data = user_data;
-+ port->pending_replies = NULL;
-+
-+ event_set(&port->event, port->socket, EV_READ | EV_PERSIST,
-+ server_port_ready_callback, port);
-+ event_add(&port->event, NULL); // check return.
-+ return port;
-+}
-+
-+// exported function
-+void
-+evdns_close_server_port(struct evdns_server_port *port)
-+{
-+ if (--port->refcnt == 0)
-+ server_port_free(port);
-+ port->closing = 1;
-+}
-+
-+// exported function
-+int
-+evdns_server_request_add_reply(struct evdns_server_request *_req, int section, const char *name, int type, int class, int ttl, int datalen, int is_name, const char *data)
-+{
-+ struct server_request *req = TO_SERVER_REQUEST(_req);
-+ struct server_reply_item **itemp, *item;
-+ int *countp;
-+
-+ if (req->response) /* have we already answered? */
-+ return (-1);
-+
-+ switch (section) {
-+ case EVDNS_ANSWER_SECTION:
-+ itemp = &req->answer;
-+ countp = &req->n_answer;
-+ break;
-+ case EVDNS_AUTHORITY_SECTION:
-+ itemp = &req->authority;
-+ countp = &req->n_authority;
-+ break;
-+ case EVDNS_ADDITIONAL_SECTION:
-+ itemp = &req->additional;
-+ countp = &req->n_additional;
-+ break;
-+ default:
-+ return (-1);
-+ }
-+ while (*itemp) {
-+ itemp = &((*itemp)->next);
-+ }
-+ item = malloc(sizeof(struct server_reply_item));
-+ if (!item)
-+ return -1;
-+ item->next = NULL;
-+ if (!(item->name = strdup(name))) {
-+ free(item);
-+ return -1;
-+ }
-+ item->type = type;
-+ item->class = class;
-+ item->ttl = ttl;
-+ item->is_name = is_name != 0;
-+ item->datalen = 0;
-+ item->data = NULL;
-+ if (data) {
-+ if (item->is_name) {
-+ if (!(item->data = strdup(data))) {
-+ free(item->name);
-+ free(item);
-+ return -1;
-+ }
-+ item->datalen = -1;
-+ } else {
-+ if (!(item->data = malloc(datalen))) {
-+ free(item->name);
-+ free(item);
-+ return -1;
-+ }
-+ item->datalen = datalen;
-+ memcpy(item->data, data, datalen);
-+ }
-+ }
-+
-+ *itemp = item;
-+ ++(*countp);
-+ return 0;
-+}
-+
-+// exported function
-+int
-+evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl)
-+{
-+ return evdns_server_request_add_reply(
-+ req, EVDNS_ANSWER_SECTION, name, TYPE_A, CLASS_INET,
-+ ttl, n*4, 0, addrs);
-+}
-+
-+// exported function
-+int
-+evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl)
-+{
-+ return evdns_server_request_add_reply(
-+ req, EVDNS_ANSWER_SECTION, name, TYPE_AAAA, CLASS_INET,
-+ ttl, n*16, 0, addrs);
-+}
-+
-+// exported function
-+int
-+evdns_server_request_add_ptr_reply(struct evdns_server_request *req, struct in_addr *in, const char *inaddr_name, const char *hostname, int ttl)
-+{
-+ u32 a;
-+ char buf[32];
-+ assert(in || inaddr_name);
-+ assert(!(in && inaddr_name));
-+ if (in) {
-+ a = ntohl(in->s_addr);
-+ snprintf(buf, sizeof(buf), "%d.%d.%d.%d.in-addr.arpa",
-+ (int)(u8)((a )&0xff),
-+ (int)(u8)((a>>8 )&0xff),
-+ (int)(u8)((a>>16)&0xff),
-+ (int)(u8)((a>>24)&0xff));
-+ inaddr_name = buf;
-+ }
-+ return evdns_server_request_add_reply(
-+ req, EVDNS_ANSWER_SECTION, inaddr_name, TYPE_PTR, CLASS_INET,
-+ ttl, -1, 1, hostname);
-+}
-+
-+// exported function
-+int
-+evdns_server_request_add_cname_reply(struct evdns_server_request *req, const char *name, const char *cname, int ttl)
-+{
-+ return evdns_server_request_add_reply(
-+ req, EVDNS_ANSWER_SECTION, name, TYPE_A, CLASS_INET,
-+ ttl, -1, 1, cname);
-+}
-+
-+
-+static int
-+evdns_server_request_format_response(struct server_request *req, int err)
-+{
-+ unsigned char buf[1500];
-+ size_t buf_len = sizeof(buf);
-+ off_t j = 0, r;
-+ u16 _t;
-+ u32 _t32;
-+ int i;
-+ u16 flags;
-+ struct dnslabel_table table;
-+
-+ if (err < 0 || err > 15) return -1;
-+
-+ /* Set response bit and error code; copy OPCODE and RD fields from
-+ * question; copy RA and AA if set by caller. */
-+ flags = req->base.flags;
-+ flags |= (0x8000 | err);
-+
-+ dnslabel_table_init(&table);
-+ APPEND16(req->trans_id);
-+ APPEND16(flags);
-+ APPEND16(req->base.nquestions);
-+ APPEND16(req->n_answer);
-+ APPEND16(req->n_authority);
-+ APPEND16(req->n_additional);
-+
-+ /* Add questions. */
-+ for (i=0; i < req->base.nquestions; ++i) {
-+ const char *s = req->base.questions[i]->name;
-+ j = dnsname_to_labels(buf, buf_len, j, s, strlen(s), &table);
-+ if (j < 0) {
-+ dnslabel_clear(&table);
-+ return (int) j;
-+ }
-+ APPEND16(req->base.questions[i]->type);
-+ APPEND16(req->base.questions[i]->class);
-+ }
-+
-+ /* Add answer, authority, and additional sections. */
-+ for (i=0; i<3; ++i) {
-+ struct server_reply_item *item;
-+ if (i==0)
-+ item = req->answer;
-+ else if (i==1)
-+ item = req->authority;
-+ else
-+ item = req->additional;
-+ while (item) {
-+ r = dnsname_to_labels(buf, buf_len, j, item->name, strlen(item->name), &table);
-+ if (r < 0)
-+ goto overflow;
-+ j = r;
-+
-+ APPEND16(item->type);
-+ APPEND16(item->class);
-+ APPEND32(item->ttl);
-+ if (item->is_name) {
-+ off_t len_idx = j, name_start;
-+ j += 2;
-+ name_start = j;
-+ r = dnsname_to_labels(buf, buf_len, j, item->data, strlen(item->data), &table);
-+ if (r < 0)
-+ goto overflow;
-+ j = r;
-+ _t = htons( (j-name_start) );
-+ memcpy(buf+len_idx, &_t, 2);
-+ } else {
-+ APPEND16(item->datalen);
-+ if (j+item->datalen > (off_t)buf_len)
-+ goto overflow;
-+ memcpy(buf+j, item->data, item->datalen);
-+ j += item->datalen;
-+ }
-+ item = item->next;
-+ }
-+ }
-+
-+ if (j > 512) {
-+overflow:
-+ j = 512;
-+ buf[3] |= 0x02; /* set the truncated bit. */
-+ }
-+
-+ req->response_len = j;
-+
-+ if (!(req->response = malloc(req->response_len))) {
-+ server_request_free_answers(req);
-+ dnslabel_clear(&table);
-+ return (-1);
-+ }
-+ memcpy(req->response, buf, req->response_len);
-+ server_request_free_answers(req);
-+ dnslabel_clear(&table);
-+ return (0);
-+}
-+
-+// exported function
-+int
-+evdns_server_request_respond(struct evdns_server_request *_req, int err)
-+{
-+ struct server_request *req = TO_SERVER_REQUEST(_req);
-+ struct evdns_server_port *port = req->port;
-+ int r;
-+ if (!req->response) {
-+ if ((r = evdns_server_request_format_response(req, err))<0)
-+ return r;
-+ }
-+
-+ r = sendto(port->socket, req->response, req->response_len, 0,
-+ (struct sockaddr*) &req->addr, req->addrlen);
-+ if (r<0) {
-+ int err = last_error(port->socket);
-+ if (! error_is_eagain(err))
-+ return -1;
-+
-+ if (port->pending_replies) {
-+ req->prev_pending = port->pending_replies->prev_pending;
-+ req->next_pending = port->pending_replies;
-+ req->prev_pending->next_pending =
-+ req->next_pending->prev_pending = req;
-+ } else {
-+ req->prev_pending = req->next_pending = req;
-+ port->pending_replies = req;
-+ port->choked = 1;
-+
-+ (void) event_del(&port->event);
-+ event_set(&port->event, port->socket, (port->closing?0:EV_READ) | EV_WRITE | EV_PERSIST, server_port_ready_callback, port);
-+
-+ if (event_add(&port->event, NULL) < 0) {
-+ log(EVDNS_LOG_WARN, "Error from libevent when adding event for DNS server");
-+ }
-+
-+ }
-+
-+ return 1;
-+ }
-+ if (server_request_free(req))
-+ return 0;
-+
-+ if (port->pending_replies)
-+ server_port_flush(port);
-+
-+ return 0;
-+}
-+
-+// Free all storage held by RRs in req.
-+static void
-+server_request_free_answers(struct server_request *req)
-+{
-+ struct server_reply_item *victim, *next, **list;
-+ int i;
-+ for (i = 0; i < 3; ++i) {
-+ if (i==0)
-+ list = &req->answer;
-+ else if (i==1)
-+ list = &req->authority;
-+ else
-+ list = &req->additional;
-+
-+ victim = *list;
-+ while (victim) {
-+ next = victim->next;
-+ free(victim->name);
-+ if (victim->data)
-+ free(victim->data);
-+ /* XXXX free(victim?) -NM */
-+ victim = next;
-+ }
-+ *list = NULL;
-+ }
-+}
-+
-+// Free all storage held by req, and remove links to it.
-+// return true iff we just wound up freeing the server_port.
-+static int
-+server_request_free(struct server_request *req)
-+{
-+ int i, rc=1;
-+ if (req->base.questions) {
-+ for (i = 0; i < req->base.nquestions; ++i)
-+ free(req->base.questions[i]);
-+ }
-+
-+ if (req->port) {
-+ if (req->port->pending_replies == req) {
-+ if (req->next_pending)
-+ req->port->pending_replies = req->next_pending;
-+ else
-+ req->port->pending_replies = NULL;
-+ }
-+ rc = --req->port->refcnt;
-+ }
-+
-+ if (req->response) {
-+ free(req->response);
-+ }
-+
-+ server_request_free_answers(req);
-+
-+ if (req->next_pending && req->next_pending != req) {
-+ req->next_pending->prev_pending = req->prev_pending;
-+ req->prev_pending->next_pending = req->next_pending;
-+ }
-+
-+ if (rc == 0) {
-+ server_port_free(req->port);
-+ free(req);
-+ return (1);
-+ }
-+ free(req);
-+ return (0);
-+}
-+
-+// Free all storage held by an evdns_server_port. Only called when
-+static void
-+server_port_free(struct evdns_server_port *port)
-+{
-+ assert(port);
-+ assert(!port->refcnt);
-+ assert(!port->pending_replies);
-+ if (port->socket > 0) {
-+ CLOSE_SOCKET(port->socket);
-+ port->socket = -1;
-+ }
-+ (void) event_del(&port->event);
-+ // XXXX actually free the port? -NM
-+}
-+
-+// exported function
-+int
-+evdns_server_request_drop(struct evdns_server_request *_req)
-+{
-+ struct server_request *req = TO_SERVER_REQUEST(_req);
-+ server_request_free(req);
-+ return 0;
-+}
-+
-+// exported function
-+int
-+evdns_server_request_get_requesting_addr(struct evdns_server_request *_req, struct sockaddr *sa, int addr_len)
-+{
-+ struct server_request *req = TO_SERVER_REQUEST(_req);
-+ if (addr_len < (int)req->addrlen)
-+ return -1;
-+ memcpy(sa, &(req->addr), req->addrlen);
-+ return req->addrlen;
-+}
-+
-+#undef APPEND16
-+#undef APPEND32
-+
-+// this is a libevent callback function which is called when a request
-+// has timed out.
-+static void
-+evdns_request_timeout_callback(int fd, short events, void *arg) {
-+ struct request *const req = (struct request *) arg;
-+ (void) fd;
-+ (void) events;
-+
-+ log(EVDNS_LOG_DEBUG, "Request %lx timed out", (unsigned long) arg);
-+
-+ req->ns->timedout++;
-+ if (req->ns->timedout > global_max_nameserver_timeout) {
-+ req->ns->timedout = 0;
-+ nameserver_failed(req->ns, "request timed out.");
-+ }
-+
-+ (void) evtimer_del(&req->timeout_event);
-+ if (req->tx_count >= global_max_retransmits) {
-+ // this request has failed
-+ reply_callback(req, 0, DNS_ERR_TIMEOUT, NULL);
-+ request_finished(req, &req_head);
-+ } else {
-+ // retransmit it
-+ evdns_request_transmit(req);
-+ }
-+}
-+
-+// try to send a request to a given server.
-+//
-+// return:
-+// 0 ok
-+// 1 temporary failure
-+// 2 other failure
-+static int
-+evdns_request_transmit_to(struct request *req, struct nameserver *server) {
-+ const int r = send(server->socket, req->request, req->request_len, 0);
-+ if (r < 0) {
-+ int err = last_error(server->socket);
-+ if (error_is_eagain(err)) return 1;
-+ nameserver_failed(req->ns, strerror(err));
-+ return 2;
-+ } else if (r != (int)req->request_len) {
-+ return 1; // short write
-+ } else {
-+ return 0;
-+ }
-+}
-+
-+// try to send a request, updating the fields of the request
-+// as needed
-+//
-+// return:
-+// 0 ok
-+// 1 failed
-+static int
-+evdns_request_transmit(struct request *req) {
-+ int retcode = 0, r;
-+
-+ // if we fail to send this packet then this flag marks it
-+ // for evdns_transmit
-+ req->transmit_me = 1;
-+ if (req->trans_id == 0xffff) abort();
-+
-+ if (req->ns->choked) {
-+ // don't bother trying to write to a socket
-+ // which we have had EAGAIN from
-+ return 1;
-+ }
-+
-+ r = evdns_request_transmit_to(req, req->ns);
-+ switch (r) {
-+ case 1:
-+ // temp failure
-+ req->ns->choked = 1;
-+ nameserver_write_waiting(req->ns, 1);
-+ return 1;
-+ case 2:
-+ // failed in some other way
-+ retcode = 1;
-+ // fall through
-+ default:
-+ // all ok
-+ log(EVDNS_LOG_DEBUG,
-+ "Setting timeout for request %lx", (unsigned long) req);
-+ evtimer_set(&req->timeout_event, evdns_request_timeout_callback, req);
-+ if (evtimer_add(&req->timeout_event, &global_timeout) < 0) {
-+ log(EVDNS_LOG_WARN,
-+ "Error from libevent when adding timer for request %lx",
-+ (unsigned long) req);
-+ // ???? Do more?
-+ }
-+ req->tx_count++;
-+ req->transmit_me = 0;
-+ return retcode;
-+ }
-+}
-+
-+static void
-+nameserver_probe_callback(int result, char type, int count, int ttl, void *addresses, void *arg) {
-+ struct nameserver *const ns = (struct nameserver *) arg;
-+ (void) type;
-+ (void) count;
-+ (void) ttl;
-+ (void) addresses;
-+
-+ if (result == DNS_ERR_NONE || result == DNS_ERR_NOTEXIST) {
-+ // this is a good reply
-+ nameserver_up(ns);
-+ } else nameserver_probe_failed(ns);
-+}
-+
-+static void
-+nameserver_send_probe(struct nameserver *const ns) {
-+ struct request *req;
-+ // here we need to send a probe to a given nameserver
-+ // in the hope that it is up now.
-+
-+ log(EVDNS_LOG_DEBUG, "Sending probe to %s", debug_ntoa(ns->address));
-+
-+ req = request_new(TYPE_A, "www.google.com", DNS_QUERY_NO_SEARCH, nameserver_probe_callback, ns);
-+ if (!req) return;
-+ // we force this into the inflight queue no matter what
-+ request_trans_id_set(req, transaction_id_pick());
-+ req->ns = ns;
-+ request_submit(req);
-+}
-+
-+// returns:
-+// 0 didn't try to transmit anything
-+// 1 tried to transmit something
-+static int
-+evdns_transmit(void) {
-+ char did_try_to_transmit = 0;
-+
-+ if (req_head) {
-+ struct request *const started_at = req_head, *req = req_head;
-+ // first transmit all the requests which are currently waiting
-+ do {
-+ if (req->transmit_me) {
-+ did_try_to_transmit = 1;
-+ evdns_request_transmit(req);
-+ }
-+
-+ req = req->next;
-+ } while (req != started_at);
-+ }
-+
-+ return did_try_to_transmit;
-+}
-+
-+// exported function
-+int
-+evdns_count_nameservers(void)
-+{
-+ const struct nameserver *server = server_head;
-+ int n = 0;
-+ if (!server)
-+ return 0;
-+ do {
-+ ++n;
-+ server = server->next;
-+ } while (server != server_head);
-+ return n;
-+}
-+
-+// exported function
-+int
-+evdns_clear_nameservers_and_suspend(void)
-+{
-+ struct nameserver *server = server_head, *started_at = server_head;
-+ struct request *req = req_head, *req_started_at = req_head;
-+
-+ if (!server)
-+ return 0;
-+ while (1) {
-+ struct nameserver *next = server->next;
-+ (void) event_del(&server->event);
-+ (void) evtimer_del(&server->timeout_event);
-+ if (server->socket >= 0)
-+ CLOSE_SOCKET(server->socket);
-+ free(server);
-+ if (next == started_at)
-+ break;
-+ server = next;
-+ }
-+ server_head = NULL;
-+ global_good_nameservers = 0;
-+
-+ while (req) {
-+ struct request *next = req->next;
-+ req->tx_count = req->reissue_count = 0;
-+ req->ns = NULL;
-+ // ???? What to do about searches?
-+ (void) evtimer_del(&req->timeout_event);
-+ req->trans_id = 0;
-+ req->transmit_me = 0;
-+
-+ global_requests_waiting++;
-+ evdns_request_insert(req, &req_waiting_head);
-+ /* We want to insert these suspended elements at the front of
-+ * the waiting queue, since they were pending before any of
-+ * the waiting entries were added. This is a circular list,
-+ * so we can just shift the start back by one.*/
-+ req_waiting_head = req_waiting_head->prev;
-+
-+ if (next == req_started_at)
-+ break;
-+ req = next;
-+ }
-+ req_head = NULL;
-+ global_requests_inflight = 0;
-+
-+ return 0;
-+}
-+
-+
-+// exported function
-+int
-+evdns_resume(void)
-+{
-+ evdns_requests_pump_waiting_queue();
-+ return 0;
-+}
-+
-+static int
-+_evdns_nameserver_add_impl(unsigned long int address, int port) {
-+ // first check to see if we already have this nameserver
-+
-+ const struct nameserver *server = server_head, *const started_at = server_head;
-+ struct nameserver *ns;
-+ struct sockaddr_in sin;
-+ int err = 0;
-+ if (server) {
-+ do {
-+ if (server->address == address) return 3;
-+ server = server->next;
-+ } while (server != started_at);
-+ }
-+
-+ ns = (struct nameserver *) malloc(sizeof(struct nameserver));
-+ if (!ns) return -1;
-+
-+ memset(ns, 0, sizeof(struct nameserver));
-+
-+ ns->socket = socket(PF_INET, SOCK_DGRAM, 0);
-+ if (ns->socket < 0) { err = 1; goto out1; }
-+#ifdef WIN32
-+ {
-+ u_long nonblocking = 1;
-+ ioctlsocket(ns->socket, FIONBIO, &nonblocking);
-+ }
-+#else
-+ fcntl(ns->socket, F_SETFL, O_NONBLOCK);
-+#endif
-+ sin.sin_addr.s_addr = address;
-+ sin.sin_port = htons(port);
-+ sin.sin_family = AF_INET;
-+ if (connect(ns->socket, (struct sockaddr *) &sin, sizeof(sin)) != 0) {
-+ err = 2;
-+ goto out2;
-+ }
-+
-+ ns->address = address;
-+ ns->state = 1;
-+ event_set(&ns->event, ns->socket, EV_READ | EV_PERSIST, nameserver_ready_callback, ns);
-+ if (event_add(&ns->event, NULL) < 0) {
-+ err = 2;
-+ goto out2;
-+ }
-+
-+ log(EVDNS_LOG_DEBUG, "Added nameserver %s", debug_ntoa(address));
-+
-+ // insert this nameserver into the list of them
-+ if (!server_head) {
-+ ns->next = ns->prev = ns;
-+ server_head = ns;
-+ } else {
-+ ns->next = server_head->next;
-+ ns->prev = server_head;
-+ server_head->next = ns;
-+ if (server_head->prev == server_head) {
-+ server_head->prev = ns;
-+ }
-+ }
-+
-+ global_good_nameservers++;
-+
-+ return 0;
-+
-+out2:
-+ CLOSE_SOCKET(ns->socket);
-+out1:
-+ free(ns);
-+ log(EVDNS_LOG_WARN, "Unable to add nameserver %s: error %d", debug_ntoa(address), err);
-+ return err;
-+}
-+
-+// exported function
-+int
-+evdns_nameserver_add(unsigned long int address) {
-+ return _evdns_nameserver_add_impl(address, 53);
-+}
-+
-+// exported function
-+int
-+evdns_nameserver_ip_add(const char *ip_as_string) {
-+ struct in_addr ina;
-+ int port;
-+ char buf[20];
-+ const char *cp;
-+ cp = strchr(ip_as_string, ':');
-+ if (! cp) {
-+ cp = ip_as_string;
-+ port = 53;
-+ } else {
-+ port = strtoint(cp+1);
-+ if (port < 0 || port > 65535) {
-+ return 4;
-+ }
-+ if ((cp-ip_as_string) >= (int)sizeof(buf)) {
-+ return 4;
-+ }
-+ memcpy(buf, ip_as_string, cp-ip_as_string);
-+ buf[cp-ip_as_string] = '\0';
-+ cp = buf;
-+ }
-+ if (!inet_aton(cp, &ina)) {
-+ return 4;
-+ }
-+ return _evdns_nameserver_add_impl(ina.s_addr, port);
-+}
-+
-+// insert into the tail of the queue
-+static void
-+evdns_request_insert(struct request *req, struct request **head) {
-+ if (!*head) {
-+ *head = req;
-+ req->next = req->prev = req;
-+ return;
-+ }
-+
-+ req->prev = (*head)->prev;
-+ req->prev->next = req;
-+ req->next = *head;
-+ (*head)->prev = req;
-+}
-+
-+static int
-+string_num_dots(const char *s) {
-+ int count = 0;
-+ while ((s = strchr(s, '.'))) {
-+ s++;
-+ count++;
-+ }
-+ return count;
-+}
-+
-+static struct request *
-+request_new(int type, const char *name, int flags,
-+ evdns_callback_type callback, void *user_ptr) {
-+ const char issuing_now =
-+ (global_requests_inflight < global_max_requests_inflight) ? 1 : 0;
-+
-+ const int name_len = strlen(name);
-+ const int request_max_len = evdns_request_len(name_len);
-+ const u16 trans_id = issuing_now ? transaction_id_pick() : 0xffff;
-+ // the request data is alloced in a single block with the header
-+ struct request *const req =
-+ (struct request *) malloc(sizeof(struct request) + request_max_len);
-+ int rlen;
-+ (void) flags;
-+
-+ if (!req) return NULL;
-+ memset(req, 0, sizeof(struct request));
-+
-+ // request data lives just after the header
-+ req->request = ((u8 *) req) + sizeof(struct request);
-+ // denotes that the request data shouldn't be free()ed
-+ req->request_appended = 1;
-+ rlen = evdns_request_data_build(name, name_len, trans_id,
-+ type, CLASS_INET, req->request, request_max_len);
-+ if (rlen < 0)
-+ goto err1;
-+ req->request_len = rlen;
-+ req->trans_id = trans_id;
-+ req->tx_count = 0;
-+ req->request_type = type;
-+ req->user_pointer = user_ptr;
-+ req->user_callback = callback;
-+ req->ns = issuing_now ? nameserver_pick() : NULL;
-+ req->next = req->prev = NULL;
-+
-+ return req;
-+err1:
-+ free(req);
-+ return NULL;
-+}
-+
-+static void
-+request_submit(struct request *const req) {
-+ if (req->ns) {
-+ // if it has a nameserver assigned then this is going
-+ // straight into the inflight queue
-+ evdns_request_insert(req, &req_head);
-+ global_requests_inflight++;
-+ evdns_request_transmit(req);
-+ } else {
-+ evdns_request_insert(req, &req_waiting_head);
-+ global_requests_waiting++;
-+ }
-+}
-+
-+// exported function
-+int evdns_resolve_ipv4(const char *name, int flags,
-+ evdns_callback_type callback, void *ptr) {
-+ log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name);
-+ if (flags & DNS_QUERY_NO_SEARCH) {
-+ struct request *const req =
-+ request_new(TYPE_A, name, flags, callback, ptr);
-+ if (req == NULL)
-+ return (1);
-+ request_submit(req);
-+ return (0);
-+ } else {
-+ return (search_request_new(TYPE_A, name, flags, callback, ptr));
-+ }
-+}
-+
-+// exported function
-+int evdns_resolve_ipv6(const char *name, int flags,
-+ evdns_callback_type callback, void *ptr) {
-+ log(EVDNS_LOG_DEBUG, "Resolve requested for %s", name);
-+ if (flags & DNS_QUERY_NO_SEARCH) {
-+ struct request *const req =
-+ request_new(TYPE_AAAA, name, flags, callback, ptr);
-+ if (req == NULL)
-+ return (1);
-+ request_submit(req);
-+ return (0);
-+ } else {
-+ return (search_request_new(TYPE_AAAA, name, flags, callback, ptr));
-+ }
-+}
-+
-+int evdns_resolve_reverse(struct in_addr *in, int flags, evdns_callback_type callback, void *ptr) {
-+ char buf[32];
-+ struct request *req;
-+ u32 a;
-+ assert(in);
-+ a = ntohl(in->s_addr);
-+ snprintf(buf, sizeof(buf), "%d.%d.%d.%d.in-addr.arpa",
-+ (int)(u8)((a )&0xff),
-+ (int)(u8)((a>>8 )&0xff),
-+ (int)(u8)((a>>16)&0xff),
-+ (int)(u8)((a>>24)&0xff));
-+ log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf);
-+ req = request_new(TYPE_PTR, buf, flags, callback, ptr);
-+ if (!req) return 1;
-+ request_submit(req);
-+ return 0;
-+}
-+
-+int evdns_resolve_reverse_ipv6(struct in6_addr *in, int flags, evdns_callback_type callback, void *ptr) {
-+ char buf[64];
-+ char *cp;
-+ struct request *req;
-+ int i;
-+ assert(in);
-+ cp = buf;
-+ for (i=15; i >= 0; --i) {
-+ u8 byte = in->s6_addr[i];
-+ *cp++ = "0123456789abcdef"[byte & 0x0f];
-+ *cp++ = '.';
-+ *cp++ = "0123456789abcdef"[byte >> 4];
-+ *cp++ = '.';
-+ }
-+ assert(cp + strlen(".ip6.arpa") < buf+sizeof(buf));
-+ memcpy(cp, ".ip6.arpa", strlen(".ip6.arpa")+1);
-+ log(EVDNS_LOG_DEBUG, "Resolve requested for %s (reverse)", buf);
-+ req = request_new(TYPE_PTR, buf, flags, callback, ptr);
-+ if (!req) return 1;
-+ request_submit(req);
-+ return 0;
-+}
-+
-+/////////////////////////////////////////////////////////////////////
-+// Search support
-+//
-+// the libc resolver has support for searching a number of domains
-+// to find a name. If nothing else then it takes the single domain
-+// from the gethostname() call.
-+//
-+// It can also be configured via the domain and search options in a
-+// resolv.conf.
-+//
-+// The ndots option controls how many dots it takes for the resolver
-+// to decide that a name is non-local and so try a raw lookup first.
-+
-+struct search_domain {
-+ int len;
-+ struct search_domain *next;
-+ // the text string is appended to this structure
-+};
-+
-+struct search_state {
-+ int refcount;
-+ int ndots;
-+ int num_domains;
-+ struct search_domain *head;
-+};
-+
-+static struct search_state *global_search_state = NULL;
-+
-+static void
-+search_state_decref(struct search_state *const state) {
-+ if (!state) return;
-+ state->refcount--;
-+ if (!state->refcount) {
-+ struct search_domain *next, *dom;
-+ for (dom = state->head; dom; dom = next) {
-+ next = dom->next;
-+ free(dom);
-+ }
-+ free(state);
-+ }
-+}
-+
-+static struct search_state *
-+search_state_new(void) {
-+ struct search_state *state = (struct search_state *) malloc(sizeof(struct search_state));
-+ if (!state) return NULL;
-+ memset(state, 0, sizeof(struct search_state));
-+ state->refcount = 1;
-+ state->ndots = 1;
-+
-+ return state;
-+}
-+
-+static void
-+search_postfix_clear(void) {
-+ search_state_decref(global_search_state);
-+
-+ global_search_state = search_state_new();
-+}
-+
-+// exported function
-+void
-+evdns_search_clear(void) {
-+ search_postfix_clear();
-+}
-+
-+static void
-+search_postfix_add(const char *domain) {
-+ int domain_len;
-+ struct search_domain *sdomain;
-+ while (domain[0] == '.') domain++;
-+ domain_len = strlen(domain);
-+
-+ if (!global_search_state) global_search_state = search_state_new();
-+ if (!global_search_state) return;
-+ global_search_state->num_domains++;
-+
-+ sdomain = (struct search_domain *) malloc(sizeof(struct search_domain) + domain_len);
-+ if (!sdomain) return;
-+ memcpy( ((u8 *) sdomain) + sizeof(struct search_domain), domain, domain_len);
-+ sdomain->next = global_search_state->head;
-+ sdomain->len = domain_len;
-+
-+ global_search_state->head = sdomain;
-+}
-+
-+// reverse the order of members in the postfix list. This is needed because,
-+// when parsing resolv.conf we push elements in the wrong order
-+static void
-+search_reverse(void) {
-+ struct search_domain *cur, *prev = NULL, *next;
-+ cur = global_search_state->head;
-+ while (cur) {
-+ next = cur->next;
-+ cur->next = prev;
-+ prev = cur;
-+ cur = next;
-+ }
-+
-+ global_search_state->head = prev;
-+}
-+
-+// exported function
-+void
-+evdns_search_add(const char *domain) {
-+ search_postfix_add(domain);
-+}
-+
-+// exported function
-+void
-+evdns_search_ndots_set(const int ndots) {
-+ if (!global_search_state) global_search_state = search_state_new();
-+ if (!global_search_state) return;
-+ global_search_state->ndots = ndots;
-+}
-+
-+static void
-+search_set_from_hostname(void) {
-+ char hostname[HOST_NAME_MAX + 1], *domainname;
-+
-+ search_postfix_clear();
-+ if (gethostname(hostname, sizeof(hostname))) return;
-+ domainname = strchr(hostname, '.');
-+ if (!domainname) return;
-+ search_postfix_add(domainname);
-+}
-+
-+// warning: returns malloced string
-+static char *
-+search_make_new(const struct search_state *const state, int n, const char *const base_name) {
-+ const int base_len = strlen(base_name);
-+ const char need_to_append_dot = base_name[base_len - 1] == '.' ? 0 : 1;
-+ struct search_domain *dom;
-+
-+ for (dom = state->head; dom; dom = dom->next) {
-+ if (!n--) {
-+ // this is the postfix we want
-+ // the actual postfix string is kept at the end of the structure
-+ const u8 *const postfix = ((u8 *) dom) + sizeof(struct search_domain);
-+ const int postfix_len = dom->len;
-+ char *const newname = (char *) malloc(base_len + need_to_append_dot + postfix_len + 1);
-+ if (!newname) return NULL;
-+ memcpy(newname, base_name, base_len);
-+ if (need_to_append_dot) newname[base_len] = '.';
-+ memcpy(newname + base_len + need_to_append_dot, postfix, postfix_len);
-+ newname[base_len + need_to_append_dot + postfix_len] = 0;
-+ return newname;
-+ }
-+ }
-+
-+ // we ran off the end of the list and still didn't find the requested string
-+ abort();
-+ return NULL; /* unreachable; stops warnings in some compilers. */
-+}
-+
-+static int
-+search_request_new(int type, const char *const name, int flags, evdns_callback_type user_callback, void *user_arg) {
-+ assert(type == TYPE_A || type == TYPE_AAAA);
-+ if ( ((flags & DNS_QUERY_NO_SEARCH) == 0) &&
-+ global_search_state &&
-+ global_search_state->num_domains) {
-+ // we have some domains to search
-+ struct request *req;
-+ if (string_num_dots(name) >= global_search_state->ndots) {
-+ req = request_new(type, name, flags, user_callback, user_arg);
-+ if (!req) return 1;
-+ req->search_index = -1;
-+ } else {
-+ char *const new_name = search_make_new(global_search_state, 0, name);
-+ if (!new_name) return 1;
-+ req = request_new(type, new_name, flags, user_callback, user_arg);
-+ free(new_name);
-+ if (!req) return 1;
-+ req->search_index = 0;
-+ }
-+ req->search_origname = strdup(name);
-+ req->search_state = global_search_state;
-+ req->search_flags = flags;
-+ global_search_state->refcount++;
-+ request_submit(req);
-+ return 0;
-+ } else {
-+ struct request *const req = request_new(type, name, flags, user_callback, user_arg);
-+ if (!req) return 1;
-+ request_submit(req);
-+ return 0;
-+ }
-+}
-+
-+// this is called when a request has failed to find a name. We need to check
-+// if it is part of a search and, if so, try the next name in the list
-+// returns:
-+// 0 another request has been submitted
-+// 1 no more requests needed
-+static int
-+search_try_next(struct request *const req) {
-+ if (req->search_state) {
-+ // it is part of a search
-+ char *new_name;
-+ struct request *newreq;
-+ req->search_index++;
-+ if (req->search_index >= req->search_state->num_domains) {
-+ // no more postfixes to try, however we may need to try
-+ // this name without a postfix
-+ if (string_num_dots(req->search_origname) < req->search_state->ndots) {
-+ // yep, we need to try it raw
-+ struct request *const newreq = request_new(req->request_type, req->search_origname, req->search_flags, req->user_callback, req->user_pointer);
-+ log(EVDNS_LOG_DEBUG, "Search: trying raw query %s", req->search_origname);
-+ if (newreq) {
-+ request_submit(newreq);
-+ return 0;
-+ }
-+ }
-+ return 1;
-+ }
-+
-+ new_name = search_make_new(req->search_state, req->search_index, req->search_origname);
-+ if (!new_name) return 1;
-+ log(EVDNS_LOG_DEBUG, "Search: now trying %s (%d)", new_name, req->search_index);
-+ newreq = request_new(req->request_type, new_name, req->search_flags, req->user_callback, req->user_pointer);
-+ free(new_name);
-+ if (!newreq) return 1;
-+ newreq->search_origname = req->search_origname;
-+ req->search_origname = NULL;
-+ newreq->search_state = req->search_state;
-+ newreq->search_flags = req->search_flags;
-+ newreq->search_index = req->search_index;
-+ newreq->search_state->refcount++;
-+ request_submit(newreq);
-+ return 0;
-+ }
-+ return 1;
-+}
-+
-+static void
-+search_request_finished(struct request *const req) {
-+ if (req->search_state) {
-+ search_state_decref(req->search_state);
-+ req->search_state = NULL;
-+ }
-+ if (req->search_origname) {
-+ free(req->search_origname);
-+ req->search_origname = NULL;
-+ }
-+}
-+
-+/////////////////////////////////////////////////////////////////////
-+// Parsing resolv.conf files
-+
-+static void
-+evdns_resolv_set_defaults(int flags) {
-+ // if the file isn't found then we assume a local resolver
-+ if (flags & DNS_OPTION_SEARCH) search_set_from_hostname();
-+ if (flags & DNS_OPTION_NAMESERVERS) evdns_nameserver_ip_add("127.0.0.1");
-+}
-+
-+#ifndef HAVE_STRTOK_R
-+static char *
-+strtok_r(char *s, const char *delim, char **state) {
-+ return strtok(s, delim);
-+}
-+#endif
-+
-+// helper version of atoi which returns -1 on error
-+static int
-+strtoint(const char *const str) {
-+ char *endptr;
-+ const int r = strtol(str, &endptr, 10);
-+ if (*endptr) return -1;
-+ return r;
-+}
-+
-+// helper version of atoi that returns -1 on error and clips to bounds.
-+static int
-+strtoint_clipped(const char *const str, int min, int max)
-+{
-+ int r = strtoint(str);
-+ if (r == -1)
-+ return r;
-+ else if (r<min)
-+ return min;
-+ else if (r>max)
-+ return max;
-+ else
-+ return r;
-+}
-+
-+// exported function
-+int
-+evdns_set_option(const char *option, const char *val, int flags)
-+{
-+ if (!strncmp(option, "ndots:", 6)) {
-+ const int ndots = strtoint(val);
-+ if (ndots == -1) return -1;
-+ if (!(flags & DNS_OPTION_SEARCH)) return 0;
-+ log(EVDNS_LOG_DEBUG, "Setting ndots to %d", ndots);
-+ if (!global_search_state) global_search_state = search_state_new();
-+ if (!global_search_state) return -1;
-+ global_search_state->ndots = ndots;
-+ } else if (!strncmp(option, "timeout:", 8)) {
-+ const int timeout = strtoint(val);
-+ if (timeout == -1) return -1;
-+ if (!(flags & DNS_OPTION_MISC)) return 0;
-+ log(EVDNS_LOG_DEBUG, "Setting timeout to %d", timeout);
-+ global_timeout.tv_sec = timeout;
-+ } else if (!strncmp(option, "max-timeouts:", 12)) {
-+ const int maxtimeout = strtoint_clipped(val, 1, 255);
-+ if (maxtimeout == -1) return -1;
-+ if (!(flags & DNS_OPTION_MISC)) return 0;
-+ log(EVDNS_LOG_DEBUG, "Setting maximum allowed timeouts to %d",
-+ maxtimeout);
-+ global_max_nameserver_timeout = maxtimeout;
-+ } else if (!strncmp(option, "max-inflight:", 13)) {
-+ const int maxinflight = strtoint_clipped(val, 1, 65000);
-+ if (maxinflight == -1) return -1;
-+ if (!(flags & DNS_OPTION_MISC)) return 0;
-+ log(EVDNS_LOG_DEBUG, "Setting maximum inflight requests to %d",
-+ maxinflight);
-+ global_max_requests_inflight = maxinflight;
-+ } else if (!strncmp(option, "attempts:", 9)) {
-+ int retries = strtoint(val);
-+ if (retries == -1) return -1;
-+ if (retries > 255) retries = 255;
-+ if (!(flags & DNS_OPTION_MISC)) return 0;
-+ log(EVDNS_LOG_DEBUG, "Setting retries to %d", retries);
-+ global_max_retransmits = retries;
-+ }
-+ return 0;
-+}
-+
-+static void
-+resolv_conf_parse_line(char *const start, int flags) {
-+ char *strtok_state;
-+ static const char *const delims = " \t";
-+#define NEXT_TOKEN strtok_r(NULL, delims, &strtok_state)
-+
-+ char *const first_token = strtok_r(start, delims, &strtok_state);
-+ if (!first_token) return;
-+
-+ if (!strcmp(first_token, "nameserver") && (flags & DNS_OPTION_NAMESERVERS)) {
-+ const char *const nameserver = NEXT_TOKEN;
-+ struct in_addr ina;
-+
-+ if (inet_aton(nameserver, &ina)) {
-+ // address is valid
-+ evdns_nameserver_add(ina.s_addr);
-+ }
-+ } else if (!strcmp(first_token, "domain") && (flags & DNS_OPTION_SEARCH)) {
-+ const char *const domain = NEXT_TOKEN;
-+ if (domain) {
-+ search_postfix_clear();
-+ search_postfix_add(domain);
-+ }
-+ } else if (!strcmp(first_token, "search") && (flags & DNS_OPTION_SEARCH)) {
-+ const char *domain;
-+ search_postfix_clear();
-+
-+ while ((domain = NEXT_TOKEN)) {
-+ search_postfix_add(domain);
-+ }
-+ search_reverse();
-+ } else if (!strcmp(first_token, "options")) {
-+ const char *option;
-+ while ((option = NEXT_TOKEN)) {
-+ const char *val = strchr(option, ':');
-+ evdns_set_option(option, val ? val+1 : "", flags);
-+ }
-+ }
-+#undef NEXT_TOKEN
-+}
-+
-+// exported function
-+// returns:
-+// 0 no errors
-+// 1 failed to open file
-+// 2 failed to stat file
-+// 3 file too large
-+// 4 out of memory
-+// 5 short read from file
-+int
-+evdns_resolv_conf_parse(int flags, const char *const filename) {
-+ struct stat st;
-+ int fd, n, r;
-+ u8 *resolv;
-+ char *start;
-+ int err = 0;
-+
-+ log(EVDNS_LOG_DEBUG, "Parsing resolv.conf file %s", filename);
-+
-+ fd = open(filename, O_RDONLY);
-+ if (fd < 0) {
-+ evdns_resolv_set_defaults(flags);
-+ return 1;
-+ }
-+
-+ if (fstat(fd, &st)) { err = 2; goto out1; }
-+ if (!st.st_size) {
-+ evdns_resolv_set_defaults(flags);
-+ err = (flags & DNS_OPTION_NAMESERVERS) ? 6 : 0;
-+ goto out1;
-+ }
-+ if (st.st_size > 65535) { err = 3; goto out1; } // no resolv.conf should be any bigger
-+
-+ resolv = (u8 *) malloc((size_t)st.st_size + 1);
-+ if (!resolv) { err = 4; goto out1; }
-+
-+ n = 0;
-+ while ((r = read(fd, resolv+n, (size_t)st.st_size-n)) > 0) {
-+ n += r;
-+ if (n == st.st_size)
-+ break;
-+ assert(n < st.st_size);
-+ }
-+ if (r < 0) { err = 5; goto out2; }
-+ resolv[n] = 0; // we malloced an extra byte; this should be fine.
-+
-+ start = (char *) resolv;
-+ for (;;) {
-+ char *const newline = strchr(start, '\n');
-+ if (!newline) {
-+ resolv_conf_parse_line(start, flags);
-+ break;
-+ } else {
-+ *newline = 0;
-+ resolv_conf_parse_line(start, flags);
-+ start = newline + 1;
-+ }
-+ }
-+
-+ if (!server_head && (flags & DNS_OPTION_NAMESERVERS)) {
-+ // no nameservers were configured.
-+ evdns_nameserver_ip_add("127.0.0.1");
-+ err = 6;
-+ }
-+ if (flags & DNS_OPTION_SEARCH && (!global_search_state || global_search_state->num_domains == 0)) {
-+ search_set_from_hostname();
-+ }
-+
-+out2:
-+ free(resolv);
-+out1:
-+ close(fd);
-+ return err;
-+}
-+
-+#ifdef WIN32
-+// Add multiple nameservers from a space-or-comma-separated list.
-+static int
-+evdns_nameserver_ip_add_line(const char *ips) {
-+ const char *addr;
-+ char *buf;
-+ int r;
-+ while (*ips) {
-+ while (ISSPACE(*ips) || *ips == ',' || *ips == '\t')
-+ ++ips;
-+ addr = ips;
-+ while (ISDIGIT(*ips) || *ips == '.' || *ips == ':')
-+ ++ips;
-+ buf = malloc(ips-addr+1);
-+ if (!buf) return 4;
-+ memcpy(buf, addr, ips-addr);
-+ buf[ips-addr] = '\0';
-+ r = evdns_nameserver_ip_add(buf);
-+ free(buf);
-+ if (r) return r;
-+ }
-+ return 0;
-+}
-+
-+typedef DWORD(WINAPI *GetNetworkParams_fn_t)(FIXED_INFO *, DWORD*);
-+
-+// Use the windows GetNetworkParams interface in iphlpapi.dll to
-+// figure out what our nameservers are.
-+static int
-+load_nameservers_with_getnetworkparams(void)
-+{
-+ // Based on MSDN examples and inspection of c-ares code.
-+ FIXED_INFO *fixed;
-+ HMODULE handle = 0;
-+ ULONG size = sizeof(FIXED_INFO);
-+ void *buf = NULL;
-+ int status = 0, r, added_any;
-+ IP_ADDR_STRING *ns;
-+ GetNetworkParams_fn_t fn;
-+
-+ if (!(handle = LoadLibrary("iphlpapi.dll"))) {
-+ log(EVDNS_LOG_WARN, "Could not open iphlpapi.dll");
-+ status = -1;
-+ goto done;
-+ }
-+ if (!(fn = (GetNetworkParams_fn_t) GetProcAddress(handle, "GetNetworkParams"))) {
-+ log(EVDNS_LOG_WARN, "Could not get address of function.");
-+ status = -1;
-+ goto done;
-+ }
-+
-+ buf = malloc(size);
-+ if (!buf) { status = 4; goto done; }
-+ fixed = buf;
-+ r = fn(fixed, &size);
-+ if (r != ERROR_SUCCESS && r != ERROR_BUFFER_OVERFLOW) {
-+ status = -1;
-+ goto done;
-+ }
-+ if (r != ERROR_SUCCESS) {
-+ free(buf);
-+ buf = malloc(size);
-+ if (!buf) { status = 4; goto done; }
-+ fixed = buf;
-+ r = fn(fixed, &size);
-+ if (r != ERROR_SUCCESS) {
-+ log(EVDNS_LOG_DEBUG, "fn() failed.");
-+ status = -1;
-+ goto done;
-+ }
-+ }
-+
-+ assert(fixed);
-+ added_any = 0;
-+ ns = &(fixed->DnsServerList);
-+ while (ns) {
-+ r = evdns_nameserver_ip_add_line(ns->IpAddress.String);
-+ if (r) {
-+ log(EVDNS_LOG_DEBUG,"Could not add nameserver %s to list,error: %d",
-+ (ns->IpAddress.String),(int)GetLastError());
-+ status = r;
-+ goto done;
-+ } else {
-+ log(EVDNS_LOG_DEBUG,"Succesfully added %s as nameserver",ns->IpAddress.String);
-+ }
-+
-+ added_any++;
-+ ns = ns->Next;
-+ }
-+
-+ if (!added_any) {
-+ log(EVDNS_LOG_DEBUG, "No nameservers added.");
-+ status = -1;
-+ }
-+
-+ done:
-+ if (buf)
-+ free(buf);
-+ if (handle)
-+ FreeLibrary(handle);
-+ return status;
-+}
-+
-+static int
-+config_nameserver_from_reg_key(HKEY key, const char *subkey)
-+{
-+ char *buf;
-+ DWORD bufsz = 0, type = 0;
-+ int status = 0;
-+
-+ if (RegQueryValueEx(key, subkey, 0, &type, NULL, &bufsz)
-+ != ERROR_MORE_DATA)
-+ return -1;
-+ if (!(buf = malloc(bufsz)))
-+ return -1;
-+
-+ if (RegQueryValueEx(key, subkey, 0, &type, (LPBYTE)buf, &bufsz)
-+ == ERROR_SUCCESS && bufsz > 1) {
-+ status = evdns_nameserver_ip_add_line(buf);
-+ }
-+
-+ free(buf);
-+ return status;
-+}
-+
-+#define SERVICES_KEY "System\\CurrentControlSet\\Services\\"
-+#define WIN_NS_9X_KEY SERVICES_KEY "VxD\\MSTCP"
-+#define WIN_NS_NT_KEY SERVICES_KEY "Tcpip\\Parameters"
-+
-+static int
-+load_nameservers_from_registry(void)
-+{
-+ int found = 0;
-+ int r;
-+#define TRY(k, name) \
-+ if (!found && config_nameserver_from_reg_key(k,name) == 0) { \
-+ log(EVDNS_LOG_DEBUG,"Found nameservers in %s/%s",#k,name); \
-+ found = 1; \
-+ } else if (!found) { \
-+ log(EVDNS_LOG_DEBUG,"Didn't find nameservers in %s/%s", \
-+ #k,#name); \
-+ }
-+
-+ if (((int)GetVersion()) > 0) { /* NT */
-+ HKEY nt_key = 0, interfaces_key = 0;
-+
-+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,
-+ KEY_READ, &nt_key) != ERROR_SUCCESS) {
-+ log(EVDNS_LOG_DEBUG,"Couldn't open nt key, %d",(int)GetLastError());
-+ return -1;
-+ }
-+ r = RegOpenKeyEx(nt_key, "Interfaces", 0,
-+ KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS,
-+ &interfaces_key);
-+ if (r != ERROR_SUCCESS) {
-+ log(EVDNS_LOG_DEBUG,"Couldn't open interfaces key, %d",(int)GetLastError());
-+ return -1;
-+ }
-+ TRY(nt_key, "NameServer");
-+ TRY(nt_key, "DhcpNameServer");
-+ TRY(interfaces_key, "NameServer");
-+ TRY(interfaces_key, "DhcpNameServer");
-+ RegCloseKey(interfaces_key);
-+ RegCloseKey(nt_key);
-+ } else {
-+ HKEY win_key = 0;
-+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_9X_KEY, 0,
-+ KEY_READ, &win_key) != ERROR_SUCCESS) {
-+ log(EVDNS_LOG_DEBUG, "Couldn't open registry key, %d", (int)GetLastError());
-+ return -1;
-+ }
-+ TRY(win_key, "NameServer");
-+ RegCloseKey(win_key);
-+ }
-+
-+ if (found == 0) {
-+ log(EVDNS_LOG_WARN,"Didn't find any nameservers.");
-+ }
-+
-+ return found ? 0 : -1;
-+#undef TRY
-+}
-+
-+int
-+evdns_config_windows_nameservers(void)
-+{
-+ if (load_nameservers_with_getnetworkparams() == 0)
-+ return 0;
-+ return load_nameservers_from_registry();
-+}
-+#endif
-+
-+int
-+evdns_init(void)
-+{
-+ int res = 0;
-+#ifdef WIN32
-+ evdns_config_windows_nameservers();
-+#else
-+ res = evdns_resolv_conf_parse(DNS_OPTIONS_ALL, "/etc/resolv.conf");
-+#endif
-+
-+ return (res);
-+}
-+
-+const char *
-+evdns_err_to_string(int err)
-+{
-+ switch (err) {
-+ case DNS_ERR_NONE: return "no error";
-+ case DNS_ERR_FORMAT: return "misformatted query";
-+ case DNS_ERR_SERVERFAILED: return "server failed";
-+ case DNS_ERR_NOTEXIST: return "name does not exist";
-+ case DNS_ERR_NOTIMPL: return "query not implemented";
-+ case DNS_ERR_REFUSED: return "refused";
-+
-+ case DNS_ERR_TRUNCATED: return "reply truncated or ill-formed";
-+ case DNS_ERR_UNKNOWN: return "unknown";
-+ case DNS_ERR_TIMEOUT: return "request timed out";
-+ case DNS_ERR_SHUTDOWN: return "dns subsystem shut down";
-+ default: return "[Unknown error code]";
-+ }
-+}
-+
-+void
-+evdns_shutdown(int fail_requests)
-+{
-+ struct nameserver *server, *server_next;
-+ struct search_domain *dom, *dom_next;
-+
-+ while (req_head) {
-+ if (fail_requests)
-+ reply_callback(req_head, 0, DNS_ERR_SHUTDOWN, NULL);
-+ request_finished(req_head, &req_head);
-+ }
-+ while (req_waiting_head) {
-+ if (fail_requests)
-+ reply_callback(req_waiting_head, 0, DNS_ERR_SHUTDOWN, NULL);
-+ request_finished(req_waiting_head, &req_waiting_head);
-+ }
-+ global_requests_inflight = global_requests_waiting = 0;
-+
-+ for (server = server_head; server; server = server_next) {
-+ server_next = server->next;
-+ if (server->socket >= 0)
-+ CLOSE_SOCKET(server->socket);
-+ (void) event_del(&server->event);
-+ if (server->state == 0)
-+ (void) event_del(&server->timeout_event);
-+ free(server);
-+ if (server_next == server_head)
-+ break;
-+ }
-+ server_head = NULL;
-+ global_good_nameservers = 0;
-+
-+ if (global_search_state) {
-+ for (dom = global_search_state->head; dom; dom = dom_next) {
-+ dom_next = dom->next;
-+ free(dom);
-+ }
-+ free(global_search_state);
-+ global_search_state = NULL;
-+ }
-+ evdns_log_fn = NULL;
-+}
-+
-+#ifdef EVDNS_MAIN
-+void
-+main_callback(int result, char type, int count, int ttl,
-+ void *addrs, void *orig) {
-+ char *n = (char*)orig;
-+ int i;
-+ for (i = 0; i < count; ++i) {
-+ if (type == DNS_IPv4_A) {
-+ printf("%s: %s\n", n, debug_ntoa(((u32*)addrs)[i]));
-+ } else if (type == DNS_PTR) {
-+ printf("%s: %s\n", n, ((char**)addrs)[i]);
-+ }
-+ }
-+ if (!count) {
-+ printf("%s: No answer (%d)\n", n, result);
-+ }
-+ fflush(stdout);
-+}
-+void
-+evdns_server_callback(struct evdns_server_request *req, void *data)
-+{
-+ int i, r;
-+ (void)data;
-+ /* dummy; give 192.168.11.11 as an answer for all A questions,
-+ * give foo.bar.example.com as an answer for all PTR questions. */
-+ for (i = 0; i < req->nquestions; ++i) {
-+ u32 ans = htonl(0xc0a80b0bUL);
-+ if (req->questions[i]->type == EVDNS_TYPE_A &&
-+ req->questions[i]->class == EVDNS_CLASS_INET) {
-+ printf(" -- replying for %s (A)\n", req->questions[i]->name);
-+ r = evdns_server_request_add_a_reply(req, req->questions[i]->name,
-+ 1, &ans, 10);
-+ if (r<0)
-+ printf("eeep, didn't work.\n");
-+ } else if (req->questions[i]->type == EVDNS_TYPE_PTR &&
-+ req->questions[i]->class == EVDNS_CLASS_INET) {
-+ printf(" -- replying for %s (PTR)\n", req->questions[i]->name);
-+ r = evdns_server_request_add_ptr_reply(req, NULL, req->questions[i]->name,
-+ "foo.bar.example.com", 10);
-+ } else {
-+ printf(" -- skipping %s [%d %d]\n", req->questions[i]->name,
-+ req->questions[i]->type, req->questions[i]->class);
-+ }
-+ }
-+
-+ r = evdns_request_respond(req, 0);
-+ if (r<0)
-+ printf("eeek, couldn't send reply.\n");
-+}
-+
-+void
-+logfn(int is_warn, const char *msg) {
-+ (void) is_warn;
-+ fprintf(stderr, "%s\n", msg);
-+}
-+int
-+main(int c, char **v) {
-+ int idx;
-+ int reverse = 0, verbose = 1, servertest = 0;
-+ if (c<2) {
-+ fprintf(stderr, "syntax: %s [-x] [-v] hostname\n", v[0]);
-+ fprintf(stderr, "syntax: %s [-servertest]\n", v[0]);
-+ return 1;
-+ }
-+ idx = 1;
-+ while (idx < c && v[idx][0] == '-') {
-+ if (!strcmp(v[idx], "-x"))
-+ reverse = 1;
-+ else if (!strcmp(v[idx], "-v"))
-+ verbose = 1;
-+ else if (!strcmp(v[idx], "-servertest"))
-+ servertest = 1;
-+ else
-+ fprintf(stderr, "Unknown option %s\n", v[idx]);
-+ ++idx;
-+ }
-+ event_init();
-+ if (verbose)
-+ evdns_set_log_fn(logfn);
-+ evdns_resolv_conf_parse(DNS_OPTION_NAMESERVERS, "/etc/resolv.conf");
-+ if (servertest) {
-+ int sock;
-+ struct sockaddr_in my_addr;
-+ sock = socket(PF_INET, SOCK_DGRAM, 0);
-+ fcntl(sock, F_SETFL, O_NONBLOCK);
-+ my_addr.sin_family = AF_INET;
-+ my_addr.sin_port = htons(10053);
-+ my_addr.sin_addr.s_addr = INADDR_ANY;
-+ if (bind(sock, (struct sockaddr*)&my_addr, sizeof(my_addr))<0) {
-+ perror("bind");
-+ exit(1);
-+ }
-+ evdns_add_server_port(sock, 0, evdns_server_callback, NULL);
-+ }
-+ for (; idx < c; ++idx) {
-+ if (reverse) {
-+ struct in_addr addr;
-+ if (!inet_aton(v[idx], &addr)) {
-+ fprintf(stderr, "Skipping non-IP %s\n", v[idx]);
-+ continue;
-+ }
-+ fprintf(stderr, "resolving %s...\n",v[idx]);
-+ evdns_resolve_reverse(&addr, 0, main_callback, v[idx]);
-+ } else {
-+ fprintf(stderr, "resolving (fwd) %s...\n",v[idx]);
-+ evdns_resolve_ipv4(v[idx], 0, main_callback, v[idx]);
-+ }
-+ }
-+ fflush(stdout);
-+ event_dispatch();
-+ return 0;
-+}
-+#endif
-diff -Nru php-5.2.4.vanilla/libevent/evdns.h php-5.2.4.fpm/libevent/evdns.h
---- php-5.2.4.vanilla/libevent/evdns.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/evdns.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,367 @@
-+/*
-+ * Copyright (c) 2006 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * The original DNS code is due to Adam Langley with heavy
-+ * modifications by Nick Mathewson. Adam put his DNS software in the
-+ * public domain. You can find his original copyright below. Please,
-+ * aware that the code as part of libevent is governed by the 3-clause
-+ * BSD license above.
-+ *
-+ * This software is Public Domain. To view a copy of the public domain dedication,
-+ * visit http://creativecommons.org/licenses/publicdomain/ or send a letter to
-+ * Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
-+ *
-+ * I ask and expect, but do not require, that all derivative works contain an
-+ * attribution similar to:
-+ * Parts developed by Adam Langley <agl@imperialviolet.org>
-+ *
-+ * You may wish to replace the word "Parts" with something else depending on
-+ * the amount of original code.
-+ *
-+ * (Derivative works does not include programs which link against, run or include
-+ * the source verbatim in their source distributions)
-+ */
-+
-+/*
-+ * Welcome, gentle reader
-+ *
-+ * Async DNS lookups are really a whole lot harder than they should be,
-+ * mostly stemming from the fact that the libc resolver has never been
-+ * very good at them. Before you use this library you should see if libc
-+ * can do the job for you with the modern async call getaddrinfo_a
-+ * (see http://www.imperialviolet.org/page25.html#e498). Otherwise,
-+ * please continue.
-+ *
-+ * This code is based on libevent and you must call event_init before
-+ * any of the APIs in this file. You must also seed the OpenSSL random
-+ * source if you are using OpenSSL for ids (see below).
-+ *
-+ * This library is designed to be included and shipped with your source
-+ * code. You statically link with it. You should also test for the
-+ * existence of strtok_r and define HAVE_STRTOK_R if you have it.
-+ *
-+ * The DNS protocol requires a good source of id numbers and these
-+ * numbers should be unpredictable for spoofing reasons. There are
-+ * three methods for generating them here and you must define exactly
-+ * one of them. In increasing order of preference:
-+ *
-+ * DNS_USE_GETTIMEOFDAY_FOR_ID:
-+ * Using the bottom 16 bits of the usec result from gettimeofday. This
-+ * is a pretty poor solution but should work anywhere.
-+ * DNS_USE_CPU_CLOCK_FOR_ID:
-+ * Using the bottom 16 bits of the nsec result from the CPU's time
-+ * counter. This is better, but may not work everywhere. Requires
-+ * POSIX realtime support and you'll need to link against -lrt on
-+ * glibc systems at least.
-+ * DNS_USE_OPENSSL_FOR_ID:
-+ * Uses the OpenSSL RAND_bytes call to generate the data. You must
-+ * have seeded the pool before making any calls to this library.
-+ *
-+ * The library keeps track of the state of nameservers and will avoid
-+ * them when they go down. Otherwise it will round robin between them.
-+ *
-+ * Quick start guide:
-+ * #include "evdns.h"
-+ * void callback(int result, char type, int count, int ttl,
-+ * void *addresses, void *arg);
-+ * evdns_resolv_conf_parse(DNS_OPTIONS_ALL, "/etc/resolv.conf");
-+ * evdns_resolve("www.hostname.com", 0, callback, NULL);
-+ *
-+ * When the lookup is complete the callback function is called. The
-+ * first argument will be one of the DNS_ERR_* defines in evdns.h.
-+ * Hopefully it will be DNS_ERR_NONE, in which case type will be
-+ * DNS_IPv4_A, count will be the number of IP addresses, ttl is the time
-+ * which the data can be cached for (in seconds), addresses will point
-+ * to an array of uint32_t's and arg will be whatever you passed to
-+ * evdns_resolve.
-+ *
-+ * Searching:
-+ *
-+ * In order for this library to be a good replacement for glibc's resolver it
-+ * supports searching. This involves setting a list of default domains, in
-+ * which names will be queried for. The number of dots in the query name
-+ * determines the order in which this list is used.
-+ *
-+ * Searching appears to be a single lookup from the point of view of the API,
-+ * although many DNS queries may be generated from a single call to
-+ * evdns_resolve. Searching can also drastically slow down the resolution
-+ * of names.
-+ *
-+ * To disable searching:
-+ * 1. Never set it up. If you never call evdns_resolv_conf_parse or
-+ * evdns_search_add then no searching will occur.
-+ *
-+ * 2. If you do call evdns_resolv_conf_parse then don't pass
-+ * DNS_OPTION_SEARCH (or DNS_OPTIONS_ALL, which implies it).
-+ *
-+ * 3. When calling evdns_resolve, pass the DNS_QUERY_NO_SEARCH flag.
-+ *
-+ * The order of searches depends on the number of dots in the name. If the
-+ * number is greater than the ndots setting then the names is first tried
-+ * globally. Otherwise each search domain is appended in turn.
-+ *
-+ * The ndots setting can either be set from a resolv.conf, or by calling
-+ * evdns_search_ndots_set.
-+ *
-+ * For example, with ndots set to 1 (the default) and a search domain list of
-+ * ["myhome.net"]:
-+ * Query: www
-+ * Order: www.myhome.net, www.
-+ *
-+ * Query: www.abc
-+ * Order: www.abc., www.abc.myhome.net
-+ *
-+ * API reference:
-+ *
-+ * int evdns_nameserver_add(unsigned long int address)
-+ * Add a nameserver. The address should be an IP address in
-+ * network byte order. The type of address is chosen so that
-+ * it matches in_addr.s_addr.
-+ * Returns non-zero on error.
-+ *
-+ * int evdns_nameserver_ip_add(const char *ip_as_string)
-+ * This wraps the above function by parsing a string as an IP
-+ * address and adds it as a nameserver.
-+ * Returns non-zero on error
-+ *
-+ * int evdns_resolve(const char *name, int flags,
-+ * evdns_callback_type callback,
-+ * void *ptr)
-+ * Resolve a name. The name parameter should be a DNS name.
-+ * The flags parameter should be 0, or DNS_QUERY_NO_SEARCH
-+ * which disables searching for this query. (see defn of
-+ * searching above).
-+ *
-+ * The callback argument is a function which is called when
-+ * this query completes and ptr is an argument which is passed
-+ * to that callback function.
-+ *
-+ * Returns non-zero on error
-+ *
-+ * void evdns_search_clear()
-+ * Clears the list of search domains
-+ *
-+ * void evdns_search_add(const char *domain)
-+ * Add a domain to the list of search domains
-+ *
-+ * void evdns_search_ndots_set(int ndots)
-+ * Set the number of dots which, when found in a name, causes
-+ * the first query to be without any search domain.
-+ *
-+ * int evdns_count_nameservers(void)
-+ * Return the number of configured nameservers (not necessarily the
-+ * number of running nameservers). This is useful for double-checking
-+ * whether our calls to the various nameserver configuration functions
-+ * have been successful.
-+ *
-+ * int evdns_clear_nameservers_and_suspend(void)
-+ * Remove all currently configured nameservers, and suspend all pending
-+ * resolves. Resolves will not necessarily be re-attempted until
-+ * evdns_resume() is called.
-+ *
-+ * int evdns_resume(void)
-+ * Re-attempt resolves left in limbo after an earlier call to
-+ * evdns_clear_nameservers_and_suspend().
-+ *
-+ * int evdns_config_windows_nameservers(void)
-+ * Attempt to configure a set of nameservers based on platform settings on
-+ * a win32 host. Preferentially tries to use GetNetworkParams; if that fails,
-+ * looks in the registry. Returns 0 on success, nonzero on failure.
-+ *
-+ * int evdns_resolv_conf_parse(int flags, const char *filename)
-+ * Parse a resolv.conf like file from the given filename.
-+ *
-+ * See the man page for resolv.conf for the format of this file.
-+ * The flags argument determines what information is parsed from
-+ * this file:
-+ * DNS_OPTION_SEARCH - domain, search and ndots options
-+ * DNS_OPTION_NAMESERVERS - nameserver lines
-+ * DNS_OPTION_MISC - timeout and attempts options
-+ * DNS_OPTIONS_ALL - all of the above
-+ * The following directives are not parsed from the file:
-+ * sortlist, rotate, no-check-names, inet6, debug
-+ *
-+ * Returns non-zero on error:
-+ * 0 no errors
-+ * 1 failed to open file
-+ * 2 failed to stat file
-+ * 3 file too large
-+ * 4 out of memory
-+ * 5 short read from file
-+ * 6 no nameservers in file
-+ *
-+ * Internals:
-+ *
-+ * Requests are kept in two queues. The first is the inflight queue. In
-+ * this queue requests have an allocated transaction id and nameserver.
-+ * They will soon be transmitted if they haven't already been.
-+ *
-+ * The second is the waiting queue. The size of the inflight ring is
-+ * limited and all other requests wait in waiting queue for space. This
-+ * bounds the number of concurrent requests so that we don't flood the
-+ * nameserver. Several algorithms require a full walk of the inflight
-+ * queue and so bounding its size keeps thing going nicely under huge
-+ * (many thousands of requests) loads.
-+ *
-+ * If a nameserver loses too many requests it is considered down and we
-+ * try not to use it. After a while we send a probe to that nameserver
-+ * (a lookup for google.com) and, if it replies, we consider it working
-+ * again. If the nameserver fails a probe we wait longer to try again
-+ * with the next probe.
-+ */
-+
-+#ifndef EVENTDNS_H
-+#define EVENTDNS_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* Error codes 0-5 are as described in RFC 1035. */
-+#define DNS_ERR_NONE 0
-+/* The name server was unable to interpret the query */
-+#define DNS_ERR_FORMAT 1
-+/* The name server was unable to process this query due to a problem with the
-+ * name server */
-+#define DNS_ERR_SERVERFAILED 2
-+/* The domain name does not exist */
-+#define DNS_ERR_NOTEXIST 3
-+/* The name server does not support the requested kind of query */
-+#define DNS_ERR_NOTIMPL 4
-+/* The name server refuses to reform the specified operation for policy
-+ * reasons */
-+#define DNS_ERR_REFUSED 5
-+/* The reply was truncated or ill-formated */
-+#define DNS_ERR_TRUNCATED 65
-+/* An unknown error occurred */
-+#define DNS_ERR_UNKNOWN 66
-+/* Communication with the server timed out */
-+#define DNS_ERR_TIMEOUT 67
-+/* The request was canceled because the DNS subsystem was shut down. */
-+#define DNS_ERR_SHUTDOWN 68
-+
-+#define DNS_IPv4_A 1
-+#define DNS_PTR 2
-+#define DNS_IPv6_AAAA 3
-+
-+#define DNS_QUERY_NO_SEARCH 1
-+
-+#define DNS_OPTION_SEARCH 1
-+#define DNS_OPTION_NAMESERVERS 2
-+#define DNS_OPTION_MISC 4
-+#define DNS_OPTIONS_ALL 7
-+
-+/*
-+ * The callback that contains the results from a lookup.
-+ * - type is either DNS_IPv4_A or DNS_PTR or DNS_IPv6_AAAA
-+ * - count contains the number of addresses of form type
-+ * - ttl is the number of seconds the resolution may be cached for.
-+ * - addresses needs to be cast according to type
-+ */
-+typedef void (*evdns_callback_type) (int result, char type, int count, int ttl, void *addresses, void *arg);
-+
-+int evdns_init(void);
-+void evdns_shutdown(int fail_requests);
-+const char *evdns_err_to_string(int err);
-+int evdns_nameserver_add(unsigned long int address);
-+int evdns_count_nameservers(void);
-+int evdns_clear_nameservers_and_suspend(void);
-+int evdns_resume(void);
-+int evdns_nameserver_ip_add(const char *ip_as_string);
-+int evdns_resolve_ipv4(const char *name, int flags, evdns_callback_type callback, void *ptr);
-+int evdns_resolve_ipv6(const char *name, int flags, evdns_callback_type callback, void *ptr);
-+struct in_addr;
-+struct in6_addr;
-+int evdns_resolve_reverse(struct in_addr *in, int flags, evdns_callback_type callback, void *ptr);
-+int evdns_resolve_reverse_ipv6(struct in6_addr *in, int flags, evdns_callback_type callback, void *ptr);
-+int evdns_set_option(const char *option, const char *val, int flags);
-+int evdns_resolv_conf_parse(int flags, const char *);
-+#ifdef MS_WINDOWS
-+int evdns_config_windows_nameservers(void);
-+#endif
-+void evdns_search_clear(void);
-+void evdns_search_add(const char *domain);
-+void evdns_search_ndots_set(const int ndots);
-+
-+typedef void (*evdns_debug_log_fn_type)(int is_warning, const char *msg);
-+void evdns_set_log_fn(evdns_debug_log_fn_type fn);
-+
-+#define DNS_NO_SEARCH 1
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+/*
-+ * Structures and functions used to implement a DNS server.
-+ */
-+
-+struct evdns_server_request {
-+ int flags;
-+ int nquestions;
-+ struct evdns_server_question **questions;
-+};
-+struct evdns_server_question {
-+ int type;
-+ int class;
-+ char name[1];
-+};
-+typedef void (*evdns_request_callback_fn_type)(struct evdns_server_request *, void *);
-+#define EVDNS_ANSWER_SECTION 0
-+#define EVDNS_AUTHORITY_SECTION 1
-+#define EVDNS_ADDITIONAL_SECTION 2
-+
-+#define EVDNS_TYPE_A 1
-+#define EVDNS_TYPE_NS 2
-+#define EVDNS_TYPE_CNAME 5
-+#define EVDNS_TYPE_SOA 6
-+#define EVDNS_TYPE_PTR 12
-+#define EVDNS_TYPE_MX 15
-+#define EVDNS_TYPE_TXT 16
-+#define EVDNS_TYPE_AAAA 28
-+
-+#define EVDNS_QTYPE_AXFR 252
-+#define EVDNS_QTYPE_ALL 255
-+
-+#define EVDNS_CLASS_INET 1
-+
-+struct evdns_server_port *evdns_add_server_port(int socket, int is_tcp, evdns_request_callback_fn_type callback, void *user_data);
-+void evdns_close_server_port(struct evdns_server_port *port);
-+
-+int evdns_server_request_add_reply(struct evdns_server_request *req, int section, const char *name, int type, int class, int ttl, int datalen, int is_name, const char *data);
-+int evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl);
-+int evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl);
-+int evdns_server_request_add_ptr_reply(struct evdns_server_request *req, struct in_addr *in, const char *inaddr_name, const char *hostname, int ttl);
-+int evdns_server_request_add_cname_reply(struct evdns_server_request *req, const char *name, const char *cname, int ttl);
-+
-+int evdns_server_request_respond(struct evdns_server_request *req, int err);
-+int evdns_server_request_drop(struct evdns_server_request *req);
-+struct sockaddr;
-+int evdns_server_request_get_requesting_addr(struct evdns_server_request *_req, struct sockaddr *sa, int addr_len);
-+
-+#endif // !EVENTDNS_H
-diff -Nru php-5.2.4.vanilla/libevent/event.3 php-5.2.4.fpm/libevent/event.3
---- php-5.2.4.vanilla/libevent/event.3 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/event.3 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,592 @@
-+.\" $OpenBSD: event.3,v 1.4 2002/07/12 18:50:48 provos Exp $
-+.\"
-+.\" Copyright (c) 2000 Artur Grabowski <art@openbsd.org>
-+.\" All rights reserved.
-+.\"
-+.\" Redistribution and use in source and binary forms, with or without
-+.\" modification, are permitted provided that the following conditions
-+.\" are met:
-+.\"
-+.\" 1. Redistributions of source code must retain the above copyright
-+.\" notice, this list of conditions and the following disclaimer.
-+.\" 2. Redistributions in binary form must reproduce the above copyright
-+.\" notice, this list of conditions and the following disclaimer in the
-+.\" documentation and/or other materials provided with the distribution.
-+.\" 3. The name of the author may not be used to endorse or promote products
-+.\" derived from this software without specific prior written permission.
-+.\"
-+.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-+.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-+.\" AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-+.\" THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+.\" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-+.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-+.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-+.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+.\"
-+.Dd August 8, 2000
-+.Dt EVENT 3
-+.Os
-+.Sh NAME
-+.Nm event_init ,
-+.Nm event_dispatch ,
-+.Nm event_loop ,
-+.Nm event_loopexit ,
-+.Nm event_set ,
-+.Nm event_base_dispatch ,
-+.Nm event_base_loop ,
-+.Nm event_base_loopexit ,
-+.Nm event_base_set ,
-+.Nm event_base_free ,
-+.Nm event_add ,
-+.Nm event_del ,
-+.Nm event_once ,
-+.Nm event_base_once ,
-+.Nm event_pending ,
-+.Nm event_initialized ,
-+.Nm event_priority_init ,
-+.Nm event_priority_set ,
-+.Nm evtimer_set ,
-+.Nm evtimer_add ,
-+.Nm evtimer_del ,
-+.Nm evtimer_pending ,
-+.Nm evtimer_initialized ,
-+.Nm signal_set ,
-+.Nm signal_add ,
-+.Nm signal_del ,
-+.Nm signal_pending ,
-+.Nm signal_initialized ,
-+.Nm bufferevent_new ,
-+.Nm bufferevent_free ,
-+.Nm bufferevent_write ,
-+.Nm bufferevent_write_buffer ,
-+.Nm bufferevent_read ,
-+.Nm bufferevent_enable ,
-+.Nm bufferevent_disable ,
-+.Nm bufferevent_settimeout ,
-+.Nm bufferevent_base_set ,
-+.Nm evbuffer_new ,
-+.Nm evbuffer_free ,
-+.Nm evbuffer_add ,
-+.Nm evbuffer_add_buffer ,
-+.Nm evbuffer_add_printf ,
-+.Nm evbuffer_add_vprintf ,
-+.Nm evbuffer_drain ,
-+.Nm evbuffer_write ,
-+.Nm evbuffer_read ,
-+.Nm evbuffer_find ,
-+.Nm evbuffer_readline ,
-+.Nm evhttp_start ,
-+.Nm evhttp_free
-+.Nd execute a function when a specific event occurs
-+.Sh SYNOPSIS
-+.Fd #include <sys/time.h>
-+.Fd #include <event.h>
-+.Ft "struct event_base *"
-+.Fn "event_init" "void"
-+.Ft int
-+.Fn "event_dispatch" "void"
-+.Ft int
-+.Fn "event_loop" "int flags"
-+.Ft int
-+.Fn "event_loopexit" "struct timeval *tv"
-+.Ft void
-+.Fn "event_set" "struct event *ev" "int fd" "short event" "void (*fn)(int, short, void *)" "void *arg"
-+.Ft int
-+.Fn "event_base_dispatch" "struct event_base *base"
-+.Ft int
-+.Fn "event_base_loop" "struct event_base *base" "int flags"
-+.Ft int
-+.Fn "event_base_loopexit" "struct event_base *base" "struct timeval *tv"
-+.Ft int
-+.Fn "event_base_set" "struct event_base *base" "struct event *"
-+.Ft void
-+.Fn "event_base_free" "struct event_base *base"
-+.Ft int
-+.Fn "event_add" "struct event *ev" "struct timeval *tv"
-+.Ft int
-+.Fn "event_del" "struct event *ev"
-+.Ft int
-+.Fn "event_once" "int fd" "short event" "void (*fn)(int, short, void *)" "void *arg" "struct timeval *tv"
-+.Ft int
-+.Fn "event_base_once" "struct event_base *base" "int fd" "short event" "void (*fn)(int, short, void *)" "void *arg" "struct timeval *tv"
-+.Ft int
-+.Fn "event_pending" "struct event *ev" "short event" "struct timeval *tv"
-+.Ft int
-+.Fn "event_initialized" "struct event *ev"
-+.Ft int
-+.Fn "event_priority_init" "int npriorities"
-+.Ft int
-+.Fn "event_priority_set" "struct event *ev" "int priority"
-+.Ft void
-+.Fn "evtimer_set" "struct event *ev" "void (*fn)(int, short, void *)" "void *arg"
-+.Ft void
-+.Fn "evtimer_add" "struct event *ev" "struct timeval *"
-+.Ft void
-+.Fn "evtimer_del" "struct event *ev"
-+.Ft int
-+.Fn "evtimer_pending" "struct event *ev" "struct timeval *tv"
-+.Ft int
-+.Fn "evtimer_initialized" "struct event *ev"
-+.Ft void
-+.Fn "signal_set" "struct event *ev" "int signal" "void (*fn)(int, short, void *)" "void *arg"
-+.Ft void
-+.Fn "signal_add" "struct event *ev" "struct timeval *"
-+.Ft void
-+.Fn "signal_del" "struct event *ev"
-+.Ft int
-+.Fn "signal_pending" "struct event *ev" "struct timeval *tv"
-+.Ft int
-+.Fn "signal_initialized" "struct event *ev"
-+.Ft "struct bufferevent *"
-+.Fn "bufferevent_new" "int fd" "evbuffercb readcb" "evbuffercb writecb" "everrorcb" "void *cbarg"
-+.Ft void
-+.Fn "bufferevent_free" "struct bufferevent *bufev"
-+.Ft int
-+.Fn "bufferevent_write" "struct bufferevent *bufev" "void *data" "size_t size"
-+.Ft int
-+.Fn "bufferevent_write_buffer" "struct bufferevent *bufev" "struct evbuffer *buf"
-+.Ft size_t
-+.Fn "bufferevent_read" "struct bufferevent *bufev" "void *data" "size_t size"
-+.Ft int
-+.Fn "bufferevent_enable" "struct bufferevent *bufev" "short event"
-+.Ft int
-+.Fn "bufferevent_disable" "struct bufferevent *bufev" "short event"
-+.Ft void
-+.Fn "bufferevent_settimeout" "struct bufferevent *bufev" "int timeout_read" "int timeout_write"
-+.Ft int
-+.Fn "bufferevent_base_set" "struct event_base *base" "struct bufferevent *bufev"
-+.Ft "struct evbuffer *"
-+.Fn "evbuffer_new" "void"
-+.Ft void
-+.Fn "evbuffer_free" "struct evbuffer *buf"
-+.Ft int
-+.Fn "evbuffer_add" "struct evbuffer *buf" "const void *data" "size_t size"
-+.Ft int
-+.Fn "evbuffer_add_buffer" "struct evbuffer *dst" "struct evbuffer *src"
-+.Ft int
-+.Fn "evbuffer_add_printf" "struct evbuffer *buf" "const char *fmt" "..."
-+.Ft int
-+.Fn "evbuffer_add_vprintf" "struct evbuffer *buf" "const char *fmt" "va_list ap"
-+.Ft void
-+.Fn "evbuffer_drain" "struct evbuffer *buf" "size_t size"
-+.Ft int
-+.Fn "evbuffer_write" "struct evbuffer *buf" "int fd"
-+.Ft int
-+.Fn "evbuffer_read" "struct evbuffer *buf" "int fd" "int size"
-+.Ft "u_char *"
-+.Fn "evbuffer_find" "struct evbuffer *buf" "const u_char *data" "size_t size"
-+.Ft "char *"
-+.Fn "evbuffer_readline" "struct evbuffer *buf"
-+.Ft "struct evhttp *"
-+.Fn "evhttp_start" "const char *address" "u_short port"
-+.Ft "void"
-+.Fn "evhttp_free" "struct evhttp* http"
-+.Ft int
-+.Fa (*event_sigcb)(void) ;
-+.Ft volatile sig_atomic_t
-+.Fa event_gotsig ;
-+.Sh DESCRIPTION
-+The
-+.Nm event
-+API provides a mechanism to execute a function when a specific event
-+on a file descriptor occurs or after a given time has passed.
-+.Pp
-+The
-+.Nm event
-+API needs to be initialized with
-+.Fn event_init
-+before it can be used.
-+.Pp
-+In order to process events, an application needs to call
-+.Fn event_dispatch .
-+This function only returns on error, and should replace the event core
-+of the application program.
-+.Pp
-+In order to avoid races in signal handlers, the
-+.Nm event
-+API provides two variables:
-+.Va event_sigcb
-+and
-+.Va event_gotsig .
-+A signal handler
-+sets
-+.Va event_gotsig
-+to indicate that a signal has been received.
-+The application sets
-+.Va event_sigcb
-+to a callback function.
-+After the signal handler sets
-+.Va event_gotsig ,
-+.Nm event_dispatch
-+will execute the callback function to process received signals.
-+The callback returns 1 when no events are registered any more.
-+It can return \-1 to indicate an error to the
-+.Nm event
-+library, causing
-+.Fn event_dispatch
-+to terminate with
-+.Va errno
-+set to
-+.Er EINTR .
-+.Pp
-+The
-+.Nm event_loop
-+function provides an interface for single pass execution of pending
-+events.
-+The flags
-+.Va EVLOOP_ONCE
-+and
-+.Va EVLOOP_NONBLOCK
-+are recognized.
-+The
-+.Nm event_loopexit
-+function allows the loop to be terminated after some amount of time
-+has passed.
-+The parameter indicates the time after which the loop should terminate.
-+.Pp
-+It is the responsibility of the caller to provide these functions with
-+pre-allocated event structures.
-+.Pp
-+The function
-+.Fn event_set
-+prepares the event structure
-+.Fa ev
-+to be used in future calls to
-+.Fn event_add
-+and
-+.Fn event_del .
-+The event will be prepared to call the function specified by the
-+.Fa fn
-+argument with an
-+.Fa int
-+argument indicating the file descriptor, a
-+.Fa short
-+argument indicating the type of event, and a
-+.Fa void *
-+argument given in the
-+.Fa arg
-+argument.
-+The
-+.Fa fd
-+indicates the file descriptor that should be monitored for events.
-+The events can be either
-+.Va EV_READ ,
-+.Va EV_WRITE ,
-+or both,
-+indicating that an application can read or write from the file descriptor
-+respectively without blocking.
-+.Pp
-+The function
-+.Fa fn
-+will be called with the file descriptor that triggered the event and
-+the type of event which will be either
-+.Va EV_TIMEOUT ,
-+.Va EV_SIGNAL ,
-+.Va EV_READ ,
-+or
-+.Va EV_WRITE .
-+The additional flag
-+.Va EV_PERSIST
-+makes an
-+.Fn event_add
-+persistent until
-+.Fn event_del
-+has been called.
-+.Pp
-+Once initialized, the
-+.Fa ev
-+structure can be used repeatedly with
-+.Fn event_add
-+and
-+.Fn event_del
-+and does not need to be reinitialized unless the function called and/or
-+the argument to it are to be changed.
-+However, when an
-+.Fa ev
-+structure has been added to libevent using
-+.Fn event_add
-+the structure must persist until the event occurs (assuming
-+.Fa EV_PERSIST
-+is not set) or is removed
-+using
-+.Fn event_del .
-+You may not reuse the same
-+.Fa ev
-+structure for multiple monitored descriptors; each descriptor
-+needs its own
-+.Fa ev .
-+.Pp
-+The function
-+.Fn event_add
-+schedules the execution of the
-+.Fa ev
-+event when the event specified in
-+.Fn event_set
-+occurs or in at least the time specified in the
-+.Fa tv .
-+If
-+.Fa tv
-+is
-+.Dv NULL ,
-+no timeout occurs and the function will only be called
-+if a matching event occurs on the file descriptor.
-+The event in the
-+.Fa ev
-+argument must be already initialized by
-+.Fn event_set
-+and may not be used in calls to
-+.Fn event_set
-+until it has timed out or been removed with
-+.Fn event_del .
-+If the event in the
-+.Fa ev
-+argument already has a scheduled timeout, the old timeout will be
-+replaced by the new one.
-+.Pp
-+The function
-+.Fn event_del
-+will cancel the event in the argument
-+.Fa ev .
-+If the event has already executed or has never been added
-+the call will have no effect.
-+.Pp
-+The function
-+.Fn event_once
-+is similar to
-+.Fn event_set .
-+However, it schedules a callback to be called exactly once and does not
-+require the caller to prepare an
-+.Fa event
-+structure.
-+This function supports
-+.Fa EV_TIMEOUT ,
-+.Fa EV_READ ,
-+and
-+.Fa EV_WRITE .
-+.Pp
-+The
-+.Fn event_pending
-+function can be used to check if the event specified by
-+.Fa event
-+is pending to run.
-+If
-+.Va EV_TIMEOUT
-+was specified and
-+.Fa tv
-+is not
-+.Dv NULL ,
-+the expiration time of the event will be returned in
-+.Fa tv .
-+.Pp
-+The
-+.Fn event_initialized
-+macro can be used to check if an event has been initialized.
-+.Pp
-+The functions
-+.Fn evtimer_set ,
-+.Fn evtimer_add ,
-+.Fn evtimer_del ,
-+.Fn evtimer_initialized ,
-+and
-+.Fn evtimer_pending
-+are abbreviations for common situations where only a timeout is required.
-+The file descriptor passed will be \-1, and the event type will be
-+.Va EV_TIMEOUT .
-+.Pp
-+The functions
-+.Fn signal_set ,
-+.Fn signal_add ,
-+.Fn signal_del ,
-+.Fn signal_initialized ,
-+and
-+.Fn signal_pending
-+are abbreviations.
-+The event type will be a persistent
-+.Va EV_SIGNAL .
-+That means
-+.Fn signal_set
-+adds
-+.Va EV_PERSIST .
-+.Pp
-+It is possible to disable support for
-+.Va epoll , kqueue , devpoll , poll
-+or
-+.Va select
-+by setting the environment variable
-+.Va EVENT_NOEPOLL , EVENT_NOKQUEUE , EVENT_NODEVPOLL , EVENT_NOPOLL
-+or
-+.Va EVENT_NOSELECT ,
-+respectively.
-+By setting the environment variable
-+.Va EVENT_SHOW_METHOD ,
-+.Nm libevent
-+displays the kernel notification method that it uses.
-+.Sh EVENT PRIORITIES
-+By default
-+.Nm libevent
-+schedules all active events with the same priority.
-+However, sometimes it is desirable to process some events with a higher
-+priority than others.
-+For that reason,
-+.Nm libevent
-+supports strict priority queues.
-+Active events with a lower priority are always processed before events
-+with a higher priority.
-+.Pp
-+The number of different priorities can be set initially with the
-+.Fn event_priority_init
-+function.
-+This function should be called before the first call to
-+.Fn event_dispatch .
-+The
-+.Fn event_priority_set
-+function can be used to assign a priority to an event.
-+By default,
-+.Nm libevent
-+assigns the middle priority to all events unless their priority
-+is explicitly set.
-+.Sh THREAD SAFE EVENTS
-+.Nm Libevent
-+has experimental support for thread-safe events.
-+When initializing the library via
-+.Fn event_init ,
-+an event base is returned.
-+This event base can be used in conjunction with calls to
-+.Fn event_base_set ,
-+.Fn event_base_dispatch ,
-+.Fn event_base_loop ,
-+.Fn event_base_loopexit ,
-+.Fn bufferevent_base_set
-+and
-+.Fn event_base_free .
-+.Fn event_base_set
-+should be called after preparing an event with
-+.Fn event_set ,
-+as
-+.Fn event_set
-+assigns the provided event to the most recently created event base.
-+.Fn bufferevent_base_set
-+should be called after preparing a bufferevent with
-+.Fn bufferevent_new .
-+.Fn event_base_free
-+should be used to free memory associated with the event base
-+when it is no longer needed.
-+.Sh BUFFERED EVENTS
-+.Nm libevent
-+provides an abstraction on top of the regular event callbacks.
-+This abstraction is called a
-+.Va "buffered event" .
-+A buffered event provides input and output buffers that get filled
-+and drained automatically.
-+The user of a buffered event no longer deals directly with the IO,
-+but instead is reading from input and writing to output buffers.
-+.Pp
-+A new bufferevent is created by
-+.Fn bufferevent_new .
-+The parameter
-+.Fa fd
-+specifies the file descriptor from which data is read and written to.
-+This file descriptor is not allowed to be a
-+.Xr pipe 2 .
-+The next three parameters are callbacks.
-+The read and write callback have the following form:
-+.Ft void
-+.Fn "(*cb)" "struct bufferevent *bufev" "void *arg" .
-+The error callback has the following form:
-+.Ft void
-+.Fn "(*cb)" "struct bufferevent *bufev" "short what" "void *arg" .
-+The argument is specified by the fourth parameter
-+.Fa "cbarg" .
-+A
-+.Fa bufferevent struct
-+pointer is returned on success, NULL on error.
-+Both the read and the write callback may be NULL.
-+The error callback has to be always provided.
-+.Pp
-+Once initialized, the bufferevent structure can be used repeatedly with
-+bufferevent_enable() and bufferevent_disable().
-+The flags parameter can be a combination of
-+.Va EV_READ
-+and
-+.Va EV_WRITE .
-+When read enabled the bufferevent will try to read from the file
-+descriptor and call the read callback.
-+The write callback is executed
-+whenever the output buffer is drained below the write low watermark,
-+which is
-+.Va 0
-+by default.
-+.Pp
-+The
-+.Fn bufferevent_write
-+function can be used to write data to the file descriptor.
-+The data is appended to the output buffer and written to the descriptor
-+automatically as it becomes available for writing.
-+.Fn bufferevent_write
-+returns 0 on success or \-1 on failure.
-+The
-+.Fn bufferevent_read
-+function is used to read data from the input buffer,
-+returning the amount of data read.
-+.Pp
-+If multiple bases are in use, bufferevent_base_set() must be called before
-+enabling the bufferevent for the first time.
-+.Sh NON-BLOCKING HTTP SUPPORT
-+.Nm libevent
-+provides a very thin HTTP layer that can be used both to host an HTTP
-+server and also to make HTTP requests.
-+An HTTP server can be created by calling
-+.Fn evhttp_start .
-+When the HTTP server is no longer used, it can be freed via
-+.Fn evhttp_free .
-+.Pp
-+To be notified of HTTP requests, a user needs to register callbacks with the
-+HTTP server.
-+This can be done by calling
-+.Fn evhttp_set_cb .
-+The second argument is the URI for which a callback is being registered.
-+The corresponding callback will receive an
-+.Va struct evhttp_request
-+object that contains all information about the request.
-+.Pp
-+This section does not document all the possible function calls; please
-+check
-+.Va event.h
-+for the public interfaces.
-+.Sh RETURN VALUES
-+Upon successful completion
-+.Fn event_add
-+and
-+.Fn event_del
-+return 0.
-+Otherwise, \-1 is returned and the global variable errno is
-+set to indicate the error.
-+.Sh SEE ALSO
-+.Xr kqueue 2 ,
-+.Xr poll 2 ,
-+.Xr select 2 ,
-+.Xr evdns 3 ,
-+.Xr timeout 9
-+.Sh HISTORY
-+The
-+.Nm event
-+API manpage is based on the
-+.Xr timeout 9
-+manpage by Artur Grabowski.
-+The port of
-+.Nm libevent
-+to Windows is due to Michael A. Davis.
-+Support for real-time signals is due to Taral.
-+.Sh AUTHORS
-+The
-+.Nm event
-+library was written by Niels Provos.
-+.Sh BUGS
-+This documentation is neither complete nor authoritative.
-+If you are in doubt about the usage of this API then
-+check the source code to find out how it works, write
-+up the missing piece of documentation and send it to
-+me for inclusion in this man page.
-diff -Nru php-5.2.4.vanilla/libevent/event.c php-5.2.4.fpm/libevent/event.c
---- php-5.2.4.vanilla/libevent/event.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/event.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,883 @@
-+/*
-+ * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#ifdef WIN32
-+#define WIN32_LEAN_AND_MEAN
-+#include <windows.h>
-+#undef WIN32_LEAN_AND_MEAN
-+#include "misc.h"
-+#endif
-+#include <sys/types.h>
-+#include <sys/tree.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <sys/_time.h>
-+#endif
-+#include <sys/queue.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#ifndef WIN32
-+#include <unistd.h>
-+#endif
-+#include <errno.h>
-+#include <signal.h>
-+#include <string.h>
-+#include <assert.h>
-+
-+#include "event.h"
-+#include "event-internal.h"
-+#include "log.h"
-+
-+#ifdef HAVE_EVENT_PORTS
-+extern const struct eventop evportops;
-+#endif
-+#ifdef HAVE_SELECT
-+extern const struct eventop selectops;
-+#endif
-+#ifdef HAVE_POLL
-+extern const struct eventop pollops;
-+#endif
-+#ifdef HAVE_RTSIG
-+extern const struct eventop rtsigops;
-+#endif
-+#ifdef HAVE_EPOLL
-+extern const struct eventop epollops;
-+#endif
-+#ifdef HAVE_WORKING_KQUEUE
-+extern const struct eventop kqops;
-+#endif
-+#ifdef HAVE_DEVPOLL
-+extern const struct eventop devpollops;
-+#endif
-+#ifdef WIN32
-+extern const struct eventop win32ops;
-+#endif
-+
-+/* In order of preference */
-+const struct eventop *eventops[] = {
-+#ifdef HAVE_EVENT_PORTS
-+ &evportops,
-+#endif
-+#ifdef HAVE_WORKING_KQUEUE
-+ &kqops,
-+#endif
-+#ifdef HAVE_EPOLL
-+ &epollops,
-+#endif
-+#ifdef HAVE_DEVPOLL
-+ &devpollops,
-+#endif
-+#ifdef HAVE_RTSIG
-+ &rtsigops,
-+#endif
-+#ifdef HAVE_POLL
-+ &pollops,
-+#endif
-+#ifdef HAVE_SELECT
-+ &selectops,
-+#endif
-+#ifdef WIN32
-+ &win32ops,
-+#endif
-+ NULL
-+};
-+
-+/* Global state */
-+struct event_base *current_base = NULL;
-+extern struct event_base *evsignal_base;
-+
-+/* Handle signals - This is a deprecated interface */
-+int (*event_sigcb)(void); /* Signal callback when gotsig is set */
-+volatile sig_atomic_t event_gotsig; /* Set in signal handler */
-+
-+/* Prototypes */
-+static void event_queue_insert(struct event_base *, struct event *, int);
-+static void event_queue_remove(struct event_base *, struct event *, int);
-+static int event_haveevents(struct event_base *);
-+
-+static void event_process_active(struct event_base *);
-+
-+static int timeout_next(struct event_base *, struct timeval *);
-+static void timeout_process(struct event_base *);
-+static void timeout_correct(struct event_base *, struct timeval *);
-+
-+static int
-+compare(struct event *a, struct event *b)
-+{
-+ if (timercmp(&a->ev_timeout, &b->ev_timeout, <))
-+ return (-1);
-+ else if (timercmp(&a->ev_timeout, &b->ev_timeout, >))
-+ return (1);
-+ if (a < b)
-+ return (-1);
-+ else if (a > b)
-+ return (1);
-+ return (0);
-+}
-+
-+static int
-+gettime(struct timeval *tp)
-+{
-+#ifdef HAVE_CLOCK_GETTIME
-+ struct timespec ts;
-+
-+#ifdef HAVE_CLOCK_MONOTONIC
-+ if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1)
-+#else
-+ if (clock_gettime(CLOCK_REALTIME, &ts) == -1)
-+#endif
-+ return (-1);
-+ tp->tv_sec = ts.tv_sec;
-+ tp->tv_usec = ts.tv_nsec / 1000;
-+#else
-+ gettimeofday(tp, NULL);
-+#endif
-+
-+ return (0);
-+}
-+
-+RB_PROTOTYPE(event_tree, event, ev_timeout_node, compare);
-+
-+RB_GENERATE(event_tree, event, ev_timeout_node, compare);
-+
-+
-+void *
-+event_init(void)
-+{
-+ int i;
-+ struct event_base *base;
-+
-+ if ((base = calloc(1, sizeof(struct event_base))) == NULL)
-+ event_err(1, "%s: calloc");
-+
-+ event_sigcb = NULL;
-+ event_gotsig = 0;
-+ gettime(&base->event_tv);
-+
-+ RB_INIT(&base->timetree);
-+ TAILQ_INIT(&base->eventqueue);
-+ TAILQ_INIT(&base->sig.signalqueue);
-+ base->sig.ev_signal_pair[0] = -1;
-+ base->sig.ev_signal_pair[1] = -1;
-+
-+ base->evbase = NULL;
-+ for (i = 0; eventops[i] && !base->evbase; i++) {
-+ base->evsel = eventops[i];
-+
-+ base->evbase = base->evsel->init(base);
-+ }
-+
-+ if (base->evbase == NULL)
-+ event_errx(1, "%s: no event mechanism available", __func__);
-+
-+ if (getenv("EVENT_SHOW_METHOD"))
-+ event_msgx("libevent using: %s\n",
-+ base->evsel->name);
-+
-+ /* allocate a single active event queue */
-+ event_base_priority_init(base, 1);
-+
-+ current_base = base;
-+ return (base);
-+}
-+
-+void
-+event_base_free(struct event_base *base)
-+{
-+ int i;
-+
-+ if (base == NULL && current_base)
-+ base = current_base;
-+ if (base == current_base)
-+ current_base = NULL;
-+
-+ assert(base);
-+
-+ if (base->evsel->dealloc != NULL)
-+ base->evsel->dealloc(base, base->evbase);
-+
-+ for (i = 0; i < base->nactivequeues; ++i)
-+ free(base->activequeues[i]);
-+ free(base->activequeues);
-+
-+ free(base);
-+}
-+
-+int
-+event_priority_init(int npriorities)
-+{
-+ return event_base_priority_init(current_base, npriorities);
-+}
-+
-+int
-+event_base_priority_init(struct event_base *base, int npriorities)
-+{
-+ int i;
-+
-+ if (base->event_count_active)
-+ return (-1);
-+
-+ if (base->nactivequeues && npriorities != base->nactivequeues) {
-+ for (i = 0; i < base->nactivequeues; ++i) {
-+ free(base->activequeues[i]);
-+ }
-+ free(base->activequeues);
-+ }
-+
-+ /* Allocate our priority queues */
-+ base->nactivequeues = npriorities;
-+ base->activequeues = (struct event_list **)calloc(base->nactivequeues,
-+ npriorities * sizeof(struct event_list *));
-+ if (base->activequeues == NULL)
-+ event_err(1, "%s: calloc", __func__);
-+
-+ for (i = 0; i < base->nactivequeues; ++i) {
-+ base->activequeues[i] = malloc(sizeof(struct event_list));
-+ if (base->activequeues[i] == NULL)
-+ event_err(1, "%s: malloc", __func__);
-+ TAILQ_INIT(base->activequeues[i]);
-+ }
-+
-+ return (0);
-+}
-+
-+int
-+event_haveevents(struct event_base *base)
-+{
-+ return (base->event_count > 0);
-+}
-+
-+/*
-+ * Active events are stored in priority queues. Lower priorities are always
-+ * process before higher priorities. Low priority events can starve high
-+ * priority ones.
-+ */
-+
-+static void
-+event_process_active(struct event_base *base)
-+{
-+ struct event *ev;
-+ struct event_list *activeq = NULL;
-+ int i;
-+ short ncalls;
-+
-+ if (!base->event_count_active)
-+ return;
-+
-+ for (i = 0; i < base->nactivequeues; ++i) {
-+ if (TAILQ_FIRST(base->activequeues[i]) != NULL) {
-+ activeq = base->activequeues[i];
-+ break;
-+ }
-+ }
-+
-+ assert(activeq != NULL);
-+
-+ for (ev = TAILQ_FIRST(activeq); ev; ev = TAILQ_FIRST(activeq)) {
-+ event_queue_remove(base, ev, EVLIST_ACTIVE);
-+
-+ /* Allows deletes to work */
-+ ncalls = ev->ev_ncalls;
-+ ev->ev_pncalls = &ncalls;
-+ while (ncalls) {
-+ ncalls--;
-+ ev->ev_ncalls = ncalls;
-+ (*ev->ev_callback)((int)ev->ev_fd, ev->ev_res, ev->ev_arg);
-+ if (event_gotsig || base->event_gotterm)
-+ return;
-+ }
-+ }
-+}
-+
-+/*
-+ * Wait continously for events. We exit only if no events are left.
-+ */
-+
-+int
-+event_dispatch(void)
-+{
-+ return (event_loop(0));
-+}
-+
-+int
-+event_base_dispatch(struct event_base *event_base)
-+{
-+ return (event_base_loop(event_base, 0));
-+}
-+
-+/* not thread safe */
-+int
-+event_loopexit(struct timeval *tv)
-+{
-+ current_base->event_gotterm = 1;
-+
-+ return 0;
-+}
-+
-+int
-+event_base_loopexit(struct event_base *event_base, struct timeval *tv)
-+{
-+ event_base->event_gotterm = 1;
-+
-+ return 0;
-+}
-+
-+/* not thread safe */
-+
-+int
-+event_loop(int flags)
-+{
-+ return event_base_loop(current_base, flags);
-+}
-+
-+int
-+event_base_loop(struct event_base *base, int flags)
-+{
-+ const struct eventop *evsel = base->evsel;
-+ void *evbase = base->evbase;
-+ struct timeval tv;
-+ int res, done;
-+
-+ if(!TAILQ_EMPTY(&base->sig.signalqueue))
-+ evsignal_base = base;
-+ done = 0;
-+ while (!done) {
-+ /* Calculate the initial events that we are waiting for */
-+ if (evsel->recalc(base, evbase, 0) == -1)
-+ return (-1);
-+
-+ /* Terminate the loop if we have been asked to */
-+ if (base->event_gotterm) {
-+ base->event_gotterm = 0;
-+ break;
-+ }
-+
-+ /* You cannot use this interface for multi-threaded apps */
-+ while (event_gotsig) {
-+ event_gotsig = 0;
-+ if (event_sigcb) {
-+ res = (*event_sigcb)();
-+ if (res == -1) {
-+ errno = EINTR;
-+ return (-1);
-+ }
-+ }
-+ }
-+
-+ /* Check if time is running backwards */
-+ gettime(&tv);
-+ if (timercmp(&tv, &base->event_tv, <)) {
-+ struct timeval off;
-+ event_debug(("%s: time is running backwards, corrected",
-+ __func__));
-+ timersub(&base->event_tv, &tv, &off);
-+ timeout_correct(base, &off);
-+ }
-+ base->event_tv = tv;
-+
-+ if (!base->event_count_active && !(flags & EVLOOP_NONBLOCK))
-+ timeout_next(base, &tv);
-+ else
-+ timerclear(&tv);
-+
-+ /* If we have no events, we just exit */
-+ if (!event_haveevents(base)) {
-+ event_debug(("%s: no events registered.", __func__));
-+ return (1);
-+ }
-+
-+ res = evsel->dispatch(base, evbase, &tv);
-+
-+
-+ if (res == -1)
-+ return (-1);
-+
-+ timeout_process(base);
-+
-+ if (base->event_count_active) {
-+ event_process_active(base);
-+ if (!base->event_count_active && (flags & EVLOOP_ONCE))
-+ done = 1;
-+ } else if (flags & EVLOOP_NONBLOCK)
-+ done = 1;
-+ }
-+
-+ event_debug(("%s: asked to terminate loop.", __func__));
-+ return (0);
-+}
-+
-+/* Sets up an event for processing once */
-+
-+struct event_once {
-+ struct event ev;
-+
-+ void (*cb)(int, short, void *);
-+ void *arg;
-+};
-+
-+/* One-time callback, it deletes itself */
-+
-+static void
-+event_once_cb(int fd, short events, void *arg)
-+{
-+ struct event_once *eonce = arg;
-+
-+ (*eonce->cb)(fd, events, eonce->arg);
-+ free(eonce);
-+}
-+
-+/* not threadsafe, event scheduled once. */
-+int
-+event_once(int fd, short events,
-+ void (*callback)(int, short, void *), void *arg, struct timeval *tv)
-+{
-+ return event_base_once(current_base, fd, events, callback, arg, tv);
-+}
-+
-+/* Schedules an event once */
-+int
-+event_base_once(struct event_base *base, int fd, short events,
-+ void (*callback)(int, short, void *), void *arg, struct timeval *tv)
-+{
-+ struct event_once *eonce;
-+ struct timeval etv;
-+ int res;
-+
-+ /* We cannot support signals that just fire once */
-+ if (events & EV_SIGNAL)
-+ return (-1);
-+
-+ if ((eonce = calloc(1, sizeof(struct event_once))) == NULL)
-+ return (-1);
-+
-+ eonce->cb = callback;
-+ eonce->arg = arg;
-+
-+ if (events == EV_TIMEOUT) {
-+ if (tv == NULL) {
-+ timerclear(&etv);
-+ tv = &etv;
-+ }
-+
-+ evtimer_set(&eonce->ev, event_once_cb, eonce);
-+ } else if (events & (EV_READ|EV_WRITE)) {
-+ events &= EV_READ|EV_WRITE;
-+
-+ event_set(&eonce->ev, fd, events, event_once_cb, eonce);
-+ } else {
-+ /* Bad event combination */
-+ free(eonce);
-+ return (-1);
-+ }
-+
-+ res = event_base_set(base, &eonce->ev);
-+ if (res == 0)
-+ res = event_add(&eonce->ev, tv);
-+ if (res != 0) {
-+ free(eonce);
-+ return (res);
-+ }
-+
-+ return (0);
-+}
-+
-+void
-+event_set(struct event *ev, int fd, short events,
-+ void (*callback)(int, short, void *), void *arg)
-+{
-+ /* Take the current base - caller needs to set the real base later */
-+ ev->ev_base = current_base;
-+
-+ ev->ev_callback = callback;
-+ ev->ev_arg = arg;
-+ ev->ev_fd = fd;
-+ ev->ev_events = events;
-+ ev->ev_flags = EVLIST_INIT;
-+ ev->ev_ncalls = 0;
-+ ev->ev_pncalls = NULL;
-+
-+ /* by default, we put new events into the middle priority */
-+ if(current_base)
-+ ev->ev_pri = current_base->nactivequeues/2;
-+}
-+
-+int
-+event_base_set(struct event_base *base, struct event *ev)
-+{
-+ /* Only innocent events may be assigned to a different base */
-+ if (ev->ev_flags != EVLIST_INIT)
-+ return (-1);
-+
-+ ev->ev_base = base;
-+ ev->ev_pri = base->nactivequeues/2;
-+
-+ return (0);
-+}
-+
-+/*
-+ * Set's the priority of an event - if an event is already scheduled
-+ * changing the priority is going to fail.
-+ */
-+
-+int
-+event_priority_set(struct event *ev, int pri)
-+{
-+ if (ev->ev_flags & EVLIST_ACTIVE)
-+ return (-1);
-+ if (pri < 0 || pri >= ev->ev_base->nactivequeues)
-+ return (-1);
-+
-+ ev->ev_pri = pri;
-+
-+ return (0);
-+}
-+
-+/*
-+ * Checks if a specific event is pending or scheduled.
-+ */
-+
-+int
-+event_pending(struct event *ev, short event, struct timeval *tv)
-+{
-+ struct timeval now, res;
-+ int flags = 0;
-+
-+ if (ev->ev_flags & EVLIST_INSERTED)
-+ flags |= (ev->ev_events & (EV_READ|EV_WRITE));
-+ if (ev->ev_flags & EVLIST_ACTIVE)
-+ flags |= ev->ev_res;
-+ if (ev->ev_flags & EVLIST_TIMEOUT)
-+ flags |= EV_TIMEOUT;
-+ if (ev->ev_flags & EVLIST_SIGNAL)
-+ flags |= EV_SIGNAL;
-+
-+ event &= (EV_TIMEOUT|EV_READ|EV_WRITE|EV_SIGNAL);
-+
-+ /* See if there is a timeout that we should report */
-+ if (tv != NULL && (flags & event & EV_TIMEOUT)) {
-+ gettime(&now);
-+ timersub(&ev->ev_timeout, &now, &res);
-+ /* correctly remap to real time */
-+ gettimeofday(&now, NULL);
-+ timeradd(&now, &res, tv);
-+ }
-+
-+ return (flags & event);
-+}
-+
-+int
-+event_add(struct event *ev, struct timeval *tv)
-+{
-+ struct event_base *base = ev->ev_base;
-+ const struct eventop *evsel = base->evsel;
-+ void *evbase = base->evbase;
-+
-+ event_debug((
-+ "event_add: event: %p, %s%s%scall %p",
-+ ev,
-+ ev->ev_events & EV_READ ? "EV_READ " : " ",
-+ ev->ev_events & EV_WRITE ? "EV_WRITE " : " ",
-+ tv ? "EV_TIMEOUT " : " ",
-+ ev->ev_callback));
-+
-+ assert(!(ev->ev_flags & ~EVLIST_ALL));
-+
-+ if (tv != NULL) {
-+ struct timeval now;
-+
-+ if (ev->ev_flags & EVLIST_TIMEOUT)
-+ event_queue_remove(base, ev, EVLIST_TIMEOUT);
-+
-+ /* Check if it is active due to a timeout. Rescheduling
-+ * this timeout before the callback can be executed
-+ * removes it from the active list. */
-+ if ((ev->ev_flags & EVLIST_ACTIVE) &&
-+ (ev->ev_res & EV_TIMEOUT)) {
-+ /* See if we are just active executing this
-+ * event in a loop
-+ */
-+ if (ev->ev_ncalls && ev->ev_pncalls) {
-+ /* Abort loop */
-+ *ev->ev_pncalls = 0;
-+ }
-+
-+ event_queue_remove(base, ev, EVLIST_ACTIVE);
-+ }
-+
-+ gettime(&now);
-+ timeradd(&now, tv, &ev->ev_timeout);
-+
-+ event_debug((
-+ "event_add: timeout in %d seconds, call %p",
-+ tv->tv_sec, ev->ev_callback));
-+
-+ event_queue_insert(base, ev, EVLIST_TIMEOUT);
-+ }
-+
-+ if ((ev->ev_events & (EV_READ|EV_WRITE)) &&
-+ !(ev->ev_flags & (EVLIST_INSERTED|EVLIST_ACTIVE))) {
-+ event_queue_insert(base, ev, EVLIST_INSERTED);
-+
-+ return (evsel->add(evbase, ev));
-+ } else if ((ev->ev_events & EV_SIGNAL) &&
-+ !(ev->ev_flags & EVLIST_SIGNAL)) {
-+ event_queue_insert(base, ev, EVLIST_SIGNAL);
-+
-+ return (evsel->add(evbase, ev));
-+ }
-+
-+ return (0);
-+}
-+
-+int
-+event_del(struct event *ev)
-+{
-+ struct event_base *base;
-+ const struct eventop *evsel;
-+ void *evbase;
-+
-+ event_debug(("event_del: %p, callback %p",
-+ ev, ev->ev_callback));
-+
-+ /* An event without a base has not been added */
-+ if (ev->ev_base == NULL)
-+ return (-1);
-+
-+ base = ev->ev_base;
-+ evsel = base->evsel;
-+ evbase = base->evbase;
-+
-+ assert(!(ev->ev_flags & ~EVLIST_ALL));
-+
-+ /* See if we are just active executing this event in a loop */
-+ if (ev->ev_ncalls && ev->ev_pncalls) {
-+ /* Abort loop */
-+ *ev->ev_pncalls = 0;
-+ }
-+
-+ if (ev->ev_flags & EVLIST_TIMEOUT)
-+ event_queue_remove(base, ev, EVLIST_TIMEOUT);
-+
-+ if (ev->ev_flags & EVLIST_ACTIVE)
-+ event_queue_remove(base, ev, EVLIST_ACTIVE);
-+
-+ if (ev->ev_flags & EVLIST_INSERTED) {
-+ event_queue_remove(base, ev, EVLIST_INSERTED);
-+ return (evsel->del(evbase, ev));
-+ } else if (ev->ev_flags & EVLIST_SIGNAL) {
-+ event_queue_remove(base, ev, EVLIST_SIGNAL);
-+ return (evsel->del(evbase, ev));
-+ }
-+
-+ return (0);
-+}
-+
-+void
-+event_active(struct event *ev, int res, short ncalls)
-+{
-+ /* We get different kinds of events, add them together */
-+ if (ev->ev_flags & EVLIST_ACTIVE) {
-+ ev->ev_res |= res;
-+ return;
-+ }
-+
-+ ev->ev_res = res;
-+ ev->ev_ncalls = ncalls;
-+ ev->ev_pncalls = NULL;
-+ event_queue_insert(ev->ev_base, ev, EVLIST_ACTIVE);
-+}
-+
-+int
-+timeout_next(struct event_base *base, struct timeval *tv)
-+{
-+ struct timeval dflt = TIMEOUT_DEFAULT;
-+
-+ struct timeval now;
-+ struct event *ev;
-+
-+ if ((ev = RB_MIN(event_tree, &base->timetree)) == NULL) {
-+ *tv = dflt;
-+ return (0);
-+ }
-+
-+ if (gettime(&now) == -1)
-+ return (-1);
-+
-+ if (timercmp(&ev->ev_timeout, &now, <=)) {
-+ timerclear(tv);
-+ return (0);
-+ }
-+
-+ timersub(&ev->ev_timeout, &now, tv);
-+
-+ assert(tv->tv_sec >= 0);
-+ assert(tv->tv_usec >= 0);
-+
-+ event_debug(("timeout_next: in %d seconds", tv->tv_sec));
-+ return (0);
-+}
-+
-+static void
-+timeout_correct(struct event_base *base, struct timeval *off)
-+{
-+ struct event *ev;
-+
-+ /*
-+ * We can modify the key element of the node without destroying
-+ * the key, beause we apply it to all in the right order.
-+ */
-+ RB_FOREACH(ev, event_tree, &base->timetree)
-+ timersub(&ev->ev_timeout, off, &ev->ev_timeout);
-+}
-+
-+void
-+timeout_process(struct event_base *base)
-+{
-+ struct timeval now;
-+ struct event *ev, *next;
-+
-+ gettime(&now);
-+
-+ for (ev = RB_MIN(event_tree, &base->timetree); ev; ev = next) {
-+ if (timercmp(&ev->ev_timeout, &now, >))
-+ break;
-+ next = RB_NEXT(event_tree, &base->timetree, ev);
-+
-+ event_queue_remove(base, ev, EVLIST_TIMEOUT);
-+
-+ /* delete this event from the I/O queues */
-+ event_del(ev);
-+
-+ event_debug(("timeout_process: call %p",
-+ ev->ev_callback));
-+ event_active(ev, EV_TIMEOUT, 1);
-+ }
-+}
-+
-+void
-+event_queue_remove(struct event_base *base, struct event *ev, int queue)
-+{
-+ int docount = 1;
-+
-+ if (!(ev->ev_flags & queue))
-+ event_errx(1, "%s: %p(fd %d) not on queue %x", __func__,
-+ ev, ev->ev_fd, queue);
-+
-+ if (ev->ev_flags & EVLIST_INTERNAL)
-+ docount = 0;
-+
-+ if (docount)
-+ base->event_count--;
-+
-+ ev->ev_flags &= ~queue;
-+ switch (queue) {
-+ case EVLIST_ACTIVE:
-+ if (docount)
-+ base->event_count_active--;
-+ TAILQ_REMOVE(base->activequeues[ev->ev_pri],
-+ ev, ev_active_next);
-+ break;
-+ case EVLIST_SIGNAL:
-+ TAILQ_REMOVE(&base->sig.signalqueue, ev, ev_signal_next);
-+ break;
-+ case EVLIST_TIMEOUT:
-+ RB_REMOVE(event_tree, &base->timetree, ev);
-+ break;
-+ case EVLIST_INSERTED:
-+ TAILQ_REMOVE(&base->eventqueue, ev, ev_next);
-+ break;
-+ default:
-+ event_errx(1, "%s: unknown queue %x", __func__, queue);
-+ }
-+}
-+
-+void
-+event_queue_insert(struct event_base *base, struct event *ev, int queue)
-+{
-+ int docount = 1;
-+
-+ if (ev->ev_flags & queue) {
-+ /* Double insertion is possible for active events */
-+ if (queue & EVLIST_ACTIVE)
-+ return;
-+
-+ event_errx(1, "%s: %p(fd %d) already on queue %x", __func__,
-+ ev, ev->ev_fd, queue);
-+ }
-+
-+ if (ev->ev_flags & EVLIST_INTERNAL)
-+ docount = 0;
-+
-+ if (docount)
-+ base->event_count++;
-+
-+ ev->ev_flags |= queue;
-+ switch (queue) {
-+ case EVLIST_ACTIVE:
-+ if (docount)
-+ base->event_count_active++;
-+ TAILQ_INSERT_TAIL(base->activequeues[ev->ev_pri],
-+ ev,ev_active_next);
-+ break;
-+ case EVLIST_SIGNAL:
-+ TAILQ_INSERT_TAIL(&base->sig.signalqueue, ev, ev_signal_next);
-+ break;
-+ case EVLIST_TIMEOUT: {
-+ struct event *tmp = RB_INSERT(event_tree, &base->timetree, ev);
-+ assert(tmp == NULL);
-+ break;
-+ }
-+ case EVLIST_INSERTED:
-+ TAILQ_INSERT_TAIL(&base->eventqueue, ev, ev_next);
-+ break;
-+ default:
-+ event_errx(1, "%s: unknown queue %x", __func__, queue);
-+ }
-+}
-+
-+/* Functions for debugging */
-+
-+const char *
-+event_get_version(void)
-+{
-+ return (VERSION);
-+}
-+
-+/*
-+ * No thread-safe interface needed - the information should be the same
-+ * for all threads.
-+ */
-+
-+const char *
-+event_get_method(void)
-+{
-+ return (current_base->evsel->name);
-+}
-diff -Nru php-5.2.4.vanilla/libevent/event.h php-5.2.4.fpm/libevent/event.h
---- php-5.2.4.vanilla/libevent/event.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/event.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,354 @@
-+/*
-+ * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifndef _EVENT_H_
-+#define _EVENT_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#if defined(HAVE_INTTYPES_H)
-+#include <inttypes.h>
-+#else
-+#if defined(HAVE_STDINT_H)
-+#include <stdint.h>
-+#else
-+typedef unsigned int uint32_t;
-+typedef unsigned short uint16_t;
-+typedef unsigned char uint8_t;
-+#endif
-+#endif
-+
-+#include <stdarg.h>
-+
-+#ifdef WIN32
-+#define WIN32_LEAN_AND_MEAN
-+#include <windows.h>
-+#undef WIN32_LEAN_AND_MEAN
-+typedef unsigned char u_char;
-+typedef unsigned short u_short;
-+#endif
-+
-+#define EVLIST_TIMEOUT 0x01
-+#define EVLIST_INSERTED 0x02
-+#define EVLIST_SIGNAL 0x04
-+#define EVLIST_ACTIVE 0x08
-+#define EVLIST_INTERNAL 0x10
-+#define EVLIST_INIT 0x80
-+
-+/* EVLIST_X_ Private space: 0x1000-0xf000 */
-+#define EVLIST_ALL (0xf000 | 0x9f)
-+
-+#define EV_TIMEOUT 0x01
-+#define EV_READ 0x02
-+#define EV_WRITE 0x04
-+#define EV_SIGNAL 0x08
-+#define EV_PERSIST 0x10 /* Persistant event */
-+
-+/* Fix so that ppl dont have to run with <sys/queue.h> */
-+#ifndef TAILQ_ENTRY
-+#define _EVENT_DEFINED_TQENTRY
-+#define TAILQ_ENTRY(type) \
-+struct { \
-+ struct type *tqe_next; /* next element */ \
-+ struct type **tqe_prev; /* address of previous next element */ \
-+}
-+#endif /* !TAILQ_ENTRY */
-+#ifndef RB_ENTRY
-+#define _EVENT_DEFINED_RBENTRY
-+#define RB_ENTRY(type) \
-+struct { \
-+ struct type *rbe_left; /* left element */ \
-+ struct type *rbe_right; /* right element */ \
-+ struct type *rbe_parent; /* parent element */ \
-+ int rbe_color; /* node color */ \
-+}
-+#endif /* !RB_ENTRY */
-+
-+struct event_base;
-+struct event {
-+ TAILQ_ENTRY (event) ev_next;
-+ TAILQ_ENTRY (event) ev_active_next;
-+ TAILQ_ENTRY (event) ev_signal_next;
-+ RB_ENTRY (event) ev_timeout_node;
-+
-+ struct event_base *ev_base;
-+ int ev_fd;
-+ short ev_events;
-+ short ev_ncalls;
-+ short *ev_pncalls; /* Allows deletes in callback */
-+
-+ struct timeval ev_timeout;
-+
-+ int ev_pri; /* smaller numbers are higher priority */
-+
-+ void (*ev_callback)(int, short, void *arg);
-+ void *ev_arg;
-+
-+ int ev_res; /* result passed to event callback */
-+ int ev_flags;
-+};
-+
-+#define EVENT_SIGNAL(ev) (int)(ev)->ev_fd
-+#define EVENT_FD(ev) (int)(ev)->ev_fd
-+
-+/*
-+ * Key-Value pairs. Can be used for HTTP headers but also for
-+ * query argument parsing.
-+ */
-+struct evkeyval {
-+ TAILQ_ENTRY(evkeyval) next;
-+
-+ char *key;
-+ char *value;
-+};
-+
-+#ifdef _EVENT_DEFINED_TQENTRY
-+#undef TAILQ_ENTRY
-+struct event_list;
-+struct evkeyvalq;
-+#undef _EVENT_DEFINED_TQENTRY
-+#else
-+TAILQ_HEAD (event_list, event);
-+TAILQ_HEAD (evkeyvalq, evkeyval);
-+#endif /* _EVENT_DEFINED_TQENTRY */
-+#ifdef _EVENT_DEFINED_RBENTRY
-+#undef RB_ENTRY
-+#undef _EVENT_DEFINED_RBENTRY
-+#endif /* _EVENT_DEFINED_RBENTRY */
-+
-+struct eventop {
-+ char *name;
-+ void *(*init)(struct event_base *);
-+ int (*add)(void *, struct event *);
-+ int (*del)(void *, struct event *);
-+ int (*recalc)(struct event_base *, void *, int);
-+ int (*dispatch)(struct event_base *, void *, struct timeval *);
-+ void (*dealloc)(struct event_base *, void *);
-+};
-+
-+#define TIMEOUT_DEFAULT {5, 0}
-+
-+void *event_init(void);
-+int event_dispatch(void);
-+int event_base_dispatch(struct event_base *);
-+void event_base_free(struct event_base *);
-+
-+#define _EVENT_LOG_DEBUG 0
-+#define _EVENT_LOG_MSG 1
-+#define _EVENT_LOG_WARN 2
-+#define _EVENT_LOG_ERR 3
-+typedef void (*event_log_cb)(int severity, const char *msg);
-+void event_set_log_callback(event_log_cb cb);
-+
-+/* Associate a different event base with an event */
-+int event_base_set(struct event_base *, struct event *);
-+
-+#define EVLOOP_ONCE 0x01
-+#define EVLOOP_NONBLOCK 0x02
-+int event_loop(int);
-+int event_base_loop(struct event_base *, int);
-+int event_loopexit(struct timeval *); /* Causes the loop to exit */
-+int event_base_loopexit(struct event_base *, struct timeval *);
-+
-+#define evtimer_add(ev, tv) event_add(ev, tv)
-+#define evtimer_set(ev, cb, arg) event_set(ev, -1, 0, cb, arg)
-+#define evtimer_del(ev) event_del(ev)
-+#define evtimer_pending(ev, tv) event_pending(ev, EV_TIMEOUT, tv)
-+#define evtimer_initialized(ev) ((ev)->ev_flags & EVLIST_INIT)
-+
-+#define timeout_add(ev, tv) event_add(ev, tv)
-+#define timeout_set(ev, cb, arg) event_set(ev, -1, 0, cb, arg)
-+#define timeout_del(ev) event_del(ev)
-+#define timeout_pending(ev, tv) event_pending(ev, EV_TIMEOUT, tv)
-+#define timeout_initialized(ev) ((ev)->ev_flags & EVLIST_INIT)
-+
-+#define signal_add(ev, tv) event_add(ev, tv)
-+#define signal_set(ev, x, cb, arg) \
-+ event_set(ev, x, EV_SIGNAL|EV_PERSIST, cb, arg)
-+#define signal_del(ev) event_del(ev)
-+#define signal_pending(ev, tv) event_pending(ev, EV_SIGNAL, tv)
-+#define signal_initialized(ev) ((ev)->ev_flags & EVLIST_INIT)
-+
-+void event_set(struct event *, int, short, void (*)(int, short, void *), void *);
-+int event_once(int, short, void (*)(int, short, void *), void *, struct timeval *);
-+int event_base_once(struct event_base *, int, short, void (*)(int, short, void *), void *, struct timeval *);
-+
-+int event_add(struct event *, struct timeval *);
-+int event_del(struct event *);
-+void event_active(struct event *, int, short);
-+
-+int event_pending(struct event *, short, struct timeval *);
-+
-+#ifdef WIN32
-+#define event_initialized(ev) ((ev)->ev_flags & EVLIST_INIT && (ev)->ev_fd != (int)INVALID_HANDLE_VALUE)
-+#else
-+#define event_initialized(ev) ((ev)->ev_flags & EVLIST_INIT)
-+#endif
-+
-+/* Some simple debugging functions */
-+const char *event_get_version(void);
-+const char *event_get_method(void);
-+
-+/* These functions deal with event priorities */
-+
-+int event_priority_init(int);
-+int event_base_priority_init(struct event_base *, int);
-+int event_priority_set(struct event *, int);
-+
-+/* These functions deal with buffering input and output */
-+
-+struct evbuffer {
-+ u_char *buffer;
-+ u_char *orig_buffer;
-+
-+ size_t misalign;
-+ size_t totallen;
-+ size_t off;
-+
-+ void (*cb)(struct evbuffer *, size_t, size_t, void *);
-+ void *cbarg;
-+};
-+
-+/* Just for error reporting - use other constants otherwise */
-+#define EVBUFFER_READ 0x01
-+#define EVBUFFER_WRITE 0x02
-+#define EVBUFFER_EOF 0x10
-+#define EVBUFFER_ERROR 0x20
-+#define EVBUFFER_TIMEOUT 0x40
-+
-+struct bufferevent;
-+typedef void (*evbuffercb)(struct bufferevent *, void *);
-+typedef void (*everrorcb)(struct bufferevent *, short what, void *);
-+
-+struct event_watermark {
-+ size_t low;
-+ size_t high;
-+};
-+
-+struct bufferevent {
-+ struct event ev_read;
-+ struct event ev_write;
-+
-+ struct evbuffer *input;
-+ struct evbuffer *output;
-+
-+ struct event_watermark wm_read;
-+ struct event_watermark wm_write;
-+
-+ evbuffercb readcb;
-+ evbuffercb writecb;
-+ everrorcb errorcb;
-+ void *cbarg;
-+
-+ int timeout_read; /* in seconds */
-+ int timeout_write; /* in seconds */
-+
-+ short enabled; /* events that are currently enabled */
-+};
-+
-+struct bufferevent *bufferevent_new(int fd,
-+ evbuffercb readcb, evbuffercb writecb, everrorcb errorcb, void *cbarg);
-+int bufferevent_base_set(struct event_base *base, struct bufferevent *bufev);
-+int bufferevent_priority_set(struct bufferevent *bufev, int pri);
-+void bufferevent_free(struct bufferevent *bufev);
-+int bufferevent_write(struct bufferevent *bufev, void *data, size_t size);
-+int bufferevent_write_buffer(struct bufferevent *bufev, struct evbuffer *buf);
-+size_t bufferevent_read(struct bufferevent *bufev, void *data, size_t size);
-+int bufferevent_enable(struct bufferevent *bufev, short event);
-+int bufferevent_disable(struct bufferevent *bufev, short event);
-+void bufferevent_settimeout(struct bufferevent *bufev,
-+ int timeout_read, int timeout_write);
-+
-+#define EVBUFFER_LENGTH(x) (x)->off
-+#define EVBUFFER_DATA(x) (x)->buffer
-+#define EVBUFFER_INPUT(x) (x)->input
-+#define EVBUFFER_OUTPUT(x) (x)->output
-+
-+struct evbuffer *evbuffer_new(void);
-+void evbuffer_free(struct evbuffer *);
-+int evbuffer_expand(struct evbuffer *, size_t);
-+int evbuffer_add(struct evbuffer *, const void *, size_t);
-+int evbuffer_remove(struct evbuffer *, void *, size_t);
-+char *evbuffer_readline(struct evbuffer *);
-+int evbuffer_add_buffer(struct evbuffer *, struct evbuffer *);
-+int evbuffer_add_printf(struct evbuffer *, const char *fmt, ...);
-+int evbuffer_add_vprintf(struct evbuffer *, const char *fmt, va_list ap);
-+void evbuffer_drain(struct evbuffer *, size_t);
-+int evbuffer_write(struct evbuffer *, int);
-+int evbuffer_read(struct evbuffer *, int, int);
-+u_char *evbuffer_find(struct evbuffer *, const u_char *, size_t);
-+void evbuffer_setcb(struct evbuffer *, void (*)(struct evbuffer *, size_t, size_t, void *), void *);
-+
-+/*
-+ * Marshaling tagged data - We assume that all tags are inserted in their
-+ * numeric order - so that unknown tags will always be higher than the
-+ * known ones - and we can just ignore the end of an event buffer.
-+ */
-+
-+void evtag_init(void);
-+
-+void evtag_marshal(struct evbuffer *evbuf, uint8_t tag, const void *data,
-+ uint32_t len);
-+
-+void encode_int(struct evbuffer *evbuf, uint32_t number);
-+
-+void evtag_marshal_int(struct evbuffer *evbuf, uint8_t tag,
-+ uint32_t integer);
-+
-+void evtag_marshal_string(struct evbuffer *buf, uint8_t tag,
-+ const char *string);
-+
-+void evtag_marshal_timeval(struct evbuffer *evbuf, uint8_t tag,
-+ struct timeval *tv);
-+
-+void evtag_test(void);
-+
-+int evtag_unmarshal(struct evbuffer *src, uint8_t *ptag,
-+ struct evbuffer *dst);
-+int evtag_peek(struct evbuffer *evbuf, uint8_t *ptag);
-+int evtag_peek_length(struct evbuffer *evbuf, uint32_t *plength);
-+int evtag_payload_length(struct evbuffer *evbuf, uint32_t *plength);
-+int evtag_consume(struct evbuffer *evbuf);
-+
-+int evtag_unmarshal_int(struct evbuffer *evbuf, uint8_t need_tag,
-+ uint32_t *pinteger);
-+
-+int evtag_unmarshal_fixed(struct evbuffer *src, uint8_t need_tag, void *data,
-+ size_t len);
-+
-+int evtag_unmarshal_string(struct evbuffer *evbuf, uint8_t need_tag,
-+ char **pstring);
-+
-+int evtag_unmarshal_timeval(struct evbuffer *evbuf, uint8_t need_tag,
-+ struct timeval *ptv);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _EVENT_H_ */
-diff -Nru php-5.2.4.vanilla/libevent/event-internal.h php-5.2.4.fpm/libevent/event-internal.h
---- php-5.2.4.vanilla/libevent/event-internal.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/event-internal.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,61 @@
-+/*
-+ * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifndef _EVENT_INTERNAL_H_
-+#define _EVENT_INTERNAL_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "evsignal.h"
-+
-+struct event_base {
-+ const struct eventop *evsel;
-+ void *evbase;
-+ int event_count; /* counts number of total events */
-+ int event_count_active; /* counts number of active events */
-+
-+ int event_gotterm; /* Set to terminate loop */
-+
-+ /* active event management */
-+ struct event_list **activequeues;
-+ int nactivequeues;
-+
-+ /* signal handling info */
-+ struct evsignal_info sig;
-+
-+ struct event_list eventqueue;
-+ struct timeval event_tv;
-+
-+ RB_HEAD(event_tree, event) timetree;
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _EVENT_INTERNAL_H_ */
-diff -Nru php-5.2.4.vanilla/libevent/event_rpcgen.py php-5.2.4.fpm/libevent/event_rpcgen.py
---- php-5.2.4.vanilla/libevent/event_rpcgen.py 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/event_rpcgen.py 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,1394 @@
-+#!/usr/bin/env python
-+#
-+# Copyright (c) 2005 Niels Provos <provos@citi.umich.edu>
-+# All rights reserved.
-+#
-+# Generates marshaling code based on libevent.
-+
-+import sys
-+import re
-+
-+#
-+_NAME = "event_rpcgen.py"
-+_VERSION = "0.1"
-+_STRUCT_RE = '[a-z][a-z_0-9]*'
-+
-+# Globals
-+line_count = 0
-+
-+white = re.compile(r'^\s+')
-+cppcomment = re.compile(r'\/\/.*$')
-+headerdirect = []
-+cppdirect = []
-+
-+# Holds everything that makes a struct
-+class Struct:
-+ def __init__(self, name):
-+ self._name = name
-+ self._entries = []
-+ self._tags = {}
-+ print >>sys.stderr, ' Created struct: %s' % name
-+
-+ def AddEntry(self, entry):
-+ if self._tags.has_key(entry.Tag()):
-+ print >>sys.stderr, ( 'Entry "%s" duplicates tag number '
-+ '%d from "%s" around line %d' ) % (
-+ entry.Name(), entry.Tag(),
-+ self._tags[entry.Tag()], line_count)
-+ sys.exit(1)
-+ self._entries.append(entry)
-+ self._tags[entry.Tag()] = entry.Name()
-+ print >>sys.stderr, ' Added entry: %s' % entry.Name()
-+
-+ def Name(self):
-+ return self._name
-+
-+ def EntryTagName(self, entry):
-+ """Creates the name inside an enumeration for distinguishing data
-+ types."""
-+ name = "%s_%s" % (self._name, entry.Name())
-+ return name.upper()
-+
-+ def PrintIdented(self, file, ident, code):
-+ """Takes an array, add indentation to each entry and prints it."""
-+ for entry in code:
-+ print >>file, '%s%s' % (ident, entry)
-+
-+ def PrintTags(self, file):
-+ """Prints the tag definitions for a structure."""
-+ print >>file, '/* Tag definition for %s */' % self._name
-+ print >>file, 'enum %s_ {' % self._name.lower()
-+ for entry in self._entries:
-+ print >>file, ' %s=%d,' % (self.EntryTagName(entry),
-+ entry.Tag())
-+ print >>file, ' %s_MAX_TAGS' % (self._name.upper())
-+ print >>file, '};\n'
-+
-+ def PrintForwardDeclaration(self, file):
-+ print >>file, 'struct %s;' % self._name
-+
-+ def PrintDeclaration(self, file):
-+ print >>file, '/* Structure declaration for %s */' % self._name
-+ print >>file, 'struct %s {' % self._name
-+ for entry in self._entries:
-+ dcl = entry.Declaration()
-+ dcl.extend(
-+ entry.AssignDeclaration('(*%s_assign)' % entry.Name()))
-+ dcl.extend(
-+ entry.GetDeclaration('(*%s_get)' % entry.Name()))
-+ if entry.Array():
-+ dcl.extend(
-+ entry.AddDeclaration('(*%s_add)' % entry.Name()))
-+ self.PrintIdented(file, ' ', dcl)
-+ print >>file, ''
-+ for entry in self._entries:
-+ print >>file, ' u_int8_t %s_set;' % entry.Name()
-+ print >>file, '};\n'
-+
-+ print >>file, (
-+ 'struct %s *%s_new();\n' % (self._name, self._name) +
-+ 'void %s_free(struct %s *);\n' % (self._name, self._name) +
-+ 'void %s_clear(struct %s *);\n' % (self._name, self._name) +
-+ 'void %s_marshal(struct evbuffer *, const struct %s *);\n' % (
-+ self._name, self._name) +
-+ 'int %s_unmarshal(struct %s *, struct evbuffer *);\n' % (
-+ self._name, self._name) +
-+ 'int %s_complete(struct %s *);' % (self._name, self._name)
-+ )
-+ print >>file, ('void evtag_marshal_%s(struct evbuffer *, u_int8_t, '
-+ 'const struct %s *);') % ( self._name, self._name)
-+ print >>file, ('int evtag_unmarshal_%s(struct evbuffer *, u_int8_t, '
-+ 'struct %s *);') % ( self._name, self._name)
-+
-+ # Write a setting function of every variable
-+ for entry in self._entries:
-+ self.PrintIdented(file, '', entry.AssignDeclaration(
-+ entry.AssignFuncName()))
-+ self.PrintIdented(file, '', entry.GetDeclaration(
-+ entry.GetFuncName()))
-+ if entry.Array():
-+ self.PrintIdented(file, '', entry.AddDeclaration(
-+ entry.AddFuncName()))
-+
-+ print >>file, '/* --- %s done --- */\n' % self._name
-+
-+ def PrintCode(self, file):
-+ print >>file, ('/*\n'
-+ ' * Implementation of %s\n'
-+ ' */\n') % self._name
-+
-+ # Creation
-+ print >>file, ( 'struct %s *\n' % self._name +
-+ '%s_new()\n' % self._name +
-+ '{\n'
-+ ' struct %s *tmp;\n' % self._name +
-+ ' if ((tmp = malloc(sizeof(struct %s))) == NULL) {\n'
-+ ' event_warn("%%s: malloc", __func__);\n'
-+ ' return (NULL);\n' % self._name +
-+ ' }'
-+ )
-+ for entry in self._entries:
-+ self.PrintIdented(file, ' ', entry.CodeNew('tmp'))
-+ print >>file, ' tmp->%s_set = 0;\n' % entry.Name()
-+
-+ print >>file, (' return (tmp);\n'
-+ '}\n')
-+
-+ # Adding
-+ for entry in self._entries:
-+ if entry.Array():
-+ self.PrintIdented(file, '', entry.CodeAdd())
-+ print >>file, ''
-+
-+ # Assigning
-+ for entry in self._entries:
-+ self.PrintIdented(file, '', entry.CodeAssign())
-+ print >>file, ''
-+
-+ # Getting
-+ for entry in self._entries:
-+ self.PrintIdented(file, '', entry.CodeGet())
-+ print >>file, ''
-+
-+ # Clearing
-+ print >>file, ( 'void\n'
-+ '%s_clear(struct %s *tmp)\n' % (
-+ self._name, self._name)+
-+ '{'
-+ )
-+ for entry in self._entries:
-+ self.PrintIdented(file, ' ', entry.CodeClear('tmp'))
-+
-+ print >>file, '}\n'
-+
-+ # Freeing
-+ print >>file, ( 'void\n'
-+ '%s_free(struct %s *tmp)\n' % (
-+ self._name, self._name)+
-+ '{'
-+ )
-+ for entry in self._entries:
-+ self.PrintIdented(file, ' ', entry.CodeFree('tmp'))
-+
-+ print >>file, (' free(tmp);\n'
-+ '}\n')
-+
-+ # Marshaling
-+ print >>file, ('void\n'
-+ '%s_marshal(struct evbuffer *evbuf, '
-+ 'const struct %s *tmp)' % (self._name, self._name) +
-+ '{')
-+ for entry in self._entries:
-+ indent = ' '
-+ # Optional entries do not have to be set
-+ if entry.Optional():
-+ indent += ' '
-+ print >>file, ' if (tmp->%s_set) {' % entry.Name()
-+ self.PrintIdented(
-+ file, indent,
-+ entry.CodeMarshal('evbuf', self.EntryTagName(entry), 'tmp'))
-+ if entry.Optional():
-+ print >>file, ' }'
-+
-+ print >>file, '}\n'
-+
-+ # Unmarshaling
-+ print >>file, ('int\n'
-+ '%s_unmarshal(struct %s *tmp, '
-+ ' struct evbuffer *evbuf)\n' % (
-+ self._name, self._name) +
-+ '{\n'
-+ ' u_int8_t tag;\n'
-+ ' while (EVBUFFER_LENGTH(evbuf) > 0) {\n'
-+ ' if (evtag_peek(evbuf, &tag) == -1)\n'
-+ ' return (-1);\n'
-+ ' switch (tag) {\n'
-+ )
-+ for entry in self._entries:
-+ print >>file, ' case %s:\n' % self.EntryTagName(entry)
-+ if not entry.Array():
-+ print >>file, (
-+ ' if (tmp->%s_set)\n'
-+ ' return (-1);'
-+ ) % (entry.Name())
-+
-+ self.PrintIdented(
-+ file, ' ',
-+ entry.CodeUnmarshal('evbuf',
-+ self.EntryTagName(entry), 'tmp'))
-+
-+ print >>file, ( ' tmp->%s_set = 1;\n' % entry.Name() +
-+ ' break;\n' )
-+ print >>file, ( ' default:\n'
-+ ' return -1;\n'
-+ ' }\n'
-+ ' }\n' )
-+ # Check if it was decoded completely
-+ print >>file, ( ' if (%s_complete(tmp) == -1)\n' % self._name +
-+ ' return (-1);')
-+
-+ # Successfully decoded
-+ print >>file, ( ' return (0);\n'
-+ '}\n')
-+
-+ # Checking if a structure has all the required data
-+ print >>file, (
-+ 'int\n'
-+ '%s_complete(struct %s *msg)\n' % (self._name, self._name) +
-+ '{' )
-+ for entry in self._entries:
-+ self.PrintIdented(
-+ file, ' ',
-+ entry.CodeComplete('msg'))
-+ print >>file, (
-+ ' return (0);\n'
-+ '}\n' )
-+
-+ # Complete message unmarshaling
-+ print >>file, (
-+ 'int\n'
-+ 'evtag_unmarshal_%s(struct evbuffer *evbuf, u_int8_t need_tag, '
-+ ' struct %s *msg)'
-+ ) % (self._name, self._name)
-+ print >>file, (
-+ '{\n'
-+ ' u_int8_t tag;\n'
-+ ' int res = -1;\n'
-+ '\n'
-+ ' struct evbuffer *tmp = evbuffer_new();\n'
-+ '\n'
-+ ' if (evtag_unmarshal(evbuf, &tag, tmp) == -1'
-+ ' || tag != need_tag)\n'
-+ ' goto error;\n'
-+ '\n'
-+ ' if (%s_unmarshal(msg, tmp) == -1)\n'
-+ ' goto error;\n'
-+ '\n'
-+ ' res = 0;\n'
-+ '\n'
-+ ' error:\n'
-+ ' evbuffer_free(tmp);\n'
-+ ' return (res);\n'
-+ '}\n' ) % self._name
-+
-+ # Complete message marshaling
-+ print >>file, (
-+ 'void\n'
-+ 'evtag_marshal_%s(struct evbuffer *evbuf, u_int8_t tag, '
-+ 'const struct %s *msg)\n' % (self._name, self._name) +
-+ '{\n'
-+ ' struct evbuffer *_buf = evbuffer_new();\n'
-+ ' assert(_buf != NULL);\n'
-+ ' evbuffer_drain(_buf, -1);\n'
-+ ' %s_marshal(_buf, msg);\n' % self._name +
-+ ' evtag_marshal(evbuf, tag, EVBUFFER_DATA(_buf), '
-+ 'EVBUFFER_LENGTH(_buf));\n'
-+ ' evbuffer_free(_buf);\n'
-+ '}\n' )
-+
-+class Entry:
-+ def __init__(self, type, name, tag):
-+ self._type = type
-+ self._name = name
-+ self._tag = int(tag)
-+ self._ctype = type
-+ self._optional = 0
-+ self._can_be_array = 0
-+ self._array = 0
-+ self._line_count = -1
-+ self._struct = None
-+
-+ def SetStruct(self, struct):
-+ self._struct = struct
-+
-+ def LineCount(self):
-+ assert self._line_count != -1
-+ return self._line_count
-+
-+ def SetLineCount(self, number):
-+ self._line_count = number
-+
-+ def Array(self):
-+ return self._array
-+
-+ def Optional(self):
-+ return self._optional
-+
-+ def Tag(self):
-+ return self._tag
-+
-+ def Name(self):
-+ return self._name
-+
-+ def Type(self):
-+ return self._type
-+
-+ def MakeArray(self, yes=1):
-+ self._array = yes
-+
-+ def MakeOptional(self):
-+ self._optional = 1
-+
-+ def GetFuncName(self):
-+ return '%s_%s_get' % (self._struct.Name(), self._name)
-+
-+ def GetDeclaration(self, funcname):
-+ code = [ 'int %s(struct %s *, %s *);' % (
-+ funcname, self._struct.Name(), self._ctype ) ]
-+ return code
-+
-+ def CodeGet(self):
-+ code = [ 'int',
-+ '%s_%s_get(struct %s *msg, %s *value)' % (
-+ self._struct.Name(), self._name,
-+ self._struct.Name(), self._ctype),
-+ '{',
-+ ' if (msg->%s_set != 1)' % self._name,
-+ ' return (-1);',
-+ ' *value = msg->%s_data;' % self._name,
-+ ' return (0);',
-+ '}' ]
-+ return code
-+
-+ def AssignFuncName(self):
-+ return '%s_%s_assign' % (self._struct.Name(), self._name)
-+
-+ def AddFuncName(self):
-+ return '%s_%s_add' % (self._struct.Name(), self._name)
-+
-+ def AssignDeclaration(self, funcname):
-+ code = [ 'int %s(struct %s *, const %s);' % (
-+ funcname, self._struct.Name(), self._ctype ) ]
-+ return code
-+
-+ def CodeAssign(self):
-+ code = [ 'int',
-+ '%s_%s_assign(struct %s *msg, const %s value)' % (
-+ self._struct.Name(), self._name,
-+ self._struct.Name(), self._ctype),
-+ '{',
-+ ' msg->%s_set = 1;' % self._name,
-+ ' msg->%s_data = value;' % self._name,
-+ ' return (0);',
-+ '}' ]
-+ return code
-+
-+ def CodeClear(self, structname):
-+ code = [ '%s->%s_set = 0;' % (structname, self.Name()) ]
-+
-+ return code
-+
-+ def CodeComplete(self, structname):
-+ if self.Optional():
-+ return []
-+
-+ code = [ 'if (!%s->%s_set)' % (structname, self.Name()),
-+ ' return (-1);' ]
-+
-+ return code
-+
-+ def CodeFree(self, name):
-+ return []
-+
-+ def CodeNew(self, name):
-+ code = [ '%s->%s_assign = %s_%s_assign;' % (
-+ name, self._name, self._struct.Name(), self._name ),
-+ '%s->%s_get = %s_%s_get;' % (
-+ name, self._name, self._struct.Name(), self._name ),
-+ ]
-+ if self.Array():
-+ code.append(
-+ '%s->%s_add = %s_%s_add;' % (
-+ name, self._name, self._struct.Name(), self._name ) )
-+ return code
-+
-+ def Verify(self):
-+ if self.Array() and not self._can_be_array:
-+ print >>sys.stderr, (
-+ 'Entry "%s" cannot be created as an array '
-+ 'around line %d' ) % (self._name, self.LineCount())
-+ sys.exit(1)
-+ if not self._struct:
-+ print >>sys.stderr, (
-+ 'Entry "%s" does not know which struct it belongs to '
-+ 'around line %d' ) % (self._name, self.LineCount())
-+ sys.exit(1)
-+ if self._optional and self._array:
-+ print >>sys.stderr, ( 'Entry "%s" has illegal combination of '
-+ 'optional and array around line %d' ) % (
-+ self._name, self.LineCount() )
-+ sys.exit(1)
-+
-+class EntryBytes(Entry):
-+ def __init__(self, type, name, tag, length):
-+ # Init base class
-+ Entry.__init__(self, type, name, tag)
-+
-+ self._length = length
-+ self._ctype = 'u_int8_t'
-+
-+ def GetDeclaration(self, funcname):
-+ code = [ 'int %s(struct %s *, %s **);' % (
-+ funcname, self._struct.Name(), self._ctype ) ]
-+ return code
-+
-+ def AssignDeclaration(self, funcname):
-+ code = [ 'int %s(struct %s *, const %s *);' % (
-+ funcname, self._struct.Name(), self._ctype ) ]
-+ return code
-+
-+ def Declaration(self):
-+ dcl = ['u_int8_t %s_data[%s];' % (self._name, self._length)]
-+
-+ return dcl
-+
-+ def CodeGet(self):
-+ name = self._name
-+ code = [ 'int',
-+ '%s_%s_get(struct %s *msg, %s **value)' % (
-+ self._struct.Name(), name,
-+ self._struct.Name(), self._ctype),
-+ '{',
-+ ' if (msg->%s_set != 1)' % name,
-+ ' return (-1);',
-+ ' *value = msg->%s_data;' % name,
-+ ' return (0);',
-+ '}' ]
-+ return code
-+
-+ def CodeAssign(self):
-+ name = self._name
-+ code = [ 'int',
-+ '%s_%s_assign(struct %s *msg, const %s *value)' % (
-+ self._struct.Name(), name,
-+ self._struct.Name(), self._ctype),
-+ '{',
-+ ' msg->%s_set = 1;' % name,
-+ ' memcpy(msg->%s_data, value, %s);' % (
-+ name, self._length),
-+ ' return (0);',
-+ '}' ]
-+ return code
-+
-+ def CodeUnmarshal(self, buf, tag_name, var_name):
-+ code = [ 'if (evtag_unmarshal_fixed(%s, %s, ' % (buf, tag_name) +
-+ '%s->%s_data, ' % (var_name, self._name) +
-+ 'sizeof(%s->%s_data)) == -1) {' % (
-+ var_name, self._name),
-+ ' event_warnx("%%s: failed to unmarshal %s", __func__);' % (
-+ self._name ),
-+ ' return (-1);',
-+ '}'
-+ ]
-+ return code
-+
-+ def CodeMarshal(self, buf, tag_name, var_name):
-+ code = ['evtag_marshal(%s, %s, %s->%s_data, sizeof(%s->%s_data));' % (
-+ buf, tag_name, var_name, self._name, var_name, self._name )]
-+ return code
-+
-+ def CodeClear(self, structname):
-+ code = [ '%s->%s_set = 0;' % (structname, self.Name()),
-+ 'memset(%s->%s_data, 0, sizeof(%s->%s_data));' % (
-+ structname, self._name, structname, self._name)]
-+
-+ return code
-+
-+ def CodeNew(self, name):
-+ code = ['memset(%s->%s_data, 0, sizeof(%s->%s_data));' % (
-+ name, self._name, name, self._name)]
-+ code.extend(Entry.CodeNew(self, name))
-+ return code
-+
-+ def Verify(self):
-+ if not self._length:
-+ print >>sys.stderr, 'Entry "%s" needs a length around line %d' % (
-+ self._name, self.LineCount() )
-+ sys.exit(1)
-+
-+ Entry.Verify(self)
-+
-+class EntryInt(Entry):
-+ def __init__(self, type, name, tag):
-+ # Init base class
-+ Entry.__init__(self, type, name, tag)
-+
-+ self._ctype = 'u_int32_t'
-+
-+ def CodeUnmarshal(self, buf, tag_name, var_name):
-+ code = ['if (evtag_unmarshal_int(%s, %s, &%s->%s_data) == -1) {' % (
-+ buf, tag_name, var_name, self._name),
-+ ' event_warnx("%%s: failed to unmarshal %s", __func__);' % (
-+ self._name ),
-+ ' return (-1);',
-+ '}' ]
-+ return code
-+
-+ def CodeMarshal(self, buf, tag_name, var_name):
-+ code = ['evtag_marshal_int(%s, %s, %s->%s_data);' % (
-+ buf, tag_name, var_name, self._name)]
-+ return code
-+
-+ def Declaration(self):
-+ dcl = ['u_int32_t %s_data;' % self._name]
-+
-+ return dcl
-+
-+class EntryString(Entry):
-+ def __init__(self, type, name, tag):
-+ # Init base class
-+ Entry.__init__(self, type, name, tag)
-+
-+ self._ctype = 'char *'
-+
-+ def CodeAssign(self):
-+ name = self._name
-+ code = [ 'int',
-+ '%s_%s_assign(struct %s *msg, const %s value)' % (
-+ self._struct.Name(), name,
-+ self._struct.Name(), self._ctype),
-+ '{',
-+ ' if (msg->%s_data != NULL)' % name,
-+ ' free(msg->%s_data);' % name,
-+ ' if ((msg->%s_data = strdup(value)) == NULL)' % name,
-+ ' return (-1);',
-+ ' msg->%s_set = 1;' % name,
-+ ' return (0);',
-+ '}' ]
-+ return code
-+
-+ def CodeUnmarshal(self, buf, tag_name, var_name):
-+ code = ['if (evtag_unmarshal_string(%s, %s, &%s->%s_data) == -1) {' % (
-+ buf, tag_name, var_name, self._name),
-+ ' event_warnx("%%s: failed to unmarshal %s", __func__);' % (
-+ self._name ),
-+ ' return (-1);',
-+ '}'
-+ ]
-+ return code
-+
-+ def CodeMarshal(self, buf, tag_name, var_name):
-+ code = ['evtag_marshal_string(%s, %s, %s->%s_data);' % (
-+ buf, tag_name, var_name, self._name)]
-+ return code
-+
-+ def CodeClear(self, structname):
-+ code = [ 'if (%s->%s_set == 1) {' % (structname, self.Name()),
-+ ' free (%s->%s_data);' % (structname, self.Name()),
-+ ' %s->%s_data = NULL;' % (structname, self.Name()),
-+ ' %s->%s_set = 0;' % (structname, self.Name()),
-+ '}'
-+ ]
-+
-+ return code
-+
-+ def CodeNew(self, name):
-+ code = ['%s->%s_data = NULL;' % (name, self._name)]
-+ code.extend(Entry.CodeNew(self, name))
-+ return code
-+
-+ def CodeFree(self, name):
-+ code = ['if (%s->%s_data != NULL)' % (name, self._name),
-+ ' free (%s->%s_data); ' % (name, self._name)]
-+
-+ return code
-+
-+ def Declaration(self):
-+ dcl = ['char *%s_data;' % self._name]
-+
-+ return dcl
-+
-+class EntryStruct(Entry):
-+ def __init__(self, type, name, tag, refname):
-+ # Init base class
-+ Entry.__init__(self, type, name, tag)
-+
-+ self._can_be_array = 1
-+ self._refname = refname
-+ self._ctype = 'struct %s' % refname
-+
-+ def GetDeclaration(self, funcname):
-+ code = [ 'int %s(struct %s *, %s **);' % (
-+ funcname, self._struct.Name(), self._ctype ) ]
-+ return code
-+
-+ def AssignDeclaration(self, funcname):
-+ code = [ 'int %s(struct %s *, const %s *);' % (
-+ funcname, self._struct.Name(), self._ctype ) ]
-+ return code
-+
-+ def CodeGet(self):
-+ name = self._name
-+ code = [ 'int',
-+ '%s_%s_get(struct %s *msg, %s **value)' % (
-+ self._struct.Name(), name,
-+ self._struct.Name(), self._ctype),
-+ '{',
-+ ' if (msg->%s_set != 1) {' % name,
-+ ' msg->%s_data = %s_new();' % (name, self._refname),
-+ ' if (msg->%s_data == NULL)' % name,
-+ ' return (-1);',
-+ ' msg->%s_set = 1;' % name,
-+ ' }',
-+ ' *value = msg->%s_data;' % name,
-+ ' return (0);',
-+ '}' ]
-+ return code
-+
-+ def CodeAssign(self):
-+ name = self._name
-+ code = [ 'int',
-+ '%s_%s_assign(struct %s *msg, const %s *value)' % (
-+ self._struct.Name(), name,
-+ self._struct.Name(), self._ctype),
-+ '{',
-+ ' struct evbuffer *tmp = NULL;',
-+ ' if (msg->%s_set) {' % name,
-+ ' %s_clear(msg->%s_data);' % (self._refname, name),
-+ ' msg->%s_set = 0;' % name,
-+ ' } else {',
-+ ' msg->%s_data = %s_new();' % (name, self._refname),
-+ ' if (msg->%s_data == NULL) {' % name,
-+ ' event_warn("%%s: %s_new()", __func__);' % (
-+ self._refname),
-+ ' goto error;',
-+ ' }',
-+ ' }',
-+ ' if ((tmp = evbuffer_new()) == NULL) {',
-+ ' event_warn("%s: evbuffer_new()", __func__);',
-+ ' goto error;',
-+ ' }',
-+ ' %s_marshal(tmp, value); ' % self._refname,
-+ ' if (%s_unmarshal(msg->%s_data, tmp) == -1) {' % (
-+ self._refname, name ),
-+ ' event_warnx("%%s: %s_unmarshal", __func__);' % (
-+ self._refname),
-+ ' goto error;',
-+ ' }',
-+ ' msg->%s_set = 1;' % name,
-+ ' evbuffer_free(tmp);',
-+ ' return (0);',
-+ ' error:',
-+ ' if (tmp != NULL)',
-+ ' evbuffer_free(tmp);',
-+ ' if (msg->%s_data != NULL) {' % name,
-+ ' %s_free(msg->%s_data);' % (self._refname, name),
-+ ' msg->%s_data = NULL;' % name,
-+ ' }',
-+ ' return (-1);',
-+ '}' ]
-+ return code
-+
-+ def CodeComplete(self, structname):
-+ if self.Optional():
-+ code = [ 'if (%s->%s_set && %s_complete(%s->%s_data) == -1)' % (
-+ structname, self.Name(),
-+ self._refname, structname, self.Name()),
-+ ' return (-1);' ]
-+ else:
-+ code = [ 'if (%s_complete(%s->%s_data) == -1)' % (
-+ self._refname, structname, self.Name()),
-+ ' return (-1);' ]
-+
-+ return code
-+
-+ def CodeUnmarshal(self, buf, tag_name, var_name):
-+ code = ['%s->%s_data = %s_new();' % (
-+ var_name, self._name, self._refname),
-+ 'if (%s->%s_data == NULL)' % (var_name, self._name),
-+ ' return (-1);',
-+ 'if (evtag_unmarshal_%s(%s, %s, %s->%s_data) == -1) {' % (
-+ self._refname, buf, tag_name, var_name, self._name),
-+ ' event_warnx("%%s: failed to unmarshal %s", __func__);' % (
-+ self._name ),
-+ ' return (-1);',
-+ '}'
-+ ]
-+ return code
-+
-+ def CodeMarshal(self, buf, tag_name, var_name):
-+ code = ['evtag_marshal_%s(%s, %s, %s->%s_data);' % (
-+ self._refname, buf, tag_name, var_name, self._name)]
-+ return code
-+
-+ def CodeClear(self, structname):
-+ code = [ 'if (%s->%s_set == 1) {' % (structname, self.Name()),
-+ ' %s_free(%s->%s_data);' % (
-+ self._refname, structname, self.Name()),
-+ ' %s->%s_data = NULL;' % (structname, self.Name()),
-+ ' %s->%s_set = 0;' % (structname, self.Name()),
-+ '}'
-+ ]
-+
-+ return code
-+
-+ def CodeNew(self, name):
-+ code = ['%s->%s_data = NULL;' % (name, self._name)]
-+ code.extend(Entry.CodeNew(self, name))
-+ return code
-+
-+ def CodeFree(self, name):
-+ code = ['if (%s->%s_data != NULL)' % (name, self._name),
-+ ' %s_free(%s->%s_data); ' % (
-+ self._refname, name, self._name)]
-+
-+ return code
-+
-+ def Declaration(self):
-+ dcl = ['struct %s *%s_data;' % (self._refname, self._name)]
-+
-+ return dcl
-+
-+class EntryVarBytes(Entry):
-+ def __init__(self, type, name, tag):
-+ # Init base class
-+ Entry.__init__(self, type, name, tag)
-+
-+ self._ctype = 'u_int8_t *'
-+
-+ def GetDeclaration(self, funcname):
-+ code = [ 'int %s(struct %s *, %s *, u_int32_t *);' % (
-+ funcname, self._struct.Name(), self._ctype ) ]
-+ return code
-+
-+ def AssignDeclaration(self, funcname):
-+ code = [ 'int %s(struct %s *, const %s, u_int32_t);' % (
-+ funcname, self._struct.Name(), self._ctype ) ]
-+ return code
-+
-+ def CodeAssign(self):
-+ name = self._name
-+ code = [ 'int',
-+ '%s_%s_assign(struct %s *msg, '
-+ 'const %s value, u_int32_t len)' % (
-+ self._struct.Name(), name,
-+ self._struct.Name(), self._ctype),
-+ '{',
-+ ' if (msg->%s_data != NULL)' % name,
-+ ' free (msg->%s_data);' % name,
-+ ' msg->%s_data = malloc(len);' % name,
-+ ' if (msg->%s_data == NULL)' % name,
-+ ' return (-1);',
-+ ' msg->%s_set = 1;' % name,
-+ ' msg->%s_length = len;' % name,
-+ ' memcpy(msg->%s_data, value, len);' % name,
-+ ' return (0);',
-+ '}' ]
-+ return code
-+
-+ def CodeGet(self):
-+ name = self._name
-+ code = [ 'int',
-+ '%s_%s_get(struct %s *msg, %s *value, u_int32_t *plen)' % (
-+ self._struct.Name(), name,
-+ self._struct.Name(), self._ctype),
-+ '{',
-+ ' if (msg->%s_set != 1)' % name,
-+ ' return (-1);',
-+ ' *value = msg->%s_data;' % name,
-+ ' *plen = msg->%s_length;' % name,
-+ ' return (0);',
-+ '}' ]
-+ return code
-+
-+ def CodeUnmarshal(self, buf, tag_name, var_name):
-+ code = ['if (evtag_payload_length(%s, &%s->%s_length) == -1)' % (
-+ buf, var_name, self._name),
-+ ' return (-1);',
-+ # We do not want DoS opportunities
-+ 'if (%s->%s_length > EVBUFFER_LENGTH(%s))' % (
-+ var_name, self._name, buf),
-+ ' return (-1);',
-+ 'if ((%s->%s_data = malloc(%s->%s_length)) == NULL)' % (
-+ var_name, self._name, var_name, self._name),
-+ ' return (-1);',
-+ 'if (evtag_unmarshal_fixed(%s, %s, %s->%s_data, '
-+ '%s->%s_length) == -1) {' % (
-+ buf, tag_name, var_name, self._name, var_name, self._name),
-+ ' event_warnx("%%s: failed to unmarshal %s", __func__);' % (
-+ self._name ),
-+ ' return (-1);',
-+ '}'
-+ ]
-+ return code
-+
-+ def CodeMarshal(self, buf, tag_name, var_name):
-+ code = ['evtag_marshal(%s, %s, %s->%s_data, %s->%s_length);' % (
-+ buf, tag_name, var_name, self._name, var_name, self._name)]
-+ return code
-+
-+ def CodeClear(self, structname):
-+ code = [ 'if (%s->%s_set == 1) {' % (structname, self.Name()),
-+ ' free (%s->%s_data);' % (structname, self.Name()),
-+ ' %s->%s_data = NULL;' % (structname, self.Name()),
-+ ' %s->%s_length = 0;' % (structname, self.Name()),
-+ ' %s->%s_set = 0;' % (structname, self.Name()),
-+ '}'
-+ ]
-+
-+ return code
-+
-+ def CodeNew(self, name):
-+ code = ['%s->%s_data = NULL;' % (name, self._name),
-+ '%s->%s_length = 0;' % (name, self._name) ]
-+ code.extend(Entry.CodeNew(self, name))
-+ return code
-+
-+ def CodeFree(self, name):
-+ code = ['if (%s->%s_data != NULL)' % (name, self._name),
-+ ' free (%s->%s_data); ' % (name, self._name)]
-+
-+ return code
-+
-+ def Declaration(self):
-+ dcl = ['u_int8_t *%s_data;' % self._name,
-+ 'u_int32_t %s_length;' % self._name]
-+
-+ return dcl
-+
-+class EntryArray(Entry):
-+ def __init__(self, entry):
-+ # Init base class
-+ Entry.__init__(self, entry._type, entry._name, entry._tag)
-+
-+ self._entry = entry
-+ self._refname = entry._refname
-+ self._ctype = 'struct %s' % self._refname
-+
-+ def GetDeclaration(self, funcname):
-+ """Allows direct access to elements of the array."""
-+ code = [ 'int %s(struct %s *, int, %s **);' % (
-+ funcname, self._struct.Name(), self._ctype ) ]
-+ return code
-+
-+ def AssignDeclaration(self, funcname):
-+ code = [ 'int %s(struct %s *, int, const %s *);' % (
-+ funcname, self._struct.Name(), self._ctype ) ]
-+ return code
-+
-+ def AddDeclaration(self, funcname):
-+ code = [ '%s *%s(struct %s *);' % (
-+ self._ctype, funcname, self._struct.Name() ) ]
-+ return code
-+
-+ def CodeGet(self):
-+ name = self._name
-+ code = [ 'int',
-+ '%s_%s_get(struct %s *msg, int offset, %s **value)' % (
-+ self._struct.Name(), name,
-+ self._struct.Name(), self._ctype),
-+ '{',
-+ ' if (msg->%s_set != 1)' % name,
-+ ' return (-1);',
-+ ' if (offset >= msg->%s_length)' % name,
-+ ' return (-1);',
-+ ' *value = msg->%s_data[offset];' % name,
-+ ' return (0);',
-+ '}' ]
-+ return code
-+
-+ def CodeAssign(self):
-+ name = self._name
-+ code = [ 'int',
-+ '%s_%s_assign(struct %s *msg, int off, const %s *value)' % (
-+ self._struct.Name(), name,
-+ self._struct.Name(), self._ctype),
-+ '{',
-+ ' struct evbuffer *tmp = NULL;',
-+ ' if (msg->%s_set != 1)' % name,
-+ ' return (-1);',
-+ ' if (off >= msg->%s_length)' % name,
-+ ' return (-1);',
-+ '',
-+ ' %s_clear(msg->%s_data[off]);' % (self._refname, name),
-+ ' if ((tmp = evbuffer_new()) == NULL) {',
-+ ' event_warn("%s: evbuffer_new()", __func__);',
-+ ' goto error;',
-+ ' }',
-+ ' %s_marshal(tmp, value); ' % self._refname,
-+ ' if (%s_unmarshal(msg->%s_data[off], tmp) == -1) {' % (
-+ self._refname, name ),
-+ ' event_warnx("%%s: %s_unmarshal", __func__);' % (
-+ self._refname),
-+ ' goto error;',
-+ ' }',
-+ ' evbuffer_free(tmp);',
-+ ' return (0);',
-+ ' error:',
-+ ' if (tmp != NULL)',
-+ ' evbuffer_free(tmp);',
-+ ' %s_clear(msg->%s_data[off]);' % (self._refname, name),
-+ ' return (-1);',
-+ '}' ]
-+ return code
-+
-+ def CodeAdd(self):
-+ name = self._name
-+ code = [
-+ '%s *' % self._ctype,
-+ '%s_%s_add(struct %s *msg)' % (
-+ self._struct.Name(), name, self._struct.Name()),
-+ '{',
-+ ' msg->%s_length++;' % name,
-+ ' msg->%s_data = (struct %s**)realloc(msg->%s_data, '
-+ ' msg->%s_length * sizeof(struct %s*));' % (
-+ name, self._refname, name, name, self._refname ),
-+ ' if (msg->%s_data == NULL)' % name,
-+ ' return (NULL);',
-+ ' msg->%s_data[msg->%s_length - 1] = %s_new();' % (
-+ name, name, self._refname),
-+ ' if (msg->%s_data[msg->%s_length - 1] == NULL) {' % (name, name),
-+ ' msg->%s_length--; ' % name,
-+ ' return (NULL);',
-+ ' }',
-+ ' msg->%s_set = 1;' % name,
-+ ' return (msg->%s_data[msg->%s_length - 1]);' % (name, name),
-+ '}'
-+ ]
-+ return code
-+
-+ def CodeComplete(self, structname):
-+ code = []
-+ if self.Optional():
-+ code.append( 'if (%s->%s_set)' % (structname, self.Name()))
-+
-+ code.extend(['{',
-+ ' int i;',
-+ ' for (i = 0; i < %s->%s_length; ++i) {' % (
-+ structname, self.Name()),
-+ ' if (%s_complete(%s->%s_data[i]) == -1)' % (
-+ self._refname, structname, self.Name()),
-+ ' return (-1);',
-+ ' }',
-+ '}'
-+ ])
-+
-+ return code
-+
-+ def CodeUnmarshal(self, buf, tag_name, var_name):
-+ code = ['if (%s_%s_add(%s) == NULL)' % (
-+ self._struct.Name(), self._name, var_name),
-+ ' return (-1);',
-+ 'if (evtag_unmarshal_%s(%s, %s, '
-+ '%s->%s_data[%s->%s_length - 1]) == -1) {' % (
-+ self._refname, buf, tag_name, var_name, self._name,
-+ var_name, self._name),
-+ ' %s->%s_length--; ' % (var_name, self._name),
-+ ' event_warnx("%%s: failed to unmarshal %s", __func__);' % (
-+ self._name ),
-+ ' return (-1);',
-+ '}'
-+ ]
-+ return code
-+
-+ def CodeMarshal(self, buf, tag_name, var_name):
-+ code = ['{',
-+ ' int i;',
-+ ' for (i = 0; i < %s->%s_length; ++i) {' % (
-+ var_name, self._name),
-+ ' evtag_marshal_%s(%s, %s, %s->%s_data[i]);' % (
-+ self._refname, buf, tag_name, var_name, self._name),
-+ ' }',
-+ '}'
-+ ]
-+ return code
-+
-+ def CodeClear(self, structname):
-+ code = [ 'if (%s->%s_set == 1) {' % (structname, self.Name()),
-+ ' int i;',
-+ ' for (i = 0; i < %s->%s_length; ++i) {' % (
-+ structname, self.Name()),
-+ ' %s_free(%s->%s_data[i]);' % (
-+ self._refname, structname, self.Name()),
-+ ' }',
-+ ' free(%s->%s_data);' % (structname, self.Name()),
-+ ' %s->%s_data = NULL;' % (structname, self.Name()),
-+ ' %s->%s_set = 0;' % (structname, self.Name()),
-+ ' %s->%s_length = 0;' % (structname, self.Name()),
-+ '}'
-+ ]
-+
-+ return code
-+
-+ def CodeNew(self, name):
-+ code = ['%s->%s_data = NULL;' % (name, self._name),
-+ '%s->%s_length = 0;' % (name, self._name)]
-+ code.extend(Entry.CodeNew(self, name))
-+ return code
-+
-+ def CodeFree(self, name):
-+ code = ['if (%s->%s_data != NULL) {' % (name, self._name),
-+ ' int i;',
-+ ' for (i = 0; i < %s->%s_length; ++i) {' % (
-+ name, self._name),
-+ ' %s_free(%s->%s_data[i]); ' % (
-+ self._refname, name, self._name),
-+ ' %s->%s_data[i] = NULL;' % (name, self._name),
-+ ' }',
-+ ' free(%s->%s_data);' % (name, self._name),
-+ ' %s->%s_data = NULL;' % (name, self._name),
-+ ' %s->%s_length = 0;' % (name, self._name),
-+ '}'
-+ ]
-+
-+ return code
-+
-+ def Declaration(self):
-+ dcl = ['struct %s **%s_data;' % (self._refname, self._name),
-+ 'int %s_length;' % self._name]
-+
-+ return dcl
-+
-+def NormalizeLine(line):
-+ global white
-+ global cppcomment
-+
-+ line = cppcomment.sub('', line)
-+ line = line.strip()
-+ line = white.sub(' ', line)
-+
-+ return line
-+
-+def ProcessOneEntry(newstruct, entry):
-+ optional = 0
-+ array = 0
-+ entry_type = ''
-+ name = ''
-+ tag = ''
-+ tag_set = None
-+ separator = ''
-+ fixed_length = ''
-+
-+ tokens = entry.split(' ')
-+ while tokens:
-+ token = tokens[0]
-+ tokens = tokens[1:]
-+
-+ if not entry_type:
-+ if not optional and token == 'optional':
-+ optional = 1
-+ continue
-+
-+ if not array and token == 'array':
-+ array = 1
-+ continue
-+
-+ if not entry_type:
-+ entry_type = token
-+ continue
-+
-+ if not name:
-+ res = re.match(r'^([^\[\]]+)(\[.*\])?$', token)
-+ if not res:
-+ print >>sys.stderr, 'Cannot parse name: \"%s\" around %d' % (
-+ entry, line_count)
-+ sys.exit(1)
-+ name = res.group(1)
-+ fixed_length = res.group(2)
-+ if fixed_length:
-+ fixed_length = fixed_length[1:-1]
-+ continue
-+
-+ if not separator:
-+ separator = token
-+ if separator != '=':
-+ print >>sys.stderr, 'Expected "=" after name \"%s\" got %s' % (
-+ name, token)
-+ sys.exit(1)
-+ continue
-+
-+ if not tag_set:
-+ tag_set = 1
-+ if not re.match(r'^[0-9]+$', token):
-+ print >>sys.stderr, 'Expected tag number: \"%s\"' % entry
-+ sys.exit(1)
-+ tag = int(token)
-+ continue
-+
-+ print >>sys.stderr, 'Cannot parse \"%s\"' % entry
-+ sys.exit(1)
-+
-+ if not tag_set:
-+ print >>sys.stderr, 'Need tag number: \"%s\"' % entry
-+ sys.exit(1)
-+
-+ # Create the right entry
-+ if entry_type == 'bytes':
-+ if fixed_length:
-+ newentry = EntryBytes(entry_type, name, tag, fixed_length)
-+ else:
-+ newentry = EntryVarBytes(entry_type, name, tag)
-+ elif entry_type == 'int' and not fixed_length:
-+ newentry = EntryInt(entry_type, name, tag)
-+ elif entry_type == 'string' and not fixed_length:
-+ newentry = EntryString(entry_type, name, tag)
-+ else:
-+ res = re.match(r'^struct\[(%s)\]$' % _STRUCT_RE,
-+ entry_type, re.IGNORECASE)
-+ if res:
-+ # References another struct defined in our file
-+ newentry = EntryStruct(entry_type, name, tag, res.group(1))
-+ else:
-+ print >>sys.stderr, 'Bad type: "%s" in "%s"' % (entry_type, entry)
-+ sys.exit(1)
-+
-+ structs = []
-+
-+ if optional:
-+ newentry.MakeOptional()
-+ if array:
-+ newentry.MakeArray()
-+
-+ newentry.SetStruct(newstruct)
-+ newentry.SetLineCount(line_count)
-+ newentry.Verify()
-+
-+ if array:
-+ # We need to encapsulate this entry into a struct
-+ newname = newentry.Name()+ '_array'
-+
-+ # Now borgify the new entry.
-+ newentry = EntryArray(newentry)
-+ newentry.SetStruct(newstruct)
-+ newentry.SetLineCount(line_count)
-+ newentry.MakeArray()
-+
-+ newstruct.AddEntry(newentry)
-+
-+ return structs
-+
-+def ProcessStruct(data):
-+ tokens = data.split(' ')
-+
-+ # First three tokens are: 'struct' 'name' '{'
-+ newstruct = Struct(tokens[1])
-+
-+ inside = ' '.join(tokens[3:-1])
-+
-+ tokens = inside.split(';')
-+
-+ structs = []
-+
-+ for entry in tokens:
-+ entry = NormalizeLine(entry)
-+ if not entry:
-+ continue
-+
-+ # It's possible that new structs get defined in here
-+ structs.extend(ProcessOneEntry(newstruct, entry))
-+
-+ structs.append(newstruct)
-+ return structs
-+
-+def GetNextStruct(file):
-+ global line_count
-+ global cppdirect
-+
-+ got_struct = 0
-+
-+ processed_lines = []
-+
-+ have_c_comment = 0
-+ data = ''
-+ while 1:
-+ line = file.readline()
-+ if not line:
-+ break
-+
-+ line_count += 1
-+ line = line[:-1]
-+
-+ if not have_c_comment and re.search(r'/\*', line):
-+ if re.search(r'/\*.*\*/', line):
-+ line = re.sub(r'/\*.*\*/', '', line)
-+ else:
-+ line = re.sub(r'/\*.*$', '', line)
-+ have_c_comment = 1
-+
-+ if have_c_comment:
-+ if not re.search(r'\*/', line):
-+ continue
-+ have_c_comment = 0
-+ line = re.sub(r'^.*\*/', '', line)
-+
-+ line = NormalizeLine(line)
-+
-+ if not line:
-+ continue
-+
-+ if not got_struct:
-+ if re.match(r'#include ["<].*[>"]', line):
-+ cppdirect.append(line)
-+ continue
-+
-+ if re.match(r'^#(if( |def)|endif)', line):
-+ cppdirect.append(line)
-+ continue
-+
-+ if re.match(r'^#define', line):
-+ headerdirect.append(line)
-+ continue
-+
-+ if not re.match(r'^struct %s {$' % _STRUCT_RE,
-+ line, re.IGNORECASE):
-+ print >>sys.stderr, 'Missing struct on line %d: %s' % (
-+ line_count, line)
-+ sys.exit(1)
-+ else:
-+ got_struct = 1
-+ data += line
-+ continue
-+
-+ # We are inside the struct
-+ tokens = line.split('}')
-+ if len(tokens) == 1:
-+ data += ' ' + line
-+ continue
-+
-+ if len(tokens[1]):
-+ print >>sys.stderr, 'Trailing garbage after struct on line %d' % (
-+ line_count )
-+ sys.exit(1)
-+
-+ # We found the end of the struct
-+ data += ' %s}' % tokens[0]
-+ break
-+
-+ # Remove any comments, that might be in there
-+ data = re.sub(r'/\*.*\*/', '', data)
-+
-+ return data
-+
-+
-+def Parse(file):
-+ """
-+ Parses the input file and returns C code and corresponding header file.
-+ """
-+
-+ entities = []
-+
-+ while 1:
-+ # Just gets the whole struct nicely formatted
-+ data = GetNextStruct(file)
-+
-+ if not data:
-+ break
-+
-+ entities.extend(ProcessStruct(data))
-+
-+ return entities
-+
-+def GuardName(name):
-+ name = '_'.join(name.split('.'))
-+ name = '_'.join(name.split('/'))
-+ guard = '_'+name.upper()+'_'
-+
-+ return guard
-+
-+def HeaderPreamble(name):
-+ guard = GuardName(name)
-+ pre = (
-+ '/*\n'
-+ ' * Automatically generated from %s\n'
-+ ' */\n\n'
-+ '#ifndef %s\n'
-+ '#define %s\n\n' ) % (
-+ name, guard, guard)
-+
-+ for statement in headerdirect:
-+ pre += '%s\n' % statement
-+ if headerdirect:
-+ pre += '\n'
-+
-+ pre += (
-+ '#define EVTAG_HAS(msg, member) ((msg)->member##_set == 1)\n'
-+ '#define EVTAG_ASSIGN(msg, member, args...) '
-+ '(*(msg)->member##_assign)(msg, ## args)\n'
-+ '#define EVTAG_GET(msg, member, args...) '
-+ '(*(msg)->member##_get)(msg, ## args)\n'
-+ '#define EVTAG_ADD(msg, member) (*(msg)->member##_add)(msg)\n'
-+ '#define EVTAG_LEN(msg, member) ((msg)->member##_length)\n'
-+ )
-+
-+ return pre
-+
-+
-+def HeaderPostamble(name):
-+ guard = GuardName(name)
-+ return '#endif /* %s */' % guard
-+
-+def BodyPreamble(name):
-+ global _NAME
-+ global _VERSION
-+
-+ header_file = '.'.join(name.split('.')[:-1]) + '.gen.h'
-+
-+ pre = ( '/*\n'
-+ ' * Automatically generated from %s\n'
-+ ' * by %s/%s. DO NOT EDIT THIS FILE.\n'
-+ ' */\n\n' ) % (name, _NAME, _VERSION)
-+ pre += ( '#include <sys/types.h>\n'
-+ '#include <sys/time.h>\n'
-+ '#include <stdlib.h>\n'
-+ '#include <string.h>\n'
-+ '#include <assert.h>\n'
-+ '#include <event.h>\n\n' )
-+
-+ for statement in cppdirect:
-+ pre += '%s\n' % statement
-+
-+ pre += '\n#include "%s"\n\n' % header_file
-+
-+ pre += 'void event_err(int eval, const char *fmt, ...);\n'
-+ pre += 'void event_warn(const char *fmt, ...);\n'
-+ pre += 'void event_errx(int eval, const char *fmt, ...);\n'
-+ pre += 'void event_warnx(const char *fmt, ...);\n\n'
-+
-+ return pre
-+
-+def main(argv):
-+ if len(argv) < 2 or not argv[1]:
-+ print >>sys.stderr, 'Need RPC description file as first argument.'
-+ sys.exit(1)
-+
-+ filename = argv[1]
-+
-+ ext = filename.split('.')[-1]
-+ if ext != 'rpc':
-+ print >>sys.stderr, 'Unrecognized file extension: %s' % ext
-+ sys.exit(1)
-+
-+ print >>sys.stderr, 'Reading \"%s\"' % filename
-+
-+ fp = open(filename, 'r')
-+ entities = Parse(fp)
-+ fp.close()
-+
-+ header_file = '.'.join(filename.split('.')[:-1]) + '.gen.h'
-+ impl_file = '.'.join(filename.split('.')[:-1]) + '.gen.c'
-+
-+ print >>sys.stderr, '... creating "%s"' % header_file
-+ header_fp = open(header_file, 'w')
-+ print >>header_fp, HeaderPreamble(filename)
-+
-+ # Create forward declarations: allows other structs to reference
-+ # each other
-+ for entry in entities:
-+ entry.PrintForwardDeclaration(header_fp)
-+ print >>header_fp, ''
-+
-+ for entry in entities:
-+ entry.PrintTags(header_fp)
-+ entry.PrintDeclaration(header_fp)
-+ print >>header_fp, HeaderPostamble(filename)
-+ header_fp.close()
-+
-+ print >>sys.stderr, '... creating "%s"' % impl_file
-+ impl_fp = open(impl_file, 'w')
-+ print >>impl_fp, BodyPreamble(filename)
-+ for entry in entities:
-+ entry.PrintCode(impl_fp)
-+ impl_fp.close()
-+
-+if __name__ == '__main__':
-+ main(sys.argv)
-diff -Nru php-5.2.4.vanilla/libevent/event_tagging.c php-5.2.4.fpm/libevent/event_tagging.c
---- php-5.2.4.vanilla/libevent/event_tagging.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/event_tagging.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,372 @@
-+/*
-+ * Copyright (c) 2003, 2004 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/param.h>
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#ifdef WIN32
-+#define WIN32_LEAN_AND_MEAN
-+#include <windows.h>
-+#undef WIN32_LEAN_AND_MEAN
-+#else
-+#include <sys/ioctl.h>
-+#endif
-+
-+#include <sys/tree.h>
-+#include <sys/queue.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
-+
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#ifndef WIN32
-+#include <syslog.h>
-+#endif
-+#include <unistd.h>
-+
-+#include "event.h"
-+#include "log.h"
-+
-+int decode_int(uint32_t *pnumber, struct evbuffer *evbuf);
-+
-+static struct evbuffer *_buf; /* not thread safe */
-+
-+void
-+evtag_init()
-+{
-+ if (_buf != NULL)
-+ return;
-+
-+ if ((_buf = evbuffer_new()) == NULL)
-+ event_err(1, "%s: malloc", __func__);
-+}
-+
-+/*
-+ * We encode integer's by nibbles; the first nibble contains the number
-+ * of significant nibbles - 1; this allows us to encode up to 64-bit
-+ * integers. This function is byte-order independent.
-+ */
-+
-+void
-+encode_int(struct evbuffer *evbuf, uint32_t number)
-+{
-+ int off = 1, nibbles = 0;
-+ uint8_t data[5];
-+
-+ memset(data, 0, sizeof(data));
-+ while (number) {
-+ if (off & 0x1)
-+ data[off/2] = (data[off/2] & 0xf0) | (number & 0x0f);
-+ else
-+ data[off/2] = (data[off/2] & 0x0f) |
-+ ((number & 0x0f) << 4);
-+ number >>= 4;
-+ off++;
-+ }
-+
-+ if (off > 2)
-+ nibbles = off - 2;
-+
-+ /* Off - 1 is the number of encoded nibbles */
-+ data[0] = (data[0] & 0x0f) | ((nibbles & 0x0f) << 4);
-+
-+ evbuffer_add(evbuf, data, (off + 1) / 2);
-+}
-+
-+/*
-+ * Marshal a data type, the general format is as follows:
-+ *
-+ * tag number: one byte; length: var bytes; payload: var bytes
-+ */
-+
-+void
-+evtag_marshal(struct evbuffer *evbuf, uint8_t tag,
-+ const void *data, uint32_t len)
-+{
-+ evbuffer_add(evbuf, &tag, sizeof(tag));
-+ encode_int(evbuf, len);
-+ evbuffer_add(evbuf, (void *)data, len);
-+}
-+
-+/* Marshaling for integers */
-+void
-+evtag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer)
-+{
-+ evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-+ encode_int(_buf, integer);
-+
-+ evbuffer_add(evbuf, &tag, sizeof(tag));
-+ encode_int(evbuf, EVBUFFER_LENGTH(_buf));
-+ evbuffer_add_buffer(evbuf, _buf);
-+}
-+
-+void
-+evtag_marshal_string(struct evbuffer *buf, uint8_t tag, const char *string)
-+{
-+ evtag_marshal(buf, tag, string, strlen(string));
-+}
-+
-+void
-+evtag_marshal_timeval(struct evbuffer *evbuf, uint8_t tag, struct timeval *tv)
-+{
-+ evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-+
-+ encode_int(_buf, tv->tv_sec);
-+ encode_int(_buf, tv->tv_usec);
-+
-+ evtag_marshal(evbuf, tag, EVBUFFER_DATA(_buf),
-+ EVBUFFER_LENGTH(_buf));
-+}
-+
-+static int inline
-+decode_int_internal(uint32_t *pnumber, struct evbuffer *evbuf, int dodrain)
-+{
-+ uint32_t number = 0;
-+ uint8_t *data = EVBUFFER_DATA(evbuf);
-+ int len = EVBUFFER_LENGTH(evbuf);
-+ int nibbles = 0, off;
-+
-+ if (!len)
-+ return (-1);
-+
-+ nibbles = ((data[0] & 0xf0) >> 4) + 1;
-+ if (nibbles > 8 || (nibbles >> 1) > len - 1)
-+ return (-1);
-+
-+ off = nibbles;
-+ while (off > 0) {
-+ number <<= 4;
-+ if (off & 0x1)
-+ number |= data[off >> 1] & 0x0f;
-+ else
-+ number |= (data[off >> 1] & 0xf0) >> 4;
-+ off--;
-+ }
-+
-+ len = (nibbles >> 1) + 1;
-+ if (dodrain)
-+ evbuffer_drain(evbuf, len);
-+
-+ *pnumber = number;
-+
-+ return (len);
-+}
-+
-+int
-+decode_int(uint32_t *pnumber, struct evbuffer *evbuf)
-+{
-+ return (decode_int_internal(pnumber, evbuf, 1) == -1 ? -1 : 0);
-+}
-+
-+int
-+evtag_peek(struct evbuffer *evbuf, uint8_t *ptag)
-+{
-+ if (EVBUFFER_LENGTH(evbuf) < 2)
-+ return (-1);
-+ *ptag = EVBUFFER_DATA(evbuf)[0];
-+
-+ return (0);
-+}
-+
-+int
-+evtag_peek_length(struct evbuffer *evbuf, uint32_t *plength)
-+{
-+ struct evbuffer tmp;
-+ int res;
-+
-+ if (EVBUFFER_LENGTH(evbuf) < 2)
-+ return (-1);
-+
-+ tmp = *evbuf;
-+ tmp.buffer += 1;
-+ tmp.off -= 1;
-+
-+ res = decode_int_internal(plength, &tmp, 0);
-+ if (res == -1)
-+ return (-1);
-+
-+ *plength += res + 1;
-+
-+ return (0);
-+}
-+
-+int
-+evtag_payload_length(struct evbuffer *evbuf, uint32_t *plength)
-+{
-+ struct evbuffer tmp;
-+ int res;
-+
-+ if (EVBUFFER_LENGTH(evbuf) < 2)
-+ return (-1);
-+
-+ tmp = *evbuf;
-+ tmp.buffer += 1;
-+ tmp.off -= 1;
-+
-+ res = decode_int_internal(plength, &tmp, 0);
-+ if (res == -1)
-+ return (-1);
-+
-+ return (0);
-+}
-+
-+int
-+evtag_consume(struct evbuffer *evbuf)
-+{
-+ uint32_t len;
-+ evbuffer_drain(evbuf, 1);
-+ if (decode_int(&len, evbuf) == -1)
-+ return (-1);
-+ evbuffer_drain(evbuf, len);
-+
-+ return (0);
-+}
-+
-+/* Reads the data type from an event buffer */
-+
-+int
-+evtag_unmarshal(struct evbuffer *src, uint8_t *ptag, struct evbuffer *dst)
-+{
-+ uint8_t tag;
-+ uint32_t len;
-+ uint32_t integer;
-+
-+ if (evbuffer_remove(src, &tag, sizeof(tag)) != sizeof(tag))
-+ return (-1);
-+ if (decode_int(&integer, src) == -1)
-+ return (-1);
-+ len = integer;
-+
-+ if (EVBUFFER_LENGTH(src) < len)
-+ return (-1);
-+
-+ if (evbuffer_add(dst, EVBUFFER_DATA(src), len) == -1)
-+ return (-1);
-+
-+ evbuffer_drain(src, len);
-+
-+ *ptag = tag;
-+ return (len);
-+}
-+
-+/* Marshaling for integers */
-+
-+int
-+evtag_unmarshal_int(struct evbuffer *evbuf, uint8_t need_tag,
-+ uint32_t *pinteger)
-+{
-+ uint8_t tag;
-+ uint32_t len;
-+ uint32_t integer;
-+
-+ if (evbuffer_remove(evbuf, &tag, sizeof(tag)) != sizeof(tag) ||
-+ tag != need_tag)
-+ return (-1);
-+ if (decode_int(&integer, evbuf) == -1)
-+ return (-1);
-+ len = integer;
-+
-+ if (EVBUFFER_LENGTH(evbuf) < len)
-+ return (-1);
-+
-+ evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-+ if (evbuffer_add(_buf, EVBUFFER_DATA(evbuf), len) == -1)
-+ return (-1);
-+
-+ evbuffer_drain(evbuf, len);
-+
-+ return (decode_int(pinteger, _buf));
-+}
-+
-+/* Unmarshal a fixed length tag */
-+
-+int
-+evtag_unmarshal_fixed(struct evbuffer *src, uint8_t need_tag, void *data,
-+ size_t len)
-+{
-+ uint8_t tag;
-+
-+ /* Initialize this event buffer so that we can read into it */
-+ evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-+
-+ /* Now unmarshal a tag and check that it matches the tag we want */
-+ if (evtag_unmarshal(src, &tag, _buf) == -1 || tag != need_tag)
-+ return (-1);
-+
-+ if (EVBUFFER_LENGTH(_buf) != len)
-+ return (-1);
-+
-+ memcpy(data, EVBUFFER_DATA(_buf), len);
-+ return (0);
-+}
-+
-+int
-+evtag_unmarshal_string(struct evbuffer *evbuf, uint8_t need_tag,
-+ char **pstring)
-+{
-+ uint8_t tag;
-+
-+ evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-+
-+ if (evtag_unmarshal(evbuf, &tag, _buf) == -1 || tag != need_tag)
-+ return (-1);
-+
-+ *pstring = calloc(EVBUFFER_LENGTH(_buf) + 1, 1);
-+ if (*pstring == NULL)
-+ event_err(1, "%s: calloc", __func__);
-+ evbuffer_remove(_buf, *pstring, EVBUFFER_LENGTH(_buf));
-+
-+ return (0);
-+}
-+
-+int
-+evtag_unmarshal_timeval(struct evbuffer *evbuf, uint8_t need_tag,
-+ struct timeval *ptv)
-+{
-+ uint8_t tag;
-+ uint32_t integer;
-+
-+ evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
-+ if (evtag_unmarshal(evbuf, &tag, _buf) == -1 || tag != need_tag)
-+ return (-1);
-+
-+ if (decode_int(&integer, _buf) == -1)
-+ return (-1);
-+ ptv->tv_sec = integer;
-+ if (decode_int(&integer, _buf) == -1)
-+ return (-1);
-+ ptv->tv_usec = integer;
-+
-+ return (0);
-+}
-diff -Nru php-5.2.4.vanilla/libevent/evhttp.h php-5.2.4.fpm/libevent/evhttp.h
---- php-5.2.4.vanilla/libevent/evhttp.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/evhttp.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,219 @@
-+/*
-+ * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifndef _EVHTTP_H_
-+#define _EVHTTP_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#ifdef WIN32
-+#define WIN32_LEAN_AND_MEAN
-+#include <windows.h>
-+#include <winsock2.h>
-+#undef WIN32_LEAN_AND_MEAN
-+#endif
-+
-+/*
-+ * Basic support for HTTP serving.
-+ *
-+ * As libevent is a library for dealing with event notification and most
-+ * interesting applications are networked today, I have often found the
-+ * need to write HTTP code. The following prototypes and definitions provide
-+ * an application with a minimal interface for making HTTP requests and for
-+ * creating a very simple HTTP server.
-+ */
-+
-+/* Response codes */
-+#define HTTP_OK 200
-+#define HTTP_NOCONTENT 204
-+#define HTTP_MOVEPERM 301
-+#define HTTP_MOVETEMP 302
-+#define HTTP_NOTMODIFIED 304
-+#define HTTP_BADREQUEST 400
-+#define HTTP_NOTFOUND 404
-+#define HTTP_SERVUNAVAIL 503
-+
-+struct evhttp;
-+struct evhttp_request;
-+struct evkeyvalq;
-+
-+/* Start an HTTP server on the specified address and port */
-+struct evhttp *evhttp_start(const char *address, u_short port);
-+
-+/*
-+ * Free the previously create HTTP server. Works only if no requests are
-+ * currently being served.
-+ */
-+void evhttp_free(struct evhttp* http);
-+
-+/* Set a callback for a specified URI */
-+void evhttp_set_cb(struct evhttp *, const char *,
-+ void (*)(struct evhttp_request *, void *), void *);
-+
-+/* Removes the callback for a specified URI */
-+int evhttp_del_cb(struct evhttp *, const char *);
-+
-+/* Set a callback for all requests that are not caught by specific callbacks */
-+void evhttp_set_gencb(struct evhttp *,
-+ void (*)(struct evhttp_request *, void *), void *);
-+
-+void evhttp_set_timeout(struct evhttp *, int timeout_in_secs);
-+
-+/* Request/Response functionality */
-+
-+void evhttp_send_error(struct evhttp_request *, int, const char *);
-+void evhttp_send_reply(struct evhttp_request *, int, const char *,
-+ struct evbuffer *);
-+
-+/* Low-level response interface, for streaming/chunked replies */
-+void evhttp_send_reply_start(struct evhttp_request *, int, const char *);
-+void evhttp_send_reply_chunk(struct evhttp_request *, struct evbuffer *);
-+void evhttp_send_reply_end(struct evhttp_request *);
-+
-+/* Interfaces for making requests */
-+enum evhttp_cmd_type { EVHTTP_REQ_GET, EVHTTP_REQ_POST, EVHTTP_REQ_HEAD };
-+
-+enum evhttp_request_kind { EVHTTP_REQUEST, EVHTTP_RESPONSE };
-+
-+/*
-+ * the request structure that a server receives.
-+ * WARNING: expect this structure to change. I will try to provide
-+ * reasonable accessors.
-+ */
-+struct evhttp_request {
-+ TAILQ_ENTRY(evhttp_request) next;
-+
-+ /* the connection object that this request belongs to */
-+ struct evhttp_connection *evcon;
-+ int flags;
-+#define EVHTTP_REQ_OWN_CONNECTION 0x0001
-+#define EVHTTP_PROXY_REQUEST 0x0002
-+
-+ struct evkeyvalq *input_headers;
-+ struct evkeyvalq *output_headers;
-+
-+ /* address of the remote host and the port connection came from */
-+ char *remote_host;
-+ u_short remote_port;
-+
-+ enum evhttp_request_kind kind;
-+ enum evhttp_cmd_type type;
-+
-+ char *uri; /* uri after HTTP request was parsed */
-+
-+ char major; /* HTTP Major number */
-+ char minor; /* HTTP Minor number */
-+
-+ int got_firstline;
-+ int response_code; /* HTTP Response code */
-+ char *response_code_line; /* Readable response */
-+
-+ struct evbuffer *input_buffer; /* read data */
-+ int ntoread;
-+ int chunked;
-+
-+ struct evbuffer *output_buffer; /* outgoing post or data */
-+
-+ /* Callback */
-+ void (*cb)(struct evhttp_request *, void *);
-+ void *cb_arg;
-+
-+ /*
-+ * Chunked data callback - call for each completed chunk if
-+ * specified. If not specified, all the data is delivered via
-+ * the regular callback.
-+ */
-+ void (*chunk_cb)(struct evhttp_request *, void *);
-+};
-+
-+/*
-+ * Creates a new request object that needs to be filled in with the request
-+ * parameters. The callback is executed when the request completed or an
-+ * error occurred.
-+ */
-+struct evhttp_request *evhttp_request_new(
-+ void (*cb)(struct evhttp_request *, void *), void *arg);
-+
-+/* enable delivery of chunks to requestor */
-+void evhttp_request_set_chunked_cb(struct evhttp_request *,
-+ void (*cb)(struct evhttp_request *, void *));
-+
-+/* Frees the request object and removes associated events. */
-+void evhttp_request_free(struct evhttp_request *req);
-+
-+/*
-+ * A connection object that can be used to for making HTTP requests. The
-+ * connection object tries to establish the connection when it is given an
-+ * http request object.
-+ */
-+struct evhttp_connection *evhttp_connection_new(
-+ const char *address, unsigned short port);
-+
-+/* Frees an http connection */
-+void evhttp_connection_free(struct evhttp_connection *evcon);
-+
-+/* Sets the timeout for events related to this connection */
-+void evhttp_connection_set_timeout(struct evhttp_connection *evcon,
-+ int timeout_in_secs);
-+
-+/* Sets the retry limit for this connection - -1 repeats indefnitely */
-+void evhttp_connection_set_retries(struct evhttp_connection *evcon,
-+ int retry_max);
-+
-+/* Set a callback for connection close. */
-+void evhttp_connection_set_closecb(struct evhttp_connection *evcon,
-+ void (*)(struct evhttp_connection *, void *), void *);
-+
-+/* Get the remote address and port associated with this connection. */
-+void evhttp_connection_get_peer(struct evhttp_connection *evcon,
-+ char **address, u_short *port);
-+
-+/* The connection gets ownership of the request */
-+int evhttp_make_request(struct evhttp_connection *evcon,
-+ struct evhttp_request *req,
-+ enum evhttp_cmd_type type, const char *uri);
-+
-+const char *evhttp_request_uri(struct evhttp_request *req);
-+
-+/* Interfaces for dealing with HTTP headers */
-+
-+const char *evhttp_find_header(const struct evkeyvalq *, const char *);
-+int evhttp_remove_header(struct evkeyvalq *, const char *);
-+int evhttp_add_header(struct evkeyvalq *, const char *, const char *);
-+void evhttp_clear_headers(struct evkeyvalq *);
-+
-+/* Miscellaneous utility functions */
-+char *evhttp_encode_uri(const char *uri);
-+char *evhttp_decode_uri(const char *uri);
-+void evhttp_parse_query(const char *uri, struct evkeyvalq *);
-+char *evhttp_htmlescape(const char *html);
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _EVHTTP_H_ */
-diff -Nru php-5.2.4.vanilla/libevent/evport.c php-5.2.4.fpm/libevent/evport.c
---- php-5.2.4.vanilla/libevent/evport.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/evport.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,512 @@
-+/*
-+ * Submitted by David Pacheco (dp.spambait@gmail.com)
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * Copyright (c) 2006 Sun Microsystems. All rights reserved.
-+ * Use is subject to license terms.
-+ */
-+
-+/*
-+ * evport.c: event backend using Solaris 10 event ports. See port_create(3C).
-+ * This implementation is loosely modeled after the one used for select(2) (in
-+ * select.c).
-+ *
-+ * The outstanding events are tracked in a data structure called evport_data.
-+ * Each entry in the ed_fds array corresponds to a file descriptor, and contains
-+ * pointers to the read and write events that correspond to that fd. (That is,
-+ * when the file is readable, the "read" event should handle it, etc.)
-+ *
-+ * evport_add and evport_del update this data structure. evport_dispatch uses it
-+ * to determine where to callback when an event occurs (which it gets from
-+ * port_getn).
-+ *
-+ * Helper functions are used: grow() grows the file descriptor array as
-+ * necessary when large fd's come in. reassociate() takes care of maintaining
-+ * the proper file-descriptor/event-port associations.
-+ *
-+ * As in the select(2) implementation, signals are handled by evsignal, and
-+ * evport_recalc does almost nothing.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <sys/_time.h>
-+#endif
-+#include <assert.h>
-+#include <sys/queue.h>
-+#include <sys/tree.h>
-+#include <errno.h>
-+#include <poll.h>
-+#include <port.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <time.h>
-+#include <unistd.h>
-+#ifdef CHECK_INVARIANTS
-+#include <assert.h>
-+#endif
-+
-+#include "event.h"
-+#include "event-internal.h"
-+#include "log.h"
-+#include "evsignal.h"
-+
-+
-+/*
-+ * Default value for ed_nevents, which is the maximum file descriptor number we
-+ * can handle. If an event comes in for a file descriptor F > nevents, we will
-+ * grow the array of file descriptors, doubling its size.
-+ */
-+#define DEFAULT_NFDS 16
-+
-+
-+/*
-+ * EVENTS_PER_GETN is the maximum number of events to retrieve from port_getn on
-+ * any particular call. You can speed things up by increasing this, but it will
-+ * (obviously) require more memory.
-+ */
-+#define EVENTS_PER_GETN 8
-+
-+/*
-+ * Per-file-descriptor information about what events we're subscribed to. These
-+ * fields are NULL if no event is subscribed to either of them.
-+ */
-+
-+struct fd_info {
-+ struct event* fdi_revt; /* the event responsible for the "read" */
-+ struct event* fdi_wevt; /* the event responsible for the "write" */
-+};
-+
-+#define FDI_HAS_READ(fdi) ((fdi)->fdi_revt != NULL)
-+#define FDI_HAS_WRITE(fdi) ((fdi)->fdi_wevt != NULL)
-+#define FDI_HAS_EVENTS(fdi) (FDI_HAS_READ(fdi) || FDI_HAS_WRITE(fdi))
-+#define FDI_TO_SYSEVENTS(fdi) (FDI_HAS_READ(fdi) ? POLLIN : 0) | \
-+ (FDI_HAS_WRITE(fdi) ? POLLOUT : 0)
-+
-+struct evport_data {
-+ int ed_port; /* event port for system events */
-+ int ed_nevents; /* number of allocated fdi's */
-+ struct fd_info *ed_fds; /* allocated fdi table */
-+ /* fdi's that we need to reassoc */
-+ struct fd_info *ed_pending[EVENTS_PER_GETN];
-+};
-+
-+static void* evport_init (struct event_base *);
-+static int evport_add (void *, struct event *);
-+static int evport_del (void *, struct event *);
-+static int evport_recalc (struct event_base *, void *, int);
-+static int evport_dispatch (struct event_base *, void *, struct timeval *);
-+static void evport_dealloc (struct event_base *, void *);
-+
-+const struct eventop evportops = {
-+ "event ports",
-+ evport_init,
-+ evport_add,
-+ evport_del,
-+ evport_recalc,
-+ evport_dispatch,
-+ evport_dealloc
-+};
-+
-+/*
-+ * Initialize the event port implementation.
-+ */
-+
-+static void*
-+evport_init(struct event_base *base)
-+{
-+ struct evport_data *evpd;
-+ /*
-+ * Disable event ports when this environment variable is set
-+ */
-+ if (getenv("EVENT_NOEVPORT"))
-+ return (NULL);
-+
-+ if (!(evpd = calloc(1, sizeof(struct evport_data))))
-+ return (NULL);
-+
-+ if ((evpd->ed_port = port_create()) == -1) {
-+ free(evpd);
-+ return (NULL);
-+ }
-+
-+ /*
-+ * Initialize file descriptor structure
-+ */
-+ evpd->ed_fds = calloc(DEFAULT_NFDS, sizeof(struct fd_info));
-+ if (evpd->ed_fds == NULL) {
-+ close(evpd->ed_port);
-+ free(evpd);
-+ return (NULL);
-+ }
-+ evpd->ed_nevents = DEFAULT_NFDS;
-+ memset(&evpd->ed_pending, 0, EVENTS_PER_GETN * sizeof(struct fd_info*));
-+
-+ evsignal_init(base);
-+
-+ return (evpd);
-+}
-+
-+#ifdef CHECK_INVARIANTS
-+/*
-+ * Checks some basic properties about the evport_data structure. Because it
-+ * checks all file descriptors, this function can be expensive when the maximum
-+ * file descriptor ever used is rather large.
-+ */
-+
-+static void
-+check_evportop(struct evport_data *evpd)
-+{
-+ assert(evpd);
-+ assert(evpd->ed_nevents > 0);
-+ assert(evpd->ed_port > 0);
-+ assert(evpd->ed_fds > 0);
-+
-+ /*
-+ * Verify the integrity of the fd_info struct as well as the events to
-+ * which it points (at least, that they're valid references and correct
-+ * for their position in the structure).
-+ */
-+ int i;
-+ for (i = 0; i < evpd->ed_nevents; ++i) {
-+ struct event *ev;
-+ struct fd_info *fdi;
-+
-+ fdi = &evpd->ed_fds[i];
-+ if ((ev = fdi->fdi_revt) != NULL) {
-+ assert(ev->ev_fd == i);
-+ }
-+ if ((ev = fdi->fdi_wevt) != NULL) {
-+ assert(ev->ev_fd == i);
-+ }
-+ }
-+}
-+
-+/*
-+ * Verifies very basic integrity of a given port_event.
-+ */
-+static void
-+check_event(port_event_t* pevt)
-+{
-+ /*
-+ * We've only registered for PORT_SOURCE_FD events. The only
-+ * other thing we can legitimately receive is PORT_SOURCE_ALERT,
-+ * but since we're not using port_alert either, we can assume
-+ * PORT_SOURCE_FD.
-+ */
-+ assert(pevt->portev_source == PORT_SOURCE_FD);
-+ assert(pevt->portev_user == NULL);
-+}
-+
-+#else
-+#define check_evportop(epop)
-+#define check_event(pevt)
-+#endif /* CHECK_INVARIANTS */
-+
-+/*
-+ * Doubles the size of the allocated file descriptor array.
-+ */
-+static int
-+grow(struct evport_data *epdp, int factor)
-+{
-+ struct fd_info *tmp;
-+ int oldsize = epdp->ed_nevents;
-+ int newsize = factor * oldsize;
-+ assert(factor > 1);
-+
-+ check_evportop(epdp);
-+
-+ tmp = realloc(epdp->ed_fds, sizeof(struct fd_info) * newsize);
-+ if (NULL == tmp)
-+ return -1;
-+ epdp->ed_fds = tmp;
-+ memset((char*) (epdp->ed_fds + oldsize), 0,
-+ (newsize - oldsize)*sizeof(struct fd_info));
-+ epdp->ed_nevents = newsize;
-+
-+ check_evportop(epdp);
-+
-+ return 0;
-+}
-+
-+
-+/*
-+ * (Re)associates the given file descriptor with the event port. The OS events
-+ * are specified (implicitly) from the fd_info struct.
-+ */
-+static int
-+reassociate(struct evport_data *epdp, struct fd_info *fdip, int fd)
-+{
-+ int sysevents = FDI_TO_SYSEVENTS(fdip);
-+
-+ if (sysevents != 0) {
-+ if ((-1 == port_associate(epdp->ed_port, PORT_SOURCE_FD,
-+ fd, sysevents, NULL))) {
-+ perror("port_associate");
-+ return (-1);
-+ }
-+ } else {
-+ if (-1 == port_dissociate(epdp->ed_port, PORT_SOURCE_FD, fd)) {
-+ perror("port_dissociate");
-+ return (-1);
-+ }
-+ }
-+
-+ check_evportop(epdp);
-+
-+ return (0);
-+}
-+
-+/*
-+ * Main event loop - polls port_getn for some number of events, and processes
-+ * them.
-+ */
-+
-+static int
-+evport_dispatch(struct event_base *base, void *arg, struct timeval *tv)
-+{
-+ int i, res;
-+ struct evport_data *epdp = arg;
-+ port_event_t pevtlist[EVENTS_PER_GETN];
-+
-+ /*
-+ * port_getn will block until it has at least nevents events. It will
-+ * also return how many it's given us (which may be more than we asked
-+ * for, as long as it's less than our maximum (EVENTS_PER_GETN)) in
-+ * nevents.
-+ */
-+ int nevents = 1;
-+
-+ /*
-+ * We have to convert a struct timeval to a struct timespec
-+ * (only difference is nanoseconds vs. microseconds)
-+ */
-+ struct timespec ts = {tv->tv_sec, tv->tv_usec * 1000};
-+
-+ /*
-+ * Before doing anything else, we need to reassociate the events we hit
-+ * last time which need reassociation. See comment at the end of the
-+ * loop below.
-+ */
-+ for (i = 0; i < EVENTS_PER_GETN; ++i) {
-+ struct fd_info *fdi = epdp->ed_pending[i];
-+
-+ if (fdi != NULL && FDI_HAS_EVENTS(fdi)) {
-+ int fd = FDI_HAS_READ(fdi) ? fdi->fdi_revt->ev_fd :
-+ fdi->fdi_wevt->ev_fd;
-+ reassociate(epdp, fdi, fd);
-+ epdp->ed_pending[i] = NULL;
-+ }
-+ }
-+
-+ if ((res = port_getn(epdp->ed_port, pevtlist, EVENTS_PER_GETN,
-+ (unsigned int *) &nevents, &ts)) == -1) {
-+ if (errno == EINTR) {
-+ evsignal_process(base);
-+ return (0);
-+ } else if (errno == ETIME) {
-+ if (nevents == 0)
-+ return (0);
-+ } else {
-+ perror("port_getn");
-+ return (-1);
-+ }
-+ } else if (base->sig.evsignal_caught) {
-+ evsignal_process(base);
-+ }
-+
-+ event_debug(("%s: port_getn reports %d events", __func__, nevents));
-+
-+ for (i = 0; i < nevents; ++i) {
-+ struct event *ev;
-+ struct fd_info *fdi;
-+ port_event_t *pevt = &pevtlist[i];
-+ int fd = (int) pevt->portev_object;
-+
-+ check_evportop(epdp);
-+ check_event(pevt);
-+
-+ /*
-+ * Figure out what kind of event it was
-+ * (because we have to pass this to the callback)
-+ */
-+ res = 0;
-+ if (pevt->portev_events & POLLIN)
-+ res |= EV_READ;
-+ if (pevt->portev_events & POLLOUT)
-+ res |= EV_WRITE;
-+
-+ assert(epdp->ed_nevents > fd);
-+ fdi = &(epdp->ed_fds[fd]);
-+
-+ /*
-+ * We now check for each of the possible events (READ or WRITE).
-+ * If the event is not persistent, then we delete it. Then, we
-+ * activate the event (which will cause its callback to be
-+ * executed).
-+ */
-+
-+ if ((res & EV_READ) && ((ev = fdi->fdi_revt) != NULL)) {
-+ if (!(ev->ev_events & EV_PERSIST))
-+ event_del(ev);
-+ event_active(ev, res, 1);
-+ }
-+
-+ if ((res & EV_WRITE) && ((ev = fdi->fdi_wevt) != NULL)) {
-+ if (!(ev->ev_events & EV_PERSIST))
-+ event_del(ev);
-+ event_active(ev, res, 1);
-+ }
-+
-+ /*
-+ * If there are still events (they haven't been deleted), then
-+ * we must reassociate the port, since the event port interface
-+ * dissociates them automatically.
-+ *
-+ * But we can't do it right away, because the event hasn't
-+ * handled this event yet, so of course there's still data
-+ * waiting!
-+ */
-+ if(FDI_HAS_EVENTS(fdi)) {
-+ epdp->ed_pending[i] = fdi;
-+ }
-+ } /* end of all events gotten */
-+
-+ check_evportop(epdp);
-+
-+ return (0);
-+}
-+
-+
-+/*
-+ * Copied from the version in select.c
-+ */
-+
-+static int
-+evport_recalc(struct event_base *base, void *arg, int max)
-+{
-+ struct evport_data *evpd = arg;
-+ check_evportop(evpd);
-+ return (0);
-+}
-+
-+
-+/*
-+ * Adds the given event (so that you will be notified when it happens via
-+ * the callback function).
-+ */
-+
-+static int
-+evport_add(void *arg, struct event *ev)
-+{
-+ struct evport_data *evpd = arg;
-+ struct fd_info *fdi;
-+ int factor;
-+
-+ check_evportop(evpd);
-+
-+ /*
-+ * Delegate, if it's not ours to handle.
-+ */
-+ if (ev->ev_events & EV_SIGNAL)
-+ return (evsignal_add(ev));
-+
-+ /*
-+ * If necessary, grow the file descriptor info table
-+ */
-+
-+ factor = 1;
-+ while (ev->ev_fd >= factor * evpd->ed_nevents)
-+ factor *= 2;
-+
-+ if (factor > 1) {
-+ if (-1 == grow(evpd, factor)) {
-+ return (-1);
-+ }
-+ }
-+
-+ fdi = &evpd->ed_fds[ev->ev_fd];
-+ if (ev->ev_events & EV_READ)
-+ fdi->fdi_revt = ev;
-+ if (ev->ev_events & EV_WRITE)
-+ fdi->fdi_wevt = ev;
-+
-+ return reassociate(evpd, fdi, ev->ev_fd);
-+}
-+
-+/*
-+ * Removes the given event from the list of events to wait for.
-+ */
-+
-+static int
-+evport_del(void *arg, struct event *ev)
-+{
-+ struct evport_data *evpd = arg;
-+ struct fd_info *fdi;
-+
-+ check_evportop(evpd);
-+
-+ /*
-+ * Delegate, if it's not ours to handle
-+ */
-+ if (ev->ev_events & EV_SIGNAL) {
-+ return (evsignal_del(ev));
-+ }
-+
-+ if (evpd->ed_nevents < ev->ev_fd) {
-+ return (-1);
-+ }
-+
-+
-+ fdi = &evpd->ed_fds[ev->ev_fd];
-+ if (ev->ev_events & EV_READ)
-+ fdi->fdi_revt = NULL;
-+ if (ev->ev_events & EV_WRITE)
-+ fdi->fdi_wevt = NULL;
-+
-+ return reassociate(evpd, fdi, ev->ev_fd);
-+}
-+
-+
-+static void
-+evport_dealloc(struct event_base *base, void *arg)
-+{
-+ struct evport_data *evpd = arg;
-+
-+ evsignal_dealloc(base);
-+
-+ close(evpd->ed_port);
-+
-+ if (evpd->ed_fds) free(evpd->ed_fds);
-+ free(evpd);
-+}
-diff -Nru php-5.2.4.vanilla/libevent/evrpc.c php-5.2.4.fpm/libevent/evrpc.c
---- php-5.2.4.vanilla/libevent/evrpc.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/evrpc.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,511 @@
-+/*
-+ * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#ifdef WIN32
-+#define WIN32_LEAN_AND_MEAN
-+#include <windows.h>
-+#include <winsock2.h>
-+#undef WIN32_LEAN_AND_MEAN
-+#include "misc.h"
-+#endif
-+
-+#include <sys/types.h>
-+#include <sys/tree.h>
-+#ifndef WIN32
-+#include <sys/socket.h>
-+#endif
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <sys/_time.h>
-+#endif
-+#include <sys/queue.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#ifndef WIN32
-+#include <unistd.h>
-+#endif
-+#include <errno.h>
-+#include <signal.h>
-+#include <string.h>
-+#include <assert.h>
-+
-+#include "event.h"
-+#include "evrpc.h"
-+#include "evrpc-internal.h"
-+#include "evhttp.h"
-+#include "log.h"
-+
-+struct evrpc_base *
-+evrpc_init(struct evhttp *http_server)
-+{
-+ struct evrpc_base* base = calloc(1, sizeof(struct evrpc_base));
-+ if (base == NULL)
-+ return (NULL);
-+
-+ /* we rely on the tagging sub system */
-+ evtag_init();
-+
-+ TAILQ_INIT(&base->registered_rpcs);
-+ base->http_server = http_server;
-+
-+ return (base);
-+}
-+
-+void
-+evrpc_free(struct evrpc_base *base)
-+{
-+ struct evrpc *rpc;
-+
-+ while ((rpc = TAILQ_FIRST(&base->registered_rpcs)) != NULL) {
-+ assert(evrpc_unregister_rpc(base, rpc->uri));
-+ }
-+
-+ free(base);
-+}
-+
-+static void evrpc_pool_schedule(struct evrpc_pool *pool);
-+static void evrpc_request_cb(struct evhttp_request *, void *);
-+void evrpc_request_done(struct evrpc_req_generic*);
-+
-+/*
-+ * Registers a new RPC with the HTTP server. The evrpc object is expected
-+ * to have been filled in via the EVRPC_REGISTER_OBJECT macro which in turn
-+ * calls this function.
-+ */
-+
-+char *
-+evrpc_construct_uri(const char *uri)
-+{
-+ char *constructed_uri;
-+ int constructed_uri_len;
-+
-+ constructed_uri_len = strlen(EVRPC_URI_PREFIX) + strlen(uri) + 1;
-+ if ((constructed_uri = malloc(constructed_uri_len)) == NULL)
-+ event_err(1, "%s: failed to register rpc at %s",
-+ __func__, uri);
-+ memcpy(constructed_uri, EVRPC_URI_PREFIX, strlen(EVRPC_URI_PREFIX));
-+ memcpy(constructed_uri + strlen(EVRPC_URI_PREFIX), uri, strlen(uri));
-+ constructed_uri[constructed_uri_len - 1] = '\0';
-+
-+ return (constructed_uri);
-+}
-+
-+int
-+evrpc_register_rpc(struct evrpc_base *base, struct evrpc *rpc,
-+ void (*cb)(struct evrpc_req_generic *, void *), void *cb_arg)
-+{
-+ char *constructed_uri = evrpc_construct_uri(rpc->uri);
-+
-+ rpc->cb = cb;
-+ rpc->cb_arg = cb_arg;
-+
-+ TAILQ_INSERT_TAIL(&base->registered_rpcs, rpc, next);
-+
-+ evhttp_set_cb(base->http_server,
-+ constructed_uri,
-+ evrpc_request_cb,
-+ rpc);
-+
-+ free(constructed_uri);
-+
-+ return (0);
-+}
-+
-+int
-+evrpc_unregister_rpc(struct evrpc_base *base, const char *name)
-+{
-+ char *registered_uri = NULL;
-+ struct evrpc *rpc;
-+
-+ /* find the right rpc; linear search might be slow */
-+ TAILQ_FOREACH(rpc, &base->registered_rpcs, next) {
-+ if (strcmp(rpc->uri, name) == 0)
-+ break;
-+ }
-+ if (rpc == NULL) {
-+ /* We did not find an RPC with this name */
-+ return (-1);
-+ }
-+ TAILQ_REMOVE(&base->registered_rpcs, rpc, next);
-+
-+ free((char *)rpc->uri);
-+ free(rpc);
-+
-+ registered_uri = evrpc_construct_uri(name);
-+
-+ /* remove the http server callback */
-+ assert(evhttp_del_cb(base->http_server, registered_uri) == 0);
-+
-+ free(registered_uri);
-+ return (0);
-+}
-+
-+static void
-+evrpc_request_cb(struct evhttp_request *req, void *arg)
-+{
-+ struct evrpc *rpc = arg;
-+ struct evrpc_req_generic *rpc_state = NULL;
-+
-+ /* let's verify the outside parameters */
-+ if (req->type != EVHTTP_REQ_POST ||
-+ EVBUFFER_LENGTH(req->input_buffer) <= 0)
-+ goto error;
-+
-+ rpc_state = calloc(1, sizeof(struct evrpc_req_generic));
-+ if (rpc_state == NULL)
-+ goto error;
-+
-+ /* let's check that we can parse the request */
-+ rpc_state->request = rpc->request_new();
-+ if (rpc_state->request == NULL)
-+ goto error;
-+
-+ rpc_state->rpc = rpc;
-+
-+ if (rpc->request_unmarshal(
-+ rpc_state->request, req->input_buffer) == -1) {
-+ /* we failed to parse the request; that's a bummer */
-+ goto error;
-+ }
-+
-+ /* at this point, we have a well formed request, prepare the reply */
-+
-+ rpc_state->reply = rpc->reply_new();
-+ if (rpc_state->reply == NULL)
-+ goto error;
-+
-+ rpc_state->http_req = req;
-+ rpc_state->done = evrpc_request_done;
-+
-+ /* give the rpc to the user; they can deal with it */
-+ rpc->cb(rpc_state, rpc->cb_arg);
-+
-+ return;
-+
-+error:
-+ evrpc_reqstate_free(rpc_state);
-+ evhttp_send_error(req, HTTP_SERVUNAVAIL, "Service Error");
-+ return;
-+}
-+
-+void
-+evrpc_reqstate_free(struct evrpc_req_generic* rpc_state)
-+{
-+ /* clean up all memory */
-+ if (rpc_state != NULL) {
-+ struct evrpc *rpc = rpc_state->rpc;
-+
-+ if (rpc_state->request != NULL)
-+ rpc->request_free(rpc_state->request);
-+ if (rpc_state->reply != NULL)
-+ rpc->reply_free(rpc_state->reply);
-+ free(rpc_state);
-+ }
-+}
-+
-+void
-+evrpc_request_done(struct evrpc_req_generic* rpc_state)
-+{
-+ struct evhttp_request *req = rpc_state->http_req;
-+ struct evrpc *rpc = rpc_state->rpc;
-+ struct evbuffer* data;
-+
-+ if (rpc->reply_complete(rpc_state->reply) == -1) {
-+ /* the reply was not completely filled in. error out */
-+ goto error;
-+ }
-+
-+ if ((data = evbuffer_new()) == NULL) {
-+ /* out of memory */
-+ goto error;
-+ }
-+
-+ /* serialize the reply */
-+ rpc->reply_marshal(data, rpc_state->reply);
-+
-+ evhttp_send_reply(req, HTTP_OK, "OK", data);
-+
-+ evbuffer_free(data);
-+
-+ evrpc_reqstate_free(rpc_state);
-+
-+ return;
-+
-+error:
-+ evrpc_reqstate_free(rpc_state);
-+ evhttp_send_error(req, HTTP_SERVUNAVAIL, "Service Error");
-+ return;
-+}
-+
-+/* Client implementation of RPC site */
-+
-+static int evrpc_schedule_request(struct evhttp_connection *connection,
-+ struct evrpc_request_wrapper *ctx);
-+
-+struct evrpc_pool *
-+evrpc_pool_new()
-+{
-+ struct evrpc_pool *pool = calloc(1, sizeof(struct evrpc_pool));
-+ if (pool == NULL)
-+ return (NULL);
-+
-+ TAILQ_INIT(&pool->connections);
-+ TAILQ_INIT(&pool->requests);
-+
-+ pool->timeout = -1;
-+
-+ return (pool);
-+}
-+
-+static void
-+evrpc_request_wrapper_free(struct evrpc_request_wrapper *request)
-+{
-+ free(request->name);
-+ free(request);
-+}
-+
-+void
-+evrpc_pool_free(struct evrpc_pool *pool)
-+{
-+ struct evhttp_connection *connection;
-+ struct evrpc_request_wrapper *request;
-+
-+ while ((request = TAILQ_FIRST(&pool->requests)) != NULL) {
-+ TAILQ_REMOVE(&pool->requests, request, next);
-+ /* if this gets more complicated we need our own function */
-+ evrpc_request_wrapper_free(request);
-+ }
-+
-+ while ((connection = TAILQ_FIRST(&pool->connections)) != NULL) {
-+ TAILQ_REMOVE(&pool->connections, connection, next);
-+ evhttp_connection_free(connection);
-+ }
-+
-+ free(pool);
-+}
-+
-+/*
-+ * Add a connection to the RPC pool. A request scheduled on the pool
-+ * may use any available connection.
-+ */
-+
-+void
-+evrpc_pool_add_connection(struct evrpc_pool *pool,
-+ struct evhttp_connection *connection) {
-+ assert(connection->http_server == NULL);
-+ TAILQ_INSERT_TAIL(&pool->connections, connection, next);
-+
-+ /*
-+ * unless a timeout was specifically set for a connection,
-+ * the connection inherits the timeout from the pool.
-+ */
-+ if (connection->timeout == -1)
-+ connection->timeout = pool->timeout;
-+
-+ /*
-+ * if we have any requests pending, schedule them with the new
-+ * connections.
-+ */
-+
-+ if (TAILQ_FIRST(&pool->requests) != NULL) {
-+ struct evrpc_request_wrapper *request =
-+ TAILQ_FIRST(&pool->requests);
-+ TAILQ_REMOVE(&pool->requests, request, next);
-+ evrpc_schedule_request(connection, request);
-+ }
-+}
-+
-+void
-+evrpc_pool_set_timeout(struct evrpc_pool *pool, int timeout_in_secs)
-+{
-+ struct evhttp_connection *evcon;
-+ TAILQ_FOREACH(evcon, &pool->connections, next) {
-+ evcon->timeout = timeout_in_secs;
-+ }
-+ pool->timeout = timeout_in_secs;
-+}
-+
-+
-+static void evrpc_reply_done(struct evhttp_request *, void *);
-+static void evrpc_request_timeout(int, short, void *);
-+
-+/*
-+ * Finds a connection object associated with the pool that is currently
-+ * idle and can be used to make a request.
-+ */
-+static struct evhttp_connection *
-+evrpc_pool_find_connection(struct evrpc_pool *pool)
-+{
-+ struct evhttp_connection *connection;
-+ TAILQ_FOREACH(connection, &pool->connections, next) {
-+ if (TAILQ_FIRST(&connection->requests) == NULL)
-+ return (connection);
-+ }
-+
-+ return (NULL);
-+}
-+
-+/*
-+ * We assume that the ctx is no longer queued on the pool.
-+ */
-+static int
-+evrpc_schedule_request(struct evhttp_connection *connection,
-+ struct evrpc_request_wrapper *ctx)
-+{
-+ struct evhttp_request *req = NULL;
-+ struct evrpc_pool *pool = ctx->pool;
-+ struct evrpc_status status;
-+ char *uri = NULL;
-+ int res = 0;
-+
-+ if ((req = evhttp_request_new(evrpc_reply_done, ctx)) == NULL)
-+ goto error;
-+
-+ /* serialize the request data into the output buffer */
-+ ctx->request_marshal(req->output_buffer, ctx->request);
-+
-+ uri = evrpc_construct_uri(ctx->name);
-+ if (uri == NULL)
-+ goto error;
-+
-+ /* we need to know the connection that we might have to abort */
-+ ctx->evcon = connection;
-+
-+ if (pool->timeout > 0) {
-+ /*
-+ * a timeout after which the whole rpc is going to be aborted.
-+ */
-+ struct timeval tv;
-+ timerclear(&tv);
-+ tv.tv_sec = pool->timeout;
-+ evtimer_add(&ctx->ev_timeout, &tv);
-+ }
-+
-+ /* start the request over the connection */
-+ res = evhttp_make_request(connection, req, EVHTTP_REQ_POST, uri);
-+ free(uri);
-+
-+ if (res == -1)
-+ goto error;
-+
-+ return (0);
-+
-+error:
-+ memset(&status, 0, sizeof(status));
-+ status.error = EVRPC_STATUS_ERR_UNSTARTED;
-+ (*ctx->cb)(&status, ctx->request, ctx->reply, ctx->cb_arg);
-+ evrpc_request_wrapper_free(ctx);
-+ return (-1);
-+}
-+
-+int
-+evrpc_make_request(struct evrpc_request_wrapper *ctx)
-+{
-+ struct evrpc_pool *pool = ctx->pool;
-+
-+ /* initialize the event structure for this rpc */
-+ evtimer_set(&ctx->ev_timeout, evrpc_request_timeout, ctx);
-+
-+ /* we better have some available connections on the pool */
-+ assert(TAILQ_FIRST(&pool->connections) != NULL);
-+
-+ /*
-+ * if no connection is available, we queue the request on the pool,
-+ * the next time a connection is empty, the rpc will be send on that.
-+ */
-+ TAILQ_INSERT_TAIL(&pool->requests, ctx, next);
-+
-+ evrpc_pool_schedule(pool);
-+
-+ return (0);
-+}
-+
-+static void
-+evrpc_reply_done(struct evhttp_request *req, void *arg)
-+{
-+ struct evrpc_request_wrapper *ctx = arg;
-+ struct evrpc_pool *pool = ctx->pool;
-+ struct evrpc_status status;
-+ int res = -1;
-+
-+ /* cancel any timeout we might have scheduled */
-+ event_del(&ctx->ev_timeout);
-+
-+ memset(&status, 0, sizeof(status));
-+ /* we need to get the reply now */
-+ if (req != NULL) {
-+ res = ctx->reply_unmarshal(ctx->reply, req->input_buffer);
-+ if (res == -1) {
-+ status.error = EVRPC_STATUS_ERR_BADPAYLOAD;
-+ }
-+ } else {
-+ status.error = EVRPC_STATUS_ERR_TIMEOUT;
-+ }
-+ if (res == -1) {
-+ /* clear everything that we might have written previously */
-+ ctx->reply_clear(ctx->reply);
-+ }
-+
-+ (*ctx->cb)(&status, ctx->request, ctx->reply, ctx->cb_arg);
-+
-+ evrpc_request_wrapper_free(ctx);
-+
-+ /* the http layer owns the request structure */
-+
-+ /* see if we can schedule another request */
-+ evrpc_pool_schedule(pool);
-+}
-+
-+static void
-+evrpc_pool_schedule(struct evrpc_pool *pool)
-+{
-+ struct evrpc_request_wrapper *ctx = TAILQ_FIRST(&pool->requests);
-+ struct evhttp_connection *evcon;
-+
-+ /* if no requests are pending, we have no work */
-+ if (ctx == NULL)
-+ return;
-+
-+ if ((evcon = evrpc_pool_find_connection(pool)) != NULL) {
-+ TAILQ_REMOVE(&pool->requests, ctx, next);
-+ evrpc_schedule_request(evcon, ctx);
-+ }
-+}
-+
-+static void
-+evrpc_request_timeout(int fd, short what, void *arg)
-+{
-+ struct evrpc_request_wrapper *ctx = arg;
-+ struct evhttp_connection *evcon = ctx->evcon;
-+ assert(evcon != NULL);
-+
-+ evhttp_connection_fail(evcon, EVCON_HTTP_TIMEOUT);
-+}
-diff -Nru php-5.2.4.vanilla/libevent/evrpc.h php-5.2.4.fpm/libevent/evrpc.h
---- php-5.2.4.vanilla/libevent/evrpc.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/evrpc.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,320 @@
-+/*
-+ * Copyright (c) 2006 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifndef _EVRPC_H_
-+#define _EVRPC_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * This header files provides basic support for an RPC server and client.
-+ *
-+ * To support RPCs in a server, every supported RPC command needs to be
-+ * defined and registered.
-+ *
-+ * EVRPC_HEADER(SendCommand, Request, Reply);
-+ *
-+ * SendCommand is the name of the RPC command.
-+ * Request is the name of a structure generated by event_rpcgen.py.
-+ * It contains all parameters relating to the SendCommand RPC. The
-+ * server needs to fill in the Reply structure.
-+ * Reply is the name of a structure generated by event_rpcgen.py. It
-+ * contains the answer to the RPC.
-+ *
-+ * To register an RPC with an HTTP server, you need to first create an RPC
-+ * base with:
-+ *
-+ * struct evrpc_base *base = evrpc_init(http);
-+ *
-+ * A specific RPC can then be registered with
-+ *
-+ * EVRPC_REGISTER(base, SendCommand, Request, Reply, FunctionCB, arg);
-+ *
-+ * when the server receives an appropriately formatted RPC, the user callback
-+ * is invokved. The callback needs to fill in the reply structure.
-+ *
-+ * void FunctionCB(EVRPC_STRUCT(SendCommand)* rpc, void *arg);
-+ *
-+ * To send the reply, call EVRPC_REQUEST_DONE(rpc);
-+ *
-+ * See the regression test for an example.
-+ */
-+
-+struct evbuffer;
-+struct evrpc_req_generic;
-+
-+/* Encapsulates a request */
-+struct evrpc {
-+ TAILQ_ENTRY(evrpc) next;
-+
-+ /* the URI at which the request handler lives */
-+ const char* uri;
-+
-+ /* creates a new request structure */
-+ void *(*request_new)(void);
-+
-+ /* frees the request structure */
-+ void (*request_free)(void *);
-+
-+ /* unmarshals the buffer into the proper request structure */
-+ int (*request_unmarshal)(void *, struct evbuffer *);
-+
-+ /* creates a new reply structure */
-+ void *(*reply_new)(void);
-+
-+ /* creates a new reply structure */
-+ void (*reply_free)(void *);
-+
-+ /* verifies that the reply is valid */
-+ int (*reply_complete)(void *);
-+
-+ /* marshals the reply into a buffer */
-+ void (*reply_marshal)(struct evbuffer*, void *);
-+
-+ /* the callback invoked for each received rpc */
-+ void (*cb)(struct evrpc_req_generic *, void *);
-+ void *cb_arg;
-+};
-+
-+#define EVRPC_STRUCT(rpcname) struct evrpc_req__##rpcname
-+
-+struct evhttp_request;
-+struct evrpc_status;
-+
-+/* We alias the RPC specific structs to this voided one */
-+struct evrpc_req_generic {
-+ /* the unmarshaled request object */
-+ void *request;
-+
-+ /* the empty reply object that needs to be filled in */
-+ void *reply;
-+
-+ /*
-+ * the static structure for this rpc; that can be used to
-+ * automatically unmarshal and marshal the http buffers.
-+ */
-+ struct evrpc *rpc;
-+
-+ /*
-+ * the http request structure on which we need to answer.
-+ */
-+ struct evhttp_request* http_req;
-+
-+ /*
-+ * callback to reply and finish answering this rpc
-+ */
-+ void (*done)(struct evrpc_req_generic* rpc);
-+};
-+
-+/*
-+ * You need to use EVRPC_HEADER to create structures and function prototypes
-+ * needed by the server and client implementation.
-+ */
-+#define EVRPC_HEADER(rpcname, reqstruct, rplystruct) \
-+EVRPC_STRUCT(rpcname) { \
-+ struct reqstruct* request; \
-+ struct rplystruct* reply; \
-+ struct evrpc* rpc; \
-+ void (*done)(struct evrpc_status *, \
-+ struct evrpc* rpc, void *request, void *reply); \
-+}; \
-+int evrpc_send_request_##rpcname(struct evrpc_pool *, \
-+ struct reqstruct *, struct rplystruct *, \
-+ void (*)(struct evrpc_status *, \
-+ struct reqstruct *, struct rplystruct *, void *cbarg), \
-+ void *);
-+
-+#define EVRPC_GENERATE(rpcname, reqstruct, rplystruct) \
-+int evrpc_send_request_##rpcname(struct evrpc_pool *pool, \
-+ struct reqstruct *request, struct rplystruct *reply, \
-+ void (*cb)(struct evrpc_status *, \
-+ struct reqstruct *, struct rplystruct *, void *cbarg), \
-+ void *cbarg) { \
-+ struct evrpc_status status; \
-+ struct evrpc_request_wrapper *ctx; \
-+ ctx = (struct evrpc_request_wrapper *) \
-+ malloc(sizeof(struct evrpc_request_wrapper)); \
-+ if (ctx == NULL) \
-+ goto error; \
-+ ctx->pool = pool; \
-+ ctx->evcon = NULL; \
-+ ctx->name = strdup(#rpcname); \
-+ if (ctx->name == NULL) { \
-+ free(ctx); \
-+ goto error; \
-+ } \
-+ ctx->cb = (void (*)(struct evrpc_status *, \
-+ void *, void *, void *))cb; \
-+ ctx->cb_arg = cbarg; \
-+ ctx->request = (void *)request; \
-+ ctx->reply = (void *)reply; \
-+ ctx->request_marshal = (void (*)(struct evbuffer *, void *))reqstruct##_marshal; \
-+ ctx->reply_clear = (void (*)(void *))rplystruct##_clear; \
-+ ctx->reply_unmarshal = (int (*)(void *, struct evbuffer *))rplystruct##_unmarshal; \
-+ return (evrpc_make_request(ctx)); \
-+error: \
-+ memset(&status, 0, sizeof(status)); \
-+ status.error = EVRPC_STATUS_ERR_UNSTARTED; \
-+ (*(cb))(&status, request, reply, cbarg); \
-+ return (-1); \
-+}
-+
-+
-+/*
-+ * EVRPC_REQUEST_DONE is used to answer a request; the reply is expected
-+ * to have been filled in. The request and reply pointers become invalid
-+ * after this call has finished.
-+ */
-+#define EVRPC_REQUEST_DONE(rpc_req) do { \
-+ struct evrpc_req_generic *_req = (struct evrpc_req_generic *)(rpc_req); \
-+ _req->done(_req); \
-+} while (0)
-+
-+
-+/* Takes a request object and fills it in with the right magic */
-+#define EVRPC_REGISTER_OBJECT(rpc, name, request, reply) \
-+ do { \
-+ (rpc)->uri = strdup(#name); \
-+ if ((rpc)->uri == NULL) { \
-+ fprintf(stderr, "failed to register object\n"); \
-+ exit(1); \
-+ } \
-+ (rpc)->request_new = (void *(*)(void))request##_new; \
-+ (rpc)->request_free = (void (*)(void *))request##_free; \
-+ (rpc)->request_unmarshal = (int (*)(void *, struct evbuffer *))request##_unmarshal; \
-+ (rpc)->reply_new = (void *(*)(void))reply##_new; \
-+ (rpc)->reply_free = (void (*)(void *))reply##_free; \
-+ (rpc)->reply_complete = (int (*)(void *))reply##_complete; \
-+ (rpc)->reply_marshal = (void (*)(struct evbuffer*, void *))reply##_marshal; \
-+ } while (0)
-+
-+struct evrpc_base;
-+struct evhttp;
-+
-+/* functions to start up the rpc system */
-+struct evrpc_base *evrpc_init(struct evhttp *server);
-+
-+/* frees the base - for now, you are responsible for making sure that no rpcs are ongoing */
-+void evrpc_free(struct evrpc_base *);
-+
-+/* this macro is used to register RPCs with the HTTP Server */
-+#define EVRPC_REGISTER(base, name, request, reply, callback, cbarg) \
-+ do { \
-+ struct evrpc* rpc = (struct evrpc *)calloc(1, sizeof(struct evrpc)); \
-+ EVRPC_REGISTER_OBJECT(rpc, name, request, reply); \
-+ evrpc_register_rpc(base, rpc, \
-+ (void (*)(struct evrpc_req_generic*, void *))callback, cbarg); \
-+ } while (0)
-+
-+int evrpc_register_rpc(struct evrpc_base *, struct evrpc *,
-+ void (*)(struct evrpc_req_generic*, void *), void *);
-+
-+/* Takes the named RPCs and tried to unregister it */
-+#define EVRPC_UNREGISTER(base, name) evrpc_unregister_rpc(base, #name)
-+
-+int evrpc_unregister_rpc(struct evrpc_base *, const char *name);
-+
-+/*
-+ * Client-side RPC support
-+ */
-+
-+struct evrpc_pool;
-+struct evhttp_connection;
-+
-+struct evrpc_status {
-+#define EVRPC_STATUS_ERR_NONE 0
-+#define EVRPC_STATUS_ERR_TIMEOUT 1
-+#define EVRPC_STATUS_ERR_BADPAYLOAD 2
-+#define EVRPC_STATUS_ERR_UNSTARTED 3
-+ int error;
-+};
-+
-+struct evrpc_request_wrapper {
-+ TAILQ_ENTRY(evrpc_request_wrapper) next;
-+
-+ /* pool on which this rpc request is being made */
-+ struct evrpc_pool *pool;
-+
-+ /* connection on which the request is being sent */
-+ struct evhttp_connection *evcon;
-+
-+ /* event for implementing request timeouts */
-+ struct event ev_timeout;
-+
-+ /* the name of the rpc */
-+ char *name;
-+
-+ /* callback */
-+ void (*cb)(struct evrpc_status*, void *request, void *reply, void *arg);
-+ void *cb_arg;
-+
-+ void *request;
-+ void *reply;
-+
-+ /* unmarshals the buffer into the proper request structure */
-+ void (*request_marshal)(struct evbuffer *, void *);
-+
-+ /* removes all stored state in the reply */
-+ void (*reply_clear)(void *);
-+
-+ /* marshals the reply into a buffer */
-+ int (*reply_unmarshal)(void *, struct evbuffer*);
-+};
-+
-+#define EVRPC_MAKE_REQUEST(name, pool, request, reply, cb, cbarg) \
-+ evrpc_send_request_##name(pool, request, reply, cb, cbarg)
-+
-+int evrpc_make_request(struct evrpc_request_wrapper *);
-+
-+/*
-+ * a pool has a number of connections associated with it.
-+ * rpc requests are always made via a pool.
-+ */
-+struct evrpc_pool *evrpc_pool_new();
-+void evrpc_pool_free(struct evrpc_pool *);
-+void evrpc_pool_add_connection(struct evrpc_pool *,
-+ struct evhttp_connection *);
-+
-+/*
-+ * Sets the timeout in secs after which a request has to complete. The
-+ * RPC is completely aborted if it does not complete by then. Setting
-+ * the timeout to 0 means that it never timeouts and can be used to
-+ * implement callback type RPCs.
-+ *
-+ * Any connection already in the pool will be updated with the new
-+ * timeout. Connections added to the pool after set_timeout has be
-+ * called receive the pool timeout only if no timeout has been set
-+ * for the connection itself.
-+ */
-+void evrpc_pool_set_timeout(struct evrpc_pool *, int timeout_in_secs);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _EVRPC_H_ */
-diff -Nru php-5.2.4.vanilla/libevent/evrpc-internal.h php-5.2.4.fpm/libevent/evrpc-internal.h
---- php-5.2.4.vanilla/libevent/evrpc-internal.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/evrpc-internal.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,57 @@
-+/*
-+ * Copyright (c) 2006 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifndef _EVRPC_INTERNAL_H_
-+#define _EVRPC_INTERNAL_H_
-+
-+#include "http-internal.h"
-+
-+struct evrpc;
-+
-+#define EVRPC_URI_PREFIX "/.rpc."
-+
-+struct evrpc_base {
-+ /* the HTTP server under which we register our RPC calls */
-+ struct evhttp* http_server;
-+
-+ /* a list of all RPCs registered with us */
-+ TAILQ_HEAD(evrpc_list, evrpc) registered_rpcs;
-+};
-+
-+struct evrpc_req_generic;
-+void evrpc_reqstate_free(struct evrpc_req_generic* rpc_state);
-+
-+/* A pool for holding evhttp_connection objects */
-+struct evrpc_pool {
-+ struct evconq connections;
-+
-+ int timeout;
-+
-+ TAILQ_HEAD(evrpc_requestq, evrpc_request_wrapper) requests;
-+};
-+
-+
-+#endif /* _EVRPC_INTERNAL_H_ */
-diff -Nru php-5.2.4.vanilla/libevent/evsignal.h php-5.2.4.fpm/libevent/evsignal.h
---- php-5.2.4.vanilla/libevent/evsignal.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/evsignal.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,44 @@
-+/*
-+ * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifndef _EVSIGNAL_H_
-+#define _EVSIGNAL_H_
-+
-+struct evsignal_info {
-+ struct event_list signalqueue;
-+ struct event ev_signal;
-+ int ev_signal_pair[2];
-+ int ev_signal_added;
-+ volatile sig_atomic_t evsignal_caught;
-+ sig_atomic_t evsigcaught[NSIG];
-+};
-+void evsignal_init(struct event_base *);
-+void evsignal_process(struct event_base *);
-+int evsignal_add(struct event *);
-+int evsignal_del(struct event *);
-+void evsignal_dealloc(struct event_base *);
-+
-+#endif /* _EVSIGNAL_H_ */
-diff -Nru php-5.2.4.vanilla/libevent/http.c php-5.2.4.fpm/libevent/http.c
---- php-5.2.4.vanilla/libevent/http.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/http.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,2329 @@
-+/*
-+ * Copyright (c) 2002-2006 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <sys/param.h>
-+#include <sys/types.h>
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
-+#ifdef HAVE_SYS_IOCCOM_H
-+#include <sys/ioccom.h>
-+#endif
-+
-+#ifndef WIN32
-+#include <sys/resource.h>
-+#include <sys/socket.h>
-+#include <sys/stat.h>
-+#include <sys/wait.h>
-+#endif
-+
-+#include <sys/tree.h>
-+#include <sys/queue.h>
-+
-+#ifndef WIN32
-+#include <netinet/in.h>
-+#include <netdb.h>
-+#endif
-+
-+#include <assert.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#ifndef WIN32
-+#include <syslog.h>
-+#endif
-+#include <signal.h>
-+#ifdef HAVE_TIME_H
-+#include <time.h>
-+#endif
-+#include <unistd.h>
-+#include <fcntl.h>
-+
-+#undef timeout_pending
-+#undef timeout_initialized
-+
-+#include "strlcpy-internal.h"
-+#include "event.h"
-+#include "evhttp.h"
-+#include "log.h"
-+#include "http-internal.h"
-+
-+#ifndef HAVE_GETADDRINFO
-+struct addrinfo {
-+ int ai_family;
-+ int ai_socktype;
-+ int ai_protocol;
-+ size_t ai_addrlen;
-+ struct sockaddr *ai_addr;
-+ struct addrinfo *ai_next;
-+};
-+static int
-+fake_getaddrinfo(const char *hostname, struct addrinfo *ai)
-+{
-+ struct hostent *he;
-+ he = gethostbyname(hostname);
-+ if (!he)
-+ return (-1);
-+ ai->ai_family = he->h_addrtype;
-+ ai->ai_socktype = SOCK_STREAM;
-+ ai->ai_protocol = 0;
-+ ai->ai_addrlen = he->h_length;
-+ if (NULL == (ai->ai_addr = malloc(ai->ai_addrlen)))
-+ return (-1);
-+ memcpy(ai->ai_addr, &he->h_addr_list[0], ai->ai_addrlen);
-+ ai->ai_next = NULL;
-+ return (0);
-+}
-+static void
-+fake_freeaddrinfo(struct addrinfo *ai)
-+{
-+ free(ai->ai_addr);
-+}
-+#endif
-+
-+#ifndef MIN
-+#define MIN(a,b) (((a)<(b))?(a):(b))
-+#endif
-+
-+static int
-+event_make_socket_nonblocking(int fd)
-+{
-+
-+#ifdef WIN32
-+ {
-+ unsigned long nonblocking = 1;
-+ ioctlsocket(fd, FIONBIO, (unsigned long*) &nonblocking);
-+ }
-+#else
-+ if (fcntl(fd, F_SETFL, O_NONBLOCK) == -1) {
-+ event_warn("fcntl(O_NONBLOCK)");
-+ return -1;
-+ }
-+#endif
-+ return 0;
-+}
-+
-+extern int debug;
-+
-+static int make_socket_ai(int should_bind, struct addrinfo *);
-+static int make_socket(int should_bind, const char *, u_short);
-+static void name_from_addr(struct sockaddr *, socklen_t, char **, char **);
-+static int evhttp_associate_new_request_with_connection(
-+ struct evhttp_connection *evcon);
-+static void evhttp_connection_start_detectclose(
-+ struct evhttp_connection *evcon);
-+static void evhttp_connection_stop_detectclose(
-+ struct evhttp_connection *evcon);
-+static void evhttp_request_dispatch(struct evhttp_connection* evcon);
-+
-+void evhttp_read(int, short, void *);
-+void evhttp_write(int, short, void *);
-+
-+#ifndef HAVE_STRSEP
-+static char *
-+strsep(char **s, const char *del)
-+{
-+ char *d, *tok;
-+ if (!s || !*s)
-+ return NULL;
-+ tok = *s;
-+ d = strstr(tok, del);
-+ if (d)
-+ *s = d + strlen(del);
-+ else
-+ *s = NULL;
-+ return tok;
-+}
-+#endif
-+
-+static const char *
-+html_replace(char ch)
-+{
-+ static char buf[2];
-+
-+ switch (ch) {
-+ case '<':
-+ return "<";
-+ case '>':
-+ return ">";
-+ case '"':
-+ return """;
-+ case '\'':
-+ return "'";
-+ case '&':
-+ return "&";
-+ default:
-+ break;
-+ }
-+
-+ /* Echo the character back */
-+ buf[0] = ch;
-+ buf[1] = '\0';
-+
-+ return buf;
-+}
-+
-+/*
-+ * Replaces <, >, ", ' and & with <, >, ",
-+ * ' and & correspondingly.
-+ *
-+ * The returned string needs to be freed by the caller.
-+ */
-+
-+char *
-+evhttp_htmlescape(const char *html)
-+{
-+ int i, new_size = 0, old_size = strlen(html);
-+ char *escaped_html, *p;
-+
-+ for (i = 0; i < old_size; ++i)
-+ new_size += strlen(html_replace(html[i]));
-+
-+ p = escaped_html = malloc(new_size + 1);
-+ if (escaped_html == NULL)
-+ event_err(1, "%s: malloc(%d)", __func__, new_size + 1);
-+ for (i = 0; i < old_size; ++i) {
-+ const char *replaced = html_replace(html[i]);
-+ /* this is length checked */
-+ strcpy(p, replaced);
-+ p += strlen(replaced);
-+ }
-+
-+ *p = '\0';
-+
-+ return (escaped_html);
-+}
-+
-+const char *
-+evhttp_method(enum evhttp_cmd_type type)
-+{
-+ const char *method;
-+
-+ switch (type) {
-+ case EVHTTP_REQ_GET:
-+ method = "GET";
-+ break;
-+ case EVHTTP_REQ_POST:
-+ method = "POST";
-+ break;
-+ case EVHTTP_REQ_HEAD:
-+ method = "HEAD";
-+ break;
-+ default:
-+ method = NULL;
-+ break;
-+ }
-+
-+ return (method);
-+}
-+
-+static void
-+evhttp_add_event(struct event *ev, int timeout, int default_timeout)
-+{
-+ if (timeout != 0) {
-+ struct timeval tv;
-+
-+ timerclear(&tv);
-+ tv.tv_sec = timeout != -1 ? timeout : default_timeout;
-+ event_add(ev, &tv);
-+ } else {
-+ event_add(ev, NULL);
-+ }
-+}
-+
-+void
-+evhttp_write_buffer(struct evhttp_connection *evcon,
-+ void (*cb)(struct evhttp_connection *, void *), void *arg)
-+{
-+ event_debug(("%s: preparing to write buffer\n", __func__));
-+
-+ /* Set call back */
-+ evcon->cb = cb;
-+ evcon->cb_arg = arg;
-+
-+ /* check if the event is already pending */
-+ if (event_pending(&evcon->ev, EV_WRITE|EV_TIMEOUT, NULL))
-+ event_del(&evcon->ev);
-+
-+ event_set(&evcon->ev, evcon->fd, EV_WRITE, evhttp_write, evcon);
-+ evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_WRITE_TIMEOUT);
-+}
-+
-+/*
-+ * Create the headers need for an HTTP reply
-+ */
-+static void
-+evhttp_make_header_request(struct evhttp_connection *evcon,
-+ struct evhttp_request *req)
-+{
-+ static char line[1024];
-+ const char *method;
-+
-+ evhttp_remove_header(req->output_headers, "Accept-Encoding");
-+ evhttp_remove_header(req->output_headers, "Proxy-Connection");
-+
-+ /* Generate request line */
-+ method = evhttp_method(req->type);
-+ snprintf(line, sizeof(line), "%s %s HTTP/%d.%d\r\n",
-+ method, req->uri, req->major, req->minor);
-+ evbuffer_add(evcon->output_buffer, line, strlen(line));
-+
-+ /* Add the content length on a post request if missing */
-+ if (req->type == EVHTTP_REQ_POST &&
-+ evhttp_find_header(req->output_headers, "Content-Length") == NULL){
-+ char size[12];
-+ snprintf(size, sizeof(size), "%ld",
-+ (long)EVBUFFER_LENGTH(req->output_buffer));
-+ evhttp_add_header(req->output_headers, "Content-Length", size);
-+ }
-+}
-+
-+static int
-+evhttp_is_connection_close(int flags, struct evkeyvalq* headers)
-+{
-+ if (flags & EVHTTP_PROXY_REQUEST) {
-+ /* proxy connection */
-+ const char *connection = evhttp_find_header(headers, "Proxy-Connection");
-+ return (connection == NULL || strcasecmp(connection, "keep-alive") != 0);
-+ } else {
-+ const char *connection = evhttp_find_header(headers, "Connection");
-+ return (connection != NULL && strcasecmp(connection, "close") == 0);
-+ }
-+}
-+
-+static int
-+evhttp_is_connection_keepalive(struct evkeyvalq* headers)
-+{
-+ const char *connection = evhttp_find_header(headers, "Connection");
-+ return (connection != NULL
-+ && strncasecmp(connection, "keep-alive", 10) == 0);
-+}
-+
-+/*
-+ * Create the headers needed for an HTTP reply
-+ */
-+static void
-+evhttp_make_header_response(struct evhttp_connection *evcon,
-+ struct evhttp_request *req)
-+{
-+ static char line[1024];
-+ snprintf(line, sizeof(line), "HTTP/%d.%d %d %s\r\n",
-+ req->major, req->minor, req->response_code,
-+ req->response_code_line);
-+ evbuffer_add(evcon->output_buffer, line, strlen(line));
-+
-+ /* Potentially add headers for unidentified content. */
-+ if (EVBUFFER_LENGTH(req->output_buffer)) {
-+ if (evhttp_find_header(req->output_headers,
-+ "Content-Type") == NULL) {
-+ evhttp_add_header(req->output_headers,
-+ "Content-Type", "text/html; charset=ISO-8859-1");
-+ }
-+
-+ /*
-+ * we need to add the content length if the user did
-+ * not give it, this is required for persistent
-+ * connections to work.
-+ */
-+ if (evhttp_find_header(req->output_headers,
-+ "Transfer-Encoding") == NULL &&
-+ evhttp_find_header(req->output_headers,
-+ "Content-Length") == NULL) {
-+ static char len[12];
-+ snprintf(len, sizeof(len), "%ld",
-+ (long)EVBUFFER_LENGTH(req->output_buffer));
-+ evhttp_add_header(req->output_headers,
-+ "Content-Length", len);
-+ }
-+ }
-+
-+ /* if the request asked for a close, we send a close, too */
-+ if (evhttp_is_connection_close(req->flags, req->input_headers)) {
-+ evhttp_remove_header(req->output_headers, "Connection");
-+ if (!(req->flags & EVHTTP_PROXY_REQUEST))
-+ evhttp_add_header(req->output_headers, "Connection", "close");
-+ evhttp_remove_header(req->output_headers, "Proxy-Connection");
-+ }
-+}
-+
-+void
-+evhttp_make_header(struct evhttp_connection *evcon, struct evhttp_request *req)
-+{
-+ static char line[1024];
-+ struct evkeyval *header;
-+
-+ /*
-+ * Depending if this is a HTTP request or response, we might need to
-+ * add some new headers or remove existing headers.
-+ */
-+ if (req->kind == EVHTTP_REQUEST) {
-+ evhttp_make_header_request(evcon, req);
-+ } else {
-+ evhttp_make_header_response(evcon, req);
-+ }
-+
-+ TAILQ_FOREACH(header, req->output_headers, next) {
-+ snprintf(line, sizeof(line), "%s: %s\r\n",
-+ header->key, header->value);
-+ evbuffer_add(evcon->output_buffer, line, strlen(line));
-+ }
-+ evbuffer_add(evcon->output_buffer, "\r\n", 2);
-+
-+ if (EVBUFFER_LENGTH(req->output_buffer) >= 0) {
-+ /*
-+ * For a request, we add the POST data, for a reply, this
-+ * is the regular data.
-+ */
-+ evbuffer_add_buffer(evcon->output_buffer, req->output_buffer);
-+ }
-+}
-+
-+/* Separated host, port and file from URI */
-+
-+int
-+evhttp_hostportfile(char *url, char **phost, u_short *pport, char **pfile)
-+{
-+ static char host[1024];
-+ static char file[1024];
-+ char *p, *p2;
-+ int len;
-+ u_short port;
-+
-+ len = strlen(HTTP_PREFIX);
-+ if (strncasecmp(url, HTTP_PREFIX, len))
-+ return (-1);
-+
-+ url += len;
-+
-+ /* We might overrun */
-+ if (strlcpy(host, url, sizeof (host)) >= sizeof(host))
-+ return (-1);
-+
-+ p = strchr(host, '/');
-+ if (p != NULL) {
-+ *p = '\0';
-+ p2 = p + 1;
-+ } else
-+ p2 = NULL;
-+
-+ if (pfile != NULL) {
-+ /* Generate request file */
-+ if (p2 == NULL)
-+ p2 = "";
-+ snprintf(file, sizeof(file), "/%s", p2);
-+ }
-+
-+ p = strchr(host, ':');
-+ if (p != NULL) {
-+ *p = '\0';
-+ port = atoi(p + 1);
-+
-+ if (port == 0)
-+ return (-1);
-+ } else
-+ port = HTTP_DEFAULTPORT;
-+
-+ if (phost != NULL)
-+ *phost = host;
-+ if (pport != NULL)
-+ *pport = port;
-+ if (pfile != NULL)
-+ *pfile = file;
-+
-+ return (0);
-+}
-+
-+static int
-+evhttp_connection_incoming_fail(struct evhttp_request *req,
-+ enum evhttp_connection_error error)
-+{
-+ switch (error) {
-+ case EVCON_HTTP_TIMEOUT:
-+ case EVCON_HTTP_EOF:
-+ /*
-+ * these are cases in which we probably should just
-+ * close the connection and not send a reply. this
-+ * case may happen when a browser keeps a persistent
-+ * connection open and we timeout on the read.
-+ */
-+ return (-1);
-+ case EVCON_HTTP_INVALID_HEADER:
-+ default: /* xxx: probably should just error on default */
-+ /* the callback looks at the uri to determine errors */
-+ if (req->uri) {
-+ free(req->uri);
-+ req->uri = NULL;
-+ }
-+
-+ /*
-+ * the callback needs to send a reply, once the reply has
-+ * been send, the connection should get freed.
-+ */
-+ (*req->cb)(req, req->cb_arg);
-+ }
-+
-+ return (0);
-+}
-+
-+void
-+evhttp_connection_fail(struct evhttp_connection *evcon,
-+ enum evhttp_connection_error error)
-+{
-+ struct evhttp_request* req = TAILQ_FIRST(&evcon->requests);
-+ assert(req != NULL);
-+
-+ if (evcon->flags & EVHTTP_CON_INCOMING) {
-+ /*
-+ * for incoming requests, there are two different
-+ * failure cases. it's either a network level error
-+ * or an http layer error. for problems on the network
-+ * layer like timeouts we just drop the connections.
-+ * For HTTP problems, we might have to send back a
-+ * reply before the connection can be freed.
-+ */
-+ if (evhttp_connection_incoming_fail(req, error) == -1)
-+ evhttp_connection_free(evcon);
-+ return;
-+ }
-+
-+
-+ if (req->cb != NULL)
-+ (*req->cb)(NULL, req->cb_arg);
-+
-+ TAILQ_REMOVE(&evcon->requests, req, next);
-+ evhttp_request_free(req);
-+
-+ /* xxx: maybe we should fail all requests??? */
-+
-+ /* reset the connection */
-+ evhttp_connection_reset(evcon);
-+
-+ /* We are trying the next request that was queued on us */
-+ if (TAILQ_FIRST(&evcon->requests) != NULL)
-+ evhttp_connection_connect(evcon);
-+}
-+
-+void
-+evhttp_write(int fd, short what, void *arg)
-+{
-+ struct evhttp_connection *evcon = arg;
-+ int n;
-+
-+ if (what == EV_TIMEOUT) {
-+ evhttp_connection_fail(evcon, EVCON_HTTP_TIMEOUT);
-+ return;
-+ }
-+
-+ n = evbuffer_write(evcon->output_buffer, fd);
-+ if (n == -1) {
-+ event_warn("%s: evbuffer_write", __func__);
-+ evhttp_connection_fail(evcon, EVCON_HTTP_EOF);
-+ return;
-+ }
-+
-+ if (n == 0) {
-+ event_warnx("%s: write nothing", __func__);
-+ evhttp_connection_fail(evcon, EVCON_HTTP_EOF);
-+ return;
-+ }
-+
-+ if (EVBUFFER_LENGTH(evcon->output_buffer) != 0) {
-+ evhttp_add_event(&evcon->ev,
-+ evcon->timeout, HTTP_WRITE_TIMEOUT);
-+ return;
-+ }
-+
-+ /* Activate our call back */
-+ if (evcon->cb != NULL)
-+ (*evcon->cb)(evcon, evcon->cb_arg);
-+}
-+
-+void
-+evhttp_connection_done(struct evhttp_connection *evcon)
-+{
-+ struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-+ int con_outgoing = evcon->flags & EVHTTP_CON_OUTGOING;
-+
-+ /*
-+ * if this is an incoming connection, we need to leave the request
-+ * on the connection, so that we can reply to it.
-+ */
-+ if (con_outgoing) {
-+ int need_close;
-+ TAILQ_REMOVE(&evcon->requests, req, next);
-+ req->evcon = NULL;
-+
-+ need_close =
-+ evhttp_is_connection_close(req->flags, req->input_headers) ||
-+ evhttp_is_connection_close(req->flags, req->output_headers);
-+
-+ /* check if we got asked to close the connection */
-+ if (need_close)
-+ evhttp_connection_reset(evcon);
-+
-+ if (TAILQ_FIRST(&evcon->requests) != NULL) {
-+ /*
-+ * We have more requests; reset the connection
-+ * and deal with the next request. xxx: no
-+ * persistent connection right now
-+ */
-+ if (evcon->state != EVCON_CONNECTED)
-+ evhttp_connection_connect(evcon);
-+ else
-+ evhttp_request_dispatch(evcon);
-+ } else if (!need_close) {
-+ /*
-+ * The connection is going to be persistent, but we
-+ * need to detect if the other side closes it.
-+ */
-+ evhttp_connection_start_detectclose(evcon);
-+ }
-+ }
-+
-+ /* notify the user of the request */
-+ (*req->cb)(req, req->cb_arg);
-+
-+ /* if this was an outgoing request, we own and it's done. so free it */
-+ if (con_outgoing) {
-+ evhttp_request_free(req);
-+ }
-+}
-+
-+/*
-+ * Handles reading from a chunked request.
-+ * return 1: all data has been read
-+ * return 0: more data is expected
-+ * return -1: data is corrupted
-+ */
-+
-+static int
-+evhttp_handle_chunked_read(struct evhttp_request *req, struct evbuffer *buf)
-+{
-+ int len;
-+
-+ while ((len = EVBUFFER_LENGTH(buf)) > 0) {
-+ if (req->ntoread < 0) {
-+ /* Read chunk size */
-+ char *p = evbuffer_readline(buf);
-+ char *endp;
-+ int error;
-+ if (p == NULL)
-+ break;
-+ /* the last chunk is on a new line? */
-+ if (strlen(p) == 0)
-+ continue;
-+ req->ntoread = strtol(p, &endp, 16);
-+ error = *p == '\0' || (*endp != '\0' && *endp != ' ');
-+ free(p);
-+ if (error) {
-+ /* could not get chunk size */
-+ return (-1);
-+ }
-+ if (req->ntoread == 0) {
-+ /* Last chunk */
-+ return (1);
-+ }
-+ continue;
-+ }
-+
-+ /* don't have enough to complete a chunk; wait for more */
-+ if (len < req->ntoread)
-+ return (0);
-+
-+ /* Completed chunk */
-+ evbuffer_add(req->input_buffer,
-+ EVBUFFER_DATA(buf), req->ntoread);
-+ evbuffer_drain(buf, req->ntoread);
-+ req->ntoread = -1;
-+ if (req->chunk_cb != NULL) {
-+ (*req->chunk_cb)(req, req->cb_arg);
-+ evbuffer_drain(req->input_buffer,
-+ EVBUFFER_LENGTH(req->input_buffer));
-+ }
-+ }
-+
-+ return (0);
-+}
-+
-+void
-+evhttp_read_body(struct evhttp_connection *evcon, struct evhttp_request *req)
-+{
-+ struct evbuffer *buf = evcon->input_buffer;
-+
-+ if (req->chunked) {
-+ int res = evhttp_handle_chunked_read(req, buf);
-+ if (res == 1) {
-+ /* finished last chunk */
-+ evhttp_connection_done(evcon);
-+ return;
-+ } else if (res == -1) {
-+ /* corrupted data */
-+ evhttp_connection_fail(evcon,
-+ EVCON_HTTP_INVALID_HEADER);
-+ return;
-+ }
-+ } else if (req->ntoread < 0) {
-+ /* Read until connection close. */
-+ evbuffer_add_buffer(req->input_buffer, buf);
-+ } else if (EVBUFFER_LENGTH(buf) >= req->ntoread) {
-+ /* Completed content length */
-+ evbuffer_add(req->input_buffer, EVBUFFER_DATA(buf),
-+ req->ntoread);
-+ evbuffer_drain(buf, req->ntoread);
-+ req->ntoread = 0;
-+ evhttp_connection_done(evcon);
-+ return;
-+ }
-+ /* Read more! */
-+ event_set(&evcon->ev, evcon->fd, EV_READ, evhttp_read, evcon);
-+ evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_READ_TIMEOUT);
-+}
-+
-+/*
-+ * Reads data into a buffer structure until no more data
-+ * can be read on the file descriptor or we have read all
-+ * the data that we wanted to read.
-+ * Execute callback when done.
-+ */
-+
-+void
-+evhttp_read(int fd, short what, void *arg)
-+{
-+ struct evhttp_connection *evcon = arg;
-+ struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-+ struct evbuffer *buf = evcon->input_buffer;
-+ int n, len;
-+
-+ if (what == EV_TIMEOUT) {
-+ evhttp_connection_fail(evcon, EVCON_HTTP_TIMEOUT);
-+ return;
-+ }
-+ n = evbuffer_read(buf, fd, -1);
-+ len = EVBUFFER_LENGTH(buf);
-+ event_debug(("%s: got %d on %d\n", __func__, n, fd));
-+
-+ if (n == -1) {
-+ event_warn("%s: evbuffer_read", __func__);
-+ evhttp_connection_fail(evcon, EVCON_HTTP_EOF);
-+ return;
-+ } else if (n == 0) {
-+ /* Connection closed */
-+ evhttp_connection_done(evcon);
-+ return;
-+ }
-+ evhttp_read_body(evcon, req);
-+}
-+
-+void
-+evhttp_write_connectioncb(struct evhttp_connection *evcon, void *arg)
-+{
-+ /* This is after writing the request to the server */
-+ struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-+ assert(req != NULL);
-+
-+ /* We are done writing our header and are now expecting the response */
-+ req->kind = EVHTTP_RESPONSE;
-+
-+ evhttp_start_read(evcon);
-+}
-+
-+/*
-+ * Clean up a connection object
-+ */
-+
-+void
-+evhttp_connection_free(struct evhttp_connection *evcon)
-+{
-+ struct evhttp_request *req;
-+
-+ /* notify interested parties that this connection is going down */
-+ if (evcon->fd != -1) {
-+ if (evcon->state == EVCON_CONNECTED && evcon->closecb != NULL)
-+ (*evcon->closecb)(evcon, evcon->closecb_arg);
-+ }
-+
-+ /* remove all requests that might be queued on this connection */
-+ while ((req = TAILQ_FIRST(&evcon->requests)) != NULL) {
-+ TAILQ_REMOVE(&evcon->requests, req, next);
-+ evhttp_request_free(req);
-+ }
-+
-+ if (evcon->http_server != NULL) {
-+ struct evhttp *http = evcon->http_server;
-+ TAILQ_REMOVE(&http->connections, evcon, next);
-+ }
-+
-+ if (event_initialized(&evcon->close_ev))
-+ event_del(&evcon->close_ev);
-+
-+ if (event_initialized(&evcon->ev))
-+ event_del(&evcon->ev);
-+
-+ if (evcon->fd != -1)
-+ close(evcon->fd);
-+
-+ if (evcon->address != NULL)
-+ free(evcon->address);
-+
-+ if (evcon->input_buffer != NULL)
-+ evbuffer_free(evcon->input_buffer);
-+
-+ if (evcon->output_buffer != NULL)
-+ evbuffer_free(evcon->output_buffer);
-+
-+ free(evcon);
-+}
-+
-+static void
-+evhttp_request_dispatch(struct evhttp_connection* evcon)
-+{
-+ struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-+
-+ /* this should not usually happy but it's possible */
-+ if (req == NULL)
-+ return;
-+
-+ /* delete possible close detection events */
-+ evhttp_connection_stop_detectclose(evcon);
-+
-+ /* we assume that the connection is connected already */
-+ assert(evcon->state == EVCON_CONNECTED);
-+
-+ /* Create the header from the store arguments */
-+ evhttp_make_header(evcon, req);
-+
-+ evhttp_write_buffer(evcon, evhttp_write_connectioncb, NULL);
-+}
-+
-+/* Reset our connection state */
-+void
-+evhttp_connection_reset(struct evhttp_connection *evcon)
-+{
-+ if (event_initialized(&evcon->ev))
-+ event_del(&evcon->ev);
-+
-+ if (evcon->fd != -1) {
-+ /* inform interested parties about connection close */
-+ if (evcon->state == EVCON_CONNECTED && evcon->closecb != NULL)
-+ (*evcon->closecb)(evcon, evcon->closecb_arg);
-+
-+ close(evcon->fd);
-+ evcon->fd = -1;
-+ }
-+ evcon->state = EVCON_DISCONNECTED;
-+
-+ /* remove unneeded flags */
-+ evcon->flags &= ~EVHTTP_CON_CLOSEDETECT;
-+}
-+
-+static void
-+evhttp_detect_close_cb(int fd, short what, void *arg)
-+{
-+ struct evhttp_connection *evcon = arg;
-+ evhttp_connection_reset(evcon);
-+}
-+
-+static void
-+evhttp_connection_start_detectclose(struct evhttp_connection *evcon)
-+{
-+ evcon->flags |= EVHTTP_CON_CLOSEDETECT;
-+
-+ if (event_initialized(&evcon->close_ev))
-+ event_del(&evcon->close_ev);
-+ event_set(&evcon->close_ev, evcon->fd, EV_READ,
-+ evhttp_detect_close_cb, evcon);
-+ event_add(&evcon->close_ev, NULL);
-+}
-+
-+static void
-+evhttp_connection_stop_detectclose(struct evhttp_connection *evcon)
-+{
-+ evcon->flags &= ~EVHTTP_CON_CLOSEDETECT;
-+ event_del(&evcon->close_ev);
-+}
-+
-+static void
-+evhttp_connection_retry(int fd, short what, void *arg)
-+{
-+ struct evhttp_connection *evcon = arg;
-+
-+ evcon->state = EVCON_DISCONNECTED;
-+ evhttp_connection_connect(evcon);
-+}
-+
-+/*
-+ * Call back for asynchronous connection attempt.
-+ */
-+
-+static void
-+evhttp_connectioncb(int fd, short what, void *arg)
-+{
-+ struct evhttp_connection *evcon = arg;
-+ int error;
-+ socklen_t errsz = sizeof(error);
-+
-+ if (what == EV_TIMEOUT) {
-+ event_warnx("%s: connection timeout for \"%s:%d\" on %d",
-+ __func__, evcon->address, evcon->port, evcon->fd);
-+ goto cleanup;
-+ }
-+
-+ /* Check if the connection completed */
-+ if (getsockopt(evcon->fd, SOL_SOCKET, SO_ERROR, (void*)&error,
-+ &errsz) == -1) {
-+ event_warn("%s: getsockopt for \"%s:%d\" on %d",
-+ __func__, evcon->address, evcon->port, evcon->fd);
-+ goto cleanup;
-+ }
-+
-+ if (error) {
-+ event_warnx("%s: connect failed for \"%s:%d\" on %d: %s",
-+ __func__, evcon->address, evcon->port, evcon->fd,
-+ strerror(error));
-+ goto cleanup;
-+ }
-+
-+ /* We are connected to the server now */
-+ event_debug(("%s: connected to \"%s:%d\" on %d\n",
-+ __func__, evcon->address, evcon->port, evcon->fd));
-+
-+ /* Reset the retry count as we were successful in connecting */
-+ evcon->retry_cnt = 0;
-+ evcon->state = EVCON_CONNECTED;
-+
-+ /* try to start requests that have queued up on this connection */
-+ evhttp_request_dispatch(evcon);
-+ return;
-+
-+ cleanup:
-+ if (evcon->retry_max < 0 || evcon->retry_cnt < evcon->retry_max) {
-+ evtimer_set(&evcon->ev, evhttp_connection_retry, evcon);
-+ evhttp_add_event(&evcon->ev, MIN(3600, 2 << evcon->retry_cnt),
-+ HTTP_CONNECT_TIMEOUT);
-+ evcon->retry_cnt++;
-+ return;
-+ }
-+ evhttp_connection_reset(evcon);
-+
-+ /* for now, we just signal all requests by executing their callbacks */
-+ while (TAILQ_FIRST(&evcon->requests) != NULL) {
-+ struct evhttp_request *request = TAILQ_FIRST(&evcon->requests);
-+ TAILQ_REMOVE(&evcon->requests, request, next);
-+ request->evcon = NULL;
-+
-+ /* we might want to set an error here */
-+ request->cb(request, request->cb_arg);
-+ }
-+}
-+
-+/*
-+ * Check if we got a valid response code.
-+ */
-+
-+int
-+evhttp_valid_response_code(int code)
-+{
-+ if (code == 0)
-+ return (0);
-+
-+ return (1);
-+}
-+
-+/* Parses the status line of a web server */
-+
-+int
-+evhttp_parse_response_line(struct evhttp_request *req, char *line)
-+{
-+ char *protocol;
-+ char *number;
-+ char *readable;
-+
-+ protocol = strsep(&line, " ");
-+ if (line == NULL)
-+ return (-1);
-+ number = strsep(&line, " ");
-+ if (line == NULL)
-+ return (-1);
-+ readable = line;
-+
-+ if (strcmp(protocol, "HTTP/1.0") == 0) {
-+ req->major = 1;
-+ req->minor = 0;
-+ } else if (strcmp(protocol, "HTTP/1.1") == 0) {
-+ req->major = 1;
-+ req->minor = 1;
-+ } else {
-+ event_warnx("%s: bad protocol \"%s\"",
-+ __func__, protocol);
-+ return (-1);
-+ }
-+
-+ req->response_code = atoi(number);
-+ if (!evhttp_valid_response_code(req->response_code)) {
-+ event_warnx("%s: bad response code \"%s\"",
-+ __func__, number);
-+ return (-1);
-+ }
-+
-+ if ((req->response_code_line = strdup(readable)) == NULL)
-+ event_err(1, "%s: strdup", __func__);
-+
-+ return (0);
-+}
-+
-+/* Parse the first line of a HTTP request */
-+
-+int
-+evhttp_parse_request_line(struct evhttp_request *req, char *line)
-+{
-+ char *method;
-+ char *uri;
-+ char *version;
-+
-+ /* Parse the request line */
-+ method = strsep(&line, " ");
-+ if (line == NULL)
-+ return (-1);
-+ uri = strsep(&line, " ");
-+ if (line == NULL)
-+ return (-1);
-+ version = strsep(&line, " ");
-+ if (line != NULL)
-+ return (-1);
-+
-+ /* First line */
-+ if (strcmp(method, "GET") == 0) {
-+ req->type = EVHTTP_REQ_GET;
-+ } else if (strcmp(method, "POST") == 0) {
-+ req->type = EVHTTP_REQ_POST;
-+ } else if (strcmp(method, "HEAD") == 0) {
-+ req->type = EVHTTP_REQ_HEAD;
-+ } else {
-+ event_warnx("%s: bad method %s on request %p from %s",
-+ __func__, method, req, req->remote_host);
-+ return (-1);
-+ }
-+
-+ if (strcmp(version, "HTTP/1.0") == 0) {
-+ req->major = 1;
-+ req->minor = 0;
-+ } else if (strcmp(version, "HTTP/1.1") == 0) {
-+ req->major = 1;
-+ req->minor = 1;
-+ } else {
-+ event_warnx("%s: bad version %s on request %p from %s",
-+ __func__, version, req, req->remote_host);
-+ return (-1);
-+ }
-+
-+ if ((req->uri = strdup(uri)) == NULL) {
-+ event_warn("%s: evhttp_decode_uri", __func__);
-+ return (-1);
-+ }
-+
-+ /* determine if it's a proxy request */
-+ if (strlen(req->uri) > 0 && req->uri[0] != '/')
-+ req->flags |= EVHTTP_PROXY_REQUEST;
-+
-+ return (0);
-+}
-+
-+const char *
-+evhttp_find_header(const struct evkeyvalq *headers, const char *key)
-+{
-+ struct evkeyval *header;
-+
-+ TAILQ_FOREACH(header, headers, next) {
-+ if (strcasecmp(header->key, key) == 0)
-+ return (header->value);
-+ }
-+
-+ return (NULL);
-+}
-+
-+void
-+evhttp_clear_headers(struct evkeyvalq *headers)
-+{
-+ struct evkeyval *header;
-+
-+ for (header = TAILQ_FIRST(headers);
-+ header != NULL;
-+ header = TAILQ_FIRST(headers)) {
-+ TAILQ_REMOVE(headers, header, next);
-+ free(header->key);
-+ free(header->value);
-+ free(header);
-+ }
-+}
-+
-+/*
-+ * Returns 0, if the header was successfully removed.
-+ * Returns -1, if the header could not be found.
-+ */
-+
-+int
-+evhttp_remove_header(struct evkeyvalq *headers, const char *key)
-+{
-+ struct evkeyval *header;
-+
-+ TAILQ_FOREACH(header, headers, next) {
-+ if (strcasecmp(header->key, key) == 0)
-+ break;
-+ }
-+
-+ if (header == NULL)
-+ return (-1);
-+
-+ /* Free and remove the header that we found */
-+ TAILQ_REMOVE(headers, header, next);
-+ free(header->key);
-+ free(header->value);
-+ free(header);
-+
-+ return (0);
-+}
-+
-+int
-+evhttp_add_header(struct evkeyvalq *headers, const char *key, const char *value)
-+{
-+ struct evkeyval *header;
-+
-+ header = calloc(1, sizeof(struct evkeyval));
-+ if (header == NULL) {
-+ event_warn("%s: calloc", __func__);
-+ return (-1);
-+ }
-+ if ((header->key = strdup(key)) == NULL) {
-+ free(header);
-+ event_warn("%s: strdup", __func__);
-+ return (-1);
-+ }
-+ if ((header->value = strdup(value)) == NULL) {
-+ free(header->key);
-+ free(header);
-+ event_warn("%s: strdup", __func__);
-+ return (-1);
-+ }
-+
-+ TAILQ_INSERT_TAIL(headers, header, next);
-+
-+ return (0);
-+}
-+
-+/*
-+ * Parses header lines from a request or a response into the specified
-+ * request object given an event buffer.
-+ *
-+ * Returns
-+ * -1 on error
-+ * 0 when we need to read more headers
-+ * 1 when all headers have been read.
-+ */
-+
-+int
-+evhttp_parse_lines(struct evhttp_request *req, struct evbuffer* buffer)
-+{
-+ u_char *endp;
-+ int done = 0;
-+
-+ struct evkeyvalq* headers = req->input_headers;
-+ while ((endp = evbuffer_find(buffer, (u_char *)"\r\n", 2)) != NULL) {
-+ char *skey, *svalue;
-+
-+ if (strncmp((char *)EVBUFFER_DATA(buffer), "\r\n", 2) == 0) {
-+ evbuffer_drain(buffer, 2);
-+ /* Last header - Done */
-+ done = 1;
-+ break;
-+ }
-+
-+ *endp = '\0';
-+ endp += 2;
-+
-+ /* Processing of header lines */
-+ if (req->got_firstline == 0) {
-+ switch (req->kind) {
-+ case EVHTTP_REQUEST:
-+ if (evhttp_parse_request_line(req,
-+ (char *)EVBUFFER_DATA(buffer)) == -1)
-+ return (-1);
-+ break;
-+ case EVHTTP_RESPONSE:
-+ if (evhttp_parse_response_line(req,
-+ (char *)EVBUFFER_DATA(buffer)) == -1)
-+ return (-1);
-+ break;
-+ default:
-+ return (-1);
-+ }
-+ req->got_firstline = 1;
-+ } else {
-+ /* Regular header */
-+ svalue = (char *)EVBUFFER_DATA(buffer);
-+ skey = strsep(&svalue, ":");
-+ if (svalue == NULL)
-+ return (-1);
-+
-+ svalue += strspn(svalue, " ");
-+
-+ if (evhttp_add_header(headers, skey, svalue) == -1)
-+ return (-1);
-+ }
-+
-+ /* Move the uncompleted headers forward */
-+ evbuffer_drain(buffer, endp - EVBUFFER_DATA(buffer));
-+ }
-+
-+ return (done);
-+}
-+
-+static int
-+evhttp_get_body_length(struct evhttp_request *req)
-+{
-+ struct evkeyvalq *headers = req->input_headers;
-+ const char *content_length;
-+ const char *connection;
-+
-+ content_length = evhttp_find_header(headers, "Content-Length");
-+ connection = evhttp_find_header(headers, "Connection");
-+
-+ if (content_length == NULL && connection == NULL)
-+ req->ntoread = -1;
-+ else if (content_length == NULL &&
-+ strcasecmp(connection, "Close") != 0) {
-+ /* Bad combination, we don't know when it will end */
-+ event_warnx("%s: we got no content length, but the "
-+ "server wants to keep the connection open: %s.",
-+ __func__, connection);
-+ return (-1);
-+ } else if (content_length == NULL) {
-+ req->ntoread = -1;
-+ } else {
-+ char *endp;
-+ req->ntoread = strtol(content_length, &endp, 10);
-+ if (*content_length == '\0' || *endp != '\0') {
-+ event_warnx("%s: illegal content length: %s",
-+ __func__, content_length);
-+ return (-1);
-+ }
-+ }
-+
-+ event_debug(("%s: bytes to read: %d (in buffer %d)\n",
-+ __func__, req->ntoread,
-+ EVBUFFER_LENGTH(evcon->input_buffer)));
-+
-+ return (0);
-+}
-+
-+static void
-+evhttp_get_body(struct evhttp_connection *evcon, struct evhttp_request *req)
-+{
-+ const char *xfer_enc;
-+
-+ /* If this is a request without a body, then we are done */
-+ if (req->kind == EVHTTP_REQUEST && req->type != EVHTTP_REQ_POST) {
-+ evhttp_connection_done(evcon);
-+ return;
-+ }
-+ xfer_enc = evhttp_find_header(req->input_headers, "Transfer-Encoding");
-+ if (xfer_enc != NULL && strcasecmp(xfer_enc, "chunked") == 0) {
-+ req->chunked = 1;
-+ req->ntoread = -1;
-+ } else {
-+ if (evhttp_get_body_length(req) == -1) {
-+ evhttp_connection_fail(evcon,
-+ EVCON_HTTP_INVALID_HEADER);
-+ return;
-+ }
-+ }
-+ evhttp_read_body(evcon, req);
-+}
-+
-+void
-+evhttp_read_header(int fd, short what, void *arg)
-+{
-+ struct evhttp_connection *evcon = arg;
-+ struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-+ int n, res;
-+
-+ if (what == EV_TIMEOUT) {
-+ event_debug(("%s: timeout on %d\n", __func__, fd));
-+ evhttp_connection_fail(evcon, EVCON_HTTP_TIMEOUT);
-+ return;
-+ }
-+
-+ n = evbuffer_read(evcon->input_buffer, fd, -1);
-+ if (n == 0) {
-+ event_warnx("%s: no more data on %d", __func__, fd);
-+ evhttp_connection_fail(evcon, EVCON_HTTP_EOF);
-+ return;
-+ }
-+ if (n == -1) {
-+ event_warnx("%s: bad read on %d", __func__, fd);
-+ evhttp_connection_fail(evcon, EVCON_HTTP_EOF);
-+ return;
-+ }
-+
-+ res = evhttp_parse_lines(req, evcon->input_buffer);
-+ if (res == -1) {
-+ /* Error while reading, terminate */
-+ event_debug(("%s: bad header lines on %d\n", __func__, fd));
-+ evhttp_connection_fail(evcon, EVCON_HTTP_INVALID_HEADER);
-+ return;
-+ } else if (res == 0) {
-+ /* Need more header lines */
-+ evhttp_add_event(&evcon->ev,
-+ evcon->timeout, HTTP_READ_TIMEOUT);
-+ return;
-+ }
-+
-+ /* Done reading headers, do the real work */
-+ switch (req->kind) {
-+ case EVHTTP_REQUEST:
-+ event_debug(("%s: checking for post data on %d\n",
-+ __func__, fd));
-+ evhttp_get_body(evcon, req);
-+ break;
-+
-+ case EVHTTP_RESPONSE:
-+ if (req->response_code == HTTP_NOCONTENT ||
-+ req->response_code == HTTP_NOTMODIFIED ||
-+ (req->response_code >= 100 && req->response_code < 200)) {
-+ event_debug(("%s: skipping body for code %d\n",
-+ __func__, req->response_code));
-+ evhttp_connection_done(evcon);
-+ } else {
-+ event_debug(("%s: start of read body for %s on %d\n",
-+ __func__, req->remote_host, fd));
-+ evhttp_get_body(evcon, req);
-+ }
-+ break;
-+
-+ default:
-+ event_warnx("%s: bad header on %d", __func__, fd);
-+ evhttp_connection_fail(evcon, EVCON_HTTP_INVALID_HEADER);
-+ break;
-+ }
-+}
-+
-+/*
-+ * Creates a TCP connection to the specified port and executes a callback
-+ * when finished. Failure or sucess is indicate by the passed connection
-+ * object.
-+ *
-+ * Although this interface accepts a hostname, it is intended to take
-+ * only numeric hostnames so that non-blocking DNS resolution can
-+ * happen elsewhere.
-+ */
-+
-+struct evhttp_connection *
-+evhttp_connection_new(const char *address, unsigned short port)
-+{
-+ struct evhttp_connection *evcon = NULL;
-+
-+ event_debug(("Attempting connection to %s:%d\n", address, port));
-+
-+ if ((evcon = calloc(1, sizeof(struct evhttp_connection))) == NULL) {
-+ event_warn("%s: calloc failed", __func__);
-+ goto error;
-+ }
-+
-+ evcon->fd = -1;
-+ evcon->port = port;
-+
-+ evcon->timeout = -1;
-+ evcon->retry_cnt = evcon->retry_max = 0;
-+
-+ if ((evcon->address = strdup(address)) == NULL) {
-+ event_warn("%s: strdup failed", __func__);
-+ goto error;
-+ }
-+
-+ if ((evcon->input_buffer = evbuffer_new()) == NULL) {
-+ event_warn("%s: evbuffer_new failed", __func__);
-+ goto error;
-+ }
-+
-+ if ((evcon->output_buffer = evbuffer_new()) == NULL) {
-+ event_warn("%s: evbuffer_new failed", __func__);
-+ goto error;
-+ }
-+
-+ evcon->state = EVCON_DISCONNECTED;
-+ TAILQ_INIT(&evcon->requests);
-+
-+ return (evcon);
-+
-+ error:
-+ if (evcon != NULL)
-+ evhttp_connection_free(evcon);
-+ return (NULL);
-+}
-+
-+void
-+evhttp_connection_set_timeout(struct evhttp_connection *evcon,
-+ int timeout_in_secs)
-+{
-+ evcon->timeout = timeout_in_secs;
-+}
-+
-+void
-+evhttp_connection_set_retries(struct evhttp_connection *evcon,
-+ int retry_max)
-+{
-+ evcon->retry_max = retry_max;
-+}
-+
-+void
-+evhttp_connection_set_closecb(struct evhttp_connection *evcon,
-+ void (*cb)(struct evhttp_connection *, void *), void *cbarg)
-+{
-+ evcon->closecb = cb;
-+ evcon->closecb_arg = cbarg;
-+}
-+
-+void
-+evhttp_connection_get_peer(struct evhttp_connection *evcon,
-+ char **address, u_short *port)
-+{
-+ *address = evcon->address;
-+ *port = evcon->port;
-+}
-+
-+int
-+evhttp_connection_connect(struct evhttp_connection *evcon)
-+{
-+ if (evcon->state == EVCON_CONNECTING)
-+ return (0);
-+
-+ evhttp_connection_reset(evcon);
-+
-+ assert(!(evcon->flags & EVHTTP_CON_INCOMING));
-+ evcon->flags |= EVHTTP_CON_OUTGOING;
-+
-+ /* Do async connection to HTTP server */
-+ if ((evcon->fd = make_socket(
-+ 0, evcon->address, evcon->port)) == -1) {
-+ event_warn("%s: failed to connect to \"%s:%d\"",
-+ __func__, evcon->address, evcon->port);
-+ return (-1);
-+ }
-+
-+ /* Set up a callback for successful connection setup */
-+ event_set(&evcon->ev, evcon->fd, EV_WRITE, evhttp_connectioncb, evcon);
-+ evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_CONNECT_TIMEOUT);
-+
-+ evcon->state = EVCON_CONNECTING;
-+
-+ return (0);
-+}
-+
-+/*
-+ * Starts an HTTP request on the provided evhttp_connection object.
-+ * If the connection object is not connected to the web server already,
-+ * this will start the connection.
-+ */
-+
-+int
-+evhttp_make_request(struct evhttp_connection *evcon,
-+ struct evhttp_request *req,
-+ enum evhttp_cmd_type type, const char *uri)
-+{
-+ /* We are making a request */
-+ req->kind = EVHTTP_REQUEST;
-+ req->type = type;
-+ if (req->uri != NULL)
-+ free(req->uri);
-+ if ((req->uri = strdup(uri)) == NULL)
-+ event_err(1, "%s: strdup", __func__);
-+
-+ /* Set the protocol version if it is not supplied */
-+ if (!req->major && !req->minor) {
-+ req->major = 1;
-+ req->minor = 1;
-+ }
-+
-+ assert(req->evcon == NULL);
-+ req->evcon = evcon;
-+ assert(!(req->flags & EVHTTP_REQ_OWN_CONNECTION));
-+
-+ TAILQ_INSERT_TAIL(&evcon->requests, req, next);
-+
-+ /* If the connection object is not connected; make it so */
-+ if (evcon->state != EVCON_CONNECTED)
-+ return (evhttp_connection_connect(evcon));
-+
-+ /*
-+ * If it's connected already and we are the first in the queue,
-+ * then we can dispatch this request immediately. Otherwise, it
-+ * will be dispatched once the pending requests are completed.
-+ */
-+ if (TAILQ_FIRST(&evcon->requests) == req)
-+ evhttp_request_dispatch(evcon);
-+
-+ return (0);
-+}
-+
-+/*
-+ * Reads data from file descriptor into request structure
-+ * Request structure needs to be set up correctly.
-+ */
-+
-+void
-+evhttp_start_read(struct evhttp_connection *evcon)
-+{
-+ /* Set up an event to read the headers */
-+ if (event_initialized(&evcon->ev))
-+ event_del(&evcon->ev);
-+ event_set(&evcon->ev, evcon->fd, EV_READ, evhttp_read_header, evcon);
-+
-+ evhttp_add_event(&evcon->ev, evcon->timeout, HTTP_READ_TIMEOUT);
-+}
-+
-+void
-+evhttp_send_done(struct evhttp_connection *evcon, void *arg)
-+{
-+ int need_close;
-+ struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
-+ TAILQ_REMOVE(&evcon->requests, req, next);
-+
-+ /* delete possible close detection events */
-+ evhttp_connection_stop_detectclose(evcon);
-+
-+ need_close =
-+ (req->minor == 0 &&
-+ !evhttp_is_connection_keepalive(req->input_headers))||
-+ evhttp_is_connection_close(req->flags, req->input_headers) ||
-+ evhttp_is_connection_close(req->flags, req->output_headers);
-+
-+ assert(req->flags & EVHTTP_REQ_OWN_CONNECTION);
-+ evhttp_request_free(req);
-+
-+ if (need_close) {
-+ evhttp_connection_free(evcon);
-+ return;
-+ }
-+
-+ /* we have a persistent connection; try to accept another request. */
-+ if (evhttp_associate_new_request_with_connection(evcon) == -1)
-+ evhttp_connection_free(evcon);
-+}
-+
-+/*
-+ * Returns an error page.
-+ */
-+
-+void
-+evhttp_send_error(struct evhttp_request *req, int error, const char *reason)
-+{
-+ char *fmt = "<HTML><HEAD>\n"
-+ "<TITLE>%d %s</TITLE>\n"
-+ "</HEAD><BODY>\n"
-+ "<H1>Method Not Implemented</H1>\n"
-+ "Invalid method in request<P>\n"
-+ "</BODY></HTML>\n";
-+
-+ struct evbuffer *buf = evbuffer_new();
-+
-+ /* close the connection on error */
-+ evhttp_add_header(req->output_headers, "Connection", "close");
-+
-+ evhttp_response_code(req, error, reason);
-+
-+ evbuffer_add_printf(buf, fmt, error, reason);
-+
-+ evhttp_send_page(req, buf);
-+
-+ evbuffer_free(buf);
-+}
-+
-+/* Requires that headers and response code are already set up */
-+
-+static inline void
-+evhttp_send(struct evhttp_request *req, struct evbuffer *databuf)
-+{
-+ struct evhttp_connection *evcon = req->evcon;
-+
-+ assert(TAILQ_FIRST(&evcon->requests) == req);
-+
-+ /* xxx: not sure if we really should expose the data buffer this way */
-+ if (databuf != NULL)
-+ evbuffer_add_buffer(req->output_buffer, databuf);
-+
-+ /* Adds headers to the response */
-+ evhttp_make_header(evcon, req);
-+
-+ evhttp_write_buffer(evcon, evhttp_send_done, NULL);
-+}
-+
-+void
-+evhttp_send_reply(struct evhttp_request *req, int code, const char *reason,
-+ struct evbuffer *databuf)
-+{
-+ /* set up to watch for client close */
-+ evhttp_connection_start_detectclose(req->evcon);
-+ evhttp_response_code(req, code, reason);
-+
-+ evhttp_send(req, databuf);
-+}
-+
-+void
-+evhttp_send_reply_start(struct evhttp_request *req, int code,
-+ const char *reason)
-+{
-+ /* set up to watch for client close */
-+ evhttp_connection_start_detectclose(req->evcon);
-+ evhttp_response_code(req, code, reason);
-+ if (req->major == 1 && req->minor == 1) {
-+ /* use chunked encoding for HTTP/1.1 */
-+ evhttp_add_header(req->output_headers, "Transfer-Encoding",
-+ "chunked");
-+ req->chunked = 1;
-+ }
-+ evhttp_make_header(req->evcon, req);
-+ evhttp_write_buffer(req->evcon, NULL, NULL);
-+}
-+
-+void
-+evhttp_send_reply_chunk(struct evhttp_request *req, struct evbuffer *databuf)
-+{
-+ if (req->chunked) {
-+ evbuffer_add_printf(req->evcon->output_buffer, "%x\r\n",
-+ EVBUFFER_LENGTH(databuf));
-+ }
-+ evbuffer_add_buffer(req->evcon->output_buffer, databuf);
-+ evhttp_write_buffer(req->evcon, NULL, NULL);
-+}
-+
-+void
-+evhttp_send_reply_end(struct evhttp_request *req)
-+{
-+ struct evhttp_connection *evcon = req->evcon;
-+
-+ if (req->chunked) {
-+ evbuffer_add(req->evcon->output_buffer, "0\r\n\r\n", 5);
-+ evhttp_write_buffer(req->evcon, evhttp_send_done, NULL);
-+ req->chunked = 0;
-+ } else if (!event_pending(&evcon->ev, EV_WRITE|EV_TIMEOUT, NULL)) {
-+ /* let the connection know that we are done with the request */
-+ evhttp_send_done(evcon, NULL);
-+ } else {
-+ /* make the callback execute after all data has been written */
-+ evcon->cb = evhttp_send_done;
-+ evcon->cb_arg = NULL;
-+ }
-+}
-+
-+void
-+evhttp_response_code(struct evhttp_request *req, int code, const char *reason)
-+{
-+ req->kind = EVHTTP_RESPONSE;
-+ req->response_code = code;
-+ if (req->response_code_line != NULL)
-+ free(req->response_code_line);
-+ req->response_code_line = strdup(reason);
-+}
-+
-+void
-+evhttp_send_page(struct evhttp_request *req, struct evbuffer *databuf)
-+{
-+ if (!req->major || !req->minor) {
-+ req->major = 1;
-+ req->minor = 1;
-+ }
-+
-+ if (req->kind != EVHTTP_RESPONSE)
-+ evhttp_response_code(req, 200, "OK");
-+
-+ evhttp_clear_headers(req->output_headers);
-+ evhttp_add_header(req->output_headers, "Content-Type", "text/html");
-+ evhttp_add_header(req->output_headers, "Connection", "close");
-+
-+ evhttp_send(req, databuf);
-+}
-+
-+static const char uri_chars[256] = {
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0,
-+ /* 64 */
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1,
-+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0,
-+ /* 128 */
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ /* 192 */
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+};
-+
-+/*
-+ * Helper functions to encode/decode a URI.
-+ * The returned string must be freed by the caller.
-+ */
-+char *
-+evhttp_encode_uri(const char *uri)
-+{
-+ struct evbuffer *buf = evbuffer_new();
-+ char *p;
-+
-+ for (p = (char *)uri; *p != '\0'; p++) {
-+ if (uri_chars[(u_char)(*p)]) {
-+ evbuffer_add(buf, p, 1);
-+ } else {
-+ evbuffer_add_printf(buf, "%%%02X", (u_char)(*p));
-+ }
-+ }
-+ evbuffer_add(buf, "", 1);
-+ p = strdup((char *)EVBUFFER_DATA(buf));
-+ evbuffer_free(buf);
-+
-+ return (p);
-+}
-+
-+char *
-+evhttp_decode_uri(const char *uri)
-+{
-+ char c, *ret;
-+ int i, j, in_query = 0;
-+
-+ ret = malloc(strlen(uri) + 1);
-+ if (ret == NULL)
-+ event_err(1, "%s: malloc(%d)", __func__, strlen(uri) + 1);
-+
-+ for (i = j = 0; uri[i] != '\0'; i++) {
-+ c = uri[i];
-+ if (c == '?') {
-+ in_query = 1;
-+ } else if (c == '+' && in_query) {
-+ c = ' ';
-+ } else if (c == '%' && isxdigit(uri[i+1]) &&
-+ isxdigit(uri[i+2])) {
-+ char tmp[] = { uri[i+1], uri[i+2], '\0' };
-+ c = (char)strtol(tmp, NULL, 16);
-+ i += 2;
-+ }
-+ ret[j++] = c;
-+ }
-+ ret[j] = '\0';
-+
-+ return (ret);
-+}
-+
-+/*
-+ * Helper function to parse out arguments in a query.
-+ * The arguments are separated by key and value.
-+ * URI should already be decoded.
-+ */
-+
-+void
-+evhttp_parse_query(const char *uri, struct evkeyvalq *headers)
-+{
-+ char *line;
-+ char *argument;
-+ char *p;
-+
-+ TAILQ_INIT(headers);
-+
-+ /* No arguments - we are done */
-+ if (strchr(uri, '?') == NULL)
-+ return;
-+
-+ if ((line = strdup(uri)) == NULL)
-+ event_err(1, "%s: strdup", __func__);
-+
-+
-+ argument = line;
-+
-+ /* We already know that there has to be a ? */
-+ strsep(&argument, "?");
-+
-+ p = argument;
-+ while (p != NULL && *p != '\0') {
-+ char *key, *value;
-+ argument = strsep(&p, "&");
-+
-+ value = argument;
-+ key = strsep(&value, "=");
-+ if (value == NULL)
-+ goto error;
-+
-+ value = evhttp_decode_uri(value);
-+ event_debug(("Query Param: %s -> %s\n", key, value));
-+ evhttp_add_header(headers, key, value);
-+ free(value);
-+ }
-+
-+ error:
-+ free(line);
-+}
-+
-+static struct evhttp_cb *
-+evhttp_dispatch_callback(struct httpcbq *callbacks, struct evhttp_request *req)
-+{
-+ struct evhttp_cb *cb;
-+
-+ /* Test for different URLs */
-+ char *p = strchr(req->uri, '?');
-+ TAILQ_FOREACH(cb, callbacks, next) {
-+ int res;
-+ if (p == NULL)
-+ res = strcmp(cb->what, req->uri) == 0;
-+ else
-+ res = strncmp(cb->what, req->uri,
-+ (size_t)(p - req->uri)) == 0;
-+ if (res)
-+ return (cb);
-+ }
-+
-+ return (NULL);
-+}
-+
-+void
-+evhttp_handle_request(struct evhttp_request *req, void *arg)
-+{
-+ struct evhttp *http = arg;
-+ struct evhttp_cb *cb = NULL;
-+
-+ if (req->uri == NULL) {
-+ evhttp_send_error(req, HTTP_BADREQUEST, "Bad Request");
-+ return;
-+ }
-+
-+ if ((cb = evhttp_dispatch_callback(&http->callbacks, req)) != NULL) {
-+ (*cb->cb)(req, cb->cbarg);
-+ return;
-+ }
-+
-+ /* Generic call back */
-+ if (http->gencb) {
-+ (*http->gencb)(req, http->gencbarg);
-+ return;
-+ } else {
-+ /* We need to send a 404 here */
-+ char *fmt = "<html><head>"
-+ "<title>404 Not Found</title>"
-+ "</head><body>"
-+ "<h1>Not Found</h1>"
-+ "<p>The requested URL %s was not found on this server.</p>"
-+ "</body></html>\n";
-+
-+ char *escaped_html = evhttp_htmlescape(req->uri);
-+ struct evbuffer *buf = evbuffer_new();
-+
-+ evhttp_response_code(req, HTTP_NOTFOUND, "Not Found");
-+
-+ evbuffer_add_printf(buf, fmt, escaped_html);
-+
-+ free(escaped_html);
-+
-+ evhttp_send_page(req, buf);
-+
-+ evbuffer_free(buf);
-+ }
-+}
-+
-+static void
-+accept_socket(int fd, short what, void *arg)
-+{
-+ struct evhttp *http = arg;
-+ struct sockaddr_storage ss;
-+ socklen_t addrlen = sizeof(ss);
-+ int nfd;
-+
-+ if ((nfd = accept(fd, (struct sockaddr *)&ss, &addrlen)) == -1) {
-+ event_warn("%s: bad accept", __func__);
-+ return;
-+ }
-+ if (event_make_socket_nonblocking(nfd) < 0)
-+ return;
-+
-+ evhttp_get_request(http, nfd, (struct sockaddr *)&ss, addrlen);
-+}
-+
-+static int
-+bind_socket(struct evhttp *http, const char *address, u_short port)
-+{
-+ struct event *ev = &http->bind_ev;
-+ int fd;
-+
-+ if ((fd = make_socket(1, address, port)) == -1)
-+ return (-1);
-+
-+ if (listen(fd, 10) == -1) {
-+ event_warn("%s: listen", __func__);
-+ return (-1);
-+ }
-+
-+ /* Schedule the socket for accepting */
-+ event_set(ev, fd, EV_READ | EV_PERSIST, accept_socket, http);
-+ event_add(ev, NULL);
-+
-+ event_debug(("Bound to port %d - Awaiting connections ... ", port));
-+
-+ return (0);
-+}
-+
-+/*
-+ * Start a web server on the specified address and port.
-+ */
-+
-+struct evhttp *
-+evhttp_start(const char *address, u_short port)
-+{
-+ struct evhttp *http;
-+
-+ if ((http = calloc(1, sizeof(struct evhttp))) == NULL) {
-+ event_warn("%s: calloc", __func__);
-+ return (NULL);
-+ }
-+
-+ http->timeout = -1;
-+
-+ TAILQ_INIT(&http->callbacks);
-+ TAILQ_INIT(&http->connections);
-+
-+ if (bind_socket(http, address, port) == -1) {
-+ free(http);
-+ return (NULL);
-+ }
-+
-+ return (http);
-+}
-+
-+void
-+evhttp_free(struct evhttp* http)
-+{
-+ struct evhttp_cb *http_cb;
-+ struct evhttp_connection *evcon;
-+ int fd = http->bind_ev.ev_fd;
-+
-+ /* Remove the accepting part */
-+ event_del(&http->bind_ev);
-+ close(fd);
-+
-+ while ((evcon = TAILQ_FIRST(&http->connections)) != NULL) {
-+ /* evhttp_connection_free removes the connection */
-+ evhttp_connection_free(evcon);
-+ }
-+
-+ while ((http_cb = TAILQ_FIRST(&http->callbacks)) != NULL) {
-+ TAILQ_REMOVE(&http->callbacks, http_cb, next);
-+ free(http_cb->what);
-+ free(http_cb);
-+ }
-+
-+ free(http);
-+}
-+
-+void
-+evhttp_set_timeout(struct evhttp* http, int timeout_in_secs)
-+{
-+ http->timeout = timeout_in_secs;
-+}
-+
-+void
-+evhttp_set_cb(struct evhttp *http, const char *uri,
-+ void (*cb)(struct evhttp_request *, void *), void *cbarg)
-+{
-+ struct evhttp_cb *http_cb;
-+
-+ if ((http_cb = calloc(1, sizeof(struct evhttp_cb))) == NULL)
-+ event_err(1, "%s: calloc", __func__);
-+
-+ http_cb->what = strdup(uri);
-+ http_cb->cb = cb;
-+ http_cb->cbarg = cbarg;
-+
-+ TAILQ_INSERT_TAIL(&http->callbacks, http_cb, next);
-+}
-+
-+int
-+evhttp_del_cb(struct evhttp *http, const char *uri)
-+{
-+ struct evhttp_cb *http_cb;
-+
-+ TAILQ_FOREACH(http_cb, &http->callbacks, next) {
-+ if (strcmp(http_cb->what, uri) == 0)
-+ break;
-+ }
-+ if (http_cb == NULL)
-+ return (-1);
-+
-+ TAILQ_REMOVE(&http->callbacks, http_cb, next);
-+ free(http_cb->what);
-+ free(http_cb);
-+
-+ return (0);
-+}
-+
-+void
-+evhttp_set_gencb(struct evhttp *http,
-+ void (*cb)(struct evhttp_request *, void *), void *cbarg)
-+{
-+ http->gencb = cb;
-+ http->gencbarg = cbarg;
-+}
-+
-+/*
-+ * Request related functions
-+ */
-+
-+struct evhttp_request *
-+evhttp_request_new(void (*cb)(struct evhttp_request *, void *), void *arg)
-+{
-+ struct evhttp_request *req = NULL;
-+
-+ /* Allocate request structure */
-+ if ((req = calloc(1, sizeof(struct evhttp_request))) == NULL) {
-+ event_warn("%s: calloc", __func__);
-+ goto error;
-+ }
-+
-+ req->kind = EVHTTP_RESPONSE;
-+ req->input_headers = calloc(1, sizeof(struct evkeyvalq));
-+ if (req->input_headers == NULL) {
-+ event_warn("%s: calloc", __func__);
-+ goto error;
-+ }
-+ TAILQ_INIT(req->input_headers);
-+
-+ req->output_headers = calloc(1, sizeof(struct evkeyvalq));
-+ if (req->output_headers == NULL) {
-+ event_warn("%s: calloc", __func__);
-+ goto error;
-+ }
-+ TAILQ_INIT(req->output_headers);
-+
-+ if ((req->input_buffer = evbuffer_new()) == NULL) {
-+ event_warn("%s: evbuffer_new", __func__);
-+ goto error;
-+ }
-+
-+ if ((req->output_buffer = evbuffer_new()) == NULL) {
-+ event_warn("%s: evbuffer_new", __func__);
-+ goto error;
-+ }
-+
-+ req->cb = cb;
-+ req->cb_arg = arg;
-+
-+ return (req);
-+
-+ error:
-+ if (req != NULL)
-+ evhttp_request_free(req);
-+ return (NULL);
-+}
-+
-+void
-+evhttp_request_free(struct evhttp_request *req)
-+{
-+ if (req->remote_host != NULL)
-+ free(req->remote_host);
-+ if (req->uri != NULL)
-+ free(req->uri);
-+ if (req->response_code_line != NULL)
-+ free(req->response_code_line);
-+
-+ evhttp_clear_headers(req->input_headers);
-+ free(req->input_headers);
-+
-+ evhttp_clear_headers(req->output_headers);
-+ free(req->output_headers);
-+
-+ if (req->input_buffer != NULL)
-+ evbuffer_free(req->input_buffer);
-+
-+ if (req->output_buffer != NULL)
-+ evbuffer_free(req->output_buffer);
-+
-+ free(req);
-+}
-+
-+void
-+evhttp_request_set_chunked_cb(struct evhttp_request *req,
-+ void (*cb)(struct evhttp_request *, void *))
-+{
-+ req->chunk_cb = cb;
-+}
-+
-+/*
-+ * Allows for inspection of the request URI
-+ */
-+
-+const char *
-+evhttp_request_uri(struct evhttp_request *req) {
-+ if (req->uri == NULL)
-+ event_debug(("%s: request %p has no uri\n", req));
-+ return (req->uri);
-+}
++ AC_MSG_ERROR([FPM Requires Libevent. You must build this target --with-libevent. Stop.])
++fi
+
++])
+diff -Naur php-src-vanilla/sapi/fpm/ac/Makefile.frag php-src/sapi/fpm/ac/Makefile.frag
+--- php-src-vanilla/sapi/fpm/ac/Makefile.frag 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/ac/Makefile.frag 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,61 @@
++fpm: $(SAPI_FPM_PATH)
++
++$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
++ $(BUILD_FPM)
++
++install: install-fpm
++
++install-fpm: all
++ @echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(php_fpm_bin_path)"
++ @$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_bin_dir)
++ @$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_pid_dir)
++ @$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_log_dir)
++ @$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(php_fpm_bin_path)$(program_suffix)$(EXEEXT)
++
++ @test "$(php_fpm_conf)" && \
++ echo "Installing PHP FPM config: $(INSTALL_ROOT)$(php_fpm_conf_path)" && \
++ $(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_conf_dir) || :
++
++ @test "$(php_fpm_conf)" && \
++ test -f "$(INSTALL_ROOT)$(php_fpm_conf_path)" && \
++ $(INSTALL_DATA) --backup=numbered $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old || :
++
++ @test "$(php_fpm_conf)" && \
++ $(INSTALL_DATA) sapi/fpm/php_fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
++ ln -sf $(INSTALL_ROOT)$(php_fpm_conf_path).default $(INSTALL_ROOT)$(php_fpm_conf_path) || :
++
++ @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man1/$(php_fpm_bin)$(program_suffix).1"
++ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
++ @$(INSTALL_DATA) sapi/fpm/$(php_fpm_bin).1 $(INSTALL_ROOT)$(mandir)/man1/$(php_fpm_bin)$(program_suffix).1
++
++ @test "$(php_fpm_init)" && \
++ echo "Installing PHP FPM init script: $(INSTALL_ROOT)$(php_fpm_init_path)" && \
++ $(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_init_dir) && \
++ $(INSTALL) -m 0755 sapi/fpm/init.d.php_fpm $(INSTALL_ROOT)$(php_fpm_init_path) || :
++
++ @test -d /etc/nginx/ && \
++ echo "Installing NGINX sample config: /etc/nginx/nginx-site-conf.sample" && \
++ $(mkinstalldirs) $(INSTALL_ROOT)/etc/nginx && \
++ $(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample $(INSTALL_ROOT)/etc/nginx/nginx-site-conf.sample || :
++
++ @test -d /usr/local/etc/nginx/ && \
++ echo "Installing NGINX sample config: /usr/local/etc/nginx/nginx-site-conf.sample" && \
++ $(mkinstalldirs) $(INSTALL_ROOT)/usr/local/etc/nginx && \
++ $(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample $(INSTALL_ROOT)/usr/local/etc/nginx/nginx-site-conf.sample || :
++
++ @test -d /usr/local/nginx/conf/ && \
++ echo "Installing NGINX sample config: /usr/local/nginx/conf/nginx-site-conf.sample" && \
++ $(mkinstalldirs) $(INSTALL_ROOT)/usr/local/nginx/conf && \
++ $(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample $(INSTALL_ROOT)/usr/local/nginx/conf/nginx-site-conf.sample || :
++
++ @echo ""
++ @echo "*** FPM Installation complete. ***"
++ @echo ""
++
++ @test "$(php_fpm_init)" && \
++ echo "run:" && \
++ echo "\`update-rc.d $(php_fpm_init) defaults; invoke-rc.d $(php_fpm_init) start\`" && \
++ echo "" && \
++ echo "or system equivalent to start the $(php_fpm_init) service." && \
++ echo "" || :
++
+diff -Naur php-src-vanilla/sapi/fpm/cgi/cgi_main.c php-src/sapi/fpm/cgi/cgi_main.c
+--- php-src-vanilla/sapi/fpm/cgi/cgi_main.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/cgi/cgi_main.c 2009-10-18 21:05:39.302497288 +0100
+@@ -0,0 +1,1660 @@
+/*
-+ * Takes a file descriptor to read a request from.
-+ * The callback is executed once the whole request has been read.
-+ */
-+
-+static struct evhttp_connection*
-+evhttp_get_request_connection(
-+ int fd, struct sockaddr *sa, socklen_t salen)
-+{
-+ struct evhttp_connection *evcon;
-+ char *hostname, *portname;
-+
-+ name_from_addr(sa, salen, &hostname, &portname);
-+ event_debug(("%s: new request from %s:%s on %d\n",
-+ __func__, hostname, portname, fd));
-+
-+ /* we need a connection object to put the http request on */
-+ if ((evcon = evhttp_connection_new(hostname, atoi(portname))) == NULL)
-+ return (NULL);
-+ evcon->flags |= EVHTTP_CON_INCOMING;
-+ evcon->state = EVCON_CONNECTED;
-+
-+ evcon->fd = fd;
-+
-+ return (evcon);
-+}
-+
-+static int
-+evhttp_associate_new_request_with_connection(struct evhttp_connection *evcon)
-+{
-+ struct evhttp *http = evcon->http_server;
-+ struct evhttp_request *req;
-+ if ((req = evhttp_request_new(evhttp_handle_request, http)) == NULL)
-+ return (-1);
-+
-+ req->evcon = evcon; /* the request ends up owning the connection */
-+ req->flags |= EVHTTP_REQ_OWN_CONNECTION;
-+
-+ TAILQ_INSERT_TAIL(&evcon->requests, req, next);
-+
-+ req->kind = EVHTTP_REQUEST;
-+
-+ if ((req->remote_host = strdup(evcon->address)) == NULL)
-+ event_err(1, "%s: strdup", __func__);
-+ req->remote_port = evcon->port;
-+
-+ evhttp_start_read(evcon);
-+
-+ return (0);
-+}
-+
-+void
-+evhttp_get_request(struct evhttp *http, int fd,
-+ struct sockaddr *sa, socklen_t salen)
-+{
-+ struct evhttp_connection *evcon;
-+
-+ evcon = evhttp_get_request_connection(fd, sa, salen);
-+ if (evcon == NULL)
-+ return;
-+
-+ /* the timeout can be used by the server to close idle connections */
-+ if (http->timeout != -1)
-+ evhttp_connection_set_timeout(evcon, http->timeout);
++ +----------------------------------------------------------------------+
++ | PHP Version 5 |
++ +----------------------------------------------------------------------+
++ | Copyright (c) 1997-2008 The PHP Group |
++ +----------------------------------------------------------------------+
++ | This source file is subject to version 3.01 of the PHP license, |
++ | that is bundled with this package in the file LICENSE, and is |
++ | available through the world-wide-web at the following url: |
++ | http://www.php.net/license/3_01.txt |
++ | If you did not receive a copy of the PHP license and are unable to |
++ | obtain it through the world-wide-web, please send a note to |
++ | license@php.net so we can mail you a copy immediately. |
++ +----------------------------------------------------------------------+
++ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
++ | Stig Bakken <ssb@php.net> |
++ | Zeev Suraski <zeev@zend.com> |
++ | FastCGI: Ben Mansell <php@slimyhorror.com> |
++ | Shane Caraveo <shane@caraveo.com> |
++ | Dmitry Stogov <dmitry@zend.com> |
++ +----------------------------------------------------------------------+
++*/
+
-+ /*
-+ * if we want to accept more than one request on a connection,
-+ * we need to know which http server it belongs to.
-+ */
-+ evcon->http_server = http;
-+ TAILQ_INSERT_TAIL(&http->connections, evcon, next);
-+
-+ if (evhttp_associate_new_request_with_connection(evcon) == -1)
-+ evhttp_connection_free(evcon);
-+}
++/* $Id$ */
+
++#include <php.h>
++#include <php_globals.h>
++#include <php_variables.h>
++#include <zend_modules.h>
+
-+/*
-+ * Network helper functions that we do not want to export to the rest of
-+ * the world.
-+ */
++#include <SAPI.h>
+
-+static struct addrinfo *
-+addr_from_name(char *address)
-+{
-+#ifdef HAVE_GETADDRINFO
-+ struct addrinfo ai, *aitop;
-+ int ai_result;
-+
-+ memset(&ai, 0, sizeof (ai));
-+ ai.ai_family = AF_INET;
-+ ai.ai_socktype = SOCK_RAW;
-+ ai.ai_flags = 0;
-+ if ((ai_result = getaddrinfo(address, NULL, &ai, &aitop)) != 0) {
-+ if ( ai_result == EAI_SYSTEM )
-+ event_warn("getaddrinfo");
-+ else
-+ event_warnx("getaddrinfo: %s", gai_strerror(ai_result));
-+ }
++#include <stdio.h>
+
-+ return (aitop);
-+#else
-+ assert(0);
-+ return NULL; // XXXXX Use gethostbyname, if this function is ever used.
++#ifdef PHP_WIN32
++#include "win32/time.h"
++#include "win32/signal.h"
++#include <process.h>
+#endif
-+}
-+
-+static void
-+name_from_addr(struct sockaddr *sa, socklen_t salen,
-+ char **phost, char **pport)
-+{
-+#ifdef HAVE_GETNAMEINFO
-+ static char ntop[NI_MAXHOST];
-+ static char strport[NI_MAXSERV];
-+ int ni_result;
-+
-+ if ((ni_result = getnameinfo(sa, salen,
-+ ntop, sizeof(ntop), strport, sizeof(strport),
-+ NI_NUMERICHOST|NI_NUMERICSERV)) != 0) {
-+ if (ni_result == EAI_SYSTEM)
-+ event_err(1, "getnameinfo failed");
-+ else
-+ event_errx(1, "getnameinfo failed: %s", gai_strerror(ni_result));
-+ }
-+
-+ *phost = ntop;
-+ *pport = strport;
-+#else
-+ // XXXX
++#if HAVE_SYS_TIME_H
++#include <sys/time.h>
+#endif
-+}
-+
-+/* Either connect or bind */
-+
-+static int
-+make_socket_ai(int should_bind, struct addrinfo *ai)
-+{
-+ struct linger linger;
-+ int fd, on = 1, r;
-+ int serrno;
-+
-+ /* Create listen socket */
-+ fd = socket(AF_INET, SOCK_STREAM, 0);
-+ if (fd == -1) {
-+ event_warn("socket");
-+ return (-1);
-+ }
-+
-+ if (event_make_socket_nonblocking(fd) < 0)
-+ goto out;
-+
-+#ifndef WIN32
-+ if (fcntl(fd, F_SETFD, 1) == -1) {
-+ event_warn("fcntl(F_SETFD)");
-+ goto out;
-+ }
++#if HAVE_UNISTD_H
++#include <unistd.h>
+#endif
-+
-+ setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&on, sizeof(on));
-+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&on, sizeof(on));
-+ linger.l_onoff = 1;
-+ linger.l_linger = 5;
-+ setsockopt(fd, SOL_SOCKET, SO_LINGER, (void *)&linger, sizeof(linger));
-+
-+ if (should_bind)
-+ r = bind(fd, ai->ai_addr, ai->ai_addrlen);
-+ else
-+ r = connect(fd, ai->ai_addr, ai->ai_addrlen);
-+ if (r == -1) {
-+#ifdef WIN32
-+ int tmp_error = WSAGetLastError();
-+ if (tmp_error != WSAEWOULDBLOCK && tmp_error != WSAEINVAL &&
-+ tmp_error != WSAEINPROGRESS) {
-+ goto out;
-+ }
-+#else
-+ if (errno != EINPROGRESS) {
-+ goto out;
-+ }
++#if HAVE_SIGNAL_H
++#include <signal.h>
+#endif
-+ }
-+
-+ return (fd);
-+
-+ out:
-+ serrno = errno;
-+ close(fd);
-+ errno = serrno;
-+ return (-1);
-+}
-+
-+static int
-+make_socket(int should_bind, const char *address, u_short port)
-+{
-+ int fd;
-+ struct addrinfo ai, *aitop = NULL;
-+#ifdef HAVE_GETADDRINFO
-+ char strport[NI_MAXSERV];
-+ int ai_result;
-+
-+ memset(&ai, 0, sizeof (ai));
-+ ai.ai_family = AF_INET;
-+ ai.ai_socktype = SOCK_STREAM;
-+ ai.ai_flags = should_bind ? AI_PASSIVE : 0;
-+ snprintf(strport, sizeof (strport), "%d", port);
-+ if ((ai_result = getaddrinfo(address, strport, &ai, &aitop)) != 0) {
-+ if ( ai_result == EAI_SYSTEM )
-+ event_warn("getaddrinfo");
-+ else
-+ event_warnx("getaddrinfo: %s", gai_strerror(ai_result));
-+ return (-1);
-+ }
-+#else
-+ if (fake_getaddrinfo(address, &ai) < 0) {
-+ event_warn("fake_getaddrinfo");
-+ return (-1);
-+ }
-+ aitop = &ai;
++#if HAVE_SETLOCALE
++#include <locale.h>
+#endif
-+
-+ fd = make_socket_ai(should_bind, aitop);
-+
-+#ifdef HAVE_GETADDRINFO
-+ freeaddrinfo(aitop);
-+#else
-+ fake_freeaddrinfo(aitop);
++#if HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#if HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
++#if HAVE_FCNTL_H
++#include <fcntl.h>
++#endif
++#include <zend.h>
++#include <zend_extensions.h>
++#include <php_ini.h>
++#include <php_main.h>
++#include <fopen_wrappers.h>
++#include <ext/standard/php_standard.h>
++#ifdef PHP_WIN32
++#include <io.h>
++#include <fcntl.h>
++#include "win32/php_registry.h"
+#endif
+
-+ return (fd);
-+}
-diff -Nru php-5.2.4.vanilla/libevent/http-internal.h php-5.2.4.fpm/libevent/http-internal.h
---- php-5.2.4.vanilla/libevent/http-internal.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/http-internal.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,125 @@
-+/*
-+ * Copyright 2001 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * This header file contains definitions for dealing with HTTP requests
-+ * that are internal to libevent. As user of the library, you should not
-+ * need to know about these.
-+ */
-+
-+#ifndef _HTTP_H_
-+#define _HTTP_H_
-+
-+#define HTTP_CONNECT_TIMEOUT 45
-+#define HTTP_WRITE_TIMEOUT 50
-+#define HTTP_READ_TIMEOUT 50
-+
-+#define HTTP_PREFIX "http://"
-+#define HTTP_DEFAULTPORT 80
-+
-+enum evhttp_connection_error {
-+ EVCON_HTTP_TIMEOUT,
-+ EVCON_HTTP_EOF,
-+ EVCON_HTTP_INVALID_HEADER
-+};
-+
-+struct evbuffer;
-+struct addrinfo;
-+struct evhttp_request;
-+
-+/* A stupid connection object - maybe make this a bufferevent later */
-+
-+enum evhttp_connection_state {
-+ EVCON_DISCONNECTED, /* not currently connected not trying either */
-+ EVCON_CONNECTING, /* tries to currently connect */
-+ EVCON_CONNECTED /* connection is established */
-+};
-+
-+struct evhttp_connection {
-+ /* we use tailq only if they were created for an http server */
-+ TAILQ_ENTRY(evhttp_connection) next;
-+
-+ int fd;
-+ struct event ev;
-+ struct event close_ev;
-+ struct evbuffer *input_buffer;
-+ struct evbuffer *output_buffer;
-+
-+ char *address;
-+ u_short port;
-+
-+ int flags;
-+#define EVHTTP_CON_INCOMING 0x0001 /* only one request on it ever */
-+#define EVHTTP_CON_OUTGOING 0x0002 /* multiple requests possible */
-+#define EVHTTP_CON_CLOSEDETECT 0x0004 /* detecting if persistent close */
-+
-+ int timeout; /* timeout in seconds for events */
-+ int retry_cnt; /* retry count */
-+ int retry_max; /* maximum number of retries */
-+
-+ enum evhttp_connection_state state;
++#ifdef __riscos__
++#include <unixlib/local.h>
++int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
++#endif
+
-+ /* for server connections, the http server they are connected with */
-+ struct evhttp *http_server;
++#include "zend_compile.h"
++#include "zend_execute.h"
++#include "zend_highlight.h"
++#include "zend_indent.h"
+
-+ TAILQ_HEAD(evcon_requestq, evhttp_request) requests;
-+
-+ void (*cb)(struct evhttp_connection *, void *);
-+ void *cb_arg;
-+
-+ void (*closecb)(struct evhttp_connection *, void *);
-+ void *closecb_arg;
-+};
++#include "php_getopt.h"
+
-+struct evhttp_cb {
-+ TAILQ_ENTRY(evhttp_cb) next;
++#include "fastcgi.h"
+
-+ char *what;
++#ifdef FPM_AUTOCONFIG_H
++#include <fpm_autoconfig.h>
++#else
++#include <php_config.h>
++#endif
++#include <fpm/fpm.h>
++#include <fpm/fpm_request.h>
+
-+ void (*cb)(struct evhttp_request *req, void *);
-+ void *cbarg;
-+};
+
-+/* both the http server as well as the rpc system need to queue connections */
-+TAILQ_HEAD(evconq, evhttp_connection);
++static void (*php_php_import_environment_variables)(zval *array_ptr TSRMLS_DC);
+
-+struct evhttp {
-+ struct event bind_ev;
++static int parent = 1;
+
-+ TAILQ_HEAD(httpcbq, evhttp_cb) callbacks;
-+ struct evconq connections;
++static int request_body_fd;
+
-+ int timeout;
++static char *sapi_cgibin_getenv(char *name, size_t name_len TSRMLS_DC);
+
-+ void (*gencb)(struct evhttp_request *req, void *);
-+ void *gencbarg;
++static char *php_optarg = NULL;
++static int php_optind = 1;
++static zend_module_entry cgi_module_entry;
++
++static const opt_struct OPTIONS[] = {
++ {'a', 0, "interactive"},
++ {'b', 1, "bindpath"},
++ {'C', 0, "no-chdir"},
++ {'c', 1, "php-ini"},
++ {'d', 1, "define"},
++ {'e', 0, "profile-info"},
++ {'f', 1, "file"},
++ {'h', 0, "help"},
++ {'i', 0, "info"},
++ {'l', 0, "syntax-check"},
++ {'m', 0, "modules"},
++ {'n', 0, "no-php-ini"},
++ {'q', 0, "no-header"},
++ {'s', 0, "syntax-highlight"},
++ {'s', 0, "syntax-highlighting"},
++ {'w', 0, "strip"},
++ {'?', 0, "usage"},/* help alias (both '?' and 'usage') */
++ {'v', 0, "version"},
++ {'x', 0, "fpm"},
++ {'y', 1, "fpm-config"},
++ {'z', 1, "zend-extension"},
++ {'-', 0, NULL} /* end of args */
+};
+
-+/* resets the connection; can be reused for more requests */
-+void evhttp_connection_reset(struct evhttp_connection *);
-+
-+/* connects if necessary */
-+int evhttp_connection_connect(struct evhttp_connection *);
-+
-+/* notifies the current request that it failed; resets connection */
-+void evhttp_connection_fail(struct evhttp_connection *,
-+ enum evhttp_connection_error error);
-+
-+void evhttp_get_request(struct evhttp *, int, struct sockaddr *, socklen_t);
-+
-+int evhttp_hostportfile(char *, char **, u_short *, char **);
-+
-+int evhttp_parse_lines(struct evhttp_request *, struct evbuffer*);
-+
-+void evhttp_start_read(struct evhttp_connection *);
-+void evhttp_read_header(int, short, void *);
-+void evhttp_make_header(struct evhttp_connection *, struct evhttp_request *);
-+
-+void evhttp_write_buffer(struct evhttp_connection *,
-+ void (*)(struct evhttp_connection *, void *), void *);
-+
-+/* response sending HTML the data in the buffer */
-+void evhttp_response_code(struct evhttp_request *, int, const char *);
-+void evhttp_send_page(struct evhttp_request *, struct evbuffer *);
-+
-+#endif /* _HTTP_H */
-diff -Nru php-5.2.4.vanilla/libevent/install-sh php-5.2.4.fpm/libevent/install-sh
---- php-5.2.4.vanilla/libevent/install-sh 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/install-sh 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,238 @@
-+#! /bin/sh
-+#
-+# install - install a program, script, or datafile
-+# This comes from X11R5.
-+#
-+# Calling this script install-sh is preferred over install.sh, to prevent
-+# `make' implicit rules from creating a file called install from it
-+# when there is no Makefile.
-+#
-+# This script is compatible with the BSD install script, but was written
-+# from scratch.
-+#
-+
-+
-+# set DOITPROG to echo to test this script
-+
-+# Don't use :- since 4.3BSD and earlier shells don't like it.
-+doit="${DOITPROG-}"
-+
-+
-+# put in absolute paths if you don't have them in your path; or use env. vars.
-+
-+mvprog="${MVPROG-mv}"
-+cpprog="${CPPROG-cp}"
-+chmodprog="${CHMODPROG-chmod}"
-+chownprog="${CHOWNPROG-chown}"
-+chgrpprog="${CHGRPPROG-chgrp}"
-+stripprog="${STRIPPROG-strip}"
-+rmprog="${RMPROG-rm}"
-+mkdirprog="${MKDIRPROG-mkdir}"
-+
-+tranformbasename=""
-+transform_arg=""
-+instcmd="$mvprog"
-+chmodcmd="$chmodprog 0755"
-+chowncmd=""
-+chgrpcmd=""
-+stripcmd=""
-+rmcmd="$rmprog -f"
-+mvcmd="$mvprog"
-+src=""
-+dst=""
-+dir_arg=""
-+
-+while [ x"$1" != x ]; do
-+ case $1 in
-+ -c) instcmd="$cpprog"
-+ shift
-+ continue;;
-+
-+ -d) dir_arg=true
-+ shift
-+ continue;;
-+
-+ -m) chmodcmd="$chmodprog $2"
-+ shift
-+ shift
-+ continue;;
-+
-+ -o) chowncmd="$chownprog $2"
-+ shift
-+ shift
-+ continue;;
-+
-+ -g) chgrpcmd="$chgrpprog $2"
-+ shift
-+ shift
-+ continue;;
-+
-+ -s) stripcmd="$stripprog"
-+ shift
-+ continue;;
-+
-+ -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-+ shift
-+ continue;;
-+
-+ -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-+ shift
-+ continue;;
-+
-+ *) if [ x"$src" = x ]
-+ then
-+ src=$1
-+ else
-+ # this colon is to work around a 386BSD /bin/sh bug
-+ :
-+ dst=$1
-+ fi
-+ shift
-+ continue;;
-+ esac
-+done
-+
-+if [ x"$src" = x ]
-+then
-+ echo "install: no input file specified"
-+ exit 1
-+else
-+ true
-+fi
-+
-+if [ x"$dir_arg" != x ]; then
-+ dst=$src
-+ src=""
-+
-+ if [ -d $dst ]; then
-+ instcmd=:
-+ else
-+ instcmd=mkdir
-+ fi
-+else
-+
-+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-+# might cause directories to be created, which would be especially bad
-+# if $src (and thus $dsttmp) contains '*'.
-+
-+ if [ -f $src -o -d $src ]
-+ then
-+ true
-+ else
-+ echo "install: $src does not exist"
-+ exit 1
-+ fi
-+
-+ if [ x"$dst" = x ]
-+ then
-+ echo "install: no destination specified"
-+ exit 1
-+ else
-+ true
-+ fi
-+
-+# If destination is a directory, append the input filename; if your system
-+# does not like double slashes in filenames, you may need to add some logic
-+
-+ if [ -d $dst ]
-+ then
-+ dst="$dst"/`basename $src`
-+ else
-+ true
-+ fi
-+fi
-+
-+## this sed command emulates the dirname command
-+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+
-+# Make sure that the destination directory exists.
-+# this part is taken from Noah Friedman's mkinstalldirs script
-+
-+# Skip lots of stat calls in the usual case.
-+if [ ! -d "$dstdir" ]; then
-+defaultIFS='
-+'
-+IFS="${IFS-${defaultIFS}}"
-+
-+oIFS="${IFS}"
-+# Some sh's can't handle IFS=/ for some reason.
-+IFS='%'
-+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-+IFS="${oIFS}"
-+
-+pathcomp=''
-+
-+while [ $# -ne 0 ] ; do
-+ pathcomp="${pathcomp}${1}"
-+ shift
-+
-+ if [ ! -d "${pathcomp}" ] ;
-+ then
-+ $mkdirprog "${pathcomp}"
-+ else
-+ true
-+ fi
-+
-+ pathcomp="${pathcomp}/"
-+done
-+fi
-+
-+if [ x"$dir_arg" != x ]
-+then
-+ $doit $instcmd $dst &&
-+
-+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-+else
-+
-+# If we're going to rename the final executable, determine the name now.
-+
-+ if [ x"$transformarg" = x ]
-+ then
-+ dstfile=`basename $dst`
-+ else
-+ dstfile=`basename $dst $transformbasename |
-+ sed $transformarg`$transformbasename
-+ fi
-+
-+# don't allow the sed command to completely eliminate the filename
-+
-+ if [ x"$dstfile" = x ]
-+ then
-+ dstfile=`basename $dst`
-+ else
-+ true
-+ fi
-+
-+# Make a temp file name in the proper directory.
-+
-+ dsttmp=$dstdir/#inst.$$#
-+
-+# Move or copy the file name to the temp name
-+
-+ $doit $instcmd $src $dsttmp &&
-+
-+ trap "rm -f ${dsttmp}" 0 &&
-+
-+# and set any options; do chmod last to preserve setuid bits
-+
-+# If any of these fail, we abort the whole thing. If we want to
-+# ignore errors from any of these, just make sure not to ignore
-+# errors from the above "$doit $instcmd $src $dsttmp" command.
-+
-+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-+
-+# Now rename the file to the real destination.
-+
-+ $doit $rmcmd -f $dstdir/$dstfile &&
-+ $doit $mvcmd $dsttmp $dstdir/$dstfile
-+
-+fi &&
-+
-+
-+exit 0
-diff -Nru php-5.2.4.vanilla/libevent/kqueue.c php-5.2.4.fpm/libevent/kqueue.c
---- php-5.2.4.vanilla/libevent/kqueue.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/kqueue.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,419 @@
-+/* $OpenBSD: kqueue.c,v 1.5 2002/07/10 14:41:31 art Exp $ */
-+
-+/*
-+ * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <sys/types.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <sys/_time.h>
++typedef struct _php_cgi_globals_struct {
++ zend_bool rfc2616_headers;
++ zend_bool nph;
++ zend_bool check_shebang_line;
++#if ENABLE_PATHINFO_CHECK
++ zend_bool fix_pathinfo;
+#endif
-+#include <sys/queue.h>
-+#include <sys/event.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
++ zend_bool fcgi_logging;
++# ifdef PHP_WIN32
++ zend_bool impersonate;
++# endif
++ char *error_header;
++} php_cgi_globals_struct;
++
++#ifdef ZTS
++static int php_cgi_globals_id;
++#define CGIG(v) TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v)
++#else
++static php_cgi_globals_struct php_cgi_globals;
++#define CGIG(v) (php_cgi_globals.v)
+#endif
+
-+#if defined(HAVE_INTTYPES_H) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
-+#define INTPTR(x) (intptr_t)x
++#ifdef PHP_WIN32
++#define TRANSLATE_SLASHES(path) \
++ { \
++ char *tmp = path; \
++ while (*tmp) { \
++ if (*tmp == '\\') *tmp = '/'; \
++ tmp++; \
++ } \
++ }
+#else
-+#define INTPTR(x) x
++#define TRANSLATE_SLASHES(path)
+#endif
+
-+#include "event.h"
-+#include "log.h"
++static int print_module_info(zend_module_entry *module, void *arg TSRMLS_DC)
++{
++ php_printf("%s\n", module->name);
++ return 0;
++}
+
-+#define EVLIST_X_KQINKERNEL 0x1000
++static int module_name_cmp(const void *a, const void *b TSRMLS_DC)
++{
++ Bucket *f = *((Bucket **) a);
++ Bucket *s = *((Bucket **) b);
+
-+#define NEVENT 64
++ return strcasecmp(((zend_module_entry *)f->pData)->name,
++ ((zend_module_entry *)s->pData)->name);
++}
+
-+struct kqop {
-+ struct kevent *changes;
-+ int nchanges;
-+ struct kevent *events;
-+ int nevents;
-+ int kq;
-+ pid_t pid;
-+};
++static void print_modules(TSRMLS_D)
++{
++ HashTable sorted_registry;
++ zend_module_entry tmp;
+
-+void *kq_init (struct event_base *);
-+int kq_add (void *, struct event *);
-+int kq_del (void *, struct event *);
-+int kq_recalc (struct event_base *, void *, int);
-+int kq_dispatch (struct event_base *, void *, struct timeval *);
-+int kq_insert (struct kqop *, struct kevent *);
-+void kq_dealloc (struct event_base *, void *);
-+
-+const struct eventop kqops = {
-+ "kqueue",
-+ kq_init,
-+ kq_add,
-+ kq_del,
-+ kq_recalc,
-+ kq_dispatch,
-+ kq_dealloc
-+};
++ zend_hash_init(&sorted_registry, 50, NULL, NULL, 1);
++ zend_hash_copy(&sorted_registry, &module_registry, NULL, &tmp, sizeof(zend_module_entry));
++ zend_hash_sort(&sorted_registry, zend_qsort, module_name_cmp, 0 TSRMLS_CC);
++ zend_hash_apply_with_argument(&sorted_registry, (apply_func_arg_t) print_module_info, NULL TSRMLS_CC);
++ zend_hash_destroy(&sorted_registry);
++}
+
-+void *
-+kq_init(struct event_base *base)
++static int print_extension_info(zend_extension *ext, void *arg TSRMLS_DC)
+{
-+ int kq;
-+ struct kqop *kqueueop;
++ php_printf("%s\n", ext->name);
++ return 0;
++}
+
-+ /* Disable kqueue when this environment variable is set */
-+ if (getenv("EVENT_NOKQUEUE"))
-+ return (NULL);
++static int extension_name_cmp(const zend_llist_element **f,
++ const zend_llist_element **s TSRMLS_DC)
++{
++ return strcmp(((zend_extension *)(*f)->data)->name,
++ ((zend_extension *)(*s)->data)->name);
++}
+
-+ if (!(kqueueop = calloc(1, sizeof(struct kqop))))
-+ return (NULL);
++static void print_extensions(TSRMLS_D)
++{
++ zend_llist sorted_exts;
+
-+ /* Initalize the kernel queue */
-+
-+ if ((kq = kqueue()) == -1) {
-+ event_warn("kqueue");
-+ free (kqueueop);
-+ return (NULL);
-+ }
++ zend_llist_copy(&sorted_exts, &zend_extensions);
++ sorted_exts.dtor = NULL;
++ zend_llist_sort(&sorted_exts, extension_name_cmp TSRMLS_CC);
++ zend_llist_apply_with_argument(&sorted_exts, (llist_apply_with_arg_func_t) print_extension_info, NULL TSRMLS_CC);
++ zend_llist_destroy(&sorted_exts);
++}
+
-+ kqueueop->kq = kq;
++#ifndef STDOUT_FILENO
++#define STDOUT_FILENO 1
++#endif
+
-+ kqueueop->pid = getpid();
++static inline size_t sapi_cgibin_single_write(const char *str, uint str_length TSRMLS_DC)
++{
++ long ret;
+
-+ /* Initalize fields */
-+ kqueueop->changes = malloc(NEVENT * sizeof(struct kevent));
-+ if (kqueueop->changes == NULL) {
-+ free (kqueueop);
-+ return (NULL);
-+ }
-+ kqueueop->events = malloc(NEVENT * sizeof(struct kevent));
-+ if (kqueueop->events == NULL) {
-+ free (kqueueop->changes);
-+ free (kqueueop);
-+ return (NULL);
-+ }
-+ kqueueop->nevents = NEVENT;
-+
-+ /* Check for Mac OS X kqueue bug. */
-+ kqueueop->changes[0].ident = -1;
-+ kqueueop->changes[0].filter = EVFILT_READ;
-+ kqueueop->changes[0].flags = EV_ADD;
-+ /*
-+ * If kqueue works, then kevent will succeed, and it will
-+ * stick an error in events[0]. If kqueue is broken, then
-+ * kevent will fail.
-+ */
-+ if (kevent(kq,
-+ kqueueop->changes, 1, kqueueop->events, NEVENT, NULL) != 1 ||
-+ kqueueop->events[0].ident != -1 ||
-+ kqueueop->events[0].flags != EV_ERROR) {
-+ event_warn("%s: detected broken kqueue; not using.", __func__);
-+ free(kqueueop->changes);
-+ free(kqueueop->events);
-+ free(kqueueop);
-+ close(kq);
-+ return (NULL);
++ if (fcgi_is_fastcgi()) {
++ fcgi_request *request = (fcgi_request*) SG(server_context);
++ long ret = fcgi_write(request, FCGI_STDOUT, str, str_length);
++ if (ret <= 0) {
++ return 0;
++ }
++ return ret;
+ }
-+
-+ return (kqueueop);
++ ret = write(STDOUT_FILENO, str, str_length);
++ if (ret <= 0) return 0;
++ return ret;
+}
+
-+int
-+kq_recalc(struct event_base *base, void *arg, int max)
++static int sapi_cgibin_ub_write(const char *str, uint str_length TSRMLS_DC)
+{
-+ return (0);
-+}
++ const char *ptr = str;
++ uint remaining = str_length;
++ size_t ret;
+
-+int
-+kq_insert(struct kqop *kqop, struct kevent *kev)
-+{
-+ int nevents = kqop->nevents;
++ while (remaining > 0) {
++ ret = sapi_cgibin_single_write(ptr, remaining TSRMLS_CC);
++ if (!ret) {
++ php_handle_aborted_connection();
++ return str_length - remaining;
++ }
++ ptr += ret;
++ remaining -= ret;
++ }
+
-+ if (kqop->nchanges == nevents) {
-+ struct kevent *newchange;
-+ struct kevent *newresult;
++ return str_length;
++}
+
-+ nevents *= 2;
+
-+ newchange = realloc(kqop->changes,
-+ nevents * sizeof(struct kevent));
-+ if (newchange == NULL) {
-+ event_warn("%s: malloc", __func__);
-+ return (-1);
-+ }
-+ kqop->changes = newchange;
-+
-+ newresult = realloc(kqop->events,
-+ nevents * sizeof(struct kevent));
-+
-+ /*
-+ * If we fail, we don't have to worry about freeing,
-+ * the next realloc will pick it up.
-+ */
-+ if (newresult == NULL) {
-+ event_warn("%s: malloc", __func__);
-+ return (-1);
++static void sapi_cgibin_flush(void *server_context)
++{
++ if (fcgi_is_fastcgi()) {
++ fcgi_request *request = (fcgi_request*) server_context;
++ if (
++#ifndef PHP_WIN32
++ !parent &&
++#endif
++ request && !fcgi_flush(request, 0)) {
++ php_handle_aborted_connection();
+ }
-+ kqop->events = newresult;
-+
-+ kqop->nevents = nevents;
++ return;
+ }
++ if (fflush(stdout) == EOF) {
++ php_handle_aborted_connection();
++ }
++}
++
++#define SAPI_CGI_MAX_HEADER_LENGTH 1024
++
++typedef struct _http_error {
++ int code;
++ const char* msg;
++} http_error;
++
++static const http_error http_error_codes[] = {
++ {100, "Continue"},
++ {101, "Switching Protocols"},
++ {200, "OK"},
++ {201, "Created"},
++ {202, "Accepted"},
++ {203, "Non-Authoritative Information"},
++ {204, "No Content"},
++ {205, "Reset Content"},
++ {206, "Partial Content"},
++ {300, "Multiple Choices"},
++ {301, "Moved Permanently"},
++ {302, "Moved Temporarily"},
++ {303, "See Other"},
++ {304, "Not Modified"},
++ {305, "Use Proxy"},
++ {400, "Bad Request"},
++ {401, "Unauthorized"},
++ {402, "Payment Required"},
++ {403, "Forbidden"},
++ {404, "Not Found"},
++ {405, "Method Not Allowed"},
++ {406, "Not Acceptable"},
++ {407, "Proxy Authentication Required"},
++ {408, "Request Time-out"},
++ {409, "Conflict"},
++ {410, "Gone"},
++ {411, "Length Required"},
++ {412, "Precondition Failed"},
++ {413, "Request Entity Too Large"},
++ {414, "Request-URI Too Large"},
++ {415, "Unsupported Media Type"},
++ {500, "Internal Server Error"},
++ {501, "Not Implemented"},
++ {502, "Bad Gateway"},
++ {503, "Service Unavailable"},
++ {504, "Gateway Time-out"},
++ {505, "HTTP Version not supported"},
++ {0, NULL}
++};
+
-+ memcpy(&kqop->changes[kqop->nchanges++], kev, sizeof(struct kevent));
++static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
++{
++ char buf[SAPI_CGI_MAX_HEADER_LENGTH];
++ sapi_header_struct *h;
++ zend_llist_position pos;
++ zend_bool ignore_status = 0;
++ int response_status = SG(sapi_headers).http_response_code;
+
-+ event_debug(("%s: fd %d %s%s",
-+ __func__, kev->ident,
-+ kev->filter == EVFILT_READ ? "EVFILT_READ" : "EVFILT_WRITE",
-+ kev->flags == EV_DELETE ? " (del)" : ""));
++ if (SG(request_info).no_headers == 1) {
++ return SAPI_HEADER_SENT_SUCCESSFULLY;
++ }
+
-+ return (0);
-+}
++ if (CGIG(nph) || SG(sapi_headers).http_response_code != 200)
++ {
++ int len;
++ zend_bool has_status = 0;
+
-+static void
-+kq_sighandler(int sig)
-+{
-+ /* Do nothing here */
-+}
++ if (CGIG(rfc2616_headers) && SG(sapi_headers).http_status_line) {
++ char *s;
++ len = slprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH, "%s\r\n", SG(sapi_headers).http_status_line);
++ if ((s = strchr(SG(sapi_headers).http_status_line, ' '))) {
++ response_status = atoi((s + 1));
++ }
+
-+int
-+kq_dispatch(struct event_base *base, void *arg, struct timeval *tv)
-+{
-+ struct kqop *kqop = arg;
-+ struct kevent *changes = kqop->changes;
-+ struct kevent *events = kqop->events;
-+ struct event *ev;
-+ struct timespec ts;
-+ int i, res;
++ if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
++ len = SAPI_CGI_MAX_HEADER_LENGTH;
++ }
+
-+ TIMEVAL_TO_TIMESPEC(tv, &ts);
++ } else {
++ char *s;
++
++ if (SG(sapi_headers).http_status_line &&
++ (s = strchr(SG(sapi_headers).http_status_line, ' ')) != 0 &&
++ (s - SG(sapi_headers).http_status_line) >= 5 &&
++ strncasecmp(SG(sapi_headers).http_status_line, "HTTP/", 5) == 0) {
++ len = slprintf(buf, sizeof(buf), "Status:%s\r\n", s);
++ response_status = atoi((s + 1));
++ } else {
++ h = (sapi_header_struct*)zend_llist_get_first_ex(&sapi_headers->headers, &pos);
++ while (h) {
++ if (h->header_len > sizeof("Status:")-1 &&
++ strncasecmp(h->header, "Status:", sizeof("Status:")-1) == 0) {
++ has_status = 1;
++ break;
++ }
++ h = (sapi_header_struct*)zend_llist_get_next_ex(&sapi_headers->headers, &pos);
++ }
++ if (!has_status) {
++ http_error *err = (http_error*)http_error_codes;
+
-+ res = kevent(kqop->kq, changes, kqop->nchanges,
-+ events, kqop->nevents, &ts);
-+ kqop->nchanges = 0;
-+ if (res == -1) {
-+ if (errno != EINTR) {
-+ event_warn("kevent");
-+ return (-1);
++ while (err->code != 0) {
++ if (err->code == SG(sapi_headers).http_response_code) {
++ break;
++ }
++ err++;
++ }
++ if (err->msg) {
++ len = slprintf(buf, sizeof(buf), "Status: %d %s\r\n", SG(sapi_headers).http_response_code, err->msg);
++ } else {
++ len = slprintf(buf, sizeof(buf), "Status: %d\r\n", SG(sapi_headers).http_response_code);
++ }
++ }
++ }
++ }
++ if (!has_status) {
++ PHPWRITE_H(buf, len);
++ ignore_status = 1;
+ }
-+
-+ return (0);
+ }
+
-+ event_debug(("%s: kevent reports %d", __func__, res));
-+
-+ for (i = 0; i < res; i++) {
-+ int which = 0;
-+
-+ if (events[i].flags & EV_ERROR) {
-+ /*
-+ * Error messages that can happen, when a delete fails.
-+ * EBADF happens when the file discriptor has been
-+ * closed,
-+ * ENOENT when the file discriptor was closed and
-+ * then reopened.
-+ * EINVAL for some reasons not understood; EINVAL
-+ * should not be returned ever; but FreeBSD does :-\
-+ * An error is also indicated when a callback deletes
-+ * an event we are still processing. In that case
-+ * the data field is set to ENOENT.
-+ */
-+ if (events[i].data == EBADF ||
-+ events[i].data == EINVAL ||
-+ events[i].data == ENOENT)
++ h = (sapi_header_struct*)zend_llist_get_first_ex(&sapi_headers->headers, &pos);
++ while (h) {
++ /* prevent CRLFCRLF */
++ if (h->header_len) {
++ if (h->header_len > sizeof("Status:")-1 &&
++ strncasecmp(h->header, "Status:", sizeof("Status:")-1) == 0) {
++ if (!ignore_status) {
++ ignore_status = 1;
++ PHPWRITE_H(h->header, h->header_len);
++ PHPWRITE_H("\r\n", 2);
++ }
++ } else if (response_status == 304 && h->header_len > sizeof("Content-Type:")-1 &&
++ strncasecmp(h->header, "Content-Type:", sizeof("Content-Type:")-1) == 0) {
++ h = (sapi_header_struct*)zend_llist_get_next_ex(&sapi_headers->headers, &pos);
+ continue;
-+ errno = events[i].data;
-+ return (-1);
++ } else {
++ PHPWRITE_H(h->header, h->header_len);
++ PHPWRITE_H("\r\n", 2);
++ }
+ }
++ h = (sapi_header_struct*)zend_llist_get_next_ex(&sapi_headers->headers, &pos);
++ }
++ PHPWRITE_H("\r\n", 2);
+
-+ ev = (struct event *)events[i].udata;
++ return SAPI_HEADER_SENT_SUCCESSFULLY;
++}
+
-+ if (events[i].filter == EVFILT_READ) {
-+ which |= EV_READ;
-+ } else if (events[i].filter == EVFILT_WRITE) {
-+ which |= EV_WRITE;
-+ } else if (events[i].filter == EVFILT_SIGNAL) {
-+ which |= EV_SIGNAL;
-+ }
+
-+ if (!which)
-+ continue;
++static int sapi_cgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
++{
++ int read_bytes=0, tmp_read_bytes;
+
-+ if (!(ev->ev_events & EV_PERSIST))
-+ event_del(ev);
++ count_bytes = MIN(count_bytes, (uint) SG(request_info).content_length - SG(read_post_bytes));
++ while (read_bytes < count_bytes) {
++ if (fcgi_is_fastcgi()) {
++ fcgi_request *request = (fcgi_request*) SG(server_context);
+
-+ event_active(ev, which,
-+ ev->ev_events & EV_SIGNAL ? events[i].data : 1);
-+ }
++ if (request_body_fd == -1) {
++ char *request_body_filename = sapi_cgibin_getenv((char *) "REQUEST_BODY_FILE",
++ sizeof("REQUEST_BODY_FILE")-1 TSRMLS_CC);
+
-+ return (0);
-+}
++ if (request_body_filename && *request_body_filename) {
++ request_body_fd = open(request_body_filename, O_RDONLY);
+
++ if (0 > request_body_fd) {
++ php_error(E_WARNING, "REQUEST_BODY_FILE: open('%s') failed: %s (%d)",
++ request_body_filename, strerror(errno), errno);
++ return 0;
++ }
++ }
++ }
+
-+int
-+kq_add(void *arg, struct event *ev)
-+{
-+ struct kqop *kqop = arg;
-+ struct kevent kev;
-+
-+ if (ev->ev_events & EV_SIGNAL) {
-+ int nsignal = EVENT_SIGNAL(ev);
-+
-+ memset(&kev, 0, sizeof(kev));
-+ kev.ident = nsignal;
-+ kev.filter = EVFILT_SIGNAL;
-+ kev.flags = EV_ADD;
-+ if (!(ev->ev_events & EV_PERSIST))
-+ kev.flags |= EV_ONESHOT;
-+ kev.udata = INTPTR(ev);
-+
-+ if (kq_insert(kqop, &kev) == -1)
-+ return (-1);
++ /* If REQUEST_BODY_FILE variable not available - read post body from fastcgi stream */
++ if (request_body_fd < 0) {
++ tmp_read_bytes = fcgi_read(request, buffer + read_bytes, count_bytes - read_bytes);
++ } else {
++ tmp_read_bytes = read(request_body_fd, buffer + read_bytes, count_bytes - read_bytes);
++ }
++ } else {
++ tmp_read_bytes = read(0, buffer + read_bytes, count_bytes - read_bytes);
++ }
+
-+ if (signal(nsignal, kq_sighandler) == SIG_ERR)
-+ return (-1);
++ if (tmp_read_bytes <= 0) {
++ break;
++ }
++ read_bytes += tmp_read_bytes;
++ }
++ return read_bytes;
++}
+
-+ ev->ev_flags |= EVLIST_X_KQINKERNEL;
-+ return (0);
++static char *sapi_cgibin_getenv(char *name, size_t name_len TSRMLS_DC)
++{
++ /* when php is started by mod_fastcgi, no regular environment
++ is provided to PHP. It is always sent to PHP at the start
++ of a request. So we have to do our own lookup to get env
++ vars. This could probably be faster somehow. */
++ if (fcgi_is_fastcgi()) {
++ fcgi_request *request = (fcgi_request*) SG(server_context);
++ return fcgi_getenv(request, name, name_len);
+ }
++ /* if cgi, or fastcgi and not found in fcgi env
++ check the regular environment */
++ return getenv(name);
++}
+
-+ if (ev->ev_events & EV_READ) {
-+ memset(&kev, 0, sizeof(kev));
-+ kev.ident = ev->ev_fd;
-+ kev.filter = EVFILT_READ;
-+#ifdef NOTE_EOF
-+ /* Make it behave like select() and poll() */
-+ kev.fflags = NOTE_EOF;
++static char *_sapi_cgibin_putenv(char *name, char *value TSRMLS_DC)
++{
++ int name_len;
++#if !HAVE_SETENV || !HAVE_UNSETENV
++ int len;
++ char *buf;
+#endif
-+ kev.flags = EV_ADD;
-+ if (!(ev->ev_events & EV_PERSIST))
-+ kev.flags |= EV_ONESHOT;
-+ kev.udata = INTPTR(ev);
-+
-+ if (kq_insert(kqop, &kev) == -1)
-+ return (-1);
+
-+ ev->ev_flags |= EVLIST_X_KQINKERNEL;
++ if (!name) {
++ return NULL;
+ }
++ name_len = strlen(name);
+
-+ if (ev->ev_events & EV_WRITE) {
-+ memset(&kev, 0, sizeof(kev));
-+ kev.ident = ev->ev_fd;
-+ kev.filter = EVFILT_WRITE;
-+ kev.flags = EV_ADD;
-+ if (!(ev->ev_events & EV_PERSIST))
-+ kev.flags |= EV_ONESHOT;
-+ kev.udata = INTPTR(ev);
-+
-+ if (kq_insert(kqop, &kev) == -1)
-+ return (-1);
++ /* when php is started by mod_fastcgi, no regular environment
++ is provided to PHP. It is always sent to PHP at the start
++ of a request. So we have to do our own lookup to get env
++ vars. This could probably be faster somehow. */
++ if (fcgi_is_fastcgi()) {
++ fcgi_request *request = (fcgi_request*) SG(server_context);
++ return fcgi_putenv(request, name, name_len, value);
++ }
++#if HAVE_SETENV
++ if (value) {
++ setenv(name, value, 1);
++ }
++#endif
++#if HAVE_UNSETENV
++ if (!value) {
++ unsetenv(name);
++ }
++#endif
+
-+ ev->ev_flags |= EVLIST_X_KQINKERNEL;
++#if !HAVE_SETENV || !HAVE_UNSETENV
++ /* if cgi, or fastcgi and not found in fcgi env
++ check the regular environment
++ this leaks, but it's only cgi anyway, we'll fix
++ it for 5.0
++ */
++ len = name_len + (value ? strlen(value) : 0) + sizeof("=") + 2;
++ buf = (char *) malloc(len);
++ if (buf == NULL) {
++ return getenv(name);
++ }
++#endif
++#if !HAVE_SETENV
++ if (value) {
++ len = slprintf(buf, len - 1, "%s=%s", name, value);
++ putenv(buf);
++ }
++#endif
++#if !HAVE_UNSETENV
++ if (!value) {
++ len = slprintf(buf, len - 1, "%s=", name);
++ putenv(buf);
+ }
++#endif
++ return getenv(name);
++}
+
-+ return (0);
++static char *sapi_cgi_read_cookies(TSRMLS_D)
++{
++ return sapi_cgibin_getenv((char *) "HTTP_COOKIE", sizeof("HTTP_COOKIE")-1 TSRMLS_CC);
+}
+
-+int
-+kq_del(void *arg, struct event *ev)
++void cgi_php_import_environment_variables(zval *array_ptr TSRMLS_DC)
+{
-+ struct kqop *kqop = arg;
-+ struct kevent kev;
++ if (PG(http_globals)[TRACK_VARS_ENV] &&
++ array_ptr != PG(http_globals)[TRACK_VARS_ENV] &&
++ Z_TYPE_P(PG(http_globals)[TRACK_VARS_ENV]) == IS_ARRAY &&
++ zend_hash_num_elements(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_ENV])) > 0) {
++ zval_dtor(array_ptr);
++ *array_ptr = *PG(http_globals)[TRACK_VARS_ENV];
++ INIT_PZVAL(array_ptr);
++ zval_copy_ctor(array_ptr);
++ return;
++ } else if (PG(http_globals)[TRACK_VARS_SERVER] &&
++ array_ptr != PG(http_globals)[TRACK_VARS_SERVER] &&
++ Z_TYPE_P(PG(http_globals)[TRACK_VARS_SERVER]) == IS_ARRAY &&
++ zend_hash_num_elements(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER])) > 0) {
++ zval_dtor(array_ptr);
++ *array_ptr = *PG(http_globals)[TRACK_VARS_SERVER];
++ INIT_PZVAL(array_ptr);
++ zval_copy_ctor(array_ptr);
++ return;
++ }
++
++ /* call php's original import as a catch-all */
++ php_php_import_environment_variables(array_ptr TSRMLS_CC);
++
++ if (fcgi_is_fastcgi()) {
++ fcgi_request *request = (fcgi_request*) SG(server_context);
++ HashPosition pos;
++ int magic_quotes_gpc = PG(magic_quotes_gpc);
++ char *var, **val;
++ uint var_len;
++ ulong idx;
++ int filter_arg = (array_ptr == PG(http_globals)[TRACK_VARS_ENV])?PARSE_ENV:PARSE_SERVER;
++
++ /* turn off magic_quotes while importing environment variables */
++ PG(magic_quotes_gpc) = 0;
++ for (zend_hash_internal_pointer_reset_ex(&request->env, &pos);
++ zend_hash_get_current_key_ex(&request->env, &var, &var_len, &idx, 0, &pos) == HASH_KEY_IS_STRING &&
++ zend_hash_get_current_data_ex(&request->env, (void **) &val, &pos) == SUCCESS;
++ zend_hash_move_forward_ex(&request->env, &pos)) {
++ unsigned int new_val_len;
++ if (sapi_module.input_filter(filter_arg, var, val, strlen(*val), &new_val_len TSRMLS_CC)) {
++ php_register_variable_safe(var, *val, new_val_len, array_ptr TSRMLS_CC);
++ }
++ }
++ PG(magic_quotes_gpc) = magic_quotes_gpc;
++ }
++}
+
-+ if (!(ev->ev_flags & EVLIST_X_KQINKERNEL))
-+ return (0);
++static void sapi_cgi_register_variables(zval *track_vars_array TSRMLS_DC)
++{
++ unsigned int php_self_len;
++ char *php_self;
+
-+ if (ev->ev_events & EV_SIGNAL) {
-+ int nsignal = EVENT_SIGNAL(ev);
++ /* In CGI mode, we consider the environment to be a part of the server
++ * variables
++ */
++ php_import_environment_variables(track_vars_array TSRMLS_CC);
+
-+ memset(&kev, 0, sizeof(kev));
-+ kev.ident = nsignal;
-+ kev.filter = EVFILT_SIGNAL;
-+ kev.flags = EV_DELETE;
-+
-+ if (kq_insert(kqop, &kev) == -1)
-+ return (-1);
++#if ENABLE_PATHINFO_CHECK
++ if (CGIG(fix_pathinfo)) {
++ char *script_name = SG(request_info).request_uri;
++ unsigned int script_name_len = script_name ? strlen(script_name) : 0;
++ char *path_info = sapi_cgibin_getenv("PATH_INFO", sizeof("PATH_INFO")-1 TSRMLS_CC);
++ unsigned int path_info_len = path_info ? strlen(path_info) : 0;
+
-+ if (signal(nsignal, SIG_DFL) == SIG_ERR)
-+ return (-1);
++ php_self_len = script_name_len + path_info_len;
++ php_self = emalloc(php_self_len + 1);
++ if (script_name) {
++ memcpy(php_self, script_name, script_name_len + 1);
++ }
++ if (path_info) {
++ memcpy(php_self + script_name_len, path_info, path_info_len + 1);
++ }
+
-+ ev->ev_flags &= ~EVLIST_X_KQINKERNEL;
-+ return (0);
++ /* Build the special-case PHP_SELF variable for the CGI version */
++ if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &php_self, php_self_len, &php_self_len TSRMLS_CC)) {
++ php_register_variable_safe("PHP_SELF", php_self, php_self_len, track_vars_array TSRMLS_CC);
++ }
++ efree(php_self);
++ return;
+ }
++#endif
+
-+ if (ev->ev_events & EV_READ) {
-+ memset(&kev, 0, sizeof(kev));
-+ kev.ident = ev->ev_fd;
-+ kev.filter = EVFILT_READ;
-+ kev.flags = EV_DELETE;
-+
-+ if (kq_insert(kqop, &kev) == -1)
-+ return (-1);
-+
-+ ev->ev_flags &= ~EVLIST_X_KQINKERNEL;
++ php_self = SG(request_info).request_uri ? SG(request_info).request_uri : "";
++ php_self_len = strlen(php_self);
++ if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &php_self, php_self_len, &php_self_len TSRMLS_CC)) {
++ php_register_variable_safe("PHP_SELF", php_self, php_self_len, track_vars_array TSRMLS_CC);
+ }
++}
++
++static void sapi_cgi_log_message(char *message)
++{
++ TSRMLS_FETCH();
+
-+ if (ev->ev_events & EV_WRITE) {
-+ memset(&kev, 0, sizeof(kev));
-+ kev.ident = ev->ev_fd;
-+ kev.filter = EVFILT_WRITE;
-+ kev.flags = EV_DELETE;
++ if (fcgi_is_fastcgi() && CGIG(fcgi_logging)) {
++ fcgi_request *request;
+
-+ if (kq_insert(kqop, &kev) == -1)
-+ return (-1);
++ request = (fcgi_request*) SG(server_context);
++ if (request) {
++ int len = strlen(message);
++ char *buf = malloc(len+2);
++
++ memcpy(buf, message, len);
++ memcpy(buf + len, "\n", sizeof("\n"));
++ fcgi_write(request, FCGI_STDERR, buf, len+1);
++ free(buf);
++ } else {
++ fprintf(stderr, "%s\n", message);
++ }
++ /* ignore return code */
++ } else
++ fprintf(stderr, "%s\n", message);
++}
+
-+ ev->ev_flags &= ~EVLIST_X_KQINKERNEL;
++static int sapi_cgi_deactivate(TSRMLS_D)
++{
++ /* flush only when SAPI was started. The reasons are:
++ 1. SAPI Deactivate is called from two places: module init and request shutdown
++ 2. When the first call occurs and the request is not set up, flush fails on
++ FastCGI.
++ */
++ if (SG(sapi_started)) {
++ sapi_cgibin_flush(SG(server_context));
+ }
-+
-+ return (0);
++ return SUCCESS;
+}
+
-+void
-+kq_dealloc(struct event_base *base, void *arg)
++static int php_cgi_startup(sapi_module_struct *sapi_module)
+{
-+ struct kqop *kqop = arg;
-+
-+ if (kqop->changes)
-+ free(kqop->changes);
-+ if (kqop->events)
-+ free(kqop->events);
-+
-+ /* kqueue fd does not get inherited on fork() so we must not close() it in child processes
-+ yes, this is a bad hack, but it works */
-+ if (kqop->kq >= 0 && kqop->pid == getpid())
-+ close(kqop->kq);
-+ memset(kqop, 0, sizeof(struct kqop));
-+ free(kqop);
++ if (php_module_startup(sapi_module, &cgi_module_entry, 1) == FAILURE) {
++ return FAILURE;
++ }
++ return SUCCESS;
+}
-diff -Nru php-5.2.4.vanilla/libevent/log.c php-5.2.4.fpm/libevent/log.c
---- php-5.2.4.vanilla/libevent/log.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/log.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,219 @@
-+/* $OpenBSD: err.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */
+
-+/*
-+ * log.c
-+ *
-+ * Based on err.c, which was adapted from OpenBSD libc *err* *warn* code.
-+ *
-+ * Copyright (c) 2005 Nick Mathewson <nickm@freehaven.net>
-+ *
-+ * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
-+ *
-+ * Copyright (c) 1993
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
++
++/* {{{ sapi_module_struct cgi_sapi_module
+ */
++static sapi_module_struct cgi_sapi_module = {
++ "cgi-fcgi", /* name */
++ "CGI/FastCGI", /* pretty name */
+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
++ php_cgi_startup, /* startup */
++ php_module_shutdown_wrapper, /* shutdown */
+
-+#ifdef WIN32
-+#define WIN32_LEAN_AND_MEAN
-+#include <windows.h>
-+#undef WIN32_LEAN_AND_MEAN
-+#include "misc.h"
-+#endif
-+#include <sys/types.h>
-+#include <sys/tree.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <sys/_time.h>
-+#endif
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <errno.h>
-+#include "event.h"
++ NULL, /* activate */
++ sapi_cgi_deactivate, /* deactivate */
+
-+#include "log.h"
++ sapi_cgibin_ub_write, /* unbuffered write */
++ sapi_cgibin_flush, /* flush */
++ NULL, /* get uid */
++ sapi_cgibin_getenv, /* getenv */
+
-+static void _warn_helper(int severity, int log_errno, const char *fmt,
-+ va_list ap);
-+static void event_log(int severity, const char *msg);
++ php_error, /* error handler */
+
-+static int
-+event_vsnprintf(char *str, size_t size, const char *format, va_list args)
-+{
-+ int r;
-+ if (size == 0)
-+ return -1;
-+#ifdef WIN32
-+ r = _vsnprintf(str, size, format, args);
-+#else
-+ r = vsnprintf(str, size, format, args);
-+#endif
-+ str[size-1] = '\0';
-+ if (r < 0 || ((size_t)r) >= size) {
-+ /* different platforms behave differently on overflow;
-+ * handle both kinds. */
-+ return -1;
-+ }
-+ return r;
-+}
++ NULL, /* header handler */
++ sapi_cgi_send_headers, /* send headers handler */
++ NULL, /* send header handler */
+
-+static int
-+event_snprintf(char *str, size_t size, const char *format, ...)
-+{
-+ va_list ap;
-+ int r;
-+ va_start(ap, format);
-+ r = event_vsnprintf(str, size, format, ap);
-+ va_end(ap);
-+ return r;
-+}
++ sapi_cgi_read_post, /* read POST data */
++ sapi_cgi_read_cookies, /* read Cookies */
+
-+void
-+event_err(int eval, const char *fmt, ...)
-+{
-+ va_list ap;
-+
-+ va_start(ap, fmt);
-+ _warn_helper(_EVENT_LOG_ERR, errno, fmt, ap);
-+ va_end(ap);
-+ exit(eval);
-+}
++ sapi_cgi_register_variables, /* register server variables */
++ sapi_cgi_log_message, /* Log message */
++ NULL, /* Get request time */
+
-+void
-+event_warn(const char *fmt, ...)
-+{
-+ va_list ap;
-+
-+ va_start(ap, fmt);
-+ _warn_helper(_EVENT_LOG_WARN, errno, fmt, ap);
-+ va_end(ap);
-+}
++ STANDARD_SAPI_MODULE_PROPERTIES
++};
++/* }}} */
+
-+void
-+event_errx(int eval, const char *fmt, ...)
++/* {{{ php_cgi_usage
++ */
++static void php_cgi_usage(char *argv0)
+{
-+ va_list ap;
-+
-+ va_start(ap, fmt);
-+ _warn_helper(_EVENT_LOG_ERR, -1, fmt, ap);
-+ va_end(ap);
-+ exit(eval);
-+}
++ char *prog;
+
-+void
-+event_warnx(const char *fmt, ...)
-+{
-+ va_list ap;
-+
-+ va_start(ap, fmt);
-+ _warn_helper(_EVENT_LOG_WARN, -1, fmt, ap);
-+ va_end(ap);
++ prog = strrchr(argv0, '/');
++ if (prog) {
++ prog++;
++ } else {
++ prog = "php";
++ }
++
++ php_printf("Usage: %s [options]\n"
++ "\n"
++ " -C Do not chdir to the script's directory\n"
++ " -c <path>|<file> Look for php.ini file in this directory\n"
++ " -n No php.ini file will be used\n"
++ " -d foo[=bar] Define INI entry foo with value 'bar'\n"
++ " -e Generate extended information for debugger/profiler\n"
++ " -h This help\n"
++ " -i PHP information\n"
++ " -m Show compiled in modules\n"
++ " -v Version number\n"
++ " -y, --fpm-config <file>\n"
++ " Specify alternative path to FastCGI process manager config file.\n"
++ " -z <file> Load Zend extension <file>.\n"
++ ,
++ prog);
+}
++/* }}} */
+
-+void
-+event_msgx(const char *fmt, ...)
++/* {{{ is_valid_path
++ *
++ * some server configurations allow '..' to slip through in the
++ * translated path. We'll just refuse to handle such a path.
++ */
++static int is_valid_path(const char *path)
+{
-+ va_list ap;
-+
-+ va_start(ap, fmt);
-+ _warn_helper(_EVENT_LOG_MSG, -1, fmt, ap);
-+ va_end(ap);
-+}
++ const char *p;
+
-+void
-+_event_debugx(const char *fmt, ...)
-+{
-+ va_list ap;
-+
-+ va_start(ap, fmt);
-+ _warn_helper(_EVENT_LOG_DEBUG, -1, fmt, ap);
-+ va_end(ap);
++ if (!path) {
++ return 0;
++ }
++ p = strstr(path, "..");
++ if (p) {
++ if ((p == path || IS_SLASH(*(p-1))) &&
++ (*(p+2) == 0 || IS_SLASH(*(p+2)))) {
++ return 0;
++ }
++ while (1) {
++ p = strstr(p+1, "..");
++ if (!p) {
++ break;
++ }
++ if (IS_SLASH(*(p-1)) &&
++ (*(p+2) == 0 || IS_SLASH(*(p+2)))) {
++ return 0;
++ }
++ }
++ }
++ return 1;
+}
++/* }}} */
+
-+static void
-+_warn_helper(int severity, int log_errno, const char *fmt, va_list ap)
-+{
-+ char buf[1024];
-+ size_t len;
++/* {{{ init_request_info
+
-+ if (fmt != NULL)
-+ event_vsnprintf(buf, sizeof(buf), fmt, ap);
-+ else
-+ buf[0] = '\0';
++ initializes request_info structure
++
++ specificly in this section we handle proper translations
++ for:
++
++ PATH_INFO
++ derived from the portion of the URI path following
++ the script name but preceding any query data
++ may be empty
++
++ PATH_TRANSLATED
++ derived by taking any path-info component of the
++ request URI and performing any virtual-to-physical
++ translation appropriate to map it onto the server's
++ document repository structure
++
++ empty if PATH_INFO is empty
++
++ The env var PATH_TRANSLATED **IS DIFFERENT** than the
++ request_info.path_translated variable, the latter should
++ match SCRIPT_FILENAME instead.
++
++ SCRIPT_NAME
++ set to a URL path that could identify the CGI script
++ rather than the interpreter. PHP_SELF is set to this.
++
++ REQUEST_URI
++ uri section following the domain:port part of a URI
++
++ SCRIPT_FILENAME
++ The virtual-to-physical translation of SCRIPT_NAME (as per
++ PATH_TRANSLATED)
++
++ These settings are documented at
++ http://cgi-spec.golux.com/
++
++
++ Based on the following URL request:
++
++ http://localhost/info.php/test?a=b
++
++ should produce, which btw is the same as if
++ we were running under mod_cgi on apache (ie. not
++ using ScriptAlias directives):
++
++ PATH_INFO=/test
++ PATH_TRANSLATED=/docroot/test
++ SCRIPT_NAME=/info.php
++ REQUEST_URI=/info.php/test?a=b
++ SCRIPT_FILENAME=/docroot/info.php
++ QUERY_STRING=a=b
++
++ but what we get is (cgi/mod_fastcgi under apache):
++
++ PATH_INFO=/info.php/test
++ PATH_TRANSLATED=/docroot/info.php/test
++ SCRIPT_NAME=/php/php-cgi (from the Action setting I suppose)
++ REQUEST_URI=/info.php/test?a=b
++ SCRIPT_FILENAME=/path/to/php/bin/php-cgi (Action setting translated)
++ QUERY_STRING=a=b
++
++ Comments in the code below refer to using the above URL in a request
++
++ */
++static void init_request_info(TSRMLS_D)
++{
++ char *env_script_filename = sapi_cgibin_getenv("SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME")-1 TSRMLS_CC);
++ char *env_path_translated = sapi_cgibin_getenv("PATH_TRANSLATED", sizeof("PATH_TRANSLATED")-1 TSRMLS_CC);
++ char *script_path_translated = env_script_filename;
++
++#if !DISCARD_PATH
++ /* some broken servers do not have script_filename or argv0
++ an example, IIS configured in some ways. then they do more
++ broken stuff and set path_translated to the cgi script location */
++ if (!script_path_translated && env_path_translated) {
++ script_path_translated = env_path_translated;
++ }
++#endif
++
++ /* initialize the defaults */
++ SG(request_info).path_translated = NULL;
++ SG(request_info).request_method = NULL;
++ SG(request_info).proto_num = 1000;
++ SG(request_info).query_string = NULL;
++ SG(request_info).request_uri = NULL;
++ SG(request_info).content_type = NULL;
++ SG(request_info).content_length = 0;
++ SG(sapi_headers).http_response_code = 200;
++
++ /* script_path_translated being set is a good indication that
++ we are running in a cgi environment, since it is always
++ null otherwise. otherwise, the filename
++ of the script will be retreived later via argc/argv */
++ if (script_path_translated) {
++ const char *auth;
++ char *content_length = sapi_cgibin_getenv("CONTENT_LENGTH", sizeof("CONTENT_LENGTH")-1 TSRMLS_CC);
++ char *content_type = sapi_cgibin_getenv("CONTENT_TYPE", sizeof("CONTENT_TYPE")-1 TSRMLS_CC);
++ char *env_path_info = sapi_cgibin_getenv("PATH_INFO", sizeof("PATH_INFO")-1 TSRMLS_CC);
++ char *env_script_name = sapi_cgibin_getenv("SCRIPT_NAME", sizeof("SCRIPT_NAME")-1 TSRMLS_CC);
++#if ENABLE_PATHINFO_CHECK
++ struct stat st;
++ char *env_redirect_url = sapi_cgibin_getenv("REDIRECT_URL", sizeof("REDIRECT_URL")-1 TSRMLS_CC);
++ char *env_document_root = sapi_cgibin_getenv("DOCUMENT_ROOT", sizeof("DOCUMENT_ROOT")-1 TSRMLS_CC);
++ int script_path_translated_len;
++
++ /* Hack for buggy IIS that sets incorrect PATH_INFO */
++ char *env_server_software = sapi_cgibin_getenv("SERVER_SOFTWARE", sizeof("SERVER_SOFTWARE")-1 TSRMLS_CC);
++ if (env_server_software &&
++ env_script_name &&
++ env_path_info &&
++ strncmp(env_server_software, "Microsoft-IIS", sizeof("Microsoft-IIS")-1) == 0 &&
++ strncmp(env_path_info, env_script_name, strlen(env_script_name)) == 0) {
++ env_path_info = _sapi_cgibin_putenv("ORIG_PATH_INFO", env_path_info TSRMLS_CC);
++ env_path_info += strlen(env_script_name);
++ if (*env_path_info == 0) {
++ env_path_info = NULL;
++ }
++ env_path_info = _sapi_cgibin_putenv("PATH_INFO", env_path_info TSRMLS_CC);
++ }
++
++ if (CGIG(fix_pathinfo)) {
++ char *real_path = NULL;
++ char *orig_path_translated = env_path_translated;
++ char *orig_path_info = env_path_info;
++ char *orig_script_name = env_script_name;
++ char *orig_script_filename = env_script_filename;
++
++ if (!env_document_root && PG(doc_root)) {
++ env_document_root = _sapi_cgibin_putenv("DOCUMENT_ROOT", PG(doc_root) TSRMLS_CC);
++ /* fix docroot */
++ TRANSLATE_SLASHES(env_document_root);
++ }
++
++ if (env_path_translated != NULL && env_redirect_url != NULL) {
++ /*
++ pretty much apache specific. If we have a redirect_url
++ then our script_filename and script_name point to the
++ php executable
++ */
++ script_path_translated = env_path_translated;
++ /* we correct SCRIPT_NAME now in case we don't have PATH_INFO */
++ env_script_name = env_redirect_url;
++ }
+
-+ if (log_errno >= 0) {
-+ len = strlen(buf);
-+ if (len < sizeof(buf) - 3) {
-+ event_snprintf(buf + len, sizeof(buf) - len, ": %s",
-+ strerror(log_errno));
++#ifdef __riscos__
++ /* Convert path to unix format*/
++ __riscosify_control |= __RISCOSIFY_DONT_CHECK_DIR;
++ script_path_translated = __unixify(script_path_translated, 0, NULL, 1, 0);
++#endif
++
++ /*
++ * if the file doesn't exist, try to extract PATH_INFO out
++ * of it by stat'ing back through the '/'
++ * this fixes url's like /info.php/test
++ */
++ if (script_path_translated &&
++ (script_path_translated_len = strlen(script_path_translated)) > 0 &&
++ (script_path_translated[script_path_translated_len-1] == '/' ||
++#ifdef PHP_WIN32
++ script_path_translated[script_path_translated_len-1] == '\\' ||
++#endif
++ (real_path = tsrm_realpath(script_path_translated, NULL TSRMLS_CC)) == NULL)) {
++ char *pt = estrndup(script_path_translated, script_path_translated_len);
++ int len = script_path_translated_len;
++ char *ptr;
++
++ while ((ptr = strrchr(pt, '/')) || (ptr = strrchr(pt, '\\'))) {
++ *ptr = 0;
++ if (stat(pt, &st) == 0 && S_ISREG(st.st_mode)) {
++ /*
++ * okay, we found the base script!
++ * work out how many chars we had to strip off;
++ * then we can modify PATH_INFO
++ * accordingly
++ *
++ * we now have the makings of
++ * PATH_INFO=/test
++ * SCRIPT_FILENAME=/docroot/info.php
++ *
++ * we now need to figure out what docroot is.
++ * if DOCUMENT_ROOT is set, this is easy, otherwise,
++ * we have to play the game of hide and seek to figure
++ * out what SCRIPT_NAME should be
++ */
++ int slen = len - strlen(pt);
++ int pilen = env_path_info ? strlen(env_path_info) : 0;
++ char *path_info = env_path_info ? env_path_info + pilen - slen : NULL;
++
++ if (orig_path_info != path_info) {
++ if (orig_path_info) {
++ char old;
++
++ _sapi_cgibin_putenv("ORIG_PATH_INFO", orig_path_info TSRMLS_CC);
++ old = path_info[0];
++ path_info[0] = 0;
++ if (!orig_script_name ||
++ strcmp(orig_script_name, env_path_info) != 0) {
++ if (orig_script_name) {
++ _sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC);
++ }
++ SG(request_info).request_uri = _sapi_cgibin_putenv("SCRIPT_NAME", env_path_info TSRMLS_CC);
++ } else {
++ SG(request_info).request_uri = orig_script_name;
++ }
++ path_info[0] = old;
++ }
++ env_path_info = _sapi_cgibin_putenv("PATH_INFO", path_info TSRMLS_CC);
++ }
++ if (!orig_script_filename ||
++ strcmp(orig_script_filename, pt) != 0) {
++ if (orig_script_filename) {
++ _sapi_cgibin_putenv("ORIG_SCRIPT_FILENAME", orig_script_filename TSRMLS_CC);
++ }
++ script_path_translated = _sapi_cgibin_putenv("SCRIPT_FILENAME", pt TSRMLS_CC);
++ }
++ TRANSLATE_SLASHES(pt);
++
++ /* figure out docroot
++ SCRIPT_FILENAME minus SCRIPT_NAME
++ */
++
++ if (env_document_root) {
++ int l = strlen(env_document_root);
++ int path_translated_len = 0;
++ char *path_translated = NULL;
++
++ if (l && env_document_root[l - 1] == '/') {
++ --l;
++ }
++
++ /* we have docroot, so we should have:
++ * DOCUMENT_ROOT=/docroot
++ * SCRIPT_FILENAME=/docroot/info.php
++ */
++
++ /* PATH_TRANSLATED = DOCUMENT_ROOT + PATH_INFO */
++ path_translated_len = l + (env_path_info ? strlen(env_path_info) : 0);
++ path_translated = (char *) emalloc(path_translated_len + 1);
++ memcpy(path_translated, env_document_root, l);
++ if (env_path_info) {
++ memcpy(path_translated + l, env_path_info, (path_translated_len - l));
++ }
++ path_translated[path_translated_len] = '\0';
++ if (orig_path_translated) {
++ _sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
++ }
++ env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
++ efree(path_translated);
++ } else if (env_script_name &&
++ strstr(pt, env_script_name)
++ ) {
++ /* PATH_TRANSLATED = PATH_TRANSLATED - SCRIPT_NAME + PATH_INFO */
++ int ptlen = strlen(pt) - strlen(env_script_name);
++ int path_translated_len = ptlen + (env_path_info ? strlen(env_path_info) : 0);
++ char *path_translated = NULL;
++
++ path_translated = (char *) emalloc(path_translated_len + 1);
++ memcpy(path_translated, pt, ptlen);
++ if (env_path_info) {
++ memcpy(path_translated + ptlen, env_path_info, path_translated_len - ptlen);
++ }
++ path_translated[path_translated_len] = '\0';
++ if (orig_path_translated) {
++ _sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
++ }
++ env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
++ efree(path_translated);
++ }
++ break;
++ }
++ }
++ if (!ptr) {
++ /*
++ * if we stripped out all the '/' and still didn't find
++ * a valid path... we will fail, badly. of course we would
++ * have failed anyway... we output 'no input file' now.
++ */
++ if (orig_script_filename) {
++ _sapi_cgibin_putenv("ORIG_SCRIPT_FILENAME", orig_script_filename TSRMLS_CC);
++ }
++ script_path_translated = _sapi_cgibin_putenv("SCRIPT_FILENAME", NULL TSRMLS_CC);
++ SG(sapi_headers).http_response_code = 404;
++ }
++ if (!SG(request_info).request_uri) {
++ if (!orig_script_name ||
++ strcmp(orig_script_name, env_script_name) != 0) {
++ if (orig_script_name) {
++ _sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC);
++ }
++ SG(request_info).request_uri = _sapi_cgibin_putenv("SCRIPT_NAME", env_script_name TSRMLS_CC);
++ } else {
++ SG(request_info).request_uri = orig_script_name;
++ }
++ }
++ if (pt) {
++ efree(pt);
++ }
++ if (is_valid_path(script_path_translated)) {
++ SG(request_info).path_translated = estrdup(script_path_translated);
++ }
++ } else {
++ /* make sure path_info/translated are empty */
++ if (!orig_script_filename ||
++ (script_path_translated != orig_script_filename &&
++ strcmp(script_path_translated, orig_script_filename) != 0)) {
++ if (orig_script_filename) {
++ _sapi_cgibin_putenv("ORIG_SCRIPT_FILENAME", orig_script_filename TSRMLS_CC);
++ }
++ script_path_translated = _sapi_cgibin_putenv("SCRIPT_FILENAME", script_path_translated TSRMLS_CC);
++ }
++ if (env_redirect_url) {
++ if (orig_path_info) {
++ _sapi_cgibin_putenv("ORIG_PATH_INFO", orig_path_info TSRMLS_CC);
++ _sapi_cgibin_putenv("PATH_INFO", NULL TSRMLS_CC);
++ }
++ if (orig_path_translated) {
++ _sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
++ _sapi_cgibin_putenv("PATH_TRANSLATED", NULL TSRMLS_CC);
++ }
++ }
++ if (env_script_name != orig_script_name) {
++ if (orig_script_name) {
++ _sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC);
++ }
++ SG(request_info).request_uri = _sapi_cgibin_putenv("SCRIPT_NAME", env_script_name TSRMLS_CC);
++ } else {
++ SG(request_info).request_uri = env_script_name;
++ }
++ if (is_valid_path(script_path_translated)) {
++ SG(request_info).path_translated = estrdup(script_path_translated);
++ }
++ free(real_path);
++ }
++ } else {
++#endif
++ /* pre 4.3 behaviour, shouldn't be used but provides BC */
++ if (env_path_info) {
++ SG(request_info).request_uri = env_path_info;
++ } else {
++ SG(request_info).request_uri = env_script_name;
++ }
++#if !DISCARD_PATH
++ if (env_path_translated) {
++ script_path_translated = env_path_translated;
++ }
++#endif
++ if (is_valid_path(script_path_translated)) {
++ SG(request_info).path_translated = estrdup(script_path_translated);
++ }
++#if ENABLE_PATHINFO_CHECK
+ }
++#endif
++ SG(request_info).request_method = sapi_cgibin_getenv("REQUEST_METHOD", sizeof("REQUEST_METHOD")-1 TSRMLS_CC);
++ /* FIXME - Work out proto_num here */
++ SG(request_info).query_string = sapi_cgibin_getenv("QUERY_STRING", sizeof("QUERY_STRING")-1 TSRMLS_CC);
++ SG(request_info).content_type = (content_type ? content_type : "" );
++ SG(request_info).content_length = (content_length ? atoi(content_length) : 0);
++
++ /* The CGI RFC allows servers to pass on unvalidated Authorization data */
++ auth = sapi_cgibin_getenv("HTTP_AUTHORIZATION", sizeof("HTTP_AUTHORIZATION")-1 TSRMLS_CC);
++ php_handle_auth_data(auth TSRMLS_CC);
+ }
-+
-+ event_log(severity, buf);
+}
++/* }}} */
+
-+static event_log_cb log_fn = NULL;
+
-+void
-+event_set_log_callback(event_log_cb cb)
-+{
-+ log_fn = cb;
-+}
++PHP_INI_BEGIN()
++ STD_PHP_INI_ENTRY("cgi.rfc2616_headers", "0", PHP_INI_ALL, OnUpdateBool, rfc2616_headers, php_cgi_globals_struct, php_cgi_globals)
++ STD_PHP_INI_ENTRY("cgi.nph", "0", PHP_INI_ALL, OnUpdateBool, nph, php_cgi_globals_struct, php_cgi_globals)
++ STD_PHP_INI_ENTRY("cgi.check_shebang_line", "1", PHP_INI_SYSTEM, OnUpdateBool, check_shebang_line, php_cgi_globals_struct, php_cgi_globals)
++#if ENABLE_PATHINFO_CHECK
++ STD_PHP_INI_ENTRY("cgi.fix_pathinfo", "1", PHP_INI_SYSTEM, OnUpdateBool, fix_pathinfo, php_cgi_globals_struct, php_cgi_globals)
++#endif
++ STD_PHP_INI_ENTRY("fastcgi.logging", "1", PHP_INI_SYSTEM, OnUpdateBool, fcgi_logging, php_cgi_globals_struct, php_cgi_globals)
++# ifdef PHP_WIN32
++ STD_PHP_INI_ENTRY("fastcgi.impersonate", "0", PHP_INI_SYSTEM, OnUpdateBool, impersonate, php_cgi_globals_struct, php_cgi_globals)
++# endif
++ STD_PHP_INI_ENTRY("fastcgi.error_header", NULL, PHP_INI_SYSTEM, OnUpdateString, error_header, php_cgi_globals_struct, php_cgi_globals)
++PHP_INI_END()
+
-+static void
-+event_log(int severity, const char *msg)
++/* {{{ php_cgi_globals_ctor
++ */
++static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals TSRMLS_DC)
+{
-+ if (log_fn)
-+ log_fn(severity, msg);
-+ else {
-+ const char *severity_str;
-+ switch (severity) {
-+ case _EVENT_LOG_DEBUG:
-+ severity_str = "debug";
-+ break;
-+ case _EVENT_LOG_MSG:
-+ severity_str = "msg";
-+ break;
-+ case _EVENT_LOG_WARN:
-+ severity_str = "warn";
-+ break;
-+ case _EVENT_LOG_ERR:
-+ severity_str = "err";
-+ break;
-+ default:
-+ severity_str = "???";
-+ break;
-+ }
-+ (void)fprintf(stderr, "[%s] %s\n", severity_str, msg);
-+ }
++ php_cgi_globals->rfc2616_headers = 0;
++ php_cgi_globals->nph = 0;
++ php_cgi_globals->check_shebang_line = 1;
++#if ENABLE_PATHINFO_CHECK
++ php_cgi_globals->fix_pathinfo = 1;
++#endif
++ php_cgi_globals->fcgi_logging = 1;
++# ifdef PHP_WIN32
++ php_cgi_globals->impersonate = 0;
++# endif
++ php_cgi_globals->error_header = NULL;
+}
-diff -Nru php-5.2.4.vanilla/libevent/log.h php-5.2.4.fpm/libevent/log.h
---- php-5.2.4.vanilla/libevent/log.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/log.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,43 @@
-+/*
-+ * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++/* }}} */
++
++/* {{{ PHP_MINIT_FUNCTION
+ */
-+#ifndef _LOG_H_
-+#define _LOG_H_
-+
-+void event_err(int eval, const char *fmt, ...);
-+void event_warn(const char *fmt, ...);
-+void event_errx(int eval, const char *fmt, ...);
-+void event_warnx(const char *fmt, ...);
-+void event_msgx(const char *fmt, ...);
-+void _event_debugx(const char *fmt, ...);
-+
-+#ifdef USE_DEBUG
-+#define event_debug(x) _event_debugx x
++static PHP_MINIT_FUNCTION(cgi)
++{
++#ifdef ZTS
++ ts_allocate_id(&php_cgi_globals_id, sizeof(php_cgi_globals_struct), (ts_allocate_ctor) php_cgi_globals_ctor, NULL);
+#else
-+#define event_debug(x) do {;} while (0)
-+#endif
-+
++ php_cgi_globals_ctor(&php_cgi_globals TSRMLS_CC);
+#endif
-diff -Nru php-5.2.4.vanilla/libevent/ltmain.sh php-5.2.4.fpm/libevent/ltmain.sh
---- php-5.2.4.vanilla/libevent/ltmain.sh 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/ltmain.sh 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,6460 @@
-+# ltmain.sh - Provide generalized library-building support services.
-+# NOTE: Changing this file will not affect anything until you rerun configure.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+basename="s,^.*/,,g"
-+
-+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-+# is ksh but when the shell is invoked as "sh" and the current value of
-+# the _XPG environment variable is not equal to 1 (one), the special
-+# positional parameter $0, within a function call, is the name of the
-+# function.
-+progpath="$0"
-+
-+# The name of this program:
-+progname=`echo "$progpath" | $SED $basename`
-+modename="$progname"
-+
-+# Global variables:
-+EXIT_SUCCESS=0
-+EXIT_FAILURE=1
-+
-+PROGRAM=ltmain.sh
-+PACKAGE=libtool
-+VERSION=1.5.14
-+TIMESTAMP=" (1.1220.2.195 2005/02/12 12:12:33)"
-+
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes.
-+if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+fi
-+
-+# Check that we have a working $echo.
-+if test "X$1" = X--no-reexec; then
-+ # Discard the --no-reexec flag, and continue.
-+ shift
-+elif test "X$1" = X--fallback-echo; then
-+ # Avoid inline document here, it may be left over
-+ :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+ # Yippee, $echo works!
-+ :
-+else
-+ # Restart under the correct shell, and then maybe $echo will work.
-+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-+fi
-+
-+if test "X$1" = X--fallback-echo; then
-+ # used as fallback echo
-+ shift
-+ cat <<EOF
-+$*
-+EOF
-+ exit $EXIT_SUCCESS
-+fi
-+
-+default_mode=
-+help="Try \`$progname --help' for more information."
-+magic="%%%MAGIC variable%%%"
-+mkdir="mkdir"
-+mv="mv -f"
-+rm="rm -f"
-+
-+# Sed substitution that helps us do robust quoting. It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed="${SED}"' -e 1s/^X//'
-+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-+# test EBCDIC or ASCII
-+case `echo A|tr A '\301'` in
-+ A) # EBCDIC based system
-+ SP2NL="tr '\100' '\n'"
-+ NL2SP="tr '\r\n' '\100\100'"
-+ ;;
-+ *) # Assume ASCII based system
-+ SP2NL="tr '\040' '\012'"
-+ NL2SP="tr '\015\012' '\040\040'"
-+ ;;
-+esac
-+
-+# NLS nuisances.
-+# Only set LANG and LC_ALL to C if already set.
-+# These must not be set unconditionally because not all systems understand
-+# e.g. LANG=C (notably SCO).
-+# We save the old values to restore during execute mode.
-+if test "${LC_ALL+set}" = set; then
-+ save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-+fi
-+if test "${LANG+set}" = set; then
-+ save_LANG="$LANG"; LANG=C; export LANG
-+fi
-+
-+# Make sure IFS has a sensible default
-+: ${IFS="
-+"}
-+
-+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-+ $echo "$modename: not configured to build any kind of library" 1>&2
-+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
-+ exit $EXIT_FAILURE
-+fi
-+
-+# Global variables.
-+mode=$default_mode
-+nonopt=
-+prev=
-+prevopt=
-+run=
-+show="$echo"
-+show_help=
-+execute_dlfiles=
-+lo2o="s/\\.lo\$/.${objext}/"
-+o2lo="s/\\.${objext}\$/.lo/"
-+quote_scanset='[[~#^*{};<>?'"'"' ]'
-+
-+#####################################
-+# Shell function definitions:
-+# This seems to be the best place for them
-+
-+# func_win32_libid arg
-+# return the library type of file 'arg'
-+#
-+# Need a lot of goo to handle *both* DLLs and import libs
-+# Has to be a shell function in order to 'eat' the argument
-+# that is supplied when $file_magic_command is called.
-+func_win32_libid ()
-+{
-+ win32_libid_type="unknown"
-+ win32_fileres=`file -L $1 2>/dev/null`
-+ case $win32_fileres in
-+ *ar\ archive\ import\ library*) # definitely import
-+ win32_libid_type="x86 archive import"
-+ ;;
-+ *ar\ archive*) # could be an import, or static
-+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-+ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-+ win32_nmres=`eval $NM -f posix -A $1 | \
-+ sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-+ if test "X$win32_nmres" = "Ximport" ; then
-+ win32_libid_type="x86 archive import"
-+ else
-+ win32_libid_type="x86 archive static"
-+ fi
-+ fi
-+ ;;
-+ *DLL*)
-+ win32_libid_type="x86 DLL"
-+ ;;
-+ *executable*) # but shell scripts are "executable" too...
-+ case $win32_fileres in
-+ *MS\ Windows\ PE\ Intel*)
-+ win32_libid_type="x86 DLL"
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ $echo $win32_libid_type
++ REGISTER_INI_ENTRIES();
++ return SUCCESS;
+}
++/* }}} */
+
-+
-+# func_infer_tag arg
-+# Infer tagged configuration to use if any are available and
-+# if one wasn't chosen via the "--tag" command line option.
-+# Only attempt this if the compiler in the base compile
-+# command doesn't match the default compiler.
-+# arg is usually of the form 'gcc ...'
-+func_infer_tag ()
++/* {{{ PHP_MSHUTDOWN_FUNCTION
++ */
++static PHP_MSHUTDOWN_FUNCTION(cgi)
+{
-+ if test -n "$available_tags" && test -z "$tagname"; then
-+ CC_quoted=
-+ for arg in $CC; do
-+ case $arg in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ arg="\"$arg\""
-+ ;;
-+ esac
-+ CC_quoted="$CC_quoted $arg"
-+ done
-+ case $@ in
-+ # Blanks in the command may have been stripped by the calling shell,
-+ # but not from the CC environment variable when configure was run.
-+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-+ # Blanks at the start of $base_compile will cause this to fail
-+ # if we don't check for them as well.
-+ *)
-+ for z in $available_tags; do
-+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-+ # Evaluate the configuration.
-+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-+ CC_quoted=
-+ for arg in $CC; do
-+ # Double-quote args containing other shell metacharacters.
-+ case $arg in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ arg="\"$arg\""
-+ ;;
-+ esac
-+ CC_quoted="$CC_quoted $arg"
-+ done
-+ case "$@ " in
-+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-+ # The compiler in the base compile command matches
-+ # the one in the tagged configuration.
-+ # Assume this is the tagged configuration we want.
-+ tagname=$z
-+ break
-+ ;;
-+ esac
-+ fi
-+ done
-+ # If $tagname still isn't set, then no tagged configuration
-+ # was found and let the user know that the "--tag" command
-+ # line option must be used.
-+ if test -z "$tagname"; then
-+ $echo "$modename: unable to infer tagged configuration"
-+ $echo "$modename: specify a tag with \`--tag'" 1>&2
-+ exit $EXIT_FAILURE
-+# else
-+# $echo "$modename: using $tagname tagged configuration"
-+ fi
-+ ;;
-+ esac
-+ fi
++ UNREGISTER_INI_ENTRIES();
++ return SUCCESS;
+}
++/* }}} */
+
-+
-+# func_extract_an_archive dir oldlib
-+func_extract_an_archive ()
++/* {{{ PHP_MINFO_FUNCTION
++ */
++static PHP_MINFO_FUNCTION(cgi)
+{
-+ f_ex_an_ar_dir="$1"; shift
-+ f_ex_an_ar_oldlib="$1"
-+ f_ex_an_ar_lib=`$echo "X$f_ex_an_ar_oldlib" | $Xsed -e 's%^.*/%%'`
-+
-+ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-+ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-+ :
-+ else
-+ $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-+ $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-+ $show "cp $f_ex_an_ar_oldlib $f_ex_an_ar_dir/$f_ex_an_ar_lib"
-+ $run eval "cp \$f_ex_an_ar_oldlib \$f_ex_an_ar_dir/\$f_ex_an_ar_lib"
-+ $AR t "$f_ex_an_ar_oldlib" | sort | uniq -c \
-+ | $EGREP -v '^[ ]*1[ ]' | while read count name
-+ do
-+ i=1
-+ while test "$i" -le "$count"
-+ do
-+ # Put our $i before any first dot (extension)
-+ # Never overwrite any file
-+ name_to="$name"
-+ while test "X$name_to" = "X$name" || test -f "$f_ex_an_ar_dir/$name_to"
-+ do
-+ name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-+ done
-+ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_lib '$name' && $mv '$name' '$name_to')"
-+ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_lib '$name' && $mv '$name' '$name_to' && $AR -d \$f_ex_an_ar_lib '$name')" || exit $?
-+ i=`expr $i + 1`
-+ done
-+ done
-+ $show "$rm $f_ex_an_ar_dir/$f_ex_an_ar_lib"
-+ $run eval "$rm \$f_ex_an_ar_dir/\$f_ex_an_ar_lib"
-+ fi
-+}
++ DISPLAY_INI_ENTRIES();
+
-+# func_extract_archives gentop oldlib ...
-+func_extract_archives ()
-+{
-+ my_gentop="$1"; shift
-+ my_oldlibs=${1+"$@"}
-+ my_oldobjs=""
-+ my_xlib=""
-+ my_xabs=""
-+ my_xdir=""
-+ my_status=""
-+
-+ $show "${rm}r $my_gentop"
-+ $run ${rm}r "$my_gentop"
-+ $show "$mkdir $my_gentop"
-+ $run $mkdir "$my_gentop"
-+ my_status=$?
-+ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-+ exit $my_status
-+ fi
++ php_info_print_table_start();
++ php_info_print_table_row(2, "php-fpm", "active");
++ php_info_print_table_row(2, "php-fpm version", PHP_FPM_VERSION);
++ php_info_print_table_end();
+
-+ for my_xlib in $my_oldlibs; do
-+ # Extract the objects.
-+ case $my_xlib in
-+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-+ *) my_xabs=`pwd`"/$my_xlib" ;;
-+ esac
-+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-+ my_xdir="$my_gentop/$my_xlib"
-+
-+ $show "${rm}r $my_xdir"
-+ $run ${rm}r "$my_xdir"
-+ $show "$mkdir $my_xdir"
-+ $run $mkdir "$my_xdir"
-+ status=$?
-+ if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-+ exit $status
-+ fi
-+ case $host in
-+ *-darwin*)
-+ $show "Extracting $my_xabs"
-+ # Do not bother doing anything if just a dry run
-+ if test -z "$run"; then
-+ darwin_orig_dir=`pwd`
-+ cd $my_xdir || exit $?
-+ darwin_archive=$my_xabs
-+ darwin_curdir=`pwd`
-+ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-+ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-+ if test -n "$darwin_arches"; then
-+ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-+ darwin_arch=
-+ $show "$darwin_base_archive has multiple architectures $darwin_arches"
-+ for darwin_arch in $darwin_arches ; do
-+ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-+ cd "$darwin_curdir"
-+ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-+ done # $darwin_arches
-+ ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-+ darwin_file=
-+ darwin_files=
-+ for darwin_file in $darwin_filelist; do
-+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+ lipo -create -output "$darwin_file" $darwin_files
-+ done # $darwin_filelist
-+ ${rm}r unfat-$$
-+ cd "$darwin_orig_dir"
-+ else
-+ cd "$darwin_orig_dir"
-+ func_extract_an_archive "$my_xdir" "$my_xabs"
-+ fi # $darwin_arches
-+ fi # $run
-+ ;;
-+ *)
-+ func_extract_an_archive "$my_xdir" "$my_xabs"
-+ ;;
-+ esac
-+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+ done
-+ func_extract_archives_result="$my_oldobjs"
+}
-+# End of Shell function definitions
-+#####################################
-+
-+# Darwin sucks
-+eval std_shrext=\"$shrext_cmds\"
-+
-+# Parse our command line options once, thoroughly.
-+while test "$#" -gt 0
-+do
-+ arg="$1"
-+ shift
-+
-+ case $arg in
-+ -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ # If the previous option needs an argument, assign it.
-+ if test -n "$prev"; then
-+ case $prev in
-+ execute_dlfiles)
-+ execute_dlfiles="$execute_dlfiles $arg"
-+ ;;
-+ tag)
-+ tagname="$arg"
-+ preserve_args="${preserve_args}=$arg"
-+
-+ # Check whether tagname contains only valid characters
-+ case $tagname in
-+ *[!-_A-Za-z0-9,/]*)
-+ $echo "$progname: invalid tag name: $tagname" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+
-+ case $tagname in
-+ CC)
-+ # Don't test for the "default" C tag, as we know, it's there, but
-+ # not specially marked.
-+ ;;
-+ *)
-+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-+ taglist="$taglist $tagname"
-+ # Evaluate the configuration.
-+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-+ else
-+ $echo "$progname: ignoring unknown tag $tagname" 1>&2
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ *)
-+ eval "$prev=\$arg"
-+ ;;
-+ esac
-+
-+ prev=
-+ prevopt=
-+ continue
-+ fi
-+
-+ # Have we seen a non-optional argument yet?
-+ case $arg in
-+ --help)
-+ show_help=yes
-+ ;;
-+
-+ --version)
-+ $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-+ $echo
-+ $echo "Copyright (C) 2005 Free Software Foundation, Inc."
-+ $echo "This is free software; see the source for copying conditions. There is NO"
-+ $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+ exit $?
-+ ;;
-+
-+ --config)
-+ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-+ # Now print the configurations for the tags.
-+ for tagname in $taglist; do
-+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-+ done
-+ exit $?
-+ ;;
-+
-+ --debug)
-+ $echo "$progname: enabling shell trace mode"
-+ set -x
-+ preserve_args="$preserve_args $arg"
-+ ;;
-+
-+ --dry-run | -n)
-+ run=:
-+ ;;
-+
-+ --features)
-+ $echo "host: $host"
-+ if test "$build_libtool_libs" = yes; then
-+ $echo "enable shared libraries"
-+ else
-+ $echo "disable shared libraries"
-+ fi
-+ if test "$build_old_libs" = yes; then
-+ $echo "enable static libraries"
-+ else
-+ $echo "disable static libraries"
-+ fi
-+ exit $?
-+ ;;
-+
-+ --finish) mode="finish" ;;
-+
-+ --mode) prevopt="--mode" prev=mode ;;
-+ --mode=*) mode="$optarg" ;;
-+
-+ --preserve-dup-deps) duplicate_deps="yes" ;;
-+
-+ --quiet | --silent)
-+ show=:
-+ preserve_args="$preserve_args $arg"
-+ ;;
-+
-+ --tag) prevopt="--tag" prev=tag ;;
-+ --tag=*)
-+ set tag "$optarg" ${1+"$@"}
-+ shift
-+ prev=tag
-+ preserve_args="$preserve_args --tag"
-+ ;;
-+
-+ -dlopen)
-+ prevopt="-dlopen"
-+ prev=execute_dlfiles
-+ ;;
-+
-+ -*)
-+ $echo "$modename: unrecognized option \`$arg'" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+
-+ *)
-+ nonopt="$arg"
-+ break
-+ ;;
-+ esac
-+done
-+
-+if test -n "$prevopt"; then
-+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+fi
-+
-+# If this variable is set in any of the actions, the command in it
-+# will be execed at the end. This prevents here-documents from being
-+# left over by shells.
-+exec_cmd=
-+
-+if test -z "$show_help"; then
-+
-+ # Infer the operation mode.
-+ if test -z "$mode"; then
-+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-+ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-+ case $nonopt in
-+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-+ mode=link
-+ for arg
-+ do
-+ case $arg in
-+ -c)
-+ mode=compile
-+ break
-+ ;;
-+ esac
-+ done
-+ ;;
-+ *db | *dbx | *strace | *truss)
-+ mode=execute
-+ ;;
-+ *install*|cp|mv)
-+ mode=install
-+ ;;
-+ *rm)
-+ mode=uninstall
-+ ;;
-+ *)
-+ # If we have no mode, but dlfiles were specified, then do execute mode.
-+ test -n "$execute_dlfiles" && mode=execute
-+
-+ # Just use the default operation mode.
-+ if test -z "$mode"; then
-+ if test -n "$nonopt"; then
-+ $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-+ else
-+ $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-+ fi
-+ fi
-+ ;;
-+ esac
-+ fi
-+
-+ # Only execute mode is allowed to have -dlopen flags.
-+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
-+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+
-+ # Change the help message to a mode-specific one.
-+ generic_help="$help"
-+ help="Try \`$modename --help --mode=$mode' for more information."
-+
-+ # These modes are in order of execution frequency so that they run quickly.
-+ case $mode in
-+ # libtool compile mode
-+ compile)
-+ modename="$modename: compile"
-+ # Get the compilation command and the source file.
-+ base_compile=
-+ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
-+ suppress_opt=yes
-+ suppress_output=
-+ arg_mode=normal
-+ libobj=
-+ later=
-+
-+ for arg
-+ do
-+ case "$arg_mode" in
-+ arg )
-+ # do not "continue". Instead, add this to base_compile
-+ lastarg="$arg"
-+ arg_mode=normal
-+ ;;
-+
-+ target )
-+ libobj="$arg"
-+ arg_mode=normal
-+ continue
-+ ;;
-+
-+ normal )
-+ # Accept any command-line options.
-+ case $arg in
-+ -o)
-+ if test -n "$libobj" ; then
-+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ arg_mode=target
-+ continue
-+ ;;
-+
-+ -static | -prefer-pic | -prefer-non-pic)
-+ later="$later $arg"
-+ continue
-+ ;;
-+
-+ -no-suppress)
-+ suppress_opt=no
-+ continue
-+ ;;
-+
-+ -Xcompiler)
-+ arg_mode=arg # the next one goes into the "base_compile" arg list
-+ continue # The current "srcfile" will either be retained or
-+ ;; # replaced later. I would guess that would be a bug.
-+
-+ -Wc,*)
-+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-+ lastarg=
-+ save_ifs="$IFS"; IFS=','
-+ for arg in $args; do
-+ IFS="$save_ifs"
-+
-+ # Double-quote args containing other shell metacharacters.
-+ # Many Bourne shells cannot handle close brackets correctly
-+ # in scan sets, so we specify it separately.
-+ case $arg in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ arg="\"$arg\""
-+ ;;
-+ esac
-+ lastarg="$lastarg $arg"
-+ done
-+ IFS="$save_ifs"
-+ lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-+
-+ # Add the arguments to base_compile.
-+ base_compile="$base_compile $lastarg"
-+ continue
-+ ;;
-+
-+ * )
-+ # Accept the current argument as the source file.
-+ # The previous "srcfile" becomes the current argument.
-+ #
-+ lastarg="$srcfile"
-+ srcfile="$arg"
-+ ;;
-+ esac # case $arg
-+ ;;
-+ esac # case $arg_mode
-+
-+ # Aesthetically quote the previous argument.
-+ lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-+
-+ case $lastarg in
-+ # Double-quote args containing other shell metacharacters.
-+ # Many Bourne shells cannot handle close brackets correctly
-+ # in scan sets, and some SunOS ksh mistreat backslash-escaping
-+ # in scan sets (worked around with variable expansion),
-+ # and furthermore cannot handle '|' '&' '(' ')' in scan sets
-+ # at all, so we specify them separately.
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ lastarg="\"$lastarg\""
-+ ;;
-+ esac
-+
-+ base_compile="$base_compile $lastarg"
-+ done # for arg
-+
-+ case $arg_mode in
-+ arg)
-+ $echo "$modename: you must specify an argument for -Xcompile"
-+ exit $EXIT_FAILURE
-+ ;;
-+ target)
-+ $echo "$modename: you must specify a target with \`-o'" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ *)
-+ # Get the name of the library object.
-+ [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-+ ;;
-+ esac
-+
-+ # Recognize several different file suffixes.
-+ # If the user specifies -o file.o, it is replaced with file.lo
-+ xform='[cCFSifmso]'
-+ case $libobj in
-+ *.ada) xform=ada ;;
-+ *.adb) xform=adb ;;
-+ *.ads) xform=ads ;;
-+ *.asm) xform=asm ;;
-+ *.c++) xform=c++ ;;
-+ *.cc) xform=cc ;;
-+ *.ii) xform=ii ;;
-+ *.class) xform=class ;;
-+ *.cpp) xform=cpp ;;
-+ *.cxx) xform=cxx ;;
-+ *.f90) xform=f90 ;;
-+ *.for) xform=for ;;
-+ *.java) xform=java ;;
-+ esac
++/* }}} */
+
-+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
++PHP_FUNCTION(fastcgi_finish_request)
++{
++ fcgi_request *request = (fcgi_request*) SG(server_context);
+
-+ case $libobj in
-+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-+ *)
-+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
++ if (fcgi_is_fastcgi() && request->fd >= 0) {
+
-+ func_infer_tag $base_compile
++ php_end_ob_buffers(1 TSRMLS_CC);
++ php_header(TSRMLS_C);
+
-+ for arg in $later; do
-+ case $arg in
-+ -static)
-+ build_old_libs=yes
-+ continue
-+ ;;
++ fcgi_flush(request, 1);
++ fcgi_close(request, 0, 0);
++ RETURN_TRUE;
++ }
+
-+ -prefer-pic)
-+ pic_mode=yes
-+ continue
-+ ;;
++ RETURN_FALSE;
+
-+ -prefer-non-pic)
-+ pic_mode=no
-+ continue
-+ ;;
-+ esac
-+ done
++}
+
-+ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-+ if test "X$xdir" = "X$obj"; then
-+ xdir=
-+ else
-+ xdir=$xdir/
-+ fi
-+ lobj=${xdir}$objdir/$objname
++function_entry cgi_fcgi_sapi_functions[] = {
++ PHP_FE(fastcgi_finish_request, NULL)
++ {NULL, NULL, NULL}
++};
+
-+ if test -z "$base_compile"; then
-+ $echo "$modename: you must specify a compilation command" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++static zend_module_entry cgi_module_entry = {
++ STANDARD_MODULE_HEADER,
++ "cgi-fcgi",
++ cgi_fcgi_sapi_functions,
++ PHP_MINIT(cgi),
++ PHP_MSHUTDOWN(cgi),
++ NULL,
++ NULL,
++ PHP_MINFO(cgi),
++ NO_VERSION_YET,
++ STANDARD_MODULE_PROPERTIES
++};
+
-+ # Delete any leftover library objects.
-+ if test "$build_old_libs" = yes; then
-+ removelist="$obj $lobj $libobj ${libobj}T"
-+ else
-+ removelist="$lobj $libobj ${libobj}T"
-+ fi
++/* {{{ main
++ */
++int main(int argc, char *argv[])
++{
++ int free_query_string = 0;
++ int exit_status = SUCCESS;
++ int c;
++ zend_file_handle file_handle = {};
++ int retval;
++/* temporary locals */
++ int orig_optind = php_optind;
++ char *orig_optarg = php_optarg;
++ int ini_entries_len = 0;
+
-+ $run $rm $removelist
-+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
++/* end of temporary locals */
++#ifdef ZTS
++ void ***tsrm_ls;
++#endif
+
-+ # On Cygwin there's no "real" PIC flag so we must build both object types
-+ case $host_os in
-+ cygwin* | mingw* | pw32* | os2*)
-+ pic_mode=default
-+ ;;
-+ esac
-+ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-+ # non-PIC code in shared libraries is not supported
-+ pic_mode=default
-+ fi
++ int max_requests = 500;
++ int requests = 0;
++ int fcgi_fd = 0;
++ fcgi_request request;
++ char *fpm_config = NULL;
+
-+ # Calculate the filename of the output object if compiler does
-+ # not support -o with -c
-+ if test "$compiler_c_o" = no; then
-+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-+ lockfile="$output_obj.lock"
-+ removelist="$removelist $output_obj $lockfile"
-+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-+ else
-+ output_obj=
-+ need_locks=no
-+ lockfile=
-+ fi
++#ifdef HAVE_SIGNAL_H
++#if defined(SIGPIPE) && defined(SIG_IGN)
++ signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE in standalone mode so
++ that sockets created via fsockopen()
++ don't kill PHP if the remote site
++ closes it. in apache|apxs mode apache
++ does that for us! thies@thieso.net
++ 20000419 */
++#endif
++#endif
+
-+ # Lock this critical section if it is needed
-+ # We use this script file to make the link, it avoids creating a new file
-+ if test "$need_locks" = yes; then
-+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-+ $show "Waiting for $lockfile to be removed"
-+ sleep 2
-+ done
-+ elif test "$need_locks" = warn; then
-+ if test -f "$lockfile"; then
-+ $echo "\
-+*** ERROR, $lockfile exists and contains:
-+`cat $lockfile 2>/dev/null`
-+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together. If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
-+
-+ $run $rm $removelist
-+ exit $EXIT_FAILURE
-+ fi
-+ $echo $srcfile > "$lockfile"
-+ fi
++#ifdef ZTS
++ tsrm_startup(1, 1, 0, NULL);
++ tsrm_ls = ts_resource(0);
++#endif
+
-+ if test -n "$fix_srcfile_path"; then
-+ eval srcfile=\"$fix_srcfile_path\"
-+ fi
++ sapi_startup(&cgi_sapi_module);
++ cgi_sapi_module.php_ini_path_override = NULL;
+
-+ $run $rm "$libobj" "${libobj}T"
-+
-+ # Create a libtool object file (analogous to a ".la" file),
-+ # but don't create it if we're doing a dry run.
-+ test -z "$run" && cat > ${libobj}T <<EOF
-+# $libobj - a libtool object file
-+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# Name of the PIC object.
-+EOF
-+
-+ # Only build a PIC object if we are building libtool libraries.
-+ if test "$build_libtool_libs" = yes; then
-+ # Without this assignment, base_compile gets emptied.
-+ fbsd_hideous_sh_bug=$base_compile
-+
-+ if test "$pic_mode" != no; then
-+ command="$base_compile $srcfile $pic_flag"
-+ else
-+ # Don't build PIC code
-+ command="$base_compile $srcfile"
-+ fi
++#ifdef PHP_WIN32
++ _fmode = _O_BINARY; /* sets default for file streams to binary */
++ setmode(_fileno(stdin), O_BINARY); /* make the stdio mode be binary */
++ setmode(_fileno(stdout), O_BINARY); /* make the stdio mode be binary */
++ setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be binary */
++#endif
+
-+ if test ! -d "${xdir}$objdir"; then
-+ $show "$mkdir ${xdir}$objdir"
-+ $run $mkdir ${xdir}$objdir
-+ status=$?
-+ if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-+ exit $status
-+ fi
-+ fi
++ while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0)) != -1) {
++ switch (c) {
+
-+ if test -z "$output_obj"; then
-+ # Place PIC objects in $objdir
-+ command="$command -o $lobj"
-+ fi
++ case 'c':
++ if (cgi_sapi_module.php_ini_path_override) {
++ free(cgi_sapi_module.php_ini_path_override);
++ }
++ cgi_sapi_module.php_ini_path_override = strdup(php_optarg);
++ break;
+
-+ $run $rm "$lobj" "$output_obj"
++ case 'n':
++ cgi_sapi_module.php_ini_ignore = 1;
++ break;
+
-+ $show "$command"
-+ if $run eval "$command"; then :
-+ else
-+ test -n "$output_obj" && $run $rm $removelist
-+ exit $EXIT_FAILURE
-+ fi
++ case 'C': /* don't chdir to the script directory */
++ SG(options) |= SAPI_OPTION_NO_CHDIR;
++ break;
+
-+ if test "$need_locks" = warn &&
-+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-+ $echo "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
++ case 'd': {
++ /* define ini entries on command line */
++ int len = strlen(php_optarg);
++ char *val;
++
++ if ((val = strchr(php_optarg, '='))) {
++ val++;
++ if (!isalnum(*val) && *val != '"' && *val != '\'' && *val != '\0') {
++ cgi_sapi_module.ini_entries = realloc(cgi_sapi_module.ini_entries, ini_entries_len + len + sizeof("\"\"\n\0"));
++ memcpy(cgi_sapi_module.ini_entries + ini_entries_len, php_optarg, (val - php_optarg));
++ ini_entries_len += (val - php_optarg);
++ memcpy(cgi_sapi_module.ini_entries + ini_entries_len, "\"", 1);
++ ini_entries_len++;
++ memcpy(cgi_sapi_module.ini_entries + ini_entries_len, val, len - (val - php_optarg));
++ ini_entries_len += len - (val - php_optarg);
++ memcpy(cgi_sapi_module.ini_entries + ini_entries_len, "\"\n\0", sizeof("\"\n\0"));
++ ini_entries_len += sizeof("\n\0\"") - 2;
++ } else {
++ cgi_sapi_module.ini_entries = realloc(cgi_sapi_module.ini_entries, ini_entries_len + len + sizeof("\n\0"));
++ memcpy(cgi_sapi_module.ini_entries + ini_entries_len, php_optarg, len);
++ memcpy(cgi_sapi_module.ini_entries + ini_entries_len + len, "\n\0", sizeof("\n\0"));
++ ini_entries_len += len + sizeof("\n\0") - 2;
++ }
++ } else {
++ cgi_sapi_module.ini_entries = realloc(cgi_sapi_module.ini_entries, ini_entries_len + len + sizeof("=1\n\0"));
++ memcpy(cgi_sapi_module.ini_entries + ini_entries_len, php_optarg, len);
++ memcpy(cgi_sapi_module.ini_entries + ini_entries_len + len, "=1\n\0", sizeof("=1\n\0"));
++ ini_entries_len += len + sizeof("=1\n\0") - 2;
++ }
++ break;
++ }
+
-+but it should contain:
-+$srcfile
++ case 'y':
++ fpm_config = php_optarg;
++ break;
+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together. If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
++ case 'e': /* enable extended info output */
++ /* CG(extended_info) = 1; */ /* 5_2 */
++ CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO; /* 5_3 */
++ break;
+
-+ $run $rm $removelist
-+ exit $EXIT_FAILURE
-+ fi
++ case 'm': /* list compiled in modules */
++ cgi_sapi_module.startup(&cgi_sapi_module);
++ php_output_startup();
++ php_output_activate(TSRMLS_C);
++ SG(headers_sent) = 1;
++ php_printf("[PHP Modules]\n");
++ print_modules(TSRMLS_C);
++ php_printf("\n[Zend Modules]\n");
++ print_extensions(TSRMLS_C);
++ php_printf("\n");
++ php_end_ob_buffers(1 TSRMLS_CC);
++ exit_status = 0;
++ goto out;
++
++ case 'i': /* php info & quit */
++ cgi_sapi_module.startup(&cgi_sapi_module);
++ if (php_request_startup(TSRMLS_C) == FAILURE) {
++ SG(server_context) = NULL;
++ php_module_shutdown(TSRMLS_C);
++ return FAILURE;
++ }
++ SG(headers_sent) = 1;
++ SG(request_info).no_headers = 1;
++ php_print_info(0xFFFFFFFF TSRMLS_CC);
++ php_request_shutdown((void *) 0);
++ exit_status = 0;
++ goto out;
++
++ case 'h':
++ case '?':
++ cgi_sapi_module.startup(&cgi_sapi_module);
++ php_output_startup();
++ php_output_activate(TSRMLS_C);
++ SG(headers_sent) = 1;
++ php_cgi_usage(argv[0]);
++ php_end_ob_buffers(1 TSRMLS_CC);
++ exit_status = 0;
++ goto out;
++
++ case 'v': /* show php version & quit */
++ cgi_sapi_module.startup(&cgi_sapi_module);
++ if (php_request_startup(TSRMLS_C) == FAILURE) {
++ SG(server_context) = NULL;
++ php_module_shutdown(TSRMLS_C);
++ return FAILURE;
++ }
++ SG(headers_sent) = 1;
++ SG(request_info).no_headers = 1;
+
-+ # Just move the object if needed, then go on to compile the next one
-+ if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-+ $show "$mv $output_obj $lobj"
-+ if $run $mv $output_obj $lobj; then :
-+ else
-+ error=$?
-+ $run $rm $removelist
-+ exit $error
-+ fi
-+ fi
++#if SUHOSIN_PATCH
++#if ZEND_DEBUG
++ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++#else
++ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++#endif
++#else
++#if ZEND_DEBUG
++ php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++#else
++ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++#endif
++#endif
++ php_request_shutdown((void *) 0);
++ exit_status = 0;
++ goto out;
+
-+ # Append the name of the PIC object to the libtool object file.
-+ test -z "$run" && cat >> ${libobj}T <<EOF
-+pic_object='$objdir/$objname'
++ }
+
-+EOF
++ }
++ php_optind = orig_optind;
++ php_optarg = orig_optarg;
+
-+ # Allow error messages only from the first compilation.
-+ if test "$suppress_opt" = yes; then
-+ suppress_output=' >/dev/null 2>&1'
-+ fi
-+ else
-+ # No PIC object so indicate it doesn't exist in the libtool
-+ # object file.
-+ test -z "$run" && cat >> ${libobj}T <<EOF
-+pic_object=none
++#ifdef ZTS
++ SG(request_info).path_translated = NULL;
++#endif
+
-+EOF
-+ fi
++ cgi_sapi_module.executable_location = argv[0];
+
-+ # Only build a position-dependent object if we build old libraries.
-+ if test "$build_old_libs" = yes; then
-+ if test "$pic_mode" != yes; then
-+ # Don't build PIC code
-+ command="$base_compile $srcfile"
-+ else
-+ command="$base_compile $srcfile $pic_flag"
-+ fi
-+ if test "$compiler_c_o" = yes; then
-+ command="$command -o $obj"
-+ fi
++ /* startup after we get the above ini override se we get things right */
++ if (cgi_sapi_module.startup(&cgi_sapi_module) == FAILURE) {
++#ifdef ZTS
++ tsrm_shutdown();
++#endif
++ return FAILURE;
++ }
+
-+ # Suppress compiler output if we already did a PIC compilation.
-+ command="$command$suppress_output"
-+ $run $rm "$obj" "$output_obj"
-+ $show "$command"
-+ if $run eval "$command"; then :
-+ else
-+ $run $rm $removelist
-+ exit $EXIT_FAILURE
-+ fi
++ if (0 > fpm_init(argc, argv, fpm_config)) {
++ return FAILURE;
++ }
+
-+ if test "$need_locks" = warn &&
-+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-+ $echo "\
-+*** ERROR, $lockfile contains:
-+`cat $lockfile 2>/dev/null`
++ fcgi_fd = fpm_run(&max_requests);
+
-+but it should contain:
-+$srcfile
++ parent = 0;
+
-+This indicates that another process is trying to use the same
-+temporary object file, and libtool could not work around it because
-+your compiler does not support \`-c' and \`-o' together. If you
-+repeat this compilation, it may succeed, by chance, but you had better
-+avoid parallel builds (make -j) in this platform, or get a better
-+compiler."
++ fcgi_set_is_fastcgi(1);
+
-+ $run $rm $removelist
-+ exit $EXIT_FAILURE
-+ fi
++ /* make php call us to get _ENV vars */
++ php_php_import_environment_variables = php_import_environment_variables;
++ php_import_environment_variables = cgi_php_import_environment_variables;
+
-+ # Just move the object if needed
-+ if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-+ $show "$mv $output_obj $obj"
-+ if $run $mv $output_obj $obj; then :
-+ else
-+ error=$?
-+ $run $rm $removelist
-+ exit $error
-+ fi
-+ fi
++ /* library is already initialized, now init our request */
++ fcgi_init_request(&request, fcgi_fd);
+
-+ # Append the name of the non-PIC object the libtool object file.
-+ # Only append if the libtool object file exists.
-+ test -z "$run" && cat >> ${libobj}T <<EOF
-+# Name of the non-PIC object.
-+non_pic_object='$objname'
-+
-+EOF
-+ else
-+ # Append the name of the non-PIC object the libtool object file.
-+ # Only append if the libtool object file exists.
-+ test -z "$run" && cat >> ${libobj}T <<EOF
-+# Name of the non-PIC object.
-+non_pic_object=none
-+
-+EOF
-+ fi
++ zend_first_try {
+
-+ $run $mv "${libobj}T" "${libobj}"
++ /* start of FAST CGI loop */
++ /* Initialise FastCGI request structure */
++#ifdef PHP_WIN32
++ /* attempt to set security impersonation for fastcgi
++ will only happen on NT based OS, others will ignore it. */
++ if (fastcgi && CGIG(impersonate)) {
++ fcgi_impersonate();
++ }
++#endif
++ while (fcgi_accept_request(&request) >= 0) {
+
-+ # Unlock the critical section if it was locked
-+ if test "$need_locks" != no; then
-+ $run $rm "$lockfile"
-+ fi
++ request_body_fd = -1;
+
-+ exit $EXIT_SUCCESS
-+ ;;
-+
-+ # libtool link mode
-+ link | relink)
-+ modename="$modename: link"
-+ case $host in
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ # It is impossible to link a dll without this setting, and
-+ # we shouldn't force the makefile maintainer to figure out
-+ # which system we are compiling for in order to pass an extra
-+ # flag for every libtool invocation.
-+ # allow_undefined=no
-+
-+ # FIXME: Unfortunately, there are problems with the above when trying
-+ # to make a dll which has undefined symbols, in which case not
-+ # even a static library is built. For now, we need to specify
-+ # -no-undefined on the libtool link line when we can be certain
-+ # that all symbols are satisfied, otherwise we get a static library.
-+ allow_undefined=yes
-+ ;;
-+ *)
-+ allow_undefined=yes
-+ ;;
-+ esac
-+ libtool_args="$nonopt"
-+ base_compile="$nonopt $@"
-+ compile_command="$nonopt"
-+ finalize_command="$nonopt"
-+
-+ compile_rpath=
-+ finalize_rpath=
-+ compile_shlibpath=
-+ finalize_shlibpath=
-+ convenience=
-+ old_convenience=
-+ deplibs=
-+ old_deplibs=
-+ compiler_flags=
-+ linker_flags=
-+ dllsearchpath=
-+ lib_search_path=`pwd`
-+ inst_prefix_dir=
-+
-+ avoid_version=no
-+ dlfiles=
-+ dlprefiles=
-+ dlself=no
-+ export_dynamic=no
-+ export_symbols=
-+ export_symbols_regex=
-+ generated=
-+ libobjs=
-+ ltlibs=
-+ module=no
-+ no_install=no
-+ objs=
-+ non_pic_objects=
-+ precious_files_regex=
-+ prefer_static_libs=no
-+ preload=no
-+ prev=
-+ prevarg=
-+ release=
-+ rpath=
-+ xrpath=
-+ perm_rpath=
-+ temp_rpath=
-+ thread_safe=no
-+ vinfo=
-+ vinfo_number=no
-+
-+ func_infer_tag $base_compile
-+
-+ # We need to know -static, to get the right output filenames.
-+ for arg
-+ do
-+ case $arg in
-+ -all-static | -static)
-+ if test "X$arg" = "X-all-static"; then
-+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-+ fi
-+ if test -n "$link_static_flag"; then
-+ dlopen_self=$dlopen_self_static
-+ fi
-+ else
-+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+ dlopen_self=$dlopen_self_static
-+ fi
-+ fi
-+ build_libtool_libs=no
-+ build_old_libs=yes
-+ prefer_static_libs=yes
-+ break
-+ ;;
-+ esac
-+ done
++ SG(server_context) = (void *) &request;
+
-+ # See if our shared archives depend on static archives.
-+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes
++ init_request_info(TSRMLS_C);
+
-+ # Go through the arguments, transforming them on the way.
-+ while test "$#" -gt 0; do
-+ arg="$1"
-+ shift
-+ case $arg in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-+ ;;
-+ *) qarg=$arg ;;
-+ esac
-+ libtool_args="$libtool_args $qarg"
-+
-+ # If the previous option needs an argument, assign it.
-+ if test -n "$prev"; then
-+ case $prev in
-+ output)
-+ compile_command="$compile_command @OUTPUT@"
-+ finalize_command="$finalize_command @OUTPUT@"
-+ ;;
-+ esac
-+
-+ case $prev in
-+ dlfiles|dlprefiles)
-+ if test "$preload" = no; then
-+ # Add the symbol object into the linking commands.
-+ compile_command="$compile_command @SYMFILE@"
-+ finalize_command="$finalize_command @SYMFILE@"
-+ preload=yes
-+ fi
-+ case $arg in
-+ *.la | *.lo) ;; # We handle these cases below.
-+ force)
-+ if test "$dlself" = no; then
-+ dlself=needless
-+ export_dynamic=yes
-+ fi
-+ prev=
-+ continue
-+ ;;
-+ self)
-+ if test "$prev" = dlprefiles; then
-+ dlself=yes
-+ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-+ dlself=yes
-+ else
-+ dlself=needless
-+ export_dynamic=yes
-+ fi
-+ prev=
-+ continue
-+ ;;
-+ *)
-+ if test "$prev" = dlfiles; then
-+ dlfiles="$dlfiles $arg"
-+ else
-+ dlprefiles="$dlprefiles $arg"
-+ fi
-+ prev=
-+ continue
-+ ;;
-+ esac
-+ ;;
-+ expsyms)
-+ export_symbols="$arg"
-+ if test ! -f "$arg"; then
-+ $echo "$modename: symbol file \`$arg' does not exist"
-+ exit $EXIT_FAILURE
-+ fi
-+ prev=
-+ continue
-+ ;;
-+ expsyms_regex)
-+ export_symbols_regex="$arg"
-+ prev=
-+ continue
-+ ;;
-+ inst_prefix)
-+ inst_prefix_dir="$arg"
-+ prev=
-+ continue
-+ ;;
-+ precious_regex)
-+ precious_files_regex="$arg"
-+ prev=
-+ continue
-+ ;;
-+ release)
-+ release="-$arg"
-+ prev=
-+ continue
-+ ;;
-+ objectlist)
-+ if test -f "$arg"; then
-+ save_arg=$arg
-+ moreargs=
-+ for fil in `cat $save_arg`
-+ do
-+# moreargs="$moreargs $fil"
-+ arg=$fil
-+ # A libtool-controlled object.
-+
-+ # Check to see that this really is a libtool object.
-+ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+ pic_object=
-+ non_pic_object=
-+
-+ # Read the .lo file
-+ # If there is no directory component, then add one.
-+ case $arg in
-+ */* | *\\*) . $arg ;;
-+ *) . ./$arg ;;
-+ esac
++ CG(interactive) = 0;
+
-+ if test -z "$pic_object" || \
-+ test -z "$non_pic_object" ||
-+ test "$pic_object" = none && \
-+ test "$non_pic_object" = none; then
-+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++ fpm_request_info();
+
-+ # Extract subdirectory from the argument.
-+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-+ if test "X$xdir" = "X$arg"; then
-+ xdir=
-+ else
-+ xdir="$xdir/"
-+ fi
++ /*
++ we never take stdin if we're (f)cgi, always
++ rely on the web server giving us the info
++ we need in the environment.
++ */
++ if (SG(request_info).path_translated) {
++ file_handle.type = ZEND_HANDLE_FILENAME;
++ file_handle.filename = SG(request_info).path_translated;
++ file_handle.handle.fp = NULL;
++ }
++ file_handle.opened_path = NULL;
++ file_handle.free_filename = 0;
++
++ /* request startup only after we've done all we can to
++ get path_translated */
++ if (php_request_startup(TSRMLS_C) == FAILURE) {
++ fcgi_finish_request(&request);
++ SG(server_context) = NULL;
++ php_module_shutdown(TSRMLS_C);
++ return FAILURE;
++ }
+
-+ if test "$pic_object" != none; then
-+ # Prepend the subdirectory the object is found in.
-+ pic_object="$xdir$pic_object"
-+
-+ if test "$prev" = dlfiles; then
-+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+ dlfiles="$dlfiles $pic_object"
-+ prev=
-+ continue
-+ else
-+ # If libtool objects are unsupported, then we need to preload.
-+ prev=dlprefiles
-+ fi
-+ fi
-+
-+ # CHECK ME: I think I busted this. -Ossama
-+ if test "$prev" = dlprefiles; then
-+ # Preload the old-style object.
-+ dlprefiles="$dlprefiles $pic_object"
-+ prev=
-+ fi
-+
-+ # A PIC object.
-+ libobjs="$libobjs $pic_object"
-+ arg="$pic_object"
-+ fi
++ /*
++ at this point path_translated will be set if:
++ 1. we are running from shell and got filename was there
++ 2. we are running as cgi or fastcgi
++ */
++ retval = FAILURE;
++ if (SG(request_info).path_translated) {
++ if (!php_check_open_basedir(SG(request_info).path_translated TSRMLS_CC)) {
++ retval = php_fopen_primary_script(&file_handle TSRMLS_CC);
++ }
++ }
++ /*
++ if we are unable to open path_translated and we are not
++ running from shell (so fp == NULL), then fail.
++ */
++ if (retval == FAILURE && file_handle.handle.fp == NULL) {
++ if (errno == EACCES) {
++ SG(sapi_headers).http_response_code = 403;
++ PUTS("Access denied.\n");
++ } else {
++ SG(sapi_headers).http_response_code = 404;
++ PUTS("No input file specified.\n");
++ }
++ /* we want to serve more requests if this is fastcgi
++ so cleanup and continue, request shutdown is
++ handled later */
++ goto fastcgi_request_done;
+
-+ # Non-PIC object.
-+ if test "$non_pic_object" != none; then
-+ # Prepend the subdirectory the object is found in.
-+ non_pic_object="$xdir$non_pic_object"
++ STR_FREE(SG(request_info).path_translated);
+
-+ # A standard non-PIC object
-+ non_pic_objects="$non_pic_objects $non_pic_object"
-+ if test -z "$pic_object" || test "$pic_object" = none ; then
-+ arg="$non_pic_object"
-+ fi
-+ fi
-+ else
-+ # Only an error if not doing a dry-run.
-+ if test -z "$run"; then
-+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-+ exit $EXIT_FAILURE
-+ else
-+ # Dry-run case.
-+
-+ # Extract subdirectory from the argument.
-+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-+ if test "X$xdir" = "X$arg"; then
-+ xdir=
-+ else
-+ xdir="$xdir/"
-+ fi
-+
-+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-+ libobjs="$libobjs $pic_object"
-+ non_pic_objects="$non_pic_objects $non_pic_object"
-+ fi
-+ fi
-+ done
-+ else
-+ $echo "$modename: link input file \`$save_arg' does not exist"
-+ exit $EXIT_FAILURE
-+ fi
-+ arg=$save_arg
-+ prev=
-+ continue
-+ ;;
-+ rpath | xrpath)
-+ # We need an absolute path.
-+ case $arg in
-+ [\\/]* | [A-Za-z]:[\\/]*) ;;
-+ *)
-+ $echo "$modename: only absolute run-paths are allowed" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+ if test "$prev" = rpath; then
-+ case "$rpath " in
-+ *" $arg "*) ;;
-+ *) rpath="$rpath $arg" ;;
-+ esac
-+ else
-+ case "$xrpath " in
-+ *" $arg "*) ;;
-+ *) xrpath="$xrpath $arg" ;;
-+ esac
-+ fi
-+ prev=
-+ continue
-+ ;;
-+ xcompiler)
-+ compiler_flags="$compiler_flags $qarg"
-+ prev=
-+ compile_command="$compile_command $qarg"
-+ finalize_command="$finalize_command $qarg"
-+ continue
-+ ;;
-+ xlinker)
-+ linker_flags="$linker_flags $qarg"
-+ compiler_flags="$compiler_flags $wl$qarg"
-+ prev=
-+ compile_command="$compile_command $wl$qarg"
-+ finalize_command="$finalize_command $wl$qarg"
-+ continue
-+ ;;
-+ xcclinker)
-+ linker_flags="$linker_flags $qarg"
-+ compiler_flags="$compiler_flags $qarg"
-+ prev=
-+ compile_command="$compile_command $qarg"
-+ finalize_command="$finalize_command $qarg"
-+ continue
-+ ;;
-+ shrext)
-+ shrext_cmds="$arg"
-+ prev=
-+ continue
-+ ;;
-+ darwin_framework)
-+ compiler_flags="$compiler_flags $arg"
-+ prev=
-+ continue
-+ ;;
-+ *)
-+ eval "$prev=\"\$arg\""
-+ prev=
-+ continue
-+ ;;
-+ esac
-+ fi # test -n "$prev"
-+
-+ prevarg="$arg"
-+
-+ case $arg in
-+ -all-static)
-+ if test -n "$link_static_flag"; then
-+ compile_command="$compile_command $link_static_flag"
-+ finalize_command="$finalize_command $link_static_flag"
-+ fi
-+ continue
-+ ;;
++ if (free_query_string && SG(request_info).query_string) {
++ free(SG(request_info).query_string);
++ SG(request_info).query_string = NULL;
++ }
+
-+ -allow-undefined)
-+ # FIXME: remove this flag sometime in the future.
-+ $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-+ continue
-+ ;;
++ php_request_shutdown((void *) 0);
++ SG(server_context) = NULL;
++ php_module_shutdown(TSRMLS_C);
++ sapi_shutdown();
++#ifdef ZTS
++ tsrm_shutdown();
++#endif
++ return FAILURE;
++ }
+
-+ -avoid-version)
-+ avoid_version=yes
-+ continue
-+ ;;
++ fpm_request_executing();
+
-+ -dlopen)
-+ prev=dlfiles
-+ continue
-+ ;;
++ php_execute_script(&file_handle TSRMLS_CC);
+
-+ -dlpreopen)
-+ prev=dlprefiles
-+ continue
-+ ;;
++fastcgi_request_done:
+
-+ -export-dynamic)
-+ export_dynamic=yes
-+ continue
-+ ;;
++ if (request_body_fd != -1) close(request_body_fd);
+
-+ -export-symbols | -export-symbols-regex)
-+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-+ $echo "$modename: more than one -exported-symbols argument is not allowed"
-+ exit $EXIT_FAILURE
-+ fi
-+ if test "X$arg" = "X-export-symbols"; then
-+ prev=expsyms
-+ else
-+ prev=expsyms_regex
-+ fi
-+ continue
-+ ;;
++ request_body_fd = -2;
+
-+ -framework)
-+ prev=darwin_framework
-+ compiler_flags="$compiler_flags $arg"
-+ continue
-+ ;;
++ {
++ char *path_translated;
+
-+ -inst-prefix-dir)
-+ prev=inst_prefix
-+ continue
-+ ;;
++ /* Go through this trouble so that the memory manager doesn't warn
++ * about SG(request_info).path_translated leaking
++ */
++ if (SG(request_info).path_translated) {
++ path_translated = strdup(SG(request_info).path_translated);
++ STR_FREE(SG(request_info).path_translated);
++ SG(request_info).path_translated = path_translated;
++ }
+
-+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-+ # so, if we see these flags be careful not to treat them like -L
-+ -L[A-Z][A-Z]*:*)
-+ case $with_gcc/$host in
-+ no/*-*-irix* | /*-*-irix*)
-+ compile_command="$compile_command $arg"
-+ finalize_command="$finalize_command $arg"
-+ ;;
-+ esac
-+ continue
-+ ;;
++ if (EG(exit_status) == 255) {
++ if (CGIG(error_header) && *CGIG(error_header)) {
++ sapi_header_line ctr = {0};
+
-+ -L*)
-+ dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-+ # We need an absolute path.
-+ case $dir in
-+ [\\/]* | [A-Za-z]:[\\/]*) ;;
-+ *)
-+ absdir=`cd "$dir" && pwd`
-+ if test -z "$absdir"; then
-+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ dir="$absdir"
-+ ;;
-+ esac
-+ case "$deplibs " in
-+ *" -L$dir "*) ;;
-+ *)
-+ deplibs="$deplibs -L$dir"
-+ lib_search_path="$lib_search_path $dir"
-+ ;;
-+ esac
-+ case $host in
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ case :$dllsearchpath: in
-+ *":$dir:"*) ;;
-+ *) dllsearchpath="$dllsearchpath:$dir";;
-+ esac
-+ ;;
-+ esac
-+ continue
-+ ;;
++ ctr.line = CGIG(error_header);
++ ctr.line_len = strlen(CGIG(error_header));
++ sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC);
++ }
++ }
++
++ php_request_shutdown((void *) 0);
++ if (exit_status == 0) {
++ exit_status = EG(exit_status);
++ }
+
-+ -l*)
-+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-+ case $host in
-+ *-*-cygwin* | *-*-pw32* | *-*-beos*)
-+ # These systems don't actually have a C or math library (as such)
-+ continue
-+ ;;
-+ *-*-mingw* | *-*-os2*)
-+ # These systems don't actually have a C library (as such)
-+ test "X$arg" = "X-lc" && continue
-+ ;;
-+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+ # Do not include libc due to us having libc/libc_r.
-+ test "X$arg" = "X-lc" && continue
-+ ;;
-+ *-*-rhapsody* | *-*-darwin1.[012])
-+ # Rhapsody C and math libraries are in the System framework
-+ deplibs="$deplibs -framework System"
-+ continue
-+ esac
-+ elif test "X$arg" = "X-lc_r"; then
-+ case $host in
-+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+ # Do not include libc_r directly, use -pthread flag.
-+ continue
-+ ;;
-+ esac
-+ fi
-+ deplibs="$deplibs $arg"
-+ continue
-+ ;;
++ if (SG(request_info).path_translated) {
++ free(SG(request_info).path_translated);
++ SG(request_info).path_translated = NULL;
++ }
++ if (free_query_string && SG(request_info).query_string) {
++ free(SG(request_info).query_string);
++ SG(request_info).query_string = NULL;
++ }
+
-+ # Tru64 UNIX uses -model [arg] to determine the layout of C++
-+ # classes, name mangling, and exception handling.
-+ -model)
-+ compile_command="$compile_command $arg"
-+ compiler_flags="$compiler_flags $arg"
-+ finalize_command="$finalize_command $arg"
-+ prev=xcompiler
-+ continue
-+ ;;
++ }
+
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ compiler_flags="$compiler_flags $arg"
-+ compile_command="$compile_command $arg"
-+ finalize_command="$finalize_command $arg"
-+ continue
-+ ;;
++ requests++;
++ if (max_requests && (requests == max_requests)) {
++ fcgi_finish_request(&request);
++ break;
++ }
+
-+ -module)
-+ module=yes
-+ continue
-+ ;;
++ /* end of fastcgi loop */
++ }
+
-+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+ # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+ # +DA*, +DD* enable 64-bit mode on the HP compiler
-+ # -q* pass through compiler args for the IBM compiler
-+ # -m* pass through architecture-specific compiler args for GCC
-+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
-+
-+ # Unknown arguments in both finalize_command and compile_command need
-+ # to be aesthetically quoted because they are evaled later.
-+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+ case $arg in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ arg="\"$arg\""
-+ ;;
-+ esac
-+ compile_command="$compile_command $arg"
-+ finalize_command="$finalize_command $arg"
-+ if test "$with_gcc" = "yes" ; then
-+ compiler_flags="$compiler_flags $arg"
-+ fi
-+ continue
-+ ;;
++ fcgi_shutdown();
+
-+ -shrext)
-+ prev=shrext
-+ continue
-+ ;;
++ if (fcgi_in_shutdown() || /* graceful shutdown by a signal */
++ (max_requests && (requests == max_requests)) /* we were told to process max_requests and we are done */
++ ) {
++ exit_status = 0;
++ }
++ else {
++ exit_status = 255;
++ }
+
-+ -no-fast-install)
-+ fast_install=no
-+ continue
-+ ;;
++ if (cgi_sapi_module.php_ini_path_override) {
++ free(cgi_sapi_module.php_ini_path_override);
++ }
++ if (cgi_sapi_module.ini_entries) {
++ free(cgi_sapi_module.ini_entries);
++ }
++ } zend_catch {
++ exit_status = 255;
++ } zend_end_try();
+
-+ -no-install)
-+ case $host in
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ # The PATH hackery in wrapper scripts is required on Windows
-+ # in order for the loader to find any dlls it needs.
-+ $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-+ $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-+ fast_install=no
-+ ;;
-+ *) no_install=yes ;;
-+ esac
-+ continue
-+ ;;
++out:
+
-+ -no-undefined)
-+ allow_undefined=no
-+ continue
-+ ;;
++ SG(server_context) = NULL;
++ php_module_shutdown(TSRMLS_C);
++ sapi_shutdown();
+
-+ -objectlist)
-+ prev=objectlist
-+ continue
-+ ;;
++#ifdef ZTS
++ /*tsrm_shutdown();*/
++#endif
+
-+ -o) prev=output ;;
++#if defined(PHP_WIN32) && ZEND_DEBUG && 0
++ _CrtDumpMemoryLeaks();
++#endif
+
-+ -precious-files-regex)
-+ prev=precious_regex
-+ continue
-+ ;;
++ return exit_status;
++}
++/* }}} */
+
-+ -release)
-+ prev=release
-+ continue
-+ ;;
++/*
++ * Local variables:
++ * tab-width: 4
++ * c-basic-offset: 4
++ * End:
++ * vim600: sw=4 ts=4 fdm=marker
++ * vim<600: sw=4 ts=4
++ */
+diff -Naur php-src-vanilla/sapi/fpm/cgi/CREDITS php-src/sapi/fpm/cgi/CREDITS
+--- php-src-vanilla/sapi/fpm/cgi/CREDITS 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/cgi/CREDITS 2009-10-18 21:05:39.302497288 +0100
+@@ -0,0 +1,2 @@
++CGI / FastCGI
++Rasmus Lerdorf, Stig Bakken, Shane Caraveo, Dmitry Stogov
+diff -Naur php-src-vanilla/sapi/fpm/cgi/fastcgi.c php-src/sapi/fpm/cgi/fastcgi.c
+--- php-src-vanilla/sapi/fpm/cgi/fastcgi.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/cgi/fastcgi.c 2009-10-18 21:05:39.302497288 +0100
+@@ -0,0 +1,1319 @@
++/*
++ +----------------------------------------------------------------------+
++ | PHP Version 5 |
++ +----------------------------------------------------------------------+
++ | Copyright (c) 1997-2008 The PHP Group |
++ +----------------------------------------------------------------------+
++ | This source file is subject to version 3.01 of the PHP license, |
++ | that is bundled with this package in the file LICENSE, and is |
++ | available through the world-wide-web at the following url: |
++ | http://www.php.net/license/3_01.txt |
++ | If you did not receive a copy of the PHP license and are unable to |
++ | obtain it through the world-wide-web, please send a note to |
++ | license@php.net so we can mail you a copy immediately. |
++ +----------------------------------------------------------------------+
++ | Authors: Dmitry Stogov <dmitry@zend.com> |
++ +----------------------------------------------------------------------+
++*/
+
-+ -rpath)
-+ prev=rpath
-+ continue
-+ ;;
++/* $Id$ */
+
-+ -R)
-+ prev=xrpath
-+ continue
-+ ;;
++#include <php.h>
++#include "fastcgi.h"
+
-+ -R*)
-+ dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-+ # We need an absolute path.
-+ case $dir in
-+ [\\/]* | [A-Za-z]:[\\/]*) ;;
-+ *)
-+ $echo "$modename: only absolute run-paths are allowed" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+ case "$xrpath " in
-+ *" $dir "*) ;;
-+ *) xrpath="$xrpath $dir" ;;
-+ esac
-+ continue
-+ ;;
++#include <string.h>
++#include <stdlib.h>
++#include <stdio.h>
++#include <stdarg.h>
++#include <errno.h>
+
-+ -static)
-+ # The effects of -static are defined in a previous loop.
-+ # We used to do the same as -all-static on platforms that
-+ # didn't have a PIC flag, but the assumption that the effects
-+ # would be equivalent was wrong. It would break on at least
-+ # Digital Unix and AIX.
-+ continue
-+ ;;
++#ifdef FPM_AUTOCONFIG_H
++#include <fpm_autoconfig.h>
++#else
++#include <php_config.h>
++#endif
++#include <fpm/fpm.h>
++#include <fpm/fpm_request.h>
+
-+ -thread-safe)
-+ thread_safe=yes
-+ continue
-+ ;;
++#ifdef _WIN32
+
-+ -version-info)
-+ prev=vinfo
-+ continue
-+ ;;
-+ -version-number)
-+ prev=vinfo
-+ vinfo_number=yes
-+ continue
-+ ;;
++#include <windows.h>
+
-+ -Wc,*)
-+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-+ arg=
-+ save_ifs="$IFS"; IFS=','
-+ for flag in $args; do
-+ IFS="$save_ifs"
-+ case $flag in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ flag="\"$flag\""
-+ ;;
-+ esac
-+ arg="$arg $wl$flag"
-+ compiler_flags="$compiler_flags $flag"
-+ done
-+ IFS="$save_ifs"
-+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+ ;;
++ typedef unsigned int in_addr_t;
+
-+ -Wl,*)
-+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-+ arg=
-+ save_ifs="$IFS"; IFS=','
-+ for flag in $args; do
-+ IFS="$save_ifs"
-+ case $flag in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ flag="\"$flag\""
-+ ;;
-+ esac
-+ arg="$arg $wl$flag"
-+ compiler_flags="$compiler_flags $wl$flag"
-+ linker_flags="$linker_flags $flag"
-+ done
-+ IFS="$save_ifs"
-+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+ ;;
++ struct sockaddr_un {
++ short sun_family;
++ char sun_path[MAXPATHLEN];
++ };
+
-+ -Xcompiler)
-+ prev=xcompiler
-+ continue
-+ ;;
++ static HANDLE fcgi_accept_mutex = INVALID_HANDLE_VALUE;
++ static int is_impersonate = 0;
+
-+ -Xlinker)
-+ prev=xlinker
-+ continue
-+ ;;
++#define FCGI_LOCK(fd) \
++ if (fcgi_accept_mutex != INVALID_HANDLE_VALUE) { \
++ DWORD ret; \
++ while ((ret = WaitForSingleObject(fcgi_accept_mutex, 1000)) == WAIT_TIMEOUT) { \
++ if (in_shutdown) return -1; \
++ } \
++ if (ret == WAIT_FAILED) { \
++ fprintf(stderr, "WaitForSingleObject() failed\n"); \
++ return -1; \
++ } \
++ }
+
-+ -XCClinker)
-+ prev=xcclinker
-+ continue
-+ ;;
++#define FCGI_UNLOCK(fd) \
++ if (fcgi_accept_mutex != INVALID_HANDLE_VALUE) { \
++ ReleaseMutex(fcgi_accept_mutex); \
++ }
+
-+ # Some other compiler flag.
-+ -* | +*)
-+ # Unknown arguments in both finalize_command and compile_command need
-+ # to be aesthetically quoted because they are evaled later.
-+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+ case $arg in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ arg="\"$arg\""
-+ ;;
-+ esac
-+ ;;
++#else
+
-+ *.$objext)
-+ # A standard object.
-+ objs="$objs $arg"
-+ ;;
++# include <sys/types.h>
++# include <sys/stat.h>
++# include <unistd.h>
++# include <fcntl.h>
++# include <sys/socket.h>
++# include <sys/un.h>
++# include <netinet/in.h>
++# include <arpa/inet.h>
++# include <netdb.h>
++# include <signal.h>
++
++# define closesocket(s) close(s)
++
++# if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
++# include <sys/poll.h>
++# endif
++# if defined(HAVE_SYS_SELECT_H)
++# include <sys/select.h>
++# endif
+
-+ *.lo)
-+ # A libtool-controlled object.
-+
-+ # Check to see that this really is a libtool object.
-+ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+ pic_object=
-+ non_pic_object=
-+
-+ # Read the .lo file
-+ # If there is no directory component, then add one.
-+ case $arg in
-+ */* | *\\*) . $arg ;;
-+ *) . ./$arg ;;
-+ esac
-+
-+ if test -z "$pic_object" || \
-+ test -z "$non_pic_object" ||
-+ test "$pic_object" = none && \
-+ test "$non_pic_object" = none; then
-+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+
-+ # Extract subdirectory from the argument.
-+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-+ if test "X$xdir" = "X$arg"; then
-+ xdir=
-+ else
-+ xdir="$xdir/"
-+ fi
-+
-+ if test "$pic_object" != none; then
-+ # Prepend the subdirectory the object is found in.
-+ pic_object="$xdir$pic_object"
-+
-+ if test "$prev" = dlfiles; then
-+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+ dlfiles="$dlfiles $pic_object"
-+ prev=
-+ continue
-+ else
-+ # If libtool objects are unsupported, then we need to preload.
-+ prev=dlprefiles
-+ fi
-+ fi
-+
-+ # CHECK ME: I think I busted this. -Ossama
-+ if test "$prev" = dlprefiles; then
-+ # Preload the old-style object.
-+ dlprefiles="$dlprefiles $pic_object"
-+ prev=
-+ fi
-+
-+ # A PIC object.
-+ libobjs="$libobjs $pic_object"
-+ arg="$pic_object"
-+ fi
-+
-+ # Non-PIC object.
-+ if test "$non_pic_object" != none; then
-+ # Prepend the subdirectory the object is found in.
-+ non_pic_object="$xdir$non_pic_object"
-+
-+ # A standard non-PIC object
-+ non_pic_objects="$non_pic_objects $non_pic_object"
-+ if test -z "$pic_object" || test "$pic_object" = none ; then
-+ arg="$non_pic_object"
-+ fi
-+ fi
-+ else
-+ # Only an error if not doing a dry-run.
-+ if test -z "$run"; then
-+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-+ exit $EXIT_FAILURE
-+ else
-+ # Dry-run case.
-+
-+ # Extract subdirectory from the argument.
-+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-+ if test "X$xdir" = "X$arg"; then
-+ xdir=
-+ else
-+ xdir="$xdir/"
-+ fi
-+
-+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-+ libobjs="$libobjs $pic_object"
-+ non_pic_objects="$non_pic_objects $non_pic_object"
-+ fi
-+ fi
-+ ;;
++#ifndef INADDR_NONE
++#define INADDR_NONE ((unsigned long) -1)
++#endif
+
-+ *.$libext)
-+ # An archive.
-+ deplibs="$deplibs $arg"
-+ old_deplibs="$old_deplibs $arg"
-+ continue
-+ ;;
++# ifndef HAVE_SOCKLEN_T
++ typedef unsigned int socklen_t;
++# endif
+
-+ *.la)
-+ # A libtool-controlled library.
-+
-+ if test "$prev" = dlfiles; then
-+ # This library was specified with -dlopen.
-+ dlfiles="$dlfiles $arg"
-+ prev=
-+ elif test "$prev" = dlprefiles; then
-+ # The library was specified with -dlpreopen.
-+ dlprefiles="$dlprefiles $arg"
-+ prev=
-+ else
-+ deplibs="$deplibs $arg"
-+ fi
-+ continue
-+ ;;
++# ifdef USE_LOCKING
++# define FCGI_LOCK(fd) \
++ do { \
++ struct flock lock; \
++ lock.l_type = F_WRLCK; \
++ lock.l_start = 0; \
++ lock.l_whence = SEEK_SET; \
++ lock.l_len = 0; \
++ if (fcntl(fd, F_SETLKW, &lock) != -1) { \
++ break; \
++ } else if (errno != EINTR || in_shutdown) { \
++ return -1; \
++ } \
++ } while (1)
++
++# define FCGI_UNLOCK(fd) \
++ do { \
++ int orig_errno = errno; \
++ while (1) { \
++ struct flock lock; \
++ lock.l_type = F_UNLCK; \
++ lock.l_start = 0; \
++ lock.l_whence = SEEK_SET; \
++ lock.l_len = 0; \
++ if (fcntl(fd, F_SETLK, &lock) != -1) { \
++ break; \
++ } else if (errno != EINTR) { \
++ return -1; \
++ } \
++ } \
++ errno = orig_errno; \
++ } while (0)
++# else
++# define FCGI_LOCK(fd)
++# define FCGI_UNLOCK(fd)
++# endif
+
-+ # Some other compiler argument.
-+ *)
-+ # Unknown arguments in both finalize_command and compile_command need
-+ # to be aesthetically quoted because they are evaled later.
-+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+ case $arg in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ arg="\"$arg\""
-+ ;;
-+ esac
-+ ;;
-+ esac # arg
++#endif
+
-+ # Now actually substitute the argument into the commands.
-+ if test -n "$arg"; then
-+ compile_command="$compile_command $arg"
-+ finalize_command="$finalize_command $arg"
-+ fi
-+ done # argument parsing loop
++typedef union _sa_t {
++ struct sockaddr sa;
++ struct sockaddr_un sa_unix;
++ struct sockaddr_in sa_inet;
++} sa_t;
+
-+ if test -n "$prev"; then
-+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++static HashTable *fcgi_mgmt_vars;
+
-+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-+ eval arg=\"$export_dynamic_flag_spec\"
-+ compile_command="$compile_command $arg"
-+ finalize_command="$finalize_command $arg"
-+ fi
++static int is_initialized = 0;
++static int is_fastcgi = 0;
++static int in_shutdown = 0;
++static in_addr_t *allowed_clients = NULL;
+
-+ oldlibs=
-+ # calculate the name of the file, without its directory
-+ outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-+ libobjs_save="$libobjs"
++#ifdef _WIN32
+
-+ if test -n "$shlibpath_var"; then
-+ # get the directories listed in $shlibpath_var
-+ eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+ else
-+ shlib_search_path=
-+ fi
-+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-+
-+ output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-+ if test "X$output_objdir" = "X$output"; then
-+ output_objdir="$objdir"
-+ else
-+ output_objdir="$output_objdir/$objdir"
-+ fi
-+ # Create the object directory.
-+ if test ! -d "$output_objdir"; then
-+ $show "$mkdir $output_objdir"
-+ $run $mkdir $output_objdir
-+ status=$?
-+ if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-+ exit $status
-+ fi
-+ fi
++static DWORD WINAPI fcgi_shutdown_thread(LPVOID arg)
++{
++ HANDLE shutdown_event = (HANDLE) arg;
++ WaitForSingleObject(shutdown_event, INFINITE);
++ in_shutdown = 1;
++ return 0;
++}
+
-+ # Determine the type of output
-+ case $output in
-+ "")
-+ $echo "$modename: you must specify an output file" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ *.$libext) linkmode=oldlib ;;
-+ *.lo | *.$objext) linkmode=obj ;;
-+ *.la) linkmode=lib ;;
-+ *) linkmode=prog ;; # Anything else should be a program.
-+ esac
++#else
+
-+ case $host in
-+ *cygwin* | *mingw* | *pw32*)
-+ # don't eliminate duplications in $postdeps and $predeps
-+ duplicate_compiler_generated_deps=yes
-+ ;;
-+ *)
-+ duplicate_compiler_generated_deps=$duplicate_deps
-+ ;;
-+ esac
-+ specialdeplibs=
-+
-+ libs=
-+ # Find all interdependent deplibs by searching for libraries
-+ # that are linked more than once (e.g. -la -lb -la)
-+ for deplib in $deplibs; do
-+ if test "X$duplicate_deps" = "Xyes" ; then
-+ case "$libs " in
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+ esac
-+ fi
-+ libs="$libs $deplib"
-+ done
++static void fcgi_signal_handler(int signo)
++{
++ if (signo == SIGUSR1 || signo == SIGTERM) {
++ in_shutdown = 1;
++ }
++}
+
-+ if test "$linkmode" = lib; then
-+ libs="$predeps $libs $compiler_lib_search_path $postdeps"
-+
-+ # Compute libraries that are listed more than once in $predeps
-+ # $postdeps and mark them as special (i.e., whose duplicates are
-+ # not to be eliminated).
-+ pre_post_deps=
-+ if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-+ for pre_post_dep in $predeps $postdeps; do
-+ case "$pre_post_deps " in
-+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-+ esac
-+ pre_post_deps="$pre_post_deps $pre_post_dep"
-+ done
-+ fi
-+ pre_post_deps=
-+ fi
++static void fcgi_setup_signals(void)
++{
++ struct sigaction new_sa, old_sa;
+
-+ deplibs=
-+ newdependency_libs=
-+ newlib_search_path=
-+ need_relink=no # whether we're linking any uninstalled libtool libraries
-+ notinst_deplibs= # not-installed libtool libraries
-+ notinst_path= # paths that contain not-installed libtool libraries
-+ case $linkmode in
-+ lib)
-+ passes="conv link"
-+ for file in $dlfiles $dlprefiles; do
-+ case $file in
-+ *.la) ;;
-+ *)
-+ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+ done
-+ ;;
-+ prog)
-+ compile_deplibs=
-+ finalize_deplibs=
-+ alldeplibs=no
-+ newdlfiles=
-+ newdlprefiles=
-+ passes="conv scan dlopen dlpreopen link"
-+ ;;
-+ *) passes="conv"
-+ ;;
-+ esac
-+ for pass in $passes; do
-+ if test "$linkmode,$pass" = "lib,link" ||
-+ test "$linkmode,$pass" = "prog,scan"; then
-+ libs="$deplibs"
-+ deplibs=
-+ fi
-+ if test "$linkmode" = prog; then
-+ case $pass in
-+ dlopen) libs="$dlfiles" ;;
-+ dlpreopen) libs="$dlprefiles" ;;
-+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+ esac
-+ fi
-+ if test "$pass" = dlopen; then
-+ # Collect dlpreopened libraries
-+ save_deplibs="$deplibs"
-+ deplibs=
-+ fi
-+ for deplib in $libs; do
-+ lib=
-+ found=no
-+ case $deplib in
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ compiler_flags="$compiler_flags $deplib"
-+ fi
-+ continue
-+ ;;
-+ -l*)
-+ if test "$linkmode" != lib && test "$linkmode" != prog; then
-+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-+ continue
-+ fi
-+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-+ for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+ for search_ext in .la $std_shrext .so .a; do
-+ # Search the libtool library
-+ lib="$searchdir/lib${name}${search_ext}"
-+ if test -f "$lib"; then
-+ if test "$search_ext" = ".la"; then
-+ found=yes
-+ else
-+ found=no
-+ fi
-+ break 2
-+ fi
-+ done
-+ done
-+ if test "$found" != yes; then
-+ # deplib doesn't seem to be a libtool library
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ deplibs="$deplib $deplibs"
-+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-+ fi
-+ continue
-+ else # deplib is a libtool library
-+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-+ # We need to do some special things here, and not later.
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ case " $predeps $postdeps " in
-+ *" $deplib "*)
-+ if (${SED} -e '2q' $lib |
-+ grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+ library_names=
-+ old_library=
-+ case $lib in
-+ */* | *\\*) . $lib ;;
-+ *) . ./$lib ;;
-+ esac
-+ for l in $old_library $library_names; do
-+ ll="$l"
-+ done
-+ if test "X$ll" = "X$old_library" ; then # only static version available
-+ found=no
-+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-+ test "X$ladir" = "X$lib" && ladir="."
-+ lib=$ladir/$old_library
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ deplibs="$deplib $deplibs"
-+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-+ fi
-+ continue
-+ fi
-+ fi
-+ ;;
-+ *) ;;
-+ esac
-+ fi
-+ fi
-+ ;; # -l
-+ -L*)
-+ case $linkmode in
-+ lib)
-+ deplibs="$deplib $deplibs"
-+ test "$pass" = conv && continue
-+ newdependency_libs="$deplib $newdependency_libs"
-+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-+ ;;
-+ prog)
-+ if test "$pass" = conv; then
-+ deplibs="$deplib $deplibs"
-+ continue
-+ fi
-+ if test "$pass" = scan; then
-+ deplibs="$deplib $deplibs"
-+ else
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ fi
-+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-+ ;;
-+ *)
-+ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-+ ;;
-+ esac # linkmode
-+ continue
-+ ;; # -L
-+ -R*)
-+ if test "$pass" = link; then
-+ dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-+ # Make sure the xrpath contains only unique directories.
-+ case "$xrpath " in
-+ *" $dir "*) ;;
-+ *) xrpath="$xrpath $dir" ;;
-+ esac
-+ fi
-+ deplibs="$deplib $deplibs"
-+ continue
-+ ;;
-+ *.la) lib="$deplib" ;;
-+ *.$libext)
-+ if test "$pass" = conv; then
-+ deplibs="$deplib $deplibs"
-+ continue
-+ fi
-+ case $linkmode in
-+ lib)
-+ valid_a_lib=no
-+ case $deplibs_check_method in
-+ match_pattern*)
-+ set dummy $deplibs_check_method
-+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+ if eval $echo \"$deplib\" 2>/dev/null \
-+ | $SED 10q \
-+ | $EGREP "$match_pattern_regex" > /dev/null; then
-+ valid_a_lib=yes
-+ fi
-+ ;;
-+ pass_all)
-+ valid_a_lib=yes
-+ ;;
-+ esac
-+ if test "$valid_a_lib" != yes; then
-+ $echo
-+ $echo "*** Warning: Trying to link with static lib archive $deplib."
-+ $echo "*** I have the capability to make that library automatically link in when"
-+ $echo "*** you link to this library. But I can only do this if you have a"
-+ $echo "*** shared version of the library, which you do not appear to have"
-+ $echo "*** because the file extensions .$libext of this argument makes me believe"
-+ $echo "*** that it is just a static archive that I should not used here."
-+ else
-+ $echo
-+ $echo "*** Warning: Linking the shared library $output against the"
-+ $echo "*** static library $deplib is not portable!"
-+ deplibs="$deplib $deplibs"
-+ fi
-+ continue
-+ ;;
-+ prog)
-+ if test "$pass" != link; then
-+ deplibs="$deplib $deplibs"
-+ else
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ fi
-+ continue
-+ ;;
-+ esac # linkmode
-+ ;; # *.$libext
-+ *.lo | *.$objext)
-+ if test "$pass" = conv; then
-+ deplibs="$deplib $deplibs"
-+ elif test "$linkmode" = prog; then
-+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+ # If there is no dlopen support or we're linking statically,
-+ # we need to preload.
-+ newdlprefiles="$newdlprefiles $deplib"
-+ compile_deplibs="$deplib $compile_deplibs"
-+ finalize_deplibs="$deplib $finalize_deplibs"
-+ else
-+ newdlfiles="$newdlfiles $deplib"
-+ fi
-+ fi
-+ continue
-+ ;;
-+ %DEPLIBS%)
-+ alldeplibs=yes
-+ continue
-+ ;;
-+ esac # case $deplib
-+ if test "$found" = yes || test -f "$lib"; then :
-+ else
-+ $echo "$modename: cannot find the library \`$lib'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++ sigemptyset(&new_sa.sa_mask);
++ new_sa.sa_flags = 0;
++ new_sa.sa_handler = fcgi_signal_handler;
++ sigaction(SIGUSR1, &new_sa, NULL);
++ sigaction(SIGTERM, &new_sa, NULL);
++ sigaction(SIGPIPE, NULL, &old_sa);
++ if (old_sa.sa_handler == SIG_DFL) {
++ sigaction(SIGPIPE, &new_sa, NULL);
++ }
++}
++#endif
+
-+ # Check to see that this really is a libtool archive.
-+ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+ else
-+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++int fcgi_in_shutdown(void)
++{
++ return in_shutdown;
++}
+
-+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-+ test "X$ladir" = "X$lib" && ladir="."
-+
-+ dlname=
-+ dlopen=
-+ dlpreopen=
-+ libdir=
-+ library_names=
-+ old_library=
-+ # If the library was installed with an old release of libtool,
-+ # it will not redefine variables installed, or shouldnotlink
-+ installed=yes
-+ shouldnotlink=no
-+ avoidtemprpath=
-+
-+
-+ # Read the .la file
-+ case $lib in
-+ */* | *\\*) . $lib ;;
-+ *) . ./$lib ;;
-+ esac
-+
-+ if test "$linkmode,$pass" = "lib,link" ||
-+ test "$linkmode,$pass" = "prog,scan" ||
-+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-+ fi
++int fcgi_init(void)
++{
++ if (!is_initialized) {
++ fcgi_mgmt_vars = pemalloc(sizeof(HashTable), 1);
++ zend_hash_init(fcgi_mgmt_vars, 3, NULL, fcgi_free_mgmt_var_cb, 1);
++ fcgi_set_mgmt_var("FCGI_MAX_CONNS", sizeof("FCGI_MAX_CONNS")-1, "1", sizeof("1")-1);
++ fcgi_set_mgmt_var("FCGI_MAX_REQS", sizeof("FCGI_MAX_REQS")-1, "1", sizeof("1")-1);
++ fcgi_set_mgmt_var("FCGI_MPXS_CONNS", sizeof("FCGI_MPXS_CONNS")-1, "0", sizeof("0")-1);
++#ifdef _WIN32
++# if 0
++ /* TODO: Support for TCP sockets */
++ WSADATA wsaData;
+
-+ if test "$pass" = conv; then
-+ # Only check for convenience libraries
-+ deplibs="$lib $deplibs"
-+ if test -z "$libdir"; then
-+ if test -z "$old_library"; then
-+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ # It is a libtool convenience library, so add in its objects.
-+ convenience="$convenience $ladir/$objdir/$old_library"
-+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+ tmp_libs=
-+ for deplib in $dependency_libs; do
-+ deplibs="$deplib $deplibs"
-+ if test "X$duplicate_deps" = "Xyes" ; then
-+ case "$tmp_libs " in
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+ esac
-+ fi
-+ tmp_libs="$tmp_libs $deplib"
-+ done
-+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
-+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ continue
-+ fi # $pass = conv
-+
-+
-+ # Get the name of the library we link against.
-+ linklib=
-+ for l in $old_library $library_names; do
-+ linklib="$l"
-+ done
-+ if test -z "$linklib"; then
-+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++ if (WSAStartup(MAKEWORD(2,0), &wsaData)) {
++ fprintf(stderr, "Error starting Windows Sockets. Error: %d", WSAGetLastError());
++ return 0;
++ }
++# endif
++ is_initialized = 1;
++
++ if ((GetStdHandle(STD_OUTPUT_HANDLE) == INVALID_HANDLE_VALUE) &&
++ (GetStdHandle(STD_ERROR_HANDLE) == INVALID_HANDLE_VALUE) &&
++ (GetStdHandle(STD_INPUT_HANDLE) != INVALID_HANDLE_VALUE)) {
++ char *str;
++ DWORD pipe_mode = PIPE_READMODE_BYTE | PIPE_WAIT;
++ HANDLE pipe = GetStdHandle(STD_INPUT_HANDLE);
++
++ SetNamedPipeHandleState(pipe, &pipe_mode, NULL, NULL);
++
++ str = getenv("_FCGI_SHUTDOWN_EVENT_");
++ if (str != NULL) {
++ HANDLE shutdown_event = (HANDLE) atoi(str);
++ if (!CreateThread(NULL, 0, fcgi_shutdown_thread,
++ shutdown_event, 0, NULL)) {
++ return -1;
++ }
++ }
++ str = getenv("_FCGI_MUTEX_");
++ if (str != NULL) {
++ fcgi_accept_mutex = (HANDLE) atoi(str);
++ }
++ return is_fastcgi = 1;
++ } else {
++ return is_fastcgi = 0;
++ }
++#else
++ sa_t sa;
++ socklen_t len = sizeof(sa);
++
++ is_initialized = 1;
++ errno = 0;
++ if (getpeername(0, (struct sockaddr *)&sa, &len) != 0 && errno == ENOTCONN) {
++ fcgi_setup_signals();
++ return is_fastcgi = 1;
++ } else {
++ return is_fastcgi = 0;
++ }
+
-+ # This library was specified with -dlopen.
-+ if test "$pass" = dlopen; then
-+ if test -z "$libdir"; then
-+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ if test -z "$dlname" ||
-+ test "$dlopen_support" != yes ||
-+ test "$build_libtool_libs" = no; then
-+ # If there is no dlname, no dlopen support or we're linking
-+ # statically, we need to preload. We also need to preload any
-+ # dependent libraries so libltdl's deplib preloader doesn't
-+ # bomb out in the load deplibs phase.
-+ dlprefiles="$dlprefiles $lib $dependency_libs"
-+ else
-+ newdlfiles="$newdlfiles $lib"
-+ fi
-+ continue
-+ fi # $pass = dlopen
-+
-+ # We need an absolute path.
-+ case $ladir in
-+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-+ *)
-+ abs_ladir=`cd "$ladir" && pwd`
-+ if test -z "$abs_ladir"; then
-+ $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-+ $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-+ abs_ladir="$ladir"
-+ fi
-+ ;;
-+ esac
-+ laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+
-+ # Find the relevant object directory and library name.
-+ if test "X$installed" = Xyes; then
-+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+ $echo "$modename: warning: library \`$lib' was moved." 1>&2
-+ dir="$ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ else
-+ dir="$libdir"
-+ absdir="$libdir"
-+ fi
-+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-+ else
-+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+ dir="$ladir"
-+ absdir="$abs_ladir"
-+ # Remove this search path later
-+ notinst_path="$notinst_path $abs_ladir"
-+ else
-+ dir="$ladir/$objdir"
-+ absdir="$abs_ladir/$objdir"
-+ # Remove this search path later
-+ notinst_path="$notinst_path $abs_ladir"
-+ fi
-+ fi # $installed = yes
-+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-+
-+ # This library was specified with -dlpreopen.
-+ if test "$pass" = dlpreopen; then
-+ if test -z "$libdir"; then
-+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ # Prefer using a static library (so that no silly _DYNAMIC symbols
-+ # are required to link).
-+ if test -n "$old_library"; then
-+ newdlprefiles="$newdlprefiles $dir/$old_library"
-+ # Otherwise, use the dlname, so that lt_dlopen finds it.
-+ elif test -n "$dlname"; then
-+ newdlprefiles="$newdlprefiles $dir/$dlname"
-+ else
-+ newdlprefiles="$newdlprefiles $dir/$linklib"
-+ fi
-+ fi # $pass = dlpreopen
-+
-+ if test -z "$libdir"; then
-+ # Link the convenience library
-+ if test "$linkmode" = lib; then
-+ deplibs="$dir/$old_library $deplibs"
-+ elif test "$linkmode,$pass" = "prog,link"; then
-+ compile_deplibs="$dir/$old_library $compile_deplibs"
-+ finalize_deplibs="$dir/$old_library $finalize_deplibs"
-+ else
-+ deplibs="$lib $deplibs" # used for prog,scan pass
-+ fi
-+ continue
-+ fi
++ fcgi_set_allowed_clients(getenv("FCGI_WEB_SERVER_ADDRS"));
++#endif
++ }
++ return is_fastcgi;
++}
+
+
-+ if test "$linkmode" = prog && test "$pass" != link; then
-+ newlib_search_path="$newlib_search_path $ladir"
-+ deplibs="$lib $deplibs"
-+
-+ linkalldeplibs=no
-+ if test "$link_all_deplibs" != no || test -z "$library_names" ||
-+ test "$build_libtool_libs" = no; then
-+ linkalldeplibs=yes
-+ fi
-+
-+ tmp_libs=
-+ for deplib in $dependency_libs; do
-+ case $deplib in
-+ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-+ esac
-+ # Need to link against all dependency_libs?
-+ if test "$linkalldeplibs" = yes; then
-+ deplibs="$deplib $deplibs"
-+ else
-+ # Need to hardcode shared library paths
-+ # or/and link against static libraries
-+ newdependency_libs="$deplib $newdependency_libs"
-+ fi
-+ if test "X$duplicate_deps" = "Xyes" ; then
-+ case "$tmp_libs " in
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+ esac
-+ fi
-+ tmp_libs="$tmp_libs $deplib"
-+ done # for deplib
-+ continue
-+ fi # $linkmode = prog...
-+
-+ if test "$linkmode,$pass" = "prog,link"; then
-+ if test -n "$library_names" &&
-+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+ # We need to hardcode the library path
-+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-+ # Make sure the rpath contains only unique directories.
-+ case "$temp_rpath " in
-+ *" $dir "*) ;;
-+ *" $absdir "*) ;;
-+ *) temp_rpath="$temp_rpath $dir" ;;
-+ esac
-+ fi
-+
-+ # Hardcode the library path.
-+ # Skip directories that are in the system default run-time
-+ # search path.
-+ case " $sys_lib_dlsearch_path " in
-+ *" $absdir "*) ;;
-+ *)
-+ case "$compile_rpath " in
-+ *" $absdir "*) ;;
-+ *) compile_rpath="$compile_rpath $absdir"
-+ esac
-+ ;;
-+ esac
-+ case " $sys_lib_dlsearch_path " in
-+ *" $libdir "*) ;;
-+ *)
-+ case "$finalize_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_rpath="$finalize_rpath $libdir"
-+ esac
-+ ;;
-+ esac
-+ fi # $linkmode,$pass = prog,link...
-+
-+ if test "$alldeplibs" = yes &&
-+ { test "$deplibs_check_method" = pass_all ||
-+ { test "$build_libtool_libs" = yes &&
-+ test -n "$library_names"; }; }; then
-+ # We only need to search for static libraries
-+ continue
-+ fi
-+ fi
++int fcgi_is_fastcgi(void)
++{
++ if (!is_initialized) {
++ return fcgi_init();
++ } else {
++ return is_fastcgi;
++ }
++}
+
-+ link_static=no # Whether the deplib will be linked statically
-+ if test -n "$library_names" &&
-+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+ if test "$installed" = no; then
-+ notinst_deplibs="$notinst_deplibs $lib"
-+ need_relink=yes
-+ fi
-+ # This is a shared library
-+
-+ # Warn about portability, can't link against -module's on
-+ # some systems (darwin)
-+ if test "$shouldnotlink" = yes && test "$pass" = link ; then
-+ $echo
-+ if test "$linkmode" = prog; then
-+ $echo "*** Warning: Linking the executable $output against the loadable module"
-+ else
-+ $echo "*** Warning: Linking the shared library $output against the loadable module"
-+ fi
-+ $echo "*** $linklib is not portable!"
-+ fi
-+ if test "$linkmode" = lib &&
-+ test "$hardcode_into_libs" = yes; then
-+ # Hardcode the library path.
-+ # Skip directories that are in the system default run-time
-+ # search path.
-+ case " $sys_lib_dlsearch_path " in
-+ *" $absdir "*) ;;
-+ *)
-+ case "$compile_rpath " in
-+ *" $absdir "*) ;;
-+ *) compile_rpath="$compile_rpath $absdir"
-+ esac
-+ ;;
-+ esac
-+ case " $sys_lib_dlsearch_path " in
-+ *" $libdir "*) ;;
-+ *)
-+ case "$finalize_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_rpath="$finalize_rpath $libdir"
-+ esac
-+ ;;
-+ esac
-+ fi
-+
-+ if test -n "$old_archive_from_expsyms_cmds"; then
-+ # figure out the soname
-+ set dummy $library_names
-+ realname="$2"
-+ shift; shift
-+ libname=`eval \\$echo \"$libname_spec\"`
-+ # use dlname if we got it. it's perfectly good, no?
-+ if test -n "$dlname"; then
-+ soname="$dlname"
-+ elif test -n "$soname_spec"; then
-+ # bleh windows
-+ case $host in
-+ *cygwin* | mingw*)
-+ major=`expr $current - $age`
-+ versuffix="-$major"
-+ ;;
-+ esac
-+ eval soname=\"$soname_spec\"
-+ else
-+ soname="$realname"
-+ fi
-+
-+ # Make a new name for the extract_expsyms_cmds to use
-+ soroot="$soname"
-+ soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-+ newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-+
-+ # If the library has no export list, then create one now
-+ if test -f "$output_objdir/$soname-def"; then :
-+ else
-+ $show "extracting exported symbol list from \`$soname'"
-+ save_ifs="$IFS"; IFS='~'
-+ cmds=$extract_expsyms_cmds
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ $show "$cmd"
-+ $run eval "$cmd" || exit $?
-+ done
-+ IFS="$save_ifs"
-+ fi
-+
-+ # Create $newlib
-+ if test -f "$output_objdir/$newlib"; then :; else
-+ $show "generating import library for \`$soname'"
-+ save_ifs="$IFS"; IFS='~'
-+ cmds=$old_archive_from_expsyms_cmds
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ $show "$cmd"
-+ $run eval "$cmd" || exit $?
-+ done
-+ IFS="$save_ifs"
-+ fi
-+ # make sure the library variables are pointing to the new library
-+ dir=$output_objdir
-+ linklib=$newlib
-+ fi # test -n "$old_archive_from_expsyms_cmds"
-+
-+ if test "$linkmode" = prog || test "$mode" != relink; then
-+ add_shlibpath=
-+ add_dir=
-+ add=
-+ lib_linked=yes
-+ case $hardcode_action in
-+ immediate | unsupported)
-+ if test "$hardcode_direct" = no; then
-+ add="$dir/$linklib"
-+ case $host in
-+ *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-+ *-*-darwin* )
-+ # if the lib is a module then we can not link against
-+ # it, someone is ignoring the new warnings I added
-+ if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
-+ $echo "** Warning, lib $linklib is a module, not a shared library"
-+ if test -z "$old_library" ; then
-+ $echo
-+ $echo "** And there doesn't seem to be a static archive available"
-+ $echo "** The link will probably fail, sorry"
-+ else
-+ add="$dir/$old_library"
-+ fi
-+ fi
-+ esac
-+ elif test "$hardcode_minus_L" = no; then
-+ case $host in
-+ *-*-sunos*) add_shlibpath="$dir" ;;
-+ esac
-+ add_dir="-L$dir"
-+ add="-l$name"
-+ elif test "$hardcode_shlibpath_var" = no; then
-+ add_shlibpath="$dir"
-+ add="-l$name"
-+ else
-+ lib_linked=no
-+ fi
-+ ;;
-+ relink)
-+ if test "$hardcode_direct" = yes; then
-+ add="$dir/$linklib"
-+ elif test "$hardcode_minus_L" = yes; then
-+ add_dir="-L$dir"
-+ # Try looking first in the location we're being installed to.
-+ if test -n "$inst_prefix_dir"; then
-+ case "$libdir" in
-+ [\\/]*)
-+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+ ;;
-+ esac
-+ fi
-+ add="-l$name"
-+ elif test "$hardcode_shlibpath_var" = yes; then
-+ add_shlibpath="$dir"
-+ add="-l$name"
-+ else
-+ lib_linked=no
-+ fi
-+ ;;
-+ *) lib_linked=no ;;
-+ esac
-+
-+ if test "$lib_linked" != yes; then
-+ $echo "$modename: configuration error: unsupported hardcode properties"
-+ exit $EXIT_FAILURE
-+ fi
-+
-+ if test -n "$add_shlibpath"; then
-+ case :$compile_shlibpath: in
-+ *":$add_shlibpath:"*) ;;
-+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-+ esac
-+ fi
-+ if test "$linkmode" = prog; then
-+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-+ test -n "$add" && compile_deplibs="$add $compile_deplibs"
-+ else
-+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+ test -n "$add" && deplibs="$add $deplibs"
-+ if test "$hardcode_direct" != yes && \
-+ test "$hardcode_minus_L" != yes && \
-+ test "$hardcode_shlibpath_var" = yes; then
-+ case :$finalize_shlibpath: in
-+ *":$libdir:"*) ;;
-+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+ esac
-+ fi
-+ fi
-+ fi
-+
-+ if test "$linkmode" = prog || test "$mode" = relink; then
-+ add_shlibpath=
-+ add_dir=
-+ add=
-+ # Finalize command for both is simple: just hardcode it.
-+ if test "$hardcode_direct" = yes; then
-+ add="$libdir/$linklib"
-+ elif test "$hardcode_minus_L" = yes; then
-+ add_dir="-L$libdir"
-+ add="-l$name"
-+ elif test "$hardcode_shlibpath_var" = yes; then
-+ case :$finalize_shlibpath: in
-+ *":$libdir:"*) ;;
-+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-+ esac
-+ add="-l$name"
-+ elif test "$hardcode_automatic" = yes; then
-+ if test -n "$inst_prefix_dir" &&
-+ test -f "$inst_prefix_dir$libdir/$linklib" ; then
-+ add="$inst_prefix_dir$libdir/$linklib"
-+ else
-+ add="$libdir/$linklib"
-+ fi
-+ else
-+ # We cannot seem to hardcode it, guess we'll fake it.
-+ add_dir="-L$libdir"
-+ # Try looking first in the location we're being installed to.
-+ if test -n "$inst_prefix_dir"; then
-+ case "$libdir" in
-+ [\\/]*)
-+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+ ;;
-+ esac
-+ fi
-+ add="-l$name"
-+ fi
-+
-+ if test "$linkmode" = prog; then
-+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-+ else
-+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
-+ test -n "$add" && deplibs="$add $deplibs"
-+ fi
-+ fi
-+ elif test "$linkmode" = prog; then
-+ # Here we assume that one of hardcode_direct or hardcode_minus_L
-+ # is not unsupported. This is valid on all known static and
-+ # shared platforms.
-+ if test "$hardcode_direct" != unsupported; then
-+ test -n "$old_library" && linklib="$old_library"
-+ compile_deplibs="$dir/$linklib $compile_deplibs"
-+ finalize_deplibs="$dir/$linklib $finalize_deplibs"
-+ else
-+ compile_deplibs="-l$name -L$dir $compile_deplibs"
-+ finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-+ fi
-+ elif test "$build_libtool_libs" = yes; then
-+ # Not a shared library
-+ if test "$deplibs_check_method" != pass_all; then
-+ # We're trying link a shared library against a static one
-+ # but the system doesn't support it.
-+
-+ # Just print a warning and add the library to dependency_libs so
-+ # that the program can be linked against the static library.
-+ $echo
-+ $echo "*** Warning: This system can not link to static lib archive $lib."
-+ $echo "*** I have the capability to make that library automatically link in when"
-+ $echo "*** you link to this library. But I can only do this if you have a"
-+ $echo "*** shared version of the library, which you do not appear to have."
-+ if test "$module" = yes; then
-+ $echo "*** But as you try to build a module library, libtool will still create "
-+ $echo "*** a static module, that should work as long as the dlopening application"
-+ $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-+ if test -z "$global_symbol_pipe"; then
-+ $echo
-+ $echo "*** However, this would only work if libtool was able to extract symbol"
-+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+ $echo "*** not find such a program. So, this module is probably useless."
-+ $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+ fi
-+ if test "$build_old_libs" = no; then
-+ build_libtool_libs=module
-+ build_old_libs=yes
-+ else
-+ build_libtool_libs=no
-+ fi
-+ fi
-+ else
-+ convenience="$convenience $dir/$old_library"
-+ old_convenience="$old_convenience $dir/$old_library"
-+ deplibs="$dir/$old_library $deplibs"
-+ link_static=yes
-+ fi
-+ fi # link shared/static library?
-+
-+ if test "$linkmode" = lib; then
-+ if test -n "$dependency_libs" &&
-+ { test "$hardcode_into_libs" != yes ||
-+ test "$build_old_libs" = yes ||
-+ test "$link_static" = yes; }; then
-+ # Extract -R from dependency_libs
-+ temp_deplibs=
-+ for libdir in $dependency_libs; do
-+ case $libdir in
-+ -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-+ case " $xrpath " in
-+ *" $temp_xrpath "*) ;;
-+ *) xrpath="$xrpath $temp_xrpath";;
-+ esac;;
-+ *) temp_deplibs="$temp_deplibs $libdir";;
-+ esac
-+ done
-+ dependency_libs="$temp_deplibs"
-+ fi
-+
-+ newlib_search_path="$newlib_search_path $absdir"
-+ # Link against this library
-+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-+ # ... and its dependency_libs
-+ tmp_libs=
-+ for deplib in $dependency_libs; do
-+ newdependency_libs="$deplib $newdependency_libs"
-+ if test "X$duplicate_deps" = "Xyes" ; then
-+ case "$tmp_libs " in
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+ esac
-+ fi
-+ tmp_libs="$tmp_libs $deplib"
-+ done
-+
-+ if test "$link_all_deplibs" != no; then
-+ # Add the search paths of all dependency libraries
-+ for deplib in $dependency_libs; do
-+ case $deplib in
-+ -L*) path="$deplib" ;;
-+ *.la)
-+ dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-+ test "X$dir" = "X$deplib" && dir="."
-+ # We need an absolute path.
-+ case $dir in
-+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-+ *)
-+ absdir=`cd "$dir" && pwd`
-+ if test -z "$absdir"; then
-+ $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-+ absdir="$dir"
-+ fi
-+ ;;
-+ esac
-+ if grep "^installed=no" $deplib > /dev/null; then
-+ path="$absdir/$objdir"
-+ else
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+ if test -z "$libdir"; then
-+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ if test "$absdir" != "$libdir"; then
-+ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+ fi
-+ path="$absdir"
-+ fi
-+ depdepl=
-+ case $host in
-+ *-*-darwin*)
-+ # we do not want to link against static libs,
-+ # but need to link against shared
-+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+ if test -n "$deplibrary_names" ; then
-+ for tmp in $deplibrary_names ; do
-+ depdepl=$tmp
-+ done
-+ if test -f "$path/$depdepl" ; then
-+ depdepl="$path/$depdepl"
-+ fi
-+ # do not add paths which are already there
-+ case " $newlib_search_path " in
-+ *" $path "*) ;;
-+ *) newlib_search_path="$newlib_search_path $path";;
-+ esac
-+ fi
-+ path=""
-+ ;;
-+ *)
-+ path="-L$path"
-+ ;;
-+ esac
-+ ;;
-+ -l*)
-+ case $host in
-+ *-*-darwin*)
-+ # Again, we only want to link against shared libraries
-+ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-+ for tmp in $newlib_search_path ; do
-+ if test -f "$tmp/lib$tmp_libs.dylib" ; then
-+ eval depdepl="$tmp/lib$tmp_libs.dylib"
-+ break
-+ fi
-+ done
-+ path=""
-+ ;;
-+ *) continue ;;
-+ esac
-+ ;;
-+ *) continue ;;
-+ esac
-+ case " $deplibs " in
-+ *" $depdepl "*) ;;
-+ *) deplibs="$depdepl $deplibs" ;;
-+ esac
-+ case " $deplibs " in
-+ *" $path "*) ;;
-+ *) deplibs="$deplibs $path" ;;
-+ esac
-+ done
-+ fi # link_all_deplibs != no
-+ fi # linkmode = lib
-+ done # for deplib in $libs
-+ dependency_libs="$newdependency_libs"
-+ if test "$pass" = dlpreopen; then
-+ # Link the dlpreopened libraries before other libraries
-+ for deplib in $save_deplibs; do
-+ deplibs="$deplib $deplibs"
-+ done
-+ fi
-+ if test "$pass" != dlopen; then
-+ if test "$pass" != conv; then
-+ # Make sure lib_search_path contains only unique directories.
-+ lib_search_path=
-+ for dir in $newlib_search_path; do
-+ case "$lib_search_path " in
-+ *" $dir "*) ;;
-+ *) lib_search_path="$lib_search_path $dir" ;;
-+ esac
-+ done
-+ newlib_search_path=
-+ fi
++void fcgi_set_is_fastcgi(int new_value)
++{
++ is_fastcgi = new_value;
++}
+
-+ if test "$linkmode,$pass" != "prog,link"; then
-+ vars="deplibs"
-+ else
-+ vars="compile_deplibs finalize_deplibs"
-+ fi
-+ for var in $vars dependency_libs; do
-+ # Add libraries to $var in reverse order
-+ eval tmp_libs=\"\$$var\"
-+ new_libs=
-+ for deplib in $tmp_libs; do
-+ # FIXME: Pedantically, this is the right thing to do, so
-+ # that some nasty dependency loop isn't accidentally
-+ # broken:
-+ #new_libs="$deplib $new_libs"
-+ # Pragmatically, this seems to cause very few problems in
-+ # practice:
-+ case $deplib in
-+ -L*) new_libs="$deplib $new_libs" ;;
-+ -R*) ;;
-+ *)
-+ # And here is the reason: when a library appears more
-+ # than once as an explicit dependence of a library, or
-+ # is implicitly linked in more than once by the
-+ # compiler, it is considered special, and multiple
-+ # occurrences thereof are not removed. Compare this
-+ # with having the same library being listed as a
-+ # dependency of multiple other libraries: in this case,
-+ # we know (pedantically, we assume) the library does not
-+ # need to be listed more than once, so we keep only the
-+ # last copy. This is not always right, but it is rare
-+ # enough that we require users that really mean to play
-+ # such unportable linking tricks to link the library
-+ # using -Wl,-lname, so that libtool does not consider it
-+ # for duplicate removal.
-+ case " $specialdeplibs " in
-+ *" $deplib "*) new_libs="$deplib $new_libs" ;;
-+ *)
-+ case " $new_libs " in
-+ *" $deplib "*) ;;
-+ *) new_libs="$deplib $new_libs" ;;
-+ esac
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ done
-+ tmp_libs=
-+ for deplib in $new_libs; do
-+ case $deplib in
-+ -L*)
-+ case " $tmp_libs " in
-+ *" $deplib "*) ;;
-+ *) tmp_libs="$tmp_libs $deplib" ;;
-+ esac
-+ ;;
-+ *) tmp_libs="$tmp_libs $deplib" ;;
-+ esac
-+ done
-+ eval $var=\"$tmp_libs\"
-+ done # for var
-+ fi
-+ # Last step: remove runtime libs from dependency_libs
-+ # (they stay in deplibs)
-+ tmp_libs=
-+ for i in $dependency_libs ; do
-+ case " $predeps $postdeps $compiler_lib_search_path " in
-+ *" $i "*)
-+ i=""
-+ ;;
-+ esac
-+ if test -n "$i" ; then
-+ tmp_libs="$tmp_libs $i"
-+ fi
-+ done
-+ dependency_libs=$tmp_libs
-+ done # for pass
-+ if test "$linkmode" = prog; then
-+ dlfiles="$newdlfiles"
-+ dlprefiles="$newdlprefiles"
-+ fi
++void fcgi_set_in_shutdown(int new_value)
++{
++ in_shutdown = new_value;
++}
+
-+ case $linkmode in
-+ oldlib)
-+ if test -n "$deplibs"; then
-+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-+ fi
++void fcgi_shutdown(void)
++{
++ if (is_initialized) {
++ zend_hash_destroy(fcgi_mgmt_vars);
++ pefree(fcgi_mgmt_vars, 1);
++ }
++ is_fastcgi = 0;
+
-+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-+ fi
++ if (allowed_clients) {
++ free(allowed_clients);
++ allowed_clients = 0;
++ }
++}
+
-+ if test -n "$rpath"; then
-+ $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-+ fi
++#ifdef _WIN32
++/* Do some black magic with the NT security API.
++ * We prepare a DACL (Discretionary Access Control List) so that
++ * we, the creator, are allowed all access, while "Everyone Else"
++ * is only allowed to read and write to the pipe.
++ * This avoids security issues on shared hosts where a luser messes
++ * with the lower-level pipe settings and screws up the FastCGI service.
++ */
++static PACL prepare_named_pipe_acl(PSECURITY_DESCRIPTOR sd, LPSECURITY_ATTRIBUTES sa)
++{
++ DWORD req_acl_size;
++ char everyone_buf[32], owner_buf[32];
++ PSID sid_everyone, sid_owner;
++ SID_IDENTIFIER_AUTHORITY
++ siaWorld = SECURITY_WORLD_SID_AUTHORITY,
++ siaCreator = SECURITY_CREATOR_SID_AUTHORITY;
++ PACL acl;
+
-+ if test -n "$xrpath"; then
-+ $echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-+ fi
++ sid_everyone = (PSID)&everyone_buf;
++ sid_owner = (PSID)&owner_buf;
+
-+ if test -n "$vinfo"; then
-+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-+ fi
++ req_acl_size = sizeof(ACL) +
++ (2 * ((sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD)) + GetSidLengthRequired(1)));
+
-+ if test -n "$release"; then
-+ $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-+ fi
++ acl = malloc(req_acl_size);
+
-+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-+ $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-+ fi
++ if (acl == NULL) {
++ return NULL;
++ }
+
-+ # Now set the variables for building old libraries.
-+ build_libtool_libs=no
-+ oldlibs="$output"
-+ objs="$objs$old_deplibs"
-+ ;;
++ if (!InitializeSid(sid_everyone, &siaWorld, 1)) {
++ goto out_fail;
++ }
++ *GetSidSubAuthority(sid_everyone, 0) = SECURITY_WORLD_RID;
+
-+ lib)
-+ # Make sure we only generate libraries of the form `libNAME.la'.
-+ case $outputname in
-+ lib*)
-+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-+ eval shared_ext=\"$shrext_cmds\"
-+ eval libname=\"$libname_spec\"
-+ ;;
-+ *)
-+ if test "$module" = no; then
-+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ if test "$need_lib_prefix" != no; then
-+ # Add the "lib" prefix for modules if required
-+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-+ eval shared_ext=\"$shrext_cmds\"
-+ eval libname=\"$libname_spec\"
-+ else
-+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-+ fi
-+ ;;
-+ esac
++ if (!InitializeSid(sid_owner, &siaCreator, 1)) {
++ goto out_fail;
++ }
++ *GetSidSubAuthority(sid_owner, 0) = SECURITY_CREATOR_OWNER_RID;
+
-+ if test -n "$objs"; then
-+ if test "$deplibs_check_method" != pass_all; then
-+ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-+ exit $EXIT_FAILURE
-+ else
-+ $echo
-+ $echo "*** Warning: Linking the shared library $output against the non-libtool"
-+ $echo "*** objects $objs is not portable!"
-+ libobjs="$libobjs $objs"
-+ fi
-+ fi
++ if (!InitializeAcl(acl, req_acl_size, ACL_REVISION)) {
++ goto out_fail;
++ }
+
-+ if test "$dlself" != no; then
-+ $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-+ fi
++ if (!AddAccessAllowedAce(acl, ACL_REVISION, FILE_GENERIC_READ | FILE_GENERIC_WRITE, sid_everyone)) {
++ goto out_fail;
++ }
+
-+ set dummy $rpath
-+ if test "$#" -gt 2; then
-+ $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-+ fi
-+ install_libdir="$2"
-+
-+ oldlibs=
-+ if test -z "$rpath"; then
-+ if test "$build_libtool_libs" = yes; then
-+ # Building a libtool convenience library.
-+ # Some compilers have problems with a `.al' extension so
-+ # convenience libraries should have the same extension an
-+ # archive normally would.
-+ oldlibs="$output_objdir/$libname.$libext $oldlibs"
-+ build_libtool_libs=convenience
-+ build_old_libs=yes
-+ fi
++ if (!AddAccessAllowedAce(acl, ACL_REVISION, FILE_ALL_ACCESS, sid_owner)) {
++ goto out_fail;
++ }
+
-+ if test -n "$vinfo"; then
-+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-+ fi
++ if (!InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION)) {
++ goto out_fail;
++ }
+
-+ if test -n "$release"; then
-+ $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-+ fi
-+ else
++ if (!SetSecurityDescriptorDacl(sd, TRUE, acl, FALSE)) {
++ goto out_fail;
++ }
+
-+ # Parse the version information argument.
-+ save_ifs="$IFS"; IFS=':'
-+ set dummy $vinfo 0 0 0
-+ IFS="$save_ifs"
++ sa->lpSecurityDescriptor = sd;
+
-+ if test -n "$8"; then
-+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++ return acl;
+
-+ # convert absolute version numbers to libtool ages
-+ # this retains compatibility with .la files and attempts
-+ # to make the code below a bit more comprehensible
-+
-+ case $vinfo_number in
-+ yes)
-+ number_major="$2"
-+ number_minor="$3"
-+ number_revision="$4"
-+ #
-+ # There are really only two kinds -- those that
-+ # use the current revision as the major version
-+ # and those that subtract age and use age as
-+ # a minor version. But, then there is irix
-+ # which has an extra 1 added just for fun
-+ #
-+ case $version_type in
-+ darwin|linux|osf|windows)
-+ current=`expr $number_major + $number_minor`
-+ age="$number_minor"
-+ revision="$number_revision"
-+ ;;
-+ freebsd-aout|freebsd-elf|sunos)
-+ current="$number_major"
-+ revision="$number_minor"
-+ age="0"
-+ ;;
-+ irix|nonstopux)
-+ current=`expr $number_major + $number_minor - 1`
-+ age="$number_minor"
-+ revision="$number_minor"
-+ ;;
-+ esac
-+ ;;
-+ no)
-+ current="$2"
-+ revision="$3"
-+ age="$4"
-+ ;;
-+ esac
-+
-+ # Check that each of the things are valid numbers.
-+ case $current in
-+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+ *)
-+ $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+
-+ case $revision in
-+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+ *)
-+ $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+
-+ case $age in
-+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-+ *)
-+ $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+
-+ if test "$age" -gt "$current"; then
-+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++out_fail:
++ free(acl);
++ return NULL;
++}
++#endif
+
-+ # Calculate the version variables.
-+ major=
-+ versuffix=
-+ verstring=
-+ case $version_type in
-+ none) ;;
-+
-+ darwin)
-+ # Like Linux, but with the current version available in
-+ # verstring for coding it into the library header
-+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
-+ # Darwin ld doesn't like 0 for these options...
-+ minor_current=`expr $current + 1`
-+ verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ ;;
-+
-+ freebsd-aout)
-+ major=".$current"
-+ versuffix=".$current.$revision";
-+ ;;
-+
-+ freebsd-elf)
-+ major=".$current"
-+ versuffix=".$current";
-+ ;;
-+
-+ irix | nonstopux)
-+ major=`expr $current - $age + 1`
-+
-+ case $version_type in
-+ nonstopux) verstring_prefix=nonstopux ;;
-+ *) verstring_prefix=sgi ;;
-+ esac
-+ verstring="$verstring_prefix$major.$revision"
-+
-+ # Add in all the interfaces that we are compatible with.
-+ loop=$revision
-+ while test "$loop" -ne 0; do
-+ iface=`expr $revision - $loop`
-+ loop=`expr $loop - 1`
-+ verstring="$verstring_prefix$major.$iface:$verstring"
-+ done
-+
-+ # Before this point, $major must not contain `.'.
-+ major=.$major
-+ versuffix="$major.$revision"
-+ ;;
-+
-+ linux)
-+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
-+ ;;
-+
-+ osf)
-+ major=.`expr $current - $age`
-+ versuffix=".$current.$age.$revision"
-+ verstring="$current.$age.$revision"
-+
-+ # Add in all the interfaces that we are compatible with.
-+ loop=$age
-+ while test "$loop" -ne 0; do
-+ iface=`expr $current - $loop`
-+ loop=`expr $loop - 1`
-+ verstring="$verstring:${iface}.0"
-+ done
-+
-+ # Make executables depend on our current version.
-+ verstring="$verstring:${current}.0"
-+ ;;
-+
-+ sunos)
-+ major=".$current"
-+ versuffix=".$current.$revision"
-+ ;;
-+
-+ windows)
-+ # Use '-' rather than '.', since we only want one
-+ # extension on DOS 8.3 filesystems.
-+ major=`expr $current - $age`
-+ versuffix="-$major"
-+ ;;
++void fcgi_set_allowed_clients(char *ip)
++{
++ char *cur, *end;
++ int n;
++
++ if (ip) {
++ ip = strdup(ip);
++ cur = ip;
++ n = 0;
++ while (*cur) {
++ if (*cur == ',') n++;
++ cur++;
++ }
++ if (allowed_clients) free(allowed_clients);
++ allowed_clients = malloc(sizeof(in_addr_t) * (n+2));
++ n = 0;
++ cur = ip;
++ while (cur) {
++ end = strchr(cur, ',');
++ if (end) {
++ *end = 0;
++ end++;
++ }
++ allowed_clients[n] = inet_addr(cur);
++ if (allowed_clients[n] == INADDR_NONE) {
++ fprintf(stderr, "Wrong IP address '%s' in FCGI_WEB_SERVER_ADDRS\n", cur);
++ }
++ n++;
++ cur = end;
++ }
++ allowed_clients[n] = INADDR_NONE;
++ free(ip);
++ }
++}
+
-+ *)
-+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
-+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+
-+ # Clear the version info if we defaulted, and they specified a release.
-+ if test -z "$vinfo" && test -n "$release"; then
-+ major=
-+ case $version_type in
-+ darwin)
-+ # we can't check for "0.0" in archive_cmds due to quoting
-+ # problems, so we reset it completely
-+ verstring=
-+ ;;
-+ *)
-+ verstring="0.0"
-+ ;;
-+ esac
-+ if test "$need_version" = no; then
-+ versuffix=
-+ else
-+ versuffix=".0.0"
-+ fi
-+ fi
++static int is_port_number(const char *bindpath)
++{
++ while (*bindpath) {
++ if (*bindpath < '0' || *bindpath > '9') {
++ return 0;
++ }
++ bindpath++;
++ }
++ return 1;
++}
+
-+ # Remove version info from name if versioning should be avoided
-+ if test "$avoid_version" = yes && test "$need_version" = no; then
-+ major=
-+ versuffix=
-+ verstring=""
-+ fi
++int fcgi_listen(const char *path, int backlog)
++{
++ char *s;
++ int tcp = 0;
++ char host[MAXPATHLEN];
++ short port = 0;
++ int listen_socket;
++ sa_t sa;
++ socklen_t sock_len;
++#ifdef SO_REUSEADDR
++# ifdef _WIN32
++ BOOL reuse = 1;
++# else
++ int reuse = 1;
++# endif
++#endif
+
-+ # Check to see if the archive will have undefined symbols.
-+ if test "$allow_undefined" = yes; then
-+ if test "$allow_undefined_flag" = unsupported; then
-+ $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-+ build_libtool_libs=no
-+ build_old_libs=yes
-+ fi
-+ else
-+ # Don't allow undefined symbols.
-+ allow_undefined_flag="$no_undefined_flag"
-+ fi
-+ fi
++ if ((s = strchr(path, ':'))) {
++ port = atoi(s+1);
++ if (port != 0 && (s-path) < MAXPATHLEN) {
++ strncpy(host, path, s-path);
++ host[s-path] = '\0';
++ tcp = 1;
++ }
++ } else if (is_port_number(path)) {
++ port = atoi(path);
++ if (port != 0) {
++ host[0] = '\0';
++ tcp = 1;
++ }
++ }
+
-+ if test "$mode" != relink; then
-+ # Remove our outputs, but don't remove object files since they
-+ # may have been created when compiling PIC objects.
-+ removelist=
-+ tempremovelist=`$echo "$output_objdir/*"`
-+ for p in $tempremovelist; do
-+ case $p in
-+ *.$objext)
-+ ;;
-+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-+ if test "X$precious_files_regex" != "X"; then
-+ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-+ then
-+ continue
-+ fi
-+ fi
-+ removelist="$removelist $p"
-+ ;;
-+ *) ;;
-+ esac
-+ done
-+ if test -n "$removelist"; then
-+ $show "${rm}r $removelist"
-+ $run ${rm}r $removelist
-+ fi
-+ fi
++ /* Prepare socket address */
++ if (tcp) {
++ memset(&sa.sa_inet, 0, sizeof(sa.sa_inet));
++ sa.sa_inet.sin_family = AF_INET;
++ sa.sa_inet.sin_port = htons(port);
++ sock_len = sizeof(sa.sa_inet);
+
-+ # Now set the variables for building old libraries.
-+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
++ if (!*host || !strncmp(host, "*", sizeof("*")-1)) {
++ sa.sa_inet.sin_addr.s_addr = htonl(INADDR_ANY);
++ } else {
++ sa.sa_inet.sin_addr.s_addr = inet_addr(host);
++ if (sa.sa_inet.sin_addr.s_addr == INADDR_NONE) {
++ struct hostent *hep;
++
++ hep = gethostbyname(host);
++ if (!hep || hep->h_addrtype != AF_INET || !hep->h_addr_list[0]) {
++ fprintf(stderr, "Cannot resolve host name '%s'!\n", host);
++ return -1;
++ } else if (hep->h_addr_list[1]) {
++ fprintf(stderr, "Host '%s' has multiple addresses. You must choose one explicitly!\n", host);
++ return -1;
++ }
++ sa.sa_inet.sin_addr.s_addr = ((struct in_addr*)hep->h_addr_list[0])->s_addr;
++ }
++ }
++ } else {
++#ifdef _WIN32
++ SECURITY_DESCRIPTOR sd;
++ SECURITY_ATTRIBUTES sa;
++ PACL acl;
++ HANDLE namedPipe;
++
++ memset(&sa, 0, sizeof(sa));
++ sa.nLength = sizeof(sa);
++ sa.bInheritHandle = FALSE;
++ acl = prepare_named_pipe_acl(&sd, &sa);
++
++ namedPipe = CreateNamedPipe(path,
++ PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
++ PIPE_TYPE_BYTE | PIPE_WAIT | PIPE_READMODE_BYTE,
++ PIPE_UNLIMITED_INSTANCES,
++ 8192, 8192, 0, &sa);
++ if (namedPipe == INVALID_HANDLE_VALUE) {
++ return -1;
++ }
++ listen_socket = _open_osfhandle((long)namedPipe, 0);
++ if (!is_initialized) {
++ fcgi_init();
++ }
++ is_fastcgi = 1;
++ return listen_socket;
+
-+ # Transform .lo files to .o files.
-+ oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-+ fi
++#else
++ int path_len = strlen(path);
+
-+ # Eliminate all temporary directories.
-+ for path in $notinst_path; do
-+ lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-+ deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-+ dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-+ done
-+
-+ if test -n "$xrpath"; then
-+ # If the user specified any rpath flags, then add them.
-+ temp_xrpath=
-+ for libdir in $xrpath; do
-+ temp_xrpath="$temp_xrpath -R$libdir"
-+ case "$finalize_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_rpath="$finalize_rpath $libdir" ;;
-+ esac
-+ done
-+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-+ dependency_libs="$temp_xrpath $dependency_libs"
-+ fi
-+ fi
++ if (path_len >= sizeof(sa.sa_unix.sun_path)) {
++ fprintf(stderr, "Listening socket's path name is too long.\n");
++ return -1;
++ }
+
-+ # Make sure dlfiles contains only unique files that won't be dlpreopened
-+ old_dlfiles="$dlfiles"
-+ dlfiles=
-+ for lib in $old_dlfiles; do
-+ case " $dlprefiles $dlfiles " in
-+ *" $lib "*) ;;
-+ *) dlfiles="$dlfiles $lib" ;;
-+ esac
-+ done
-+
-+ # Make sure dlprefiles contains only unique files
-+ old_dlprefiles="$dlprefiles"
-+ dlprefiles=
-+ for lib in $old_dlprefiles; do
-+ case "$dlprefiles " in
-+ *" $lib "*) ;;
-+ *) dlprefiles="$dlprefiles $lib" ;;
-+ esac
-+ done
-+
-+ if test "$build_libtool_libs" = yes; then
-+ if test -n "$rpath"; then
-+ case $host in
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-+ # these systems don't actually have a c library (as such)!
-+ ;;
-+ *-*-rhapsody* | *-*-darwin1.[012])
-+ # Rhapsody C library is in the System framework
-+ deplibs="$deplibs -framework System"
-+ ;;
-+ *-*-netbsd*)
-+ # Don't link with libc until the a.out ld.so is fixed.
-+ ;;
-+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+ # Do not include libc due to us having libc/libc_r.
-+ test "X$arg" = "X-lc" && continue
-+ ;;
-+ *)
-+ # Add libc to deplibs on all other systems if necessary.
-+ if test "$build_libtool_need_lc" = "yes"; then
-+ deplibs="$deplibs -lc"
-+ fi
-+ ;;
-+ esac
-+ fi
++ memset(&sa.sa_unix, 0, sizeof(sa.sa_unix));
++ sa.sa_unix.sun_family = AF_UNIX;
++ memcpy(sa.sa_unix.sun_path, path, path_len + 1);
++ sock_len = (size_t)(((struct sockaddr_un *)0)->sun_path) + path_len;
++#ifdef HAVE_SOCKADDR_UN_SUN_LEN
++ sa.sa_unix.sun_len = sock_len;
++#endif
++ unlink(path);
++#endif
++ }
+
-+ # Transform deplibs into only deplibs that can be linked in shared.
-+ name_save=$name
-+ libname_save=$libname
-+ release_save=$release
-+ versuffix_save=$versuffix
-+ major_save=$major
-+ # I'm not sure if I'm treating the release correctly. I think
-+ # release should show up in the -l (ie -lgmp5) so we don't want to
-+ # add it in twice. Is that correct?
-+ release=""
-+ versuffix=""
-+ major=""
-+ newdeplibs=
-+ droppeddeps=no
-+ case $deplibs_check_method in
-+ pass_all)
-+ # Don't check for shared/static. Everything works.
-+ # This might be a little naive. We might want to check
-+ # whether the library exists or not. But this is on
-+ # osf3 & osf4 and I'm not really sure... Just
-+ # implementing what was already the behavior.
-+ newdeplibs=$deplibs
-+ ;;
-+ test_compile)
-+ # This code stresses the "libraries are programs" paradigm to its
-+ # limits. Maybe even breaks it. We compile a program, linking it
-+ # against the deplibs as a proxy for the library. Then we can check
-+ # whether they linked in statically or dynamically with ldd.
-+ $rm conftest.c
-+ cat > conftest.c <<EOF
-+ int main() { return 0; }
-+EOF
-+ $rm conftest
-+ $LTCC -o conftest conftest.c $deplibs
-+ if test "$?" -eq 0 ; then
-+ ldd_output=`ldd conftest`
-+ for i in $deplibs; do
-+ name="`expr $i : '-l\(.*\)'`"
-+ # If $name is empty we are operating on a -L argument.
-+ if test "$name" != "" && test "$name" -ne "0"; then
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ case " $predeps $postdeps " in
-+ *" $i "*)
-+ newdeplibs="$newdeplibs $i"
-+ i=""
-+ ;;
-+ esac
-+ fi
-+ if test -n "$i" ; then
-+ libname=`eval \\$echo \"$libname_spec\"`
-+ deplib_matches=`eval \\$echo \"$library_names_spec\"`
-+ set dummy $deplib_matches
-+ deplib_match=$2
-+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+ newdeplibs="$newdeplibs $i"
-+ else
-+ droppeddeps=yes
-+ $echo
-+ $echo "*** Warning: dynamic linker does not accept needed library $i."
-+ $echo "*** I have the capability to make that library automatically link in when"
-+ $echo "*** you link to this library. But I can only do this if you have a"
-+ $echo "*** shared version of the library, which I believe you do not have"
-+ $echo "*** because a test_compile did reveal that the linker did not use it for"
-+ $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-+ fi
-+ fi
-+ else
-+ newdeplibs="$newdeplibs $i"
-+ fi
-+ done
-+ else
-+ # Error occurred in the first compile. Let's try to salvage
-+ # the situation: Compile a separate program for each library.
-+ for i in $deplibs; do
-+ name="`expr $i : '-l\(.*\)'`"
-+ # If $name is empty we are operating on a -L argument.
-+ if test "$name" != "" && test "$name" != "0"; then
-+ $rm conftest
-+ $LTCC -o conftest conftest.c $i
-+ # Did it work?
-+ if test "$?" -eq 0 ; then
-+ ldd_output=`ldd conftest`
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ case " $predeps $postdeps " in
-+ *" $i "*)
-+ newdeplibs="$newdeplibs $i"
-+ i=""
-+ ;;
-+ esac
-+ fi
-+ if test -n "$i" ; then
-+ libname=`eval \\$echo \"$libname_spec\"`
-+ deplib_matches=`eval \\$echo \"$library_names_spec\"`
-+ set dummy $deplib_matches
-+ deplib_match=$2
-+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+ newdeplibs="$newdeplibs $i"
-+ else
-+ droppeddeps=yes
-+ $echo
-+ $echo "*** Warning: dynamic linker does not accept needed library $i."
-+ $echo "*** I have the capability to make that library automatically link in when"
-+ $echo "*** you link to this library. But I can only do this if you have a"
-+ $echo "*** shared version of the library, which you do not appear to have"
-+ $echo "*** because a test_compile did reveal that the linker did not use this one"
-+ $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-+ fi
-+ fi
-+ else
-+ droppeddeps=yes
-+ $echo
-+ $echo "*** Warning! Library $i is needed by this library but I was not able to"
-+ $echo "*** make it link in! You will probably need to install it or some"
-+ $echo "*** library that it depends on before this library will be fully"
-+ $echo "*** functional. Installing it before continuing would be even better."
-+ fi
-+ else
-+ newdeplibs="$newdeplibs $i"
-+ fi
-+ done
-+ fi
-+ ;;
-+ file_magic*)
-+ set dummy $deplibs_check_method
-+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+ for a_deplib in $deplibs; do
-+ name="`expr $a_deplib : '-l\(.*\)'`"
-+ # If $name is empty we are operating on a -L argument.
-+ if test "$name" != "" && test "$name" != "0"; then
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ case " $predeps $postdeps " in
-+ *" $a_deplib "*)
-+ newdeplibs="$newdeplibs $a_deplib"
-+ a_deplib=""
-+ ;;
-+ esac
-+ fi
-+ if test -n "$a_deplib" ; then
-+ libname=`eval \\$echo \"$libname_spec\"`
-+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+ for potent_lib in $potential_libs; do
-+ # Follow soft links.
-+ if ls -lLd "$potent_lib" 2>/dev/null \
-+ | grep " -> " >/dev/null; then
-+ continue
-+ fi
-+ # The statement above tries to avoid entering an
-+ # endless loop below, in case of cyclic links.
-+ # We might still enter an endless loop, since a link
-+ # loop can be closed while we follow links,
-+ # but so what?
-+ potlib="$potent_lib"
-+ while test -h "$potlib" 2>/dev/null; do
-+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-+ case $potliblink in
-+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-+ *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-+ esac
-+ done
-+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-+ | ${SED} 10q \
-+ | $EGREP "$file_magic_regex" > /dev/null; then
-+ newdeplibs="$newdeplibs $a_deplib"
-+ a_deplib=""
-+ break 2
-+ fi
-+ done
-+ done
-+ fi
-+ if test -n "$a_deplib" ; then
-+ droppeddeps=yes
-+ $echo
-+ $echo "*** Warning: linker path does not have real file for library $a_deplib."
-+ $echo "*** I have the capability to make that library automatically link in when"
-+ $echo "*** you link to this library. But I can only do this if you have a"
-+ $echo "*** shared version of the library, which you do not appear to have"
-+ $echo "*** because I did check the linker path looking for a file starting"
-+ if test -z "$potlib" ; then
-+ $echo "*** with $libname but no candidates were found. (...for file magic test)"
-+ else
-+ $echo "*** with $libname and none of the candidates passed a file format test"
-+ $echo "*** using a file magic. Last file checked: $potlib"
-+ fi
-+ fi
-+ else
-+ # Add a -L argument.
-+ newdeplibs="$newdeplibs $a_deplib"
-+ fi
-+ done # Gone through all deplibs.
-+ ;;
-+ match_pattern*)
-+ set dummy $deplibs_check_method
-+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+ for a_deplib in $deplibs; do
-+ name="`expr $a_deplib : '-l\(.*\)'`"
-+ # If $name is empty we are operating on a -L argument.
-+ if test -n "$name" && test "$name" != "0"; then
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ case " $predeps $postdeps " in
-+ *" $a_deplib "*)
-+ newdeplibs="$newdeplibs $a_deplib"
-+ a_deplib=""
-+ ;;
-+ esac
-+ fi
-+ if test -n "$a_deplib" ; then
-+ libname=`eval \\$echo \"$libname_spec\"`
-+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+ for potent_lib in $potential_libs; do
-+ potlib="$potent_lib" # see symlink-check above in file_magic test
-+ if eval $echo \"$potent_lib\" 2>/dev/null \
-+ | ${SED} 10q \
-+ | $EGREP "$match_pattern_regex" > /dev/null; then
-+ newdeplibs="$newdeplibs $a_deplib"
-+ a_deplib=""
-+ break 2
-+ fi
-+ done
-+ done
-+ fi
-+ if test -n "$a_deplib" ; then
-+ droppeddeps=yes
-+ $echo
-+ $echo "*** Warning: linker path does not have real file for library $a_deplib."
-+ $echo "*** I have the capability to make that library automatically link in when"
-+ $echo "*** you link to this library. But I can only do this if you have a"
-+ $echo "*** shared version of the library, which you do not appear to have"
-+ $echo "*** because I did check the linker path looking for a file starting"
-+ if test -z "$potlib" ; then
-+ $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-+ else
-+ $echo "*** with $libname and none of the candidates passed a file format test"
-+ $echo "*** using a regex pattern. Last file checked: $potlib"
-+ fi
-+ fi
-+ else
-+ # Add a -L argument.
-+ newdeplibs="$newdeplibs $a_deplib"
-+ fi
-+ done # Gone through all deplibs.
-+ ;;
-+ none | unknown | *)
-+ newdeplibs=""
-+ tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-+ -e 's/ -[LR][^ ]*//g'`
-+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+ for i in $predeps $postdeps ; do
-+ # can't use Xsed below, because $i might contain '/'
-+ tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-+ done
-+ fi
-+ if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \
-+ | grep . >/dev/null; then
-+ $echo
-+ if test "X$deplibs_check_method" = "Xnone"; then
-+ $echo "*** Warning: inter-library dependencies are not supported in this platform."
-+ else
-+ $echo "*** Warning: inter-library dependencies are not known to be supported."
-+ fi
-+ $echo "*** All declared inter-library dependencies are being dropped."
-+ droppeddeps=yes
-+ fi
-+ ;;
-+ esac
-+ versuffix=$versuffix_save
-+ major=$major_save
-+ release=$release_save
-+ libname=$libname_save
-+ name=$name_save
-+
-+ case $host in
-+ *-*-rhapsody* | *-*-darwin1.[012])
-+ # On Rhapsody replace the C library is the System framework
-+ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+ ;;
-+ esac
-+
-+ if test "$droppeddeps" = yes; then
-+ if test "$module" = yes; then
-+ $echo
-+ $echo "*** Warning: libtool could not satisfy all declared inter-library"
-+ $echo "*** dependencies of module $libname. Therefore, libtool will create"
-+ $echo "*** a static module, that should work as long as the dlopening"
-+ $echo "*** application is linked with the -dlopen flag."
-+ if test -z "$global_symbol_pipe"; then
-+ $echo
-+ $echo "*** However, this would only work if libtool was able to extract symbol"
-+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+ $echo "*** not find such a program. So, this module is probably useless."
-+ $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+ fi
-+ if test "$build_old_libs" = no; then
-+ oldlibs="$output_objdir/$libname.$libext"
-+ build_libtool_libs=module
-+ build_old_libs=yes
-+ else
-+ build_libtool_libs=no
-+ fi
-+ else
-+ $echo "*** The inter-library dependencies that have been dropped here will be"
-+ $echo "*** automatically added whenever a program is linked with this library"
-+ $echo "*** or is declared to -dlopen it."
-+
-+ if test "$allow_undefined" = no; then
-+ $echo
-+ $echo "*** Since this library must not contain undefined symbols,"
-+ $echo "*** because either the platform does not support them or"
-+ $echo "*** it was explicitly requested with -no-undefined,"
-+ $echo "*** libtool will only create a static version of it."
-+ if test "$build_old_libs" = no; then
-+ oldlibs="$output_objdir/$libname.$libext"
-+ build_libtool_libs=module
-+ build_old_libs=yes
-+ else
-+ build_libtool_libs=no
-+ fi
-+ fi
-+ fi
-+ fi
-+ # Done checking deplibs!
-+ deplibs=$newdeplibs
-+ fi
++ /* Create, bind socket and start listen on it */
++ if ((listen_socket = socket(sa.sa.sa_family, SOCK_STREAM, 0)) < 0 ||
++#ifdef SO_REUSEADDR
++ setsockopt(listen_socket, SOL_SOCKET, SO_REUSEADDR, (char*)&reuse, sizeof(reuse)) < 0 ||
++#endif
++ bind(listen_socket, (struct sockaddr *) &sa, sock_len) < 0 ||
++ listen(listen_socket, backlog) < 0) {
+
-+ # All the library-specific variables (install_libdir is set above).
-+ library_names=
-+ old_library=
-+ dlname=
-+
-+ # Test again, we may have decided not to build it any more
-+ if test "$build_libtool_libs" = yes; then
-+ if test "$hardcode_into_libs" = yes; then
-+ # Hardcode the library paths
-+ hardcode_libdirs=
-+ dep_rpath=
-+ rpath="$finalize_rpath"
-+ test "$mode" != relink && rpath="$compile_rpath$rpath"
-+ for libdir in $rpath; do
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ if test -z "$hardcode_libdirs"; then
-+ hardcode_libdirs="$libdir"
-+ else
-+ # Just accumulate the unique libdirs.
-+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+ ;;
-+ *)
-+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+ ;;
-+ esac
-+ fi
-+ else
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ dep_rpath="$dep_rpath $flag"
-+ fi
-+ elif test -n "$runpath_var"; then
-+ case "$perm_rpath " in
-+ *" $libdir "*) ;;
-+ *) perm_rpath="$perm_rpath $libdir" ;;
-+ esac
-+ fi
-+ done
-+ # Substitute the hardcoded libdirs into the rpath.
-+ if test -n "$hardcode_libdir_separator" &&
-+ test -n "$hardcode_libdirs"; then
-+ libdir="$hardcode_libdirs"
-+ if test -n "$hardcode_libdir_flag_spec_ld"; then
-+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-+ else
-+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-+ fi
-+ fi
-+ if test -n "$runpath_var" && test -n "$perm_rpath"; then
-+ # We should set the runpath_var.
-+ rpath=
-+ for dir in $perm_rpath; do
-+ rpath="$rpath$dir:"
-+ done
-+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-+ fi
-+ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-+ fi
++ fprintf(stderr, "Cannot bind/listen socket - [%d] %s.\n",errno, strerror(errno));
++ return -1;
++ }
+
-+ shlibpath="$finalize_shlibpath"
-+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-+ if test -n "$shlibpath"; then
-+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-+ fi
++ if (!tcp) {
++ chmod(path, 0777);
++ }
+
-+ # Get the real and link names of the library.
-+ eval shared_ext=\"$shrext_cmds\"
-+ eval library_names=\"$library_names_spec\"
-+ set dummy $library_names
-+ realname="$2"
-+ shift; shift
++ if (!is_initialized) {
++ fcgi_init();
++ }
++ is_fastcgi = 1;
+
-+ if test -n "$soname_spec"; then
-+ eval soname=\"$soname_spec\"
-+ else
-+ soname="$realname"
-+ fi
-+ if test -z "$dlname"; then
-+ dlname=$soname
-+ fi
++#ifdef _WIN32
++ if (tcp) {
++ listen_socket = _open_osfhandle((long)listen_socket, 0);
++ }
++#else
++ fcgi_setup_signals();
++#endif
++ return listen_socket;
++}
+
-+ lib="$output_objdir/$realname"
-+ for link
-+ do
-+ linknames="$linknames $link"
-+ done
++void fcgi_init_request(fcgi_request *req, int listen_socket)
++{
++ memset(req, 0, sizeof(fcgi_request));
++ req->listen_socket = listen_socket;
++ req->fd = -1;
++ req->id = -1;
+
-+ # Use standard objects if they are pic
-+ test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+
-+ # Prepare the list of exported symbols
-+ if test -z "$export_symbols"; then
-+ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-+ $show "generating symbol list for \`$libname.la'"
-+ export_symbols="$output_objdir/$libname.exp"
-+ $run $rm $export_symbols
-+ cmds=$export_symbols_cmds
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ if len=`expr "X$cmd" : ".*"` &&
-+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+ $show "$cmd"
-+ $run eval "$cmd" || exit $?
-+ skipped_export=false
-+ else
-+ # The command line is too long to execute in one step.
-+ $show "using reloadable object file for export list..."
-+ skipped_export=:
-+ fi
-+ done
-+ IFS="$save_ifs"
-+ if test -n "$export_symbols_regex"; then
-+ $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-+ $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-+ $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-+ $run eval '$mv "${export_symbols}T" "$export_symbols"'
-+ fi
-+ fi
-+ fi
++ req->in_len = 0;
++ req->in_pad = 0;
+
-+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
-+ $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-+ fi
++ req->out_hdr = NULL;
++ req->out_pos = req->out_buf;
+
-+ tmp_deplibs=
-+ for test_deplib in $deplibs; do
-+ case " $convenience " in
-+ *" $test_deplib "*) ;;
-+ *)
-+ tmp_deplibs="$tmp_deplibs $test_deplib"
-+ ;;
-+ esac
-+ done
-+ deplibs="$tmp_deplibs"
-+
-+ if test -n "$convenience"; then
-+ if test -n "$whole_archive_flag_spec"; then
-+ save_libobjs=$libobjs
-+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-+ else
-+ gentop="$output_objdir/${outputname}x"
-+ generated="$generated $gentop"
-+
-+ func_extract_archives $gentop $convenience
-+ libobjs="$libobjs $func_extract_archives_result"
-+ fi
-+ fi
-+
-+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-+ eval flag=\"$thread_safe_flag_spec\"
-+ linker_flags="$linker_flags $flag"
-+ fi
++#ifdef _WIN32
++ req->tcp = !GetNamedPipeInfo((HANDLE)_get_osfhandle(req->listen_socket), NULL, NULL, NULL, NULL);
++#endif
++}
+
-+ # Make a backup of the uninstalled library when relinking
-+ if test "$mode" = relink; then
-+ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-+ fi
++static inline ssize_t safe_write(fcgi_request *req, const void *buf, size_t count)
++{
++ int ret;
++ size_t n = 0;
+
-+ # Do each of the archive commands.
-+ if test "$module" = yes && test -n "$module_cmds" ; then
-+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-+ eval test_cmds=\"$module_expsym_cmds\"
-+ cmds=$module_expsym_cmds
-+ else
-+ eval test_cmds=\"$module_cmds\"
-+ cmds=$module_cmds
-+ fi
-+ else
-+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-+ eval test_cmds=\"$archive_expsym_cmds\"
-+ cmds=$archive_expsym_cmds
-+ else
-+ eval test_cmds=\"$archive_cmds\"
-+ cmds=$archive_cmds
-+ fi
-+ fi
++ do {
++ errno = 0;
++#ifdef _WIN32
++ if (!req->tcp) {
++ ret = write(req->fd, ((char*)buf)+n, count-n);
++ } else {
++ ret = send(req->fd, ((char*)buf)+n, count-n, 0);
++ if (ret <= 0) {
++ errno = WSAGetLastError();
++ }
++ }
++#else
++ ret = write(req->fd, ((char*)buf)+n, count-n);
++#endif
++ if (ret > 0) {
++ n += ret;
++ } else if (ret <= 0 && errno != 0 && errno != EINTR) {
++ return ret;
++ }
++ } while (n != count);
++ return n;
++}
+
-+ if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
-+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+ :
-+ else
-+ # The command line is too long to link in one step, link piecewise.
-+ $echo "creating reloadable object files..."
-+
-+ # Save the value of $output and $libobjs because we want to
-+ # use them later. If we have whole_archive_flag_spec, we
-+ # want to use save_libobjs as it was before
-+ # whole_archive_flag_spec was expanded, because we can't
-+ # assume the linker understands whole_archive_flag_spec.
-+ # This may have to be revisited, in case too many
-+ # convenience libraries get linked in and end up exceeding
-+ # the spec.
-+ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-+ save_libobjs=$libobjs
-+ fi
-+ save_output=$output
-+ output_la=`$echo "X$output" | $Xsed -e "$basename"`
-+
-+ # Clear the reloadable object creation command queue and
-+ # initialize k to one.
-+ test_cmds=
-+ concat_cmds=
-+ objlist=
-+ delfiles=
-+ last_robj=
-+ k=1
-+ output=$output_objdir/$output_la-${k}.$objext
-+ # Loop over the list of objects to be linked.
-+ for obj in $save_libobjs
-+ do
-+ eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-+ if test "X$objlist" = X ||
-+ { len=`expr "X$test_cmds" : ".*"` &&
-+ test "$len" -le "$max_cmd_len"; }; then
-+ objlist="$objlist $obj"
-+ else
-+ # The command $test_cmds is almost too long, add a
-+ # command to the queue.
-+ if test "$k" -eq 1 ; then
-+ # The first file doesn't have a previous command to add.
-+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-+ else
-+ # All subsequent reloadable object files will link in
-+ # the last one created.
-+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-+ fi
-+ last_robj=$output_objdir/$output_la-${k}.$objext
-+ k=`expr $k + 1`
-+ output=$output_objdir/$output_la-${k}.$objext
-+ objlist=$obj
-+ len=1
-+ fi
-+ done
-+ # Handle the remaining objects by creating one last
-+ # reloadable object file. All subsequent reloadable object
-+ # files will link in the last one created.
-+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-+
-+ if ${skipped_export-false}; then
-+ $show "generating symbol list for \`$libname.la'"
-+ export_symbols="$output_objdir/$libname.exp"
-+ $run $rm $export_symbols
-+ libobjs=$output
-+ # Append the command to create the export file.
-+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-+ fi
++static inline ssize_t safe_read(fcgi_request *req, const void *buf, size_t count)
++{
++ int ret;
++ size_t n = 0;
+
-+ # Set up a command to remove the reloadable object files
-+ # after they are used.
-+ i=0
-+ while test "$i" -lt "$k"
-+ do
-+ i=`expr $i + 1`
-+ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-+ done
-+
-+ $echo "creating a temporary reloadable object file: $output"
-+
-+ # Loop through the commands generated above and execute them.
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $concat_cmds; do
-+ IFS="$save_ifs"
-+ $show "$cmd"
-+ $run eval "$cmd" || exit $?
-+ done
-+ IFS="$save_ifs"
-+
-+ libobjs=$output
-+ # Restore the value of output.
-+ output=$save_output
-+
-+ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-+ fi
-+ # Expand the library linking commands again to reset the
-+ # value of $libobjs for piecewise linking.
-+
-+ # Do each of the archive commands.
-+ if test "$module" = yes && test -n "$module_cmds" ; then
-+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-+ cmds=$module_expsym_cmds
-+ else
-+ cmds=$module_cmds
-+ fi
-+ else
-+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-+ cmds=$archive_expsym_cmds
-+ else
-+ cmds=$archive_cmds
-+ fi
-+ fi
-+
-+ # Append the command to remove the reloadable object files
-+ # to the just-reset $cmds.
-+ eval cmds=\"\$cmds~\$rm $delfiles\"
-+ fi
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ $show "$cmd"
-+ $run eval "$cmd" || exit $?
-+ done
-+ IFS="$save_ifs"
++ do {
++ errno = 0;
++#ifdef _WIN32
++ if (!req->tcp) {
++ ret = read(req->fd, ((char*)buf)+n, count-n);
++ } else {
++ ret = recv(req->fd, ((char*)buf)+n, count-n, 0);
++ if (ret <= 0) {
++ errno = WSAGetLastError();
++ }
++ }
++#else
++ ret = read(req->fd, ((char*)buf)+n, count-n);
++#endif
++ if (ret > 0) {
++ n += ret;
++ } else if (ret == 0 && errno == 0) {
++ return n;
++ } else if (ret <= 0 && errno != 0 && errno != EINTR) {
++ return ret;
++ }
++ } while (n != count);
++ return n;
++}
+
-+ # Restore the uninstalled library and exit
-+ if test "$mode" = relink; then
-+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-+ exit $EXIT_SUCCESS
-+ fi
++static inline int fcgi_make_header(fcgi_header *hdr, fcgi_request_type type, int req_id, int len)
++{
++ int pad = ((len + 7) & ~7) - len;
+
-+ # Create links to the real library.
-+ for linkname in $linknames; do
-+ if test "$realname" != "$linkname"; then
-+ $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-+ $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-+ fi
-+ done
++ hdr->contentLengthB0 = (unsigned char)(len & 0xff);
++ hdr->contentLengthB1 = (unsigned char)((len >> 8) & 0xff);
++ hdr->paddingLength = (unsigned char)pad;
++ hdr->requestIdB0 = (unsigned char)(req_id & 0xff);
++ hdr->requestIdB1 = (unsigned char)((req_id >> 8) & 0xff);
++ hdr->reserved = 0;
++ hdr->type = type;
++ hdr->version = FCGI_VERSION_1;
++ if (pad) {
++ memset(((unsigned char*)hdr) + sizeof(fcgi_header) + len, 0, pad);
++ }
++ return pad;
++}
+
-+ # If -module or -export-dynamic was specified, set the dlname.
-+ if test "$module" = yes || test "$export_dynamic" = yes; then
-+ # On all known operating systems, these are identical.
-+ dlname="$soname"
-+ fi
-+ fi
-+ ;;
++static int fcgi_get_params(fcgi_request *req, unsigned char *p, unsigned char *end)
++{
++ char buf[128];
++ char *tmp = buf;
++ int buf_size = sizeof(buf);
++ int name_len, val_len;
++ char *s;
++ int ret = 1;
++
++ while (p < end) {
++ name_len = *p++;
++ if (name_len >= 128) {
++ name_len = ((name_len & 0x7f) << 24);
++ name_len |= (*p++ << 16);
++ name_len |= (*p++ << 8);
++ name_len |= *p++;
++ }
++ val_len = *p++;
++ if (val_len >= 128) {
++ val_len = ((val_len & 0x7f) << 24);
++ val_len |= (*p++ << 16);
++ val_len |= (*p++ << 8);
++ val_len |= *p++;
++ }
++ if (name_len + val_len < 0 ||
++ name_len + val_len > end - p) {
++ /* Malformated request */
++ ret = 0;
++ break;
++ }
++ if (name_len+1 >= buf_size) {
++ buf_size = name_len + 64;
++ tmp = (tmp == buf ? emalloc(buf_size): erealloc(tmp, buf_size));
++ }
++ memcpy(tmp, p, name_len);
++ tmp[name_len] = 0;
++ s = zend_strndup((char*)p + name_len, val_len);
++ zend_hash_update(&req->env, tmp, name_len+1, &s, sizeof(char*), NULL);
++ p += name_len + val_len;
++ }
++ if (tmp != buf && tmp != NULL) {
++ efree(tmp);
++ }
++ return ret;
++}
+
-+ obj)
-+ if test -n "$deplibs"; then
-+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-+ fi
++static void fcgi_free_var(char **s)
++{
++ free(*s);
++}
+
-+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-+ fi
++static int fcgi_read_request(fcgi_request *req)
++{
++ fcgi_header hdr;
++ int len, padding;
++ unsigned char buf[FCGI_MAX_LENGTH+8];
+
-+ if test -n "$rpath"; then
-+ $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-+ fi
++ req->keep = 0;
++ req->in_len = 0;
++ req->out_hdr = NULL;
++ req->out_pos = req->out_buf;
++ zend_hash_init(&req->env, 0, NULL, (void (*)(void *)) fcgi_free_var, 1);
+
-+ if test -n "$xrpath"; then
-+ $echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-+ fi
++ if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
++ hdr.version < FCGI_VERSION_1) {
++ return 0;
++ }
+
-+ if test -n "$vinfo"; then
-+ $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-+ fi
++ len = (hdr.contentLengthB1 << 8) | hdr.contentLengthB0;
++ padding = hdr.paddingLength;
+
-+ if test -n "$release"; then
-+ $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-+ fi
++ while (hdr.type == FCGI_STDIN && len == 0) {
++ if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
++ hdr.version < FCGI_VERSION_1) {
++ return 0;
++ }
+
-+ case $output in
-+ *.lo)
-+ if test -n "$objs$old_deplibs"; then
-+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ libobj="$output"
-+ obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-+ ;;
-+ *)
-+ libobj=
-+ obj="$output"
-+ ;;
-+ esac
-+
-+ # Delete the old objects.
-+ $run $rm $obj $libobj
-+
-+ # Objects from convenience libraries. This assumes
-+ # single-version convenience libraries. Whenever we create
-+ # different ones for PIC/non-PIC, this we'll have to duplicate
-+ # the extraction.
-+ reload_conv_objs=
-+ gentop=
-+ # reload_cmds runs $LD directly, so let us get rid of
-+ # -Wl from whole_archive_flag_spec
-+ wl=
-+
-+ if test -n "$convenience"; then
-+ if test -n "$whole_archive_flag_spec"; then
-+ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-+ else
-+ gentop="$output_objdir/${obj}x"
-+ generated="$generated $gentop"
++ len = (hdr.contentLengthB1 << 8) | hdr.contentLengthB0;
++ padding = hdr.paddingLength;
++ }
+
-+ func_extract_archives $gentop $convenience
-+ reload_conv_objs="$reload_objs $func_extract_archives_result"
-+ fi
-+ fi
++ if (len + padding > FCGI_MAX_LENGTH) {
++ return 0;
++ }
+
-+ # Create the old-style object.
-+ reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-+
-+ output="$obj"
-+ cmds=$reload_cmds
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ $show "$cmd"
-+ $run eval "$cmd" || exit $?
-+ done
-+ IFS="$save_ifs"
-+
-+ # Exit if we aren't doing a library object file.
-+ if test -z "$libobj"; then
-+ if test -n "$gentop"; then
-+ $show "${rm}r $gentop"
-+ $run ${rm}r $gentop
-+ fi
++ req->id = (hdr.requestIdB1 << 8) + hdr.requestIdB0;
+
-+ exit $EXIT_SUCCESS
-+ fi
++ if (hdr.type == FCGI_BEGIN_REQUEST && len == sizeof(fcgi_begin_request)) {
++ char *val;
+
-+ if test "$build_libtool_libs" != yes; then
-+ if test -n "$gentop"; then
-+ $show "${rm}r $gentop"
-+ $run ${rm}r $gentop
-+ fi
++ if (safe_read(req, buf, len+padding) != len+padding) {
++ return 0;
++ }
+
-+ # Create an invalid libtool object if no PIC, so that we don't
-+ # accidentally link it into a program.
-+ # $show "echo timestamp > $libobj"
-+ # $run eval "echo timestamp > $libobj" || exit $?
-+ exit $EXIT_SUCCESS
-+ fi
++ req->keep = (((fcgi_begin_request*)buf)->flags & FCGI_KEEP_CONN);
++ switch ((((fcgi_begin_request*)buf)->roleB1 << 8) + ((fcgi_begin_request*)buf)->roleB0) {
++ case FCGI_RESPONDER:
++ val = strdup("RESPONDER");
++ zend_hash_update(&req->env, "FCGI_ROLE", sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
++ break;
++ case FCGI_AUTHORIZER:
++ val = strdup("AUTHORIZER");
++ zend_hash_update(&req->env, "FCGI_ROLE", sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
++ break;
++ case FCGI_FILTER:
++ val = strdup("FILTER");
++ zend_hash_update(&req->env, "FCGI_ROLE", sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
++ break;
++ default:
++ return 0;
++ }
+
-+ if test -n "$pic_flag" || test "$pic_mode" != default; then
-+ # Only do commands if we really have different PIC objects.
-+ reload_objs="$libobjs $reload_conv_objs"
-+ output="$libobj"
-+ cmds=$reload_cmds
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ $show "$cmd"
-+ $run eval "$cmd" || exit $?
-+ done
-+ IFS="$save_ifs"
-+ fi
++ if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
++ hdr.version < FCGI_VERSION_1) {
++ return 0;
++ }
+
-+ if test -n "$gentop"; then
-+ $show "${rm}r $gentop"
-+ $run ${rm}r $gentop
-+ fi
++ len = (hdr.contentLengthB1 << 8) | hdr.contentLengthB0;
++ padding = hdr.paddingLength;
+
-+ exit $EXIT_SUCCESS
-+ ;;
++ while (hdr.type == FCGI_PARAMS && len > 0) {
++ if (len + padding > FCGI_MAX_LENGTH) {
++ return 0;
++ }
+
-+ prog)
-+ case $host in
-+ *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-+ esac
-+ if test -n "$vinfo"; then
-+ $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-+ fi
++ if (safe_read(req, buf, len+padding) != len+padding) {
++ req->keep = 0;
++ return 0;
++ }
+
-+ if test -n "$release"; then
-+ $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-+ fi
++ if (!fcgi_get_params(req, buf, buf+len)) {
++ req->keep = 0;
++ return 0;
++ }
+
-+ if test "$preload" = yes; then
-+ if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-+ test "$dlopen_self_static" = unknown; then
-+ $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-+ fi
-+ fi
++ if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
++ hdr.version < FCGI_VERSION_1) {
++ req->keep = 0;
++ return 0;
++ }
++ len = (hdr.contentLengthB1 << 8) | hdr.contentLengthB0;
++ padding = hdr.paddingLength;
++ }
++ } else if (hdr.type == FCGI_GET_VALUES) {
++ unsigned char *p = buf + sizeof(fcgi_header);
++ HashPosition pos;
++ char * str_index;
++ uint str_length;
++ ulong num_index;
++ int key_type;
++ zval ** value;
++
++ if (safe_read(req, buf, len+padding) != len+padding) {
++ req->keep = 0;
++ return 0;
++ }
+
-+ case $host in
-+ *-*-rhapsody* | *-*-darwin1.[012])
-+ # On Rhapsody replace the C library is the System framework
-+ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-+ ;;
-+ esac
++ if (!fcgi_get_params(req, buf, buf+len)) {
++ req->keep = 0;
++ return 0;
++ }
+
-+ case $host in
-+ *darwin*)
-+ # Don't allow lazy linking, it breaks C++ global constructors
-+ if test "$tagname" = CXX ; then
-+ compile_command="$compile_command ${wl}-bind_at_load"
-+ finalize_command="$finalize_command ${wl}-bind_at_load"
-+ fi
-+ ;;
-+ esac
-+
-+ compile_command="$compile_command $compile_deplibs"
-+ finalize_command="$finalize_command $finalize_deplibs"
-+
-+ if test -n "$rpath$xrpath"; then
-+ # If the user specified any rpath flags, then add them.
-+ for libdir in $rpath $xrpath; do
-+ # This is the magic to use -rpath.
-+ case "$finalize_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_rpath="$finalize_rpath $libdir" ;;
-+ esac
-+ done
-+ fi
++ zend_hash_internal_pointer_reset_ex(&req->env, &pos);
++ while ((key_type = zend_hash_get_current_key_ex(&req->env, &str_index, &str_length, &num_index, 0, &pos)) != HASH_KEY_NON_EXISTANT) {
++ int zlen;
++ zend_hash_move_forward_ex(&req->env, &pos);
++ if (key_type != HASH_KEY_IS_STRING) {
++ continue;
++ }
++ if (zend_hash_find(fcgi_mgmt_vars, str_index, str_length, (void**) &value) != SUCCESS) {
++ continue;
++ }
++ --str_length;
++ zlen = Z_STRLEN_PP(value);
++ if ((p + 4 + 4 + str_length + zlen) >= (buf + sizeof(buf))) {
++ break;
++ }
++ if (str_length < 0x80) {
++ *p++ = str_length;
++ } else {
++ *p++ = ((str_length >> 24) & 0xff) | 0x80;
++ *p++ = (str_length >> 16) & 0xff;
++ *p++ = (str_length >> 8) & 0xff;
++ *p++ = str_length & 0xff;
++ }
++ if (zlen < 0x80) {
++ *p++ = zlen;
++ } else {
++ *p++ = ((zlen >> 24) & 0xff) | 0x80;
++ *p++ = (zlen >> 16) & 0xff;
++ *p++ = (zlen >> 8) & 0xff;
++ *p++ = zlen & 0xff;
++ }
++ memcpy(p, str_index, str_length);
++ p += str_length;
++ memcpy(p, Z_STRVAL_PP(value), zlen);
++ p += zlen;
++ }
++ len = p - buf - sizeof(fcgi_header);
++ len += fcgi_make_header((fcgi_header*)buf, FCGI_GET_VALUES_RESULT, 0, len);
++ if (safe_write(req, buf, sizeof(fcgi_header)+len) != (int)sizeof(fcgi_header)+len) {
++ req->keep = 0;
++ return 0;
++ }
++ return 0;
++ } else {
++ return 0;
++ }
+
-+ # Now hardcode the library paths
-+ rpath=
-+ hardcode_libdirs=
-+ for libdir in $compile_rpath $finalize_rpath; do
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ if test -z "$hardcode_libdirs"; then
-+ hardcode_libdirs="$libdir"
-+ else
-+ # Just accumulate the unique libdirs.
-+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+ ;;
-+ *)
-+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+ ;;
-+ esac
-+ fi
-+ else
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ rpath="$rpath $flag"
-+ fi
-+ elif test -n "$runpath_var"; then
-+ case "$perm_rpath " in
-+ *" $libdir "*) ;;
-+ *) perm_rpath="$perm_rpath $libdir" ;;
-+ esac
-+ fi
-+ case $host in
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ case :$dllsearchpath: in
-+ *":$libdir:"*) ;;
-+ *) dllsearchpath="$dllsearchpath:$libdir";;
-+ esac
-+ ;;
-+ esac
-+ done
-+ # Substitute the hardcoded libdirs into the rpath.
-+ if test -n "$hardcode_libdir_separator" &&
-+ test -n "$hardcode_libdirs"; then
-+ libdir="$hardcode_libdirs"
-+ eval rpath=\" $hardcode_libdir_flag_spec\"
-+ fi
-+ compile_rpath="$rpath"
-+
-+ rpath=
-+ hardcode_libdirs=
-+ for libdir in $finalize_rpath; do
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ if test -z "$hardcode_libdirs"; then
-+ hardcode_libdirs="$libdir"
-+ else
-+ # Just accumulate the unique libdirs.
-+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+ ;;
-+ *)
-+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+ ;;
-+ esac
-+ fi
-+ else
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ rpath="$rpath $flag"
-+ fi
-+ elif test -n "$runpath_var"; then
-+ case "$finalize_perm_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+ esac
-+ fi
-+ done
-+ # Substitute the hardcoded libdirs into the rpath.
-+ if test -n "$hardcode_libdir_separator" &&
-+ test -n "$hardcode_libdirs"; then
-+ libdir="$hardcode_libdirs"
-+ eval rpath=\" $hardcode_libdir_flag_spec\"
-+ fi
-+ finalize_rpath="$rpath"
++ return 1;
++}
+
-+ if test -n "$libobjs" && test "$build_old_libs" = yes; then
-+ # Transform all the library objects into standard objects.
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+ fi
++int fcgi_read(fcgi_request *req, char *str, int len)
++{
++ int ret, n, rest;
++ fcgi_header hdr;
++ unsigned char buf[255];
+
-+ dlsyms=
-+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+ if test -n "$NM" && test -n "$global_symbol_pipe"; then
-+ dlsyms="${outputname}S.c"
-+ else
-+ $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-+ fi
-+ fi
++ n = 0;
++ rest = len;
++ while (rest > 0) {
++ if (req->in_len == 0) {
++ if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
++ hdr.version < FCGI_VERSION_1 ||
++ hdr.type != FCGI_STDIN) {
++ req->keep = 0;
++ return 0;
++ }
++ req->in_len = (hdr.contentLengthB1 << 8) | hdr.contentLengthB0;
++ req->in_pad = hdr.paddingLength;
++ if (req->in_len == 0) {
++ return n;
++ }
++ }
+
-+ if test -n "$dlsyms"; then
-+ case $dlsyms in
-+ "") ;;
-+ *.c)
-+ # Discover the nlist of each of the dlfiles.
-+ nlist="$output_objdir/${outputname}.nm"
++ if (req->in_len >= rest) {
++ ret = safe_read(req, str, rest);
++ } else {
++ ret = safe_read(req, str, req->in_len);
++ }
++ if (ret < 0) {
++ req->keep = 0;
++ return ret;
++ } else if (ret > 0) {
++ req->in_len -= ret;
++ rest -= ret;
++ n += ret;
++ str += ret;
++ if (req->in_len == 0) {
++ if (req->in_pad) {
++ if (safe_read(req, buf, req->in_pad) != req->in_pad) {
++ req->keep = 0;
++ return ret;
++ }
++ }
++ } else {
++ return n;
++ }
++ } else {
++ return n;
++ }
++ }
++ return n;
++}
+
-+ $show "$rm $nlist ${nlist}S ${nlist}T"
-+ $run $rm "$nlist" "${nlist}S" "${nlist}T"
++void fcgi_close(fcgi_request *req, int force, int destroy)
++{
++ if (destroy) {
++ zend_hash_destroy(&req->env);
++ }
+
-+ # Parse the name list into a source file.
-+ $show "creating $output_objdir/$dlsyms"
++#ifdef _WIN32
++ if (is_impersonate && !req->tcp) {
++ RevertToSelf();
++ }
++#endif
+
-+ test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
++ if ((force || !req->keep) && req->fd >= 0) {
++#ifdef _WIN32
++ if (!req->tcp) {
++ HANDLE pipe = (HANDLE)_get_osfhandle(req->fd);
+
-+#ifdef __cplusplus
-+extern \"C\" {
-+#endif
++ if (!force) {
++ FlushFileBuffers(pipe);
++ }
++ DisconnectNamedPipe(pipe);
++ } else {
++ if (!force) {
++ char buf[8];
+
-+/* Prevent the only kind of declaration conflicts we can make. */
-+#define lt_preloaded_symbols some_other_symbol
-+
-+/* External symbol declarations for the compiler. */\
-+"
-+
-+ if test "$dlself" = yes; then
-+ $show "generating symbol list for \`$output'"
-+
-+ test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-+
-+ # Add our own program objects to the symbol list.
-+ progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+ for arg in $progfiles; do
-+ $show "extracting global C symbols from \`$arg'"
-+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-+ done
-+
-+ if test -n "$exclude_expsyms"; then
-+ $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-+ $run eval '$mv "$nlist"T "$nlist"'
-+ fi
-+
-+ if test -n "$export_symbols_regex"; then
-+ $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-+ $run eval '$mv "$nlist"T "$nlist"'
-+ fi
-+
-+ # Prepare the list of exported symbols
-+ if test -z "$export_symbols"; then
-+ export_symbols="$output_objdir/$outputname.exp"
-+ $run $rm $export_symbols
-+ $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+ else
-+ $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-+ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-+ $run eval 'mv "$nlist"T "$nlist"'
-+ fi
-+ fi
-+
-+ for arg in $dlprefiles; do
-+ $show "extracting global C symbols from \`$arg'"
-+ name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-+ $run eval '$echo ": $name " >> "$nlist"'
-+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-+ done
-+
-+ if test -z "$run"; then
-+ # Make sure we have at least an empty file.
-+ test -f "$nlist" || : > "$nlist"
-+
-+ if test -n "$exclude_expsyms"; then
-+ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-+ $mv "$nlist"T "$nlist"
-+ fi
-+
-+ # Try sorting and uniquifying the output.
-+ if grep -v "^: " < "$nlist" |
-+ if sort -k 3 </dev/null >/dev/null 2>&1; then
-+ sort -k 3
-+ else
-+ sort +2
-+ fi |
-+ uniq > "$nlist"S; then
-+ :
-+ else
-+ grep -v "^: " < "$nlist" > "$nlist"S
-+ fi
-+
-+ if test -f "$nlist"S; then
-+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-+ else
-+ $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-+ fi
-+
-+ $echo >> "$output_objdir/$dlsyms" "\
-+
-+#undef lt_preloaded_symbols
-+
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr void *
++ shutdown(req->fd, 1);
++ while (recv(req->fd, buf, sizeof(buf), 0) > 0) {}
++ }
++ closesocket(req->fd);
++ }
+#else
-+# define lt_ptr char *
-+# define const
++ if (!force) {
++ char buf[8];
++
++ shutdown(req->fd, 1);
++ while (recv(req->fd, buf, sizeof(buf), 0) > 0) {}
++ }
++ close(req->fd);
+#endif
++ req->fd = -1;
+
-+/* The mapping between symbol names and symbols. */
-+"
-+
-+ case $host in
-+ *cygwin* | *mingw* )
-+ $echo >> "$output_objdir/$dlsyms" "\
-+/* DATA imports from DLLs on WIN32 can't be const, because
-+ runtime relocations are performed -- see ld's documentation
-+ on pseudo-relocs */
-+struct {
-+"
-+ ;;
-+ * )
-+ $echo >> "$output_objdir/$dlsyms" "\
-+const struct {
-+"
-+ ;;
-+ esac
-+
-+
-+ $echo >> "$output_objdir/$dlsyms" "\
-+ const char *name;
-+ lt_ptr address;
++ fpm_request_finished();
++ }
+}
-+lt_preloaded_symbols[] =
-+{\
-+"
+
-+ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
++int fcgi_accept_request(fcgi_request *req)
++{
++#ifdef _WIN32
++ HANDLE pipe;
++ OVERLAPPED ov;
++#endif
++ fcgi_finish_request(req);
+
-+ $echo >> "$output_objdir/$dlsyms" "\
-+ {0, (lt_ptr) 0}
-+};
++ while (1) {
++ if (req->fd < 0) {
++ while (1) {
++ if (in_shutdown) {
++ return -1;
++ }
++#ifdef _WIN32
++ if (!req->tcp) {
++ pipe = (HANDLE)_get_osfhandle(req->listen_socket);
++ FCGI_LOCK(req->listen_socket);
++ ov.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
++ if (!ConnectNamedPipe(pipe, &ov)) {
++ errno = GetLastError();
++ if (errno == ERROR_IO_PENDING) {
++ while (WaitForSingleObject(ov.hEvent, 1000) == WAIT_TIMEOUT) {
++ if (in_shutdown) {
++ CloseHandle(ov.hEvent);
++ FCGI_UNLOCK(req->listen_socket);
++ return -1;
++ }
++ }
++ } else if (errno != ERROR_PIPE_CONNECTED) {
++ }
++ }
++ CloseHandle(ov.hEvent);
++ req->fd = req->listen_socket;
++ FCGI_UNLOCK(req->listen_socket);
++ } else {
++ SOCKET listen_socket = (SOCKET)_get_osfhandle(req->listen_socket);
++#else
++ {
++ int listen_socket = req->listen_socket;
++#endif
++ sa_t sa;
++ socklen_t len = sizeof(sa);
++
++ fpm_request_accepting();
++
++ FCGI_LOCK(req->listen_socket);
++ req->fd = accept(listen_socket, (struct sockaddr *)&sa, &len);
++ FCGI_UNLOCK(req->listen_socket);
++ if (req->fd >= 0 && allowed_clients) {
++ int n = 0;
++ int allowed = 0;
++
++ while (allowed_clients[n] != INADDR_NONE) {
++ if (allowed_clients[n] == sa.sa_inet.sin_addr.s_addr) {
++ allowed = 1;
++ break;
++ }
++ n++;
++ }
++ if (!allowed) {
++ fprintf(stderr, "Connection from disallowed IP address '%s' is dropped.\n", inet_ntoa(sa.sa_inet.sin_addr));
++ closesocket(req->fd);
++ req->fd = -1;
++ continue;
++ }
++ }
++ }
+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+ return lt_preloaded_symbols;
-+}
++#ifdef _WIN32
++ if (req->fd < 0 && (in_shutdown || errno != EINTR)) {
++#else
++ if (req->fd < 0 && (in_shutdown || (errno != EINTR && errno != ECONNABORTED))) {
+#endif
++ return -1;
++ }
+
-+#ifdef __cplusplus
++#ifdef _WIN32
++ break;
++#else
++ if (req->fd >= 0) {
++
++ fpm_request_reading_headers();
++
++#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
++ struct pollfd fds;
++ int ret;
++
++ fds.fd = req->fd;
++ fds.events = POLLIN;
++ fds.revents = 0;
++ do {
++ errno = 0;
++ ret = poll(&fds, 1, 5000);
++ } while (ret < 0 && errno == EINTR);
++ if (ret > 0 && (fds.revents & POLLIN)) {
++ break;
++ }
++ fcgi_close(req, 1, 0);
++#else
++ if (req->fd < FD_SETSIZE) {
++ struct timeval tv = {5,0};
++ fd_set set;
++ int ret;
++
++ FD_ZERO(&set);
++ FD_SET(req->fd, &set);
++ do {
++ errno = 0;
++ ret = select(req->fd + 1, &set, NULL, NULL, &tv) >= 0;
++ } while (ret < 0 && errno == EINTR);
++ if (ret > 0 && FD_ISSET(req->fd, &set)) {
++ break;
++ }
++ fcgi_close(req, 1, 0);
++ } else {
++ fprintf(stderr, "Too many open file descriptors. FD_SETSIZE limit exceeded.");
++ fcgi_close(req, 1, 0);
++ }
++#endif
++ }
++#endif
++ }
++ } else if (in_shutdown) {
++ return -1;
++ }
++ if (fcgi_read_request(req)) {
++#ifdef _WIN32
++ if (is_impersonate && !req->tcp) {
++ pipe = (HANDLE)_get_osfhandle(req->fd);
++ if (!ImpersonateNamedPipeClient(pipe)) {
++ fcgi_close(req, 1, 1);
++ continue;
++ }
++ }
++#endif
++ return req->fd;
++ } else {
++ fcgi_close(req, 1, 1);
++ }
++ }
+}
-+#endif\
-+"
-+ fi
-+
-+ pic_flag_for_symtable=
-+ case $host in
-+ # compiling the symbol table file with pic_flag works around
-+ # a FreeBSD bug that causes programs to crash when -lm is
-+ # linked before any other PIC object. But we must not use
-+ # pic_flag when linking with -static. The problem exists in
-+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-+ case "$compile_command " in
-+ *" -static "*) ;;
-+ *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-+ esac;;
-+ *-*-hpux*)
-+ case "$compile_command " in
-+ *" -static "*) ;;
-+ *) pic_flag_for_symtable=" $pic_flag";;
-+ esac
-+ esac
-+
-+ # Now compile the dynamic symbol file.
-+ $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-+ $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-+
-+ # Clean up the generated files.
-+ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-+ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-+
-+ # Transform the symbol file into the correct name.
-+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ ;;
-+ *)
-+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+ else
-+ # We keep going just in case the user didn't refer to
-+ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe
-+ # really was required.
-+
-+ # Nullify the symbol file.
-+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+ fi
+
-+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-+ # Replace the output file specification.
-+ compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+ link_command="$compile_command$compile_rpath"
++static inline fcgi_header* open_packet(fcgi_request *req, fcgi_request_type type)
++{
++ req->out_hdr = (fcgi_header*) req->out_pos;
++ req->out_hdr->type = type;
++ req->out_pos += sizeof(fcgi_header);
++ return req->out_hdr;
++}
+
-+ # We have no uninstalled library dependencies, so finalize right now.
-+ $show "$link_command"
-+ $run eval "$link_command"
-+ status=$?
++static inline void close_packet(fcgi_request *req)
++{
++ if (req->out_hdr) {
++ int len = req->out_pos - ((unsigned char*)req->out_hdr + sizeof(fcgi_header));
+
-+ # Delete the generated files.
-+ if test -n "$dlsyms"; then
-+ $show "$rm $output_objdir/${outputname}S.${objext}"
-+ $run $rm "$output_objdir/${outputname}S.${objext}"
-+ fi
++ req->out_pos += fcgi_make_header(req->out_hdr, (fcgi_request_type)req->out_hdr->type, req->id, len);
++ req->out_hdr = NULL;
++ }
++}
+
-+ exit $status
-+ fi
++int fcgi_flush(fcgi_request *req, int close)
++{
++ int len;
+
-+ if test -n "$shlibpath_var"; then
-+ # We should set the shlibpath_var
-+ rpath=
-+ for dir in $temp_rpath; do
-+ case $dir in
-+ [\\/]* | [A-Za-z]:[\\/]*)
-+ # Absolute path.
-+ rpath="$rpath$dir:"
-+ ;;
-+ *)
-+ # Relative path: add a thisdir entry.
-+ rpath="$rpath\$thisdir/$dir:"
-+ ;;
-+ esac
-+ done
-+ temp_rpath="$rpath"
-+ fi
++ close_packet(req);
+
-+ if test -n "$compile_shlibpath$finalize_shlibpath"; then
-+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-+ fi
-+ if test -n "$finalize_shlibpath"; then
-+ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-+ fi
++ len = req->out_pos - req->out_buf;
+
-+ compile_var=
-+ finalize_var=
-+ if test -n "$runpath_var"; then
-+ if test -n "$perm_rpath"; then
-+ # We should set the runpath_var.
-+ rpath=
-+ for dir in $perm_rpath; do
-+ rpath="$rpath$dir:"
-+ done
-+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+ fi
-+ if test -n "$finalize_perm_rpath"; then
-+ # We should set the runpath_var.
-+ rpath=
-+ for dir in $finalize_perm_rpath; do
-+ rpath="$rpath$dir:"
-+ done
-+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-+ fi
-+ fi
++ if (close) {
++ fcgi_end_request_rec *rec = (fcgi_end_request_rec*)(req->out_pos);
+
-+ if test "$no_install" = yes; then
-+ # We don't need to create a wrapper script.
-+ link_command="$compile_var$compile_command$compile_rpath"
-+ # Replace the output file specification.
-+ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+ # Delete the old output file.
-+ $run $rm $output
-+ # Link the executable and exit
-+ $show "$link_command"
-+ $run eval "$link_command" || exit $?
-+ exit $EXIT_SUCCESS
-+ fi
++ fcgi_make_header(&rec->hdr, FCGI_END_REQUEST, req->id, sizeof(fcgi_end_request));
++ rec->body.appStatusB3 = 0;
++ rec->body.appStatusB2 = 0;
++ rec->body.appStatusB1 = 0;
++ rec->body.appStatusB0 = 0;
++ rec->body.protocolStatus = FCGI_REQUEST_COMPLETE;
++ len += sizeof(fcgi_end_request_rec);
++ }
+
-+ if test "$hardcode_action" = relink; then
-+ # Fast installation is not supported
-+ link_command="$compile_var$compile_command$compile_rpath"
-+ relink_command="$finalize_var$finalize_command$finalize_rpath"
-+
-+ $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-+ $echo "$modename: \`$output' will be relinked during installation" 1>&2
-+ else
-+ if test "$fast_install" != no; then
-+ link_command="$finalize_var$compile_command$finalize_rpath"
-+ if test "$fast_install" = yes; then
-+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+ else
-+ # fast_install is set to needless
-+ relink_command=
-+ fi
-+ else
-+ link_command="$compile_var$compile_command$compile_rpath"
-+ relink_command="$finalize_var$finalize_command$finalize_rpath"
-+ fi
-+ fi
++ if (safe_write(req, req->out_buf, len) != len) {
++ req->keep = 0;
++ return 0;
++ }
+
-+ # Replace the output file specification.
-+ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+
-+ # Delete the old output files.
-+ $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-+
-+ $show "$link_command"
-+ $run eval "$link_command" || exit $?
-+
-+ # Now create the wrapper script.
-+ $show "creating $output"
-+
-+ # Quote the relink command for shipping.
-+ if test -n "$relink_command"; then
-+ # Preserve any variables that may affect compiler behavior
-+ for var in $variables_saved_for_relink; do
-+ if eval test -z \"\${$var+set}\"; then
-+ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-+ elif eval var_value=\$$var; test -z "$var_value"; then
-+ relink_command="$var=; export $var; $relink_command"
-+ else
-+ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-+ relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+ fi
-+ done
-+ relink_command="(cd `pwd`; $relink_command)"
-+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ fi
++ req->out_pos = req->out_buf;
++ return 1;
++}
+
-+ # Quote $echo for shipping.
-+ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-+ case $progpath in
-+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-+ esac
-+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-+ else
-+ qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-+ fi
++int fcgi_write(fcgi_request *req, fcgi_request_type type, const char *str, int len)
++{
++ int limit, rest;
+
-+ # Only actually do things if our run command is non-null.
-+ if test -z "$run"; then
-+ # win32 will think the script is a binary if it has
-+ # a .exe suffix, so we strip it off here.
-+ case $output in
-+ *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-+ esac
-+ # test for cygwin because mv fails w/o .exe extensions
-+ case $host in
-+ *cygwin*)
-+ exeext=.exe
-+ outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-+ *) exeext= ;;
-+ esac
-+ case $host in
-+ *cygwin* | *mingw* )
-+ cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
-+ cwrapper=`$echo ${output}.exe`
-+ $rm $cwrappersource $cwrapper
-+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-+
-+ cat > $cwrappersource <<EOF
-+
-+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-+ Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+
-+ The $output program cannot be directly executed until all the libtool
-+ libraries that it depends on are installed.
-+
-+ This wrapper executable should never be moved out of the build directory.
-+ If it is, it will not operate correctly.
-+
-+ Currently, it simply execs the wrapper *script* "/bin/sh $output",
-+ but could eventually absorb all of the scripts functionality and
-+ exec $objdir/$outputname directly.
-+*/
-+EOF
-+ cat >> $cwrappersource<<"EOF"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <malloc.h>
-+#include <stdarg.h>
-+#include <assert.h>
++ if (len <= 0) {
++ return 0;
++ }
+
-+#if defined(PATH_MAX)
-+# define LT_PATHMAX PATH_MAX
-+#elif defined(MAXPATHLEN)
-+# define LT_PATHMAX MAXPATHLEN
++ if (req->out_hdr && req->out_hdr->type != type) {
++ close_packet(req);
++ }
++#if 0
++ /* Unoptimized, but clear version */
++ rest = len;
++ while (rest > 0) {
++ limit = sizeof(req->out_buf) - (req->out_pos - req->out_buf);
++
++ if (!req->out_hdr) {
++ if (limit < sizeof(fcgi_header)) {
++ if (!fcgi_flush(req, 0)) {
++ return -1;
++ }
++ }
++ open_packet(req, type);
++ }
++ limit = sizeof(req->out_buf) - (req->out_pos - req->out_buf);
++ if (rest < limit) {
++ memcpy(req->out_pos, str, rest);
++ req->out_pos += rest;
++ return len;
++ } else {
++ memcpy(req->out_pos, str, limit);
++ req->out_pos += limit;
++ rest -= limit;
++ str += limit;
++ if (!fcgi_flush(req, 0)) {
++ return -1;
++ }
++ }
++ }
+#else
-+# define LT_PATHMAX 1024
-+#endif
++ /* Optimized version */
++ limit = sizeof(req->out_buf) - (req->out_pos - req->out_buf);
++ if (!req->out_hdr) {
++ limit -= sizeof(fcgi_header);
++ if (limit < 0) limit = 0;
++ }
+
-+#ifndef DIR_SEPARATOR
-+#define DIR_SEPARATOR '/'
-+#endif
++ if (len < limit) {
++ if (!req->out_hdr) {
++ open_packet(req, type);
++ }
++ memcpy(req->out_pos, str, len);
++ req->out_pos += len;
++ } else if (len - limit < sizeof(req->out_buf) - sizeof(fcgi_header)) {
++ if (!req->out_hdr) {
++ open_packet(req, type);
++ }
++ if (limit > 0) {
++ memcpy(req->out_pos, str, limit);
++ req->out_pos += limit;
++ }
++ if (!fcgi_flush(req, 0)) {
++ return -1;
++ }
++ if (len > limit) {
++ open_packet(req, type);
++ memcpy(req->out_pos, str + limit, len - limit);
++ req->out_pos += len - limit;
++ }
++ } else {
++ int pos = 0;
++ int pad;
++
++ close_packet(req);
++ while ((len - pos) > 0xffff) {
++ open_packet(req, type);
++ fcgi_make_header(req->out_hdr, type, req->id, 0xfff8);
++ req->out_hdr = NULL;
++ if (!fcgi_flush(req, 0)) {
++ return -1;
++ }
++ if (safe_write(req, str + pos, 0xfff8) != 0xfff8) {
++ req->keep = 0;
++ return -1;
++ }
++ pos += 0xfff8;
++ }
++
++ pad = (((len - pos) + 7) & ~7) - (len - pos);
++ rest = pad ? 8 - pad : 0;
+
-+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-+ defined (__OS2__)
-+#define HAVE_DOS_BASED_FILE_SYSTEM
-+#ifndef DIR_SEPARATOR_2
-+#define DIR_SEPARATOR_2 '\\'
-+#endif
++ open_packet(req, type);
++ fcgi_make_header(req->out_hdr, type, req->id, (len - pos) - rest);
++ req->out_hdr = NULL;
++ if (!fcgi_flush(req, 0)) {
++ return -1;
++ }
++ if (safe_write(req, str + pos, (len - pos) - rest) != (len - pos) - rest) {
++ req->keep = 0;
++ return -1;
++ }
++ if (pad) {
++ open_packet(req, type);
++ memcpy(req->out_pos, str + len - rest, rest);
++ req->out_pos += rest;
++ }
++ }
+#endif
++ return len;
++}
+
-+#ifndef DIR_SEPARATOR_2
-+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-+#else /* DIR_SEPARATOR_2 */
-+# define IS_DIR_SEPARATOR(ch) \
-+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-+#endif /* DIR_SEPARATOR_2 */
-+
-+#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
-+#define XFREE(stale) do { \
-+ if (stale) { free ((void *) stale); stale = 0; } \
-+} while (0)
-+
-+const char *program_name = NULL;
-+
-+void * xmalloc (size_t num);
-+char * xstrdup (const char *string);
-+char * basename (const char *name);
-+char * fnqualify(const char *path);
-+char * strendzap(char *str, const char *pat);
-+void lt_fatal (const char *message, ...);
-+
-+int
-+main (int argc, char *argv[])
++int fcgi_finish_request(fcgi_request *req)
+{
-+ char **newargz;
-+ int i;
-+
-+ program_name = (char *) xstrdup ((char *) basename (argv[0]));
-+ newargz = XMALLOC(char *, argc+2);
-+EOF
-+
-+ cat >> $cwrappersource <<EOF
-+ newargz[0] = "$SHELL";
-+EOF
-+
-+ cat >> $cwrappersource <<"EOF"
-+ newargz[1] = fnqualify(argv[0]);
-+ /* we know the script has the same name, without the .exe */
-+ /* so make sure newargz[1] doesn't end in .exe */
-+ strendzap(newargz[1],".exe");
-+ for (i = 1; i < argc; i++)
-+ newargz[i+1] = xstrdup(argv[i]);
-+ newargz[argc+1] = NULL;
-+EOF
-+
-+ cat >> $cwrappersource <<EOF
-+ execv("$SHELL",newargz);
-+EOF
-+
-+ cat >> $cwrappersource <<"EOF"
++ if (req->fd >= 0) {
++ fcgi_flush(req, 1);
++ fcgi_close(req, 0, 1);
++ }
++ return 1;
+}
+
-+void *
-+xmalloc (size_t num)
++char* fcgi_getenv(fcgi_request *req, const char* var, int var_len)
+{
-+ void * p = (void *) malloc (num);
-+ if (!p)
-+ lt_fatal ("Memory exhausted");
++ char **val;
+
-+ return p;
++ if (!req) return NULL;
++
++ if (zend_hash_find(&req->env, (char*)var, var_len+1, (void**)&val) == SUCCESS) {
++ return *val;
++ }
++ return NULL;
+}
+
-+char *
-+xstrdup (const char *string)
++char* fcgi_putenv(fcgi_request *req, char* var, int var_len, char* val)
+{
-+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-+;
++ if (var && req) {
++ if (val == NULL) {
++ zend_hash_del(&req->env, var, var_len+1);
++ } else {
++ char **ret;
++
++ val = strdup(val);
++ if (zend_hash_update(&req->env, var, var_len+1, &val, sizeof(char*), (void**)&ret) == SUCCESS) {
++ return *ret;
++ }
++ }
++ }
++ return NULL;
+}
+
-+char *
-+basename (const char *name)
++#ifdef _WIN32
++void fcgi_impersonate(void)
+{
-+ const char *base;
++ char *os_name;
+
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+ /* Skip over the disk name in MSDOS pathnames. */
-+ if (isalpha (name[0]) && name[1] == ':')
-+ name += 2;
++ os_name = getenv("OS");
++ if (os_name && stricmp(os_name, "Windows_NT") == 0) {
++ is_impersonate = 1;
++ }
++}
+#endif
+
-+ for (base = name; *name; name++)
-+ if (IS_DIR_SEPARATOR (*name))
-+ base = name + 1;
-+ return (char *) base;
++void fcgi_set_mgmt_var(char * name, size_t name_len, const char * value, size_t value_len)
++{
++ zval * zvalue;
++ zvalue = pemalloc(sizeof(*zvalue), 1);
++ Z_TYPE_P(zvalue) = IS_STRING;
++ Z_STRVAL_P(zvalue) = pestrndup(value, value_len, 1);
++ Z_STRLEN_P(zvalue) = value_len;
++ zend_hash_update(fcgi_mgmt_vars, name, name_len + 1, &zvalue, sizeof(zvalue), NULL);
+}
+
-+char *
-+fnqualify(const char *path)
++void fcgi_free_mgmt_var_cb(void * ptr)
+{
-+ size_t size;
-+ char *p;
-+ char tmp[LT_PATHMAX + 1];
++ zval ** var = (zval **)ptr;
++ pefree(Z_STRVAL_PP(var), 1);
++ pefree(*var, 1);
++}
+
-+ assert(path != NULL);
++/*
++ * Local variables:
++ * tab-width: 4
++ * c-basic-offset: 4
++ * End:
++ * vim600: sw=4 ts=4 fdm=marker
++ * vim<600: sw=4 ts=4
++ */
+diff -Naur php-src-vanilla/sapi/fpm/cgi/fastcgi.h php-src/sapi/fpm/cgi/fastcgi.h
+--- php-src-vanilla/sapi/fpm/cgi/fastcgi.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/cgi/fastcgi.h 2009-10-18 21:05:39.302497288 +0100
+@@ -0,0 +1,150 @@
++/*
++ +----------------------------------------------------------------------+
++ | PHP Version 5 |
++ +----------------------------------------------------------------------+
++ | Copyright (c) 1997-2008 The PHP Group |
++ +----------------------------------------------------------------------+
++ | This source file is subject to version 3.01 of the PHP license, |
++ | that is bundled with this package in the file LICENSE, and is |
++ | available through the world-wide-web at the following url: |
++ | http://www.php.net/license/3_01.txt |
++ | If you did not receive a copy of the PHP license and are unable to |
++ | obtain it through the world-wide-web, please send a note to |
++ | license@php.net so we can mail you a copy immediately. |
++ +----------------------------------------------------------------------+
++ | Authors: Dmitry Stogov <dmitry@zend.com> |
++ +----------------------------------------------------------------------+
++*/
+
-+ /* Is it qualified already? */
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+ if (isalpha (path[0]) && path[1] == ':')
-+ return xstrdup (path);
-+#endif
-+ if (IS_DIR_SEPARATOR (path[0]))
-+ return xstrdup (path);
-+
-+ /* prepend the current directory */
-+ /* doesn't handle '~' */
-+ if (getcwd (tmp, LT_PATHMAX) == NULL)
-+ lt_fatal ("getcwd failed");
-+ size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-+ p = XMALLOC(char, size);
-+ sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-+ return p;
-+}
++/* $Id$ */
+
-+char *
-+strendzap(char *str, const char *pat)
-+{
-+ size_t len, patlen;
++/* FastCGI protocol */
++
++#define FCGI_VERSION_1 1
++
++#define FCGI_MAX_LENGTH 0xffff
++
++#define FCGI_KEEP_CONN 1
++
++typedef enum _fcgi_role {
++ FCGI_RESPONDER = 1,
++ FCGI_AUTHORIZER = 2,
++ FCGI_FILTER = 3
++} fcgi_role;
++
++typedef enum _fcgi_request_type {
++ FCGI_BEGIN_REQUEST = 1, /* [in] */
++ FCGI_ABORT_REQUEST = 2, /* [in] (not supported) */
++ FCGI_END_REQUEST = 3, /* [out] */
++ FCGI_PARAMS = 4, /* [in] environment variables */
++ FCGI_STDIN = 5, /* [in] post data */
++ FCGI_STDOUT = 6, /* [out] response */
++ FCGI_STDERR = 7, /* [out] errors */
++ FCGI_DATA = 8, /* [in] filter data (not supported) */
++ FCGI_GET_VALUES = 9, /* [in] */
++ FCGI_GET_VALUES_RESULT = 10 /* [out] */
++} fcgi_request_type;
++
++typedef enum _fcgi_protocol_status {
++ FCGI_REQUEST_COMPLETE = 0,
++ FCGI_CANT_MPX_CONN = 1,
++ FCGI_OVERLOADED = 2,
++ FCGI_UNKNOWN_ROLE = 3
++} dcgi_protocol_status;
++
++typedef struct _fcgi_header {
++ unsigned char version;
++ unsigned char type;
++ unsigned char requestIdB1;
++ unsigned char requestIdB0;
++ unsigned char contentLengthB1;
++ unsigned char contentLengthB0;
++ unsigned char paddingLength;
++ unsigned char reserved;
++} fcgi_header;
++
++typedef struct _fcgi_begin_request {
++ unsigned char roleB1;
++ unsigned char roleB0;
++ unsigned char flags;
++ unsigned char reserved[5];
++} fcgi_begin_request;
++
++typedef struct _fcgi_begin_request_rec {
++ fcgi_header hdr;
++ fcgi_begin_request body;
++} fcgi_begin_request_rec;
++
++typedef struct _fcgi_end_request {
++ unsigned char appStatusB3;
++ unsigned char appStatusB2;
++ unsigned char appStatusB1;
++ unsigned char appStatusB0;
++ unsigned char protocolStatus;
++ unsigned char reserved[3];
++} fcgi_end_request;
++
++typedef struct _fcgi_end_request_rec {
++ fcgi_header hdr;
++ fcgi_end_request body;
++} fcgi_end_request_rec;
++
++/* FastCGI client API */
++
++typedef struct _fcgi_request {
++ int listen_socket;
++#ifdef _WIN32
++ int tcp;
++#endif
++ int fd;
++ int id;
++ int keep;
++
++ int in_len;
++ int in_pad;
++
++ fcgi_header *out_hdr;
++ unsigned char *out_pos;
++ unsigned char out_buf[1024*8];
++ unsigned char reserved[sizeof(fcgi_end_request_rec)];
++
++ HashTable env;
++} fcgi_request;
++
++int fcgi_init(void);
++void fcgi_shutdown(void);
++int fcgi_is_fastcgi(void);
++void fcgi_set_is_fastcgi(int);
++void fcgi_set_in_shutdown(int);
++void fcgi_set_allowed_clients(char *);
++int fcgi_in_shutdown(void);
++int fcgi_listen(const char *path, int backlog);
++void fcgi_init_request(fcgi_request *req, int listen_socket);
++int fcgi_accept_request(fcgi_request *req);
++int fcgi_finish_request(fcgi_request *req);
+
-+ assert(str != NULL);
-+ assert(pat != NULL);
++char* fcgi_getenv(fcgi_request *req, const char* var, int var_len);
++char* fcgi_putenv(fcgi_request *req, char* var, int var_len, char* val);
+
-+ len = strlen(str);
-+ patlen = strlen(pat);
++int fcgi_read(fcgi_request *req, char *str, int len);
+
-+ if (patlen <= len)
-+ {
-+ str += len - patlen;
-+ if (strcmp(str, pat) == 0)
-+ *str = '\0';
-+ }
-+ return str;
-+}
++int fcgi_write(fcgi_request *req, fcgi_request_type type, const char *str, int len);
++int fcgi_flush(fcgi_request *req, int close);
+
-+static void
-+lt_error_core (int exit_status, const char * mode,
-+ const char * message, va_list ap)
-+{
-+ fprintf (stderr, "%s: %s: ", program_name, mode);
-+ vfprintf (stderr, message, ap);
-+ fprintf (stderr, ".\n");
++void fcgi_close(fcgi_request *req, int force, int destroy);
+
-+ if (exit_status >= 0)
-+ exit (exit_status);
-+}
++#ifdef PHP_WIN32
++void fcgi_impersonate(void);
++#endif
+
-+void
-+lt_fatal (const char *message, ...)
-+{
-+ va_list ap;
-+ va_start (ap, message);
-+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-+ va_end (ap);
-+}
-+EOF
-+ # we should really use a build-platform specific compiler
-+ # here, but OTOH, the wrappers (shell script and this C one)
-+ # are only useful if you want to execute the "real" binary.
-+ # Since the "real" binary is built for $host, then this
-+ # wrapper might as well be built for $host, too.
-+ $run $LTCC -s -o $cwrapper $cwrappersource
-+ ;;
-+ esac
-+ $rm $output
-+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-+
-+ $echo > $output "\
-+#! $SHELL
-+
-+# $output - temporary wrapper script for $objdir/$outputname
-+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+#
-+# The $output program cannot be directly executed until all the libtool
-+# libraries that it depends on are installed.
-+#
-+# This wrapper script should never be moved out of the build directory.
-+# If it is, it will not operate correctly.
-+
-+# Sed substitution that helps us do robust quoting. It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='${SED} -e 1s/^X//'
-+sed_quote_subst='$sed_quote_subst'
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+relink_command=\"$relink_command\"
-+
-+# This environment variable determines our operation mode.
-+if test \"\$libtool_install_magic\" = \"$magic\"; then
-+ # install mode needs the following variable:
-+ notinst_deplibs='$notinst_deplibs'
-+else
-+ # When we are sourced in execute mode, \$file and \$echo are already set.
-+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+ echo=\"$qecho\"
-+ file=\"\$0\"
-+ # Make sure echo works.
-+ if test \"X\$1\" = X--no-reexec; then
-+ # Discard the --no-reexec flag, and continue.
-+ shift
-+ elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-+ # Yippee, \$echo works!
-+ :
-+ else
-+ # Restart under the correct shell, and then maybe \$echo will work.
-+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-+ fi
-+ fi\
-+"
-+ $echo >> $output "\
-+
-+ # Find the directory that this script lives in.
-+ thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-+ test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-+
-+ # Follow symbolic links until we get to the real thisdir.
-+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-+ while test -n \"\$file\"; do
-+ destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-+
-+ # If there was a directory component, then change thisdir.
-+ if test \"x\$destdir\" != \"x\$file\"; then
-+ case \"\$destdir\" in
-+ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-+ *) thisdir=\"\$thisdir/\$destdir\" ;;
-+ esac
-+ fi
++void fcgi_set_mgmt_var(char * name, size_t name_len, const char * value, size_t value_len);
++void fcgi_free_mgmt_var_cb(void * ptr);
+
-+ file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-+ done
-+
-+ # Try to get the absolute directory name.
-+ absdir=\`cd \"\$thisdir\" && pwd\`
-+ test -n \"\$absdir\" && thisdir=\"\$absdir\"
-+"
-+
-+ if test "$fast_install" = yes; then
-+ $echo >> $output "\
-+ program=lt-'$outputname'$exeext
-+ progdir=\"\$thisdir/$objdir\"
-+
-+ if test ! -f \"\$progdir/\$program\" || \\
-+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-+
-+ file=\"\$\$-\$program\"
-+
-+ if test ! -d \"\$progdir\"; then
-+ $mkdir \"\$progdir\"
-+ else
-+ $rm \"\$progdir/\$file\"
-+ fi"
-+
-+ $echo >> $output "\
-+
-+ # relink executable if necessary
-+ if test -n \"\$relink_command\"; then
-+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-+ else
-+ $echo \"\$relink_command_output\" >&2
-+ $rm \"\$progdir/\$file\"
-+ exit $EXIT_FAILURE
-+ fi
-+ fi
++/*
++ * Local variables:
++ * tab-width: 4
++ * c-basic-offset: 4
++ * End:
++ * vim600: sw=4 ts=4 fdm=marker
++ * vim<600: sw=4 ts=4
++ */
+diff -Naur php-src-vanilla/sapi/fpm/cgi/php_getopt.h php-src/sapi/fpm/cgi/php_getopt.h
+--- php-src-vanilla/sapi/fpm/cgi/php_getopt.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/cgi/php_getopt.h 2009-10-18 21:05:39.302497288 +0100
+@@ -0,0 +1,39 @@
++/*
++ +----------------------------------------------------------------------+
++ | PHP Version 5 |
++ +----------------------------------------------------------------------+
++ | Copyright (c) 1997-2008 The PHP Group |
++ +----------------------------------------------------------------------+
++ | This source file is subject to version 3.01 of the PHP license, |
++ | that is bundled with this package in the file LICENSE, and is |
++ | available through the world-wide-web at the following url: |
++ | http://www.php.net/license/3_01.txt |
++ | If you did not receive a copy of the PHP license and are unable to |
++ | obtain it through the world-wide-web, please send a note to |
++ | license@php.net so we can mail you a copy immediately. |
++ +----------------------------------------------------------------------+
++ | Author: Marcus Boerger <helly@php.net> |
++ +----------------------------------------------------------------------+
++*/
+
-+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-+ { $rm \"\$progdir/\$program\";
-+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-+ $rm \"\$progdir/\$file\"
-+ fi"
-+ else
-+ $echo >> $output "\
-+ program='$outputname'
-+ progdir=\"\$thisdir/$objdir\"
-+"
-+ fi
++/* $Id$ */
+
-+ $echo >> $output "\
++#include <php.h>
+
-+ if test -f \"\$progdir/\$program\"; then"
++#ifdef NETWARE
++/*
++As NetWare LibC has optind and optarg macros defined in unistd.h our local variables were getting mistakenly preprocessed so undeffing optind and optarg
++*/
++#undef optarg
++#undef optind
++#endif
++/* Define structure for one recognized option (both single char and long name).
++ * If short_open is '-' this is the last option.
++ */
++typedef struct _opt_struct {
++ const char opt_char;
++ const int need_param;
++ const char * opt_name;
++} opt_struct;
++
++int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err);
+diff -Naur php-src-vanilla/sapi/fpm/conf/init.d.php-fpm.in php-src/sapi/fpm/conf/init.d.php-fpm.in
+--- php-src-vanilla/sapi/fpm/conf/init.d.php-fpm.in 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/conf/init.d.php-fpm.in 2009-10-18 21:05:39.298456068 +0100
+@@ -0,0 +1,135 @@
++#! /bin/sh
+
-+ # Export our shlibpath_var if we have one.
-+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-+ $echo >> $output "\
-+ # Add our own library path to $shlibpath_var
-+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
++### BEGIN INIT INFO
++# Provides: @php_fpm_bin@
++# Required-Start: $all
++# Required-Stop: $all
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
++# Short-Description: starts @php_fpm_bin@
++# Description: starts the PHP FastCGI Process Manager daemon
++### END INIT INFO
+
-+ # Some systems cannot cope with colon-terminated $shlibpath_var
-+ # The second colon is a workaround for a bug in BeOS R4 sed
-+ $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
++php_fpm_BIN=@php_fpm_bin_path@
++php_fpm_CONF=@php_fpm_conf_path@
++php_fpm_PID=@php_fpm_pid_path@
+
-+ export $shlibpath_var
-+"
-+ fi
+
-+ # fixup the dll searchpath if we need to.
-+ if test -n "$dllsearchpath"; then
-+ $echo >> $output "\
-+ # Add the dll search path components to the executable PATH
-+ PATH=$dllsearchpath:\$PATH
-+"
-+ fi
++php_opts="--fpm-config $php_fpm_CONF"
+
-+ $echo >> $output "\
-+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+ # Run the actual program with our arguments.
-+"
-+ case $host in
-+ # Backslashes separate directories on plain windows
-+ *-*-mingw | *-*-os2*)
-+ $echo >> $output "\
-+ exec \$progdir\\\\\$program \${1+\"\$@\"}
-+"
-+ ;;
+
-+ *)
-+ $echo >> $output "\
-+ exec \$progdir/\$program \${1+\"\$@\"}
-+"
-+ ;;
-+ esac
-+ $echo >> $output "\
-+ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-+ exit $EXIT_FAILURE
-+ fi
-+ else
-+ # The program doesn't exist.
-+ \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-+ \$echo \"This script is just a wrapper for \$program.\" 1>&2
-+ $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+fi\
-+"
-+ chmod +x $output
-+ fi
-+ exit $EXIT_SUCCESS
-+ ;;
-+ esac
++wait_for_pid () {
++ try=0
+
-+ # See if we need to build an old-fashioned archive.
-+ for oldlib in $oldlibs; do
-+
-+ if test "$build_libtool_libs" = convenience; then
-+ oldobjs="$libobjs_save"
-+ addlibs="$convenience"
-+ build_libtool_libs=no
-+ else
-+ if test "$build_libtool_libs" = module; then
-+ oldobjs="$libobjs_save"
-+ build_libtool_libs=no
-+ else
-+ oldobjs="$old_deplibs $non_pic_objects"
-+ fi
-+ addlibs="$old_convenience"
-+ fi
++ while test $try -lt 35 ; do
+
-+ if test -n "$addlibs"; then
-+ gentop="$output_objdir/${outputname}x"
-+ generated="$generated $gentop"
++ case "$1" in
++ 'created')
++ if [ -f "$2" ] ; then
++ try=''
++ break
++ fi
++ ;;
+
-+ func_extract_archives $gentop $addlibs
-+ oldobjs="$oldobjs $func_extract_archives_result"
-+ fi
++ 'removed')
++ if [ ! -f "$2" ] ; then
++ try=''
++ break
++ fi
++ ;;
++ esac
+
-+ # Do each command in the archive commands.
-+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-+ cmds=$old_archive_from_new_cmds
-+ else
-+ eval cmds=\"$old_archive_cmds\"
++ echo -n .
++ try=`expr $try + 1`
++ sleep 1
+
-+ if len=`expr "X$cmds" : ".*"` &&
-+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+ cmds=$old_archive_cmds
-+ else
-+ # the command line is too long to link in one step, link in parts
-+ $echo "using piecewise archive linking..."
-+ save_RANLIB=$RANLIB
-+ RANLIB=:
-+ objlist=
-+ concat_cmds=
-+ save_oldobjs=$oldobjs
-+ # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-+ # encoded into archives. This makes 'ar r' malfunction in
-+ # this piecewise linking case whenever conflicting object
-+ # names appear in distinct ar calls; check, warn and compensate.
-+ if (for obj in $save_oldobjs
-+ do
-+ $echo "X$obj" | $Xsed -e 's%^.*/%%'
-+ done | sort | sort -uc >/dev/null 2>&1); then
-+ :
-+ else
-+ $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-+ $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-+ AR_FLAGS=cq
-+ fi
-+ # Is there a better way of finding the last object in the list?
-+ for obj in $save_oldobjs
-+ do
-+ last_oldobj=$obj
-+ done
-+ for obj in $save_oldobjs
-+ do
-+ oldobjs="$objlist $obj"
-+ objlist="$objlist $obj"
-+ eval test_cmds=\"$old_archive_cmds\"
-+ if len=`expr "X$test_cmds" : ".*"` &&
-+ test "$len" -le "$max_cmd_len"; then
-+ :
-+ else
-+ # the above command should be used before it gets too long
-+ oldobjs=$objlist
-+ if test "$obj" = "$last_oldobj" ; then
-+ RANLIB=$save_RANLIB
-+ fi
-+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-+ objlist=
-+ fi
-+ done
-+ RANLIB=$save_RANLIB
-+ oldobjs=$objlist
-+ if test "X$oldobjs" = "X" ; then
-+ eval cmds=\"\$concat_cmds\"
-+ else
-+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-+ fi
-+ fi
-+ fi
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ eval cmd=\"$cmd\"
-+ IFS="$save_ifs"
-+ $show "$cmd"
-+ $run eval "$cmd" || exit $?
-+ done
-+ IFS="$save_ifs"
-+ done
++ done
+
-+ if test -n "$generated"; then
-+ $show "${rm}r$generated"
-+ $run ${rm}r$generated
-+ fi
++}
+
-+ # Now create the libtool archive.
-+ case $output in
-+ *.la)
-+ old_library=
-+ test "$build_old_libs" = yes && old_library="$libname.$libext"
-+ $show "creating $output"
-+
-+ # Preserve any variables that may affect compiler behavior
-+ for var in $variables_saved_for_relink; do
-+ if eval test -z \"\${$var+set}\"; then
-+ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-+ elif eval var_value=\$$var; test -z "$var_value"; then
-+ relink_command="$var=; export $var; $relink_command"
-+ else
-+ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-+ relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+ fi
-+ done
-+ # Quote the link command for shipping.
-+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ if test "$hardcode_automatic" = yes ; then
-+ relink_command=
-+ fi
++case "$1" in
++ start)
++ echo -n "Starting @php_fpm_bin@ "
+
++ $php_fpm_BIN $php_opts
+
-+ # Only create the output if not a dry run.
-+ if test -z "$run"; then
-+ for installed in no yes; do
-+ if test "$installed" = yes; then
-+ if test -z "$install_libdir"; then
-+ break
-+ fi
-+ output="$output_objdir/$outputname"i
-+ # Replace all uninstalled libtool libraries with the installed ones
-+ newdependency_libs=
-+ for deplib in $dependency_libs; do
-+ case $deplib in
-+ *.la)
-+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+ if test -z "$libdir"; then
-+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-+ exit $EXIT_FAILURE
++ if [ "$?" != 0 ] ; then
++ echo " failed"
++ exit 1
+ fi
-+ newdependency_libs="$newdependency_libs $libdir/$name"
-+ ;;
-+ *) newdependency_libs="$newdependency_libs $deplib" ;;
-+ esac
-+ done
-+ dependency_libs="$newdependency_libs"
-+ newdlfiles=
-+ for lib in $dlfiles; do
-+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+ if test -z "$libdir"; then
-+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ newdlfiles="$newdlfiles $libdir/$name"
-+ done
-+ dlfiles="$newdlfiles"
-+ newdlprefiles=
-+ for lib in $dlprefiles; do
-+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+ if test -z "$libdir"; then
-+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ newdlprefiles="$newdlprefiles $libdir/$name"
-+ done
-+ dlprefiles="$newdlprefiles"
-+ else
-+ newdlfiles=
-+ for lib in $dlfiles; do
-+ case $lib in
-+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+ *) abs=`pwd`"/$lib" ;;
-+ esac
-+ newdlfiles="$newdlfiles $abs"
-+ done
-+ dlfiles="$newdlfiles"
-+ newdlprefiles=
-+ for lib in $dlprefiles; do
-+ case $lib in
-+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+ *) abs=`pwd`"/$lib" ;;
-+ esac
-+ newdlprefiles="$newdlprefiles $abs"
-+ done
-+ dlprefiles="$newdlprefiles"
-+ fi
-+ $rm $output
-+ # place dlname in correct position for cygwin
-+ tdlname=$dlname
-+ case $host,$output,$installed,$module,$dlname in
-+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+ esac
-+ $echo > $output "\
-+# $outputname - a libtool library file
-+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# The name that we can dlopen(3).
-+dlname='$tdlname'
-+
-+# Names of this library.
-+library_names='$library_names'
-+
-+# The name of the static archive.
-+old_library='$old_library'
-+
-+# Libraries that this one depends upon.
-+dependency_libs='$dependency_libs'
-+
-+# Version information for $libname.
-+current=$current
-+age=$age
-+revision=$revision
-+
-+# Is this an already installed library?
-+installed=$installed
-+
-+# Should we warn about portability when linking against -modules?
-+shouldnotlink=$module
-+
-+# Files to dlopen/dlpreopen
-+dlopen='$dlfiles'
-+dlpreopen='$dlprefiles'
-+
-+# Directory that this library needs to be installed in:
-+libdir='$install_libdir'"
-+ if test "$installed" = no && test "$need_relink" = yes; then
-+ $echo >> $output "\
-+relink_command=\"$relink_command\""
-+ fi
-+ done
-+ fi
-+
-+ # Do a symbolic link so that the libtool archive can be found in
-+ # LD_LIBRARY_PATH before the program is installed.
-+ $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-+ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-+ ;;
-+ esac
-+ exit $EXIT_SUCCESS
-+ ;;
-+
-+ # libtool install mode
-+ install)
-+ modename="$modename: install"
-+
-+ # There may be an optional sh(1) argument at the beginning of
-+ # install_prog (especially on Windows NT).
-+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-+ # Allow the use of GNU shtool's install command.
-+ $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-+ # Aesthetically quote it.
-+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-+ case $arg in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ arg="\"$arg\""
-+ ;;
-+ esac
-+ install_prog="$arg "
-+ arg="$1"
-+ shift
-+ else
-+ install_prog=
-+ arg="$nonopt"
-+ fi
+
-+ # The real first argument should be the name of the installation program.
-+ # Aesthetically quote it.
-+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+ case $arg in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ arg="\"$arg\""
-+ ;;
-+ esac
-+ install_prog="$install_prog$arg"
-+
-+ # We need to accept at least all the BSD install flags.
-+ dest=
-+ files=
-+ opts=
-+ prev=
-+ install_type=
-+ isdir=no
-+ stripme=
-+ for arg
-+ do
-+ if test -n "$dest"; then
-+ files="$files $dest"
-+ dest="$arg"
-+ continue
-+ fi
++ wait_for_pid created $php_fpm_PID
+
-+ case $arg in
-+ -d) isdir=yes ;;
-+ -f) prev="-f" ;;
-+ -g) prev="-g" ;;
-+ -m) prev="-m" ;;
-+ -o) prev="-o" ;;
-+ -s)
-+ stripme=" -s"
-+ continue
++ if [ -n "$try" ] ; then
++ echo " failed"
++ exit 1
++ else
++ echo " done"
++ fi
+ ;;
-+ -*) ;;
+
-+ *)
-+ # If the previous option needed an argument, then skip it.
-+ if test -n "$prev"; then
-+ prev=
-+ else
-+ dest="$arg"
-+ continue
-+ fi
-+ ;;
-+ esac
++ stop)
++ echo -n "Gracefully shutting down @php_fpm_bin@ "
+
-+ # Aesthetically quote the argument.
-+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+ case $arg in
-+ *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-+ arg="\"$arg\""
-+ ;;
-+ esac
-+ install_prog="$install_prog $arg"
-+ done
++ if [ ! -r $php_fpm_PID ] ; then
++ echo "warning, no pid file found - php-fpm is not running ?"
++ exit 1
++ fi
+
-+ if test -z "$install_prog"; then
-+ $echo "$modename: you must specify an install program" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++ kill -QUIT `cat $php_fpm_PID`
+
-+ if test -n "$prev"; then
-+ $echo "$modename: the \`$prev' option requires an argument" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++ wait_for_pid removed $php_fpm_PID
+
-+ if test -z "$files"; then
-+ if test -z "$dest"; then
-+ $echo "$modename: no file or destination specified" 1>&2
-+ else
-+ $echo "$modename: you must specify a destination" 1>&2
-+ fi
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++ if [ -n "$try" ] ; then
++ echo " failed. Use force-exit"
++ exit 1
++ else
++ echo " done"
++ fi
++ ;;
+
-+ # Strip any trailing slash from the destination.
-+ dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-+
-+ # Check to see that the destination is a directory.
-+ test -d "$dest" && isdir=yes
-+ if test "$isdir" = yes; then
-+ destdir="$dest"
-+ destname=
-+ else
-+ destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-+ test "X$destdir" = "X$dest" && destdir=.
-+ destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-+
-+ # Not a directory, so check to see that there is only one file specified.
-+ set dummy $files
-+ if test "$#" -gt 2; then
-+ $echo "$modename: \`$dest' is not a directory" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ fi
-+ case $destdir in
-+ [\\/]* | [A-Za-z]:[\\/]*) ;;
-+ *)
-+ for file in $files; do
-+ case $file in
-+ *.lo) ;;
-+ *)
-+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+ done
-+ ;;
-+ esac
++ force-quit)
++ echo -n "Terminating @php_fpm_bin@ "
++
++ if [ ! -r $php_fpm_PID ] ; then
++ echo "warning, no pid file found - php-fpm is not running ?"
++ exit 1
++ fi
+
-+ # This variable tells wrapper scripts just to set variables rather
-+ # than running their programs.
-+ libtool_install_magic="$magic"
++ kill -TERM `cat $php_fpm_PID`
+
-+ staticlibs=
-+ future_libdirs=
-+ current_libdirs=
-+ for file in $files; do
++ wait_for_pid removed $php_fpm_PID
+
-+ # Do each installation.
-+ case $file in
-+ *.$libext)
-+ # Do the static libraries later.
-+ staticlibs="$staticlibs $file"
++ if [ -n "$try" ] ; then
++ echo " failed"
++ exit 1
++ else
++ echo " done"
++ fi
+ ;;
+
-+ *.la)
-+ # Check to see that this really is a libtool archive.
-+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+ else
-+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++ restart)
++ $0 stop
++ $0 start
++ ;;
+
-+ library_names=
-+ old_library=
-+ relink_command=
-+ # If there is no directory component, then add one.
-+ case $file in
-+ */* | *\\*) . $file ;;
-+ *) . ./$file ;;
-+ esac
-+
-+ # Add the libdir to current_libdirs if it is the destination.
-+ if test "X$destdir" = "X$libdir"; then
-+ case "$current_libdirs " in
-+ *" $libdir "*) ;;
-+ *) current_libdirs="$current_libdirs $libdir" ;;
-+ esac
-+ else
-+ # Note the libdir as a future libdir.
-+ case "$future_libdirs " in
-+ *" $libdir "*) ;;
-+ *) future_libdirs="$future_libdirs $libdir" ;;
-+ esac
-+ fi
++ reload)
+
-+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-+ test "X$dir" = "X$file/" && dir=
-+ dir="$dir$objdir"
-+
-+ if test -n "$relink_command"; then
-+ # Determine the prefix the user has applied to our future dir.
-+ inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-+
-+ # Don't allow the user to place us outside of our expected
-+ # location b/c this prevents finding dependent libraries that
-+ # are installed to the same prefix.
-+ # At present, this check doesn't affect windows .dll's that
-+ # are installed into $libdir/../bin (currently, that works fine)
-+ # but it's something to keep an eye on.
-+ if test "$inst_prefix_dir" = "$destdir"; then
-+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+
-+ if test -n "$inst_prefix_dir"; then
-+ # Stick the inst_prefix_dir data into the link command.
-+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+ else
-+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-+ fi
-+
-+ $echo "$modename: warning: relinking \`$file'" 1>&2
-+ $show "$relink_command"
-+ if $run eval "$relink_command"; then :
-+ else
-+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ fi
++ echo -n "Reload service @php_fpm_bin@ "
+
-+ # See the names of the shared library.
-+ set dummy $library_names
-+ if test -n "$2"; then
-+ realname="$2"
-+ shift
-+ shift
-+
-+ srcname="$realname"
-+ test -n "$relink_command" && srcname="$realname"T
-+
-+ # Install the shared library and build the symlinks.
-+ $show "$install_prog $dir/$srcname $destdir/$realname"
-+ $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-+ if test -n "$stripme" && test -n "$striplib"; then
-+ $show "$striplib $destdir/$realname"
-+ $run eval "$striplib $destdir/$realname" || exit $?
-+ fi
-+
-+ if test "$#" -gt 0; then
-+ # Delete the old symlinks, and create new ones.
-+ for linkname
-+ do
-+ if test "$linkname" != "$realname"; then
-+ $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+ $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-+ fi
-+ done
-+ fi
-+
-+ # Do each command in the postinstall commands.
-+ lib="$destdir/$realname"
-+ cmds=$postinstall_cmds
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ $show "$cmd"
-+ $run eval "$cmd" || exit $?
-+ done
-+ IFS="$save_ifs"
-+ fi
++ if [ ! -r $php_fpm_PID ] ; then
++ echo "warning, no pid file found - @php_fpm_bin@ is not running ?"
++ exit 1
++ fi
+
-+ # Install the pseudo-library for information purposes.
-+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+ instname="$dir/$name"i
-+ $show "$install_prog $instname $destdir/$name"
-+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ kill -USR2 `cat $php_fpm_PID`
+
-+ # Maybe install the static library, too.
-+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
++ echo " done"
+ ;;
+
-+ *.lo)
-+ # Install (i.e. copy) a libtool object.
-+
-+ # Figure out destination file name, if it wasn't already specified.
-+ if test -n "$destname"; then
-+ destfile="$destdir/$destname"
-+ else
-+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+ destfile="$destdir/$destfile"
-+ fi
-+
-+ # Deduce the name of the destination old-style object file.
-+ case $destfile in
-+ *.lo)
-+ staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-+ ;;
-+ *.$objext)
-+ staticdest="$destfile"
-+ destfile=
-+ ;;
+ *)
-+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+
-+ # Install the libtool object if requested.
-+ if test -n "$destfile"; then
-+ $show "$install_prog $file $destfile"
-+ $run eval "$install_prog $file $destfile" || exit $?
-+ fi
++ echo "Usage: $0 {start|stop|force-quit|restart|reload}"
++ exit 1
++ ;;
+
-+ # Install the old object if enabled.
-+ if test "$build_old_libs" = yes; then
-+ # Deduce the name of the old-style object file.
-+ staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
++esac
+diff -Naur php-src-vanilla/sapi/fpm/conf/nginx-site-conf.sample.in php-src/sapi/fpm/conf/nginx-site-conf.sample.in
+--- php-src-vanilla/sapi/fpm/conf/nginx-site-conf.sample.in 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/conf/nginx-site-conf.sample.in 2009-10-18 21:05:39.298456068 +0100
+@@ -0,0 +1,46 @@
++# @php_fpm_bin@ - PHP FastCGI Process Manager 'PHP-FPM'
++#
++# nginx-site-conf.sample:
++# Php Site configuration for nginx webserver
++#
++# 1. set server root /path/to/your/website;
++# 2. Rename this file. Copy it to /etc/nginx/sites-available, /etc/nginx/sites-enabled
++# or otherwise ensure that this file is included by the nginx.conf
++# 3. Restart nginx webserver, and @php_fpm_bin@ service.
++#
+
-+ $show "$install_prog $staticobj $staticdest"
-+ $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-+ fi
-+ exit $EXIT_SUCCESS
-+ ;;
++server {
+
-+ *)
-+ # Figure out destination file name, if it wasn't already specified.
-+ if test -n "$destname"; then
-+ destfile="$destdir/$destname"
-+ else
-+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+ destfile="$destdir/$destfile"
-+ fi
++ root /var/www/nginx-site;
+
-+ # If the file is missing, and there is a .exe on the end, strip it
-+ # because it is most likely a libtool script we actually want to
-+ # install
-+ stripped_ext=""
-+ case $file in
-+ *.exe)
-+ if test ! -f "$file"; then
-+ file=`$echo $file|${SED} 's,.exe$,,'`
-+ stripped_ext=".exe"
-+ fi
-+ ;;
-+ esac
-+
-+ # Do a test to see if this is really a libtool program.
-+ case $host in
-+ *cygwin*|*mingw*)
-+ wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-+ ;;
-+ *)
-+ wrapper=$file
-+ ;;
-+ esac
-+ if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-+ notinst_deplibs=
-+ relink_command=
-+
-+ # To insure that "foo" is sourced, and not "foo.exe",
-+ # finese the cygwin/MSYS system by explicitly sourcing "foo."
-+ # which disallows the automatic-append-.exe behavior.
-+ case $build in
-+ *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-+ *) wrapperdot=${wrapper} ;;
-+ esac
-+ # If there is no directory component, then add one.
-+ case $file in
-+ */* | *\\*) . ${wrapperdot} ;;
-+ *) . ./${wrapperdot} ;;
-+ esac
-+
-+ # Check the variables that should have been set.
-+ if test -z "$notinst_deplibs"; then
-+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+
-+ finalize=yes
-+ for lib in $notinst_deplibs; do
-+ # Check to see that each library is installed.
-+ libdir=
-+ if test -f "$lib"; then
-+ # If there is no directory component, then add one.
-+ case $lib in
-+ */* | *\\*) . $lib ;;
-+ *) . ./$lib ;;
-+ esac
-+ fi
-+ libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+ if test -n "$libdir" && test ! -f "$libfile"; then
-+ $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-+ finalize=no
-+ fi
-+ done
-+
-+ relink_command=
-+ # To insure that "foo" is sourced, and not "foo.exe",
-+ # finese the cygwin/MSYS system by explicitly sourcing "foo."
-+ # which disallows the automatic-append-.exe behavior.
-+ case $build in
-+ *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-+ *) wrapperdot=${wrapper} ;;
-+ esac
-+ # If there is no directory component, then add one.
-+ case $file in
-+ */* | *\\*) . ${wrapperdot} ;;
-+ *) . ./${wrapperdot} ;;
-+ esac
-+
-+ outputname=
-+ if test "$fast_install" = no && test -n "$relink_command"; then
-+ if test "$finalize" = yes && test -z "$run"; then
-+ tmpdir="/tmp"
-+ test -n "$TMPDIR" && tmpdir="$TMPDIR"
-+ tmpdir="$tmpdir/libtool-$$"
-+ save_umask=`umask`
-+ umask 0077
-+ if $mkdir "$tmpdir"; then
-+ umask $save_umask
-+ else
-+ umask $save_umask
-+ $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-+ continue
-+ fi
-+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-+ outputname="$tmpdir/$file"
-+ # Replace the output file specification.
-+ relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+
-+ $show "$relink_command"
-+ if $run eval "$relink_command"; then :
-+ else
-+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-+ ${rm}r "$tmpdir"
-+ continue
-+ fi
-+ file="$outputname"
-+ else
-+ $echo "$modename: warning: cannot relink \`$file'" 1>&2
-+ fi
-+ else
-+ # Install the binary that we compiled earlier.
-+ file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-+ fi
-+ fi
++ server_name localhost;
++ listen 80;
+
-+ # remove .exe since cygwin /usr/bin/install will append another
-+ # one anyways
-+ case $install_prog,$host in
-+ */usr/bin/install*,*cygwin*)
-+ case $file:$destfile in
-+ *.exe:*.exe)
-+ # this is ok
-+ ;;
-+ *.exe:*)
-+ destfile=$destfile.exe
-+ ;;
-+ *:*.exe)
-+ destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-+ ;;
-+ esac
-+ ;;
-+ esac
-+ $show "$install_prog$stripme $file $destfile"
-+ $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-+ test -n "$outputname" && ${rm}r "$tmpdir"
-+ ;;
-+ esac
-+ done
++ access_log /var/log/nginx/localhost.access.log;
+
-+ for file in $staticlibs; do
-+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++ location / {
++ index index.html index.htm;
++ }
+
-+ # Set up the ranlib parameters.
-+ oldlib="$destdir/$name"
++ #error_page 404 /404.html;
+
-+ $show "$install_prog $file $oldlib"
-+ $run eval "$install_prog \$file \$oldlib" || exit $?
++ # redirect server error pages to the static page /50x.html
++ #
++ error_page 500 502 503 504 /50x.html;
++ location = /50x.html {
++ root /var/www/nginx-default;
++ }
+
-+ if test -n "$stripme" && test -n "$old_striplib"; then
-+ $show "$old_striplib $oldlib"
-+ $run eval "$old_striplib $oldlib" || exit $?
-+ fi
++ # pass the *.php scripts to @php_fpm_bin@ listening on tcp port @php_fpm_port@
++ #
++ location ~ \.php$ {
+
-+ # Do each command in the postinstall commands.
-+ cmds=$old_postinstall_cmds
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ $show "$cmd"
-+ $run eval "$cmd" || exit $?
-+ done
-+ IFS="$save_ifs"
-+ done
++ fastcgi_pass 127.0.0.1:@php_fpm_port@;
++ fastcgi_index index.php;
+
-+ if test -n "$future_libdirs"; then
-+ $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-+ fi
++ include fastcgi_params;
++ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
++ fastcgi_param SERVER_NAME $http_host;
++ fastcgi_ignore_client_abort on;
++ }
++}
+diff -Naur php-src-vanilla/sapi/fpm/conf/php-fpm.conf.in php-src/sapi/fpm/conf/php-fpm.conf.in
+--- php-src-vanilla/sapi/fpm/conf/php-fpm.conf.in 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/conf/php-fpm.conf.in 2009-10-18 21:05:39.298456068 +0100
+@@ -0,0 +1,159 @@
++<?xml version="1.0" ?>
++<configuration>
+
-+ if test -n "$current_libdirs"; then
-+ # Maybe just do a dry run.
-+ test -n "$run" && current_libdirs=" -n$current_libdirs"
-+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-+ else
-+ exit $EXIT_SUCCESS
-+ fi
-+ ;;
-+
-+ # libtool finish mode
-+ finish)
-+ modename="$modename: finish"
-+ libdirs="$nonopt"
-+ admincmds=
-+
-+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+ for dir
-+ do
-+ libdirs="$libdirs $dir"
-+ done
-+
-+ for libdir in $libdirs; do
-+ if test -n "$finish_cmds"; then
-+ # Do each command in the finish commands.
-+ cmds=$finish_cmds
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ $show "$cmd"
-+ $run eval "$cmd" || admincmds="$admincmds
-+ $cmd"
-+ done
-+ IFS="$save_ifs"
-+ fi
-+ if test -n "$finish_eval"; then
-+ # Do the single finish_eval.
-+ eval cmds=\"$finish_eval\"
-+ $run eval "$cmds" || admincmds="$admincmds
-+ $cmds"
-+ fi
-+ done
-+ fi
++ All relative paths in this config are relative to php's install prefix
+
-+ # Exit here if they wanted silent mode.
-+ test "$show" = : && exit $EXIT_SUCCESS
++ <section name="global_options">
+
-+ $echo "----------------------------------------------------------------------"
-+ $echo "Libraries have been installed in:"
-+ for libdir in $libdirs; do
-+ $echo " $libdir"
-+ done
-+ $echo
-+ $echo "If you ever happen to want to link against installed libraries"
-+ $echo "in a given directory, LIBDIR, you must either use libtool, and"
-+ $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+ $echo "flag during linking and do at least one of the following:"
-+ if test -n "$shlibpath_var"; then
-+ $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
-+ $echo " during execution"
-+ fi
-+ if test -n "$runpath_var"; then
-+ $echo " - add LIBDIR to the \`$runpath_var' environment variable"
-+ $echo " during linking"
-+ fi
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ libdir=LIBDIR
-+ eval flag=\"$hardcode_libdir_flag_spec\"
++ Pid file
++ <value name="pid_file">@php_fpm_pid_path@</value>
+
-+ $echo " - use the \`$flag' linker flag"
-+ fi
-+ if test -n "$admincmds"; then
-+ $echo " - have your system administrator run these commands:$admincmds"
-+ fi
-+ if test -f /etc/ld.so.conf; then
-+ $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+ fi
-+ $echo
-+ $echo "See any operating system documentation about shared libraries for"
-+ $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-+ $echo "----------------------------------------------------------------------"
-+ exit $EXIT_SUCCESS
-+ ;;
-+
-+ # libtool execute mode
-+ execute)
-+ modename="$modename: execute"
-+
-+ # The first argument is the command name.
-+ cmd="$nonopt"
-+ if test -z "$cmd"; then
-+ $echo "$modename: you must specify a COMMAND" 1>&2
-+ $echo "$help"
-+ exit $EXIT_FAILURE
-+ fi
++ Error log file
++ <value name="error_log">@php_fpm_log_path@</value>
+
-+ # Handle -dlopen flags immediately.
-+ for file in $execute_dlfiles; do
-+ if test ! -f "$file"; then
-+ $echo "$modename: \`$file' is not a file" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++ Log level
++ <value name="log_level">notice</value>
+
-+ dir=
-+ case $file in
-+ *.la)
-+ # Check to see that this really is a libtool archive.
-+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+ else
-+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++ When this amount of php processes exited with SIGSEGV or SIGBUS ...
++ <value name="emergency_restart_threshold">10</value>
+
-+ # Read the libtool library.
-+ dlname=
-+ library_names=
-+
-+ # If there is no directory component, then add one.
-+ case $file in
-+ */* | *\\*) . $file ;;
-+ *) . ./$file ;;
-+ esac
-+
-+ # Skip this library if it cannot be dlopened.
-+ if test -z "$dlname"; then
-+ # Warn if it was a shared library.
-+ test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-+ continue
-+ fi
++ ... in a less than this interval of time, a graceful restart will be initiated.
++ Useful to work around accidental curruptions in accelerator's shared memory.
++ <value name="emergency_restart_interval">1m</value>
+
-+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+ test "X$dir" = "X$file" && dir=.
++ Time limit on waiting child's reaction on signals from master
++ <value name="process_control_timeout">5s</value>
+
-+ if test -f "$dir/$objdir/$dlname"; then
-+ dir="$dir/$objdir"
-+ else
-+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+ ;;
++ Set to 'no' to debug fpm
++ <value name="daemonize">yes</value>
+
-+ *.lo)
-+ # Just add the directory containing the .lo file.
-+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+ test "X$dir" = "X$file" && dir=.
-+ ;;
++ </section>
+
-+ *)
-+ $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-+ continue
-+ ;;
-+ esac
++ <workers>
+
-+ # Get the absolute pathname.
-+ absdir=`cd "$dir" && pwd`
-+ test -n "$absdir" && dir="$absdir"
++ <section name="pool">
+
-+ # Now add the directory to shlibpath_var.
-+ if eval "test -z \"\$$shlibpath_var\""; then
-+ eval "$shlibpath_var=\"\$dir\""
-+ else
-+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-+ fi
-+ done
++ Name of pool. Used in logs and stats.
++ <value name="name">default</value>
+
-+ # This variable tells wrapper scripts just to set shlibpath_var
-+ # rather than running their programs.
-+ libtool_execute_magic="$magic"
++ Address to accept fastcgi requests on.
++ Valid syntax is 'ip.ad.re.ss:port' or just 'port' or '/path/to/unix/socket'
++ <value name="listen_address">127.0.0.1:@php_fpm_port@</value>
+
-+ # Check if any of the arguments is a wrapper script.
-+ args=
-+ for file
-+ do
-+ case $file in
-+ -*) ;;
-+ *)
-+ # Do a test to see if this is really a libtool program.
-+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+ # If there is no directory component, then add one.
-+ case $file in
-+ */* | *\\*) . $file ;;
-+ *) . ./$file ;;
-+ esac
-+
-+ # Transform arg to wrapped name.
-+ file="$progdir/$program"
-+ fi
-+ ;;
-+ esac
-+ # Quote arguments (to preserve shell metacharacters).
-+ file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-+ args="$args \"$file\""
-+ done
++ <value name="listen_options">
+
-+ if test -z "$run"; then
-+ if test -n "$shlibpath_var"; then
-+ # Export the shlibpath_var.
-+ eval "export $shlibpath_var"
-+ fi
++ Set listen(2) backlog
++ <value name="backlog">-1</value>
+
-+ # Restore saved environment variables
-+ if test "${save_LC_ALL+set}" = set; then
-+ LC_ALL="$save_LC_ALL"; export LC_ALL
-+ fi
-+ if test "${save_LANG+set}" = set; then
-+ LANG="$save_LANG"; export LANG
-+ fi
++ Set permissions for unix socket, if one used.
++ In Linux read/write permissions must be set in order to allow connections from web server.
++ Many BSD-derrived systems allow connections regardless of permissions.
++ <value name="owner">@php_fpm_user@</value>
++ <value name="group">@php_fpm_group@</value>
++ <value name="mode">0666</value>
++ </value>
+
-+ # Now prepare to actually exec the command.
-+ exec_cmd="\"\$cmd\"$args"
-+ else
-+ # Display what would be done.
-+ if test -n "$shlibpath_var"; then
-+ eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-+ $echo "export $shlibpath_var"
-+ fi
-+ eval \$echo \"\$cmd\"$args
-+ exit $EXIT_SUCCESS
-+ fi
-+ ;;
-+
-+ # libtool clean and uninstall mode
-+ clean | uninstall)
-+ modename="$modename: $mode"
-+ rm="$nonopt"
-+ files=
-+ rmforce=
-+ exit_status=0
-+
-+ # This variable tells wrapper scripts just to set variables rather
-+ # than running their programs.
-+ libtool_install_magic="$magic"
-+
-+ for arg
-+ do
-+ case $arg in
-+ -f) rm="$rm $arg"; rmforce=yes ;;
-+ -*) rm="$rm $arg" ;;
-+ *) files="$files $arg" ;;
-+ esac
-+ done
++ Additional php.ini defines, specific to this pool of workers.
++ These settings overwrite the values previously defined in the php.ini.
++ <value name="php_defines">
++ <!-- <value name="sendmail_path">/usr/sbin/sendmail -t -i</value> -->
++ <!-- <value name="display_errors">0</value> -->
++ <!-- <value name="error_log">/var/log/php-error.log</value> -->
++ <!-- <value name="log_errors">true</value> -->
++ </value>
+
-+ if test -z "$rm"; then
-+ $echo "$modename: you must specify an RM program" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
++ Unix user of processes
++ <value name="user">@php_fpm_user@</value>
+
-+ rmdirs=
++ Unix group of processes
++ <value name="group">@php_fpm_group@</value>
+
-+ origobjdir="$objdir"
-+ for file in $files; do
-+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-+ if test "X$dir" = "X$file"; then
-+ dir=.
-+ objdir="$origobjdir"
-+ else
-+ objdir="$dir/$origobjdir"
-+ fi
-+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+ test "$mode" = uninstall && objdir="$dir"
-+
-+ # Remember objdir for removal later, being careful to avoid duplicates
-+ if test "$mode" = clean; then
-+ case " $rmdirs " in
-+ *" $objdir "*) ;;
-+ *) rmdirs="$rmdirs $objdir" ;;
-+ esac
-+ fi
++ Process manager settings
++ <value name="pm">
+
-+ # Don't error if the file doesn't exist and rm -f was used.
-+ if (test -L "$file") >/dev/null 2>&1 \
-+ || (test -h "$file") >/dev/null 2>&1 \
-+ || test -f "$file"; then
-+ :
-+ elif test -d "$file"; then
-+ exit_status=1
-+ continue
-+ elif test "$rmforce" = yes; then
-+ continue
-+ fi
++ Sets style of controling worker process count.
++ Valid values are 'static' and 'apache-like'
++ <value name="style">static</value>
+
-+ rmfiles="$file"
-+
-+ case $name in
-+ *.la)
-+ # Possibly a libtool archive, so verify it.
-+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+ . $dir/$name
-+
-+ # Delete the libtool libraries and symlinks.
-+ for n in $library_names; do
-+ rmfiles="$rmfiles $objdir/$n"
-+ done
-+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-+ test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+
-+ if test "$mode" = uninstall; then
-+ if test -n "$library_names"; then
-+ # Do each command in the postuninstall commands.
-+ cmds=$postuninstall_cmds
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ $show "$cmd"
-+ $run eval "$cmd"
-+ if test "$?" -ne 0 && test "$rmforce" != yes; then
-+ exit_status=1
-+ fi
-+ done
-+ IFS="$save_ifs"
-+ fi
-+
-+ if test -n "$old_library"; then
-+ # Do each command in the old_postuninstall commands.
-+ cmds=$old_postuninstall_cmds
-+ save_ifs="$IFS"; IFS='~'
-+ for cmd in $cmds; do
-+ IFS="$save_ifs"
-+ eval cmd=\"$cmd\"
-+ $show "$cmd"
-+ $run eval "$cmd"
-+ if test "$?" -ne 0 && test "$rmforce" != yes; then
-+ exit_status=1
-+ fi
-+ done
-+ IFS="$save_ifs"
-+ fi
-+ # FIXME: should reinstall the best remaining shared library.
-+ fi
-+ fi
-+ ;;
++ Sets the limit on the number of simultaneous requests that will be served.
++ Equivalent to Apache MaxClients directive.
++ Equivalent to PHP_FCGI_CHILDREN environment in original php.fcgi
++ Used with any pm_style.
++ <value name="max_children">5</value>
+
-+ *.lo)
-+ # Possibly a libtool object, so verify it.
-+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++ Settings group for 'apache-like' pm style
++ <value name="apache_like">
+
-+ # Read the .lo file
-+ . $dir/$name
++ Sets the number of server processes created on startup.
++ Used only when 'apache-like' pm_style is selected
++ <value name="StartServers">20</value>
+
-+ # Add PIC object to the list of files to remove.
-+ if test -n "$pic_object" \
-+ && test "$pic_object" != none; then
-+ rmfiles="$rmfiles $dir/$pic_object"
-+ fi
++ Sets the desired minimum number of idle server processes.
++ Used only when 'apache-like' pm_style is selected
++ <value name="MinSpareServers">5</value>
+
-+ # Add non-PIC object to the list of files to remove.
-+ if test -n "$non_pic_object" \
-+ && test "$non_pic_object" != none; then
-+ rmfiles="$rmfiles $dir/$non_pic_object"
-+ fi
-+ fi
-+ ;;
++ Sets the desired maximum number of idle server processes.
++ Used only when 'apache-like' pm_style is selected
++ <value name="MaxSpareServers">35</value>
+
-+ *)
-+ if test "$mode" = clean ; then
-+ noexename=$name
-+ case $file in
-+ *.exe)
-+ file=`$echo $file|${SED} 's,.exe$,,'`
-+ noexename=`$echo $name|${SED} 's,.exe$,,'`
-+ # $file with .exe has already been added to rmfiles,
-+ # add $file without .exe
-+ rmfiles="$rmfiles $file"
-+ ;;
-+ esac
-+ # Do a test to see if this is a libtool program.
-+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+ relink_command=
-+ . $dir/$noexename
-+
-+ # note $name still contains .exe if it was in $file originally
-+ # as does the version of $file that was added into $rmfiles
-+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-+ if test "$fast_install" = yes && test -n "$relink_command"; then
-+ rmfiles="$rmfiles $objdir/lt-$name"
-+ fi
-+ if test "X$noexename" != "X$name" ; then
-+ rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-+ fi
-+ fi
-+ fi
-+ ;;
-+ esac
-+ $show "$rm $rmfiles"
-+ $run $rm $rmfiles || exit_status=1
-+ done
-+ objdir="$origobjdir"
++ </value>
+
-+ # Try to remove the ${objdir}s in the directories where we deleted files
-+ for dir in $rmdirs; do
-+ if test -d "$dir"; then
-+ $show "rmdir $dir"
-+ $run rmdir $dir >/dev/null 2>&1
-+ fi
-+ done
++ </value>
+
-+ exit $exit_status
-+ ;;
-+
-+ "")
-+ $echo "$modename: you must specify a MODE" 1>&2
-+ $echo "$generic_help" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+ esac
-+
-+ if test -z "$exec_cmd"; then
-+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
-+ $echo "$generic_help" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
-+fi # test -z "$show_help"
-+
-+if test -n "$exec_cmd"; then
-+ eval exec $exec_cmd
-+ exit $EXIT_FAILURE
-+fi
++ The timeout (in seconds) for serving a single request after which the worker process will be terminated
++ Should be used when 'max_execution_time' ini option does not stop script execution for some reason
++ '0s' means 'off'
++ <value name="request_terminate_timeout">0s</value>
+
-+# We need to display help for each of the modes.
-+case $mode in
-+"") $echo \
-+"Usage: $modename [OPTION]... [MODE-ARG]...
++ The timeout (in seconds) for serving of single request after which a php backtrace will be dumped to slow.log file
++ '0s' means 'off'
++ <value name="request_slowlog_timeout">0s</value>
+
-+Provide generalized library-building support services.
++ The log file for slow requests
++ <value name="slowlog">@php_fpm_log_path@.slow</value>
+
-+ --config show all configuration variables
-+ --debug enable verbose shell tracing
-+-n, --dry-run display commands without modifying any files
-+ --features display basic configuration information and exit
-+ --finish same as \`--mode=finish'
-+ --help display this help message and exit
-+ --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS]
-+ --quiet same as \`--silent'
-+ --silent don't print informational messages
-+ --tag=TAG use configuration variables from tag TAG
-+ --version print version information
++ Set open file desc rlimit
++ <value name="rlimit_files">1024</value>
+
-+MODE must be one of the following:
++ Set max core size rlimit
++ <value name="rlimit_core">0</value>
+
-+ clean remove files from the build directory
-+ compile compile a source file into a libtool object
-+ execute automatically set library path, then run a program
-+ finish complete the installation of libtool libraries
-+ install install libraries or executables
-+ link create a library or an executable
-+ uninstall remove libraries from an installed directory
++ Chroot to this directory at the start, absolute path
++ <value name="chroot"></value>
+
-+MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for
-+a more detailed description of MODE.
++ Chdir to this directory at the start, absolute path
++ <value name="chdir"></value>
+
-+Report bugs to <bug-libtool@gnu.org>."
-+ exit $EXIT_SUCCESS
-+ ;;
++ Redirect workers' stdout and stderr into main error log.
++ If not set, they will be redirected to /dev/null, according to FastCGI specs
++ <value name="catch_workers_output">yes</value>
+
-+clean)
-+ $echo \
-+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
++ How much requests each process should execute before respawn.
++ Useful to work around memory leaks in 3rd party libraries.
++ For endless request processing please specify 0
++ Equivalent to PHP_FCGI_MAX_REQUESTS
++ <value name="max_requests">500</value>
+
-+Remove files from the build directory.
++ Comma separated list of ipv4 addresses of FastCGI clients that allowed to connect.
++ Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcgi (5.2.2+)
++ Makes sense only with AF_INET listening socket.
++ <value name="allowed_clients">127.0.0.1</value>
+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
++ Pass environment variables like LD_LIBRARY_PATH
++ All $VARIABLEs are taken from current environment
++ <value name="environment">
++ <value name="HOSTNAME">$HOSTNAME</value>
++ <value name="PATH">/usr/local/bin:/usr/bin:/bin</value>
++ <value name="TMP">/tmp</value>
++ <value name="TMPDIR">/tmp</value>
++ <value name="TEMP">/tmp</value>
++ <value name="OSTYPE">$OSTYPE</value>
++ <value name="MACHTYPE">$MACHTYPE</value>
++ <value name="MALLOC_CHECK_">2</value>
++ </value>
+
-+If FILE is a libtool library, object or program, all the files associated
-+with it are deleted. Otherwise, only FILE itself is deleted using RM."
-+ ;;
++ </section>
+
-+compile)
-+ $echo \
-+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
++ </workers>
+
-+Compile a source file into a libtool library object.
++</configuration>
+diff -Naur php-src-vanilla/sapi/fpm/config.m4 php-src/sapi/fpm/config.m4
+--- php-src-vanilla/sapi/fpm/config.m4 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/config.m4 2009-10-18 21:05:39.302497288 +0100
+@@ -0,0 +1,26 @@
++dnl
++dnl $Id$
++dnl
+
-+This mode accepts the following additional options:
++PHP_ARG_WITH(fpm,,
++[ --with-fpm Build PHP FastCGI - FPM executable], no)
+
-+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE
-+ -prefer-pic try to building PIC objects only
-+ -prefer-non-pic try to building non-PIC objects only
-+ -static always build a \`.o' file suitable for static linking
-+
-+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-+from the given SOURCEFILE.
++if test "$PHP_FPM" != "no"; then
+
-+The output file name is determined by removing the directory component from
-+SOURCEFILE, then substituting the C source code suffix \`.c' with the
-+library object suffix, \`.lo'."
-+ ;;
++ PHP_CONFIGURE_PART(Configuring fpm)
++
++ sinclude(sapi/fpm/ac/fpm_libevent.m4)
++ AC_LIB_EVENT([1.4.3],[1.4.11])
+
-+execute)
-+ $echo \
-+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
++ sinclude(sapi/fpm/ac/fpm_checks.m4)
++ AC_FPM_CHECKS
+
-+Automatically set library path, then run a program.
++ sinclude(sapi/fpm/ac/fpm_conf.m4)
++ fpm_version="0.6"
++ AC_FPM_CONF
+
-+This mode accepts the following additional options:
++ sinclude(sapi/fpm/ac/fpm_build.m4)
++ AC_FPM_BUILD_SAPI
+
-+ -dlopen FILE add the directory containing FILE to the library path
++ AC_MSG_RESULT()
++fi
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_arrays.h php-src/sapi/fpm/fpm/fpm_arrays.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_arrays.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_arrays.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,110 @@
+
-+This mode sets the library path environment variable according to \`-dlopen'
-+flags.
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+If any of the ARGS are libtool executable wrappers, then they are translated
-+into their corresponding uninstalled binary, and any of their required library
-+directories are added to the library path.
++#ifndef FPM_ARRAYS_H
++#define FPM_ARRAYS_H 1
+
-+Then, COMMAND is executed, with ARGS as arguments."
-+ ;;
++#include <stdlib.h>
++#include <string.h>
+
-+finish)
-+ $echo \
-+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
++struct fpm_array_s {
++ void *data;
++ size_t sz;
++ size_t used;
++ size_t allocated;
++};
+
-+Complete the installation of libtool libraries.
++static inline struct fpm_array_s *fpm_array_init(struct fpm_array_s *a, unsigned int sz, unsigned int initial_num)
++{
++ void *allocated = 0;
+
-+Each LIBDIR is a directory that contains libtool libraries.
++ if (!a) {
++ a = malloc(sizeof(struct fpm_array_s));
+
-+The commands that this mode executes may require superuser privileges. Use
-+the \`--dry-run' option if you just want to see what would be executed."
-+ ;;
-+
-+install)
-+ $echo \
-+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-+
-+Install executables or libraries.
-+
-+INSTALL-COMMAND is the installation command. The first component should be
-+either the \`install' or \`cp' program.
++ if (!a) {
++ return 0;
++ }
+
-+The rest of the components are interpreted as arguments to that command (only
-+BSD-compatible install options are recognized)."
-+ ;;
++ allocated = a;
++ }
+
-+link)
-+ $echo \
-+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
++ a->sz = sz;
+
-+Link object files or libraries together to form another library, or to
-+create an executable program.
++ a->data = calloc(sz, initial_num);
+
-+LINK-COMMAND is a command using the C compiler that you would use to create
-+a program from several object files.
++ if (!a->data) {
++ free(allocated);
++ return 0;
++ }
+
-+The following components of LINK-COMMAND are treated specially:
++ a->allocated = initial_num;
++ a->used = 0;
+
-+ -all-static do not do any dynamic linking at all
-+ -avoid-version do not add a version suffix if possible
-+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-+ -export-symbols SYMFILE
-+ try to export only the symbols listed in SYMFILE
-+ -export-symbols-regex REGEX
-+ try to export only the symbols matching REGEX
-+ -LLIBDIR search LIBDIR for required installed libraries
-+ -lNAME OUTPUT-FILE requires the installed library libNAME
-+ -module build a library that can dlopened
-+ -no-fast-install disable the fast-install mode
-+ -no-install link a not-installable executable
-+ -no-undefined declare that a library does not refer to external symbols
-+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
-+ -objectlist FILE Use a list of object files found in FILE to specify objects
-+ -precious-files-regex REGEX
-+ don't remove output files matching REGEX
-+ -release RELEASE specify package release information
-+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
-+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-+ -static do not do any dynamic linking of libtool libraries
-+ -version-info CURRENT[:REVISION[:AGE]]
-+ specify library version info [each variable defaults to 0]
++ return a;
++}
+
-+All other options (arguments beginning with \`-') are ignored.
++static inline void *fpm_array_item(struct fpm_array_s *a, unsigned int n)
++{
++ char *ret;
+
-+Every other argument is treated as a filename. Files ending in \`.la' are
-+treated as uninstalled libtool libraries, other files are standard or library
-+object files.
++ ret = (char *) a->data + a->sz * n;
+
-+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-+only library objects (\`.lo' files) may be specified, and \`-rpath' is
-+required, except when creating a convenience library.
++ return ret;
++}
+
-+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-+using \`ar' and \`ranlib', or on Windows using \`lib'.
-+
-+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-+is created, otherwise an executable program is created."
-+ ;;
++static inline void *fpm_array_item_last(struct fpm_array_s *a)
++{
++ return fpm_array_item(a, a->used - 1);
++}
+
-+uninstall)
-+ $echo \
-+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
++static inline int fpm_array_item_remove(struct fpm_array_s *a, unsigned int n)
++{
++ int ret = -1;
+
-+Remove libraries from an installation directory.
++ if (n < a->used - 1) {
++ void *last = fpm_array_item(a, a->used - 1);
++ void *to_remove = fpm_array_item(a, n);
+
-+RM is the name of the program to use to delete files associated with each FILE
-+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
-+to RM.
-+
-+If FILE is a libtool library, all the files associated with it are deleted.
-+Otherwise, only FILE itself is deleted using RM."
-+ ;;
-+
-+*)
-+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
-+ $echo "$help" 1>&2
-+ exit $EXIT_FAILURE
-+ ;;
-+esac
++ memcpy(to_remove, last, a->sz);
+
-+$echo
-+$echo "Try \`$modename --help' for more information about other modes."
-+
-+exit $?
-+
-+# The TAGs below are defined such that we never get into a situation
-+# in which we disable both kinds of libraries. Given conflicting
-+# choices, we go for a static library, that is the most portable,
-+# since we can't tell whether shared libraries were disabled because
-+# the user asked for that or because the platform doesn't support
-+# them. This is particularly important on AIX, because we don't
-+# support having both static and shared libraries enabled at the same
-+# time on that platform, so we default to a shared-only configuration.
-+# If a disable-shared tag is given, we'll fallback to a static-only
-+# configuration. But we'll never go from static-only to shared-only.
-+
-+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-+build_libtool_libs=no
-+build_old_libs=yes
-+# ### END LIBTOOL TAG CONFIG: disable-shared
-+
-+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-+build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-+# ### END LIBTOOL TAG CONFIG: disable-static
-+
-+# Local Variables:
-+# mode:shell-script
-+# sh-indentation:2
-+# End:
-diff -Nru php-5.2.4.vanilla/libevent/Makefile.am php-5.2.4.fpm/libevent/Makefile.am
---- php-5.2.4.vanilla/libevent/Makefile.am 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/Makefile.am 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,27 @@
++ ret = n;
++ }
+
-+bin_SCRIPTS = event_rpcgen.py
-+
-+EXTRA_DIST = acconfig.h event.h event-internal.h log.h evsignal.h evdns.3 \
-+ evrpc.h evrpc-internal.h \
-+ event.3 \
-+ kqueue.c epoll_sub.c epoll.c select.c rtsig.c poll.c signal.c \
-+ evport.c devpoll.c event_rpcgen.py \
-+ compat/sys/queue.h compat/sys/tree.h compat/sys/_time.h
-+
-+lib_LTLIBRARIES = libevent.la
-+
-+libevent_la_SOURCES = event.c buffer.c evbuffer.c log.c event_tagging.c \
-+ http.c evhttp.h http-internal.h evdns.c evdns.h evrpc.c strlcpy.c \
-+ strlcpy-internal.h evrpc.h evrpc-internal.h strlcpy-internal.h \
-+ $(SYS_SRC)
-+
-+libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
-+libevent_la_LDFLAGS = -release @VERSION@ -version-info 1:3:0
-+
-+include_HEADERS = event.h evhttp.h evdns.h evrpc.h
-+
-+INCLUDES = -I$(top_srcdir)/compat $(SYS_INCLUDES)
-+
-+man_MANS = event.3 evdns.3
-+
-+DISTCLEANFILES = *~
-diff -Nru php-5.2.4.vanilla/libevent/Makefile.in php-5.2.4.fpm/libevent/Makefile.in
---- php-5.2.4.vanilla/libevent/Makefile.in 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/Makefile.in 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,733 @@
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+
-+
-+SOURCES = $(libevent_la_SOURCES)
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = .
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
-+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+ $(srcdir)/config.h.in $(top_srcdir)/configure acconfig.h \
-+ config.guess config.sub depcomp devpoll.c epoll.c epoll_sub.c \
-+ evport.c install-sh kqueue.c ltmain.sh missing mkinstalldirs \
-+ poll.c rtsig.c select.c signal.c
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-+ "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"
-+libLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(lib_LTLIBRARIES)
-+libevent_la_DEPENDENCIES = @LTLIBOBJS@
-+am_libevent_la_OBJECTS = event.lo buffer.lo evbuffer.lo log.lo \
-+ event_tagging.lo http.lo evdns.lo evrpc.lo strlcpy.lo
-+libevent_la_OBJECTS = $(am_libevent_la_OBJECTS)
-+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-+SCRIPTS = $(bin_SCRIPTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libevent_la_SOURCES)
-+DIST_SOURCES = $(libevent_la_SOURCES)
-+man3dir = $(mandir)/man3
-+NROFF = nroff
-+MANS = $(man_MANS)
-+includeHEADERS_INSTALL = $(INSTALL_HEADER)
-+HEADERS = $(include_HEADERS)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+ { test ! -d $(distdir) \
-+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+ && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+BUILD_WIN32_FALSE = @BUILD_WIN32_FALSE@
-+BUILD_WIN32_TRUE = @BUILD_WIN32_TRUE@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+RANLIB = @RANLIB@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+bin_SCRIPTS = event_rpcgen.py
-+EXTRA_DIST = acconfig.h event.h event-internal.h log.h evsignal.h evdns.3 \
-+ evrpc.h evrpc-internal.h \
-+ event.3 \
-+ kqueue.c epoll_sub.c epoll.c select.c rtsig.c poll.c signal.c \
-+ evport.c devpoll.c event_rpcgen.py \
-+ compat/sys/queue.h compat/sys/tree.h compat/sys/_time.h
-+
-+lib_LTLIBRARIES = libevent.la
-+libevent_la_SOURCES = event.c buffer.c evbuffer.c log.c event_tagging.c \
-+ http.c evhttp.h http-internal.h evdns.c evdns.h evrpc.c strlcpy.c \
-+ strlcpy-internal.h evrpc.h evrpc-internal.h strlcpy-internal.h \
-+ $(SYS_SRC)
-+
-+libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS)
-+libevent_la_LDFLAGS = -release @VERSION@ -version-info 1:3:0
-+include_HEADERS = event.h evhttp.h evdns.h evrpc.h
-+INCLUDES = -I$(top_srcdir)/compat $(SYS_INCLUDES)
-+man_MANS = event.3 evdns.3
-+DISTCLEANFILES = *~
-+all: config.h
-+ $(MAKE) $(AM_MAKEFLAGS) all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .lo .o .obj
-+am--refresh:
-+ @:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
-+ @for dep in $?; do \
-+ case '$(am__configure_deps)' in \
-+ *$$dep*) \
-+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-+ cd $(srcdir) && $(AUTOMAKE) --foreign \
-+ && exit 0; \
-+ exit 1;; \
-+ esac; \
-+ done; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --foreign Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+ @case '$?' in \
-+ *config.status*) \
-+ echo ' $(SHELL) ./config.status'; \
-+ $(SHELL) ./config.status;; \
-+ *) \
-+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+ esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+ $(SHELL) ./config.status --recheck
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+ cd $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+
-+config.h: stamp-h1
-+ @if test ! -f $@; then \
-+ rm -f stamp-h1; \
-+ $(MAKE) stamp-h1; \
-+ else :; fi
-+
-+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-+ @rm -f stamp-h1
-+ cd $(top_builddir) && $(SHELL) ./config.status config.h
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h
-+ cd $(top_srcdir) && $(AUTOHEADER)
-+ rm -f stamp-h1
-+ touch $@
-+
-+distclean-hdr:
-+ -rm -f config.h stamp-h1
-+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ if test -f $$p; then \
-+ f=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+ else :; fi; \
-+ done
++ --a->used;
+
-+uninstall-libLTLIBRARIES:
-+ @$(NORMAL_UNINSTALL)
-+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ p=$(am__strip_dir) \
-+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ done
++ return ret;
++}
+
-+clean-libLTLIBRARIES:
-+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+ test "$$dir" != "$$p" || dir=.; \
-+ echo "rm -f \"$${dir}/so_locations\""; \
-+ rm -f "$${dir}/so_locations"; \
-+ done
-+libevent.la: $(libevent_la_OBJECTS) $(libevent_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libevent_la_LDFLAGS) $(libevent_la_OBJECTS) $(libevent_la_LIBADD) $(LIBS)
-+install-binSCRIPTS: $(bin_SCRIPTS)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
-+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+ if test -f $$d$$p; then \
-+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-+ else :; fi; \
-+ done
++static inline void *fpm_array_push(struct fpm_array_s *a)
++{
++ void *ret;
+
-+uninstall-binSCRIPTS:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
-+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+ done
++ if (a->used == a->allocated) {
++ size_t new_allocated = a->allocated ? a->allocated * 2 : 20;
++ void *new_ptr = realloc(a->data, a->sz * new_allocated);
+
-+mostlyclean-compile:
-+ -rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+ -rm -f *.tab.c
-+
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/devpoll.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/epoll.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/epoll_sub.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/evport.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kqueue.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/poll.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rtsig.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/select.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/signal.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evbuffer.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evdns.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_tagging.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evrpc.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@
-+
-+.c.o:
-+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
-+
-+.c.obj:
-+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+.c.lo:
-+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-+
-+mostlyclean-libtool:
-+ -rm -f *.lo
-+
-+clean-libtool:
-+ -rm -rf .libs _libs
-+
-+distclean-libtool:
-+ -rm -f libtool
-+uninstall-info-am:
-+install-man3: $(man3_MANS) $(man_MANS)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)"
-+ @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
-+ case "$$i" in \
-+ *.3*) list="$$list $$i" ;; \
-+ esac; \
-+ done; \
-+ for i in $$list; do \
-+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-+ else file=$$i; fi; \
-+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+ case "$$ext" in \
-+ 3*) ;; \
-+ *) ext='3' ;; \
-+ esac; \
-+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
-+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
-+ done
-+uninstall-man3:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
-+ case "$$i" in \
-+ *.3*) list="$$list $$i" ;; \
-+ esac; \
-+ done; \
-+ for i in $$list; do \
-+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+ case "$$ext" in \
-+ 3*) ;; \
-+ *) ext='3' ;; \
-+ esac; \
-+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
-+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+ echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
-+ rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
-+ done
-+install-includeHEADERS: $(include_HEADERS)
-+ @$(NORMAL_INSTALL)
-+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
-+ @list='$(include_HEADERS)'; for p in $$list; do \
-+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+ f=$(am__strip_dir) \
-+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-+ done
++ if (!new_ptr) {
++ return 0;
++ }
+
-+uninstall-includeHEADERS:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(include_HEADERS)'; for p in $$list; do \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
-+ done
++ a->data = new_ptr;
++ a->allocated = new_allocated;
++ }
+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | \
-+ $(AWK) ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-+ $(TAGS_FILES) $(LISP)
-+ tags=; \
-+ here=`pwd`; \
-+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | \
-+ $(AWK) ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ test -n "$$unique" || unique=$$empty_fix; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
-+ fi
-+ctags: CTAGS
-+CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-+ $(TAGS_FILES) $(LISP)
-+ tags=; \
-+ here=`pwd`; \
-+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-+ unique=`for i in $$list; do \
-+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+ done | \
-+ $(AWK) ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
-+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+ $$tags $$unique
-+
-+GTAGS:
-+ here=`$(am__cd) $(top_builddir) && pwd` \
-+ && cd $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+ $(am__remove_distdir)
-+ mkdir $(distdir)
-+ $(mkdir_p) $(distdir)/compat/sys
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+ list='$(DISTFILES)'; for file in $$list; do \
-+ case $$file in \
-+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+ esac; \
-+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+ dir="/$$dir"; \
-+ $(mkdir_p) "$(distdir)$$dir"; \
-+ else \
-+ dir=''; \
-+ fi; \
-+ if test -d $$d/$$file; then \
-+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ fi; \
-+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ else \
-+ test -f $(distdir)/$$file \
-+ || cp -p $$d/$$file $(distdir)/$$file \
-+ || exit 1; \
-+ fi; \
-+ done
-+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+ || chmod -R a+r $(distdir)
-+dist-gzip: distdir
-+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ $(am__remove_distdir)
-+
-+dist-bzip2: distdir
-+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+ $(am__remove_distdir)
-+
-+dist-tarZ: distdir
-+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+ $(am__remove_distdir)
-+
-+dist-shar: distdir
-+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+ $(am__remove_distdir)
-+
-+dist-zip: distdir
-+ -rm -f $(distdir).zip
-+ zip -rq $(distdir).zip $(distdir)
-+ $(am__remove_distdir)
-+
-+dist dist-all: distdir
-+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+ $(am__remove_distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration. Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+ case '$(DIST_ARCHIVES)' in \
-+ *.tar.gz*) \
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ *.tar.bz2*) \
-+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ *.tar.Z*) \
-+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+ *.shar.gz*) \
-+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ *.zip*) \
-+ unzip $(distdir).zip ;;\
-+ esac
-+ chmod -R a-w $(distdir); chmod a+w $(distdir)
-+ mkdir $(distdir)/_build
-+ mkdir $(distdir)/_inst
-+ chmod a-w $(distdir)
-+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+ && cd $(distdir)/_build \
-+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+ $(DISTCHECK_CONFIGURE_FLAGS) \
-+ && $(MAKE) $(AM_MAKEFLAGS) \
-+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) check \
-+ && $(MAKE) $(AM_MAKEFLAGS) install \
-+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+ distuninstallcheck \
-+ && chmod -R a-w "$$dc_install_base" \
-+ && ({ \
-+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+ && rm -rf "$$dc_destdir" \
-+ && $(MAKE) $(AM_MAKEFLAGS) dist \
-+ && rm -rf $(DIST_ARCHIVES) \
-+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+ $(am__remove_distdir)
-+ @(echo "$(distdir) archives ready for distribution: "; \
-+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+distuninstallcheck:
-+ @cd $(distuninstallcheck_dir) \
-+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+ || { echo "ERROR: files left after uninstall:" ; \
-+ if test -n "$(DESTDIR)"; then \
-+ echo " (check DESTDIR support)"; \
-+ fi ; \
-+ $(distuninstallcheck_listfiles) ; \
-+ exit 1; } >&2
-+distcleancheck: distclean
-+ @if test '$(srcdir)' = . ; then \
-+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+ exit 1 ; \
-+ fi
-+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+ || { echo "ERROR: files left in build directory after distclean:" ; \
-+ $(distcleancheck_listfiles) ; \
-+ exit 1; } >&2
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(HEADERS) config.h
-+installdirs:
-+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"; do \
-+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
++ ret = fpm_array_item(a, a->used);
+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++ ++a->used;
+
-+installcheck: installcheck-am
-+install-strip:
-+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+ `test -z '$(STRIP)' || \
-+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
++ return ret;
++}
+
-+clean-generic:
++static inline void fpm_array_free(struct fpm_array_s *a)
++{
++ free(a->data);
++ a->data = 0;
++ a->sz = 0;
++ a->used = a->allocated = 0;
++}
+
-+distclean-generic:
-+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
++#endif
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_atomic.h php-src/sapi/fpm/fpm/fpm_atomic.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_atomic.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_atomic.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,139 @@
+
-+maintainer-clean-generic:
-+ @echo "This command is intended for maintainers to use"
-+ @echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-+ mostlyclean-am
++#ifndef FPM_ATOMIC_H
++#define FPM_ATOMIC_H 1
+
-+distclean: distclean-am
-+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+ -rm -rf $(DEPDIR) ./$(DEPDIR)
-+ -rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+ distclean-hdr distclean-libtool distclean-tags
++#if HAVE_INTTYPES_H
++#include <inttypes.h>
++#else
++#include <stdint.h>
++#endif
++#include <sched.h>
+
-+dvi: dvi-am
++#if ( __i386__ || __i386 )
+
-+dvi-am:
++typedef int32_t atomic_int_t;
++typedef uint32_t atomic_uint_t;
++typedef volatile atomic_uint_t atomic_t;
+
-+html: html-am
+
-+info: info-am
++static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add)
++{
++ __asm__ volatile ( "lock;" "xaddl %0, %1;" :
++ "+r" (add) : "m" (*value) : "memory");
+
-+info-am:
++ return add;
++}
+
-+install-data-am: install-includeHEADERS install-man
++static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
++{
++ unsigned char res;
+
-+install-exec-am: install-binSCRIPTS install-libLTLIBRARIES
++ __asm__ volatile ( "lock;" "cmpxchgl %3, %1;" "sete %0;" :
++ "=a" (res) : "m" (*lock), "a" (old), "r" (set) : "memory");
+
-+install-info: install-info-am
++ return res;
++}
+
-+install-man: install-man3
++#elif ( __amd64__ || __amd64 )
+
-+installcheck-am:
++typedef int64_t atomic_int_t;
++typedef uint64_t atomic_uint_t;
++typedef volatile atomic_uint_t atomic_t;
+
-+maintainer-clean: maintainer-clean-am
-+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+ -rm -rf $(top_srcdir)/autom4te.cache
-+ -rm -rf $(DEPDIR) ./$(DEPDIR)
-+ -rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
++static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add)
++{
++ __asm__ volatile ( "lock;" "xaddq %0, %1;" :
++ "+r" (add) : "m" (*value) : "memory");
+
-+mostlyclean: mostlyclean-am
++ return add;
++}
+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+ mostlyclean-libtool
++static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
++{
++ unsigned char res;
+
-+pdf: pdf-am
++ __asm__ volatile ( "lock;" "cmpxchgq %3, %1;" "sete %0;" :
++ "=a" (res) : "m" (*lock), "a" (old), "r" (set) : "memory");
+
-+pdf-am:
++ return res;
++}
+
-+ps: ps-am
++#if (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
+
-+ps-am:
++#elif ( __arm__ || __arm ) /* W-Mark Kubacki */
+
-+uninstall-am: uninstall-binSCRIPTS uninstall-includeHEADERS \
-+ uninstall-info-am uninstall-libLTLIBRARIES uninstall-man
++#if (__arch64__ || __arch64)
++typedef int64_t atomic_int_t;
++typedef uint64_t atomic_uint_t;
++#else
++typedef int32_t atomic_int_t;
++typedef uint32_t atomic_uint_t;
++#endif
+
-+uninstall-man: uninstall-man3
++#define atomic_cmp_set(a,b,c) __sync_bool_compare_and_swap(a,b,c)
+
-+.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-+ clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
-+ dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
-+ distcheck distclean distclean-compile distclean-generic \
-+ distclean-hdr distclean-libtool distclean-tags distcleancheck \
-+ distdir distuninstallcheck dvi dvi-am html html-am info \
-+ info-am install install-am install-binSCRIPTS install-data \
-+ install-data-am install-exec install-exec-am \
-+ install-includeHEADERS install-info install-info-am \
-+ install-libLTLIBRARIES install-man install-man3 install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-compile \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ tags uninstall uninstall-am uninstall-binSCRIPTS \
-+ uninstall-includeHEADERS uninstall-info-am \
-+ uninstall-libLTLIBRARIES uninstall-man uninstall-man3
++#endif /* defined (__GNUC__) &&... */
+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -Nru php-5.2.4.vanilla/libevent/missing php-5.2.4.fpm/libevent/missing
---- php-5.2.4.vanilla/libevent/missing 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/missing 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,360 @@
-+#! /bin/sh
-+# Common stub for a few missing GNU programs while installing.
++#elif ( __sparc__ || __sparc ) /* Marcin Ochab */
+
-+scriptversion=2003-09-02.23
++#if (__arch64__ || __arch64)
++typedef uint64_t atomic_uint_t;
++typedef volatile atomic_uint_t atomic_t;
+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
-+# Free Software Foundation, Inc.
-+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
++static inline int atomic_cas_64(atomic_t *lock, atomic_uint_t old, atomic_uint_t new)
++{
++ __asm__ __volatile__("casx [%2], %3, %0 " : "=&r"(new) : "0"(new), "r"(lock), "r"(old): "memory");
+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
++ return new;
++}
+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
++static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
++{
++ return (atomic_cas_64(lock, old, set)==old);
++}
++#else
++typedef uint32_t atomic_uint_t;
++typedef volatile atomic_uint_t atomic_t;
+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
++static inline int atomic_cas_32(atomic_t *lock, atomic_uint_t old, atomic_uint_t new)
++{
++ __asm__ __volatile__("cas [%2], %3, %0 " : "=&r"(new) : "0"(new), "r"(lock), "r"(old): "memory");
+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
++ return new;
++}
+
-+if test $# -eq 0; then
-+ echo 1>&2 "Try \`$0 --help' for more information"
-+ exit 1
-+fi
++static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
++{
++ return (atomic_cas_32(lock, old, set)==old);
++}
++#endif
+
-+run=:
++#else
+
-+# In the cases where this matters, `missing' is being run in the
-+# srcdir already.
-+if test -f configure.ac; then
-+ configure_ac=configure.ac
-+else
-+ configure_ac=configure.in
-+fi
++#error unsupported architecture. please write a patch and send it in
+
-+msg="missing on your system"
++#endif
+
-+case "$1" in
-+--run)
-+ # Try to run requested program, and just exit if it succeeds.
-+ run=
-+ shift
-+ "$@" && exit 0
-+ # Exit code 63 means version mismatch. This often happens
-+ # when the user try to use an ancient version of a tool on
-+ # a file that requires a minimum version. In this case we
-+ # we should proceed has if the program had been absent, or
-+ # if --run hadn't been passed.
-+ if test $? = 63; then
-+ run=:
-+ msg="probably too old"
-+ fi
-+ ;;
-+esac
++static inline int fpm_spinlock(atomic_t *lock, int try_once)
++{
++ if (try_once) {
++ return atomic_cmp_set(lock, 0, 1) ? 0 : -1;
++ }
+
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case "$1" in
++ for (;;) {
+
-+ -h|--h|--he|--hel|--help)
-+ echo "\
-+$0 [OPTION]... PROGRAM [ARGUMENT]...
-+
-+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-+error status if there is no known handling for PROGRAM.
-+
-+Options:
-+ -h, --help display this help and exit
-+ -v, --version output version information and exit
-+ --run try to run the given command, and emulate it if it fails
-+
-+Supported PROGRAM values:
-+ aclocal touch file \`aclocal.m4'
-+ autoconf touch file \`configure'
-+ autoheader touch file \`config.h.in'
-+ automake touch all \`Makefile.in' files
-+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
-+ flex create \`lex.yy.c', if possible, from existing .c
-+ help2man touch the output file
-+ lex create \`lex.yy.c', if possible, from existing .c
-+ makeinfo touch the output file
-+ tar try tar, gnutar, gtar, then tar without non-portable flags
-+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-+
-+Send bug reports to <bug-automake@gnu.org>."
-+ ;;
-+
-+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-+ echo "missing $scriptversion (GNU Automake)"
-+ ;;
-+
-+ -*)
-+ echo 1>&2 "$0: Unknown \`$1' option"
-+ echo 1>&2 "Try \`$0 --help' for more information"
-+ exit 1
-+ ;;
-+
-+ aclocal*)
-+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+ # We have it, but it failed.
-+ exit 1
-+ fi
++ if (atomic_cmp_set(lock, 0, 1)) {
++ break;
++ }
+
-+ echo 1>&2 "\
-+WARNING: \`$1' is $msg. You should only need it if
-+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
-+ to install the \`Automake' and \`Perl' packages. Grab them from
-+ any GNU archive site."
-+ touch aclocal.m4
-+ ;;
-+
-+ autoconf)
-+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+ # We have it, but it failed.
-+ exit 1
-+ fi
++ sched_yield();
++ }
+
-+ echo 1>&2 "\
-+WARNING: \`$1' is $msg. You should only need it if
-+ you modified \`${configure_ac}'. You might want to install the
-+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
-+ archive site."
-+ touch configure
-+ ;;
-+
-+ autoheader)
-+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+ # We have it, but it failed.
-+ exit 1
-+ fi
++ return 0;
++}
+
-+ echo 1>&2 "\
-+WARNING: \`$1' is $msg. You should only need it if
-+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
-+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
-+ from any GNU archive site."
-+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-+ test -z "$files" && files="config.h"
-+ touch_files=
-+ for f in $files; do
-+ case "$f" in
-+ *:*) touch_files="$touch_files "`echo "$f" |
-+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-+ *) touch_files="$touch_files $f.in";;
-+ esac
-+ done
-+ touch $touch_files
-+ ;;
++#endif
+
-+ automake*)
-+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+ # We have it, but it failed.
-+ exit 1
-+ fi
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm.c php-src/sapi/fpm/fpm/fpm.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm.c 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,82 @@
+
-+ echo 1>&2 "\
-+WARNING: \`$1' is $msg. You should only need it if
-+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-+ You might want to install the \`Automake' and \`Perl' packages.
-+ Grab them from any GNU archive site."
-+ find . -type f -name Makefile.am -print |
-+ sed 's/\.am$/.in/' |
-+ while read f; do touch "$f"; done
-+ ;;
-+
-+ autom4te)
-+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+ # We have it, but it failed.
-+ exit 1
-+ fi
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ echo 1>&2 "\
-+WARNING: \`$1' is needed, but is $msg.
-+ You might have modified some files without having the
-+ proper tools for further handling them.
-+ You can get \`$1' as part of \`Autoconf' from any GNU
-+ archive site."
-+
-+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+ if test -f "$file"; then
-+ touch $file
-+ else
-+ test -z "$file" || exec >$file
-+ echo "#! /bin/sh"
-+ echo "# Created by GNU Automake missing as a replacement of"
-+ echo "# $ $@"
-+ echo "exit 0"
-+ chmod +x $file
-+ exit 1
-+ fi
-+ ;;
-+
-+ bison|yacc)
-+ echo 1>&2 "\
-+WARNING: \`$1' $msg. You should only need it if
-+ you modified a \`.y' file. You may need the \`Bison' package
-+ in order for those modifications to take effect. You can get
-+ \`Bison' from any GNU archive site."
-+ rm -f y.tab.c y.tab.h
-+ if [ $# -ne 1 ]; then
-+ eval LASTARG="\${$#}"
-+ case "$LASTARG" in
-+ *.y)
-+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-+ if [ -f "$SRCFILE" ]; then
-+ cp "$SRCFILE" y.tab.c
-+ fi
-+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-+ if [ -f "$SRCFILE" ]; then
-+ cp "$SRCFILE" y.tab.h
-+ fi
-+ ;;
-+ esac
-+ fi
-+ if [ ! -f y.tab.h ]; then
-+ echo >y.tab.h
-+ fi
-+ if [ ! -f y.tab.c ]; then
-+ echo 'main() { return 0; }' >y.tab.c
-+ fi
-+ ;;
-+
-+ lex|flex)
-+ echo 1>&2 "\
-+WARNING: \`$1' is $msg. You should only need it if
-+ you modified a \`.l' file. You may need the \`Flex' package
-+ in order for those modifications to take effect. You can get
-+ \`Flex' from any GNU archive site."
-+ rm -f lex.yy.c
-+ if [ $# -ne 1 ]; then
-+ eval LASTARG="\${$#}"
-+ case "$LASTARG" in
-+ *.l)
-+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-+ if [ -f "$SRCFILE" ]; then
-+ cp "$SRCFILE" lex.yy.c
-+ fi
-+ ;;
-+ esac
-+ fi
-+ if [ ! -f lex.yy.c ]; then
-+ echo 'main() { return 0; }' >lex.yy.c
-+ fi
-+ ;;
++#include "fpm_config.h"
+
-+ help2man)
-+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+ # We have it, but it failed.
-+ exit 1
-+ fi
++#include <stdlib.h> /* for exit */
+
-+ echo 1>&2 "\
-+WARNING: \`$1' is $msg. You should only need it if
-+ you modified a dependency of a manual page. You may need the
-+ \`Help2man' package in order for those modifications to take
-+ effect. You can get \`Help2man' from any GNU archive site."
++#include "fpm.h"
++#include "fpm_children.h"
++#include "fpm_signals.h"
++#include "fpm_env.h"
++#include "fpm_events.h"
++#include "fpm_cleanup.h"
++#include "fpm_php.h"
++#include "fpm_sockets.h"
++#include "fpm_unix.h"
++#include "fpm_process_ctl.h"
++#include "fpm_conf.h"
++#include "fpm_worker_pool.h"
++#include "fpm_stdio.h"
++#include "zlog.h"
+
-+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+ if test -z "$file"; then
-+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-+ fi
-+ if [ -f "$file" ]; then
-+ touch $file
-+ else
-+ test -z "$file" || exec >$file
-+ echo ".ab help2man is required to generate this page"
-+ exit 1
-+ fi
-+ ;;
++struct fpm_globals_s fpm_globals;
+
-+ makeinfo)
-+ if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-+ # We have makeinfo, but it failed.
-+ exit 1
-+ fi
++int fpm_init(int argc, char **argv, char *config)
++{
++ fpm_globals.argc = argc;
++ fpm_globals.argv = argv;
++ fpm_globals.config = config;
+
-+ echo 1>&2 "\
-+WARNING: \`$1' is $msg. You should only need it if
-+ you modified a \`.texi' or \`.texinfo' file, or any other file
-+ indirectly affecting the aspect of the manual. The spurious
-+ call might also be the consequence of using a buggy \`make' (AIX,
-+ DU, IRIX). You might want to install the \`Texinfo' package or
-+ the \`GNU make' package. Grab either from any GNU archive site."
-+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+ if test -z "$file"; then
-+ file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-+ fi
-+ touch $file
-+ ;;
-+
-+ tar)
-+ shift
-+ if test -n "$run"; then
-+ echo 1>&2 "ERROR: \`tar' requires --run"
-+ exit 1
-+ fi
++ if (0 > fpm_php_init_main() ||
++ 0 > fpm_stdio_init_main() ||
++ 0 > fpm_conf_init_main() ||
++ 0 > fpm_unix_init_main() ||
++ 0 > fpm_env_init_main() ||
++ 0 > fpm_signals_init_main() ||
++ 0 > fpm_pctl_init_main() ||
++ 0 > fpm_children_init_main() ||
++ 0 > fpm_sockets_init_main() ||
++ 0 > fpm_worker_pool_init_main() ||
++ 0 > fpm_event_init_main()) {
++ return -1;
++ }
+
-+ # We have already tried tar in the generic part.
-+ # Look for gnutar/gtar before invocation to avoid ugly error
-+ # messages.
-+ if (gnutar --version > /dev/null 2>&1); then
-+ gnutar "$@" && exit 0
-+ fi
-+ if (gtar --version > /dev/null 2>&1); then
-+ gtar "$@" && exit 0
-+ fi
-+ firstarg="$1"
-+ if shift; then
-+ case "$firstarg" in
-+ *o*)
-+ firstarg=`echo "$firstarg" | sed s/o//`
-+ tar "$firstarg" "$@" && exit 0
-+ ;;
-+ esac
-+ case "$firstarg" in
-+ *h*)
-+ firstarg=`echo "$firstarg" | sed s/h//`
-+ tar "$firstarg" "$@" && exit 0
-+ ;;
-+ esac
-+ fi
++ if (0 > fpm_conf_write_pid()) {
++ return -1;
++ }
+
-+ echo 1>&2 "\
-+WARNING: I can't seem to be able to run \`tar' with the given arguments.
-+ You may want to install GNU tar or Free paxutils, or check the
-+ command line arguments."
-+ exit 1
-+ ;;
-+
-+ *)
-+ echo 1>&2 "\
-+WARNING: \`$1' is needed, and is $msg.
-+ You might have modified some files without having the
-+ proper tools for further handling them. Check the \`README' file,
-+ it often tells you about the needed prerequisites for installing
-+ this package. You may also peek at any GNU archive site, in case
-+ some other package would contain this missing \`$1' program."
-+ exit 1
-+ ;;
-+esac
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "fpm is running, pid %d", (int) fpm_globals.parent_pid);
+
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -Nru php-5.2.4.vanilla/libevent/mkinstalldirs php-5.2.4.fpm/libevent/mkinstalldirs
---- php-5.2.4.vanilla/libevent/mkinstalldirs 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/mkinstalldirs 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,40 @@
-+#! /bin/sh
-+# mkinstalldirs --- make directory hierarchy
-+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain
++ return 0;
++}
+
-+# $Id$
++/* children: return listening socket
++ parent: never return */
++int fpm_run(int *max_requests)
++{
++ struct fpm_worker_pool_s *wp;
+
-+errstatus=0
++ /* create initial children in all pools */
++ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
++ int is_parent;
+
-+for file
-+do
-+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+ shift
++ is_parent = fpm_children_create_initial(wp);
+
-+ pathcomp=
-+ for d
-+ do
-+ pathcomp="$pathcomp$d"
-+ case "$pathcomp" in
-+ -* ) pathcomp=./$pathcomp ;;
-+ esac
++ if (!is_parent) {
++ goto run_child;
++ }
++ }
+
-+ if test ! -d "$pathcomp"; then
-+ echo "mkdir $pathcomp"
++ /* run event loop forever */
++ fpm_event_loop();
+
-+ mkdir "$pathcomp" || lasterr=$?
++run_child: /* only workers reach this point */
+
-+ if test ! -d "$pathcomp"; then
-+ errstatus=$lasterr
-+ fi
-+ fi
++ fpm_cleanups_run(FPM_CLEANUP_CHILD);
+
-+ pathcomp="$pathcomp/"
-+ done
-+done
++ *max_requests = fpm_globals.max_requests;
++ return fpm_globals.listening_socket;
++}
+
-+exit $errstatus
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_children.c php-src/sapi/fpm/fpm/fpm_children.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_children.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_children.c 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,387 @@
+
-+# mkinstalldirs ends here
-diff -Nru php-5.2.4.vanilla/libevent/poll.c php-5.2.4.fpm/libevent/poll.c
---- php-5.2.4.vanilla/libevent/poll.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/poll.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,388 @@
-+/* $OpenBSD: poll.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+/*
-+ * Copyright 2000-2003 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
++#include "fpm_config.h"
+
+#include <sys/types.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <sys/_time.h>
-+#endif
-+#include <sys/queue.h>
-+#include <sys/tree.h>
-+#include <poll.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
++#include <sys/wait.h>
++#include <time.h>
+#include <unistd.h>
-+#include <errno.h>
-+#ifdef CHECK_INVARIANTS
-+#include <assert.h>
-+#endif
++#include <string.h>
++#include <stdio.h>
+
-+#include "event.h"
-+#include "event-internal.h"
-+#include "evsignal.h"
-+#include "log.h"
-+
-+struct pollop {
-+ int event_count; /* Highest number alloc */
-+ int nfds; /* Size of event_* */
-+ int fd_count; /* Size of idxplus1_by_fd */
-+ struct pollfd *event_set;
-+ struct event **event_r_back;
-+ struct event **event_w_back;
-+ int *idxplus1_by_fd; /* Index into event_set by fd; we add 1 so
-+ * that 0 (which is easy to memset) can mean
-+ * "no entry." */
-+};
++#include "fpm.h"
++#include "fpm_children.h"
++#include "fpm_signals.h"
++#include "fpm_worker_pool.h"
++#include "fpm_sockets.h"
++#include "fpm_process_ctl.h"
++#include "fpm_php.h"
++#include "fpm_conf.h"
++#include "fpm_cleanup.h"
++#include "fpm_events.h"
++#include "fpm_clock.h"
++#include "fpm_stdio.h"
++#include "fpm_unix.h"
++#include "fpm_env.h"
++#include "fpm_shm_slots.h"
+
-+void *poll_init (struct event_base *);
-+int poll_add (void *, struct event *);
-+int poll_del (void *, struct event *);
-+int poll_recalc (struct event_base *, void *, int);
-+int poll_dispatch (struct event_base *, void *, struct timeval *);
-+void poll_dealloc (struct event_base *, void *);
-+
-+const struct eventop pollops = {
-+ "poll",
-+ poll_init,
-+ poll_add,
-+ poll_del,
-+ poll_recalc,
-+ poll_dispatch,
-+ poll_dealloc
-+};
++#include "zlog.h"
++
++static time_t *last_faults;
++static int fault;
++
++static int fpm_children_make(struct fpm_worker_pool_s *wp, int in_event_loop);
++
++static void fpm_children_cleanup(int which, void *arg)
++{
++ free(last_faults);
++}
+
-+void *
-+poll_init(struct event_base *base)
++static struct fpm_child_s *fpm_child_alloc()
+{
-+ struct pollop *pollop;
++ struct fpm_child_s *ret;
+
-+ /* Disable poll when this environment variable is set */
-+ if (getenv("EVENT_NOPOLL"))
-+ return (NULL);
++ ret = malloc(sizeof(struct fpm_child_s));
+
-+ if (!(pollop = calloc(1, sizeof(struct pollop))))
-+ return (NULL);
++ if (!ret) { return 0; }
+
-+ evsignal_init(base);
++ memset(ret, 0, sizeof(*ret));
+
-+ return (pollop);
++ return ret;
+}
+
-+/*
-+ * Called with the highest fd that we know about. If it is 0, completely
-+ * recalculate everything.
-+ */
-+
-+int
-+poll_recalc(struct event_base *base, void *arg, int max)
++static void fpm_child_free(struct fpm_child_s *child)
+{
-+ return (0);
++ free(child);
+}
+
-+#ifdef CHECK_INVARIANTS
-+static void
-+poll_check_ok(struct pollop *pop)
++static void fpm_child_close(struct fpm_child_s *child, int in_event_loop)
+{
-+ int i, idx;
-+ struct event *ev;
-+
-+ for (i = 0; i < pop->fd_count; ++i) {
-+ idx = pop->idxplus1_by_fd[i]-1;
-+ if (idx < 0)
-+ continue;
-+ assert(pop->event_set[idx].fd == i);
-+ if (pop->event_set[idx].events & POLLIN) {
-+ ev = pop->event_r_back[idx];
-+ assert(ev);
-+ assert(ev->ev_events & EV_READ);
-+ assert(ev->ev_fd == i);
++ if (child->fd_stdout != -1) {
++ if (in_event_loop) {
++ fpm_event_fire(&child->ev_stdout);
+ }
-+ if (pop->event_set[idx].events & POLLOUT) {
-+ ev = pop->event_w_back[idx];
-+ assert(ev);
-+ assert(ev->ev_events & EV_WRITE);
-+ assert(ev->ev_fd == i);
++ if (child->fd_stdout != -1) {
++ close(child->fd_stdout);
+ }
+ }
-+ for (i = 0; i < pop->nfds; ++i) {
-+ struct pollfd *pfd = &pop->event_set[i];
-+ assert(pop->idxplus1_by_fd[pfd->fd] == i+1);
-+ }
-+}
-+#else
-+#define poll_check_ok(pop)
-+#endif
+
-+int
-+poll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
-+{
-+ int res, i, sec, nfds;
-+ struct pollop *pop = arg;
-+
-+ poll_check_ok(pop);
-+ sec = tv->tv_sec * 1000 + (tv->tv_usec + 999) / 1000;
-+ nfds = pop->nfds;
-+ res = poll(pop->event_set, nfds, sec);
-+
-+ if (res == -1) {
-+ if (errno != EINTR) {
-+ event_warn("poll");
-+ return (-1);
++ if (child->fd_stderr != -1) {
++ if (in_event_loop) {
++ fpm_event_fire(&child->ev_stderr);
++ }
++ if (child->fd_stderr != -1) {
++ close(child->fd_stderr);
+ }
-+
-+ evsignal_process(base);
-+ return (0);
-+ } else if (base->sig.evsignal_caught) {
-+ evsignal_process(base);
+ }
+
-+ event_debug(("%s: poll reports %d", __func__, res));
++ fpm_child_free(child);
++}
+
-+ if (res == 0)
-+ return (0);
++static void fpm_child_link(struct fpm_child_s *child)
++{
++ struct fpm_worker_pool_s *wp = child->wp;
+
-+ for (i = 0; i < nfds; i++) {
-+ int what = pop->event_set[i].revents;
-+ struct event *r_ev = NULL, *w_ev = NULL;
-+ if (!what)
-+ continue;
++ ++wp->running_children;
++ ++fpm_globals.running_children;
+
-+ res = 0;
++ child->next = wp->children;
++ if (child->next) { child->next->prev = child; }
++ child->prev = 0;
++ wp->children = child;
++}
+
-+ /* If the file gets closed notify */
-+ if (what & (POLLHUP|POLLERR))
-+ what |= POLLIN|POLLOUT;
-+ if (what & POLLIN) {
-+ res |= EV_READ;
-+ r_ev = pop->event_r_back[i];
-+ }
-+ if (what & POLLOUT) {
-+ res |= EV_WRITE;
-+ w_ev = pop->event_w_back[i];
-+ }
-+ if (res == 0)
-+ continue;
++static void fpm_child_unlink(struct fpm_child_s *child)
++{
++ --child->wp->running_children;
++ --fpm_globals.running_children;
+
-+ if (r_ev && (res & r_ev->ev_events)) {
-+ if (!(r_ev->ev_events & EV_PERSIST))
-+ event_del(r_ev);
-+ event_active(r_ev, res & r_ev->ev_events, 1);
-+ }
-+ if (w_ev && w_ev != r_ev && (res & w_ev->ev_events)) {
-+ if (!(w_ev->ev_events & EV_PERSIST))
-+ event_del(w_ev);
-+ event_active(w_ev, res & w_ev->ev_events, 1);
-+ }
-+ }
++ if (child->prev) { child->prev->next = child->next; }
++ else { child->wp->children = child->next; }
++ if (child->next) { child->next->prev = child->prev; }
+
-+ return (0);
+}
+
-+int
-+poll_add(void *arg, struct event *ev)
++static struct fpm_child_s *fpm_child_find(pid_t pid)
+{
-+ struct pollop *pop = arg;
-+ struct pollfd *pfd = NULL;
-+ int i;
-+
-+ if (ev->ev_events & EV_SIGNAL)
-+ return (evsignal_add(ev));
-+ if (!(ev->ev_events & (EV_READ|EV_WRITE)))
-+ return (0);
++ struct fpm_worker_pool_s *wp;
++ struct fpm_child_s *child = 0;
+
-+ poll_check_ok(pop);
-+ if (pop->nfds + 1 >= pop->event_count) {
-+ struct pollfd *tmp_event_set;
-+ struct event **tmp_event_r_back;
-+ struct event **tmp_event_w_back;
-+ int tmp_event_count;
++ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
+
-+ if (pop->event_count < 32)
-+ tmp_event_count = 32;
-+ else
-+ tmp_event_count = pop->event_count * 2;
-+
-+ /* We need more file descriptors */
-+ tmp_event_set = realloc(pop->event_set,
-+ tmp_event_count * sizeof(struct pollfd));
-+ if (tmp_event_set == NULL) {
-+ event_warn("realloc");
-+ return (-1);
-+ }
-+ pop->event_set = tmp_event_set;
-+
-+ tmp_event_r_back = realloc(pop->event_r_back,
-+ tmp_event_count * sizeof(struct event *));
-+ if (tmp_event_r_back == NULL) {
-+ /* event_set overallocated; that's okay. */
-+ event_warn("realloc");
-+ return (-1);
-+ }
-+ pop->event_r_back = tmp_event_r_back;
-+
-+ tmp_event_w_back = realloc(pop->event_w_back,
-+ tmp_event_count * sizeof(struct event *));
-+ if (tmp_event_w_back == NULL) {
-+ /* event_set and event_r_back overallocated; that's
-+ * okay. */
-+ event_warn("realloc");
-+ return (-1);
++ for (child = wp->children; child; child = child->next) {
++ if (child->pid == pid) {
++ break;
++ }
+ }
-+ pop->event_w_back = tmp_event_w_back;
+
-+ pop->event_count = tmp_event_count;
-+ }
-+ if (ev->ev_fd >= pop->fd_count) {
-+ int *tmp_idxplus1_by_fd;
-+ int new_count;
-+ if (pop->fd_count < 32)
-+ new_count = 32;
-+ else
-+ new_count = pop->fd_count * 2;
-+ while (new_count <= ev->ev_fd)
-+ new_count *= 2;
-+ tmp_idxplus1_by_fd =
-+ realloc(pop->idxplus1_by_fd, new_count * sizeof(int));
-+ if (tmp_idxplus1_by_fd == NULL) {
-+ event_warn("realloc");
-+ return (-1);
++ if (child) {
++ break;
+ }
-+ pop->idxplus1_by_fd = tmp_idxplus1_by_fd;
-+ memset(pop->idxplus1_by_fd + pop->fd_count,
-+ 0, sizeof(int)*(new_count - pop->fd_count));
-+ pop->fd_count = new_count;
-+ }
-+
-+ i = pop->idxplus1_by_fd[ev->ev_fd] - 1;
-+ if (i >= 0) {
-+ pfd = &pop->event_set[i];
-+ } else {
-+ i = pop->nfds++;
-+ pfd = &pop->event_set[i];
-+ pfd->events = 0;
-+ pfd->fd = ev->ev_fd;
-+ pop->event_w_back[i] = pop->event_r_back[i] = NULL;
-+ pop->idxplus1_by_fd[ev->ev_fd] = i + 1;
+ }
+
-+ pfd->revents = 0;
-+ if (ev->ev_events & EV_WRITE) {
-+ pfd->events |= POLLOUT;
-+ pop->event_w_back[i] = ev;
-+ }
-+ if (ev->ev_events & EV_READ) {
-+ pfd->events |= POLLIN;
-+ pop->event_r_back[i] = ev;
++ if (!child) {
++ return 0;
+ }
-+ poll_check_ok(pop);
+
-+ return (0);
++ return child;
+}
+
-+/*
-+ * Nothing to be done here.
-+ */
-+
-+int
-+poll_del(void *arg, struct event *ev)
++static void fpm_child_init(struct fpm_worker_pool_s *wp)
+{
-+ struct pollop *pop = arg;
-+ struct pollfd *pfd = NULL;
-+ int i;
-+
-+ if (ev->ev_events & EV_SIGNAL)
-+ return (evsignal_del(ev));
-+
-+ if (!(ev->ev_events & (EV_READ|EV_WRITE)))
-+ return (0);
++ fpm_globals.max_requests = wp->config->max_requests;
+
-+ poll_check_ok(pop);
-+ i = pop->idxplus1_by_fd[ev->ev_fd] - 1;
-+ if (i < 0)
-+ return (-1);
++ if (0 > fpm_stdio_init_child(wp) ||
++ 0 > fpm_unix_init_child(wp) ||
++ 0 > fpm_signals_init_child() ||
++ 0 > fpm_env_init_child(wp) ||
++ 0 > fpm_php_init_child(wp)) {
+
-+ /* Do we still want to read or write? */
-+ pfd = &pop->event_set[i];
-+ if (ev->ev_events & EV_READ) {
-+ pfd->events &= ~POLLIN;
-+ pop->event_r_back[i] = NULL;
-+ }
-+ if (ev->ev_events & EV_WRITE) {
-+ pfd->events &= ~POLLOUT;
-+ pop->event_w_back[i] = NULL;
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "child failed to initialize (pool %s)", wp->config->name);
++ exit(255);
+ }
-+ poll_check_ok(pop);
-+ if (pfd->events)
-+ /* Another event cares about that fd. */
-+ return (0);
++}
+
-+ /* Okay, so we aren't interested in that fd anymore. */
-+ pop->idxplus1_by_fd[ev->ev_fd] = 0;
++int fpm_children_free(struct fpm_child_s *child)
++{
++ struct fpm_child_s *next;
+
-+ --pop->nfds;
-+ if (i != pop->nfds) {
-+ /*
-+ * Shift the last pollfd down into the now-unoccupied
-+ * position.
-+ */
-+ memcpy(&pop->event_set[i], &pop->event_set[pop->nfds],
-+ sizeof(struct pollfd));
-+ pop->event_r_back[i] = pop->event_r_back[pop->nfds];
-+ pop->event_w_back[i] = pop->event_w_back[pop->nfds];
-+ pop->idxplus1_by_fd[pop->event_set[i].fd] = i + 1;
++ for (; child; child = next) {
++ next = child->next;
++ fpm_child_close(child, 0 /* in_event_loop */);
+ }
+
-+ poll_check_ok(pop);
-+ return (0);
++ return 0;
+}
+
-+void
-+poll_dealloc(struct event_base *base, void *arg)
++void fpm_children_bury()
+{
-+ struct pollop *pop = arg;
-+
-+ evsignal_dealloc(base);
-+ if (pop->event_set)
-+ free(pop->event_set);
-+ if (pop->event_r_back)
-+ free(pop->event_r_back);
-+ if (pop->event_w_back)
-+ free(pop->event_w_back);
-+ if (pop->idxplus1_by_fd)
-+ free(pop->idxplus1_by_fd);
-+
-+ memset(pop, 0, sizeof(struct pollop));
-+ free(pop);
-+}
-diff -Nru php-5.2.4.vanilla/libevent/README php-5.2.4.fpm/libevent/README
---- php-5.2.4.vanilla/libevent/README 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/README 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,53 @@
-+To build libevent, type
-+
-+$ ./configure && make
-+
-+Install as root via
-+
-+# make install
-+
-+You can run the regression tests by
-+
-+$ make verify
-+
-+Before, reporting any problems, please run the regression tests.
-+
-+To enable the low-level tracing build the library as:
-+
-+CFLAGS=-DUSE_DEBUG ./configure [...]
-+
-+Acknowledgements:
-+-----------------
-+
-+The following people have helped with suggestions, ideas, code or
-+fixing bugs:
-+
-+ Alejo
-+ Weston Andros Adamson
-+ William Ahern
-+ Stas Bekman
-+ Andrew Danforth
-+ Mike Davis
-+ Shie Erlich
-+ Alexander von Gernler
-+ Artur Grabowski
-+ Aaron Hopkins
-+ Claudio Jeker
-+ Scott Lamb
-+ Adam Langley
-+ Philip Lewis
-+ David Libenzi
-+ Nick Mathewson
-+ Andrey Matveev
-+ Richard Nyberg
-+ Jon Oberheide
-+ Phil Oleson
-+ Dave Pacheco
-+ Tassilo von Parseval
-+ Pierre Phaneuf
-+ Jon Poland
-+ Bert JW Regeer
-+ Dug Song
-+ Taral
-+
-+If I have forgotten your name, please contact me.
-diff -Nru php-5.2.4.vanilla/libevent/rtsig.c php-5.2.4.fpm/libevent/rtsig.c
---- php-5.2.4.vanilla/libevent/rtsig.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/rtsig.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,985 @@
-+/*
-+ * Copyright (c) 2006 Mathew Mills <mathewmills@mac.com>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+/*
-+ * Meta-level comments: You know that a kernel interface is wrong if
-+ * supporting it requires three times more code than any of the other
-+ * kernel interfaces supported in libevent. Niels - 2006-02-22
-+ */
-+/**
-+
-+ "RTSIG" is a shorthand for using O_ASYNC to make descriptors send
-+ signals when readable/writable and to use POSIX real-time signals
-+ witch are queued unlike normal signals. At first blush this may
-+ seem like a alternative to epoll, but a number of problems arise
-+ when attempting to build an eventloop entirely out of rtsig.
-+ Still, we can use rtsig in combination with poll() to
-+ provide an eventloop that allows for many thousands of sockets
-+ without huge overheads implicit with using select() or poll()
-+ alone. epoll and kqueue are far superior to rtsig and should be
-+ used where available, but rtsig has been in standard Linux kernels
-+ for a long time and have a huge installation base. epoll requires
-+ special patches for 2.4 kernels and 2.6 kernels are not yet nearly
-+ so ubiquitous.
-+
-+ rtsig problems:
-+ - O_ASYNC mechanisms work only on sockets - not pipes or tty's
-+
-+ - O_ASYNC signals are edge-triggered, POLLIN on packet arriving
-+ or socket close; POLLOUT when a socket transitions from
-+ non-writable to writable. Being edge-triggered means the
-+ event-handler callbacks must transition the level ( reading
-+ completely the socket buffer contents ) or it will be unable to
-+ reliably receive notification again.
-+
-+ - rtsig implementations must be intimately involved in how a
-+ process dispatches signals.
-+
-+ - delivering signals per-event can be expensive, CPU-wise, but
-+ sigtimedwait() blocks on signals only and means non-sockets
-+ cannot be serviced.
-+
-+ Theory of operation:
-+ This libevent module uses rtsig to allow us to manage a set of
-+ poll-event descriptors. We can drop uninteresting fd's from the
-+ pollset if the fd will send a signal when it becomes interesting
-+ again.
-+
-+ poll() offers us level-triggering and, when we have verified the
-+ level of a socket, we can trust the edge-trigger nature of the
-+ ASYNC signal.
-+
-+ As an eventloop we must poll for external events but leverage
-+ kernel functionality to sleep between events ( until the loop's
-+ next scheduled timed event ).
-+
-+ If we are polling on any non-sockets then we simply have no choice
-+ about blocking on the poll() call. If we blocked on the
-+ sigtimedwait() call as rtsig papers recommend we will not wake on
-+ non-socket state transitions. As part of libevent, this module
-+ must support non-socket polling.
-+
-+ Many applications, however, do not need to poll on non-sockets and
-+ so this module should be able to optimize this case by using
-+ sigtimedwait(). For this reason this module can actually trigger
-+ events in each of three different ways:
-+ - poll() returning ready events from descriptors in the pollset
-+
-+ - real-time signals dequeued via sigtimedwait()
-+
-+ - real-time signals that call an installed signal handler which in
-+ turn writes the contents of siginfo to one end of a socketpair
-+ DGRAM socket. The other end of the socket is always in the
-+ pollset so poll will be guaranteed to return even if the signal is
-+ received before entering poll().
-+
-+ non-socket descriptors force us to block on the poll() for the
-+ duration of a dispatch. In this case we unblock (w/ sigprocmask)
-+ the managed signals just before polling. Each managed signal is
-+ handled by signal_handler() which send()'s the contents of siginfo
-+ over the socketpair. Otherwise, we call poll() with a timeout of
-+ 0ms so it checks the levels of the fd's in the pollset and returns
-+ immediately. Any fd that is a socket and has no active state is
-+ removed from the pollset for the next pass -- we will rely on
-+ getting a signal for events on these fd's.
-+
-+ The receiving end of the siginfo socketpair is in the pollset
-+ (permanently) so if we are polling on non-sockets, the delivery of
-+ signals immediately following sigprocmask( SIG_UNBLOCK...) will
-+ result in a readable op->signal_recv_fd which ensures the poll()
-+ will return immediately. If the poll() call is blocking and a
-+ signal arrives ( possibly a real-time signal from a socket not in
-+ the pollset ) its handler will write the data to the socketpair
-+ and interrupt the poll().
-+
-+ After every poll call we attempt a non-blocking recv from the
-+ signal_recv_fd and continue to recv and dispatch the events until
-+ recv indicates the socket buffer is empty.
-+
-+ One might raise concerns about receiving event activations from
-+ both poll() and from the rtsig data in the signal_recv_fd.
-+ Fortunately, libevent is already structured for event coalescing,
-+ so this issue is mitigated ( though we do some work twice for the
-+ same event making us less efficient ). I suspect that the cost of
-+ turning off the O_ASYNC flag on fd's in the pollset is more
-+ expensive than handling some events twice. Looking at the
-+ kernel's source code for setting O_ASYNC, it looks like it takes a
-+ global kernel lock...
-+
-+ After a poll and recv-loop for the signal_recv_fd, we finally do a
-+ sigtimedwait(). sigtimedwait will only block if we haven't
-+ blocked in poll() and we have not enqueued events from either the
-+ poll or the recv-loop. Because sigtimedwait blocks all signals
-+ that are not in the set of signals to be dequeued, we need to
-+ dequeue almost all signals and make sure we dispatch them
-+ correctly. We dequeue any signal that is not blocked as well as
-+ all libevent-managed signals. If we get a signal that is not
-+ managed by libevent we lookup the sigaction for the specific
-+ signal and call that function ourselves.
-+
-+ Finally, I should mention that getting a SIGIO signal indicates
-+ that the rtsig buffer has overflowed and we have lost events.
-+ This forces us to add _every_ descriptor to the pollset to recover.
-+
-+*/
-+
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+/* Enable F_SETSIG and F_SETOWN */
-+#define _GNU_SOURCE
-+
-+#include <sys/types.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <sys/_time.h>
-+#endif
-+#include <assert.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/poll.h>
-+#include <sys/queue.h>
-+#include <sys/tree.h>
-+#include <unistd.h>
-+#include <sys/socket.h>
++ int status;
++ pid_t pid;
++ struct fpm_child_s *child;
+
-+#include "event.h"
-+#include "event-internal.h"
-+#include "log.h"
-+extern struct event_list signalqueue;
++ while ( (pid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) {
++ char buf[128];
++ int severity = ZLOG_NOTICE;
+
-+#include <linux/unistd.h>
-+#ifndef __NR_gettid
-+#define gettid() getpid()
-+#else
++ child = fpm_child_find(pid);
+
-+#if ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)))
-+_syscall0(pid_t,gettid)
-+#endif
++ if (WIFEXITED(status)) {
+
-+#endif
++ snprintf(buf, sizeof(buf), "with code %d", WEXITSTATUS(status));
+
-+#define EVLIST_NONSOCK 0x1000 /* event is for a non-socket file-descriptor */
-+#define EVLIST_DONTDEL 0x2000 /* event should always be in the pollset */
-+#define MAXBUFFERSIZE (1024 * 1024 * 2) /* max socketbuffer for signal-spair */
-+#define INIT_MAX 16 /* init/min # of fd positions in our pollset */
-+
-+static int signal_send_fd[_NSIG]; /* the globalend of the signal socketpair */
-+static int trouble[_NSIG]; /* 1 when signal-handler cant send to signal_send_fd */
-+
-+struct rtdata;
-+TAILQ_HEAD(rtdata_list, rtdata);
-+
-+struct rtsigop {
-+ sigset_t sigs; /* signal mask for all _managed_ signals */
-+ struct pollfd *poll; /* poll structures */
-+ struct rtdata **ptodat; /* map poll_position to rtdata */
-+ int cur; /* cur # fd's in a poll set */
-+ int max; /* max # fd's in a poll set, start at 16 and grow as needed */
-+ int total; /* count of fd's we are watching now */
-+ int signo; /* the signo we use for ASYNC fd notifications */
-+ int nonsock; /* number of non-socket fd's we are watching */
-+ int highestfd; /* highest fd accomodated by fdtodat */
-+ struct rtdata_list **fdtodat; /* map fd to rtdata ( and thus to event ) */
-+ int signal_recv_fd; /* recv side of the signal_send_fd */
-+ int signal_send_fd; /* recv side of the signal_send_fd */
-+ struct event sigfdev; /* our own event structure for the signal fd */
-+};
++ if (WEXITSTATUS(status) != 0) {
++ severity = ZLOG_WARNING;
++ }
+
-+struct rtdata {
-+ /* rtdata holds rtsig-private state on each event */
-+ TAILQ_ENTRY (rtdata) next;
-+ struct event *ev;
-+ int poll_position;
-+};
++ }
++ else if (WIFSIGNALED(status)) {
++ const char *signame = fpm_signal_names[WTERMSIG(status)];
++ const char *have_core = WCOREDUMP(status) ? " (core dumped)" : "";
+
-+void *rtsig_init(struct event_base *);
-+int rtsig_add(void *, struct event *);
-+int rtsig_del(void *, struct event *);
-+int rtsig_recalc(struct event_base *, void *, int);
-+int rtsig_dispatch(struct event_base *, void *, struct timeval *);
-+
-+struct eventop rtsigops = {
-+ "rtsig",
-+ rtsig_init,
-+ rtsig_add,
-+ rtsig_del,
-+ rtsig_recalc,
-+ rtsig_dispatch
-+};
++ if (signame == NULL) {
++ signame = "";
++ }
+
-+static void
-+signal_handler(int sig, siginfo_t *info, void *ctx)
-+{
-+ /*
-+ * the signal handler for all libevent-managed signals only
-+ * used if we need to do a blocking poll() call due to
-+ * non-socket fd's in the pollset.
-+ */
-+
-+ siginfo_t *i = info;
-+ siginfo_t i_local;
-+
-+ if (trouble[sig - 1]) {
-+ i_local.si_signo = SIGIO;
-+ i_local.si_errno = 0;
-+ i_local.si_code = 0;
-+ i = &i_local;
-+ trouble[sig - 1] = 0;
-+ }
++ snprintf(buf, sizeof(buf), "on signal %d %s%s", WTERMSIG(status), signame, have_core);
+
-+ if (send(signal_send_fd[sig - 1], i, sizeof(*i),
-+ MSG_DONTWAIT|MSG_NOSIGNAL) == -1)
-+ trouble[sig - 1] = 1;
-+}
++ if (WTERMSIG(status) != SIGQUIT) { /* possible request loss */
++ severity = ZLOG_WARNING;
++ }
++ }
++ else if (WIFSTOPPED(status)) {
+
-+static void
-+donothing(int fd, short event, void *arg)
-+{
-+ /*
-+ * callback for our signal_recv_fd event structure
-+ * we don't want to act on these events, we just want to wake the poll()
-+ */
-+};
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "child %d stopped for tracing", (int) pid);
+
-+static void
-+signotset(sigset_t *set)
-+{
-+ int i, l;
-+ l = sizeof(*set) / 4;
-+ for (i = 0; i < l; i++) {
-+ ((unsigned *)set)[i] = ~((unsigned *)set)[i];
-+ }
-+}
++ if (child && child->tracer) {
++ child->tracer(child);
++ }
+
-+/* The next three functions manage our private data about each event struct */
++ continue;
++ }
+
-+static int
-+grow_fdset(struct rtsigop *op, int newhigh)
-+{
-+ /*
-+ * grow the fd -> rtdata array because we have encountered a
-+ * new fd too high to fit in the existing array
-+ */
++ if (child) {
++ struct fpm_worker_pool_s *wp = child->wp;
++ struct timeval tv1, tv2;
+
-+ struct rtdata_list **p;
-+ struct rtdata_list *datset;
-+ int i,x;
-+ int newcnt = (newhigh + 1) << 1;
++ fpm_child_unlink(child);
+
-+ if (newhigh <= op->highestfd)
-+ return (0);
++ fpm_shm_slots_discard_slot(child);
+
-+ p = op->fdtodat;
-+ p = realloc(op->fdtodat, sizeof(struct rtdata_list *) * newcnt);
-+ if (p == NULL)
-+ return (-1);
-+ op->fdtodat = p;
++ fpm_clock_get(&tv1);
+
-+ datset = calloc(newcnt - (op->highestfd + 1),
-+ sizeof(struct rtdata_list));
-+ if (datset == NULL)
-+ return (-1);
++ timersub(&tv1, &child->started, &tv2);
+
-+ for (i = op->highestfd + 1, x = 0; i < newcnt; i++, x++) {
-+ op->fdtodat[i] = &(datset[x]);
-+ TAILQ_INIT(op->fdtodat[i]);
-+ }
++ zlog(ZLOG_STUFF, severity, "child %d (pool %s) exited %s after %ld.%06d seconds from start", (int) pid,
++ child->wp->config->name, buf, tv2.tv_sec, (int) tv2.tv_usec);
+
-+ op->highestfd = newcnt - 1;
-+ return (0);
-+}
++ fpm_child_close(child, 1 /* in event_loop */);
+
-+static struct rtdata *
-+ev2dat(struct rtsigop *op, struct event *ev, int create)
-+{
-+ /*
-+ * given an event struct, find the dat structure that
-+ * corresponds to it if create is non-zero and the rtdata
-+ * structure does not exist, create it return NULL if not
-+ * found
-+ */
++ fpm_pctl_child_exited();
+
-+ int found = 0;
-+ int fd = ev->ev_fd;
-+ struct rtdata *ret = NULL;
++ if (last_faults && (WTERMSIG(status) == SIGSEGV || WTERMSIG(status) == SIGBUS)) {
++ time_t now = tv1.tv_sec;
++ int restart_condition = 1;
++ int i;
+
-+ if (op->highestfd < fd && create)
-+ if (grow_fdset(op, fd) == -1)
-+ return (NULL);
-+
-+ TAILQ_FOREACH(ret, op->fdtodat[fd], next) {
-+ if (ret->ev == ev) {
-+ found = 1;
-+ break;
-+ }
-+ }
++ last_faults[fault++] = now;
+
-+ if (!found) {
-+ if (!create)
-+ return (NULL);
++ if (fault == fpm_global_config.emergency_restart_threshold) {
++ fault = 0;
++ }
+
-+ ret = calloc(1, sizeof(struct rtdata));
-+ if (ret == NULL)
-+ return (NULL);
-+ ret->ev = ev;
-+ ret->poll_position = -1;
-+ TAILQ_INSERT_TAIL(op->fdtodat[fd], ret, next);
-+ }
++ for (i = 0; i < fpm_global_config.emergency_restart_threshold; i++) {
++ if (now - last_faults[i] > fpm_global_config.emergency_restart_interval) {
++ restart_condition = 0;
++ break;
++ }
++ }
+
-+ return (ret);
-+}
++ if (restart_condition) {
+
-+static void
-+dat_del(struct rtsigop *op, struct rtdata *dat)
-+{
-+ /*
-+ * delete our private notes about a given event struct
-+ * called from rtsig_del() only
-+ */
-+ int fd;
-+ if (dat == NULL)
-+ return;
-+ fd = dat->ev->ev_fd;
++ zlog(ZLOG_STUFF, ZLOG_WARNING, "failed processes threshold (%d in %d sec) is reached, initiating reload",
++ fpm_global_config.emergency_restart_threshold, fpm_global_config.emergency_restart_interval);
+
-+ TAILQ_REMOVE(op->fdtodat[fd], dat, next);
-+ memset(dat, 0, sizeof(*dat));
-+ free(dat);
-+}
++ fpm_pctl(FPM_PCTL_STATE_RELOADING, FPM_PCTL_ACTION_SET);
++ }
++ }
+
++ fpm_children_make(wp, 1 /* in event loop */);
+
-+static void
-+set_sigaction(int sig)
-+{
-+ /*
-+ * set the standard handler for any libevent-managed signal,
-+ * including the rtsig used for O_ASYNC notifications
-+ */
-+ struct sigaction act;
++ if (fpm_globals.is_child) {
++ break;
++ }
++ }
++ else {
++ zlog(ZLOG_STUFF, ZLOG_ALERT, "oops, unknown child exited %s", buf);
++ }
++ }
+
-+ act.sa_flags = SA_RESTART | SA_SIGINFO;
-+ sigfillset(&(act.sa_mask));
-+ act.sa_sigaction = &signal_handler;
-+ sigaction(sig, &act, NULL);
+}
+
-+static int
-+find_rt_signal()
++static struct fpm_child_s *fpm_resources_prepare(struct fpm_worker_pool_s *wp)
+{
-+ /* find an unused rtsignal */
-+ struct sigaction act;
-+ int sig = SIGRTMIN;
++ struct fpm_child_s *c;
+
-+ while (sig <= SIGRTMAX) {
-+ if (sigaction(sig, NULL, &act) != 0) {
-+ if (errno == EINTR)
-+ continue;
-+ } else {
-+ if (act.sa_flags & SA_SIGINFO) {
-+ if (act.sa_sigaction == NULL)
-+ return (sig);
-+ } else {
-+ if (act.sa_handler == SIG_DFL)
-+ return (sig);
-+ }
-+ }
-+ sig++;
++ c = fpm_child_alloc();
++
++ if (!c) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "malloc failed (pool %s)", wp->config->name);
++ return 0;
+ }
-+ return (0);
-+}
+
-+/*
-+ * the next three functions manage our pollset and the memory management for
-+ * fd -> rtdata -> event -> poll_position maps
-+ */
++ c->wp = wp;
++ c->fd_stdout = -1; c->fd_stderr = -1;
+
-+static int
-+poll_add(struct rtsigop *op, struct event *ev, struct rtdata *dat)
-+{
-+ struct pollfd *pfd;
-+ int newmax = op->max << 1;
-+ int pp;
-+
-+ if (op->poll == NULL)
-+ return (0);
-+
-+ if (dat == NULL)
-+ dat = ev2dat(op, ev, 0);
-+
-+ if (dat == NULL)
-+ return (0);
-+
-+ pp = dat->poll_position;
-+
-+ if (pp != -1) {
-+ pfd = &op->poll[pp];
-+ if (ev->ev_events & EV_READ)
-+ pfd->events |= POLLIN;
-+
-+ if (ev->ev_events & EV_WRITE)
-+ pfd->events |= POLLOUT;
-+
-+ return (0);
++ if (0 > fpm_stdio_prepare_pipes(c)) {
++ fpm_child_free(c);
++ return 0;
+ }
+
-+ if (op->cur == op->max) {
-+ void *p = realloc(op->poll, sizeof(*op->poll) * newmax);
-+ if (p == NULL) {
-+ errno = ENOMEM;
-+ return (-1);
-+ }
-+ op->poll = p;
-+
-+ p = realloc(op->ptodat, sizeof(*op->ptodat) * newmax);
-+ if (p == NULL) {
-+ /* shrink the pollset back down */
-+ op->poll = realloc(op->poll,
-+ sizeof(*op->poll) * op->max);
-+ errno = ENOMEM;
-+ return (-1);
-+ }
-+ op->ptodat = p;
-+ op->max = newmax;
++ if (0 > fpm_shm_slots_prepare_slot(c)) {
++ fpm_stdio_discard_pipes(c);
++ fpm_child_free(c);
++ return 0;
+ }
+
-+ pfd = &op->poll[op->cur];
-+ pfd->fd = ev->ev_fd;
-+ pfd->revents = 0;
-+ pfd->events = 0;
-+
-+ if (ev->ev_events & EV_READ)
-+ pfd->events |= POLLIN;
-+
-+ if (ev->ev_events & EV_WRITE)
-+ pfd->events |= POLLOUT;
-+
-+ op->ptodat[op->cur] = dat;
-+ dat->poll_position = op->cur;
-+ op->cur++;
-+
-+ return (0);
++ return c;
+}
+
-+static void
-+poll_free(struct rtsigop *op, int n)
++static void fpm_resources_discard(struct fpm_child_s *child)
+{
-+ if (op->poll == NULL)
-+ return;
-+
-+ op->cur--;
-+
-+ if (n < op->cur) {
-+ memcpy(&op->poll[n], &op->poll[op->cur], sizeof(*op->poll));
-+ op->ptodat[n] = op->ptodat[op->cur];
-+ op->ptodat[n]->poll_position = n;
-+ }
-+
-+
-+ /* less then half the max in use causes us to shrink */
-+ if (op->max > INIT_MAX && op->cur < op->max >> 1) {
-+ op->max >>= 1;
-+ op->poll = realloc(op->poll, sizeof(*op->poll) * op->max);
-+ op->ptodat = realloc(op->ptodat, sizeof(*op->ptodat) * op->max);
-+ }
++ fpm_shm_slots_discard_slot(child);
++ fpm_stdio_discard_pipes(child);
++ fpm_child_free(child);
+}
+
-+static void
-+poll_remove(struct rtsigop *op, struct event *ev, struct rtdata *dat)
++static void fpm_child_resources_use(struct fpm_child_s *child)
+{
-+ int pp;
-+ if (dat == NULL)
-+ dat = ev2dat(op, ev, 0);
-+
-+ if (dat == NULL) return;
-+
-+ pp = dat->poll_position;
-+ if (pp != -1) {
-+ poll_free(op, pp);
-+ dat->poll_position = -1;
-+ }
++ fpm_shm_slots_child_use_slot(child);
++ fpm_stdio_child_use_pipes(child);
++ fpm_child_free(child);
+}
+
-+static void
-+activate(struct event *ev, int flags)
++static void fpm_parent_resources_use(struct fpm_child_s *child)
+{
-+ /* activate an event, possibly removing one-shot events */
-+ if (!(ev->ev_events & EV_PERSIST))
-+ event_del(ev);
-+ event_active(ev, flags, 1);
++ fpm_shm_slots_parent_use_slot(child);
++ fpm_stdio_parent_use_pipes(child);
++ fpm_child_link(child);
+}
+
-+#define FD_CLOSEONEXEC(x) do { \
-+ if (fcntl(x, F_SETFD, 1) == -1) \
-+ event_warn("fcntl(%d, F_SETFD)", x); \
-+} while (0)
-+
-+void *
-+rtsig_init(struct event_base *)
++static int fpm_children_make(struct fpm_worker_pool_s *wp, int in_event_loop)
+{
-+ struct rtsigop *op;
-+ int sockets[2];
-+ int optarg;
-+ struct rtdata *dat;
-+ int flags;
-+
-+ if (getenv("EVENT_NORTSIG"))
-+ goto err;
-+
-+ op = calloc(1, sizeof(*op));
-+ if (op == NULL)
-+ goto err;
-+
-+ op->max = INIT_MAX;
-+ op->poll = malloc(sizeof(*op->poll) * op->max);
-+ if (op->poll == NULL)
-+ goto err_free_op;
-+
-+ op->signo = find_rt_signal();
-+ if (op->signo == 0)
-+ goto err_free_poll;
-+
-+ op->nonsock = 0;
++ int enough = 0;
++ pid_t pid;
++ struct fpm_child_s *child;
+
-+ if (socketpair(PF_UNIX, SOCK_DGRAM, 0, sockets) != 0)
-+ goto err_free_poll;
++ while (!enough && fpm_pctl_can_spawn_children() && wp->running_children < wp->config->pm->max_children) {
+
-+ FD_CLOSEONEXEC(sockets[0]);
-+ FD_CLOSEONEXEC(sockets[1]);
++ child = fpm_resources_prepare(wp);
+
-+ signal_send_fd[op->signo - 1] = sockets[0];
-+ trouble[op->signo - 1] = 0;
-+ op->signal_send_fd = sockets[0];
-+ op->signal_recv_fd = sockets[1];
-+ flags = fcntl(op->signal_recv_fd, F_GETFL);
-+ fcntl(op->signal_recv_fd, F_SETFL, flags | O_NONBLOCK);
++ if (!child) {
++ enough = 1;
++ break;
++ }
+
-+ optarg = MAXBUFFERSIZE;
-+ setsockopt(signal_send_fd[op->signo - 1],
-+ SOL_SOCKET, SO_SNDBUF,
-+ &optarg, sizeof(optarg));
-+
-+ optarg = MAXBUFFERSIZE;
-+ setsockopt(op->signal_recv_fd,
-+ SOL_SOCKET, SO_RCVBUF,
-+ &optarg, sizeof(optarg));
-+
-+ op->highestfd = -1;
-+ op->fdtodat = NULL;
-+ if (grow_fdset(op, 1) == -1)
-+ goto err_close_pair;
-+
-+ op->ptodat = malloc(sizeof(*op->ptodat) * op->max);
-+ if (op->ptodat == NULL)
-+ goto err_close_pair;
-+
-+ sigemptyset(&op->sigs);
-+ sigaddset(&op->sigs, SIGIO);
-+ sigaddset(&op->sigs, op->signo);
-+ sigprocmask(SIG_BLOCK, &op->sigs, NULL);
-+ set_sigaction(SIGIO);
-+ set_sigaction(op->signo);
-+
-+ event_set(&(op->sigfdev), op->signal_recv_fd, EV_READ|EV_PERSIST,
-+ donothing, NULL);
-+ op->sigfdev.ev_flags |= EVLIST_DONTDEL;
-+ dat = ev2dat(op, &(op->sigfdev), 1);
-+ poll_add(op, &(op->sigfdev), dat);
-+
-+ return (op);
-+
-+ err_close_pair:
-+ close(op->signal_recv_fd);
-+ close(signal_send_fd[op->signo - 1]);
-+
-+ err_free_poll:
-+ free(op->poll);
-+
-+ err_free_op:
-+ free(op);
-+ err:
-+ return (NULL);
-+}
++ pid = fork();
+
-+int
-+rtsig_add(void *arg, struct event *ev)
-+{
-+ struct rtsigop *op = (struct rtsigop *) arg;
-+ int flags, i;
-+ struct stat statbuf;
-+ struct rtdata *dat;
++ switch (pid) {
+
-+ if (ev->ev_events & EV_SIGNAL) {
-+ int signo = EVENT_SIGNAL(ev);
-+
-+ sigaddset(&op->sigs, EVENT_SIGNAL(ev));
-+ if (sigprocmask(SIG_BLOCK, &op->sigs, NULL) == -1)
-+ return (-1);
-+
-+ set_sigaction(signo);
-+
-+ signal_send_fd[signo - 1] = op->signal_send_fd;
-+ trouble[signo - 1] = 0;
-+
-+ return (0);
-+ }
++ case 0 :
++ fpm_child_resources_use(child);
++ fpm_globals.is_child = 1;
++ if (in_event_loop) {
++ fpm_event_exit_loop();
++ }
++ fpm_child_init(wp);
++ return 0;
+
-+ if (!(ev->ev_events & (EV_READ|EV_WRITE)))
-+ return (0);
-+
-+ if (-1 == fstat(ev->ev_fd, &statbuf))
-+ return (-1);
-+
-+ if (!S_ISSOCK(statbuf.st_mode))
-+ ev->ev_flags |= EVLIST_NONSOCK;
-+
-+ flags = fcntl(ev->ev_fd, F_GETFL);
-+ if (flags == -1)
-+ return (-1);
-+
-+ if (!(flags & O_ASYNC)) {
-+ if (fcntl(ev->ev_fd, F_SETSIG, op->signo) == -1 ||
-+ fcntl(ev->ev_fd, F_SETOWN, (int) gettid()) == -1)
-+ return (-1);
-+
-+ /*
-+ * the overhead of always handling writeable edges
-+ * isn't going to be that bad...
-+ */
-+ if (fcntl(ev->ev_fd, F_SETFL, flags | O_ASYNC|O_RDWR))
-+ return (-1);
-+ }
++ case -1 :
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fork() failed");
++ enough = 1;
+
-+#ifdef O_ONESIGFD
-+ /*
-+ * F_SETAUXFL and O_ONESIGFD are defined in a non-standard
-+ * linux kernel patch to coalesce events for fds
-+ */
-+ fcntl(ev->ev_fd, F_SETAUXFL, O_ONESIGFD);
-+#endif
++ fpm_resources_discard(child);
++
++ break; /* dont try any more on error */
+
-+ dat = ev2dat(op, ev, 1);
-+ if (dat == NULL)
-+ return (-1);
++ default :
++ child->pid = pid;
++ fpm_clock_get(&child->started);
++ fpm_parent_resources_use(child);
+
-+ op->total++;
-+ if (ev->ev_flags & EVLIST_NONSOCK)
-+ op->nonsock++;
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "child %d (pool %s) started", (int) pid, wp->config->name);
++ }
+
-+ if (poll_add(op, ev, dat) == -1) {
-+ /* must check the level of new fd's */
-+ i = errno;
-+ fcntl(ev->ev_fd, F_SETFL, flags);
-+ errno = i;
-+ return (-1);
+ }
+
-+ return (0);
++ return 1; /* we are done */
+}
+
-+int
-+rtsig_del(void *arg, struct event *ev)
++int fpm_children_create_initial(struct fpm_worker_pool_s *wp)
+{
-+ struct rtdata *dat;
-+ struct rtsigop *op = (struct rtsigop *) arg;
++ return fpm_children_make(wp, 0 /* not in event loop yet */);
++}
+
-+ if (ev->ev_events & EV_SIGNAL) {
-+ sigset_t sigs;
++int fpm_children_init_main()
++{
++ if (fpm_global_config.emergency_restart_threshold &&
++ fpm_global_config.emergency_restart_interval) {
+
-+ sigdelset(&op->sigs, EVENT_SIGNAL(ev));
-+
-+ sigemptyset(&sigs);
-+ sigaddset(&sigs, EVENT_SIGNAL(ev));
-+ return (sigprocmask(SIG_UNBLOCK, &sigs, NULL));
-+ }
++ last_faults = malloc(sizeof(time_t) * fpm_global_config.emergency_restart_threshold);
+
-+ if (!(ev->ev_events & (EV_READ|EV_WRITE)))
-+ return (0);
++ if (!last_faults) {
++ return -1;
++ }
+
-+ dat = ev2dat(op, ev, 0);
-+ poll_remove(op, ev, dat);
-+ dat_del(op, dat);
-+ op->total--;
-+ if (ev->ev_flags & EVLIST_NONSOCK)
-+ op->nonsock--;
++ memset(last_faults, 0, sizeof(time_t) * fpm_global_config.emergency_restart_threshold);
++ }
+
-+ return (0);
-+}
++ if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_children_cleanup, 0)) {
++ return -1;
++ }
+
-+int
-+rtsig_recalc(struct event_base *base, void *arg, int max)
-+{
-+ return (0);
++ return 0;
+}
+
-+/*
-+ * the following do_X functions implement the different stages of a single
-+ * eventloop pass: poll(), recv(sigsock), sigtimedwait()
-+ *
-+ * do_siginfo_dispatch() is a common factor to both do_sigwait() and
-+ * do_signals_from_socket().
-+ */
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_children.h php-src/sapi/fpm/fpm/fpm_children.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_children.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_children.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,33 @@
+
-+static inline int
-+do_poll(struct rtsigop *op, struct timespec *ts)
-+{
-+ int res = 0;
-+ int i = 0;
-+
-+ if (op->cur > 1) {
-+ /* non-empty poll set (modulo the signalfd) */
-+ if (op->nonsock) {
-+ int timeout = ts->tv_nsec / 1000000 + ts->tv_sec * 1000;
-+
-+ sigprocmask(SIG_UNBLOCK, &(op->sigs), NULL);
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ res = poll(op->poll, op->cur, timeout);
-+
-+ sigprocmask(SIG_BLOCK, &(op->sigs), NULL);
-+
-+ ts->tv_sec = 0;
-+ ts->tv_nsec = 0;
-+ } else {
-+ res = poll(op->poll, op->cur, 0);
-+ }
++#ifndef FPM_CHILDREN_H
++#define FPM_CHILDREN_H 1
+
-+ if (res < 0) {
-+ return (errno == EINTR ? 0 : -1);
-+ } else if (res) {
-+ ts->tv_sec = 0;
-+ ts->tv_nsec = 0;
-+ }
++#include <sys/time.h>
++#include <sys/types.h>
++#include <event.h>
+
-+ i = 0;
-+ while (i < op->cur) {
-+ struct rtdata *dat = op->ptodat[i];
-+ struct event *ev = dat->ev;
++#include "fpm_worker_pool.h"
+
-+ if (op->poll[i].revents) {
-+ int flags = 0;
-+
-+ if (op->poll[i].revents & (POLLIN | POLLERR))
-+ flags |= EV_READ;
-+
-+ if (op->poll[i].revents & POLLOUT)
-+ flags |= EV_WRITE;
-+
-+ if (!(ev->ev_events & EV_PERSIST)) {
-+ poll_remove(op, ev, op->ptodat[i]);
-+ event_del(ev);
-+ } else {
-+ i++;
-+ }
-+
-+ event_active(ev, flags, 1);
-+ } else {
-+ if (ev->ev_flags & (EVLIST_NONSOCK|EVLIST_DONTDEL)) {
-+ i++;
-+ } else {
-+ poll_remove(op, ev, op->ptodat[i]);
-+ }
-+ }
-+ }
-+ }
-+ return (res);
-+}
++int fpm_children_create_initial(struct fpm_worker_pool_s *wp);
++int fpm_children_free(struct fpm_child_s *child);
++void fpm_children_bury();
++int fpm_children_init_main();
+
-+static inline int
-+do_siginfo_dispatch(struct event_base *base, struct rtsigop *op,
-+ siginfo_t *info)
-+{
-+ int signum;
-+ struct rtdata *dat, *next_dat;
-+ struct event *ev, *next_ev;
-+
-+ if (info == NULL)
-+ return (-1);
-+
-+ signum = info->si_signo;
-+ if (signum == op->signo) {
-+ int flags, sigok = 0;
-+ flags = 0;
-+
-+ if (info->si_band & (POLLIN|POLLERR))
-+ flags |= EV_READ;
-+ if (info->si_band & POLLOUT)
-+ flags |= EV_WRITE;
-+
-+ if (!flags)
-+ return (0);
-+
-+ if (info->si_fd > op->highestfd)
-+ return (-1);
-+
-+ dat = TAILQ_FIRST(op->fdtodat[info->si_fd]);
-+ while (dat != TAILQ_END(op->fdtodat[info->si_fd])) {
-+ next_dat = TAILQ_NEXT(dat, next);
-+ if (flags & dat->ev->ev_events) {
-+ ev = dat->ev;
-+ poll_add(op, ev, dat);
-+ activate(ev, flags & ev->ev_events);
-+ sigok = 1;
-+ }
-+ dat = next_dat;
-+ }
-+ } else if (signum == SIGIO) {
-+ TAILQ_FOREACH(ev, &base->eventqueue, ev_next) {
-+ if (ev->ev_events & (EV_READ|EV_WRITE))
-+ poll_add(op, ev, NULL);
-+ }
-+ return (1); /* 1 means the caller should poll() again */
-+
-+ } else if (sigismember(&op->sigs, signum)) {
-+ /* managed signals are queued */
-+ ev = TAILQ_FIRST(&signalqueue);
-+ while (ev != TAILQ_END(&signalqueue)) {
-+ next_ev = TAILQ_NEXT(ev, ev_signal_next);
-+ if (EVENT_SIGNAL(ev) == signum)
-+ activate(ev, EV_SIGNAL);
-+ ev = next_ev;
-+ }
-+ } else {
-+ /* dispatch unmanaged signals immediately */
-+ struct sigaction sa;
-+ if (sigaction(signum, NULL, &sa) == 0) {
-+ if ((sa.sa_flags & SA_SIGINFO) && sa.sa_sigaction) {
-+ (*sa.sa_sigaction)(signum, info, NULL);
-+ } else if (sa.sa_handler) {
-+ if ((int)sa.sa_handler != 1)
-+ (*sa.sa_handler)(signum);
-+ } else {
-+ if (signum != SIGCHLD) {
-+ /* non-blocked SIG_DFL */
-+ kill(gettid(), signum);
-+ }
-+ }
-+ }
-+ }
++struct fpm_child_s;
+
-+ return (0);
-+}
++struct fpm_child_s {
++ struct fpm_child_s *prev, *next;
++ struct timeval started;
++ struct fpm_worker_pool_s *wp;
++ struct event ev_stdout, ev_stderr;
++ int shm_slot_i;
++ int fd_stdout, fd_stderr;
++ void (*tracer)(struct fpm_child_s *);
++ struct timeval slow_logged;
++ pid_t pid;
++};
+
-+/*
-+ * return 1 if we should poll again
-+ * return 0 if we are all set
-+ * return -1 on error
-+ */
-+static inline int
-+do_sigwait(struct event_base *base, struct rtsigop *op, struct timespec *ts,
-+ sigset_t *sigs)
-+{
-+ for (;;) {
-+ siginfo_t info;
-+ int signum;
++#endif
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_cleanup.c php-src/sapi/fpm/fpm/fpm_cleanup.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_cleanup.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_cleanup.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,51 @@
+
-+ signum = sigtimedwait(sigs, &info, ts);
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ ts->tv_sec = 0;
-+ ts->tv_nsec = 0;
++#include "fpm_config.h"
+
-+ if (signum == -1) {
-+ if (errno == EAGAIN || errno == EINTR)
-+ return (0);
-+ return (-1);
-+ } else if (1 == do_siginfo_dispatch(base, op, &info)) {
-+ return (1);
-+ }
-+ }
++#include <stdlib.h>
+
-+ /* NOTREACHED */
-+}
++#include "fpm_arrays.h"
++#include "fpm_cleanup.h"
++#include "zlog.h"
+
-+static inline int
-+do_signals_from_socket(struct event_base *base, struct rtsigop *op,
-+ struct timespec *ts)
-+{
-+ int fd = op->signal_recv_fd;
-+ siginfo_t info;
-+ int res;
++struct cleanup_s {
++ int type;
++ void (*cleanup)(int, void *);
++ void *arg;
++};
+
-+ for (;;) {
-+ res = recv(fd, &info, sizeof(info), MSG_NOSIGNAL);
-+ if (res == -1) {
-+ if (errno == EAGAIN)
-+ return (0);
-+ if (errno == EINTR)
-+ continue;
-+ return (-1);
-+ } else {
-+ ts->tv_sec = 0;
-+ ts->tv_nsec = 0;
-+ if (1 == do_siginfo_dispatch(base, op, &info))
-+ return (1);
-+ }
-+ }
-+ /* NOTREACHED */
-+}
++static struct fpm_array_s cleanups = { .sz = sizeof(struct cleanup_s) };
+
-+int
-+rtsig_dispatch(struct event_base *base, void *arg, struct timeval *tv)
++int fpm_cleanup_add(int type, void (*cleanup)(int, void *), void *arg)
+{
-+ struct rtsigop *op = (struct rtsigop *) arg;
-+ struct timespec ts;
-+ int res;
-+ sigset_t sigs;
++ struct cleanup_s *c;
+
-+ ts.tv_sec = tv->tv_sec;
-+ ts.tv_nsec = tv->tv_usec * 1000;
++ c = fpm_array_push(&cleanups);
+
-+ poll_for_level:
-+ res = do_poll(op, &ts); /* ts can be modified in do_XXX() */
++ if (!c) {
++ return -1;
++ }
+
-+ res = do_signals_from_socket(base, op, &ts);
-+ if (res == 1)
-+ goto poll_for_level;
-+ else if (res == -1)
-+ return (-1);
++ c->type = type;
++ c->cleanup = cleanup;
++ c->arg = arg;
+
-+ /*
-+ * the mask = managed_signals | unblocked-signals
-+ * MM - if this is not blocking do we need to cast the net this wide?
-+ */
-+ sigemptyset(&sigs);
-+ sigprocmask(SIG_BLOCK, &sigs, &sigs);
-+ signotset(&sigs);
-+ sigorset(&sigs, &sigs, &op->sigs);
++ return 0;
++}
+
-+ res = do_sigwait(base, op, &ts, &sigs);
++void fpm_cleanups_run(int type)
++{
++ struct cleanup_s *c = fpm_array_item_last(&cleanups);
++ int cl = cleanups.used;
+
-+ if (res == 1)
-+ goto poll_for_level;
-+ else if (res == -1)
-+ return (-1);
++ for ( ; cl--; c--) {
++ if (c->type & type) {
++ c->cleanup(type, c->arg);
++ }
++ }
+
-+ return (0);
++ fpm_array_free(&cleanups);
+}
+
-diff -Nru php-5.2.4.vanilla/libevent/select.c php-5.2.4.fpm/libevent/select.c
---- php-5.2.4.vanilla/libevent/select.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/select.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,370 @@
-+/* $OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */
-+
-+/*
-+ * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <sys/types.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#else
-+#include <sys/_time.h>
-+#endif
-+#include <sys/queue.h>
-+#include <sys/tree.h>
-+#include <signal.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#ifdef CHECK_INVARIANTS
-+#include <assert.h>
-+#endif
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_cleanup.h php-src/sapi/fpm/fpm/fpm_cleanup.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_cleanup.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_cleanup.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,21 @@
+
-+#include "event.h"
-+#include "event-internal.h"
-+#include "evsignal.h"
-+#include "log.h"
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+#ifndef howmany
-+#define howmany(x, y) (((x)+((y)-1))/(y))
-+#endif
++#ifndef FPM_CLEANUP_H
++#define FPM_CLEANUP_H 1
+
-+struct selectop {
-+ int event_fds; /* Highest fd in fd set */
-+ int event_fdsz;
-+ fd_set *event_readset_in;
-+ fd_set *event_writeset_in;
-+ fd_set *event_readset_out;
-+ fd_set *event_writeset_out;
-+ struct event **event_r_by_fd;
-+ struct event **event_w_by_fd;
-+};
++int fpm_cleanup_add(int type, void (*cleanup)(int, void *), void *);
++void fpm_cleanups_run(int type);
+
-+void *select_init (struct event_base *);
-+int select_add (void *, struct event *);
-+int select_del (void *, struct event *);
-+int select_recalc (struct event_base *, void *, int);
-+int select_dispatch (struct event_base *, void *, struct timeval *);
-+void select_dealloc (struct event_base *, void *);
-+
-+const struct eventop selectops = {
-+ "select",
-+ select_init,
-+ select_add,
-+ select_del,
-+ select_recalc,
-+ select_dispatch,
-+ select_dealloc
++enum {
++ FPM_CLEANUP_CHILD = (1 << 0),
++ FPM_CLEANUP_PARENT_EXIT = (1 << 1),
++ FPM_CLEANUP_PARENT_EXIT_MAIN = (1 << 2),
++ FPM_CLEANUP_PARENT_EXEC = (1 << 3),
++ FPM_CLEANUP_PARENT = (1 << 1) | (1 << 2) | (1 << 3),
++ FPM_CLEANUP_ALL = ~0,
+};
+
-+static int select_resize(struct selectop *sop, int fdsz);
-+
-+void *
-+select_init(struct event_base *base)
-+{
-+ struct selectop *sop;
-+
-+ /* Disable select when this environment variable is set */
-+ if (getenv("EVENT_NOSELECT"))
-+ return (NULL);
-+
-+ if (!(sop = calloc(1, sizeof(struct selectop))))
-+ return (NULL);
-+
-+ select_resize(sop, howmany(32 + 1, NFDBITS)*sizeof(fd_mask));
++#endif
+
-+ evsignal_init(base);
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_clock.c php-src/sapi/fpm/fpm/fpm_clock.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_clock.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_clock.c 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,115 @@
+
-+ return (sop);
-+}
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+#ifdef CHECK_INVARIANTS
-+static void
-+check_selectop(struct selectop *sop)
-+{
-+ int i;
-+ for (i = 0; i <= sop->event_fds; ++i) {
-+ if (FD_ISSET(i, sop->event_readset_in)) {
-+ assert(sop->event_r_by_fd[i]);
-+ assert(sop->event_r_by_fd[i]->ev_events & EV_READ);
-+ assert(sop->event_r_by_fd[i]->ev_fd == i);
-+ } else {
-+ assert(! sop->event_r_by_fd[i]);
-+ }
-+ if (FD_ISSET(i, sop->event_writeset_in)) {
-+ assert(sop->event_w_by_fd[i]);
-+ assert(sop->event_w_by_fd[i]->ev_events & EV_WRITE);
-+ assert(sop->event_w_by_fd[i]->ev_fd == i);
-+ } else {
-+ assert(! sop->event_w_by_fd[i]);
-+ }
-+ }
++#include "fpm_config.h"
+
-+}
-+#else
-+#define check_selectop(sop) do { (void) sop; } while (0)
++#if defined(HAVE_CLOCK_GETTIME)
++#include <time.h> /* for CLOCK_MONOTONIC */
+#endif
+
-+/*
-+ * Called with the highest fd that we know about. If it is 0, completely
-+ * recalculate everything.
-+ */
++#include "fpm_clock.h"
++#include "zlog.h"
+
-+int
-+select_recalc(struct event_base *base, void *arg, int max)
-+{
-+ struct selectop *sop = arg;
+
-+ check_selectop(sop);
++/* posix monotonic clock - preferred source of time */
++#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
+
-+ return (0);
-+}
++static int monotonic_works;
+
-+int
-+select_dispatch(struct event_base *base, void *arg, struct timeval *tv)
++int fpm_clock_init()
+{
-+ int res, i;
-+ struct selectop *sop = arg;
++ struct timespec ts;
+
-+ check_selectop(sop);
++ monotonic_works = 0;
+
-+ memcpy(sop->event_readset_out, sop->event_readset_in,
-+ sop->event_fdsz);
-+ memcpy(sop->event_writeset_out, sop->event_writeset_in,
-+ sop->event_fdsz);
++ if (0 == clock_gettime(CLOCK_MONOTONIC, &ts)) {
++ monotonic_works = 1;
++ }
+
-+ res = select(sop->event_fds + 1, sop->event_readset_out,
-+ sop->event_writeset_out, NULL, tv);
++ return 0;
++}
+
-+ check_selectop(sop);
++int fpm_clock_get(struct timeval *tv)
++{
++ if (monotonic_works) {
++ struct timespec ts;
+
-+ if (res == -1) {
-+ if (errno != EINTR) {
-+ event_warn("select");
-+ return (-1);
++ if (0 > clock_gettime(CLOCK_MONOTONIC, &ts)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "clock_gettime() failed");
++ return -1;
+ }
+
-+ evsignal_process(base);
-+ return (0);
-+ } else if (base->sig.evsignal_caught) {
-+ evsignal_process(base);
++ tv->tv_sec = ts.tv_sec;
++ tv->tv_usec = ts.tv_nsec / 1000;
++ return 0;
+ }
+
-+ event_debug(("%s: select reports %d", __func__, res));
++ return gettimeofday(tv, 0);
++}
+
-+ check_selectop(sop);
-+ for (i = 0; i <= sop->event_fds; ++i) {
-+ struct event *r_ev = NULL, *w_ev = NULL;
-+ res = 0;
-+ if (FD_ISSET(i, sop->event_readset_out)) {
-+ r_ev = sop->event_r_by_fd[i];
-+ res |= EV_READ;
-+ }
-+ if (FD_ISSET(i, sop->event_writeset_out)) {
-+ w_ev = sop->event_w_by_fd[i];
-+ res |= EV_WRITE;
-+ }
-+ if (r_ev && (res & r_ev->ev_events)) {
-+ if (!(r_ev->ev_events & EV_PERSIST))
-+ event_del(r_ev);
-+ event_active(r_ev, res & r_ev->ev_events, 1);
-+ }
-+ if (w_ev && w_ev != r_ev && (res & w_ev->ev_events)) {
-+ if (!(w_ev->ev_events & EV_PERSIST))
-+ event_del(w_ev);
-+ event_active(w_ev, res & w_ev->ev_events, 1);
-+ }
-+ }
-+ check_selectop(sop);
++/* macosx clock */
++#elif defined(HAVE_CLOCK_GET_TIME)
+
-+ return (0);
-+}
++#include <mach/mach.h>
++#include <mach/clock.h>
++#include <mach/mach_error.h>
+
++static clock_serv_t mach_clock;
+
-+static int
-+select_resize(struct selectop *sop, int fdsz)
++/* this code borrowed from here: http://lists.apple.com/archives/Darwin-development/2002/Mar/msg00746.html */
++/* mach_clock also should be re-initialized in child process after fork */
++int fpm_clock_init()
+{
-+ int n_events, n_events_old;
-+
-+ fd_set *readset_in = NULL;
-+ fd_set *writeset_in = NULL;
-+ fd_set *readset_out = NULL;
-+ fd_set *writeset_out = NULL;
-+ struct event **r_by_fd = NULL;
-+ struct event **w_by_fd = NULL;
-+
-+ n_events = (fdsz/sizeof(fd_mask)) * NFDBITS;
-+ n_events_old = (sop->event_fdsz/sizeof(fd_mask)) * NFDBITS;
-+
-+ if (sop->event_readset_in)
-+ check_selectop(sop);
-+
-+ if ((readset_in = realloc(sop->event_readset_in, fdsz)) == NULL)
-+ goto error;
-+ sop->event_readset_in = readset_in;
-+ if ((readset_out = realloc(sop->event_readset_out, fdsz)) == NULL)
-+ goto error;
-+ sop->event_readset_out = readset_out;
-+ if ((writeset_in = realloc(sop->event_writeset_in, fdsz)) == NULL)
-+ goto error;
-+ sop->event_writeset_in = writeset_in;
-+ if ((writeset_out = realloc(sop->event_writeset_out, fdsz)) == NULL)
-+ goto error;
-+ sop->event_writeset_out = writeset_out;
-+ if ((r_by_fd = realloc(sop->event_r_by_fd,
-+ n_events*sizeof(struct event*))) == NULL)
-+ goto error;
-+ sop->event_r_by_fd = r_by_fd;
-+ if ((w_by_fd = realloc(sop->event_w_by_fd,
-+ n_events * sizeof(struct event*))) == NULL)
-+ goto error;
-+ sop->event_w_by_fd = w_by_fd;
-+
-+ memset((char *)sop->event_readset_in + sop->event_fdsz, 0,
-+ fdsz - sop->event_fdsz);
-+ memset((char *)sop->event_writeset_in + sop->event_fdsz, 0,
-+ fdsz - sop->event_fdsz);
-+ memset(sop->event_r_by_fd + n_events_old, 0,
-+ (n_events-n_events_old) * sizeof(struct event*));
-+ memset(sop->event_w_by_fd + n_events_old, 0,
-+ (n_events-n_events_old) * sizeof(struct event*));
-+
-+ sop->event_fdsz = fdsz;
-+ check_selectop(sop);
-+
-+ return (0);
-+
-+ error:
-+ event_warn("malloc");
-+ return (-1);
-+}
++ kern_return_t ret;
++ mach_timespec_t aTime;
+
++ ret = host_get_clock_service(mach_host_self(), REALTIME_CLOCK, &mach_clock);
+
-+int
-+select_add(void *arg, struct event *ev)
-+{
-+ struct selectop *sop = arg;
++ if (ret != KERN_SUCCESS) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "host_get_clock_service() failed: %s", mach_error_string(ret));
++ return -1;
++ }
+
-+ if (ev->ev_events & EV_SIGNAL)
-+ return (evsignal_add(ev));
++ /* test if it works */
++ ret = clock_get_time(mach_clock, &aTime);
+
-+ check_selectop(sop);
-+ /*
-+ * Keep track of the highest fd, so that we can calculate the size
-+ * of the fd_sets for select(2)
-+ */
-+ if (sop->event_fds < ev->ev_fd) {
-+ int fdsz = sop->event_fdsz;
++ if (ret != KERN_SUCCESS) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "clock_get_time() failed: %s", mach_error_string(ret));
++ return -1;
++ }
+
-+ if (fdsz < sizeof(fd_mask))
-+ fdsz = sizeof(fd_mask);
++ return 0;
++}
+
-+ while (fdsz <
-+ (howmany(ev->ev_fd + 1, NFDBITS) * sizeof(fd_mask)))
-+ fdsz *= 2;
++int fpm_clock_get(struct timeval *tv)
++{
++ kern_return_t ret;
++ mach_timespec_t aTime;
+
-+ if (fdsz != sop->event_fdsz) {
-+ if (select_resize(sop, fdsz)) {
-+ check_selectop(sop);
-+ return (-1);
-+ }
-+ }
++ ret = clock_get_time(mach_clock, &aTime);
+
-+ sop->event_fds = ev->ev_fd;
++ if (ret != KERN_SUCCESS) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "clock_get_time() failed: %s", mach_error_string(ret));
++ return -1;
+ }
+
-+ if (ev->ev_events & EV_READ) {
-+ FD_SET(ev->ev_fd, sop->event_readset_in);
-+ sop->event_r_by_fd[ev->ev_fd] = ev;
-+ }
-+ if (ev->ev_events & EV_WRITE) {
-+ FD_SET(ev->ev_fd, sop->event_writeset_in);
-+ sop->event_w_by_fd[ev->ev_fd] = ev;
-+ }
-+ check_selectop(sop);
++ tv->tv_sec = aTime.tv_sec;
++ tv->tv_usec = aTime.tv_nsec / 1000;
+
-+ return (0);
++ return 0;
+}
+
-+/*
-+ * Nothing to be done here.
-+ */
++#else /* no clock */
+
-+int
-+select_del(void *arg, struct event *ev)
++int fpm_clock_init()
+{
-+ struct selectop *sop = arg;
++ return 0;
++}
+
-+ check_selectop(sop);
-+ if (ev->ev_events & EV_SIGNAL)
-+ return (evsignal_del(ev));
++int fpm_clock_get(struct timeval *tv)
++{
++ return gettimeofday(tv, 0);
++}
+
-+ if (sop->event_fds < ev->ev_fd) {
-+ check_selectop(sop);
-+ return (0);
-+ }
++#endif
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_clock.h php-src/sapi/fpm/fpm/fpm_clock.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_clock.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_clock.h 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,13 @@
+
-+ if (ev->ev_events & EV_READ) {
-+ FD_CLR(ev->ev_fd, sop->event_readset_in);
-+ sop->event_r_by_fd[ev->ev_fd] = NULL;
-+ }
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ if (ev->ev_events & EV_WRITE) {
-+ FD_CLR(ev->ev_fd, sop->event_writeset_in);
-+ sop->event_w_by_fd[ev->ev_fd] = NULL;
-+ }
++#ifndef FPM_CLOCK_H
++#define FPM_CLOCK_H 1
+
-+ check_selectop(sop);
-+ return (0);
-+}
++#include <sys/time.h>
+
-+void
-+select_dealloc(struct event_base *base, void *arg)
-+{
-+ struct selectop *sop = arg;
-+
-+ evsignal_dealloc(base);
-+ if (sop->event_readset_in)
-+ free(sop->event_readset_in);
-+ if (sop->event_writeset_in)
-+ free(sop->event_writeset_in);
-+ if (sop->event_readset_out)
-+ free(sop->event_readset_out);
-+ if (sop->event_writeset_out)
-+ free(sop->event_writeset_out);
-+ if (sop->event_r_by_fd)
-+ free(sop->event_r_by_fd);
-+ if (sop->event_w_by_fd)
-+ free(sop->event_w_by_fd);
-+
-+ memset(sop, 0, sizeof(struct selectop));
-+ free(sop);
-+}
-diff -Nru php-5.2.4.vanilla/libevent/signal.c php-5.2.4.fpm/libevent/signal.c
---- php-5.2.4.vanilla/libevent/signal.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/signal.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,195 @@
-+/* $OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */
++int fpm_clock_init();
++int fpm_clock_get(struct timeval *tv);
+
-+/*
-+ * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
+#endif
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_conf.c php-src/sapi/fpm/fpm/fpm_conf.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_conf.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_conf.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,537 @@
++
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
++
++#include "fpm_config.h"
+
+#include <sys/types.h>
-+#include <sys/tree.h>
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <string.h>
++#include <stdlib.h>
++#include <stddef.h>
++#if HAVE_INTTYPES_H
++#include <inttypes.h>
+#else
-+#include <sys/_time.h>
++#include <stdint.h>
+#endif
-+#include <sys/queue.h>
-+#include <sys/socket.h>
-+#include <signal.h>
++
+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
+#include <unistd.h>
-+#include <errno.h>
-+#ifdef HAVE_FCNTL_H
-+#include <fcntl.h>
-+#endif
-+#include <assert.h>
+
-+#include "event.h"
-+#include "event-internal.h"
-+#include "evsignal.h"
-+#include "log.h"
++#include "fpm.h"
++#include "fpm_conf.h"
++#include "fpm_stdio.h"
++#include "fpm_worker_pool.h"
++#include "fpm_cleanup.h"
++#include "fpm_php.h"
++#include "fpm_sockets.h"
++#include "xml_config.h"
++#include "zlog.h"
+
-+struct event_base *evsignal_base = NULL;
+
-+static void evsignal_handler(int sig);
++struct fpm_global_config_s fpm_global_config;
+
-+/* Callback for when the signal handler write a byte to our signaling socket */
-+static void
-+evsignal_cb(int fd, short what, void *arg)
++static void *fpm_global_config_ptr()
+{
-+ static char signals[100];
-+ struct event *ev = arg;
-+ ssize_t n;
-+
-+ n = read(fd, signals, sizeof(signals));
-+ if (n == -1)
-+ event_err(1, "%s: read", __func__);
-+ event_add(ev, NULL);
++ return &fpm_global_config;
+}
+
-+#ifdef HAVE_SETFD
-+#define FD_CLOSEONEXEC(x) do { \
-+ if (fcntl(x, F_SETFD, 1) == -1) \
-+ event_warn("fcntl(%d, F_SETFD)", x); \
-+} while (0)
-+#else
-+#define FD_CLOSEONEXEC(x)
-+#endif
-+
-+void
-+evsignal_init(struct event_base *base)
++static char *fpm_conf_set_log_level(void **conf, char *name, void *vv, intptr_t offset)
+{
-+ /*
-+ * Our signal handler is going to write to one end of the socket
-+ * pair to wake up our event loop. The event loop then scans for
-+ * signals that got delivered.
-+ */
-+ if (socketpair(AF_UNIX, SOCK_STREAM, 0, base->sig.ev_signal_pair) == -1)
-+ event_err(1, "%s: socketpair", __func__);
-+
-+ FD_CLOSEONEXEC(base->sig.ev_signal_pair[0]);
-+ FD_CLOSEONEXEC(base->sig.ev_signal_pair[1]);
-+ base->sig.evsignal_caught = 0;
-+ memset(&base->sig.evsigcaught, 0, sizeof(sig_atomic_t)*NSIG);
++ char *value = vv;
+
-+ fcntl(base->sig.ev_signal_pair[0], F_SETFL, O_NONBLOCK);
++ if (!strcmp(value, "debug")) {
++ fpm_globals.log_level = ZLOG_DEBUG;
++ }
++ else if (!strcmp(value, "notice")) {
++ fpm_globals.log_level = ZLOG_NOTICE;
++ }
++ else if (!strcmp(value, "warn")) {
++ fpm_globals.log_level = ZLOG_WARNING;
++ }
++ else if (!strcmp(value, "error")) {
++ fpm_globals.log_level = ZLOG_ERROR;
++ }
++ else if (!strcmp(value, "alert")) {
++ fpm_globals.log_level = ZLOG_ALERT;
++ }
++ else {
++ return "invalid value for 'log_level'";
++ }
+
-+ event_set(&base->sig.ev_signal, base->sig.ev_signal_pair[1], EV_READ,
-+ evsignal_cb, &base->sig.ev_signal);
-+ base->sig.ev_signal.ev_base = base;
-+ base->sig.ev_signal.ev_flags |= EVLIST_INTERNAL;
++ return NULL;
+}
+
-+int
-+evsignal_add(struct event *ev)
-+{
-+ int evsignal;
-+ struct sigaction sa;
-+ struct event_base *base = ev->ev_base;
-+
-+ if (ev->ev_events & (EV_READ|EV_WRITE))
-+ event_errx(1, "%s: EV_SIGNAL incompatible use", __func__);
-+ evsignal = EVENT_SIGNAL(ev);
-+
-+ memset(&sa, 0, sizeof(sa));
-+ sa.sa_handler = evsignal_handler;
-+ sigfillset(&sa.sa_mask);
-+ sa.sa_flags |= SA_RESTART;
-+ /* catch signals if they happen quickly */
-+ evsignal_base = base;
-+
-+ if (sigaction(evsignal, &sa, NULL) == -1)
-+ return (-1);
-+
-+ if (!base->sig.ev_signal_added) {
-+ base->sig.ev_signal_added = 1;
-+ event_add(&base->sig.ev_signal, NULL);
++static struct xml_conf_section xml_section_fpm_global_options = {
++ .conf = &fpm_global_config_ptr,
++ .path = "/configuration/global_options",
++ .parsers = (struct xml_value_parser []) {
++ { XML_CONF_SCALAR, "emergency_restart_threshold", &xml_conf_set_slot_integer, offsetof(struct fpm_global_config_s, emergency_restart_threshold) },
++ { XML_CONF_SCALAR, "emergency_restart_interval", &xml_conf_set_slot_time, offsetof(struct fpm_global_config_s, emergency_restart_interval) },
++ { XML_CONF_SCALAR, "process_control_timeout", &xml_conf_set_slot_time, offsetof(struct fpm_global_config_s, process_control_timeout) },
++ { XML_CONF_SCALAR, "daemonize", &xml_conf_set_slot_boolean, offsetof(struct fpm_global_config_s, daemonize) },
++ { XML_CONF_SCALAR, "pid_file", &xml_conf_set_slot_string, offsetof(struct fpm_global_config_s, pid_file) },
++ { XML_CONF_SCALAR, "error_log", &xml_conf_set_slot_string, offsetof(struct fpm_global_config_s, error_log) },
++ { XML_CONF_SCALAR, "log_level", &fpm_conf_set_log_level, 0 },
++ { 0, 0, 0, 0 }
+ }
++};
+
-+ return (0);
-+}
-+
-+int
-+evsignal_del(struct event *ev)
++static char *fpm_conf_set_pm_style(void **conf, char *name, void *vv, intptr_t offset)
+{
-+ return (sigaction(EVENT_SIGNAL(ev),(struct sigaction *)SIG_DFL, NULL));
++ char *value = vv;
++ struct fpm_pm_s *c = *conf;
++
++ if (!strcmp(value, "static")) {
++ c->style = PM_STYLE_STATIC;
++ }
++ else if (!strcmp(value, "apache-like")) {
++ c->style = PM_STYLE_APACHE_LIKE;
++ }
++ else {
++ return "invalid value for 'style'";
++ }
++
++ return NULL;
+}
+
-+static void
-+evsignal_handler(int sig)
++static char *fpm_conf_set_rlimit_core(void **conf, char *name, void *vv, intptr_t offset)
+{
-+ int save_errno = errno;
++ char *value = vv;
++ struct fpm_worker_pool_config_s *c = *conf;
+
-+ if(evsignal_base == NULL) {
-+ event_warn(
-+ "%s: received signal %s, but have no base configured",
-+ __func__, sig);
-+ return;
++ if (!strcmp(value, "unlimited")) {
++ c->rlimit_core = -1;
+ }
++ else {
++ int int_value;
++ void *subconf = &int_value;
++ char *error;
+
-+ evsignal_base->sig.evsigcaught[sig]++;
-+ evsignal_base->sig.evsignal_caught = 1;
++ error = xml_conf_set_slot_integer(&subconf, name, vv, 0);
+
-+ /* Wake up our notification mechanism */
-+ write(evsignal_base->sig.ev_signal_pair[0], "a", 1);
-+ errno = save_errno;
-+}
++ if (error) { return error; }
+
-+void
-+evsignal_process(struct event_base *base)
-+{
-+ struct event *ev;
-+ sig_atomic_t ncalls;
-+
-+ base->sig.evsignal_caught = 0;
-+ TAILQ_FOREACH(ev, &base->sig.signalqueue, ev_signal_next) {
-+ ncalls = base->sig.evsigcaught[EVENT_SIGNAL(ev)];
-+ if (ncalls) {
-+ if (!(ev->ev_events & EV_PERSIST))
-+ event_del(ev);
-+ event_active(ev, EV_SIGNAL, ncalls);
-+ base->sig.evsigcaught[EVENT_SIGNAL(ev)] = 0;
-+ }
-+ }
-+}
++ if (int_value < 0) { return "invalid value for 'rlimit_core'"; }
+
-+void
-+evsignal_dealloc(struct event_base *base)
-+{
-+ if(base->sig.ev_signal_added) {
-+ event_del(&base->sig.ev_signal);
-+ base->sig.ev_signal_added = 0;
++ c->rlimit_core = int_value;
+ }
-+ assert(TAILQ_EMPTY(&base->sig.signalqueue));
+
-+ close(base->sig.ev_signal_pair[0]);
-+ base->sig.ev_signal_pair[0] = -1;
-+ close(base->sig.ev_signal_pair[1]);
-+ base->sig.ev_signal_pair[1] = -1;
++ return NULL;
+}
-diff -Nru php-5.2.4.vanilla/libevent/stamp-h.in php-5.2.4.fpm/libevent/stamp-h.in
---- php-5.2.4.vanilla/libevent/stamp-h.in 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/stamp-h.in 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1 @@
-+timestamp
-diff -Nru php-5.2.4.vanilla/libevent/strlcpy.c php-5.2.4.fpm/libevent/strlcpy.c
---- php-5.2.4.vanilla/libevent/strlcpy.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/strlcpy.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,76 @@
-+/* $OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $ */
+
-+/*
-+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ * derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
++static char *fpm_conf_set_catch_workers_output(void **conf, char *name, void *vv, intptr_t offset)
++{
++ struct fpm_worker_pool_config_s *c = *conf;
++ int int_value;
++ void *subconf = &int_value;
++ char *error;
+
-+#if defined(LIBC_SCCS) && !defined(lint)
-+static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $";
-+#endif /* LIBC_SCCS and not lint */
++ error = xml_conf_set_slot_boolean(&subconf, name, vv, 0);
+
-+#include <sys/types.h>
++ if (error) { return error; }
+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif /* HAVE_CONFIG_H */
++ c->catch_workers_output = int_value;
+
-+#ifndef HAVE_STRLCPY
-+#include "strlcpy-internal.h"
++ return NULL;
++}
+
-+/*
-+ * Copy src to string dst of size siz. At most siz-1 characters
-+ * will be copied. Always NUL terminates (unless siz == 0).
-+ * Returns strlen(src); if retval >= siz, truncation occurred.
-+ */
-+size_t
-+_event_strlcpy(dst, src, siz)
-+ char *dst;
-+ const char *src;
-+ size_t siz;
++static struct xml_conf_section fpm_conf_set_apache_like_subsection_conf = {
++ .path = "apache_like somewhere", /* fixme */
++ .parsers = (struct xml_value_parser []) {
++ { XML_CONF_SCALAR, "StartServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.StartServers) },
++ { XML_CONF_SCALAR, "MinSpareServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.MinSpareServers) },
++ { XML_CONF_SCALAR, "MaxSpareServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.MaxSpareServers) },
++ { 0, 0, 0, 0 }
++ }
++};
++
++static char *fpm_conf_set_apache_like_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
+{
-+ register char *d = dst;
-+ register const char *s = src;
-+ register size_t n = siz;
++ return xml_conf_parse_section(conf, &fpm_conf_set_apache_like_subsection_conf, xml_node);
++}
+
-+ /* Copy as many bytes as will fit */
-+ if (n != 0 && --n != 0) {
-+ do {
-+ if ((*d++ = *s++) == 0)
-+ break;
-+ } while (--n != 0);
++static struct xml_conf_section fpm_conf_set_listen_options_subsection_conf = {
++ .path = "listen options somewhere", /* fixme */
++ .parsers = (struct xml_value_parser []) {
++ { XML_CONF_SCALAR, "backlog", &xml_conf_set_slot_integer, offsetof(struct fpm_listen_options_s, backlog) },
++ { XML_CONF_SCALAR, "owner", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, owner) },
++ { XML_CONF_SCALAR, "group", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, group) },
++ { XML_CONF_SCALAR, "mode", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, mode) },
++ { 0, 0, 0, 0 }
+ }
++};
++
++static char *fpm_conf_set_listen_options_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
++{
++ void *subconf = (char *) *conf + offset;
++ struct fpm_listen_options_s *lo;
++
++ lo = malloc(sizeof(*lo));
+
-+ /* Not enough room in dst, add NUL and traverse rest of src */
-+ if (n == 0) {
-+ if (siz != 0)
-+ *d = '\0'; /* NUL-terminate dst */
-+ while (*s++)
-+ ;
++ if (!lo) {
++ return "malloc() failed";
+ }
+
-+ return(s - src - 1); /* count does not include NUL */
-+}
-+#endif
-diff -Nru php-5.2.4.vanilla/libevent/strlcpy-internal.h php-5.2.4.fpm/libevent/strlcpy-internal.h
---- php-5.2.4.vanilla/libevent/strlcpy-internal.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/libevent/strlcpy-internal.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,23 @@
-+#ifndef _STRLCPY_INTERNAL_H_
-+#define _STRLCPY_INTERNAL_H_
++ memset(lo, 0, sizeof(*lo));
+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
++ lo->backlog = -1;
+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif /* HAVE_CONFIG_H */
++ * (struct fpm_listen_options_s **) subconf = lo;
+
-+#ifndef HAVE_STRLCPY
-+#include <string.h>
-+size_t _event_strlcpy(char *dst, const char *src, size_t siz);
-+#define strlcpy _event_strlcpy
-+#endif
++ subconf = lo;
+
-+#ifdef __cplusplus
++ return xml_conf_parse_section(&subconf, &fpm_conf_set_listen_options_subsection_conf, xml_node);
+}
-+#endif
+
-+#endif
++static struct xml_conf_section fpm_conf_set_pm_subsection_conf = {
++ .path = "pm settings somewhere", /* fixme */
++ .parsers = (struct xml_value_parser []) {
++ { XML_CONF_SCALAR, "style", &fpm_conf_set_pm_style, 0 },
++ { XML_CONF_SCALAR, "max_children", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, max_children) },
++ { XML_CONF_SUBSECTION, "apache_like", &fpm_conf_set_apache_like_subsection, offsetof(struct fpm_pm_s, options_apache_like) },
++ { 0, 0, 0, 0 }
++ }
++};
+
-diff -Nru php-5.2.4.vanilla/main/php_config.h.in php-5.2.4.fpm/main/php_config.h.in
---- php-5.2.4.vanilla/main/php_config.h.in 2007-08-30 03:39:22.000000000 +0400
-+++ php-5.2.4.fpm/main/php_config.h.in 2007-09-11 23:59:34.000000000 +0400
-@@ -170,6 +170,9 @@
- /* Define if you have the chroot function. */
- #undef HAVE_CHROOT
-
-+/* Define if you have the clearenv function. */
-+#undef HAVE_CLEARENV
-+
- /* Define if you have the crypt function. */
- #undef HAVE_CRYPT
-
-@@ -929,6 +932,9 @@
- /* */
- #undef PHP_FASTCGI
-
-+/* Is experimental fastcgi process manager code activated */
-+#undef PHP_FASTCGI_PM
-+
- /* */
- #undef FORCE_CGI_REDIRECT
-
-@@ -938,6 +944,9 @@
- /* */
- #undef ENABLE_PATHINFO_CHECK
-
-+/* do we have libxml? */
-+#undef HAVE_LIBXML
-+
- /* Define if system uses EBCDIC */
- #undef CHARSET_EBCDIC
-
-diff -Nru php-5.2.4.vanilla/sapi/cgi/cgi_main.c php-5.2.4.fpm/sapi/cgi/cgi_main.c
---- php-5.2.4.vanilla/sapi/cgi/cgi_main.c 2007-08-09 03:51:57.000000000 +0400
-+++ php-5.2.4.fpm/sapi/cgi/cgi_main.c 2007-09-11 22:20:24.000000000 +0400
-@@ -55,6 +55,9 @@
- #if HAVE_SYS_WAIT_H
- #include <sys/wait.h>
- #endif
-+#if HAVE_FCNTL_H
-+#include <fcntl.h>
-+#endif
- #include "zend.h"
- #include "zend_extensions.h"
- #include "php_ini.h"
-@@ -83,6 +86,10 @@
- #if PHP_FASTCGI
- #include "fastcgi.h"
-
-+#if PHP_FASTCGI_PM
-+#include "fpm/fpm.h"
-+#endif
++static char *fpm_conf_set_pm_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
++{
++ void *subconf = (char *) *conf + offset;
++ struct fpm_pm_s *pm;
+
- #ifndef PHP_WIN32
- /* XXX this will need to change later when threaded fastcgi is
- implemented. shane */
-@@ -109,8 +116,12 @@
- static pid_t pgroup;
- #endif
-
-+static int request_body_fd;
++ pm = malloc(sizeof(*pm));
+
- #endif
-
-+static char *sapi_cgibin_getenv(char *name, size_t name_len TSRMLS_DC);
++ if (!pm) {
++ return "fpm_conf_set_pm_subsection(): malloc failed";
++ }
+
- #define PHP_MODE_STANDARD 1
- #define PHP_MODE_HIGHLIGHT 2
- #define PHP_MODE_INDENT 3
-@@ -140,6 +151,10 @@
- {'w', 0, "strip"},
- {'?', 0, "usage"},/* help alias (both '?' and 'usage') */
- {'v', 0, "version"},
-+#if PHP_FASTCGI_PM
-+ {'x', 0, "fpm"},
-+ {'y', 1, "fpm-config"},
-+#endif
- {'z', 1, "zend-extension"},
- {'-', 0, NULL} /* end of args */
- };
-@@ -160,6 +175,7 @@
- # ifdef PHP_WIN32
- zend_bool impersonate;
- # endif
-+ char *error_header;
- #endif
- } php_cgi_globals_struct;
-
-@@ -370,7 +386,21 @@
- #if PHP_FASTCGI
- if (fcgi_is_fastcgi()) {
- fcgi_request *request = (fcgi_request*) SG(server_context);
-- tmp_read_bytes = fcgi_read(request, buffer + read_bytes, count_bytes - read_bytes);
++ memset(pm, 0, sizeof(*pm));
+
-+ if (request_body_fd == -1) {
-+ char *request_body_filename = sapi_cgibin_getenv("REQUEST_BODY_FILE", sizeof("REQUEST_BODY_FILE")-1 TSRMLS_CC);
-+ if (request_body_filename && *request_body_filename) {
-+ request_body_fd = open(request_body_filename, O_RDONLY);
-+ }
-+ }
++ * (struct fpm_pm_s **) subconf = pm;
+
-+ /* If REQUEST_BODY_FILE variable not available - read post body from fastcgi stream */
-+ /* This branch also executes when sapi_deactivate() try to consume all bytes of request input. */
-+ if (request_body_fd < 0) {
-+ tmp_read_bytes = fcgi_read(request, buffer + read_bytes, count_bytes - read_bytes);
-+ } else {
-+ tmp_read_bytes = read(request_body_fd, buffer + read_bytes, count_bytes - read_bytes);
-+ }
- } else {
- tmp_read_bytes = read(0, buffer + read_bytes, count_bytes - read_bytes);
- }
-@@ -667,6 +697,11 @@
- " -s Display colour syntax highlighted source.\n"
- " -v Version number\n"
- " -w Display source with stripped comments and whitespace.\n"
-+#if PHP_FASTCGI_PM
-+ " -x, --fpm Run in FastCGI process manager mode.\n"
-+ " -y, --fpm-config <file>\n"
-+ " Specify alternative path to FastCGI process manager config file.\n"
-+#endif
- " -z <file> Load Zend extension <file>.\n",
- prog, prog);
- }
-@@ -1067,6 +1102,7 @@
- # ifdef PHP_WIN32
- STD_PHP_INI_ENTRY("fastcgi.impersonate", "0", PHP_INI_SYSTEM, OnUpdateBool, impersonate, php_cgi_globals_struct, php_cgi_globals)
- # endif
-+ STD_PHP_INI_ENTRY("fastcgi.error_header", NULL, PHP_INI_SYSTEM, OnUpdateString, error_header, php_cgi_globals_struct, php_cgi_globals)
- #endif
- PHP_INI_END()
-
-@@ -1089,6 +1125,7 @@
- # ifdef PHP_WIN32
- php_cgi_globals->impersonate = 0;
- # endif
-+ php_cgi_globals->error_header = NULL;
- #endif
- }
- /* }}} */
-@@ -1124,6 +1161,33 @@
- }
- /* }}} */
-
-+#if PHP_FASTCGI
-+PHP_FUNCTION(fastcgi_finish_request)
++ subconf = pm;
++
++ return xml_conf_parse_section(&subconf, &fpm_conf_set_pm_subsection_conf, xml_node);
++}
++
++static char *xml_conf_set_slot_key_value_pair(void **conf, char *name, void *vv, intptr_t offset)
+{
-+ fcgi_request *request = (fcgi_request*) SG(server_context);
++ char *value = vv;
++ struct key_value_s *kv;
++ struct key_value_s ***parent = (struct key_value_s ***) conf;
+
-+ if (fcgi_is_fastcgi() && request->fd >= 0) {
++ kv = malloc(sizeof(*kv));
+
-+ php_end_ob_buffers(1 TSRMLS_CC);
-+ php_header(TSRMLS_C);
++ if (!kv) {
++ return "malloc() failed";
++ }
+
-+ fcgi_flush(request, 1);
-+ fcgi_close(request, 0, 0);
-+ RETURN_TRUE;
++ memset(kv, 0, sizeof(*kv));
++
++ kv->key = strdup(name);
++ kv->value = strdup(value);
++
++ if (!kv->key || !kv->value) {
++ return "xml_conf_set_slot_key_value_pair(): strdup() failed";
+ }
+
-+ RETURN_FALSE;
++ **parent = kv;
++
++ *parent = &kv->next;
+
++ return NULL;
+}
-+#endif
+
-+function_entry cgi_fcgi_sapi_functions[] = {
-+#if PHP_FASTCGI
-+ PHP_FE(fastcgi_finish_request, NULL)
-+#endif
-+ {NULL, NULL, NULL}
++static struct xml_conf_section fpm_conf_set_key_value_pairs_subsection_conf = {
++ .path = "key_value_pairs somewhere", /* fixme */
++ .parsers = (struct xml_value_parser []) {
++ { XML_CONF_SCALAR, 0, &xml_conf_set_slot_key_value_pair, 0 },
++ { 0, 0, 0, 0 }
++ }
+};
+
- static zend_module_entry cgi_module_entry = {
- STANDARD_MODULE_HEADER,
- #if PHP_FASTCGI
-@@ -1131,7 +1195,7 @@
- #else
- "cgi",
- #endif
-- NULL,
-+ cgi_fcgi_sapi_functions,
- PHP_MINIT(cgi),
- PHP_MSHUTDOWN(cgi),
- NULL,
-@@ -1171,6 +1235,8 @@
- char *bindpath = NULL;
- int fcgi_fd = 0;
- fcgi_request request;
-+ int fpm = 0;
-+ char *fpm_config = NULL;
- #ifndef PHP_WIN32
- int status = 0;
- #endif
-@@ -1284,6 +1350,14 @@
- case 's': /* generate highlighted HTML from source */
- behavior = PHP_MODE_HIGHLIGHT;
- break;
-+#if PHP_FASTCGI_PM
-+ case 'y':
-+ fpm_config = php_optarg;
-+ break;
-+ case 'x':
-+ fpm = 1;
-+ break;
-+#endif
-
- }
-
-@@ -1346,6 +1420,19 @@
- #endif /* FORCE_CGI_REDIRECT */
-
- #if PHP_FASTCGI
-+#if PHP_FASTCGI_PM
-+ if (fpm) {
-+ if (0 > fpm_init(argc, argv, fpm_config)) {
-+ return FAILURE;
-+ }
++static char *fpm_conf_set_key_value_pairs_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
++{
++ void *next_kv = (char *) *conf + offset;
+
-+ fcgi_fd = fpm_run(&max_requests);
++ return xml_conf_parse_section(&next_kv, &fpm_conf_set_key_value_pairs_subsection_conf, xml_node);
++}
+
-+ fcgi_set_is_fastcgi(fastcgi = 1);
-+ }
-+ else
-+#endif
++static void *fpm_worker_pool_config_alloc()
++{
++ static struct fpm_worker_pool_s *current_wp = 0;
++ struct fpm_worker_pool_s *wp;
+
- if (bindpath) {
- fcgi_fd = fcgi_listen(bindpath, 128);
- if (fcgi_fd < 0) {
-@@ -1360,7 +1447,7 @@
-
- if (fastcgi) {
- /* How many times to run PHP scripts before dying */
-- if (getenv("PHP_FCGI_MAX_REQUESTS")) {
-+ if (!fpm && getenv("PHP_FCGI_MAX_REQUESTS")) {
- max_requests = atoi(getenv("PHP_FCGI_MAX_REQUESTS"));
- if (max_requests < 0) {
- fprintf(stderr, "PHP_FCGI_MAX_REQUESTS is not valid\n");
-@@ -1377,7 +1464,7 @@
-
- #ifndef PHP_WIN32
- /* Pre-fork, if required */
-- if (getenv("PHP_FCGI_CHILDREN")) {
-+ if (!fpm && getenv("PHP_FCGI_CHILDREN")) {
- children = atoi(getenv("PHP_FCGI_CHILDREN"));
- if (children < 0) {
- fprintf(stderr, "PHP_FCGI_CHILDREN is not valid\n");
-@@ -1489,9 +1576,15 @@
- }
- #endif
- while (!fastcgi || fcgi_accept_request(&request) >= 0) {
-+
-+#if PHP_FASTCGI_PM
-+ fpm_request_start();
-+#endif
- #endif
-
- #if PHP_FASTCGI
-+ request_body_fd = -1;
++ wp = fpm_worker_pool_alloc();
+
- SG(server_context) = (void *) &request;
- #else
- SG(server_context) = (void *) 1; /* avoid server_context==NULL checks */
-@@ -1831,6 +1924,10 @@
-
- #if PHP_FASTCGI
- fastcgi_request_done:
++ if (!wp) { return 0; }
+
-+ if (request_body_fd != -1) close(request_body_fd);
++ wp->config = malloc(sizeof(struct fpm_worker_pool_config_s));
+
-+ request_body_fd = -2;
- #endif
- {
- char *path_translated;
-@@ -1844,11 +1941,25 @@
- SG(request_info).path_translated = path_translated;
- }
-
-+ if (EG(exit_status) == 255) {
-+ if (CGIG(error_header) && *CGIG(error_header)) {
-+ sapi_header_line ctr = {0};
++ if (!wp->config) { return 0; }
+
-+ ctr.line = CGIG(error_header);
-+ ctr.line_len = strlen(CGIG(error_header));
-+ sapi_header_op(SAPI_HEADER_REPLACE, &ctr TSRMLS_CC);
-+ }
-+ }
-+
- php_request_shutdown((void *) 0);
- if (exit_status == 0) {
- exit_status = EG(exit_status);
- }
-
-+#if PHP_FASTCGI_PM
-+ fpm_request_finish();
-+#endif
++ memset(wp->config, 0, sizeof(struct fpm_worker_pool_config_s));
+
- if (SG(request_info).path_translated) {
- free(SG(request_info).path_translated);
- SG(request_info).path_translated = NULL;
-diff -Nru php-5.2.4.vanilla/sapi/cgi/config9.m4 php-5.2.4.fpm/sapi/cgi/config9.m4
---- php-5.2.4.vanilla/sapi/cgi/config9.m4 2007-07-12 03:20:36.000000000 +0400
-+++ php-5.2.4.fpm/sapi/cgi/config9.m4 2007-08-31 15:47:19.000000000 +0400
-@@ -22,6 +22,10 @@
- [ --disable-path-info-check CGI: If this is disabled, paths such as
- /info.php/test?a=b will fail to work], yes, no)
-
-+PHP_ARG_ENABLE(fpm,,
-+[ --enable-fpm FastCGI: If this is enabled, the fastcgi support
-+ will include experimental process manager code], no, no)
-+
- dnl
- dnl CGI setup
- dnl
-@@ -54,6 +58,20 @@
- AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_ENABLE_FASTCGI, [ ])
- AC_MSG_RESULT($PHP_FASTCGI)
-
-+ dnl --enable-fpm
-+ if test "$PHP_FASTCGI" = "yes"; then
-+ AC_MSG_CHECKING(whether to activate experimental fastcgi process manager code)
-+ if test "$PHP_FPM" = "yes"; then
-+ PHP_FASTCGI_PM=1
-+ else
-+ PHP_FASTCGI_PM=0
-+ fi
-+ AC_MSG_RESULT($PHP_FPM)
-+ else
-+ PHP_FASTCGI_PM=0
-+ fi
-+ AC_DEFINE_UNQUOTED(PHP_FASTCGI_PM, $PHP_FASTCGI_PM, [Is experimental fastcgi process manager code activated])
-+
- dnl --enable-force-cgi-redirect
- AC_MSG_CHECKING(whether to force Apache CGI redirect)
- if test "$PHP_FORCE_CGI_REDIRECT" = "yes"; then
-@@ -93,10 +111,10 @@
- BUILD_CGI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- ;;
- *darwin*)
-- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- ;;
- *)
-- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- ;;
- esac
-
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fastcgi.c php-5.2.4.fpm/sapi/cgi/fastcgi.c
---- php-5.2.4.vanilla/sapi/cgi/fastcgi.c 2007-07-09 15:48:39.000000000 +0400
-+++ php-5.2.4.fpm/sapi/cgi/fastcgi.c 2007-08-31 15:47:19.000000000 +0400
-@@ -240,6 +240,8 @@
- } else {
- return is_fastcgi = 0;
- }
++ if (current_wp) { current_wp->next = wp; }
+
-+ fcgi_set_allowed_clients(getenv("FCGI_WEB_SERVER_ADDRS"));
- #endif
- }
- return is_fastcgi;
-@@ -255,9 +257,19 @@
- }
- }
-
-+void fcgi_set_is_fastcgi(int new_value)
-+{
-+ is_fastcgi = new_value;
++ current_wp = wp;
++
++ return wp->config;
+}
+
- void fcgi_shutdown(void)
- {
- is_fastcgi = 0;
++int fpm_worker_pool_config_free(struct fpm_worker_pool_config_s *wpc)
++{
++ struct key_value_s *kv, *kv_next;
+
-+ if (allowed_clients) {
-+ free(allowed_clients);
-+ allowed_clients = 0;
++ free(wpc->name);
++ free(wpc->listen_address);
++ if (wpc->listen_options) {
++ free(wpc->listen_options->owner);
++ free(wpc->listen_options->group);
++ free(wpc->listen_options->mode);
++ free(wpc->listen_options);
+ }
- }
-
- #ifdef _WIN32
-@@ -330,6 +342,41 @@
- }
- #endif
-
-+void fcgi_set_allowed_clients(char *ip)
-+{
-+ char *cur, *end;
-+ int n;
-+
-+ if (ip) {
-+ ip = strdup(ip);
-+ cur = ip;
-+ n = 0;
-+ while (*cur) {
-+ if (*cur == ',') n++;
-+ cur++;
-+ }
-+ if (allowed_clients) free(allowed_clients);
-+ allowed_clients = malloc(sizeof(in_addr_t) * (n+2));
-+ n = 0;
-+ cur = ip;
-+ while (cur) {
-+ end = strchr(cur, ',');
-+ if (end) {
-+ *end = 0;
-+ end++;
-+ }
-+ allowed_clients[n] = inet_addr(cur);
-+ if (allowed_clients[n] == INADDR_NONE) {
-+ fprintf(stderr, "Wrong IP address '%s' in FCGI_WEB_SERVER_ADDRS\n", cur);
-+ }
-+ n++;
-+ cur = end;
-+ }
-+ allowed_clients[n] = INADDR_NONE;
-+ free(ip);
++ for (kv = wpc->php_defines; kv; kv = kv_next) {
++ kv_next = kv->next;
++ free(kv->key);
++ free(kv->value);
++ free(kv);
+ }
++ for (kv = wpc->environment; kv; kv = kv_next) {
++ kv_next = kv->next;
++ free(kv->key);
++ free(kv->value);
++ free(kv);
++ }
++ free(wpc->pm);
++ free(wpc->user);
++ free(wpc->group);
++ free(wpc->chroot);
++ free(wpc->chdir);
++ free(wpc->allowed_clients);
++ free(wpc->slowlog);
++
++ return 0;
+}
+
- static int is_port_number(const char *bindpath)
- {
- while (*bindpath) {
-@@ -458,38 +505,6 @@
-
- if (!tcp) {
- chmod(path, 0777);
-- } else {
-- char *ip = getenv("FCGI_WEB_SERVER_ADDRS");
-- char *cur, *end;
-- int n;
--
-- if (ip) {
-- ip = strdup(ip);
-- cur = ip;
-- n = 0;
-- while (*cur) {
-- if (*cur == ',') n++;
-- cur++;
-- }
-- allowed_clients = malloc(sizeof(in_addr_t) * (n+2));
-- n = 0;
-- cur = ip;
-- while (cur) {
-- end = strchr(cur, ',');
-- if (end) {
-- *end = 0;
-- end++;
-- }
-- allowed_clients[n] = inet_addr(cur);
-- if (allowed_clients[n] == INADDR_NONE) {
-- fprintf(stderr, "Wrong IP address '%s' in FCGI_WEB_SERVER_ADDRS\n", cur);
-- }
-- n++;
-- cur = end;
-- }
-- allowed_clients[n] = INADDR_NONE;
-- free(ip);
-- }
- }
-
- if (!is_initialized) {
-@@ -817,7 +832,7 @@
- return n;
- }
-
--static inline void fcgi_close(fcgi_request *req, int force, int destroy)
-+void fcgi_close(fcgi_request *req, int force, int destroy)
- {
- if (destroy) {
- zend_hash_destroy(&req->env);
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fastcgi.h php-5.2.4.fpm/sapi/cgi/fastcgi.h
---- php-5.2.4.vanilla/sapi/cgi/fastcgi.h 2007-05-21 13:08:13.000000000 +0400
-+++ php-5.2.4.fpm/sapi/cgi/fastcgi.h 2007-08-31 15:47:19.000000000 +0400
-@@ -114,6 +114,8 @@
- int fcgi_init(void);
- void fcgi_shutdown(void);
- int fcgi_is_fastcgi(void);
-+void fcgi_set_is_fastcgi(int);
-+void fcgi_set_allowed_clients(char *);
- int fcgi_in_shutdown(void);
- int fcgi_listen(const char *path, int backlog);
- void fcgi_init_request(fcgi_request *req, int listen_socket);
-@@ -128,6 +130,8 @@
- int fcgi_write(fcgi_request *req, fcgi_request_type type, const char *str, int len);
- int fcgi_flush(fcgi_request *req, int close);
-
-+void fcgi_close(fcgi_request *req, int force, int destroy);
++static struct xml_conf_section xml_section_fpm_worker_pool_config = {
++ .conf = &fpm_worker_pool_config_alloc,
++ .path = "/configuration/workers/pool",
++ .parsers = (struct xml_value_parser []) {
++ { XML_CONF_SCALAR, "name", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, name) },
++ { XML_CONF_SCALAR, "listen_address", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, listen_address) },
++ { XML_CONF_SUBSECTION, "listen_options", &fpm_conf_set_listen_options_subsection, offsetof(struct fpm_worker_pool_config_s, listen_options) },
++ { XML_CONF_SUBSECTION, "php_defines", &fpm_conf_set_key_value_pairs_subsection, offsetof(struct fpm_worker_pool_config_s, php_defines) },
++ { XML_CONF_SCALAR, "user", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, user) },
++ { XML_CONF_SCALAR, "group", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, group) },
++ { XML_CONF_SCALAR, "chroot", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, chroot) },
++ { XML_CONF_SCALAR, "chdir", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, chdir) },
++ { XML_CONF_SCALAR, "allowed_clients", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, allowed_clients) },
++ { XML_CONF_SUBSECTION, "environment", &fpm_conf_set_key_value_pairs_subsection, offsetof(struct fpm_worker_pool_config_s, environment) },
++ { XML_CONF_SCALAR, "request_terminate_timeout", &xml_conf_set_slot_time, offsetof(struct fpm_worker_pool_config_s, request_terminate_timeout) },
++ { XML_CONF_SCALAR, "request_slowlog_timeout", &xml_conf_set_slot_time, offsetof(struct fpm_worker_pool_config_s, request_slowlog_timeout) },
++ { XML_CONF_SCALAR, "slowlog", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, slowlog) },
++ { XML_CONF_SCALAR, "rlimit_files", &xml_conf_set_slot_integer, offsetof(struct fpm_worker_pool_config_s, rlimit_files) },
++ { XML_CONF_SCALAR, "rlimit_core", &fpm_conf_set_rlimit_core, 0 },
++ { XML_CONF_SCALAR, "max_requests", &xml_conf_set_slot_integer, offsetof(struct fpm_worker_pool_config_s, max_requests) },
++ { XML_CONF_SCALAR, "catch_workers_output", &fpm_conf_set_catch_workers_output, 0 },
++ { XML_CONF_SUBSECTION, "pm", &fpm_conf_set_pm_subsection, offsetof(struct fpm_worker_pool_config_s, pm) },
++ { 0, 0, 0, 0 }
++ }
++};
+
- #ifdef PHP_WIN32
- void fcgi_impersonate(void);
- #endif
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/acinclude.m4 php-5.2.4.fpm/sapi/cgi/fpm/acinclude.m4
---- php-5.2.4.vanilla/sapi/cgi/fpm/acinclude.m4 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/acinclude.m4 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,115 @@
++static struct xml_conf_section *fpm_conf_all_sections[] = {
++ &xml_section_fpm_global_options,
++ &xml_section_fpm_worker_pool_config,
++ 0
++};
+
-+AC_DEFUN([AC_FPM_CHECK_FUNC],
-+[
-+ SAVED_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS $2"
-+ SAVED_LIBS="$LIBS"
-+ LIBS="$LIBS $3"
++static int fpm_evaluate_full_path(char **path)
++{
++ if (**path != '/') {
++ char *full_path;
+
-+ AC_CHECK_FUNC([$1],[$4],[$5])
++ full_path = malloc(sizeof(PHP_PREFIX) + strlen(*path) + 1);
+
-+ CFLAGS="$SAVED_CFLAGS"
-+ LIBS="$SAVED_LIBS"
-+])
++ if (!full_path) { return -1; }
+
-+AC_DEFUN([AC_FPM_LIBEVENT],
-+[
-+ AC_ARG_WITH([libevent],
-+ [ --with-libevent=DIR FPM: libevent install directory])
++ sprintf(full_path, "%s/%s", PHP_PREFIX, *path);
+
-+ LIBEVENT_CFLAGS=""
-+ LIBEVENT_LIBS="-levent"
-+ LIBEVENT_INCLUDE_PATH=""
++ free(*path);
+
-+ if test "$with_libevent" != "no" -a -n "$with_libevent"; then
-+ LIBEVENT_CFLAGS="-I$with_libevent/include"
-+ LIBEVENT_LIBS="-L$with_libevent/lib $LIBEVENT_LIBS"
-+ LIBEVENT_INCLUDE_PATH="$with_libevent/include"
-+ fi
++ *path = full_path;
++ }
+
-+ AC_MSG_CHECKING([for event.h])
++ return 0;
++}
+
-+ found=no
++static int fpm_conf_process_all_pools()
++{
++ struct fpm_worker_pool_s *wp;
+
-+ for dir in "$LIBEVENT_INCLUDE_PATH" /usr/include ; do
-+ if [[ -r "$dir/event.h" ]] ; then
-+ found=yes
-+ break
-+ fi
-+ done
++ if (!fpm_worker_all_pools) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "at least one pool section must be specified in config file");
++ return -1;
++ }
++
++ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
+
-+ AC_MSG_RESULT([$found])
++ if (wp->config->listen_address && *wp->config->listen_address) {
+
-+ AC_FPM_CHECK_FUNC([event_set], [$LIBEVENT_CFLAGS], [$LIBEVENT_LIBS], ,
-+ [AC_MSG_ERROR([Failed to link with libevent. Perhaps --with-libevent=DIR option could help.])])
++ wp->listen_address_domain = fpm_sockets_domain_from_address(wp->config->listen_address);
+
-+ AC_FPM_CHECK_FUNC([event_base_free], [$LIBEVENT_CFLAGS], [$LIBEVENT_LIBS], ,
-+ [AC_MSG_ERROR([You have too old version. libevent version >= 1.2 is required.])])
++ if (wp->listen_address_domain == FPM_AF_UNIX && *wp->config->listen_address != '/') {
++ fpm_evaluate_full_path(&wp->config->listen_address);
++ }
+
-+])
++ }
++ else {
+
-+AC_DEFUN([AC_FPM_LIBXML],
-+[
-+ AC_MSG_RESULT([checking for XML configuration])
++ wp->is_template = 1;
+
-+ AC_ARG_WITH(xml-config,
-+ [ --with-xml-config=PATH FPM: use xml-config in PATH to find libxml],
-+ [XMLCONFIG="$withval"],
-+ [AC_PATH_PROGS(XMLCONFIG, [xml2-config xml-config], "")]
-+ )
++ }
+
-+ if test "x$XMLCONFIG" = "x"; then
-+ AC_MSG_ERROR([XML configuration could not be found])
-+ else
-+ AC_MSG_CHECKING([for libxml library])
++ if (wp->config->request_slowlog_timeout) {
++#if HAVE_FPM_TRACE
++ if (! (wp->config->slowlog && *wp->config->slowlog)) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "pool %s: 'slowlog' must be specified for use with 'request_slowlog_timeout'",
++ wp->config->name);
++ return -1;
++ }
++#else
++ static int warned = 0;
+
-+ if test ! -x "$XMLCONFIG"; then
-+ AC_MSG_ERROR([$XMLCONFIG cannot be executed])
-+ fi
++ if (!warned) {
++ zlog(ZLOG_STUFF, ZLOG_WARNING, "pool %s: 'request_slowlog_timeout' is not supported on your system",
++ wp->config->name);
++ warned = 1;
++ }
+
-+ LIBXML_LIBS="`$XMLCONFIG --libs`"
-+ LIBXML_CFLAGS="`$XMLCONFIG --cflags`"
-+ LIBXML_VERSION="`$XMLCONFIG --version`"
++ wp->config->request_slowlog_timeout = 0;
++#endif
++ }
+
-+ AC_MSG_RESULT([yes, $LIBXML_VERSION])
++ if (wp->config->request_slowlog_timeout && wp->config->slowlog && *wp->config->slowlog) {
++ int fd;
+
-+ AC_FPM_CHECK_FUNC([xmlParseFile], [$LIBXML_CFLAGS], [$LIBXML_LIBS], ,
-+ [AC_MSG_ERROR([Failed to link with libxml])])
++ fpm_evaluate_full_path(&wp->config->slowlog);
+
-+ AC_DEFINE(HAVE_LIBXML, 1, [do we have libxml?])
-+ fi
-+])
++ if (wp->config->request_slowlog_timeout) {
++ fd = open(wp->config->slowlog, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
+
-+AC_DEFUN([AC_FPM_JUDY],
-+[
-+ AC_ARG_WITH([Judy],
-+ [ --with-Judy=DIR FPM: Judy install directory])
++ if (0 > fd) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(%s) failed", wp->config->slowlog);
++ return -1;
++ }
++ close(fd);
++ }
++ }
++ }
+
-+ JUDY_CFLAGS=""
-+ JUDY_LIBS="-lJudy"
-+ JUDY_INCLUDE_PATH=""
++ return 0;
++}
+
-+ if test "$with_Judy" != "no" -a -n "$with_Judy"; then
-+ JUDY_INCLUDE_PATH="$with_Judy/include"
-+ JUDY_CFLAGS="-I$with_Judy/include $JUDY_CFLAGS"
-+ JUDY_LIBS="-L$with_Judy/lib $JUDY_LIBS"
-+ fi
++int fpm_conf_unlink_pid()
++{
++ if (fpm_global_config.pid_file) {
++
++ if (0 > unlink(fpm_global_config.pid_file)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "unlink(\"%s\") failed", fpm_global_config.pid_file);
++ return -1;
++ }
+
-+ AC_MSG_CHECKING([for Judy.h])
++ }
+
-+ found=no
++ return 0;
++}
+
-+ for dir in "$JUDY_INCLUDE_PATH" /usr/include ; do
-+ if [[ -r "$dir/Judy.h" ]] ; then
-+ found=yes
-+ break
-+ fi
-+ done
++int fpm_conf_write_pid()
++{
++ int fd;
++
++ if (fpm_global_config.pid_file) {
++ char buf[64];
++ int len;
++
++ unlink(fpm_global_config.pid_file);
++
++ fd = creat(fpm_global_config.pid_file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
++
++ if (fd < 0) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "creat(\"%s\") failed", fpm_global_config.pid_file);
++ return -1;
++ }
++
++ len = sprintf(buf, "%d", (int) fpm_globals.parent_pid);
+
-+ AC_MSG_RESULT([$found])
++ if (len != write(fd, buf, len)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "write() failed");
++ return -1;
++ }
+
-+ AC_FPM_CHECK_FUNC([JudyLCount], [$JUDY_CFLAGS], [$JUDY_LIBS], ,
-+ [AC_MSG_ERROR([Failed to link with Judy])])
++ close(fd);
++ }
+
-+])
++ return 0;
++}
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/conf/php-fpm.conf php-5.2.4.fpm/sapi/cgi/fpm/conf/php-fpm.conf
---- php-5.2.4.vanilla/sapi/cgi/fpm/conf/php-fpm.conf 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/conf/php-fpm.conf 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,145 @@
-+<?xml version="1.0" ?>
-+<configuration>
++static int fpm_conf_post_process()
++{
++ if (fpm_global_config.pid_file) {
++ fpm_evaluate_full_path(&fpm_global_config.pid_file);
++ }
+
-+ All relative paths in this config are relative to php's install prefix
++ if (!fpm_global_config.error_log) {
++ fpm_global_config.error_log = strdup(PHP_FPM_LOG_PATH);
++ }
+
-+ <section name="global_options">
++ fpm_evaluate_full_path(&fpm_global_config.error_log);
+
-+ Pid file
-+ <value name="pid_file">logs/php-fpm.pid</value>
++ if (0 > fpm_stdio_open_error_log(0)) {
++ return -1;
++ }
+
-+ Error log file
-+ <value name="error_log">logs/php-fpm.log</value>
++ return fpm_conf_process_all_pools();
++}
+
-+ When this amount of php processes exited with SIGSEGV or SIGBUS ...
-+ <value name="emergency_restart_threshold">10</value>
++static void fpm_conf_cleanup(int which, void *arg)
++{
++ free(fpm_global_config.pid_file);
++ free(fpm_global_config.error_log);
++ fpm_global_config.pid_file = 0;
++ fpm_global_config.error_log = 0;
++}
+
-+ ... in a less than this interval of time, a complete restart will be initiated.
-+ Useful to work around accidental curruptions in accelerator's shared memory.
-+ <value name="emergency_restart_interval">1m</value>
++int fpm_conf_init_main()
++{
++ char *filename = fpm_globals.config;
++ char *err;
+
-+ Time limit on waiting child's reaction on signals from master
-+ <value name="process_control_timeout">5s</value>
++ if (0 > xml_conf_sections_register(fpm_conf_all_sections)) {
++ return -1;
++ }
+
-+ Set to 'no' to debug fpm
-+ <value name="daemonize">yes</value>
++ if (filename == NULL) {
++ filename = PHP_FPM_CONF_PATH;
++ }
+
-+ </section>
++ err = xml_conf_load_file(filename);
+
-+ <workers>
++ if (err) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "failed to load configuration file: %s", err);
++ return -1;
++ }
+
-+ <section name="pool">
++ if (0 > fpm_conf_post_process()) {
++ return -1;
++ }
+
-+ Name of pool. Used in logs and stats.
-+ <value name="name">main</value>
++ xml_conf_clean();
+
-+ Address to accept fastcgi requests on.
-+ Valid syntax is 'ip.ad.re.ss:port' or just 'port' or '/path/to/unix/socket'
-+ <value name="listen_address">127.0.0.1:9000</value>
++ if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_conf_cleanup, 0)) {
++ return -1;
++ }
+
-+ <value name="listen_options">
++ return 0;
++}
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_conf.h php-src/sapi/fpm/fpm/fpm_conf.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_conf.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_conf.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,73 @@
+
-+ Set listen(2) backlog
-+ <value name="backlog">-1</value>
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ Set permissions for unix socket, if one used.
-+ In Linux read/write permissions must be set in order to allow connections from web server.
-+ Many BSD-derrived systems allow connections regardless of permissions.
-+ <value name="owner"></value>
-+ <value name="group"></value>
-+ <value name="mode">0666</value>
-+ </value>
++#ifndef FPM_CONF_H
++#define FPM_CONF_H 1
+
-+ Additional php.ini defines, specific to this pool of workers.
-+ <value name="php_defines">
-+ <!-- <value name="sendmail_path">/usr/sbin/sendmail -t -i</value> -->
-+ <!-- <value name="display_errors">0</value> -->
-+ </value>
++struct key_value_s;
+
-+ Unix user of processes
-+ <value name="user">nobody</value>
++struct key_value_s {
++ struct key_value_s *next;
++ char *key;
++ char *value;
++};
+
-+ Unix group of processes
-+ <value name="group">nogroup</value>
++struct fpm_global_config_s {
++ int emergency_restart_threshold;
++ int emergency_restart_interval;
++ int process_control_timeout;
++ int daemonize;
++ char *pid_file;
++ char *error_log;
++};
+
-+ Process manager settings
-+ <value name="pm">
++extern struct fpm_global_config_s fpm_global_config;
+
-+ Sets style of controling worker process count.
-+ Valid values are 'static' and 'apache-like'
-+ <value name="style">static</value>
++struct fpm_pm_s {
++ int style;
++ int max_children;
++ struct {
++ int StartServers;
++ int MinSpareServers;
++ int MaxSpareServers;
++ } options_apache_like;
++};
+
-+ Sets the limit on the number of simultaneous requests that will be served.
-+ Equivalent to Apache MaxClients directive.
-+ Equivalent to PHP_FCGI_CHILDREN environment in original php.fcgi
-+ Used with any pm_style.
-+ <value name="max_children">5</value>
++struct fpm_listen_options_s {
++ int backlog;
++ char *owner;
++ char *group;
++ char *mode;
++};
+
-+ Settings group for 'apache-like' pm style
-+ <value name="apache_like">
++struct fpm_worker_pool_config_s {
++ char *name;
++ char *listen_address;
++ struct fpm_listen_options_s *listen_options;
++ struct key_value_s *php_defines;
++ char *user;
++ char *group;
++ char *chroot;
++ char *chdir;
++ char *allowed_clients;
++ struct key_value_s *environment;
++ struct fpm_pm_s *pm;
++ int request_terminate_timeout;
++ int request_slowlog_timeout;
++ char *slowlog;
++ int max_requests;
++ int rlimit_files;
++ int rlimit_core;
++ unsigned catch_workers_output:1;
++};
+
-+ Sets the number of server processes created on startup.
-+ Used only when 'apache-like' pm_style is selected
-+ <value name="StartServers">20</value>
++enum { PM_STYLE_STATIC = 1, PM_STYLE_APACHE_LIKE = 2 };
+
-+ Sets the desired minimum number of idle server processes.
-+ Used only when 'apache-like' pm_style is selected
-+ <value name="MinSpareServers">5</value>
++int fpm_conf_init_main();
++int fpm_worker_pool_config_free(struct fpm_worker_pool_config_s *wpc);
++int fpm_conf_write_pid();
++int fpm_conf_unlink_pid();
+
-+ Sets the desired maximum number of idle server processes.
-+ Used only when 'apache-like' pm_style is selected
-+ <value name="MaxSpareServers">35</value>
++#endif
+
-+ </value>
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_config.h php-src/sapi/fpm/fpm/fpm_config.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_config.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_config.h 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,40 @@
+
-+ </value>
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ Time limit on waiting execution of single request
-+ Should be used when 'max_execution_time' ini option does not terminate execution for some reason
-+ <value name="request_execution_timeout">31s</value>
++#include <php_config.h>
++#ifdef FPM_AUTOCONFIG_H
++#include <fpm_autoconfig.h>
++#endif
+
-+ Set open file desc rlimit
-+ <value name="rlimit_files">1024</value>
++/* Solaris does not have it */
++#ifndef INADDR_NONE
++#define INADDR_NONE (-1)
++#endif
+
-+ Set max core size rlimit
-+ <value name="rlimit_core">unlimited</value>
+
-+ Chroot to this directory at the start
-+ <value name="chroot"></value>
++/* If we're not using GNU C, elide __attribute__ */
++#ifndef __GNUC__
++# define __attribute__(x) /*NOTHING*/
++#endif
+
-+ Chdir to this directory at the start
-+ <value name="chdir"></value>
+
-+ Redirect workers' stdout and stderr into main log.
-+ If not set, they will be redirected to /dev/null, according to FastCGI specs
-+ <value name="catch_workers_output">yes</value>
++/* Solaris does not have it */
++#ifndef timersub
++#define timersub(tvp, uvp, vvp) \
++ do { \
++ (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
++ (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
++ if ((vvp)->tv_usec < 0) { \
++ (vvp)->tv_sec--; \
++ (vvp)->tv_usec += 1000000; \
++ } \
++ } while (0)
++#endif
+
-+ How much requests each process should execute before respawn.
-+ Useful to work around memory leaks in 3rd party libraries.
-+ For endless request processing please specify 0
-+ Equivalent to PHP_FCGI_MAX_REQUESTS
-+ <value name="max_requests">500</value>
++#if defined(HAVE_PTRACE) || defined(PROC_MEM_FILE) || defined(HAVE_MACH_VM_READ)
++#define HAVE_FPM_TRACE 1
++#else
++#define HAVE_FPM_TRACE 0
++#endif
+
-+ Comma separated list of ipv4 addresses of FastCGI clients that allowed to connect.
-+ Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcgi (5.2.2+)
-+ Makes sense only with AF_INET listening socket.
-+ <value name="allowed_clients">127.0.0.1</value>
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_env.c php-src/sapi/fpm/fpm/fpm_env.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_env.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_env.c 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,175 @@
+
-+ Pass environment variables like LD_LIBRARY_PATH
-+ All $VARIABLEs are taken from current environment
-+ <value name="environment">
-+ <value name="HOSTNAME">$HOSTNAME</value>
-+ <value name="PATH">/usr/local/bin:/usr/bin:/bin</value>
-+ <value name="TMP">/tmp</value>
-+ <value name="TMPDIR">/tmp</value>
-+ <value name="TEMP">/tmp</value>
-+ <value name="OSTYPE">$OSTYPE</value>
-+ <value name="MACHTYPE">$MACHTYPE</value>
-+ <value name="MALLOC_CHECK_">2</value>
-+ </value>
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ </section>
++#include "fpm_config.h"
+
-+ </workers>
++#ifdef HAVE_ALLOCA_H
++#include <alloca.h>
++#endif
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+
-+</configuration>
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/config.m4 php-5.2.4.fpm/sapi/cgi/fpm/config.m4
---- php-5.2.4.vanilla/sapi/cgi/fpm/config.m4 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/config.m4 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,54 @@
++#include "fpm_env.h"
++#include "zlog.h"
+
-+dnl AC_FPM_LIBEVENT
-+AC_FPM_LIBXML
-+dnl AC_FPM_JUDY
++#ifndef HAVE_SETENV
++#ifdef (__sparc__ || __sparc)
++int setenv(name, value, clobber)
++char *name;
++char *value;
++int clobber;
++{
++ char *malloc();
++ char *getenv();
++ char *cp;
+
-+LIBEVENT_CFLAGS="-I$abs_srcdir/libevent"
-+LIBEVENT_LIBS="$abs_builddir/libevent/libevent.la"
++ if (clobber == 0 && getenv(name) != 0)
++ { return (0); }
++ if ((cp = malloc(strlen(name) + strlen(value) + 2)) == 0)
++ { return (1); }
++ sprintf(cp, "%s=%s", name, value);
++ return (putenv(cp));
++}
++#else
++int setenv(char *name, char *value, int overwrite)
++{
++ int name_len = strlen(name);
++ int value_len = strlen(value);
++ char *var = alloca(name_len + 1 + value_len + 1);
+
-+SAPI_EXTRA_DEPS="$LIBEVENT_LIBS"
++ memcpy(var, name, name_len);
+
-+FPM_SOURCES="fpm.c fpm_conf.c fpm_signals.c fpm_children.c fpm_worker_pool.c fpm_unix.c fpm_cleanup.c \
-+ fpm_sockets.c fpm_stdio.c fpm_env.c fpm_events.c fpm_php.c fpm_process_ctl.c fpm_shm.c xml_config.c zlog.c"
++ var[name_len] = '=';
+
-+FPM_CFLAGS="$LIBEVENT_CFLAGS $LIBXML_CFLAGS $JUDY_CFLAGS"
-+SAPI_EXTRA_LIBS="$LIBEVENT_LIBS $LIBXML_LIBS $JUDY_LIBS"
++ memcpy(var + name_len + 1, value, value_len);
+
-+dnl FPM_CFLAGS="$FPM_CFLAGS -DJUDYERROR_NOTEST" # for Judy
-+FPM_CFLAGS="$FPM_CFLAGS -I$abs_srcdir/sapi/cgi" # for fastcgi.h
++ var[name_len + 1 + value_len] = '\0';
+
-+if [[ "x$CC" = "xgcc" ]] ; then
-+ FPM_CFLAGS="-W -Wall -Wpointer-arith -Wno-unused-parameter -Wno-unused-function -Wunused-variable -Wunused-value $FPM_CFLAGS"
-+fi
++ return putenv(var);
++}
++#endif
++#endif
+
-+PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/cgi/fpm/Makefile.frag)
++#ifndef HAVE_CLEARENV
++void clearenv()
++{
++ char **envp;
++ char *s;
+
-+PHP_ADD_SOURCES(sapi/cgi/fpm, $FPM_SOURCES, $FPM_CFLAGS, sapi)
++ /* this algo is the only one known to me
++ that works well on all systems */
++ while (*(envp = environ)) {
++ char *eq = strchr(*envp, '=');
+
-+PHP_ADD_BUILD_DIR(sapi/cgi/fpm)
++ s = strdup(*envp);
+
-+install_fpm="install-fpm"
++ if (eq) { s[eq - *envp] = '\0'; }
+
-+PHP_CONFIGURE_PART(Configuring libevent)
++ unsetenv(s);
++ free(s);
++ }
+
-+test -d "$abs_builddir/libevent" || mkdir -p $abs_builddir/libevent
++}
++#endif
+
-+dnl this is a bad hack
++#ifndef HAVE_UNSETENV
++void unsetenv(const char *name)
++{
++ if(getenv(name)!=NULL)
++ {
++ int ct=0;
++ int del=0;
+
-+chmod +x "$abs_srcdir/libevent/configure" \
-+ "$abs_srcdir/libevent/config.guess" \
-+ "$abs_srcdir/libevent/config.sub" \
-+ "$abs_srcdir/libevent/depcomp" \
-+ "$abs_srcdir/libevent/install-sh" \
-+ "$abs_srcdir/libevent/missing" \
-+ "$abs_srcdir/libevent/mkinstalldirs"
++ while(environ[ct] != NULL)
++ {
++ if (nvmatch(name, environ[ct]) != 0) del=ct;
++ { ct++; }
++ }
++ /* isn't needed free here?? */
++ environ[del]=environ[ct-1];
++ environ[ct-1]=NULL;
++ }
++}
++static char * nvmatch(s1, s2)
++register char *s1, *s2;
++{
++ while(*s1 == *s2++)
++ {
++ if(*s1++ == '=')
++ { return(s2); }
++ }
++ if(*s1 == '\0' && *(s2-1) == '=')
++ { return(s2); }
++ return(NULL);
++}
++#endif
+
-+libevent_configure="cd $abs_builddir/libevent ; $abs_srcdir/libevent/configure --disable-shared"
++int fpm_env_init_child(struct fpm_worker_pool_s *wp)
++{
++ struct key_value_s *kv;
+
-+(eval $libevent_configure)
++ clearenv();
+
-+if [[ ! -f "$abs_builddir/libevent/Makefile" ]] ; then
-+ echo "Failed to configure libevent" >&2
-+ exit 1
-+fi
++ for (kv = wp->config->environment; kv; kv = kv->next) {
++ setenv(kv->key, kv->value, 1);
++ }
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm.c php-5.2.4.fpm/sapi/cgi/fpm/fpm.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,98 @@
++ if (wp->user) {
++ setenv("USER", wp->user, 1);
++ }
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ if (wp->home) {
++ setenv("HOME", wp->home, 1);
++ }
+
-+#include "fpm_config.h"
++ return 0;
++}
+
-+#include <stdlib.h> /* for exit */
++static int fpm_env_conf_wp(struct fpm_worker_pool_s *wp)
++{
++ struct key_value_s *kv;
+
-+#include "fpm.h"
-+#include "fpm_children.h"
-+#include "fpm_signals.h"
-+#include "fpm_env.h"
-+#include "fpm_events.h"
-+#include "fpm_cleanup.h"
-+#include "fpm_php.h"
-+#include "fpm_sockets.h"
-+#include "fpm_unix.h"
-+#include "fpm_process_ctl.h"
-+#include "fpm_conf.h"
-+#include "fpm_worker_pool.h"
-+#include "fpm_stdio.h"
-+#include "zlog.h"
++ kv = wp->config->environment;
+
-+struct fpm_globals_s fpm_globals;
++ for (kv = wp->config->environment; kv; kv = kv->next) {
++ if (*kv->value == '$') {
++ char *value = getenv(kv->value + 1);
+
-+int fpm_init(int argc, char **argv, char *config)
-+{
++ if (!value) { value = ""; }
+
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "fpm is initializing");
++ free(kv->value);
++ kv->value = strdup(value);
++ }
+
-+ if (0 > fpm_stdio_init_main() ||
-+ 0 > fpm_conf_init_main(config) ||
-+ 0 > fpm_unix_init_main() ||
-+ 0 > fpm_env_init_main() ||
-+ 0 > fpm_signals_init_main() ||
-+ 0 > fpm_pctl_init_main(argc, argv) ||
-+ 0 > fpm_children_init_main() ||
-+ 0 > fpm_sockets_init_main() ||
-+ 0 > fpm_event_init_main() ||
-+ 0 > fpm_worker_pool_init_main() ||
-+ 0 > fpm_php_init_main()) {
-+ return -1;
-+ }
++ /* autodetected values should be removed
++ if these vars specified in config */
++ if (!strcmp(kv->key, "USER")) {
++ free(wp->user);
++ wp->user = 0;
++ }
+
-+ if (0 > fpm_conf_write_pid()) {
-+ return -1;
++ if (!strcmp(kv->key, "HOME")) {
++ free(wp->home);
++ wp->home = 0;
++ }
+ }
+
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "fpm is running, pid %d", (int) getpid());
-+
+ return 0;
+}
+
-+/* children: return listening socket
-+ parent: never return */
-+int fpm_run(int *max_requests)
++int fpm_env_init_main()
+{
+ struct fpm_worker_pool_s *wp;
+
-+ /* create initial children in all pools */
+ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
-+ int is_parent;
-+
-+ is_parent = fpm_children_create_initial(wp);
+
-+ if (!is_parent) {
-+ goto run_child;
++ if (0 > fpm_env_conf_wp(wp)) {
++ return -1;
+ }
++
+ }
+
-+ /* run event loop forever */
-+ fpm_event_loop();
++ return 0;
++}
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_env.h php-src/sapi/fpm/fpm/fpm_env.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_env.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_env.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,24 @@
+
-+ if (!fpm_globals.is_child) {
-+ fpm_cleanups_run(FPM_CLEANUP_PARENT_EXIT);
-+ exit(0);
-+ }
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+run_child: /* all others are worker children */
++#ifndef FPM_ENV_H
++#define FPM_ENV_H 1
+
-+ fpm_cleanups_run(FPM_CLEANUP_CHILD);
++#include "fpm_worker_pool.h"
+
-+ *max_requests = fpm_globals.max_requests;
-+ return fpm_globals.listening_socket;
-+}
++int fpm_env_init_child(struct fpm_worker_pool_s *wp);
++int fpm_env_init_main();
+
-+static int request_in_progress = 0;
++extern char **environ;
+
-+void fpm_request_start()
-+{
-+ request_in_progress = 1;
-+}
++#ifndef HAVE_SETENV
++int setenv(char *name, char *value, int overwrite);
++#endif
+
-+void fpm_request_finish()
-+{
-+ request_in_progress = 0;
-+}
++#ifndef HAVE_CLEARENV
++void clearenv();
++#endif
++
++#endif
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_children.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_children.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_children.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_children.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,333 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_events.c php-src/sapi/fpm/fpm/fpm_events.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_events.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_events.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,135 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
+#include "fpm_config.h"
+
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#include <time.h>
+#include <unistd.h>
++#include <errno.h>
++#include <stdlib.h> /* for putenv */
+#include <string.h>
-+#include <stdio.h>
++#include <sys/types.h> /* for event.h below */
++#include <event.h>
+
+#include "fpm.h"
-+#include "fpm_children.h"
-+#include "fpm_signals.h"
-+#include "fpm_worker_pool.h"
-+#include "fpm_sockets.h"
+#include "fpm_process_ctl.h"
-+#include "fpm_php.h"
-+#include "fpm_conf.h"
-+#include "fpm_cleanup.h"
+#include "fpm_events.h"
++#include "fpm_cleanup.h"
+#include "fpm_stdio.h"
-+#include "fpm_unix.h"
-+#include "fpm_env.h"
-+
++#include "fpm_signals.h"
++#include "fpm_children.h"
+#include "zlog.h"
+
-+static time_t *last_faults;
-+static int fault;
-+
-+static struct fpm_child_s **fpm_children;
-+static int fpm_children_allocated, fpm_children_used;
-+
-+static int fpm_children_make(struct fpm_worker_pool_s *wp, int in_event_loop);
-+
-+static void fpm_children_cleanup(int which, void *arg)
++static void fpm_event_cleanup(int which, void *arg)
+{
-+ free(fpm_children);
-+ free(last_faults);
-+ fpm_children_allocated = fpm_children_used = 0;
-+ fpm_children = 0;
++ event_base_free(0);
+}
+
-+static struct fpm_child_s *fpm_child_alloc()
++static void fpm_got_signal(int fd, short ev, void *arg)
+{
-+ struct fpm_child_s *ret;
-+
-+ if (fpm_children_used == fpm_children_allocated) {
-+ int new_size = fpm_children_allocated + 1024;
-+ void *new_ptr = realloc(fpm_children, sizeof(struct fpm_child_s *) * new_size);
++ char c;
++ int res;
+
-+ if (!new_ptr) return 0;
++ do {
+
-+ fpm_children_allocated = new_size;
-+ fpm_children = new_ptr;
-+ }
++ do {
++ res = read(fd, &c, 1);
++ } while (res == -1 && errno == EINTR);
+
-+ ret = malloc(sizeof(struct fpm_child_s));
++ if (res <= 0) {
++ if (res < 0 && errno != EAGAIN && errno != EWOULDBLOCK) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "read() failed");
++ }
++ return;
++ }
+
-+ if (!ret) return 0;
++ switch (c) {
++ case 'C' : /* SIGCHLD */
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGCHLD");
++ fpm_children_bury();
++ break;
++ case 'I' : /* SIGINT */
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGINT");
++ fpm_pctl(FPM_PCTL_STATE_TERMINATING, FPM_PCTL_ACTION_SET);
++ break;
++ case 'T' : /* SIGTERM */
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGTERM");
++ fpm_pctl(FPM_PCTL_STATE_TERMINATING, FPM_PCTL_ACTION_SET);
++ break;
++ case 'Q' : /* SIGQUIT */
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGQUIT");
++ fpm_pctl(FPM_PCTL_STATE_FINISHING, FPM_PCTL_ACTION_SET);
++ break;
++ case '1' : /* SIGUSR1 */
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGUSR1");
++ if (0 == fpm_stdio_open_error_log(1)) {
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "log file re-opened");
++ }
++ break;
++ case '2' : /* SIGUSR2 */
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGUSR2");
++ fpm_pctl(FPM_PCTL_STATE_RELOADING, FPM_PCTL_ACTION_SET);
++ break;
++ }
+
-+ fpm_children[fpm_children_used++] = ret;
++ if (fpm_globals.is_child) {
++ break;
++ }
+
-+ memset(ret, 0, sizeof(*ret));
++ } while (1);
+
-+ return ret;
++ return;
+}
+
-+static void fpm_child_free(struct fpm_child_s *child, int in_event_loop)
++int fpm_event_init_main()
+{
-+ int i;
-+
-+ if (child->fd_stdout != -1) {
-+ if (in_event_loop) {
-+ fpm_event_fire(&child->ev_stdout);
-+ }
-+ if (child->fd_stdout != -1) {
-+ close(child->fd_stdout);
-+ }
-+ }
++ event_init();
+
-+ if (child->fd_stderr != -1) {
-+ if (in_event_loop) {
-+ fpm_event_fire(&child->ev_stderr);
-+ }
-+ if (child->fd_stderr != -1) {
-+ close(child->fd_stderr);
-+ }
-+ }
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "libevent: using %s", event_get_method());
+
-+ for (i = 0; i < fpm_children_used; i++) {
-+ if (fpm_children[i] == child) {
-+ if (i < fpm_children_used - 1) {
-+ fpm_children[i] = fpm_children[fpm_children_used - 1];
-+ }
-+ --fpm_children_used;
-+ break;
-+ }
++ if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_event_cleanup, 0)) {
++ return -1;
+ }
+
-+ free(child);
++ return 0;
+}
+
-+static int fpm_child_add(struct fpm_worker_pool_s *wp, pid_t pid)
++int fpm_event_loop()
+{
-+ struct fpm_child_s *child = fpm_child_alloc();
++ static struct event signal_fd_event;
+
-+ if (!child) {
-+ return -1;
-+ }
++ event_set(&signal_fd_event, fpm_signals_get_fd(), EV_PERSIST | EV_READ, &fpm_got_signal, 0);
+
-+ child->wp = wp;
-+ child->pid = pid;
-+ gettimeofday(&child->started, 0);
-+ child->fd_stdout = child->fd_stderr = -1;
++ event_add(&signal_fd_event, 0);
+
-+ fpm_stdio_parent_use_pipes(child);
++ fpm_pctl_heartbeat(-1, 0, 0);
+
-+ ++child->wp->running_children;
-+ ++fpm_globals.running_children;
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "libevent: entering main loop");
+
-+ child->next = child->wp->children;
-+ if (child->next) child->next->prev = child;
-+ child->prev = 0;
-+ child->wp->children = child;
++ event_loop(0);
+
+ return 0;
+}
+
-+static struct fpm_child_s *fpm_child_remove(pid_t pid)
++int fpm_event_add(int fd, struct event *ev, void (*callback)(int, short, void *), void *arg)
+{
-+ int i;
-+ struct fpm_child_s *child = 0;
-+
-+ for (i = 0; i < fpm_children_used; i++) {
-+ if (fpm_children[i]->pid == pid) {
-+ child = fpm_children[i];
-+ break;
-+ }
-+ }
-+
-+ if (!child) {
-+ return 0;
-+ }
-+
-+ --child->wp->running_children;
-+ --fpm_globals.running_children;
-+
-+ if (child->prev) child->prev->next = child->next;
-+ else child->wp->children = child->next;
-+ if (child->next) child->next->prev = child->prev;
++ event_set(ev, fd, EV_PERSIST | EV_READ, callback, arg);
+
-+ return child;
++ return event_add(ev, 0);
+}
+
-+static void fpm_child_init(struct fpm_worker_pool_s *wp)
++int fpm_event_del(struct event *ev)
+{
-+ fpm_globals.max_requests = wp->config->max_requests;
-+ fpm_stdio_init_child(wp);
-+ fpm_unix_init_child(wp);
-+ fpm_signals_init_child();
-+ fpm_env_init_child(wp);
-+ fpm_php_init_child(wp);
++ return event_del(ev);
+}
+
-+int fpm_children_free(struct fpm_child_s *child)
++void fpm_event_exit_loop()
+{
-+ struct fpm_child_s *next;
-+
-+ for (; child; child = next) {
-+ next = child->next;
-+ fpm_child_free(child, 0 /* in_event_loop */);
-+ }
-+
-+ return 0;
++ event_loopbreak();
+}
+
-+#ifndef WCOREDUMP
-+#define WCOREDUMP(x) 0
-+#endif
-+
-+void fpm_children_bury()
++void fpm_event_fire(struct event *ev)
+{
-+ int status;
-+ pid_t pid;
-+ struct fpm_child_s *child;
++ (*ev->ev_callback)( (int) ev->ev_fd, (short) ev->ev_res, ev->ev_arg);
++}
+
-+ while ( (pid = waitpid(-1, &status, WNOHANG)) > 0) {
-+ char buf[128];
-+ int severity = ZLOG_NOTICE;
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_events.h php-src/sapi/fpm/fpm/fpm_events.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_events.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_events.h 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,16 @@
+
-+ if (WIFEXITED(status)) {
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ snprintf(buf, sizeof(buf), "with code %d", WEXITSTATUS(status));
++#ifndef FPM_EVENTS_H
++#define FPM_EVENTS_H 1
+
-+ if (WEXITSTATUS(status) != 0) {
-+ severity = ZLOG_WARNING;
-+ }
++void fpm_event_exit_loop();
++int fpm_event_loop();
++int fpm_event_add(int fd, struct event *ev, void (*callback)(int, short, void *), void *arg);
++int fpm_event_del(struct event *ev);
++void fpm_event_fire(struct event *ev);
++int fpm_event_init_main();
+
-+ }
-+ else {
+
-+ snprintf(buf, sizeof(buf), "on signal %d %s%s", WTERMSIG(status),
-+ fpm_signal_names[WTERMSIG(status)] ? fpm_signal_names[WTERMSIG(status)] : "",
-+ WCOREDUMP(status) ? " (core dumped)" : "");
++#endif
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm.h php-src/sapi/fpm/fpm/fpm.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,28 @@
++
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ if (WTERMSIG(status) != SIGQUIT) { /* possible request loss */
-+ severity = ZLOG_WARNING;
-+ }
-+ }
++#ifndef FPM_H
++#define FPM_H 1
+
-+ child = fpm_child_remove(pid);
++#include <unistd.h>
+
-+ if (child) {
-+ struct fpm_worker_pool_s *wp = child->wp;
-+ struct timeval tv1, tv2;
++int fpm_run(int *max_requests);
++int fpm_init(int argc, char **argv, char *config);
+
-+ gettimeofday(&tv1, 0);
++struct fpm_globals_s {
++ pid_t parent_pid;
++ int argc;
++ char **argv;
++ char *config;
++ int running_children;
++ int error_log_fd;
++ int log_level;
++ int listening_socket; /* for this child */
++ int max_requests; /* for this child */
++ int is_child;
++};
+
-+ timersub(&tv1, &child->started, &tv2);
++extern struct fpm_globals_s fpm_globals;
+
-+ zlog(ZLOG_STUFF, severity, "child %d (pool %s) exited %s after %ld.%06d seconds", pid,
-+ child->wp->config->name, buf, tv2.tv_sec, (int) tv2.tv_usec);
++#endif
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_php.c php-src/sapi/fpm/fpm/fpm_php.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_php.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_php.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,189 @@
+
-+ fpm_child_free(child, 1 /* in event_loop */);
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ fpm_pctl_child_exited();
++#include "fpm_config.h"
+
-+ if (last_faults && (WTERMSIG(status) == SIGSEGV || WTERMSIG(status) == SIGBUS)) {
-+ time_t now = tv1.tv_sec;
-+ int restart_condition = 1;
-+ int i;
++#include <stdlib.h>
++#include <string.h>
++#include <stdio.h>
+
-+ last_faults[fault++] = now;
++#include "php.h"
++#include "php_main.h"
++#include "php_ini.h"
++#include "ext/standard/dl.h"
+
-+ if (fault == fpm_global_options.emergency_restart_threshold) {
-+ fault = 0;
-+ }
++#include "cgi/fastcgi.h"
+
-+ for (i = 0; i < fpm_global_options.emergency_restart_threshold; i++) {
-+ if (now - last_faults[i] > fpm_global_options.emergency_restart_interval) {
-+ restart_condition = 0;
-+ break;
-+ }
-+ }
++#include "fpm.h"
++#include "fpm_php.h"
++#include "fpm_cleanup.h"
++#include "fpm_worker_pool.h"
+
-+ if (restart_condition) {
++static int zend_ini_alter_master(char *name, int name_length, char *new_value, int new_value_length, int stage TSRMLS_DC)
++{
++ zend_ini_entry *ini_entry;
++ char *duplicate;
+
-+ zlog(ZLOG_STUFF, ZLOG_WARNING, "failed processes threshold (%d in %d sec) is reached, initiating reload",
-+ fpm_global_options.emergency_restart_threshold, fpm_global_options.emergency_restart_interval);
++ if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry) == FAILURE) {
++ return FAILURE;
++ }
+
-+ fpm_pctl(FPM_PCTL_STATE_RELOADING, FPM_PCTL_ACTION_SET);
-+ }
-+ }
++ duplicate = strdup(new_value);
+
-+ fpm_children_make(wp, 1 /* in event loop */);
-+ }
-+ else {
-+ zlog(ZLOG_STUFF, ZLOG_ALERT, "oops, unknown child exited %s", buf);
-+ }
++ if (!ini_entry->on_modify
++ || ini_entry->on_modify(ini_entry, duplicate, new_value_length,
++ ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC) == SUCCESS) {
++ ini_entry->value = duplicate;
++ ini_entry->value_length = new_value_length;
++ } else {
++ free(duplicate);
+ }
+
++ return SUCCESS;
+}
+
-+static int fpm_children_make(struct fpm_worker_pool_s *wp, int in_event_loop)
++static void fpm_php_disable(char *value, int (*zend_disable)(char *, uint TSRMLS_DC) TSRMLS_DC)
+{
-+ int enough = 0;
-+
-+ while (!enough && fpm_pctl_can_spawn_children() && wp->running_children < wp->config->pm->max_children) {
-+ pid_t pid;
-+
-+ if (0 > fpm_stdio_child_prepare_pipes(wp)) {
-+ enough = 1;
-+ break;
-+ }
-+
-+ pid = fork();
++ char *s = 0, *e = value;
+
-+ switch (pid) {
-+
-+ case 0 :
-+ fpm_globals.is_child = 1;
-+ if (in_event_loop) {
-+ fpm_event_exit_loop();
++ while (*e) {
++ switch (*e) {
++ case ' ':
++ case ',':
++ if (s) {
++ *e = '\0';
++ zend_disable(s, e - s TSRMLS_CC);
++ s = 0;
+ }
-+ fpm_child_init(wp);
-+ return 0;
-+
-+ case -1 :
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fork() failed");
-+ enough = 1;
-+ break; /* dont try any more on error */
-+
-+ default :
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "child %d (pool %s) started", (int) pid, wp->config->name);
-+
-+ if (fpm_child_add(wp, pid)) {
-+ zlog(ZLOG_STUFF, ZLOG_ERROR, "fpm_child_add() failed for pid %d (pool %s)", (int) pid, wp->config->name);
-+ enough = 1;
-+ break;
++ break;
++ default:
++ if (!s) {
++ s = e;
+ }
++ break;
+ }
-+
++ e++;
+ }
+
-+ return 1; /* we are done */
++ if (s) {
++ zend_disable(s, e - s TSRMLS_CC);
++ }
+}
+
-+int fpm_children_create_initial(struct fpm_worker_pool_s *wp)
++static int fpm_php_apply_defines(struct fpm_worker_pool_s *wp)
+{
-+ return fpm_children_make(wp, 0 /* not in event loop yet */);
-+}
++ TSRMLS_FETCH();
++ struct key_value_s *kv;
+
-+int fpm_children_init_main()
-+{
-+ if (fpm_global_options.emergency_restart_threshold &&
-+ fpm_global_options.emergency_restart_interval) {
++ for (kv = wp->config->php_defines; kv; kv = kv->next) {
++ char *name = kv->key;
++ char *value = kv->value;
++ int name_len = strlen(name);
++ int value_len = strlen(value);
+
-+ last_faults = malloc(sizeof(time_t) * fpm_global_options.emergency_restart_threshold);
++ if (!strcmp(name, "extension") && *value) {
++ zval zv;
+
-+ if (!last_faults) {
-+ return -1;
++#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50300)
++ php_dl(value, MODULE_PERSISTENT, &zv, 1 TSRMLS_CC);
++#else
++ zval filename;
++ ZVAL_STRINGL(&filename, value, value_len, 0);
++#if (PHP_MAJOR_VERSION >= 5)
++ php_dl(&filename, MODULE_PERSISTENT, &zv, 1 TSRMLS_CC);
++#else
++ php_dl(&filename, MODULE_PERSISTENT, &zv TSRMLS_CC);
++#endif
++#endif
++ continue;
+ }
+
-+ memset(last_faults, 0, sizeof(time_t) * fpm_global_options.emergency_restart_threshold);
-+ }
++ zend_ini_alter_master(name, name_len + 1, value, value_len, PHP_INI_STAGE_ACTIVATE TSRMLS_CC);
+
-+ fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_children_cleanup, 0);
++ if (!strcmp(name, "disable_functions") && *value) {
++ char *v = strdup(value);
++#if (PHP_MAJOR_VERSION >= 5)
++ PG(disable_functions) = v;
++#endif
++ fpm_php_disable(v, zend_disable_function TSRMLS_CC);
++ }
++ else if (!strcmp(name, "disable_classes") && *value) {
++ char *v = strdup(value);
++#if (PHP_MAJOR_VERSION >= 5)
++ PG(disable_classes) = v;
++#endif
++ fpm_php_disable(v, zend_disable_class TSRMLS_CC);
++ }
++ }
+
+ return 0;
+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_children.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_children.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_children.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_children.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,30 @@
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
-+
-+#ifndef FPM_CHILDREN_H
-+#define FPM_CHILDREN_H 1
-+
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <event.h>
-+
-+#include "fpm_worker_pool.h"
-+
-+int fpm_children_create_initial(struct fpm_worker_pool_s *wp);
-+int fpm_children_free(struct fpm_child_s *child);
-+void fpm_children_bury();
-+int fpm_children_init_main();
-+
-+struct fpm_child_s;
-+
-+struct fpm_child_s {
-+ struct fpm_child_s *prev, *next;
-+ struct timeval started;
-+ struct fpm_worker_pool_s *wp;
-+ struct event ev_stdout, ev_stderr;
-+ int fd_stdout, fd_stderr;
-+ pid_t pid;
-+};
++static int fpm_php_set_allowed_clients(struct fpm_worker_pool_s *wp)
++{
++ if (wp->listen_address_domain == FPM_AF_INET) {
++ fcgi_set_allowed_clients(wp->config->allowed_clients);
++ }
+
-+#endif
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_cleanup.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_cleanup.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_cleanup.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_cleanup.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,56 @@
++ return 0;
++}
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++static int fpm_php_set_fcgi_mgmt_vars(struct fpm_worker_pool_s *wp)
++{
++ char max_workers[10 + 1]; /* 4294967295 */
++ int len;
+
-+#include "fpm_config.h"
++ len = sprintf(max_workers, "%u", (unsigned int) wp->config->pm->max_children);
+
-+#include <stdlib.h>
++ fcgi_set_mgmt_var("FCGI_MAX_CONNS", sizeof("FCGI_MAX_CONNS")-1, max_workers, len);
++ fcgi_set_mgmt_var("FCGI_MAX_REQS", sizeof("FCGI_MAX_REQS")-1, max_workers, len);
+
-+#include "fpm_cleanup.h"
-+#include "zlog.h"
++ return 0;
++}
+
-+struct cleanup_s {
-+ int type;
-+ void (*cleanup)(int, void *);
-+ void *arg;
-+};
++char *fpm_php_script_filename(TSRMLS_D)
++{
++ return SG(request_info).path_translated;
++}
+
-+static int cleanups_allocated, cleanups_used;
-+struct cleanup_s *cleanups;
++char *fpm_php_request_method(TSRMLS_D)
++{
++ return (char *) SG(request_info).request_method;
++}
+
-+int fpm_cleanup_add(int type, void (*cleanup)(int, void *), void *arg)
++size_t fpm_php_content_length(TSRMLS_D)
+{
-+ if (cleanups_used == cleanups_allocated) {
-+ int new_size = cleanups_allocated + 100;
++ return SG(request_info).content_length;
++}
+
-+ void *new_ptr = realloc(cleanups, sizeof(struct cleanup_s) * new_size);
++static void fpm_php_cleanup(int which, void *arg)
++{
++ TSRMLS_FETCH();
++ php_module_shutdown(TSRMLS_C);
++ sapi_shutdown();
++}
+
-+ if (!new_ptr) return -1;
++void fpm_php_soft_quit()
++{
++ fcgi_set_in_shutdown(1);
++}
+
-+ cleanups = new_ptr;
-+ cleanups_allocated = new_size;
++int fpm_php_init_main()
++{
++ if (0 > fpm_cleanup_add(FPM_CLEANUP_PARENT, fpm_php_cleanup, 0)) {
++ return -1;
+ }
+
-+ cleanups[cleanups_used].type = type;
-+ cleanups[cleanups_used].cleanup = cleanup;
-+ cleanups[cleanups_used].arg = arg;
-+
-+ ++cleanups_used;
-+
+ return 0;
+}
+
-+void fpm_cleanups_run(int type)
++int fpm_php_init_child(struct fpm_worker_pool_s *wp)
+{
-+ int cl = cleanups_used;
-+
-+ while (cl--) {
-+ struct cleanup_s *c = &cleanups[cl];
-+ if (c->type & type) {
-+ c->cleanup(type, c->arg);
-+ }
++ if (0 > fpm_php_apply_defines(wp) ||
++ 0 > fpm_php_set_allowed_clients(wp)) {
++ return -1;
+ }
+
-+ cleanups_used = 0;
-+ free(cleanups);
++ return 0;
+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_cleanup.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_cleanup.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_cleanup.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_cleanup.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,21 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_php.h php-src/sapi/fpm/fpm/fpm_php.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_php.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_php.h 2009-10-18 21:05:39.302497288 +0100
+@@ -0,0 +1,22 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+#ifndef FPM_CLEANUP_H
-+#define FPM_CLEANUP_H 1
++#ifndef FPM_PHP_H
++#define FPM_PHP_H 1
+
-+int fpm_cleanup_add(int type, void (*cleanup)(int, void *), void *);
-+void fpm_cleanups_run(int type);
++#include <TSRM.h>
+
-+enum {
-+ FPM_CLEANUP_CHILD = (1 << 0),
-+ FPM_CLEANUP_PARENT_EXIT = (1 << 1),
-+ FPM_CLEANUP_PARENT_EXIT_MAIN = (1 << 2),
-+ FPM_CLEANUP_PARENT_EXEC = (1 << 3),
-+ FPM_CLEANUP_PARENT = (1 << 1) | (1 << 2) | (1 << 3),
-+ FPM_CLEANUP_ALL = ~0,
-+};
++#include "build-defs.h" /* for PHP_ defines */
++
++struct fpm_worker_pool_s;
++
++int fpm_php_init_child(struct fpm_worker_pool_s *wp);
++char *fpm_php_script_filename(TSRMLS_D);
++char *fpm_php_request_method(TSRMLS_D);
++size_t fpm_php_content_length(TSRMLS_D);
++void fpm_php_soft_quit();
++int fpm_php_init_main();
+
+#endif
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_conf.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_conf.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_conf.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_conf.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,467 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_php_trace.c php-src/sapi/fpm/fpm/fpm_php_trace.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_php_trace.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_php_trace.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,176 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
+#include "fpm_config.h"
+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <string.h>
-+#include <stdlib.h>
++#if HAVE_FPM_TRACE
++
++#include "php.h"
++#include "php_main.h"
++
++#include <stdio.h>
+#include <stddef.h>
++#if HAVE_INTTYPES_H
++#include <inttypes.h>
++#else
+#include <stdint.h>
-+#include <stdio.h>
++#endif
++
+#include <unistd.h>
++#include <sys/time.h>
++#include <sys/types.h>
++#include <errno.h>
+
-+#include "fpm.h"
-+#include "fpm_conf.h"
++#include "fpm_trace.h"
++#include "fpm_php_trace.h"
++#include "fpm_children.h"
+#include "fpm_worker_pool.h"
-+#include "fpm_cleanup.h"
-+#include "fpm_php.h"
-+#include "fpm_sockets.h"
-+#include "xml_config.h"
++#include "fpm_process_ctl.h"
++
+#include "zlog.h"
+
+
-+struct fpm_options_s fpm_global_options;
++#define valid_ptr(p) ((p) && 0 == ((p) & (sizeof(long) - 1)))
++
++#if SIZEOF_LONG == 4
++#define PTR_FMT "08"
++#elif SIZEOF_LONG == 8
++#define PTR_FMT "016"
++#endif
++
+
-+static void *fpm_global_options_ptr()
++static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog TSRMLS_DC)
+{
-+ return &fpm_global_options;
-+}
++ int callers_limit = 20;
++ pid_t pid = child->pid;
++ struct timeval tv;
++ static const int buf_size = 1024;
++ char buf[buf_size];
++ long execute_data;
++ long l;
+
-+static struct xml_conf_section xml_section_fpm_global_options = {
-+ .conf = &fpm_global_options_ptr,
-+ .path = "/configuration/global_options",
-+ .parsers = {
-+ { XML_CONF_SCALAR, "emergency_restart_threshold", &xml_conf_set_slot_integer, offsetof(struct fpm_options_s, emergency_restart_threshold) },
-+ { XML_CONF_SCALAR, "emergency_restart_interval", &xml_conf_set_slot_time, offsetof(struct fpm_options_s, emergency_restart_interval) },
-+ { XML_CONF_SCALAR, "process_control_timeout", &xml_conf_set_slot_time, offsetof(struct fpm_options_s, process_control_timeout) },
-+ { XML_CONF_SCALAR, "daemonize", &xml_conf_set_slot_boolean, offsetof(struct fpm_options_s, daemonize) },
-+ { XML_CONF_SCALAR, "pid_file", &xml_conf_set_slot_string, offsetof(struct fpm_options_s, pid_file) },
-+ { XML_CONF_SCALAR, "error_log", &xml_conf_set_slot_string, offsetof(struct fpm_options_s, error_log) },
-+ { 0, 0, 0, 0 }
-+ }
-+};
++ gettimeofday(&tv, 0);
+
-+static char *fpm_conf_set_pm_style(void **conf, char *name, void *vv, intptr_t offset)
-+{
-+ char *value = vv;
-+ struct fpm_pm_s *c = *conf;
++ zlog_print_time(&tv, buf, buf_size);
+
-+ if (!strcmp(value, "static")) {
-+ c->style = PM_STYLE_STATIC;
-+ }
-+ else if (!strcmp(value, "apache-like")) {
-+ c->style = PM_STYLE_APACHE_LIKE;
++ fprintf(slowlog, "\n%s pid %d (pool %s)\n", buf, (int) pid, child->wp->config->name);
++
++ if (0 > fpm_trace_get_strz(buf, buf_size, (long) &SG(request_info).path_translated)) {
++ return -1;
+ }
-+ else {
-+ return "invalid value for 'style'";
++
++ fprintf(slowlog, "script_filename = %s\n", buf);
++
++ if (0 > fpm_trace_get_long((long) &EG(current_execute_data), &l)) {
++ return -1;
+ }
+
-+ return NULL;
-+}
++ execute_data = l;
+
-+static char *fpm_conf_set_rlimit_core(void **conf, char *name, void *vv, intptr_t offset)
-+{
-+ char *value = vv;
-+ struct fpm_worker_pool_config_s *c = *conf;
++ while (execute_data) {
++ long function;
++ uint lineno = 0;
+
-+ if (!strcmp(value, "unlimited")) {
-+ c->rlimit_core = -1;
-+ }
-+ else {
-+ int int_value;
-+ void *subconf = &int_value;
-+ char *error;
++ fprintf(slowlog, "[0x%" PTR_FMT "lx] ", execute_data);
+
-+ error = xml_conf_set_slot_integer(&subconf, name, vv, 0);
++ if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, function_state.function), &l)) {
++ return -1;
++ }
+
-+ if (error) return error;
++ function = l;
+
-+ if (int_value < 0) return "invalid value for 'rlimit_core'";
++ if (valid_ptr(function)) {
++ if (0 > fpm_trace_get_strz(buf, buf_size, function + offsetof(zend_function, common.function_name))) {
++ return -1;
++ }
+
-+ c->rlimit_core = int_value;
-+ }
++ fprintf(slowlog, "%s()", buf);
++ }
++ else {
++ fprintf(slowlog, "???");
++ }
+
-+ return NULL;
-+}
++ if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, op_array), &l)) {
++ return -1;
++ }
+
-+static char *fpm_conf_set_catch_workers_output(void **conf, char *name, void *vv, intptr_t offset)
-+{
-+ struct fpm_worker_pool_config_s *c = *conf;
-+ int int_value;
-+ void *subconf = &int_value;
-+ char *error;
++ *buf = '\0';
+
-+ error = xml_conf_set_slot_boolean(&subconf, name, vv, 0);
++ if (valid_ptr(l)) {
++ long op_array = l;
+
-+ if (error) return error;
++ if (0 > fpm_trace_get_strz(buf, buf_size, op_array + offsetof(zend_op_array, filename))) {
++ return -1;
++ }
++ }
+
-+ c->catch_workers_output = int_value;
++ if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, opline), &l)) {
++ return -1;
++ }
+
-+ return NULL;
-+}
++ if (valid_ptr(l)) {
++ long opline = l;
++ uint *lu = (uint *) &l;
+
-+static char *fpm_conf_set_apache_like_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
-+{
-+ static struct xml_conf_section fpm_conf_set_apache_like_subsection_conf = {
-+ .path = "apache_like somewhere", /* fixme */
-+ .parsers = {
-+ { XML_CONF_SCALAR, "StartServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.StartServers) },
-+ { XML_CONF_SCALAR, "MinSpareServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.MinSpareServers) },
-+ { XML_CONF_SCALAR, "MaxSpareServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.MaxSpareServers) },
-+ { 0, 0, 0, 0 }
++ if (0 > fpm_trace_get_long(opline + offsetof(struct _zend_op, lineno), &l)) {
++ return -1;
++ }
++
++ lineno = *lu;
+ }
-+ };
+
-+ return xml_conf_parse_section(conf, &fpm_conf_set_apache_like_subsection_conf, xml_node);
++ fprintf(slowlog, " %s:%u\n", *buf ? buf : "unknown", lineno);
++
++ if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, prev_execute_data), &l)) {
++ return -1;
++ }
++
++ execute_data = l;
++
++ if (0 == --callers_limit) {
++ break;
++ }
++ }
++
++ return 0;
+}
+
-+static char *fpm_conf_set_listen_options_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
++void fpm_php_trace(struct fpm_child_s *child)
+{
-+ void *subconf = (char *) *conf + offset;
-+ struct fpm_listen_options_s *lo;
++ TSRMLS_FETCH();
++ FILE *slowlog;
+
-+ static struct xml_conf_section fpm_conf_set_listen_options_subsection_conf = {
-+ .path = "listen options somewhere", /* fixme */
-+ .parsers = {
-+ { XML_CONF_SCALAR, "backlog", &xml_conf_set_slot_integer, offsetof(struct fpm_listen_options_s, backlog) },
-+ { XML_CONF_SCALAR, "owner", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, owner) },
-+ { XML_CONF_SCALAR, "group", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, group) },
-+ { XML_CONF_SCALAR, "mode", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, mode) },
-+ { 0, 0, 0, 0 }
-+ }
-+ };
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "about to trace %d", (int) child->pid);
+
-+ lo = malloc(sizeof(*lo));
++ slowlog = fopen(child->wp->config->slowlog, "a+");
+
-+ if (!lo) {
-+ return "fpm_conf_set_listen_options_subsection(): malloc failed";
++ if (!slowlog) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fopen(%s) failed", child->wp->config->slowlog);
++ goto done0;
+ }
+
-+ memset(lo, 0, sizeof(*lo));
++ if (0 > fpm_trace_ready(child->pid)) {
++ goto done1;
++ }
+
-+ lo->backlog = -1;
++ if (0 > fpm_php_trace_dump(child, slowlog TSRMLS_CC)) {
++ fprintf(slowlog, "+++ dump failed\n");
++ }
+
-+ * (struct fpm_listen_options_s **) subconf = lo;
++ if (0 > fpm_trace_close(child->pid)) {
++ goto done1;
++ }
+
-+ subconf = lo;
++done1:
++ fclose(slowlog);
+
-+ return xml_conf_parse_section(&subconf, &fpm_conf_set_listen_options_subsection_conf, xml_node);
++done0:
++ fpm_pctl_kill(child->pid, FPM_PCTL_CONT);
++ child->tracer = 0;
++
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "finished trace of %d", (int) child->pid);
+}
+
-+static char *fpm_conf_set_pm_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
-+{
-+ void *subconf = (char *) *conf + offset;
-+ struct fpm_pm_s *pm;
++#endif
+
-+ static struct xml_conf_section fpm_conf_set_pm_subsection_conf = {
-+ .path = "pm settings somewhere", /* fixme */
-+ .parsers = {
-+ { XML_CONF_SCALAR, "style", &fpm_conf_set_pm_style, 0 },
-+ { XML_CONF_SCALAR, "max_children", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, max_children) },
-+ { XML_CONF_SUBSECTION, "apache_like", &fpm_conf_set_apache_like_subsection, offsetof(struct fpm_pm_s, options_apache_like) },
-+ { 0, 0, 0, 0 }
-+ }
-+ };
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_php_trace.h php-src/sapi/fpm/fpm/fpm_php_trace.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_php_trace.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_php_trace.h 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,13 @@
+
-+ pm = malloc(sizeof(*pm));
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ if (!pm) {
-+ return "fpm_conf_set_pm_subsection(): malloc failed";
-+ }
++#ifndef FPM_PHP_TRACE_H
++#define FPM_PHP_TRACE_H 1
+
-+ memset(pm, 0, sizeof(*pm));
++struct fpm_child_s;
+
-+ * (struct fpm_pm_s **) subconf = pm;
++void fpm_php_trace(struct fpm_child_s *);
+
-+ subconf = pm;
++#endif
+
-+ return xml_conf_parse_section(&subconf, &fpm_conf_set_pm_subsection_conf, xml_node);
-+}
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_process_ctl.c php-src/sapi/fpm/fpm/fpm_process_ctl.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_process_ctl.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_process_ctl.c 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,354 @@
+
-+static char *xml_conf_set_slot_key_value_pair(void **conf, char *name, void *vv, intptr_t offset)
-+{
-+ char *value = vv;
-+ struct key_value_s *kv;
-+ struct key_value_s ***parent = (struct key_value_s ***) conf;
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ kv = malloc(sizeof(*kv));
++#include "fpm_config.h"
+
-+ if (!kv) {
-+ return "xml_conf_set_slot_key_value_pair(): malloc() failed";
-+ }
++#include <sys/types.h>
++#include <signal.h>
++#include <unistd.h>
++#include <stdlib.h>
+
-+ memset(kv, 0, sizeof(*kv));
++#include "fpm.h"
++#include "fpm_clock.h"
++#include "fpm_children.h"
++#include "fpm_signals.h"
++#include "fpm_events.h"
++#include "fpm_process_ctl.h"
++#include "fpm_cleanup.h"
++#include "fpm_request.h"
++#include "fpm_worker_pool.h"
++#include "zlog.h"
+
-+ kv->key = strdup(name);
-+ kv->value = strdup(value);
+
-+ if (!kv->key || !kv->value) {
-+ return "xml_conf_set_slot_key_value_pair(): strdup() failed";
-+ }
++static int fpm_state = FPM_PCTL_STATE_NORMAL;
++static int fpm_signal_sent = 0;
+
-+ **parent = kv;
+
-+ *parent = &kv->next;
++static const char *fpm_state_names[] = {
++ [FPM_PCTL_STATE_NORMAL] = "normal",
++ [FPM_PCTL_STATE_RELOADING] = "reloading",
++ [FPM_PCTL_STATE_TERMINATING] = "terminating",
++ [FPM_PCTL_STATE_FINISHING] = "finishing"
++};
+
-+ return NULL;
-+}
++static int saved_argc;
++static char **saved_argv;
+
-+static char *fpm_conf_set_key_value_pairs_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
++static void fpm_pctl_cleanup(int which, void *arg)
+{
-+ void *next_kv = (char *) *conf + offset;
++ int i;
++
++ if (which != FPM_CLEANUP_PARENT_EXEC) {
+
-+ static struct xml_conf_section fpm_conf_set_key_value_pairs_subsection_conf = {
-+ .path = "key_value_pairs somewhere", /* fixme */
-+ .parsers = {
-+ { XML_CONF_SCALAR, 0, &xml_conf_set_slot_key_value_pair, 0 },
-+ { 0, 0, 0, 0 }
++ for (i = 0; i < saved_argc; i++) {
++ free(saved_argv[i]);
+ }
-+ };
+
-+ return xml_conf_parse_section(&next_kv, &fpm_conf_set_key_value_pairs_subsection_conf, xml_node);
++ free(saved_argv);
++
++ }
+}
+
-+static void *fpm_worker_pool_config_alloc()
-+{
-+ static struct fpm_worker_pool_s *current_wp = 0;
-+ struct fpm_worker_pool_s *wp;
++static struct event pctl_event;
+
-+ wp = fpm_worker_pool_alloc();
++static void fpm_pctl_action(int fd, short which, void *arg)
++{
++ evtimer_del(&pctl_event);
+
-+ if (!wp) return 0;
++ memset(&pctl_event, 0, sizeof(pctl_event));
+
-+ wp->config = malloc(sizeof(struct fpm_worker_pool_config_s));
++ fpm_pctl(FPM_PCTL_STATE_UNSPECIFIED, FPM_PCTL_ACTION_TIMEOUT);
++}
+
-+ if (!wp->config) return 0;
++static int fpm_pctl_timeout_set(int sec)
++{
++ struct timeval tv = { .tv_sec = sec, .tv_usec = 0 };
+
-+ memset(wp->config, 0, sizeof(struct fpm_worker_pool_config_s));
++ if (evtimer_initialized(&pctl_event)) {
++ evtimer_del(&pctl_event);
++ }
+
-+ if (current_wp) current_wp->next = wp;
++ evtimer_set(&pctl_event, &fpm_pctl_action, 0);
+
-+ current_wp = wp;
++ evtimer_add(&pctl_event, &tv);
+
-+ return wp->config;
++ return 0;
+}
+
-+int fpm_worker_pool_config_free(struct fpm_worker_pool_config_s *wpc)
++static void fpm_pctl_exit()
+{
-+ struct key_value_s *kv, *kv_next;
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "exiting, bye-bye!");
+
-+ free(wpc->name);
-+ free(wpc->listen_address);
-+ if (wpc->listen_options) {
-+ free(wpc->listen_options->owner);
-+ free(wpc->listen_options->group);
-+ free(wpc->listen_options->mode);
-+ free(wpc->listen_options);
-+ }
-+ for (kv = wpc->php_defines; kv; kv = kv_next) {
-+ kv_next = kv->next;
-+ free(kv->key);
-+ free(kv->value);
-+ free(kv);
-+ }
-+ for (kv = wpc->environment; kv; kv = kv_next) {
-+ kv_next = kv->next;
-+ free(kv->key);
-+ free(kv->value);
-+ free(kv);
-+ }
-+ free(wpc->pm);
-+ free(wpc->user);
-+ free(wpc->group);
-+ free(wpc->chroot);
-+ free(wpc->chdir);
-+ free(wpc->allowed_clients);
++ fpm_conf_unlink_pid();
+
-+ return 0;
++ fpm_cleanups_run(FPM_CLEANUP_PARENT_EXIT_MAIN);
++
++ exit(0);
+}
+
-+static struct xml_conf_section xml_section_fpm_worker_pool_config = {
-+ .conf = &fpm_worker_pool_config_alloc,
-+ .path = "/configuration/workers/pool",
-+ .parsers = {
-+ { XML_CONF_SCALAR, "name", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, name) },
-+ { XML_CONF_SCALAR, "listen_address", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, listen_address) },
-+ { XML_CONF_SUBSECTION, "listen_options", &fpm_conf_set_listen_options_subsection, offsetof(struct fpm_worker_pool_config_s, listen_options) },
-+ { XML_CONF_SUBSECTION, "php_defines", &fpm_conf_set_key_value_pairs_subsection, offsetof(struct fpm_worker_pool_config_s, php_defines) },
-+ { XML_CONF_SCALAR, "user", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, user) },
-+ { XML_CONF_SCALAR, "group", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, group) },
-+ { XML_CONF_SCALAR, "chroot", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, chroot) },
-+ { XML_CONF_SCALAR, "chdir", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, chdir) },
-+ { XML_CONF_SCALAR, "allowed_clients", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, allowed_clients) },
-+ { XML_CONF_SUBSECTION, "environment", &fpm_conf_set_key_value_pairs_subsection, offsetof(struct fpm_worker_pool_config_s, environment) },
-+ { XML_CONF_SCALAR, "request_execution_timeout", &xml_conf_set_slot_time, offsetof(struct fpm_worker_pool_config_s, request_execution_timeout) },
-+ { XML_CONF_SCALAR, "rlimit_files", &xml_conf_set_slot_integer, offsetof(struct fpm_worker_pool_config_s, rlimit_files) },
-+ { XML_CONF_SCALAR, "rlimit_core", &fpm_conf_set_rlimit_core, 0 },
-+ { XML_CONF_SCALAR, "max_requests", &xml_conf_set_slot_integer, offsetof(struct fpm_worker_pool_config_s, max_requests) },
-+ { XML_CONF_SCALAR, "catch_workers_output", &fpm_conf_set_catch_workers_output, 0 },
-+ { XML_CONF_SUBSECTION, "pm", &fpm_conf_set_pm_subsection, offsetof(struct fpm_worker_pool_config_s, pm) },
-+ { 0, 0, 0, 0 }
-+ }
-+};
++#define optional_arg(c) (saved_argc > c ? ", \"" : ""), (saved_argc > c ? saved_argv[c] : ""), (saved_argc > c ? "\"" : "")
++
++static void fpm_pctl_exec()
++{
++
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "reloading: execvp(\"%s\", {\"%s\""
++ "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s"
++ "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s"
++ "})",
++ saved_argv[0], saved_argv[0],
++ optional_arg(1),
++ optional_arg(2),
++ optional_arg(3),
++ optional_arg(4),
++ optional_arg(5),
++ optional_arg(6),
++ optional_arg(7),
++ optional_arg(8),
++ optional_arg(9),
++ optional_arg(10)
++ );
++
++ fpm_cleanups_run(FPM_CLEANUP_PARENT_EXEC);
++
++ execvp(saved_argv[0], saved_argv);
++
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "execvp() failed");
+
-+static struct xml_conf_section *fpm_conf_all_sections[] = {
-+ &xml_section_fpm_global_options,
-+ &xml_section_fpm_worker_pool_config,
-+ 0
-+};
++ exit(1);
++}
+
-+static int fpm_evaluate_full_path(char **path)
++static void fpm_pctl_action_last()
+{
-+ if (**path != '/') {
-+ char *full_path;
++ switch (fpm_state) {
+
-+ full_path = malloc(sizeof(PHP_PREFIX) + strlen(*path) + 1);
++ case FPM_PCTL_STATE_RELOADING :
+
-+ if (!full_path) return -1;
++ fpm_pctl_exec();
++ break;
+
-+ sprintf(full_path, "%s/%s", PHP_PREFIX, *path);
++ case FPM_PCTL_STATE_FINISHING :
+
-+ free(*path);
++ case FPM_PCTL_STATE_TERMINATING :
+
-+ *path = full_path;
++ fpm_pctl_exit();
++ break;
+ }
-+
-+ return 0;
+}
+
-+static int fpm_conf_process_all_pools()
++int fpm_pctl_kill(pid_t pid, int how)
+{
-+ struct fpm_worker_pool_s *wp;
++ int s = 0;
+
-+ if (!fpm_worker_all_pools) {
-+ zlog(ZLOG_STUFF, ZLOG_ERROR, "at least one pool section must be specified in config file");
-+ return -1;
++ switch (how) {
++ case FPM_PCTL_TERM :
++ s = SIGTERM;
++ break;
++ case FPM_PCTL_STOP :
++ s = SIGSTOP;
++ break;
++ case FPM_PCTL_CONT :
++ s = SIGCONT;
++ break;
++ default :
++ break;
+ }
+
-+ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
++ return kill(pid, s);
++}
+
-+ if (wp->config->listen_address && *wp->config->listen_address) {
++static void fpm_pctl_kill_all(int signo)
++{
++ struct fpm_worker_pool_s *wp;
++ int alive_children = 0;
+
-+ wp->listen_address_domain = fpm_sockets_domain_from_address(wp->config->listen_address);
++ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
++ struct fpm_child_s *child;
+
-+ if (wp->listen_address_domain == FPM_AF_UNIX && *wp->config->listen_address != '/') {
-+ fpm_evaluate_full_path(&wp->config->listen_address);
-+ }
++ for (child = wp->children; child; child = child->next) {
+
-+ }
-+ else {
++ int res = kill(child->pid, signo);
+
-+ wp->is_template = 1;
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "sending signal %d %s to child %d (pool %s)", signo,
++ fpm_signal_names[signo] ? fpm_signal_names[signo] : "",
++ (int) child->pid, child->wp->config->name);
+
++ if (res == 0) { ++alive_children; }
+ }
+ }
+
-+ return 0;
++ if (alive_children) {
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "%d %s still alive", alive_children, alive_children == 1 ? "child is" : "children are");
++ }
+}
+
-+int fpm_conf_unlink_pid()
++static void fpm_pctl_action_next()
+{
-+ if (0 > unlink(fpm_global_options.pid_file)) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "unlink(\"%s\") failed", fpm_global_options.pid_file);
-+ return -1;
++ int sig, timeout;
++
++ if (!fpm_globals.running_children) { fpm_pctl_action_last(); }
++
++ if (fpm_signal_sent == 0) {
++ if (fpm_state == FPM_PCTL_STATE_TERMINATING) {
++ sig = SIGTERM;
++ }
++ else {
++ sig = SIGQUIT;
++ }
++ timeout = fpm_global_config.process_control_timeout;
++ }
++ else {
++ if (fpm_signal_sent == SIGQUIT) {
++ sig = SIGTERM;
++ }
++ else {
++ sig = SIGKILL;
++ }
++ timeout = 1;
+ }
+
-+ return 0;
++ fpm_pctl_kill_all(sig);
++
++ fpm_signal_sent = sig;
++
++ fpm_pctl_timeout_set(timeout);
+}
+
-+int fpm_conf_write_pid()
++void fpm_pctl(int new_state, int action)
+{
-+ int fd;
++ switch (action) {
+
-+ if (fpm_global_options.pid_file) {
-+ char buf[64];
-+ int len;
++ case FPM_PCTL_ACTION_SET :
+
-+ unlink(fpm_global_options.pid_file);
++ if (fpm_state == new_state) { /* already in progress - just ignore duplicate signal */
++ return;
++ }
+
-+ fd = creat(fpm_global_options.pid_file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
++ switch (fpm_state) { /* check which states can be overridden */
+
-+ if (!fd) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "creat(\"%s\") failed", fpm_global_options.pid_file);
-+ return -1;
-+ }
++ case FPM_PCTL_STATE_NORMAL :
+
-+ len = sprintf(buf, "%d", (int) getpid());
++ /* 'normal' can be overridden by any other state */
++ break;
+
-+ if (len != write(fd, buf, len)) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "write() failed");
-+ return -1;
-+ }
++ case FPM_PCTL_STATE_RELOADING :
+
-+ close(fd);
-+ }
++ /* 'reloading' can be overridden by 'finishing' */
++ if (new_state == FPM_PCTL_STATE_FINISHING) { break; }
+
-+ return 0;
-+}
++ case FPM_PCTL_STATE_FINISHING :
+
-+static int fpm_conf_post_process()
-+{
-+ int fd;
++ /* 'reloading' and 'finishing' can be overridden by 'terminating' */
++ if (new_state == FPM_PCTL_STATE_TERMINATING) { break; }
+
-+ if (fpm_global_options.pid_file) {
-+ fpm_evaluate_full_path(&fpm_global_options.pid_file);
-+ }
++ case FPM_PCTL_STATE_TERMINATING :
+
-+ if (!fpm_global_options.error_log) {
-+ fpm_global_options.error_log = strdup(PHP_PREFIX "/logs/" FPM_ERROR_LOG_FILENAME);
-+ }
++ /* nothing can override 'terminating' state */
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "not switching to '%s' state, because already in '%s' state",
++ fpm_state_names[new_state], fpm_state_names[fpm_state]);
+
-+ fpm_evaluate_full_path(&fpm_global_options.error_log);
++ return;
++ }
+
-+ fd = open(fpm_global_options.error_log, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
++ fpm_signal_sent = 0;
++ fpm_state = new_state;
+
-+ if (0 > fd) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(\"%s\") failed", fpm_global_options.error_log);
-+ return -1;
-+ }
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "switching to '%s' state", fpm_state_names[fpm_state]);
+
-+ fcntl(fd, F_SETFD, FD_CLOEXEC);
++ /* fall down */
+
-+ fpm_globals.error_log_fd = fd;
++ case FPM_PCTL_ACTION_TIMEOUT :
+
-+ return fpm_conf_process_all_pools();
++ fpm_pctl_action_next();
++
++ break;
++
++ case FPM_PCTL_ACTION_LAST_CHILD_EXITED :
++
++ fpm_pctl_action_last();
++
++ break;
++
++ }
+}
+
-+static void fpm_conf_cleanup(int which, void *arg)
++int fpm_pctl_can_spawn_children()
+{
-+ free(fpm_global_options.pid_file);
-+ free(fpm_global_options.error_log);
-+ fpm_global_options.pid_file = 0;
-+ fpm_global_options.error_log = 0;
++ return fpm_state == FPM_PCTL_STATE_NORMAL;
+}
+
-+int fpm_conf_init_main(char *filename)
++int fpm_pctl_child_exited()
+{
-+ char *err;
++ if (fpm_state == FPM_PCTL_STATE_NORMAL) { return 0; }
+
-+ if (0 > xml_conf_sections_register(fpm_conf_all_sections)) {
-+ return -1;
++ if (!fpm_globals.running_children) {
++ fpm_pctl(FPM_PCTL_STATE_UNSPECIFIED, FPM_PCTL_ACTION_LAST_CHILD_EXITED);
+ }
+
-+ if (filename == NULL) {
-+ filename = PHP_SYSCONFDIR "/" FPM_CONF_FILENAME;
-+ }
++ return 0;
++}
+
-+ err = xml_conf_load_file(filename);
++int fpm_pctl_init_main()
++{
++ int i;
+
-+ if (err) {
-+ zlog(ZLOG_STUFF, ZLOG_ERROR, "failed to load configuration file: %s", err);
++ saved_argc = fpm_globals.argc;
++
++ saved_argv = malloc(sizeof(char *) * (saved_argc + 1));
++
++ if (!saved_argv) {
+ return -1;
+ }
+
-+ if (0 > fpm_conf_post_process()) {
-+ return -1;
++ for (i = 0; i < saved_argc; i++) {
++ saved_argv[i] = strdup(fpm_globals.argv[i]);
++
++ if (!saved_argv[i]) {
++ return -1;
++ }
+ }
+
-+ xml_conf_clean();
++ saved_argv[i] = 0;
+
-+ fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_conf_cleanup, 0);
++ if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_pctl_cleanup, 0)) {
++ return -1;
++ }
+
+ return 0;
+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_conf.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_conf.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_conf.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_conf.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,74 @@
-+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
-+
-+#ifndef FPM_CONF_H
-+#define FPM_CONF_H 1
-+
-+#define FPM_CONF_FILENAME "php-fpm.conf"
-+#define FPM_ERROR_LOG_FILENAME "php-fpm.log"
-+
-+struct key_value_s;
-+
-+struct key_value_s {
-+ struct key_value_s *next;
-+ char *key;
-+ char *value;
-+};
-+
-+struct fpm_options_s {
-+ int emergency_restart_threshold;
-+ int emergency_restart_interval;
-+ int process_control_timeout;
-+ int daemonize;
-+ char *pid_file;
-+ char *error_log;
-+};
-+
-+extern struct fpm_options_s fpm_global_options;
+
-+struct fpm_pm_s {
-+ int style;
-+ int max_children;
-+ struct {
-+ int StartServers;
-+ int MinSpareServers;
-+ int MaxSpareServers;
-+ } options_apache_like;
-+};
++static void fpm_pctl_check_request_timeout(struct timeval *now)
++{
++ struct fpm_worker_pool_s *wp;
+
-+struct fpm_listen_options_s {
-+ int backlog;
-+ char *owner;
-+ char *group;
-+ char *mode;
-+};
++ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
++ int terminate_timeout = wp->config->request_terminate_timeout;
++ int slowlog_timeout = wp->config->request_slowlog_timeout;
++ struct fpm_child_s *child;
+
-+struct fpm_worker_pool_config_s {
-+ char *name;
-+ char *listen_address;
-+ struct fpm_listen_options_s *listen_options;
-+ struct key_value_s *php_defines;
-+ char *user;
-+ char *group;
-+ char *chroot;
-+ char *chdir;
-+ char *allowed_clients;
-+ struct key_value_s *environment;
-+ struct fpm_pm_s *pm;
-+ int request_execution_timeout;
-+ int max_requests;
-+ int rlimit_files;
-+ int rlimit_core;
-+ int catch_workers_output:1;
-+};
++ if (terminate_timeout || slowlog_timeout) {
++ for (child = wp->children; child; child = child->next) {
++ fpm_request_check_timed_out(child, now, terminate_timeout, slowlog_timeout);
++ }
++ }
++ }
++
++}
+
-+enum { PM_STYLE_STATIC = 1, PM_STYLE_APACHE_LIKE = 2 };
++void fpm_pctl_heartbeat(int fd, short which, void *arg)
++{
++ static struct event heartbeat;
++ struct timeval tv = { .tv_sec = 0, .tv_usec = 130000 };
++ struct timeval now;
+
-+int fpm_conf_init_main(char *filename);
-+int fpm_worker_pool_config_free(struct fpm_worker_pool_config_s *wpc);
-+int fpm_conf_write_pid();
-+int fpm_conf_unlink_pid();
++ if (which == EV_TIMEOUT) {
++ evtimer_del(&heartbeat);
++ fpm_clock_get(&now);
++ fpm_pctl_check_request_timeout(&now);
++ }
+
-+#endif
++ evtimer_set(&heartbeat, &fpm_pctl_heartbeat, 0);
++
++ evtimer_add(&heartbeat, &tv);
++}
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_config.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_config.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_config.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_config.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,31 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_process_ctl.h php-src/sapi/fpm/fpm/fpm_process_ctl.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_process_ctl.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_process_ctl.h 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,39 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+#include "php_config.h"
++#ifndef FPM_PROCESS_CTL_H
++#define FPM_PROCESS_CTL_H 1
+
++struct fpm_child_s;
+
-+/* Solaris does not have it */
-+#ifndef INADDR_NONE
-+#define INADDR_NONE (-1)
-+#endif
++void fpm_pctl(int new_state, int action);
++int fpm_pctl_can_spawn_children();
++int fpm_pctl_kill(pid_t pid, int how);
++void fpm_pctl_heartbeat(int fd, short which, void *arg);
++int fpm_pctl_child_exited();
++int fpm_pctl_init_main();
+
+
-+/* If we're not using GNU C, elide __attribute__ */
-+#ifndef __GNUC__
-+# define __attribute__(x) /*NOTHING*/
-+#endif
++enum {
++ FPM_PCTL_STATE_UNSPECIFIED,
++ FPM_PCTL_STATE_NORMAL,
++ FPM_PCTL_STATE_RELOADING,
++ FPM_PCTL_STATE_TERMINATING,
++ FPM_PCTL_STATE_FINISHING
++};
+
++enum {
++ FPM_PCTL_ACTION_SET,
++ FPM_PCTL_ACTION_TIMEOUT,
++ FPM_PCTL_ACTION_LAST_CHILD_EXITED
++};
++
++enum {
++ FPM_PCTL_TERM,
++ FPM_PCTL_STOP,
++ FPM_PCTL_CONT
++};
+
-+/* Solaris does not have it */
-+#ifndef timersub
-+#define timersub(tvp, uvp, vvp) \
-+ do { \
-+ (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
-+ (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
-+ if ((vvp)->tv_usec < 0) { \
-+ (vvp)->tv_sec--; \
-+ (vvp)->tv_usec += 1000000; \
-+ } \
-+ } while (0)
+#endif
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_env.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_env.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_env.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_env.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,125 @@
++
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_request.c php-src/sapi/fpm/fpm/fpm_request.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_request.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_request.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,164 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
+#include "fpm_config.h"
+
-+#ifdef HAVE_ALLOCA_H
-+#include <alloca.h>
-+#endif
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
++#include "fpm_php.h"
++#include "fpm_str.h"
++#include "fpm_clock.h"
++#include "fpm_conf.h"
++#include "fpm_trace.h"
++#include "fpm_php_trace.h"
++#include "fpm_process_ctl.h"
++#include "fpm_children.h"
++#include "fpm_shm_slots.h"
++#include "fpm_request.h"
+
-+#include "fpm_env.h"
+#include "zlog.h"
+
-+#if !HAVE_SETENV
-+int setenv(char *name, char *value, int overwrite)
++void fpm_request_accepting()
+{
-+ int name_len = strlen(name);
-+ int value_len = strlen(value);
-+ char *var = alloca(name_len + 1 + value_len + 1);
-+
-+ memcpy(var, name, name_len);
++ struct fpm_shm_slot_s *slot;
+
-+ var[name_len] = '=';
++ slot = fpm_shm_slots_acquire(0, 0);
+
-+ memcpy(var + name_len + 1, value, value_len);
++ slot->request_stage = FPM_REQUEST_ACCEPTING;
+
-+ var[name_len + 1 + value_len] = '\0';
++ fpm_clock_get(&slot->tv);
++ memset(slot->request_method, 0, sizeof(slot->request_method));
++ slot->content_length = 0;
++ memset(slot->script_filename, 0, sizeof(slot->script_filename));
+
-+ return putenv(var);
++ fpm_shm_slots_release(slot);
+}
-+#endif
+
-+#if !HAVE_CLEARENV
-+void clearenv()
++void fpm_request_reading_headers()
+{
-+ char **envp;
-+ char *s;
-+
-+ /* this algo is the only one known to me
-+ that works well on all systems */
-+ while (*(envp = environ)) {
-+ char *eq = strchr(*envp, '=');
++ struct fpm_shm_slot_s *slot;
+
-+ s = strdup(*envp);
++ slot = fpm_shm_slots_acquire(0, 0);
+
-+ if (eq) s[eq - *envp] = '\0';
++ slot->request_stage = FPM_REQUEST_READING_HEADERS;
+
-+ unsetenv(s);
-+ free(s);
-+ }
++ fpm_clock_get(&slot->tv);
++ slot->accepted = slot->tv;
+
++ fpm_shm_slots_release(slot);
+}
-+#endif
-+
+
-+int fpm_env_init_child(struct fpm_worker_pool_s *wp)
++void fpm_request_info()
+{
-+ struct key_value_s *kv;
++ TSRMLS_FETCH();
++ struct fpm_shm_slot_s *slot;
++ char *request_method = fpm_php_request_method(TSRMLS_C);
++ char *script_filename = fpm_php_script_filename(TSRMLS_C);
+
-+ clearenv();
++ slot = fpm_shm_slots_acquire(0, 0);
+
-+ for (kv = wp->config->environment; kv; kv = kv->next) {
-+ setenv(kv->key, kv->value, 1);
-+ }
++ slot->request_stage = FPM_REQUEST_INFO;
+
-+ if (wp->user) {
-+ setenv("USER", wp->user, 1);
++ fpm_clock_get(&slot->tv);
++
++ if (request_method) {
++ cpystrn(slot->request_method, request_method, sizeof(slot->request_method));
+ }
+
-+ if (wp->home) {
-+ setenv("HOME", wp->home, 1);
++ slot->content_length = fpm_php_content_length(TSRMLS_C);
++
++ /* if cgi.fix_pathinfo is set to "1" and script cannot be found (404)
++ the sapi_globals.request_info.path_translated is set to NULL */
++ if (script_filename) {
++ cpystrn(slot->script_filename, script_filename, sizeof(slot->script_filename));
+ }
+
-+ return 0;
++ fpm_shm_slots_release(slot);
+}
+
-+static int fpm_env_conf_wp(struct fpm_worker_pool_s *wp)
++void fpm_request_executing()
+{
-+ struct key_value_s *kv;
-+
-+ kv = wp->config->environment;
-+
-+ for (kv = wp->config->environment; kv; kv = kv->next) {
-+ if (*kv->value == '$') {
-+ char *value = getenv(kv->value + 1);
-+
-+ if (!value) value = "";
++ struct fpm_shm_slot_s *slot;
+
-+ free(kv->value);
-+ kv->value = strdup(value);
-+ }
++ slot = fpm_shm_slots_acquire(0, 0);
+
-+ /* autodetected values should be removed
-+ if these vars specified in config */
-+ if (!strcmp(kv->key, "USER")) {
-+ free(wp->user);
-+ wp->user = 0;
-+ }
++ slot->request_stage = FPM_REQUEST_EXECUTING;
+
-+ if (!strcmp(kv->key, "HOME")) {
-+ free(wp->home);
-+ wp->home = 0;
-+ }
-+ }
++ fpm_clock_get(&slot->tv);
+
-+ return 0;
++ fpm_shm_slots_release(slot);
+}
+
-+int fpm_env_init_main()
++void fpm_request_finished()
+{
-+ struct fpm_worker_pool_s *wp;
++ struct fpm_shm_slot_s *slot;
+
-+ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
++ slot = fpm_shm_slots_acquire(0, 0);
+
-+ if (0 > fpm_env_conf_wp(wp)) {
-+ return -1;
-+ }
++ slot->request_stage = FPM_REQUEST_FINISHED;
+
-+ }
++ fpm_clock_get(&slot->tv);
++ memset(&slot->accepted, 0, sizeof(slot->accepted));
+
-+ return 0;
++ fpm_shm_slots_release(slot);
+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_env.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_env.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_env.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_env.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,24 @@
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *now, int terminate_timeout, int slowlog_timeout)
++{
++ struct fpm_shm_slot_s *slot;
++ struct fpm_shm_slot_s slot_c;
+
-+#ifndef FPM_ENV_H
-+#define FPM_ENV_H 1
++ slot = fpm_shm_slot(child);
+
-+#include "fpm_worker_pool.h"
++ if (!fpm_shm_slots_acquire(slot, 1)) {
++ return;
++ }
+
-+int fpm_env_init_child(struct fpm_worker_pool_s *wp);
-+int fpm_env_init_main();
++ slot_c = *slot;
+
-+extern char **environ;
++ fpm_shm_slots_release(slot);
+
-+#if !HAVE_SETENV
-+int setenv(char *name, char *value, int overwrite);
++#if HAVE_FPM_TRACE
++ if (child->slow_logged.tv_sec) {
++ if (child->slow_logged.tv_sec != slot_c.accepted.tv_sec || child->slow_logged.tv_usec != slot_c.accepted.tv_usec) {
++ child->slow_logged.tv_sec = 0;
++ child->slow_logged.tv_usec = 0;
++ }
++ }
+#endif
+
-+#if !HAVE_CLEARENV
-+void clearenv();
-+#endif
++ if (slot_c.request_stage > FPM_REQUEST_ACCEPTING && slot_c.request_stage < FPM_REQUEST_FINISHED) {
++ char purified_script_filename[sizeof(slot_c.script_filename)];
++ struct timeval tv;
+
-+#endif
++ timersub(now, &slot_c.accepted, &tv);
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_events.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_events.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_events.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_events.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,142 @@
++#if HAVE_FPM_TRACE
++ if (child->slow_logged.tv_sec == 0 && slowlog_timeout &&
++ slot_c.request_stage == FPM_REQUEST_EXECUTING && tv.tv_sec >= slowlog_timeout) {
++
++ str_purify_filename(purified_script_filename, slot_c.script_filename, sizeof(slot_c.script_filename));
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ child->slow_logged = slot_c.accepted;
++ child->tracer = fpm_php_trace;
+
-+#include "fpm_config.h"
++ fpm_trace_signal(child->pid);
+
-+#include <unistd.h>
-+#include <errno.h>
-+#include <stdlib.h> /* for putenv */
-+#include <string.h>
-+#include <sys/types.h> /* for event.h below */
-+#include <event.h>
++ zlog(ZLOG_STUFF, ZLOG_WARNING, "child %d, script '%s' (pool %s) executing too slow (%d.%06d sec), logging",
++ (int) child->pid, purified_script_filename, child->wp->config->name, (int) tv.tv_sec, (int) tv.tv_usec);
++ }
+
-+#include "fpm_process_ctl.h"
-+#include "fpm_events.h"
-+#include "fpm_cleanup.h"
-+#include "fpm_signals.h"
-+#include "fpm_children.h"
-+#include "zlog.h"
++ else
++#endif
++ if (terminate_timeout && tv.tv_sec >= terminate_timeout) {
+
-+static struct event pctl_event;
++ str_purify_filename(purified_script_filename, slot_c.script_filename, sizeof(slot_c.script_filename));
+
-+static void fpm_event_pctl_action(int fd, short which, void *arg)
-+{
-+ evtimer_del(&pctl_event);
++ fpm_pctl_kill(child->pid, FPM_PCTL_TERM);
+
-+ memset(&pctl_event, 0, sizeof(pctl_event));
++ zlog(ZLOG_STUFF, ZLOG_WARNING, "child %d, script '%s' (pool %s) execution timed out (%d.%06d sec), terminating",
++ (int) child->pid, purified_script_filename, child->wp->config->name, (int) tv.tv_sec, (int) tv.tv_usec);
++ }
++ }
+
-+ fpm_pctl(FPM_PCTL_STATE_UNSPECIFIED, FPM_PCTL_ACTION_TIMEOUT);
+}
+
-+int fpm_event_pctl_timeout_set(int sec)
-+{
-+ struct timeval tv = { .tv_sec = sec, .tv_usec = 0 };
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_request.h php-src/sapi/fpm/fpm/fpm_request.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_request.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_request.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,27 @@
+
-+ if (evtimer_initialized(&pctl_event)) {
-+ evtimer_del(&pctl_event);
-+ }
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ evtimer_set(&pctl_event, &fpm_event_pctl_action, 0);
++#ifndef FPM_REQUEST_H
++#define FPM_REQUEST_H 1
+
-+ evtimer_add(&pctl_event, &tv);
++void fpm_request_accepting(); /* hanging in accept() */
++void fpm_request_reading_headers(); /* start reading fastcgi request from very first byte */
++void fpm_request_info(); /* not a stage really but a point in the php code, where all request params have become known to sapi */
++void fpm_request_executing(); /* the script is executing */
++void fpm_request_finished(); /* request processed: script response have been sent to web server */
+
-+ return 0;
-+}
++struct fpm_child_s;
++struct timeval;
+
-+static void fpm_event_cleanup(int which, void *arg)
-+{
-+ event_base_free(0);
-+}
++void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *tv, int terminate_timeout, int slowlog_timeout);
+
-+static void fpm_got_signal(int fd, short ev, void *arg)
-+{
-+ char c;
-+ int res;
++enum fpm_request_stage_e {
++ FPM_REQUEST_ACCEPTING = 1,
++ FPM_REQUEST_READING_HEADERS,
++ FPM_REQUEST_INFO,
++ FPM_REQUEST_EXECUTING,
++ FPM_REQUEST_FINISHED
++};
+
-+ do {
-+ res = read(fd, &c, 1);
-+ } while (res == -1 && errno == EINTR);
++#endif
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_shm.c php-src/sapi/fpm/fpm/fpm_shm.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_shm.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_shm.c 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,100 @@
+
-+ if (res <= 0) {
-+ if (res < 0 && errno != EAGAIN && errno != EWOULDBLOCK) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "read() failed");
-+ }
-+ return;
-+ }
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ switch (c) {
-+ case 'C' : /* SIGCHLD */
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGCHLD");
-+ fpm_children_bury();
-+ break;
-+ case 'I' : /* SIGINT */
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGINT");
-+ fpm_pctl(FPM_PCTL_STATE_TERMINATING, FPM_PCTL_ACTION_SET);
-+ break;
-+ case 'T' : /* SIGTERM */
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGTERM");
-+ fpm_pctl(FPM_PCTL_STATE_TERMINATING, FPM_PCTL_ACTION_SET);
-+ break;
-+ case 'Q' : /* SIGQUIT */
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGQUIT");
-+ fpm_pctl(FPM_PCTL_STATE_FINISHING, FPM_PCTL_ACTION_SET);
-+ break;
-+ case '2' : /* SIGUSR2 */
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGUSR2");
-+ fpm_pctl(FPM_PCTL_STATE_RELOADING, FPM_PCTL_ACTION_SET);
-+ break;
-+ }
++#include "fpm_config.h"
+
-+ return;
-+}
++#include <unistd.h>
++#include <sys/mman.h>
++#include <stdlib.h>
+
-+int fpm_event_init_main()
-+{
-+ event_init();
++#include "fpm_shm.h"
++#include "zlog.h"
+
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "libevent: using %s", event_get_method());
+
-+ fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_event_cleanup, 0);
++/* MAP_ANON is depricated, but not in macosx */
++#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
++#define MAP_ANONYMOUS MAP_ANON
++#endif
+
-+ return 0;
-+}
+
-+int fpm_event_loop()
++struct fpm_shm_s *fpm_shm_alloc(size_t sz)
+{
-+ static struct event signal_fd_event;
++ struct fpm_shm_s *shm;
+
-+ event_set(&signal_fd_event, fpm_signals_get_fd(), EV_PERSIST | EV_READ, &fpm_got_signal, 0);
++ shm = malloc(sizeof(*shm));
+
-+ event_add(&signal_fd_event, 0);
++ if (!shm) {
++ return 0;
++ }
+
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "libevent: entering main loop");
++ shm->mem = mmap(0, sz, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
+
-+ event_loop(0);
++ if (!shm->mem) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "mmap(MAP_ANONYMOUS | MAP_SHARED) failed");
++ free(shm);
++ return 0;
++ }
+
-+ event_del(&signal_fd_event);
++ shm->used = 0;
++ shm->sz = sz;
+
-+ return 0;
++ return shm;
+}
+
-+int fpm_event_add(int fd, struct event *ev, void (*callback)(int, short, void *), void *arg)
++static void fpm_shm_free(struct fpm_shm_s *shm, int do_unmap)
+{
-+ event_set(ev, fd, EV_PERSIST | EV_READ, callback, arg);
++ if (do_unmap) {
++ munmap(shm->mem, shm->sz);
++ }
+
-+ return event_add(ev, 0);
++ free(shm);
+}
+
-+int fpm_event_del(struct event *ev)
++void fpm_shm_free_list(struct fpm_shm_s *shm, void *mem)
+{
-+ return event_del(ev);
-+}
++ struct fpm_shm_s *next;
+
-+void fpm_event_exit_loop()
-+{
-+ event_loopexit(0);
++ for (; shm; shm = next) {
++ next = shm->next;
++
++ fpm_shm_free(shm, mem != shm->mem);
++ }
+}
+
-+void fpm_event_fire(struct event *ev)
++void *fpm_shm_alloc_chunk(struct fpm_shm_s **head, size_t sz, void **mem)
+{
-+ (*ev->ev_callback)((int)ev->ev_fd, ev->ev_res, ev->ev_arg);
-+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_events.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_events.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_events.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_events.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,17 @@
++ size_t pagesize = getpagesize();
++ static const size_t cache_line_size = 16;
++ size_t aligned_sz;
++ struct fpm_shm_s *shm;
++ void *ret;
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ sz = (sz + cache_line_size - 1) & -cache_line_size;
++
++ shm = *head;
++
++ if (0 == shm || shm->sz - shm->used < sz) {
++ /* allocate one more shm segment */
++
++ aligned_sz = (sz + pagesize - 1) & -pagesize;
++
++ shm = fpm_shm_alloc(aligned_sz);
++
++ if (!shm) {
++ return 0;
++ }
+
-+#ifndef FPM_EVENTS_H
-+#define FPM_EVENTS_H 1
++ shm->next = *head;
++ if (shm->next) { shm->next->prev = shm; }
++ shm->prev = 0;
++ *head = shm;
++ }
+
-+int fpm_event_pctl_timeout_set(int sec);
-+void fpm_event_exit_loop();
-+int fpm_event_loop();
-+int fpm_event_add(int fd, struct event *ev, void (*callback)(int, short, void *), void *arg);
-+int fpm_event_del(struct event *ev);
-+void fpm_event_fire(struct event *ev);
-+int fpm_event_init_main();
++ *mem = shm->mem;
++ ret = (char *) shm->mem + shm->used;
++ shm->used += sz;
+
++ return ret;
++}
+
-+#endif
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm.h php-5.2.4.fpm/sapi/cgi/fpm/fpm.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,23 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_shm.h php-src/sapi/fpm/fpm/fpm_shm.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_shm.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_shm.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,22 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+#ifndef FPM_H
-+#define FPM_H 1
++#ifndef FPM_SHM_H
++#define FPM_SHM_H 1
+
-+int fpm_run(int *max_requests);
-+int fpm_init(int argc, char **argv, char *config);
-+void fpm_request_start();
-+void fpm_request_finish();
++struct fpm_shm_s;
+
-+struct fpm_globals_s {
-+ int running_children;
-+ int error_log_fd;
-+ int listening_socket; /* for this child */
-+ int max_requests; /* for this child */
-+ int is_child;
++struct fpm_shm_s {
++ struct fpm_shm_s *prev, *next;
++ void *mem;
++ size_t sz;
++ size_t used;
+};
+
-+extern struct fpm_globals_s fpm_globals;
++struct fpm_shm_s *fpm_shm_alloc(size_t sz);
++void fpm_shm_free_list(struct fpm_shm_s *, void *);
++void *fpm_shm_alloc_chunk(struct fpm_shm_s **head, size_t sz, void **mem);
+
+#endif
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_php.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_php.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_php.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_php.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,98 @@
++
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_shm_slots.c php-src/sapi/fpm/fpm/fpm_shm_slots.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_shm_slots.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_shm_slots.c 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,127 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
+#include "fpm_config.h"
+
-+#ifdef HAVE_ALLOCA_H
-+#include <alloca.h>
-+#endif
-+#include <stdlib.h>
-+#include <string.h>
++#include "fpm_atomic.h"
++#include "fpm_worker_pool.h"
++#include "fpm_children.h"
++#include "fpm_shm.h"
++#include "fpm_shm_slots.h"
++#include "zlog.h"
+
-+#include "php.h"
-+#include "php_main.h"
-+#include "php_ini.h"
++static void *shm_mem;
++static struct fpm_shm_slot_s *shm_slot;
+
-+#include "fastcgi.h"
++int fpm_shm_slots_prepare_slot(struct fpm_child_s *child)
++{
++ struct fpm_worker_pool_s *wp = child->wp;
++ struct fpm_shm_slot_ptr_s *shm_slot_ptr;
+
-+#include "fpm.h"
-+#include "fpm_php.h"
-+#include "fpm_cleanup.h"
-+#include "fpm_worker_pool.h"
++ child->shm_slot_i = wp->slots_used.used;
+
-+static int zend_ini_alter_master(char *name, int name_length, char *new_value, int new_value_length, int stage)
-+{
-+ zend_ini_entry *ini_entry;
-+ char *duplicate;
++ shm_slot_ptr = fpm_array_push(&wp->slots_used);
+
-+ if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry) == FAILURE) {
-+ return FAILURE;
++ if (0 == shm_slot_ptr) {
++ return -1;
+ }
+
-+ duplicate = strdup(new_value);
++ if (0 == wp->slots_free.used) {
++ shm_slot_ptr->shm_slot = fpm_shm_alloc_chunk(&wp->shm_list, sizeof(struct fpm_shm_slot_s), &shm_slot_ptr->mem);
+
-+ if (!ini_entry->on_modify
-+ || ini_entry->on_modify(ini_entry, duplicate, new_value_length,
-+ ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC) == SUCCESS) {
-+ ini_entry->value = duplicate;
-+ ini_entry->value_length = new_value_length;
-+ } else {
-+ free(duplicate);
++ if (!shm_slot_ptr->shm_slot) {
++ return -1;
++ }
+ }
++ else {
++ *shm_slot_ptr = *(struct fpm_shm_slot_ptr_s *) fpm_array_item_last(&wp->slots_free);
+
-+ return SUCCESS;
++ --wp->slots_free.used;
++ }
++
++ memset(shm_slot_ptr->shm_slot, 0, sizeof(struct fpm_shm_slot_s));
++
++ shm_slot_ptr->child = child;
++
++ return 0;
+}
+
-+static int fpm_php_apply_defines(struct fpm_worker_pool_s *wp)
++void fpm_shm_slots_discard_slot(struct fpm_child_s *child)
+{
-+ struct key_value_s *kv = wp->config->php_defines;
++ struct fpm_shm_slot_ptr_s *shm_slot_ptr;
++ struct fpm_worker_pool_s *wp = child->wp;
++ int n;
++
++ shm_slot_ptr = fpm_array_push(&wp->slots_free);
+
-+ while (kv) {
-+ int name_len = strlen(kv->key);
-+ int value_len = strlen(kv->value);
-+ char *name = alloca(name_len + 1);
-+ char *value = alloca(value_len + 1);
++ if (shm_slot_ptr) {
+
-+ strcpy(name, kv->key);
-+ strcpy(value, kv->value);
++ struct fpm_shm_slot_ptr_s *shm_slot_ptr_used;
+
-+ zend_ini_alter_master(name, name_len + 1, value, value_len, PHP_INI_STAGE_ACTIVATE);
++ shm_slot_ptr_used = fpm_array_item(&wp->slots_used, child->shm_slot_i);
++
++ *shm_slot_ptr = *shm_slot_ptr_used;
++
++ shm_slot_ptr->child = 0;
+
-+ kv = kv->next;
+ }
+
-+ return 0;
++ n = fpm_array_item_remove(&wp->slots_used, child->shm_slot_i);
++
++ if (n > -1) {
++ shm_slot_ptr = fpm_array_item(&wp->slots_used, n);
++
++ shm_slot_ptr->child->shm_slot_i = n;
++ }
+}
+
-+static int fpm_php_set_allowed_clients(struct fpm_worker_pool_s *wp)
++void fpm_shm_slots_child_use_slot(struct fpm_child_s *child)
+{
-+ if (wp->listen_address_domain == FPM_AF_INET) {
-+ fcgi_set_allowed_clients(wp->config->allowed_clients);
-+ }
++ struct fpm_shm_slot_ptr_s *shm_slot_ptr;
++ struct fpm_worker_pool_s *wp = child->wp;
+
-+ return 0;
++ shm_slot_ptr = fpm_array_item(&wp->slots_used, child->shm_slot_i);
++
++ shm_slot = shm_slot_ptr->shm_slot;
++ shm_mem = shm_slot_ptr->mem;
+}
+
-+static void fpm_php_cleanup(int which, void *arg)
++void fpm_shm_slots_parent_use_slot(struct fpm_child_s *child)
+{
-+ php_module_shutdown(TSRMLS_C);
-+ sapi_shutdown();
++ /* nothing to do */
+}
+
-+int fpm_php_init_main()
++void *fpm_shm_slots_mem()
+{
-+ fpm_cleanup_add(FPM_CLEANUP_PARENT, fpm_php_cleanup, 0);
++ return shm_mem;
++}
+
-+ return 0;
++struct fpm_shm_slot_s *fpm_shm_slot(struct fpm_child_s *child)
++{
++ struct fpm_shm_slot_ptr_s *shm_slot_ptr;
++ struct fpm_worker_pool_s *wp = child->wp;
++
++ shm_slot_ptr = fpm_array_item(&wp->slots_used, child->shm_slot_i);
++
++ return shm_slot_ptr->shm_slot;
+}
+
-+int fpm_php_init_child(struct fpm_worker_pool_s *wp)
++struct fpm_shm_slot_s *fpm_shm_slots_acquire(struct fpm_shm_slot_s *s, int nohang)
+{
-+ if (0 > fpm_php_apply_defines(wp) ||
-+ 0 > fpm_php_set_allowed_clients(wp)) {
-+ return -1;
++ if (s == 0) {
++ s = shm_slot;
+ }
+
-+ return 0;
++ if (0 > fpm_spinlock(&s->lock, nohang)) {
++ return 0;
++ }
++
++ return s;
+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_php.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_php.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_php.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_php.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,16 @@
++
++void fpm_shm_slots_release(struct fpm_shm_slot_s *s)
++{
++ s->lock = 0;
++}
++
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_shm_slots.h php-src/sapi/fpm/fpm/fpm_shm_slots.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_shm_slots.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_shm_slots.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,43 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+#ifndef FPM_PHP_H
-+#define FPM_PHP_H 1
++#ifndef FPM_SHM_SLOTS_H
++#define FPM_SHM_SLOTS_H 1
+
++#include "fpm_atomic.h"
+#include "fpm_worker_pool.h"
++#include "fpm_request.h"
+
-+#include "build-defs.h" /* for PHP_ defines */
++struct fpm_child_s;
+
-+int fpm_php_init_child(struct fpm_worker_pool_s *wp);
-+int fpm_php_init_main();
++struct fpm_shm_slot_s {
++ union {
++ atomic_t lock;
++ char dummy[16];
++ };
++ enum fpm_request_stage_e request_stage;
++ struct timeval accepted;
++ struct timeval tv;
++ char request_method[16];
++ size_t content_length; /* used with POST only */
++ char script_filename[256];
++};
++
++struct fpm_shm_slot_ptr_s {
++ void *mem;
++ struct fpm_shm_slot_s *shm_slot;
++ struct fpm_child_s *child;
++};
++
++int fpm_shm_slots_prepare_slot(struct fpm_child_s *child);
++void fpm_shm_slots_discard_slot(struct fpm_child_s *child);
++void fpm_shm_slots_child_use_slot(struct fpm_child_s *child);
++void fpm_shm_slots_parent_use_slot(struct fpm_child_s *child);
++void *fpm_shm_slots_mem();
++struct fpm_shm_slot_s *fpm_shm_slot(struct fpm_child_s *child);
++struct fpm_shm_slot_s *fpm_shm_slots_acquire(struct fpm_shm_slot_s *, int nohang);
++void fpm_shm_slots_release(struct fpm_shm_slot_s *);
+
+#endif
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_process_ctl.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_process_ctl.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_process_ctl.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_process_ctl.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,271 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_signals.c php-src/sapi/fpm/fpm/fpm_signals.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_signals.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_signals.c 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,252 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
+#include "fpm_config.h"
+
-+#include <sys/types.h>
+#include <signal.h>
-+#include <unistd.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+#include <stdlib.h>
++#include <string.h>
++#include <fcntl.h>
++#include <unistd.h>
++#include <errno.h>
+
+#include "fpm.h"
-+#include "fpm_children.h"
+#include "fpm_signals.h"
-+#include "fpm_events.h"
-+#include "fpm_process_ctl.h"
-+#include "fpm_cleanup.h"
-+#include "fpm_worker_pool.h"
++#include "fpm_sockets.h"
++#include "fpm_php.h"
+#include "zlog.h"
+
++static int sp[2];
+
-+static int fpm_state = FPM_PCTL_STATE_NORMAL;
-+static int fpm_signal_sent = 0;
-+
-+
-+static const char *fpm_state_names[] = {
-+ [FPM_PCTL_STATE_NORMAL] = "normal",
-+ [FPM_PCTL_STATE_RELOADING] = "reloading",
-+ [FPM_PCTL_STATE_TERMINATING] = "terminating",
-+ [FPM_PCTL_STATE_FINISHING] = "finishing"
++const char *fpm_signal_names[NSIG + 1] = {
++#ifdef SIGHUP
++ [SIGHUP] = "SIGHUP",
++#endif
++#ifdef SIGINT
++ [SIGINT] = "SIGINT",
++#endif
++#ifdef SIGQUIT
++ [SIGQUIT] = "SIGQUIT",
++#endif
++#ifdef SIGILL
++ [SIGILL] = "SIGILL",
++#endif
++#ifdef SIGTRAP
++ [SIGTRAP] = "SIGTRAP",
++#endif
++#ifdef SIGABRT
++ [SIGABRT] = "SIGABRT",
++#endif
++#ifdef SIGEMT
++ [SIGEMT] = "SIGEMT",
++#endif
++#ifdef SIGBUS
++ [SIGBUS] = "SIGBUS",
++#endif
++#ifdef SIGFPE
++ [SIGFPE] = "SIGFPE",
++#endif
++#ifdef SIGKILL
++ [SIGKILL] = "SIGKILL",
++#endif
++#ifdef SIGUSR1
++ [SIGUSR1] = "SIGUSR1",
++#endif
++#ifdef SIGSEGV
++ [SIGSEGV] = "SIGSEGV",
++#endif
++#ifdef SIGUSR2
++ [SIGUSR2] = "SIGUSR2",
++#endif
++#ifdef SIGPIPE
++ [SIGPIPE] = "SIGPIPE",
++#endif
++#ifdef SIGALRM
++ [SIGALRM] = "SIGALRM",
++#endif
++#ifdef SIGTERM
++ [SIGTERM] = "SIGTERM",
++#endif
++#ifdef SIGCHLD
++ [SIGCHLD] = "SIGCHLD",
++#endif
++#ifdef SIGCONT
++ [SIGCONT] = "SIGCONT",
++#endif
++#ifdef SIGSTOP
++ [SIGSTOP] = "SIGSTOP",
++#endif
++#ifdef SIGTSTP
++ [SIGTSTP] = "SIGTSTP",
++#endif
++#ifdef SIGTTIN
++ [SIGTTIN] = "SIGTTIN",
++#endif
++#ifdef SIGTTOU
++ [SIGTTOU] = "SIGTTOU",
++#endif
++#ifdef SIGURG
++ [SIGURG] = "SIGURG",
++#endif
++#ifdef SIGXCPU
++ [SIGXCPU] = "SIGXCPU",
++#endif
++#ifdef SIGXFSZ
++ [SIGXFSZ] = "SIGXFSZ",
++#endif
++#ifdef SIGVTALRM
++ [SIGVTALRM] = "SIGVTALRM",
++#endif
++#ifdef SIGPROF
++ [SIGPROF] = "SIGPROF",
++#endif
++#ifdef SIGWINCH
++ [SIGWINCH] = "SIGWINCH",
++#endif
++#ifdef SIGINFO
++ [SIGINFO] = "SIGINFO",
++#endif
++#ifdef SIGIO
++ [SIGIO] = "SIGIO",
++#endif
++#ifdef SIGPWR
++ [SIGPWR] = "SIGPWR",
++#endif
++#ifdef SIGSYS
++ [SIGSYS] = "SIGSYS",
++#endif
++#ifdef SIGWAITING
++ [SIGWAITING] = "SIGWAITING",
++#endif
++#ifdef SIGLWP
++ [SIGLWP] = "SIGLWP",
++#endif
++#ifdef SIGFREEZE
++ [SIGFREEZE] = "SIGFREEZE",
++#endif
++#ifdef SIGTHAW
++ [SIGTHAW] = "SIGTHAW",
++#endif
++#ifdef SIGCANCEL
++ [SIGCANCEL] = "SIGCANCEL",
++#endif
++#ifdef SIGLOST
++ [SIGLOST] = "SIGLOST",
++#endif
+};
+
-+static int saved_argc;
-+static char **saved_argv;
-+static int saved_argv_allocated, saved_argv_used;
-+
-+static void fpm_pctl_cleanup(int which, void *arg)
-+{
-+ int i;
-+
-+ if (which != FPM_CLEANUP_PARENT_EXEC) {
-+
-+ for (i = 0; i < saved_argv_used; i++) {
-+ free(saved_argv[i]);
-+ }
-+
-+ free(saved_argv);
-+
-+ }
-+}
-+
-+static void fpm_pctl_exit()
++static void sig_soft_quit(int signo)
+{
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "exiting, bye-bye!");
++ int saved_errno = errno;
+
-+ fpm_conf_unlink_pid();
++ /* closing fastcgi listening socket will force fcgi_accept() exit immediately */
++ close(0);
++ socket(AF_UNIX, SOCK_STREAM, 0);
+
-+ fpm_cleanups_run(FPM_CLEANUP_PARENT_EXIT_MAIN);
++ fpm_php_soft_quit();
+
-+ exit(0);
++ errno = saved_errno;
+}
+
-+#define optional_arg(c) (saved_argc > c ? ", \"" : ""), (saved_argc > c ? saved_argv[c] : ""), (saved_argc > c ? "\"" : "")
-+
-+static void fpm_pctl_exec()
++static void sig_handler(int signo)
+{
++ static const char sig_chars[NSIG + 1] = {
++ [SIGTERM] = 'T',
++ [SIGINT] = 'I',
++ [SIGUSR1] = '1',
++ [SIGUSR2] = '2',
++ [SIGQUIT] = 'Q',
++ [SIGCHLD] = 'C'
++ };
++ char s;
++ int saved_errno;
+
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "reloading: execvp(\"%s\", {\"%s\""
-+ "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s"
-+ "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s"
-+ "})",
-+ saved_argv[0], saved_argv[0],
-+ optional_arg(1),
-+ optional_arg(2),
-+ optional_arg(3),
-+ optional_arg(4),
-+ optional_arg(5),
-+ optional_arg(6),
-+ optional_arg(7),
-+ optional_arg(8),
-+ optional_arg(9),
-+ optional_arg(10)
-+ );
++ if (fpm_globals.parent_pid != getpid()) {
++ /* prevent a signal race condition when child process
++ have not set up it's own signal handler yet */
++ return;
++ }
+
-+ fpm_cleanups_run(FPM_CLEANUP_PARENT_EXEC);
++ saved_errno = errno;
+
-+ execvp(saved_argv[0], saved_argv);
++ s = sig_chars[signo];
+
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "execvp() failed");
++ write(sp[1], &s, sizeof(s));
+
-+ fpm_event_exit_loop();
++ errno = saved_errno;
+}
+
-+static void fpm_pctl_action_last()
++int fpm_signals_init_main()
+{
-+ switch (fpm_state) {
++ struct sigaction act;
+
-+ case FPM_PCTL_STATE_RELOADING :
++ if (0 > socketpair(AF_UNIX, SOCK_STREAM, 0, sp)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "socketpair() failed");
++ return -1;
++ }
+
-+ fpm_pctl_exec();
-+ break;
++ if (0 > fd_set_blocked(sp[0], 0) || 0 > fd_set_blocked(sp[1], 0)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fd_set_blocked() failed");
++ return -1;
++ }
+
-+ case FPM_PCTL_STATE_FINISHING :
++ if (0 > fcntl(sp[0], F_SETFD, FD_CLOEXEC) || 0 > fcntl(sp[1], F_SETFD, FD_CLOEXEC)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fcntl(F_SETFD, FD_CLOEXEC) failed");
++ return -1;
++ }
+
-+ case FPM_PCTL_STATE_TERMINATING :
++ memset(&act, 0, sizeof(act));
++ act.sa_handler = sig_handler;
++ sigfillset(&act.sa_mask);
+
-+ fpm_pctl_exit();
-+ break;
++ if (0 > sigaction(SIGTERM, &act, 0) ||
++ 0 > sigaction(SIGINT, &act, 0) ||
++ 0 > sigaction(SIGUSR1, &act, 0) ||
++ 0 > sigaction(SIGUSR2, &act, 0) ||
++ 0 > sigaction(SIGCHLD, &act, 0) ||
++ 0 > sigaction(SIGQUIT, &act, 0)) {
++
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "sigaction() failed");
++ return -1;
+ }
++
++ return 0;
+}
+
-+static void fpm_pctl_kill_all(int signo)
++int fpm_signals_init_child()
+{
-+ struct fpm_worker_pool_s *wp;
-+ int alive_children = 0;
++ struct sigaction act, act_dfl;
+
-+ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
-+ struct fpm_child_s *child;
++ memset(&act, 0, sizeof(act));
++ memset(&act_dfl, 0, sizeof(act_dfl));
+
-+ for (child = wp->children; child; child = child->next) {
++ act.sa_handler = &sig_soft_quit;
++ act.sa_flags |= SA_RESTART;
+
-+ int res = kill(child->pid, signo);
++ act_dfl.sa_handler = SIG_DFL;
+
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "sending signal %d %s to child %d (pool %s)", signo,
-+ fpm_signal_names[signo] ? fpm_signal_names[signo] : "",
-+ (int) child->pid, child->wp->config->name);
++ close(sp[0]);
++ close(sp[1]);
+
-+ if (res == 0) ++alive_children;
-+ }
-+ }
++ if (0 > sigaction(SIGTERM, &act_dfl, 0) ||
++ 0 > sigaction(SIGINT, &act_dfl, 0) ||
++ 0 > sigaction(SIGUSR1, &act_dfl, 0) ||
++ 0 > sigaction(SIGUSR2, &act_dfl, 0) ||
++ 0 > sigaction(SIGCHLD, &act_dfl, 0) ||
++ 0 > sigaction(SIGQUIT, &act, 0)) {
+
-+ if (alive_children) {
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "%d %s still alive", alive_children, alive_children == 1 ? "child is" : "children are");
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "sigaction() failed");
++ return -1;
+ }
++
++ return 0;
+}
+
-+static void fpm_pctl_action_next()
++int fpm_signals_get_fd()
+{
-+ int sig, timeout;
++ return sp[0];
++}
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_signals.h php-src/sapi/fpm/fpm/fpm_signals.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_signals.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_signals.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,16 @@
+
-+ if (!fpm_globals.running_children) fpm_pctl_action_last();
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ if (fpm_signal_sent == 0) {
-+ if (fpm_state == FPM_PCTL_STATE_TERMINATING) {
-+ sig = SIGTERM;
-+ }
-+ else {
-+ sig = SIGQUIT;
-+ }
-+ timeout = fpm_global_options.process_control_timeout;
-+ }
-+ else {
-+ if (fpm_signal_sent == SIGQUIT) {
-+ sig = SIGTERM;
-+ }
-+ else {
-+ sig = SIGKILL;
-+ }
-+ timeout = 1;
-+ }
++#ifndef FPM_SIGNALS_H
++#define FPM_SIGNALS_H 1
+
-+ fpm_pctl_kill_all(sig);
++#include <signal.h>
+
-+ fpm_signal_sent = sig;
++int fpm_signals_init_main();
++int fpm_signals_init_child();
++int fpm_signals_get_fd();
+
-+ fpm_event_pctl_timeout_set(timeout);
-+}
++extern const char *fpm_signal_names[NSIG + 1];
+
-+void fpm_pctl(int new_state, int action)
-+{
-+ switch (action) {
++#endif
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_sockets.c php-src/sapi/fpm/fpm/fpm_sockets.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_sockets.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_sockets.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,427 @@
+
-+ case FPM_PCTL_ACTION_SET :
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ if (fpm_state == new_state) { /* already in progress - just ignore duplicate signal */
-+ return;
-+ }
++#include "fpm_config.h"
+
-+ switch (fpm_state) { /* check which states can be overridden */
++#ifdef HAVE_ALLOCA_H
++#include <alloca.h>
++#endif
++#include <sys/types.h>
++#include <sys/stat.h> /* for chmod(2) */
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <sys/un.h>
++#include <netdb.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++#include <unistd.h>
+
-+ case FPM_PCTL_STATE_NORMAL :
++#include "zlog.h"
++#include "fpm_arrays.h"
++#include "fpm_sockets.h"
++#include "fpm_worker_pool.h"
++#include "fpm_unix.h"
++#include "fpm_str.h"
++#include "fpm_env.h"
++#include "fpm_cleanup.h"
+
-+ /* 'normal' can be overridden by any other state */
-+ break;
++struct listening_socket_s {
++ int refcount;
++ int sock;
++ int type;
++ char *key;
++};
+
-+ case FPM_PCTL_STATE_RELOADING :
++static struct fpm_array_s sockets_list;
+
-+ /* 'reloading' can be overridden by 'finishing' */
-+ if (new_state == FPM_PCTL_STATE_FINISHING) break;
++static int fpm_sockets_resolve_af_inet(char *node, char *service, struct sockaddr_in *addr)
++{
++ struct addrinfo *res;
++ struct addrinfo hints;
++ int ret;
+
-+ case FPM_PCTL_STATE_FINISHING :
++ memset(&hints, 0, sizeof(hints));
+
-+ /* 'reloading' and 'finishing' can be overridden by 'terminating' */
-+ if (new_state == FPM_PCTL_STATE_TERMINATING) break;
++ hints.ai_family = AF_INET;
+
-+ case FPM_PCTL_STATE_TERMINATING :
++ ret = getaddrinfo(node, service, &hints, &res);
+
-+ /* nothing can override 'terminating' state */
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "not switching to '%s' state, because already in '%s' state",
-+ fpm_state_names[new_state], fpm_state_names[fpm_state]);
++ if (ret != 0) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "can't resolve hostname '%s%s%s': getaddrinfo said: %s%s%s\n",
++ node, service ? ":" : "", service ? service : "",
++ gai_strerror(ret), ret == EAI_SYSTEM ? ", system error: " : "", ret == EAI_SYSTEM ? strerror(errno) : "");
++ return -1;
++ }
+
-+ return;
-+ }
++ *addr = *(struct sockaddr_in *) res->ai_addr;
+
-+ fpm_signal_sent = 0;
-+ fpm_state = new_state;
++ freeaddrinfo(res);
+
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "switching to '%s' state", fpm_state_names[fpm_state]);
++ return 0;
++}
+
-+ /* fall down */
++enum { FPM_GET_USE_SOCKET = 1, FPM_STORE_SOCKET = 2, FPM_STORE_USE_SOCKET = 3 };
+
-+ case FPM_PCTL_ACTION_TIMEOUT :
++static void fpm_sockets_cleanup(int which, void *arg)
++{
++ int i;
++ char *env_value = 0;
++ int p = 0;
++ struct listening_socket_s *ls = sockets_list.data;
+
-+ fpm_pctl_action_next();
++ for (i = 0; i < sockets_list.used; i++, ls++) {
++
++ if (which != FPM_CLEANUP_PARENT_EXEC) {
++
++ close(ls->sock);
++
++ }
++ else { /* on PARENT EXEC we want socket fds to be inherited through environment variable */
++ char fd[32];
++ sprintf(fd, "%d", ls->sock);
++ env_value = realloc(env_value, p + (p ? 1 : 0) + strlen(ls->key) + 1 + strlen(fd) + 1);
++ p += sprintf(env_value + p, "%s%s=%s", p ? "," : "", ls->key, fd);
++ }
+
-+ break;
++ if (which == FPM_CLEANUP_PARENT_EXIT_MAIN) {
+
-+ case FPM_PCTL_ACTION_LAST_CHILD_EXITED :
++ if (ls->type == FPM_AF_UNIX) {
++ unlink(ls->key);
++ }
+
-+ fpm_pctl_action_last();
++ }
+
-+ break;
++ free(ls->key);
++ }
+
++ if (env_value) {
++ setenv("FPM_SOCKETS", env_value, 1);
++ free(env_value);
+ }
-+}
+
-+int fpm_pctl_can_spawn_children()
-+{
-+ return fpm_state == FPM_PCTL_STATE_NORMAL;
++ fpm_array_free(&sockets_list);
+}
+
-+int fpm_pctl_child_exited()
++static int fpm_sockets_hash_op(int sock, struct sockaddr *sa, char *key, int type, int op)
+{
-+ if (fpm_state == FPM_PCTL_STATE_NORMAL) return 0;
-+
-+ if (!fpm_globals.running_children) {
-+ fpm_pctl(FPM_PCTL_STATE_UNSPECIFIED, FPM_PCTL_ACTION_LAST_CHILD_EXITED);
-+ }
+
-+ return 0;
-+}
++ if (key == NULL) {
+
-+int fpm_pctl_init_main(int argc, char **argv)
-+{
-+ saved_argc = argc;
++ switch (type) {
+
-+ for ( ; *argv; ++argv) {
-+ if (saved_argv_used == saved_argv_allocated) {
-+ int new_size = saved_argv_allocated + 10;
-+ void *new_ptr = realloc(saved_argv, sizeof(char *) * new_size);
++ case FPM_AF_INET : {
++ struct sockaddr_in *sa_in = (struct sockaddr_in *) sa;
+
-+ if (!new_ptr) {
-+ return -1;
-+ }
++ key = alloca(sizeof("xxx.xxx.xxx.xxx:ppppp"));
+
-+ saved_argv = new_ptr;
-+ saved_argv_allocated = new_size;
-+ }
++ sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
+
-+ saved_argv[saved_argv_used] = strdup(*argv);
++ break;
++ }
+
-+ ++saved_argv_used;
-+ }
++ case FPM_AF_UNIX : {
++ struct sockaddr_un *sa_un = (struct sockaddr_un *) sa;
+
-+ saved_argv[saved_argv_used] = 0;
++ key = alloca(strlen(sa_un->sun_path) + 1);
+
-+ fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_pctl_cleanup, 0);
++ strcpy(key, sa_un->sun_path);
+
-+ return 0;
-+}
++ break;
++ }
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_process_ctl.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_process_ctl.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_process_ctl.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_process_ctl.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,30 @@
++ default :
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ return -1;
++ }
+
-+#ifndef FPM_PROCESS_CTL_H
-+#define FPM_PROCESS_CTL_H 1
++ }
+
-+void fpm_pctl(int new_state, int action);
-+int fpm_pctl_can_spawn_children();
-+int fpm_pctl_child_exited();
-+int fpm_pctl_init_main(int argc, char **argv);
++ switch (op) {
+
++ case FPM_GET_USE_SOCKET :
++ {
+
-+enum {
-+ FPM_PCTL_STATE_UNSPECIFIED,
-+ FPM_PCTL_STATE_NORMAL,
-+ FPM_PCTL_STATE_RELOADING,
-+ FPM_PCTL_STATE_TERMINATING,
-+ FPM_PCTL_STATE_FINISHING
-+};
++ int i;
++ struct listening_socket_s *ls = sockets_list.data;
+
-+enum {
-+ FPM_PCTL_ACTION_SET,
-+ FPM_PCTL_ACTION_TIMEOUT,
-+ FPM_PCTL_ACTION_LAST_CHILD_EXITED
-+};
++ for (i = 0; i < sockets_list.used; i++, ls++) {
+
++ if (!strcmp(ls->key, key)) {
++ ++ls->refcount;
++ return ls->sock;
++ }
++ }
+
-+#endif
++ break;
++ }
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_shm.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_shm.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_shm.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_shm.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,4 @@
++ case FPM_STORE_SOCKET : /* inherited socket */
++ case FPM_STORE_USE_SOCKET : /* just created */
++ {
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ struct listening_socket_s *ls;
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_shm.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_shm.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_shm.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_shm.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,11 @@
++ ls = fpm_array_push(&sockets_list);
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ if (!ls) {
++ break;
++ }
+
-+#ifndef FPM_SHM_H
-+#define FPM_SHM_H 1
++ if (op == FPM_STORE_SOCKET) {
++ ls->refcount = 0;
++ }
++ else {
++ ls->refcount = 1;
++ }
++ ls->type = type;
++ ls->sock = sock;
++ ls->key = strdup(key);
+
++ return 0;
+
++ }
++ }
+
-+#endif
++ return -1;
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_signals.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_signals.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_signals.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_signals.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,235 @@
++}
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct sockaddr *sa, int socklen)
++{
++ int backlog = -1;
++ int flags = 1;
++ int sock;
++ mode_t saved_umask;
+
-+#include "fpm_config.h"
++ /* we have custom backlog value */
++ if (wp->config->listen_options) {
++ backlog = wp->config->listen_options->backlog;
++ }
+
-+#include <signal.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <errno.h>
++ sock = socket(sa->sa_family, SOCK_STREAM, 0);
+
-+#include "fpm_signals.h"
-+#include "fpm_sockets.h"
-+#include "zlog.h"
++ if (0 > sock) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "socket() failed");
++ return -1;
++ }
+
-+static int sp[2];
++ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
+
-+static int signals_overflowed;
++ if (wp->listen_address_domain == FPM_AF_UNIX) {
++ unlink( ((struct sockaddr_un *) sa)->sun_path);
++ }
+
-+const char *fpm_signal_names[NSIG + 1] = {
-+#ifdef SIGHUP
-+ [SIGHUP] = "SIGHUP",
-+#endif
-+#ifdef SIGINT
-+ [SIGINT] = "SIGINT",
-+#endif
-+#ifdef SIGQUIT
-+ [SIGQUIT] = "SIGQUIT",
-+#endif
-+#ifdef SIGILL
-+ [SIGILL] = "SIGILL",
-+#endif
-+#ifdef SIGTRAP
-+ [SIGTRAP] = "SIGTRAP",
-+#endif
-+#ifdef SIGABRT
-+ [SIGABRT] = "SIGABRT",
-+#endif
-+#ifdef SIGEMT
-+ [SIGEMT] = "SIGEMT",
-+#endif
-+#ifdef SIGBUS
-+ [SIGBUS] = "SIGBUS",
-+#endif
-+#ifdef SIGFPE
-+ [SIGFPE] = "SIGFPE",
-+#endif
-+#ifdef SIGKILL
-+ [SIGKILL] = "SIGKILL",
-+#endif
-+#ifdef SIGUSR1
-+ [SIGUSR1] = "SIGUSR1",
-+#endif
-+#ifdef SIGSEGV
-+ [SIGSEGV] = "SIGSEGV",
-+#endif
-+#ifdef SIGUSR2
-+ [SIGUSR2] = "SIGUSR2",
-+#endif
-+#ifdef SIGPIPE
-+ [SIGPIPE] = "SIGPIPE",
-+#endif
-+#ifdef SIGALRM
-+ [SIGALRM] = "SIGALRM",
-+#endif
-+#ifdef SIGTERM
-+ [SIGTERM] = "SIGTERM",
-+#endif
-+#ifdef SIGCHLD
-+ [SIGCHLD] = "SIGCHLD",
-+#endif
-+#ifdef SIGCONT
-+ [SIGCONT] = "SIGCONT",
-+#endif
-+#ifdef SIGSTOP
-+ [SIGSTOP] = "SIGSTOP",
-+#endif
-+#ifdef SIGTSTP
-+ [SIGTSTP] = "SIGTSTP",
-+#endif
-+#ifdef SIGTTIN
-+ [SIGTTIN] = "SIGTTIN",
-+#endif
-+#ifdef SIGTTOU
-+ [SIGTTOU] = "SIGTTOU",
-+#endif
-+#ifdef SIGURG
-+ [SIGURG] = "SIGURG",
-+#endif
-+#ifdef SIGXCPU
-+ [SIGXCPU] = "SIGXCPU",
-+#endif
-+#ifdef SIGXFSZ
-+ [SIGXFSZ] = "SIGXFSZ",
-+#endif
-+#ifdef SIGVTALRM
-+ [SIGVTALRM] = "SIGVTALRM",
-+#endif
-+#ifdef SIGPROF
-+ [SIGPROF] = "SIGPROF",
-+#endif
-+#ifdef SIGWINCH
-+ [SIGWINCH] = "SIGWINCH",
-+#endif
-+#ifdef SIGINFO
-+ [SIGINFO] = "SIGINFO",
-+#endif
-+#ifdef SIGIO
-+ [SIGIO] = "SIGIO",
-+#endif
-+#ifdef SIGPWR
-+ [SIGPWR] = "SIGPWR",
-+#endif
-+#ifdef SIGSYS
-+ [SIGSYS] = "SIGSYS",
-+#endif
-+#ifdef SIGWAITING
-+ [SIGWAITING] = "SIGWAITING",
-+#endif
-+#ifdef SIGLWP
-+ [SIGLWP] = "SIGLWP",
-+#endif
-+#ifdef SIGFREEZE
-+ [SIGFREEZE] = "SIGFREEZE",
-+#endif
-+#ifdef SIGTHAW
-+ [SIGTHAW] = "SIGTHAW",
-+#endif
-+#ifdef SIGCANCEL
-+ [SIGCANCEL] = "SIGCANCEL",
-+#endif
-+#ifdef SIGLOST
-+ [SIGLOST] = "SIGLOST",
-+#endif
-+};
++ saved_umask = umask(0777 ^ wp->socket_mode);
+
-+static void sig_soft_quit(int signo)
++ if (0 > bind(sock, sa, socklen)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "bind() for address '%s' failed", wp->config->listen_address);
++ return -1;
++ }
++
++ if (wp->listen_address_domain == FPM_AF_UNIX) {
++
++ char *path = ((struct sockaddr_un *) sa)->sun_path;
++
++ if (wp->socket_uid != -1 || wp->socket_gid != -1) {
++
++ if (0 > chown(path, wp->socket_uid, wp->socket_gid)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "chown() for address '%s' failed", wp->config->listen_address);
++ return -1;
++ }
++
++ }
++
++ }
++
++ umask(saved_umask);
++
++ if (0 > listen(sock, backlog)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "listen() for address '%s' failed", wp->config->listen_address);
++ return -1;
++ }
++
++ return sock;
++}
++
++static int fpm_sockets_get_listening_socket(struct fpm_worker_pool_s *wp, struct sockaddr *sa, int socklen)
+{
-+ /* closing fastcgi listening socket will force fcgi_accept() exit immediately */
-+ close(0);
-+ socket(AF_UNIX, SOCK_STREAM, 0);
++ int sock;
++
++ sock = fpm_sockets_hash_op(0, sa, 0, wp->listen_address_domain, FPM_GET_USE_SOCKET);
++
++ if (sock >= 0) { return sock; }
++
++ sock = fpm_sockets_new_listening_socket(wp, sa, socklen);
++
++ fpm_sockets_hash_op(sock, sa, 0, wp->listen_address_domain, FPM_STORE_USE_SOCKET);
++
++ return sock;
+}
+
-+static void sig_handler(int signo)
++enum fpm_address_domain fpm_sockets_domain_from_address(char *address)
+{
-+ static const char sig_chars[32] = {
-+ [SIGTERM] = 'T',
-+ [SIGINT] = 'I',
-+ [SIGUSR2] = '2',
-+ [SIGQUIT] = 'Q',
-+ [SIGCHLD] = 'C'
-+ };
-+ char s = sig_chars[signo];
-+ int saved_errno = errno;
++ if (strchr(address, ':')) { return FPM_AF_INET; }
+
-+ if (0 > write(sp[1], &s, sizeof(s))) {
-+ signals_overflowed = 1;
-+ }
++ if (strlen(address) == strspn(address, "0123456789")) { return FPM_AF_INET; }
+
-+ errno = saved_errno;
++ return FPM_AF_UNIX;
+}
+
-+int fpm_signals_init_main()
++static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp)
+{
-+ struct sigaction act;
++ struct sockaddr_in sa_in;
++ char *dup_address = strdup(wp->config->listen_address);
++ char *port_str = strchr(dup_address, ':');
++ char *addr = NULL;
++ int port = 0;
+
-+ if (0 > socketpair(AF_UNIX, SOCK_STREAM, 0, sp)) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "socketpair() failed");
-+ return -1;
++ if (port_str) { /* this is host:port pair */
++ *port_str++ = '\0';
++ port = atoi(port_str);
++ addr = dup_address;
+ }
-+
-+ if (0 > fd_set_blocked(sp[0], 0) || 0 > fd_set_blocked(sp[1], 0)) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fd_set_blocked() failed");
-+ return -1;
++ else if (strlen(dup_address) == strspn(dup_address, "0123456789")) { /* this is port */
++ port = atoi(dup_address);
++ port_str = dup_address;
+ }
+
-+ if (0 > fcntl(sp[0], F_SETFD, FD_CLOEXEC) || 0 > fcntl(sp[1], F_SETFD, FD_CLOEXEC)) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fcntl(F_SETFD, FD_CLOEXEC) failed");
++ if (port == 0) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "invalid port value '%s'", port_str);
+ return -1;
+ }
+
-+ memset(&act, 0, sizeof(act));
-+ act.sa_handler = &sig_handler;
-+ sigfillset(&act.sa_mask);
++ memset(&sa_in, 0, sizeof(sa_in));
+
-+ if (0 > sigaction(SIGTERM, &act, 0) ||
-+ 0 > sigaction(SIGINT, &act, 0) ||
-+ 0 > sigaction(SIGUSR2, &act, 0) ||
-+ 0 > sigaction(SIGCHLD, &act, 0) ||
-+ 0 > sigaction(SIGQUIT, &act, 0)) {
++ if (addr) {
+
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "sigaction() failed");
-+ return -1;
++ sa_in.sin_addr.s_addr = inet_addr(addr);
++
++ if (sa_in.sin_addr.s_addr == INADDR_NONE) { /* do resolve */
++ if (0 > fpm_sockets_resolve_af_inet(addr, NULL, &sa_in)) {
++ return -1;
++ }
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "address '%s' resolved as %u.%u.%u.%u", addr, IPQUAD(&sa_in.sin_addr));
++ }
+ }
++ else {
+
-+ return 0;
++ sa_in.sin_addr.s_addr = htonl(INADDR_ANY);
++
++ }
++
++ sa_in.sin_family = AF_INET;
++ sa_in.sin_port = htons(port);
++
++ free(dup_address);
++
++ return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_in, sizeof(struct sockaddr_in));
+}
+
-+int fpm_signals_init_child()
++static int fpm_socket_af_unix_listening_socket(struct fpm_worker_pool_s *wp)
+{
-+ struct sigaction act, act_dfl;
-+
-+ memset(&act, 0, sizeof(act));
-+ memset(&act_dfl, 0, sizeof(act_dfl));
++ struct sockaddr_un sa_un;
+
-+ act.sa_handler = sig_soft_quit;
-+ act.sa_flags |= SA_RESTART;
++ memset(&sa_un, 0, sizeof(sa_un));
+
-+ act_dfl.sa_handler = SIG_DFL;
++ cpystrn(sa_un.sun_path, wp->config->listen_address, sizeof(sa_un.sun_path));
++ sa_un.sun_family = AF_UNIX;
+
-+ close(sp[0]);
-+ close(sp[1]);
++ return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_un, sizeof(struct sockaddr_un));
++}
+
-+ if (0 > sigaction(SIGTERM, &act_dfl, 0) ||
-+ 0 > sigaction(SIGINT, &act_dfl, 0) ||
-+ 0 > sigaction(SIGUSR2, &act_dfl, 0) ||
-+ 0 > sigaction(SIGCHLD, &act_dfl, 0) ||
-+ 0 > sigaction(SIGQUIT, &act, 0)) {
++int fpm_sockets_init_main()
++{
++ int i;
++ struct fpm_worker_pool_s *wp;
++ char *inherited = getenv("FPM_SOCKETS");
++ struct listening_socket_s *ls;
+
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "sigaction() failed");
++ if (0 == fpm_array_init(&sockets_list, sizeof(struct listening_socket_s), 10)) {
+ return -1;
+ }
+
-+ return 0;
-+}
++ /* import inherited sockets */
++ while (inherited && *inherited) {
++ char *comma = strchr(inherited, ',');
++ int type, fd_no;
++ char *eq;
+
-+int fpm_signals_get_fd()
-+{
-+ return sp[0];
-+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_signals.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_signals.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_signals.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_signals.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,16 @@
++ if (comma) { *comma = '\0'; }
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ eq = strchr(inherited, '=');
+
-+#ifndef FPM_SIGNALS_H
-+#define FPM_SIGNALS_H 1
++ if (eq) {
++ *eq = '\0';
+
-+#include <signal.h>
++ fd_no = atoi(eq + 1);
+
-+int fpm_signals_init_main();
-+int fpm_signals_init_child();
-+int fpm_signals_get_fd();
++ type = fpm_sockets_domain_from_address(inherited);
+
-+extern const char *fpm_signal_names[NSIG + 1];
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "using inherited socket fd=%d, \"%s\"", fd_no, inherited);
+
-+#endif
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_sockets.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_sockets.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_sockets.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_sockets.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,432 @@
++ fpm_sockets_hash_op(fd_no, 0, inherited, type, FPM_STORE_SOCKET);
++ }
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ if (comma) { inherited = comma + 1; }
++ else { inherited = 0; }
++ }
+
-+#include "fpm_config.h"
++ /* create all required sockets */
++ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
+
-+#ifdef HAVE_ALLOCA_H
-+#include <alloca.h>
-+#endif
-+#include <sys/types.h>
-+#include <sys/stat.h> /* for chmod(2) */
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <sys/un.h>
-+#include <netdb.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <unistd.h>
++ if (!wp->is_template) {
+
-+#include "zlog.h"
-+#include "fpm_sockets.h"
-+#include "fpm_worker_pool.h"
-+#include "fpm_unix.h"
-+#include "fpm_env.h"
-+#include "fpm_cleanup.h"
++ switch (wp->listen_address_domain) {
+
-+struct fpm_listening_socket_s {
-+ int refcount;
-+ int sock;
-+ int type;
-+ char *key;
-+};
++ case FPM_AF_INET :
+
-+struct fpm_listening_socket_s *sockets_list;
-+static int sockets_list_used, sockets_list_allocated;
++ wp->listening_socket = fpm_socket_af_inet_listening_socket(wp);
++ break;
+
-+static int fpm_sockets_resolve_af_inet(char *node, char *service, struct sockaddr_in *addr)
-+{
-+ struct addrinfo *res;
-+ struct addrinfo hints;
-+ int ret;
++ case FPM_AF_UNIX :
++
++ if (0 > fpm_unix_resolve_socket_premissions(wp)) {
++ return -1;
++ }
++
++ wp->listening_socket = fpm_socket_af_unix_listening_socket(wp);
++ break;
++
++ }
++
++ if (wp->listening_socket == -1) {
++ return -1;
++ }
++ }
++
++ }
++
++ /* close unused sockets that was inherited */
++ ls = sockets_list.data;
++
++ for (i = 0; i < sockets_list.used; ) {
++
++ if (ls->refcount == 0) {
++ close(ls->sock);
++ if (ls->type == FPM_AF_UNIX) {
++ unlink(ls->key);
++ }
++ free(ls->key);
++ fpm_array_item_remove(&sockets_list, i);
++ }
++ else {
++ ++i;
++ ++ls;
++ }
++ }
++
++ if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_sockets_cleanup, 0)) {
++ return -1;
++ }
++
++ return 0;
++}
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_sockets.h php-src/sapi/fpm/fpm/fpm_sockets.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_sockets.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_sockets.h 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,37 @@
++
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
++
++#ifndef FPM_MISC_H
++#define FPM_MISC_H 1
++
++#include <unistd.h>
++#include <fcntl.h>
+
-+ memset(&hints, 0, sizeof(hints));
++#include "fpm_worker_pool.h"
+
-+ hints.ai_family = AF_INET;
++enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);
++int fpm_sockets_init_main();
+
-+ ret = getaddrinfo(node, service, &hints, &res);
+
-+ if (ret != 0) {
-+ zlog(ZLOG_STUFF, ZLOG_ERROR, "can't resolve hostname '%s%s%s': getaddrinfo said: %s%s%s\n",
-+ node, service ? ":" : "", service ? service : "",
-+ gai_strerror(ret), ret == EAI_SYSTEM ? ", system error: " : "", ret == EAI_SYSTEM ? strerror(errno) : "");
-+ return -1;
-+ }
++static inline int fd_set_blocked(int fd, int blocked)
++{
++ int flags = fcntl(fd, F_GETFL);
+
-+ *addr = *(struct sockaddr_in *) res->ai_addr;
++ if (flags < 0) { return -1; }
+
-+ freeaddrinfo(res);
++ if (blocked)
++ { flags &= ~O_NONBLOCK; }
++ else
++ { flags |= O_NONBLOCK; }
+
-+ return 0;
++ return fcntl(fd, F_SETFL, flags);
+}
+
-+enum { FPM_GET_USE_SOCKET = 1, FPM_STORE_SOCKET = 2, FPM_STORE_USE_SOCKET = 3 };
-+
-+static void fpm_sockets_cleanup(int which, void *arg)
-+{
-+ int i;
-+ char *env_value = 0;
-+ int p = 0;
++#define IPQUAD(sin_addr) \
++ (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[0], \
++ (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[1], \
++ (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[2], \
++ (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[3]
+
-+ for (i = 0; i < sockets_list_used; i++) {
-+ struct fpm_listening_socket_s *ls = &sockets_list[i];
++#endif
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_stdio.c php-src/sapi/fpm/fpm/fpm_stdio.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_stdio.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_stdio.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,286 @@
+
-+ if (which != FPM_CLEANUP_PARENT_EXEC) {
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ close(ls->sock);
++#include "fpm_config.h"
+
-+ }
-+ else { /* on PARENT EXEC we want socket fds to be inherited through environment variable */
-+ char fd[32];
-+ sprintf(fd, "%d", ls->sock);
-+ env_value = realloc(env_value, p + (p ? 1 : 0) + strlen(ls->key) + 1 + strlen(fd) + 1);
-+ p += sprintf(env_value + p, "%s%s=%s", p ? "," : "", ls->key, fd);
-+ }
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <string.h>
++#include <fcntl.h>
++#include <unistd.h>
++#include <errno.h>
+
-+ if (which == FPM_CLEANUP_PARENT_EXIT_MAIN) {
++#include "fpm.h"
++#include "fpm_children.h"
++#include "fpm_events.h"
++#include "fpm_sockets.h"
++#include "fpm_stdio.h"
++#include "zlog.h"
+
-+ if (ls->type == FPM_AF_UNIX) {
-+ unlink(ls->key);
-+ }
++static int fd_stdout[2];
++static int fd_stderr[2];
+
-+ }
++int fpm_stdio_init_main()
++{
++ int fd = open("/dev/null", O_RDWR);
+
-+ free(ls->key);
++ if (0 > fd) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(\"/dev/null\") failed");
++ return -1;
+ }
+
-+ if (env_value) {
-+ setenv("FPM_SOCKETS", env_value, 1);
++ if (0 > dup2(fd, STDIN_FILENO) || 0 > dup2(fd, STDOUT_FILENO)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "dup2() failed");
++ return -1;
+ }
+
-+ free(sockets_list);
++ close(fd);
+
-+ sockets_list_used = sockets_list_allocated = 0;
-+ sockets_list = 0;
++ return 0;
+}
+
-+static int fpm_sockets_hash_op(int sock, struct sockaddr *sa, char *key, int type, int op)
++int fpm_stdio_init_final()
+{
++ if (fpm_global_config.daemonize) {
+
-+ if (key == NULL) {
++ if (fpm_globals.error_log_fd != STDERR_FILENO) {
++ /* there might be messages to stderr from libevent, we need to log them all */
++ if (0 > dup2(fpm_globals.error_log_fd, STDERR_FILENO)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "dup2() failed");
++ return -1;
++ }
++ }
+
-+ switch (type) {
++ zlog_set_level(fpm_globals.log_level);
+
-+ case FPM_AF_INET : {
-+ struct sockaddr_in *sa_in = (struct sockaddr_in *) sa;
++ zlog_set_fd(fpm_globals.error_log_fd);
++ }
+
-+ key = alloca(sizeof("xxx.xxx.xxx.xxx:ppppp"));
++ return 0;
++}
+
-+ sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), ntohs(sa_in->sin_port));
++int fpm_stdio_init_child(struct fpm_worker_pool_s *wp)
++{
++ close(fpm_globals.error_log_fd);
++ fpm_globals.error_log_fd = -1;
++ zlog_set_fd(-1);
+
-+ break;
-+ }
++ if (wp->listening_socket != STDIN_FILENO) {
++ if (0 > dup2(wp->listening_socket, STDIN_FILENO)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "dup2() failed");
++ return -1;
++ }
++ }
+
-+ case FPM_AF_UNIX : {
-+ struct sockaddr_un *sa_un = (struct sockaddr_un *) sa;
++ return 0;
++}
+
-+ key = alloca(strlen(sa_un->sun_path) + 1);
++static void fpm_stdio_child_said(int fd, short which, void *arg)
++{
++ static const int max_buf_size = 1024;
++ char buf[max_buf_size];
++ struct fpm_child_s *child = arg;
++ int is_stdout = fd == child->fd_stdout;
++ struct event *ev = is_stdout ? &child->ev_stdout : &child->ev_stderr;
++ int fifo_in = 1, fifo_out = 1;
++ int is_last_message = 0;
++ int in_buf = 0;
++ int res;
+
-+ strcpy(key, sa_un->sun_path);
++#if 0
++ zlog(ZLOG_STUFF, ZLOG_DEBUG, "child %d said %s", (int) child->pid, is_stdout ? "stdout" : "stderr");
++#endif
+
-+ break;
-+ }
++ while (fifo_in || fifo_out) {
+
-+ default :
++ if (fifo_in) {
+
-+ return -1;
-+ }
++ res = read(fd, buf + in_buf, max_buf_size - 1 - in_buf);
+
-+ }
++ if (res <= 0) { /* no data */
++ fifo_in = 0;
+
-+ switch (op) {
++ if (res < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
++ /* just no more data ready */
++ }
++ else { /* error or pipe is closed */
+
-+ case FPM_GET_USE_SOCKET :
-+ {
++ if (res < 0) { /* error */
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "read() failed");
++ }
+
-+ int i;
++ fpm_event_del(ev);
++ is_last_message = 1;
+
-+ for (i = 0; i < sockets_list_used; i++) {
-+ struct fpm_listening_socket_s *ls = &sockets_list[i];
++ if (is_stdout) {
++ close(child->fd_stdout);
++ child->fd_stdout = -1;
++ }
++ else {
++ close(child->fd_stderr);
++ child->fd_stderr = -1;
++ }
+
-+ if (!strcmp(ls->key, key)) {
-+ ++ls->refcount;
-+ return ls->sock;
++#if 0
++ if (in_buf == 0 && !fpm_globals.is_child) {
++ zlog(ZLOG_STUFF, ZLOG_DEBUG, "child %d (pool %s) %s pipe is closed", (int) child->pid,
++ child->wp->config->name, is_stdout ? "stdout" : "stderr");
++ }
++#endif
+ }
+ }
-+
-+ break;
++ else {
++ in_buf += res;
++ }
+ }
+
-+ case FPM_STORE_SOCKET : /* inherited socket */
-+ case FPM_STORE_USE_SOCKET : /* just created */
-+ {
-+
-+ struct fpm_listening_socket_s *ls;
++ if (fifo_out) {
++ if (in_buf == 0) {
++ fifo_out = 0;
++ }
++ else {
++ char *nl;
++ int should_print = 0;
++ buf[in_buf] = '\0';
+
-+ if (sockets_list_used == sockets_list_allocated) {
-+ int new_size = sockets_list_allocated + 10;
-+ void *new_ptr = realloc(sockets_list, sizeof(struct fpm_listening_socket_s) * new_size);
++ /* FIXME: there might be binary data */
+
-+ if (!new_ptr) {
-+ break;
++ /* we should print if no more space in the buffer */
++ if (in_buf == max_buf_size - 1) {
++ should_print = 1;
+ }
+
-+ sockets_list = new_ptr;
-+ sockets_list_allocated = new_size;
-+ }
++ /* we should print if no more data to come */
++ if (!fifo_in) {
++ should_print = 1;
++ }
+
-+ ls = &sockets_list[sockets_list_used];
++ nl = strchr(buf, '\n');
+
-+ if (op == FPM_STORE_SOCKET) {
-+ ls->refcount = 0;
-+ }
-+ else {
-+ ls->refcount = 1;
-+ }
-+ ls->type = type;
-+ ls->sock = sock;
-+ ls->key = strdup(key);
++ if (nl || should_print) {
+
-+ ++sockets_list_used;
++ if (nl) {
++ *nl = '\0';
++ }
+
-+ return 0;
++ zlog(ZLOG_STUFF, ZLOG_WARNING, "child %d (pool %s) said into %s: \"%s\"%s", (int) child->pid,
++ child->wp->config->name, is_stdout ? "stdout" : "stderr", buf, is_last_message ? ", pipe is closed" : "");
+
++ if (nl) {
++ int out_buf = 1 + nl - buf;
++ memmove(buf, buf + out_buf, in_buf - out_buf);
++ in_buf -= out_buf;
++ }
++ else {
++ in_buf = 0;
++ }
++ }
++ }
+ }
+ }
+
-+ return -1;
-+
+}
+
-+static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct sockaddr *sa, int socklen)
++int fpm_stdio_prepare_pipes(struct fpm_child_s *child)
+{
-+ int backlog = -1;
-+ int flags = 1;
-+ int sock;
-+ mode_t saved_umask;
-+
-+ /* we have custom backlog value */
-+ if (wp->config->listen_options) {
-+ backlog = wp->config->listen_options->backlog;
++ if (0 == child->wp->config->catch_workers_output) { /* not required */
++ return 0;
+ }
+
-+ sock = socket(sa->sa_family, SOCK_STREAM, 0);
-+
-+ if (0 > sock) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "socket() failed");
++ if (0 > pipe(fd_stdout)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "pipe() failed");
+ return -1;
+ }
+
-+ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
-+
-+ if (wp->listen_address_domain == FPM_AF_UNIX) {
-+ unlink( ((struct sockaddr_un *) sa)->sun_path);
-+ }
-+
-+ saved_umask = umask(0777 ^ wp->socket_mode);
-+
-+ if (0 > bind(sock, sa, socklen)) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "bind() for address '%s' failed", wp->config->listen_address);
++ if (0 > pipe(fd_stderr)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "pipe() failed");
++ close(fd_stdout[0]); close(fd_stdout[1]);
+ return -1;
+ }
-+
-+ if (wp->listen_address_domain == FPM_AF_UNIX) {
-+
-+ char *path = ((struct sockaddr_un *) sa)->sun_path;
-+
-+ if (wp->socket_uid != -1 || wp->socket_gid != -1) {
-+
-+ if (0 > chown(path, wp->socket_uid, wp->socket_gid)) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "chown() for address '%s' failed", wp->config->listen_address);
-+ return -1;
-+ }
-+
-+ }
-+
-+ }
-+
-+ umask(saved_umask);
-+
-+ if (0 > listen(sock, backlog)) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "listen() for address '%s' failed", wp->config->listen_address);
++
++ if (0 > fd_set_blocked(fd_stdout[0], 0) || 0 > fd_set_blocked(fd_stderr[0], 0)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fd_set_blocked() failed");
++ close(fd_stdout[0]); close(fd_stdout[1]);
++ close(fd_stderr[0]); close(fd_stderr[1]);
+ return -1;
+ }
+
-+ return sock;
++ return 0;
+}
+
-+static int fpm_sockets_get_listening_socket(struct fpm_worker_pool_s *wp, struct sockaddr *sa, int socklen)
++int fpm_stdio_parent_use_pipes(struct fpm_child_s *child)
+{
-+ int sock;
-+
-+ sock = fpm_sockets_hash_op(0, sa, 0, wp->listen_address_domain, FPM_GET_USE_SOCKET);
++ if (0 == child->wp->config->catch_workers_output) { /* not required */
++ return 0;
++ }
+
-+ if (sock >= 0) return sock;
++ close(fd_stdout[1]);
++ close(fd_stderr[1]);
+
-+ sock = fpm_sockets_new_listening_socket(wp, sa, socklen);
++ child->fd_stdout = fd_stdout[0];
++ child->fd_stderr = fd_stderr[0];
+
-+ fpm_sockets_hash_op(sock, sa, 0, wp->listen_address_domain, FPM_STORE_USE_SOCKET);
++ fpm_event_add(child->fd_stdout, &child->ev_stdout, fpm_stdio_child_said, child);
++ fpm_event_add(child->fd_stderr, &child->ev_stderr, fpm_stdio_child_said, child);
+
-+ return sock;
++ return 0;
+}
+
-+enum fpm_address_domain fpm_sockets_domain_from_address(char *address)
++int fpm_stdio_discard_pipes(struct fpm_child_s *child)
+{
-+ if (strchr(address, ':')) return FPM_AF_INET;
++ if (0 == child->wp->config->catch_workers_output) { /* not required */
++ return 0;
++ }
+
-+ if (strlen(address) == strspn(address, "0123456789")) return FPM_AF_INET;
++ close(fd_stdout[1]);
++ close(fd_stderr[1]);
+
-+ return FPM_AF_UNIX;
++ close(fd_stdout[0]);
++ close(fd_stderr[0]);
++
++ return 0;
+}
+
-+static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp)
++void fpm_stdio_child_use_pipes(struct fpm_child_s *child)
+{
-+ struct sockaddr_in sa_in;
-+ char *dup_address = strdup(wp->config->listen_address);
-+ char *port_str = strchr(dup_address, ':');
-+ char *addr = NULL;
-+ int port = 0;
-+
-+ if (port_str) { /* this is host:port pair */
-+ *port_str++ = '\0';
-+ port = atoi(port_str);
-+ addr = dup_address;
-+ }
-+ else if (strlen(dup_address) == strspn(dup_address, "0123456789")) { /* this is port */
-+ port = atoi(dup_address);
-+ port_str = dup_address;
++ if (child->wp->config->catch_workers_output) {
++ dup2(fd_stdout[1], STDOUT_FILENO);
++ dup2(fd_stderr[1], STDERR_FILENO);
++ close(fd_stdout[0]); close(fd_stdout[1]);
++ close(fd_stderr[0]); close(fd_stderr[1]);
+ }
-+
-+ if (port == 0) {
-+ zlog(ZLOG_STUFF, ZLOG_ERROR, "invalid port value '%s'", port_str);
-+ return -1;
++ else {
++ /* stdout of parent is always /dev/null */
++ dup2(STDOUT_FILENO, STDERR_FILENO);
+ }
++}
+
-+ memset(&sa_in, 0, sizeof(sa_in));
++int fpm_stdio_open_error_log(int reopen)
++{
++ int fd;
+
-+ if (addr) {
++ fd = open(fpm_global_config.error_log, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
+
-+ sa_in.sin_addr.s_addr = inet_addr(addr);
++ if (0 > fd) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(\"%s\") failed", fpm_global_config.error_log);
++ return -1;
++ }
+
-+ if (sa_in.sin_addr.s_addr == INADDR_NONE) { /* do resolve */
-+ if (0 > fpm_sockets_resolve_af_inet(addr, NULL, &sa_in)) {
-+ return -1;
-+ }
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "address '%s' resolved as %u.%u.%u.%u", addr, IPQUAD(&sa_in.sin_addr));
++ if (reopen) {
++ if (fpm_global_config.daemonize) {
++ dup2(fd, STDERR_FILENO);
+ }
++
++ dup2(fd, fpm_globals.error_log_fd);
++ close(fd);
++ fd = fpm_globals.error_log_fd; /* for FD_CLOSEXEC to work */
+ }
+ else {
++ fpm_globals.error_log_fd = fd;
++ }
+
-+ sa_in.sin_addr.s_addr = htonl(INADDR_ANY);
++ fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+
-+ }
++ return 0;
++}
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_stdio.h php-src/sapi/fpm/fpm/fpm_stdio.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_stdio.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_stdio.h 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,20 @@
+
-+ sa_in.sin_family = AF_INET;
-+ sa_in.sin_port = htons(port);
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ free(dup_address);
++#ifndef FPM_STDIO_H
++#define FPM_STDIO_H 1
+
-+ return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_in, sizeof(struct sockaddr_in));
-+}
++#include "fpm_worker_pool.h"
+
-+static int fpm_socket_af_unix_listening_socket(struct fpm_worker_pool_s *wp)
-+{
-+ struct sockaddr_un sa_un;
++int fpm_stdio_init_main();
++int fpm_stdio_init_final();
++int fpm_stdio_init_child(struct fpm_worker_pool_s *wp);
++int fpm_stdio_prepare_pipes(struct fpm_child_s *child);
++void fpm_stdio_child_use_pipes(struct fpm_child_s *child);
++int fpm_stdio_parent_use_pipes(struct fpm_child_s *child);
++int fpm_stdio_discard_pipes(struct fpm_child_s *child);
++int fpm_stdio_open_error_log(int reopen);
+
-+ memset(&sa_un, 0, sizeof(sa_un));
++#endif
+
-+ strncpy(sa_un.sun_path, wp->config->listen_address, sizeof(sa_un.sun_path) - 1);
-+ sa_un.sun_family = AF_UNIX;
-+ sa_un.sun_path[sizeof(sa_un.sun_path) - 1] = '\0';
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_str.h php-src/sapi/fpm/fpm/fpm_str.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_str.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_str.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,49 @@
+
-+ return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_un, sizeof(struct sockaddr_un));
-+}
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+int fpm_sockets_init_main()
++#ifndef FPM_STR_H
++#define FPM_STR_H 1
++
++static inline char *cpystrn(char *dst, const char *src, size_t dst_size)
+{
-+ int i;
-+ struct fpm_worker_pool_s *wp;
-+ char *inherited = getenv("FPM_SOCKETS");
++ char *d, *end;
++
++ if (!dst_size) { return dst; }
++
++ d = dst;
++ end = dst + dst_size - 1;
++
++ for (; d < end; ++d, ++src) {
++ if (!(*d = *src)) {
++ return d;
++ }
++ }
+
-+ /* import inherited sockets */
-+ while (inherited && *inherited) {
-+ char *comma = strchr(inherited, ',');
-+ int type, fd_no;
-+ char *eq;
++ *d = '\0';
+
-+ if (comma) *comma = '\0';
++ return d;
++}
+
-+ eq = strchr(inherited, '=');
++static inline char *str_purify_filename(char *dst, char *src, size_t size)
++{
++ char *d, *end;
+
-+ if (eq) {
-+ *eq = '\0';
++ d = dst;
++ end = dst + size - 1;
+
-+ fd_no = atoi(eq + 1);
++ for (; d < end && *src; ++d, ++src) {
++ if (* (unsigned char *) src < ' ' || * (unsigned char *) src > '\x7f') {
++ *d = '.';
++ }
++ else {
++ *d = *src;
++ }
++ }
+
-+ type = fpm_sockets_domain_from_address(inherited);
++ *d = '\0';
+
-+ zlog(ZLOG_STUFF, ZLOG_NOTICE, "using inherited socket fd=%d, \"%s\"", fd_no, inherited);
++ return d;
++}
+
-+ fpm_sockets_hash_op(fd_no, 0, inherited, type, FPM_STORE_SOCKET);
-+ }
++#endif
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_trace.c php-src/sapi/fpm/fpm/fpm_trace.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_trace.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_trace.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,46 @@
+
-+ if (comma) inherited = comma + 1;
-+ else inherited = 0;
-+ }
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
++#include "fpm_config.h"
+
-+ if (!wp->is_template) {
++#include <sys/types.h>
+
-+ switch (wp->listen_address_domain) {
++#include "fpm_trace.h"
+
-+ case FPM_AF_INET :
++int fpm_trace_get_strz(char *buf, size_t sz, long addr)
++{
++ int i;
++ long l;
++ char *lc = (char *) &l;
+
-+ wp->listening_socket = fpm_socket_af_inet_listening_socket(wp);
-+ break;
++ if (0 > fpm_trace_get_long(addr, &l)) {
++ return -1;
++ }
+
-+ case FPM_AF_UNIX :
++ i = l % SIZEOF_LONG;
+
-+ if (0 > fpm_unix_resolve_socket_premissions(wp)) {
-+ return -1;
-+ }
++ l -= i;
+
-+ wp->listening_socket = fpm_socket_af_unix_listening_socket(wp);
-+ break;
++ for (addr = l; ; addr += SIZEOF_LONG) {
+
-+ }
++ if (0 > fpm_trace_get_long(addr, &l)) {
++ return -1;
++ }
+
-+ if (wp->listening_socket == -1) {
-+ return -1;
++ for ( ; i < SIZEOF_LONG; i++) {
++ --sz;
++
++ if (sz && lc[i]) {
++ *buf++ = lc[i];
++ continue;
+ }
++
++ *buf = '\0';
++ return 0;
+ }
+
++ i = 0;
+ }
++}
+
-+ /* close unused sockets that was inherited */
-+ for (i = 0; i < sockets_list_used; ) {
-+ struct fpm_listening_socket_s *ls = &sockets_list[i];
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_trace.h php-src/sapi/fpm/fpm/fpm_trace.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_trace.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_trace.h 2009-10-18 21:05:39.302497288 +0100
+@@ -0,0 +1,17 @@
+
-+ if (ls->refcount == 0) {
-+ close(ls->sock);
-+ if (ls->type == FPM_AF_UNIX) {
-+ unlink(ls->key);
-+ }
-+ free(ls->key);
-+ if (i < sockets_list_used - 1) {
-+ *ls = sockets_list[sockets_list_used - 1];
-+ }
-+ --sockets_list_used;
-+ }
-+ else {
-+ ++i;
-+ }
-+ }
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_sockets_cleanup, 0);
++#ifndef FPM_TRACE_H
++#define FPM_TRACE_H 1
+
-+ return 0;
-+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_sockets.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_sockets.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_sockets.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_sockets.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,37 @@
++#include <unistd.h>
++
++int fpm_trace_signal(pid_t pid);
++int fpm_trace_ready(pid_t pid);
++int fpm_trace_close(pid_t pid);
++int fpm_trace_get_long(long addr, long *data);
++int fpm_trace_get_strz(char *buf, size_t sz, long addr);
++
++#endif
++
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_trace_mach.c php-src/sapi/fpm/fpm/fpm_trace_mach.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_trace_mach.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_trace_mach.c 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,102 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+#ifndef FPM_MISC_H
-+#define FPM_MISC_H 1
++#include "fpm_config.h"
++
++#include <mach/mach.h>
++#include <mach/mach_vm.h>
+
+#include <unistd.h>
-+#include <fcntl.h>
+
-+#include "fpm_worker_pool.h"
++#include "fpm_trace.h"
++#include "fpm_process_ctl.h"
++#include "fpm_unix.h"
++#include "zlog.h"
+
-+enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);
-+int fpm_sockets_init_main();
+
++static mach_port_name_t target;
++static vm_offset_t target_page_base;
++static vm_offset_t local_page;
++static mach_msg_type_number_t local_size;
+
-+static inline int fd_set_blocked(int fd, int blocked)
++static void fpm_mach_vm_deallocate()
+{
-+ int flags = fcntl(fd, F_GETFL);
++ if (local_page) {
++ mach_vm_deallocate(mach_task_self(), local_page, local_size);
++ target_page_base = 0;
++ local_page = 0;
++ local_size = 0;
++ }
++}
+
-+ if (flags < 0) return -1;
++static int fpm_mach_vm_read_page(vm_offset_t page)
++{
++ kern_return_t kr;
+
-+ if (blocked)
-+ flags &= ~O_NONBLOCK;
-+ else
-+ flags |= O_NONBLOCK;
++ kr = mach_vm_read(target, page, fpm_pagesize, &local_page, &local_size);
+
-+ return fcntl(fd, F_SETFL, flags);
-+}
++ if (kr != KERN_SUCCESS) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "mach_vm_read() failed: %s (%d)", mach_error_string(kr), kr);
++ return -1;
++ }
+
-+#define IPQUAD(sin_addr) \
-+ ((unsigned char *) &(sin_addr)->s_addr)[0], \
-+ ((unsigned char *) &(sin_addr)->s_addr)[1], \
-+ ((unsigned char *) &(sin_addr)->s_addr)[2], \
-+ ((unsigned char *) &(sin_addr)->s_addr)[3]
++ return 0;
++}
+
-+#endif
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_stdio.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_stdio.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_stdio.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_stdio.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,220 @@
++int fpm_trace_signal(pid_t pid)
++{
++ if (0 > fpm_pctl_kill(pid, FPM_PCTL_STOP)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "kill(SIGSTOP) failed");
++ return -1;
++ }
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ return 0;
++}
+
-+#include "fpm_config.h"
++int fpm_trace_ready(pid_t pid)
++{
++ kern_return_t kr;
+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <errno.h>
++ kr = task_for_pid(mach_task_self(), pid, &target);
+
-+#include "fpm.h"
-+#include "fpm_children.h"
-+#include "fpm_events.h"
-+#include "fpm_sockets.h"
-+#include "fpm_stdio.h"
-+#include "zlog.h"
++ if (kr != KERN_SUCCESS) {
++ char *msg = "";
+
-+int fpm_stdio_init_main()
-+{
-+ int fd = open("/dev/null", 0);
++ if (kr == KERN_FAILURE) {
++ msg = " It seems that master process does not have enough privileges to trace processes.";
++ }
+
-+ if (0 > fd) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(\"/dev/zero\") failed");
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "task_for_pid() failed: %s (%d)%s", mach_error_string(kr), kr, msg);
+ return -1;
+ }
+
-+ dup2(fd, STDIN_FILENO);
-+ dup2(fd, STDOUT_FILENO);
-+ close(fd);
++ return 0;
++}
++
++int fpm_trace_close(pid_t pid)
++{
++ fpm_mach_vm_deallocate();
++
++ target = 0;
+
+ return 0;
+}
+
-+int fpm_stdio_init_final()
++int fpm_trace_get_long(long addr, long *data)
+{
-+ if (fpm_global_options.daemonize) {
++ size_t offset = ((uintptr_t) (addr) % fpm_pagesize);
++ vm_offset_t base = (uintptr_t) (addr) - offset;
+
-+ if (fpm_globals.error_log_fd != STDERR_FILENO) {
-+ dup2(fpm_globals.error_log_fd, STDERR_FILENO);
++ if (base != target_page_base) {
++ fpm_mach_vm_deallocate();
++ if (0 > fpm_mach_vm_read_page(base)) {
++ return -1;
+ }
-+
-+ zlog_set_fd(fpm_globals.error_log_fd);
+ }
+
++ *data = * (long *) (local_page + offset);
++
+ return 0;
+}
+
-+int fpm_stdio_init_child(struct fpm_worker_pool_s *wp)
-+{
-+ if (wp->config->catch_workers_output) {
-+ dup2(wp->fd_stdout[1], STDOUT_FILENO);
-+ dup2(wp->fd_stderr[1], STDERR_FILENO);
-+ close(wp->fd_stdout[0]); close(wp->fd_stdout[1]);
-+ close(wp->fd_stderr[0]); close(wp->fd_stderr[1]);
-+ }
-+ else {
-+ /* stdout of parent is always /dev/null */
-+ dup2(STDOUT_FILENO, STDERR_FILENO);
-+ }
-+
-+ close(fpm_globals.error_log_fd);
-+ fpm_globals.error_log_fd = -1;
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_trace_pread.c php-src/sapi/fpm/fpm/fpm_trace_pread.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_trace_pread.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_trace_pread.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,72 @@
++
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
++
++#define _GNU_SOURCE
++#define _FILE_OFFSET_BITS 64
++
++#include "fpm_config.h"
++
++#include <unistd.h>
++
++#include <fcntl.h>
++#include <stdio.h>
++#if HAVE_INTTYPES_H
++#include <inttypes.h>
++#else
++#include <stdint.h>
++#endif
++
++
++#include "fpm_trace.h"
++#include "fpm_process_ctl.h"
++#include "zlog.h"
++
++
++static int mem_file = -1;
+
-+ if (wp->listening_socket != STDIN_FILENO) {
-+ dup2(wp->listening_socket, STDIN_FILENO);
++int fpm_trace_signal(pid_t pid)
++{
++ if (0 > fpm_pctl_kill(pid, FPM_PCTL_STOP)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "kill(SIGSTOP) failed");
++ return -1;
+ }
+
+ return 0;
+}
+
-+int fpm_stdio_child_prepare_pipes(struct fpm_worker_pool_s *wp)
++int fpm_trace_ready(pid_t pid)
+{
-+ if (!wp->config->catch_workers_output) { /* not required */
-+ return 0;
-+ }
++ char buf[128];
+
-+ if (0 > pipe(wp->fd_stdout) || 0 > pipe(wp->fd_stderr)) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "pipe() failed");
-+ return -1;
-+ }
++ sprintf(buf, "/proc/%d/" PROC_MEM_FILE, (int) pid);
+
-+ if (0 > fd_set_blocked(wp->fd_stdout[0], 0) || 0 > fd_set_blocked(wp->fd_stderr[0], 0)) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fd_set_blocked() failed");
-+ close(wp->fd_stdout[0]); close(wp->fd_stdout[1]);
-+ close(wp->fd_stderr[0]); close(wp->fd_stderr[1]);
++ mem_file = open(buf, O_RDONLY);
++
++ if (0 > mem_file) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(%s) failed", buf);
+ return -1;
+ }
+
+ return 0;
+}
+
-+static void fpm_stdio_child_said(int fd, short which, void *arg)
++int fpm_trace_close(pid_t pid)
+{
-+ static const int max_buf_size = 1024;
-+ char buf[max_buf_size];
-+ struct fpm_child_s *child = arg;
-+ int is_stdout = fd == child->fd_stdout;
-+ struct event *ev = is_stdout ? &child->ev_stdout : &child->ev_stderr;
-+ int fifo_in = 1, fifo_out = 1;
-+ int is_last_message = 0;
-+ int in_buf = 0;
-+ int res;
-+
-+#if 0
-+ zlog(ZLOG_STUFF, ZLOG_DEBUG, "child %d said %s", (int) child->pid, is_stdout ? "stdout" : "stderr");
-+#endif
++ close(mem_file);
+
-+ while (fifo_in || fifo_out) {
++ mem_file = -1;
+
-+ if (fifo_in) {
++ return 0;
++}
+
-+ res = read(fd, buf + in_buf, max_buf_size - 1 - in_buf);
++int fpm_trace_get_long(long addr, long *data)
++{
++ if (sizeof(*data) != pread(mem_file, (void *) data, sizeof(*data), (uintptr_t) addr)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "pread() failed");
++ return -1;
++ }
+
-+ if (res <= 0) { /* no data */
-+ fifo_in = 0;
++ return 0;
++}
+
-+ if (res < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
-+ /* just no more data ready */
-+ }
-+ else { /* error or pipe is closed */
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_trace_ptrace.c php-src/sapi/fpm/fpm/fpm_trace_ptrace.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_trace_ptrace.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_trace_ptrace.c 2009-10-18 21:05:39.302497288 +0100
+@@ -0,0 +1,85 @@
+
-+ if (res < 0) { /* error */
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "read() failed");
-+ }
++ /* $Id$ */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
-+ fpm_event_del(ev);
-+ is_last_message = 1;
++#include "fpm_config.h"
+
-+ if (is_stdout) {
-+ close(child->fd_stdout);
-+ child->fd_stdout = -1;
-+ }
-+ else {
-+ close(child->fd_stderr);
-+ child->fd_stderr = -1;
-+ }
++#include <sys/wait.h>
++#include <sys/ptrace.h>
++#include <unistd.h>
++#include <errno.h>
+
-+#if 0
-+ if (in_buf == 0 && !fpm_globals.is_child) {
-+ zlog(ZLOG_STUFF, ZLOG_DEBUG, "child %d (pool %s) %s pipe is closed", (int) child->pid,
-+ child->wp->config->name, is_stdout ? "stdout" : "stderr");
-+ }
++#if defined(PT_ATTACH) && !defined(PTRACE_ATTACH)
++#define PTRACE_ATTACH PT_ATTACH
+#endif
-+ }
-+ }
-+ else {
-+ in_buf += res;
-+ }
-+ }
-+
-+ if (fifo_out) {
-+ if (in_buf == 0) {
-+ fifo_out = 0;
-+ }
-+ else {
-+ char *nl;
-+ int should_print = 0;
-+ buf[in_buf] = '\0';
-+
-+ /* FIXME: there might be binary data */
-+
-+ /* we should print if no more space in the buffer */
-+ if (in_buf == max_buf_size - 1) {
-+ should_print = 1;
-+ }
-+
-+ /* we should print if no more data to come */
-+ if (!fifo_in) {
-+ should_print = 1;
-+ }
+
-+ nl = strchr(buf, '\n');
++#if defined(PT_DETACH) && !defined(PTRACE_DETACH)
++#define PTRACE_DETACH PT_DETACH
++#endif
+
-+ if (nl || should_print) {
++#if defined(PT_READ_D) && !defined(PTRACE_PEEKDATA)
++#define PTRACE_PEEKDATA PT_READ_D
++#endif
+
-+ if (nl) {
-+ *nl = '\0';
-+ }
++#include "fpm_trace.h"
++#include "zlog.h"
+
-+ zlog(ZLOG_STUFF, ZLOG_WARNING, "child %d (pool %s) said into %s: \"%s\"%s", (int) child->pid,
-+ child->wp->config->name, is_stdout ? "stdout" : "stderr", buf, is_last_message ? ", pipe is closed" : "");
++static pid_t traced_pid;
+
-+ if (nl) {
-+ int out_buf = 1 + nl - buf;
-+ memmove(buf, buf + out_buf, in_buf - out_buf);
-+ in_buf -= out_buf;
-+ }
-+ else {
-+ in_buf = 0;
-+ }
-+ }
-+ }
-+ }
++int fpm_trace_signal(pid_t pid)
++{
++ if (0 > ptrace(PTRACE_ATTACH, pid, 0, 0)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(ATTACH) failed");
++ return -1;
+ }
+
++ return 0;
+}
+
-+int fpm_stdio_parent_use_pipes(struct fpm_child_s *child)
++int fpm_trace_ready(pid_t pid)
+{
-+ if (!child->wp->config->catch_workers_output) { /* not required */
-+ return 0;
-+ }
-+
-+ close(child->wp->fd_stdout[1]);
-+ close(child->wp->fd_stderr[1]);
++ traced_pid = pid;
+
-+ child->fd_stdout = child->wp->fd_stdout[0];
-+ child->fd_stderr = child->wp->fd_stderr[0];
++ return 0;
++}
+
-+ child->wp->fd_stdout[0] = child->wp->fd_stdout[1] = -1;
-+ child->wp->fd_stderr[0] = child->wp->fd_stderr[1] = -1;
++int fpm_trace_close(pid_t pid)
++{
++ if (0 > ptrace(PTRACE_DETACH, pid, (void *) 1, 0)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(DETACH) failed");
++ return -1;
++ }
+
-+ fpm_event_add(child->fd_stdout, &child->ev_stdout, fpm_stdio_child_said, child);
-+ fpm_event_add(child->fd_stderr, &child->ev_stderr, fpm_stdio_child_said, child);
++ traced_pid = 0;
+
+ return 0;
+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_stdio.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_stdio.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_stdio.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_stdio.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,17 @@
+
-+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
-+
-+#ifndef FPM_STDIO_H
-+#define FPM_STDIO_H 1
++int fpm_trace_get_long(long addr, long *data)
++{
++#ifdef PT_IO
++ struct ptrace_io_desc ptio = {
++ .piod_op = PIOD_READ_D,
++ .piod_offs = (void *) addr,
++ .piod_addr = (void *) data,
++ .piod_len = sizeof(long)
++ };
+
-+#include "fpm_worker_pool.h"
++ if (0 > ptrace(PT_IO, traced_pid, (void *) &ptio, 0)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(PT_IO) failed");
++ return -1;
++ }
++#else
++ errno = 0;
+
-+int fpm_stdio_init_main();
-+int fpm_stdio_init_final();
-+int fpm_stdio_init_child(struct fpm_worker_pool_s *wp);
-+int fpm_stdio_child_prepare_pipes(struct fpm_worker_pool_s *wp);
-+int fpm_stdio_parent_use_pipes(struct fpm_child_s *child);
++ *data = ptrace(PTRACE_PEEKDATA, traced_pid, (void *) addr, 0);
+
++ if (errno) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(PEEKDATA) failed");
++ return -1;
++ }
+#endif
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_unix.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_unix.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_unix.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_unix.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,244 @@
++ return 0;
++}
++
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_unix.c php-src/sapi/fpm/fpm/fpm_unix.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_unix.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_unix.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,289 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
+#include "fpm_config.h"
+
+#include <pwd.h>
+#include <grp.h>
+
-+#ifdef __linux
++#ifdef HAVE_PRCTL
+#include <sys/prctl.h>
+#endif
+
++#include "fpm.h"
+#include "fpm_conf.h"
+#include "fpm_cleanup.h"
++#include "fpm_clock.h"
+#include "fpm_stdio.h"
+#include "fpm_unix.h"
+#include "zlog.h"
+
++size_t fpm_pagesize;
++
+int fpm_unix_resolve_socket_premissions(struct fpm_worker_pool_s *wp)
+{
+ struct fpm_listen_options_s *lo = wp->config->listen_options;
+ wp->socket_gid = -1;
+ wp->socket_mode = 0666;
+
-+ if (!lo) return 0;
++ if (!lo) { return 0; }
+
+ if (lo->owner && *lo->owner) {
+ struct passwd *pwd;
+
+ if (is_root) {
+ if (wp->config->user && *wp->config->user) {
-+ struct passwd *pwd;
+
-+ pwd = getpwnam(wp->config->user);
-+
-+ if (!pwd) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "cannot get uid for user '%s', pool '%s'", wp->config->user, wp->config->name);
-+ return -1;
++ if (strlen(wp->config->user) == strspn(wp->config->user, "0123456789")) {
++ wp->set_uid = strtoul(wp->config->user, 0, 10);
+ }
++ else {
++ struct passwd *pwd;
++
++ pwd = getpwnam(wp->config->user);
++
++ if (!pwd) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "cannot get uid for user '%s', pool '%s'", wp->config->user, wp->config->name);
++ return -1;
++ }
+
-+ wp->set_uid = pwd->pw_uid;
-+ wp->set_gid = pwd->pw_gid;
++ wp->set_uid = pwd->pw_uid;
++ wp->set_gid = pwd->pw_gid;
+
-+ wp->user = strdup(pwd->pw_name);
-+ wp->home = strdup(pwd->pw_dir);
++ wp->user = strdup(pwd->pw_name);
++ wp->home = strdup(pwd->pw_dir);
++ }
+ }
+
+ if (wp->config->group && *wp->config->group) {
-+ struct group *grp;
-+
-+ grp = getgrnam(wp->config->group);
+
-+ if (!grp) {
-+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "cannot get gid for group '%s', pool '%s'", wp->config->group, wp->config->name);
-+ return -1;
++ if (strlen(wp->config->group) == strspn(wp->config->group, "0123456789")) {
++ wp->set_gid = strtoul(wp->config->group, 0, 10);
+ }
++ else {
++ struct group *grp;
++
++ grp = getgrnam(wp->config->group);
++
++ if (!grp) {
++ zlog(ZLOG_STUFF, ZLOG_ERROR, "cannot get gid for group '%s', pool '%s'", wp->config->group, wp->config->name);
++ return -1;
++ }
+
-+ wp->set_gid = grp->gr_gid;
++ wp->set_gid = grp->gr_gid;
++ }
+ }
+
+#ifndef I_REALLY_WANT_ROOT_PHP
+
+ if (is_root) {
+ if (wp->set_gid) {
-+ setgid(wp->set_gid);
++ if (0 > setgid(wp->set_gid)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "setgid(%d) failed", wp->set_gid);
++ return -1;
++ }
+ }
+ if (wp->set_uid) {
-+ initgroups(wp->config->user, wp->set_gid);
-+ setuid(wp->set_uid);
++ if (0 > initgroups(wp->config->user, wp->set_gid)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "initgroups(%s, %d) failed", wp->config->user, wp->set_gid);
++ return -1;
++ }
++ if (0 > setuid(wp->set_uid)) {
++ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "setuid(%d) failed", wp->set_uid);
++ return -1;
++ }
+ }
+ }
+
-+#ifdef __linux
++#ifdef HAVE_PRCTL
+ if (0 > prctl(PR_SET_DUMPABLE, 1, 0, 0, 0)) {
+ zlog(ZLOG_STUFF, ZLOG_SYSERROR, "prctl(PR_SET_DUMPABLE) failed");
+ }
+#endif
+
++ if (0 > fpm_clock_init()) {
++ return -1;
++ }
++
+ return 0;
+}
+
+{
+ struct fpm_worker_pool_s *wp;
+
-+ if (fpm_global_options.daemonize) {
++ fpm_pagesize = getpagesize();
++
++ if (fpm_global_config.daemonize) {
+
+ switch (fork()) {
+
+
+ setsid();
+
++ if (0 > fpm_clock_init()) {
++ return -1;
++ }
++
++ fpm_globals.parent_pid = getpid();
++
+ for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
+
+ if (0 > fpm_unix_conf_wp(wp)) {
+
+ fpm_stdio_init_final();
+
++ {
++ struct rlimit r;
++ getrlimit(RLIMIT_NOFILE, &r);
++
++ zlog(ZLOG_STUFF, ZLOG_NOTICE, "getrlimit(nofile): max:%lld, cur:%lld",
++ (long long) r.rlim_max, (long long) r.rlim_cur);
++ }
++
+ return 0;
+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_unix.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_unix.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_unix.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_unix.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,15 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_unix.h php-src/sapi/fpm/fpm/fpm_unix.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_unix.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_unix.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,17 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
+#ifndef FPM_UNIX_H
+#define FPM_UNIX_H 1
+int fpm_unix_init_child(struct fpm_worker_pool_s *wp);
+int fpm_unix_init_main();
+
++extern size_t fpm_pagesize;
++
+#endif
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_worker_pool.c php-5.2.4.fpm/sapi/cgi/fpm/fpm_worker_pool.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_worker_pool.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_worker_pool.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,59 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_worker_pool.c php-src/sapi/fpm/fpm/fpm_worker_pool.c
+--- php-src-vanilla/sapi/fpm/fpm/fpm_worker_pool.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_worker_pool.c 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,69 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
+#include "fpm_config.h"
+
+#include "fpm_worker_pool.h"
+#include "fpm_cleanup.h"
+#include "fpm_children.h"
++#include "fpm_shm.h"
++#include "fpm_shm_slots.h"
+#include "fpm_conf.h"
+
+struct fpm_worker_pool_s *fpm_worker_all_pools;
+
-+void fpm_worker_pool_cleanup(int which, void *arg)
++static void fpm_worker_pool_cleanup(int which, void *arg)
+{
+ struct fpm_worker_pool_s *wp, *wp_next;
+
+ wp_next = wp->next;
+ fpm_worker_pool_config_free(wp->config);
+ fpm_children_free(wp->children);
++ fpm_array_free(&wp->slots_used);
++ fpm_array_free(&wp->slots_free);
++ fpm_shm_free_list(wp->shm_list, which == FPM_CLEANUP_CHILD ? fpm_shm_slots_mem() : 0);
+ free(wp->config);
+ free(wp->user);
+ free(wp->home);
+ fpm_worker_all_pools = ret;
+ }
+
++ fpm_array_init(&ret->slots_used, sizeof(struct fpm_shm_slot_ptr_s), 50);
++ fpm_array_init(&ret->slots_free, sizeof(struct fpm_shm_slot_ptr_s), 50);
++
+ return ret;
+}
+
+int fpm_worker_pool_init_main()
+{
-+ fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_worker_pool_cleanup, 0);
++ if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_worker_pool_cleanup, 0)) {
++ return -1;
++ }
+
+ return 0;
+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/fpm_worker_pool.h php-5.2.4.fpm/sapi/cgi/fpm/fpm_worker_pool.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/fpm_worker_pool.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/fpm_worker_pool.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,40 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/fpm_worker_pool.h php-src/sapi/fpm/fpm/fpm_worker_pool.h
+--- php-src-vanilla/sapi/fpm/fpm/fpm_worker_pool.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/fpm_worker_pool.h 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,46 @@
+
+ /* $Id$ */
-+ /* (c) 2007 Andrei Nigmatulin */
++ /* (c) 2007,2008 Andrei Nigmatulin */
+
+#ifndef FPM_WORKER_POOL_H
+#define FPM_WORKER_POOL_H 1
+
+#include "fpm_conf.h"
++#include "fpm_arrays.h"
+
+struct fpm_worker_pool_s;
+struct fpm_child_s;
++struct fpm_child_stat_s;
++struct fpm_shm_s;
+
+enum fpm_address_domain {
+ FPM_AF_UNIX = 1,
+ enum fpm_address_domain listen_address_domain;
+ int listening_socket;
+ int set_uid, set_gid; /* config uid and gid */
-+ int is_template:1; /* just config template, no processes will be created */
++ unsigned is_template:1; /* just config template, no processes will be created */
+ int socket_uid, socket_gid, socket_mode;
+
++ struct fpm_shm_s *shm_list;
++ struct fpm_array_s slots_used;
++ struct fpm_array_s slots_free;
++
+ /* runtime */
+ struct fpm_child_s *children;
-+ int fd_stdout[2], fd_stderr[2];
+ int running_children;
+};
+
+
+#endif
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/Makefile.frag php-5.2.4.fpm/sapi/cgi/fpm/Makefile.frag
---- php-5.2.4.vanilla/sapi/cgi/fpm/Makefile.frag 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/Makefile.frag 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,16 @@
-+
-+install-fpm:
-+ @echo "Installing FPM config: $(INSTALL_ROOT)$(sysconfdir)/"
-+ -@$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)
-+ -@$(mkinstalldirs) $(INSTALL_ROOT)$(prefix)/logs
-+ -@if test -r $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf ; then \
-+ echo " (installing as php-fpm.conf.default)" ; \
-+ dest=php-fpm.conf.default ; \
-+ else \
-+ dest=php-fpm.conf ; \
-+ fi ; \
-+ $(INSTALL_DATA) $(top_srcdir)/sapi/cgi/fpm/conf/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/$$dest
-+
-+$(top_builddir)/libevent/libevent.la: $(top_builddir)/libevent/Makefile
-+ cd $(top_builddir)/libevent && $(MAKE) libevent.la
-+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/xml_config.c php-5.2.4.fpm/sapi/cgi/fpm/xml_config.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/xml_config.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/xml_config.c 2007-08-31 15:47:19.000000000 +0400
+diff -Naur php-src-vanilla/sapi/fpm/fpm/xml_config.c php-src/sapi/fpm/fpm/xml_config.c
+--- php-src-vanilla/sapi/fpm/fpm/xml_config.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/xml_config.c 2009-10-18 21:05:39.310440424 +0100
@@ -0,0 +1,278 @@
+
+ /* $Id$ */
+ char *value = vv;
+ char *v = strdup(value);
+
-+ if (!v) return "xml_conf_set_slot_string(): strdup() failed";
++ if (!v) { return "xml_conf_set_slot_string(): strdup() failed"; }
+
+#ifdef XML_CONF_DEBUG
+ fprintf(stderr, "setting string '%s' => '%s'\n", name, v);
+ char suffix;
+ int seconds;
+
-+ if (!len) return "xml_conf_set_slot_timeval(): invalid timeval value";
++ if (!len) { return "xml_conf_set_slot_timeval(): invalid timeval value"; }
+
+ suffix = value[len-1];
+
+ }
+
+ xmlFree(name);
-+ if (ret) return ret;
-+ else continue;
++ if (ret) { return ret; }
++ else { continue; }
+ }
+
-+ fprintf(stderr, "Warning, unknown setting '%s' in section '%s'\n", name, section->path);
++ fprintf(stderr, "Warning, unknown setting '%s' in section '%s'\n", (char *) name, section->path);
+
+ xmlFree(name);
+ }
+#endif
+ full_name = alloca(strlen(parent_name) + strlen((char *) name) + 1 + 1);
+
-+ sprintf(full_name, "%s/%s", parent_name, name);
++ sprintf(full_name, "%s/%s", parent_name, (char *) name);
+
+ xmlFree(parent_name);
+ xmlFree(name);
+ if (section) { /* found a registered section */
+ void *conf = section->conf();
+ ret = xml_conf_parse_section(&conf, section, element->children);
-+ if (ret) break;
++ if (ret) { break; }
+ }
+
+ }
+
+ if (element->children) {
+ ret = xml_conf_parse_file(element->children);
-+ if (ret) break;
++ if (ret) { break; }
+ }
+ }
+
+ return 0;
+}
+
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/xml_config.h php-5.2.4.fpm/sapi/cgi/fpm/xml_config.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/xml_config.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/xml_config.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,43 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/xml_config.h php-src/sapi/fpm/fpm/xml_config.h
+--- php-src-vanilla/sapi/fpm/fpm/xml_config.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/xml_config.h 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,48 @@
+
+ /* $Id$ */
+ /* (c) 2004-2007 Andrei Nigmatulin */
+#ifndef XML_CONFIG_H
+#define XML_CONFIG_H 1
+
++#if HAVE_INTTYPES_H
++#include <inttypes.h>
++#else
+#include <stdint.h>
++#endif
++
+
+struct xml_value_parser;
+
+struct xml_conf_section {
+ void *(*conf)();
+ char *path;
-+ struct xml_value_parser parsers[];
++ struct xml_value_parser *parsers;
+};
+
+char *xml_conf_set_slot_boolean(void **conf, char *name, void *value, intptr_t offset);
+enum { XML_CONF_SCALAR = 1, XML_CONF_SUBSECTION = 2 };
+
+#endif
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/zlog.c php-5.2.4.fpm/sapi/cgi/fpm/zlog.c
---- php-5.2.4.vanilla/sapi/cgi/fpm/zlog.c 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/zlog.c 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,100 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/zlog.c php-src/sapi/fpm/fpm/zlog.c
+--- php-src-vanilla/sapi/fpm/fpm/zlog.c 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/zlog.c 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,113 @@
+
+ /* $Id$ */
+ /* (c) 2004-2007 Andrei Nigmatulin */
+#define MAX_LINE_LENGTH 1024
+
+static int zlog_fd = -1;
-+#if 0
-+static int zlog_level = 0;
-+#endif
++static int zlog_level = ZLOG_NOTICE;
+
+static const char *level_names[] = {
+ [ZLOG_DEBUG] = "DEBUG",
+ [ZLOG_ALERT] = "ALERT",
+};
+
-+static size_t print_time(char *timebuf, int timebuf_len)
++size_t zlog_print_time(struct timeval *tv, char *timebuf, size_t timebuf_len)
+{
-+ struct timeval tv;
+ struct tm t;
+ size_t len;
+
-+ gettimeofday(&tv, 0);
-+
-+ len = strftime(timebuf, timebuf_len, "%b %d %H:%M:%S", localtime_r((const time_t *) &tv.tv_sec, &t));
-+ len += snprintf(timebuf + len, timebuf_len - len, ".%06d", (int) tv.tv_usec);
++ len = strftime(timebuf, timebuf_len, "%b %d %H:%M:%S", localtime_r((const time_t *) &tv->tv_sec, &t));
++ len += snprintf(timebuf + len, timebuf_len - len, ".%06d", (int) tv->tv_usec);
+
+ return len;
+}
+ return old_fd;
+}
+
++int zlog_set_level(int new_value)
++{
++ int old_value = zlog_level;
++
++ zlog_level = new_value;
++
++ return old_value;
++}
++
+void zlog(const char *function, int line, int flags, const char *fmt, ...)
+{
++ struct timeval tv;
+ char buf[MAX_LINE_LENGTH];
+ const size_t buf_size = MAX_LINE_LENGTH;
+ va_list args;
+ size_t len;
+ int truncated = 0;
-+ int saved_errno = errno;
++ int saved_errno;
++
++ if ((flags & ZLOG_LEVEL_MASK) < zlog_level) {
++ return;
++ }
++
++ saved_errno = errno;
++
++ gettimeofday(&tv, 0);
+
-+ len = print_time(buf, buf_size);
++ len = zlog_print_time(&tv, buf, buf_size);
+
+ len += snprintf(buf + len, buf_size - len, " [%s] %s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], function, line);
+
+
+ write(zlog_fd > -1 ? zlog_fd : STDERR_FILENO, buf, len);
+}
-diff -Nru php-5.2.4.vanilla/sapi/cgi/fpm/zlog.h php-5.2.4.fpm/sapi/cgi/fpm/zlog.h
---- php-5.2.4.vanilla/sapi/cgi/fpm/zlog.h 1970-01-01 03:00:00.000000000 +0300
-+++ php-5.2.4.fpm/sapi/cgi/fpm/zlog.h 2007-08-31 15:47:19.000000000 +0400
-@@ -0,0 +1,29 @@
+diff -Naur php-src-vanilla/sapi/fpm/fpm/zlog.h php-src/sapi/fpm/fpm/zlog.h
+--- php-src-vanilla/sapi/fpm/fpm/zlog.h 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/fpm/zlog.h 2009-10-18 21:05:39.308376784 +0100
+@@ -0,0 +1,34 @@
+
+ /* $Id$ */
+ /* (c) 2004-2007 Andrei Nigmatulin */
+
+#define ZLOG_STUFF __func__, __LINE__
+
++struct timeval;
++
+int zlog_set_fd(int new_fd);
++int zlog_set_level(int new_value);
++
++size_t zlog_print_time(struct timeval *tv, char *timebuf, size_t timebuf_len);
+
+void zlog(const char *function, int line, int flags, const char *fmt, ...)
+ __attribute__ ((format(printf,4,5)));
+#define ZLOG_SYSERROR (ZLOG_ERROR | ZLOG_HAVE_ERRNO)
+
+#endif
-diff -Nru php-5.2.4.vanilla/sapi/cgi/Makefile.frag php-5.2.4.fpm/sapi/cgi/Makefile.frag
---- php-5.2.4.vanilla/sapi/cgi/Makefile.frag 2003-07-02 05:08:26.000000000 +0400
-+++ php-5.2.4.fpm/sapi/cgi/Makefile.frag 2007-08-31 15:47:19.000000000 +0400
-@@ -1,2 +1,2 @@
--$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
- $(BUILD_CGI)
+diff -Naur php-src-vanilla/sapi/fpm/LICENSE php-src/sapi/fpm/LICENSE
+--- php-src-vanilla/sapi/fpm/LICENSE 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/LICENSE 2009-10-18 21:05:39.302497288 +0100
+@@ -0,0 +1,23 @@
++Copyright (c) 2007-2009, Andrei Nigmatulin
++All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions
++are met:
++1. Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++2. Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in the
++ documentation and/or other materials provided with the distribution.
++
++THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
++FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++SUCH DAMAGE.
+diff -Naur php-src-vanilla/sapi/fpm/man/php-fpm.1.in php-src/sapi/fpm/man/php-fpm.1.in
+--- php-src-vanilla/sapi/fpm/man/php-fpm.1.in 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/man/php-fpm.1.in 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,186 @@
++.TH PHP-FPM 1 "2009" "The PHP Group" "Scripting Language"
++.SH NAME
++.TP 15
++@php_fpm_bin@ \- PHP FastCGI Process Manager 'PHP-FPM'
++.SH SYNOPSIS
++.B @php_fpm_bin@
++[options]
++.LP
++.SH DESCRIPTION
++\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for
++Web development and can be embedded into HTML. This is a variant of PHP that will run in the background as a daemon, listening for CGI requests. Output is logged to @php_fpm_log_path@.
++.LP
++Most options are set in the xml configuration file @php_fpm_conf_path@. Unless configured otherwise, @php_fpm_bin@ will respond to CGI requests listening on http localhost port 9000 by default. Therefore @php_fpm_bin@ expects your webserver to forward all requests for '.php' files to port 9000 and you should edit your webserver configuration file appropriately.
++.SH OPTIONS
++.TP 15
++.B \-C
++Do not chdir to the script's directory
++.TP
++.PD 0
++.B \-\-php\-ini \fIpath\fP|\fIfile\fP
++.TP
++.PD 1
++.B \-c \fIpath\fP|\fIfile\fP
++Look for
++.B php.ini
++file in the directory
++.IR path
++or use the specified
++.IR file
++.TP
++.PD 0
++.B \-\-no\-php\-ini
++.TP
++.PD 1
++.B \-n
++No
++.B php.ini
++file will be used
++.TP
++.PD 0
++.B \-\-define \fIfoo\fP[=\fIbar\fP]
++.TP
++.PD 1
++.B \-d \fIfoo\fP[=\fIbar\fP]
++Define INI entry
++.IR foo
++with value
++.IR bar
++.TP
++.B \-e
++Generate extended information for debugger/profiler
++.TP
++.PD 0
++.B \-\-help
++.TP
++.PD 1
++.B \-h
++This help
++.TP
++.PD 0
++.B \-\-info
++.TP
++.PD 1
++.B \-i
++PHP information and configuration
++.TP
++.PD 0
++.B \-\-modules
++.TP
++.PD 1
++.B \-m
++Show compiled in modules
++.TP
++.PD 0
++.B \-\-version
++.TP
++.PD 1
++.B \-v
++Version number
++.TP
++.PD 0
++.B \-\-fpm\-config \fIfile\fP
++.TP
++.PD 1
++.B \-\-y
++Specify alternative path to FastCGI process manager configuration file (the default is @php_fpm_conf_path@)
++.TP
++.PD 0
++.B \-\-zend\-extension \fIfile\fP
++.TP
++.PD 1
++.B \-z \fIfile\fP
++Load Zend extension
++.IR file
++.SH FILES
++.TP 15
++.B @php_fpm_bin@.conf
++The configuration file for the @php_fpm_bin@ daemon.
++.TP
++.B php.ini
++The standard php configuration file.
++.SH EXAMPLES
++You should use the init script provided to start and stop the @php_fpm_bin@ daemon. This situation applies for any unix systems which use init.d for their main process manager.
++.P
++.PD 1
++.RS
++sudo /etc/init.d/@php_fpm_bin@ start
++.RE
++.TP
++If your installation has no appropriate init script, launch @php_fpm_bin_path@ with no arguments. It will launch as a daemon (background process) by default. The file @php_fpm_pid_path@ determines whether @php_fpm_bin@ is already up and running. Once started, @php_fpm_bin@ then responds to several POSIX signals:
++.P
++.PD 0
++.RS
++.B SIGINT,SIGTERM \fPimmediate termination
++.TP
++.B SIGQUIT \fPgraceful stop
++.TP
++.B SIGUSR1 \fPre-open log file
++.TP
++.B SIGUSR2 \fPgraceful reload of all workers + reload of fpm conf/binary
++.RE
++.PD 1
++.P
++.SH TIPS
++The PHP-FPM CGI daemon will work well with most popular webservers, including Apache2 and light-httpd. For best efficiency and performance improvements its also worthwhile to consider the engine-x webserver ('nginx'), and php opcode-cacher ('php5-xcache').
++.PD 1
++.P
++.SH SEE ALSO
++The PHP-FPM website:
++.PD 0
++.P
++.B http://php-fpm.org
++.PD 1
++.P
++For a more or less complete description of PHP look here:
++.PD 0
++.P
++.B http://www.php.net/manual/
++.PD 1
++.P
++A nice introduction to PHP by Stig Bakken can be found here:
++.PD 0
++.P
++.B http://www.zend.com/zend/art/intro.php
++.PD 1
++.SH BUGS
++You can view the list of known bugs or report any new bug you
++found at:
++.PD 0
++.P
++.B http://bugs.php.net
++.PD 1
++.SH AUTHORS
++PHP-FPM Sapi was written by Andrei Nigmatulin. The mailing-lists are highload-php-en (English) and highload-php-ru (Russion).
++.P
++The PHP Group: Thies C. Arntzen, Stig Bakken, Andi Gutmans, Rasmus Lerdorf, Sam Ruby, Sascha Schumann, Zeev Suraski, Jim Winstead, Andrei Zmievski.
++.P
++A List of active developers can be found here:
++.PD 0
++.P
++.B http://www.php.net/credits.php
++.PD 1
++.P
++And last but not least PHP was developed with the help of a huge amount of
++contributors all around the world.
++.SH VERSION INFORMATION
++This manpage describes \fBphp\fP, version @PHP_VERSION@, \fBfpm\fP, version @fpm_version@.
++.SH COPYRIGHT
++Copyright \(co 1997\-2009 The PHP Group
++.PD 0
++.P
++Copyright (c) 2007-2009, Andrei Nigmatulin
++.PD 1
++.LP
++This source file is subject to version 3.01 of the PHP license,
++that is bundled with this package in the file LICENSE, and is
++available through the world-wide-web at the following url:
++.PD 0
++.P
++.B http://www.php.net/license/3_01.txt
++.PD 1
++.P
++If you did not receive a copy of the PHP license and are unable to
++obtain it through the world-wide-web, please send a note to
++.B license@php.net
++so we can mail you a copy immediately.
+diff -Naur php-src-vanilla/sapi/fpm/readme-ru.markdown php-src/sapi/fpm/readme-ru.markdown
+--- php-src-vanilla/sapi/fpm/readme-ru.markdown 1970-01-01 01:00:00.000000000 +0100
++++ php-src/sapi/fpm/readme-ru.markdown 2009-10-18 21:05:39.310440424 +0100
+@@ -0,0 +1,127 @@
++# PHP FastCGI Менеджер процессов (PHP-FPM)
++
++PHP-FPM это Fast-CGI фронтэнд для php и расширение php-cgi. Проект находится на [Launchpad](https://launchpad.net/php-fpm)
++
++## Быстрый старт:
++
++Выберите один из 2 путей сборки fpm: Или `встроенный`, или `отдельный`. Если вы не разработчик или не системный администратор, то мы рекомендуем `встроенный` вариант компиляции. Для дополнительной информации смотрите файл `readme.markdown`.
++
++## Зависимости
++Если вы до этого не устанавливали php, то вам придётся установить пакет `libxml2-dev`. FPM также необходим `libevent-dev`. Debian / ubuntu:
++
++ sudo aptitude install -y libxml2-dev libevent-dev
++
++Рекомендуется использовать libevent 1.4.12-stable или позднее, но необходим, как минимум, libevent 1.4.3-stable. Если нет подходящей версии, скайте и скомпилируйте с [сайта Libevent](http://www.monkey.org/~provos/libevent/).
++
++ export LE_VER=1.4.12-stable
++ wget "http://www.monkey.org/~provos/libevent-$LE_VER.tar.gz"
++ tar -zxvf "libevent-$LE_VER.tar.gz"
++ cd "libevent-$LE_VER"
++ ./configure && make
++ DESTDIR=$PWD make install
++ export LIBEVENT_SEARCH_PATH="$PWD/usr/local"
++
++## Встроенная сборка
++
++Скачайте fpm и сгенерируйте патч
++
++ export PHP_VER=5.3.0
++ wget "http://launchpad.net/php-fpm/master/0.6/+download/php-fpm-0.6-$PHP_VER.tar.gz"
++ tar -zxvf "php-fpm-0.6-$PHP_VER.tar.gz"
++ "php-fpm-0.6-$PHP_VER/generate-fpm-patch"
++
++Скачайте и распакуйте исходный код PHP
++
++ wget "http://ru2.php.net/get/php-$PHP_VER.tar.gz/from/ru2.php.net/mirror"
++ tar xvfz "php-$PHP_VER.tar.gz"
++ cd "php-$PHP_VER"
++
++Примените патч и компилируйте
++
++ patch -p1 < ../fpm.patch
++ ./buildconf --force
++ mkdir fpm-build && cd fpm-build
++ ../configure --with-fpm \
++ --with-libevent="$LIBEVENT_SEARCH_PATH" && make
++
++## Отдельная сборка
++
++Скачайте и распакуйте исходный код PHP
++
++ export PHP_VER=5.3.0
++ wget "http://ru2.php.net/get/php-$PHP_VER.tar.gz/from/ru2.php.net/mirror"
++ tar xvfz "php-$PHP_VER.tar.gz"
++ cd "php-$PHP_VER"
++ mkdir php-build && cd php-build
++ ../configure && make
++
++Теперь можете скачать, конфигурировать и компилировать FPM фронтэнд
++
++ wget "http://launchpad.net/php-fpm/master/0.6/+download/php-fpm-0.6-$PHP_VER.tar.gz"
++ tar -zxvf "php-fpm-0.6-$PHP_VER.tar.gz"
++ cd "php-fpm-0.6-$PHP_VER"
++ mkdir fpm-build && cd fpm-build
++ ../configure --srcdir=../ \
++ --with-php-src="../../php-$PHP_VER" \
++ --with-php-build="../../php-$PHP_VER/php-build" \
++ --with-libevent="$LIBEVENT_SEARCH_PATH" && make
++
++## Флаги конфигурирования
++
++ --with-libevent[=PATH] Путь до libevent, для fpm SAPI [/usr/local]
++ --with-fpm-bin[=PATH] Путь для откомпилированного php-fpm [/usr/local/bin/php-fpm]
++ --with-fpm-port[=PORT] TCP порт для cgi запросов [9000]
++ --with[out]-fpm-conf[=PATH] Путь до файла конфигурации php-fpm [/etc/php-fpm.conf]
++ --with[out]-fpm-init[=PATH] Путь до init-файла php-fpm [/etc/init.d/php-fpm]
++ --with-fpm-log[=PATH] Путь до лог-файла php-fpm [/var/log/php-fpm.log]
++ --with-fpm-pid[=PATH] Путь до pid-файла php-fpm [/var/run/php-fpm.pid]
++ --with-fpm-user[=USER] Пользователь, под которым запускать php-fpm [nobody]
++ --with-fpm-group[=GRP] Группа, под которой запускать php-fpm. Для системных
++ пользователей задайте имя пользователя [nobody]
++
++## Установка
++
++Если вы делали `встроенную` сборку, то вы получите полный php, включая исполнитель коммандной строки `php-cli` и библиотеку PEAR. `Отдельная` или `независимая` сборка установит только демон `php-fpm` и минимум файлов, необходимых для его запуска.
++
++ # Посмотреть, какие файлы будут установлены
++ make install --dry-run
++
++ # Установить в '/'
++ sudo make install
++
++ # Установить в '/opt'
++ sudo INSTALL_ROOT=/opt make install
++
++Notes:
++
++* (Upgrade) When overwriting existing FPM installation files: A previous configuration file `php-fpm.conf` will be moved to `php-fpm.conf.old`. Then a newer (default) configuration file will be installed in it's place. If you have any custom XML settings which you wish to keep, its recommended to copy these back over manually.
++
++* (BSD) the default init.d path is `/usr/local/etc/rc.d/php-fpm` or disable: `--without-fpm-init`
++
++* (Nginx) An example nginx configuration file is generated. The file `nginx-site-conf.sample` may be installed into your nginx configuration directory, if exists: `/etc/nginx/`, `/usr/local/etc/nginx/`, or `/usr/local/nginx/conf`
++
++## Больше о процессе сборки PHP-FPM
++
++Процесс сборки можно описать так:
++
++ 1) Компилируются исходники php в объектные файлы
++ 2) Компилируются исходники fpm в объектные файлы
++ 3) Линковка php и fpm объектных файлов
++ 4) Результат: исполняемый php5, в основе которого php и fast-CGI от fpm как фронтэнд
++
++Fpm подмешивается в php при линковке (link-level). Андрей разделил исходный код fpm, сделав SAPI чем-то менее чуствительным к изменениям в остальном коде php. Код cgi-main.c из PHP-FPM - конктроллер запросов - вырезан из оригинального fcgi-sapi. Мы отправляем билд 0.6 в PHP Group. Мы будем отслеживать развитие PHP и периодически синхронизировать изменения с проектами встроенной / отдельной сборки.
++
++## Buildconf
++
++Для сборки fpm отдельно, конфигурирование (`./configure`) требует некоторой версии набора инструментов autoconf. Buildconf запустит `./generate-autotools` и попробует установить эти инструменты самостоятельно. Если `./buildconf` не работает, смотрите лог ошибок.
++
++
++## Обсуждение
++
++Есть 2 группы для обсуждения php-fpm,
++
++- [highload-php-ru](http://groups.google.com/group/highload-php-en) (english)
++
++- [highload-php-ru](http://groups.google.com/group/highload-php-ru) (русская)
++
++Translated by Anatoly Pashin
projects / packages / php.git / blobdiff