From cbd23008d2e5a357f81e8da8b17d47670e61a5e7 Mon Sep 17 00:00:00 2001 From: Stefano Date: Tue, 10 Jan 2012 07:40:49 +0100 Subject: [PATCH] mega commit to add tainting propagation at xpconnect and chrome level. --- .mozconfig | 56 +- configure | 1926 ++++++++--------- content/base/src/nsAttrValue.cpp | 46 + content/base/src/nsAttrValue.h | 25 + content/base/src/nsGenericElement.cpp | 9 + .../html/content/src/nsGenericHTMLElement.cpp | 6 + .../html/content/src/nsHTMLInputElement.cpp | 7 + content/html/content/src/nsHTMLInputElement.h | 9 + dom/base/nsDOMClassInfo.cpp | 6 + dom/base/nsJSUtils.h | 10 + js/src/jsapi.cpp | 17 + js/src/jsapi.h | 38 + js/src/taint.cpp | 77 +- js/src/taint.h | 7 +- js/src/xpconnect/src/xpcconvert.cpp | 97 + js/src/xpconnect/src/xpcquickstubs.cpp | 27 + js/src/xpconnect/src/xpcquickstubs.h | 4 + tainttests/unit_tests.js | 16 + xpcom/string/public/nsString.h | 7 +- xpcom/string/public/nsTDependentString.h | 9 + xpcom/string/public/nsTString.h | 15 + xpcom/string/public/nsTSubstring.h | 43 +- xpcom/string/public/nsXPCOMStrings.h | 4 + xpcom/string/src/nsReadableUtils.cpp | 18 + xpcom/string/src/nsTSubstring.cpp | 21 +- 25 files changed, 1383 insertions(+), 1117 deletions(-) diff --git a/.mozconfig b/.mozconfig index ddc4a822..7df6a310 100644 --- a/.mozconfig +++ b/.mozconfig @@ -3,60 +3,22 @@ export MOZ_PHOENIX=1 export MOZ_APP_PROFILE=DOMinator1 mk_add_options MOZ_PHOENIX=1 mk_add_options MOZ_APP_PROFILE=DOMinator1 -ac_add_options --disable-optimize +#ac_add_options --disable-optimize ac_add_options --enable-application=browser ac_add_options --disable-necko-wifi mk_add_options MOZ_CO_PROJECT=browser -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-taintD +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-taintOPT ac_add_options --disable-tests mk_add_options MOZ_MAKE_FLAGS=-j4 ac_add_options --with-user-appdir=.DOMinator1 -ac_add_options --enable-debug +#ac_add_options --enable-debug -export MOZ_DEBUG_SYMBOLS=1 -export CFLAGS="-gdwarf-2 -DTAINTED=1" -export CXXFLAGS="-gdwarf-2 -DTAINTED=1" +#export MOZ_DEBUG_SYMBOLS=1 +export CFLAGS="-DTAINTED=1" +export CXXFLAGS="-DTAINTED=1" export CPPFLAGS="-DTAINTED=1" export DEFS="-DTAINTED=1" -ac_add_options --enable-debug-symbols="-gdwarf-2" -ac_add_options --enable-trace-malloc - - - -#. $topsrcdir/browser/config/mozconfig -#export MOZ_PHOENIX=1 -#export MOZ_APP_PROFILE=DOMinator1 -#mk_add_options MOZ_PHOENIX=1 -#mk_add_options MOZ_APP_PROFILE=DOMinator1 -##ac_add_options --disable-optimize -#ac_add_options --enable-application=browser -#ac_add_options --disable-accessibility -#ac_add_options --disable-necko-wifi -#mk_add_options MOZ_CO_PROJECT=browser -#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-taintD -#ac_add_options --disable-tests -#mk_add_options MOZ_MAKE_FLAGS=-j4 -#ac_add_options --with-user-appdir=.DOMinator1 -#ac_add_options --enable-debug -#ac_add_options --enable-libxul -##ac_add_options --enable-debug-symbols=DBG -#ac_add_options --disable-crashreporter -#ac_add_options --disable-calendar -#ac_add_options --disable-chatzilla -#ac_add_options --disable-composer -#ac_add_options --disable-installer -#ac_add_options --disable-ipc -#ac_add_options --disable-ldap -#ac_add_options --disable-mailnews -#ac_add_options --disable-mochitest -#ac_add_options --disable-negotiateauth -#ac_add_options --disable-updater -#ac_add_options --disable-xinerama -#ac_add_options --disable-xprint -# -#export MOZ_DEBUG_SYMBOLS=1 -#export CFLAGS="-gstabs+ -DTAINTED=1" -#export CXXFLAGS="-gstabs+ -DTAINTED=1" -#export CPPFLAGS="-DTAINTED=1" -#export DEFS="-DTAINTED=1" +#ac_add_options --enable-debug-symbols="-gdwarf-2" +#ac_add_options --enable-trace-malloc + diff --git a/configure b/configure index c93937c7..c6b7d377 100644 --- a/configure +++ b/configure @@ -1125,7 +1125,7 @@ LIBNOTIFY_VERSION=0.4 MSMANIFEST_TOOL= MISSING_X= -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk 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 @@ -2225,57 +2225,6 @@ else fi fi -for ac_declaration in \ - ''\ - '#include ' \ - '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 < -$ac_declaration -int main() { -exit (42); -; return 0; } -EOF -if { (eval echo configure:2247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - continue -fi -rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - - case "$build:$target" in powerpc-apple-darwin8*:i?86-apple-darwin*) @@ -2289,7 +2238,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2293: checking for $ac_word" >&5 +echo "configure:2242: 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 @@ -2324,7 +2273,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2328: checking for $ac_word" >&5 +echo "configure:2277: 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 @@ -2359,7 +2308,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2363: checking for $ac_word" >&5 +echo "configure:2312: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2413,7 +2362,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2417: checking for $ac_word" >&5 +echo "configure:2366: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2448,7 +2397,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2452: checking for $ac_word" >&5 +echo "configure:2401: 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 @@ -2483,7 +2432,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2487: checking for $ac_word" >&5 +echo "configure:2436: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2521,7 +2470,7 @@ else # 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:2525: checking for $ac_word" >&5 +echo "configure:2474: 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 @@ -2551,7 +2500,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2555: checking for $ac_word" >&5 +echo "configure:2504: 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 @@ -2602,7 +2551,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2606: checking for $ac_word" >&5 +echo "configure:2555: 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 @@ -2634,7 +2583,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2638: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2587: 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. @@ -2645,12 +2594,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2649 "configure" +#line 2598 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$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 @@ -2676,12 +2625,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2680: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2629: 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:2685: checking whether we are using GNU C" >&5 +echo "configure:2634: 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 @@ -2690,7 +2639,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2694: \"$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:2643: \"$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 @@ -2709,7 +2658,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2713: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2662: 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 @@ -2745,7 +2694,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2749: checking for $ac_word" >&5 +echo "configure:2698: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2777,7 +2726,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2781: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2730: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2788,12 +2737,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2792 "configure" +#line 2741 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2819,12 +2768,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2823: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2772: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:2828: checking whether we are using GNU C++" >&5 +echo "configure:2777: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2833,7 +2782,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -2852,7 +2801,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:2856: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2805: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2883,61 +2832,10 @@ else fi fi -for ac_declaration in \ - ''\ - '#include ' \ - '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 < -$ac_declaration -int main() { -exit (42); -; return 0; } -EOF -if { (eval echo configure:2905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - continue -fi -rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - - # 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:2941: checking for $ac_word" >&5 +echo "configure:2839: 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 @@ -2969,7 +2867,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2973: checking for $ac_word" >&5 +echo "configure:2871: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3023,7 +2921,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3027: checking for $ac_word" >&5 +echo "configure:2925: 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 @@ -3058,7 +2956,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3062: checking for $ac_word" >&5 +echo "configure:2960: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3093,7 +2991,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3097: checking for $ac_word" >&5 +echo "configure:2995: 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 @@ -3128,7 +3026,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3132: checking for $ac_word" >&5 +echo "configure:3030: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3276,7 +3174,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3280: checking for $ac_word" >&5 +echo "configure:3178: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3318,14 +3216,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:3329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3343,14 +3241,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { unsigned *test = new unsigned(42); ; return 0; } EOF -if { (eval echo configure:3354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3473,7 +3371,7 @@ EOF _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` # Add flags if necessary echo $ac_n "checking for midl flags""... $ac_c" 1>&6 -echo "configure:3477: checking for midl flags" >&5 +echo "configure:3375: checking for midl flags" >&5 case "$target" in i*86-*) if test \( "$_MIDL_MAJOR_VERSION" = "7" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" = "0499" \); then @@ -3500,19 +3398,19 @@ echo "configure:3477: checking for midl flags" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3504: checking for $ac_hdr" >&5 +echo "configure:3402: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:3516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -3544,7 +3442,7 @@ EOF # This is done because the Windows 7 beta SDK reports its # NTDDI_MAXVER to be 0x06000100 instead of 0x06010000, as it should echo $ac_n "checking for highest Windows version supported by this SDK""... $ac_c" 1>&6 -echo "configure:3548: checking for highest Windows version supported by this SDK" >&5 +echo "configure:3446: checking for highest Windows version supported by this SDK" >&5 if eval "test \"`echo '$''{'ac_cv_winsdk_maxver'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3574,19 +3472,19 @@ echo "$ac_t""$ac_cv_winsdk_maxver" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3578: checking for $ac_hdr" >&5 +echo "configure:3476: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:3590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -3623,7 +3521,7 @@ EOF unset _MSVC_VER_FILTER echo $ac_n "checking for std::_Throw""... $ac_c" 1>&6 -echo "configure:3627: checking for std::_Throw" >&5 +echo "configure:3525: checking for std::_Throw" >&5 if eval "test \"`echo '$''{'ac_cv_have_std__Throw'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3639,14 +3537,14 @@ cross_compiling=$ac_cv_prog_cxx_cross _SAVE_CXXFLAGS="$CXXFLAGS" CXXFLAGS="${CXXFLAGS} -D_HAS_EXCEPTIONS=0" cat > conftest.$ac_ext < int main() { std::_Throw(std::exception()); return 0; ; return 0; } EOF -if { (eval echo configure:3650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_std__Throw="yes" else @@ -3671,7 +3569,7 @@ echo "$ac_t""$ac_cv_have_std__Throw" 1>&6 if test "$ac_cv_have_std__Throw" = "yes"; then echo $ac_n "checking for |class __declspec(dllimport) exception| bug""... $ac_c" 1>&6 -echo "configure:3675: checking for |class __declspec(dllimport) exception| bug" >&5 +echo "configure:3573: checking for |class __declspec(dllimport) exception| bug" >&5 if eval "test \"`echo '$''{'ac_cv_have_dllimport_exception_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3687,14 +3585,14 @@ cross_compiling=$ac_cv_prog_cxx_cross _SAVE_CXXFLAGS="$CXXFLAGS" CXXFLAGS="${CXXFLAGS} -D_HAS_EXCEPTIONS=0" cat > conftest.$ac_ext < int main() { std::vector v; return v.at(1); ; return 0; } EOF -if { (eval echo configure:3698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_dllimport_exception_bug="no" else @@ -3726,7 +3624,7 @@ EOF fi else echo $ac_n "checking for overridable _RAISE""... $ac_c" 1>&6 -echo "configure:3730: checking for overridable _RAISE" >&5 +echo "configure:3628: checking for overridable _RAISE" >&5 if eval "test \"`echo '$''{'ac_cv_have__RAISE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3742,7 +3640,7 @@ cross_compiling=$ac_cv_prog_cxx_cross _SAVE_CXXFLAGS="$CXXFLAGS" CXXFLAGS="${CXXFLAGS} -D_HAS_EXCEPTIONS=0" cat > conftest.$ac_ext < #undef _RAISE @@ -3753,7 +3651,7 @@ int main() { std::vector v; return v.at(1); ; return 0; } EOF -if { (eval echo configure:3757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have__RAISE="no" else @@ -3795,9 +3693,9 @@ EOF _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 -echo "configure:3799: checking for w32api version >= $W32API_VERSION" >&5 +echo "configure:3697: checking for w32api version >= $W32API_VERSION" >&5 cat > conftest.$ac_ext < int main() { @@ -3809,7 +3707,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* res=yes else @@ -3825,7 +3723,7 @@ rm -f conftest* fi # Check windres version echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 -echo "configure:3829: checking for windres version >= $WINDRES_VERSION" >&5 +echo "configure:3727: checking for windres version >= $WINDRES_VERSION" >&5 _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` echo "$ac_t""$_WINDRES_VERSION" 1>&6 _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` @@ -3864,7 +3762,7 @@ EOF # If the maximum version supported by this SDK is lower than the target # version, error out echo $ac_n "checking for Windows SDK being recent enough""... $ac_c" 1>&6 -echo "configure:3868: checking for Windows SDK being recent enough" >&5 +echo "configure:3766: checking for Windows SDK being recent enough" >&5 if $PERL -e "exit(0x$MOZ_WINSDK_TARGETVER > $MOZ_WINSDK_MAXVER)"; then echo "$ac_t"""yes"" 1>&6 else @@ -3895,10 +3793,10 @@ esac if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then 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:3899: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:3797: 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:3902: checking whether cc understands -c and -o together" >&5 +echo "configure:3800: 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]/_/'`" @@ -3910,16 +3808,16 @@ else # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:3914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:3915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:3812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:3813: \"$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:3920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3818: \"$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:3922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:3923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:3820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:3821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -3955,7 +3853,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3959: checking how to run the C preprocessor" >&5 +echo "configure:3857: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3970,13 +3868,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3878: \"$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 : @@ -3987,13 +3885,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3895: \"$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 : @@ -4004,13 +3902,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3912: \"$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 : @@ -4035,7 +3933,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:4039: checking how to run the C++ preprocessor" >&5 +echo "configure:3937: 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 @@ -4048,12 +3946,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3955: \"$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 : @@ -4130,7 +4028,7 @@ fi # COMPILE_ENVIRONMENT # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:4134: checking for a BSD compatible install" >&5 +echo "configure:4032: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4183,7 +4081,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:4187: checking whether ln -s works" >&5 +echo "configure:4085: 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 @@ -4206,7 +4104,7 @@ fi if test -z "$TINDERBOX_SKIP_PERL_VERSION_CHECK"; then echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 -echo "configure:4210: checking for minimum required perl version >= $PERL_VERSION" >&5 +echo "configure:4108: checking for minimum required perl version >= $PERL_VERSION" >&5 _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` _perl_res=$? echo "$ac_t""$_perl_version" 1>&6 @@ -4217,7 +4115,7 @@ fi fi echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 -echo "configure:4221: checking for full perl installation" >&5 +echo "configure:4119: checking for full perl installation" >&5 _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` _perl_res=$? if test "$_perl_res" != 0; then @@ -4232,7 +4130,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4236: checking for $ac_word" >&5 +echo "configure:4134: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4292,7 +4190,7 @@ fi # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4296: checking for $ac_word" >&5 +echo "configure:4194: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4341,7 +4239,7 @@ fi # Extract the first word of "autoconf", so it can be a program name with args. set dummy autoconf; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4345: checking for $ac_word" >&5 +echo "configure:4243: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4392,7 +4290,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4396: checking for $ac_word" >&5 +echo "configure:4294: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4448,7 +4346,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4452: checking for $ac_word" >&5 +echo "configure:4350: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4502,7 +4400,7 @@ fi # Extract the first word of "makedepend", so it can be a program name with args. set dummy makedepend; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4506: checking for $ac_word" >&5 +echo "configure:4404: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4550,7 +4448,7 @@ fi # Extract the first word of "xargs", so it can be a program name with args. set dummy xargs; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4554: checking for $ac_word" >&5 +echo "configure:4452: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4602,7 +4500,7 @@ fi # Extract the first word of "rpmbuild", so it can be a program name with args. set dummy rpmbuild; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4606: checking for $ac_word" >&5 +echo "configure:4504: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RPMBUILD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4675,7 +4573,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4679: checking for $ac_word" >&5 +echo "configure:4577: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4727,7 +4625,7 @@ done # Extract the first word of "sdp", so it can be a program name with args. set dummy sdp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4731: checking for $ac_word" >&5 +echo "configure:4629: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4847,7 +4745,7 @@ tools are selected during the Xcode/Developer Tools installation." 1>&2; exit 1; echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 -echo "configure:4851: checking for valid compiler/Mac OS X SDK combination" >&5 +echo "configure:4749: checking for valid compiler/Mac OS X SDK combination" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -4856,14 +4754,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:4867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result=yes else @@ -4898,7 +4796,7 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else @@ -4950,7 +4848,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4954: checking for $ac_word" >&5 +echo "configure:4852: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5006,7 +4904,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5010: checking for $ac_word" >&5 +echo "configure:4908: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5069,7 +4967,7 @@ if test "$COMPILE_ENVIRONMENT"; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5073: checking for X" >&5 +echo "configure:4971: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5131,12 +5029,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5038: \"$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* @@ -5205,14 +5103,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -5318,17 +5216,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:5322: checking whether -R must be followed by a space" >&5 +echo "configure:5220: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -5344,14 +5242,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -5383,7 +5281,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:5387: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:5285: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5391,7 +5289,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5424,7 +5322,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:5428: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:5326: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5432,7 +5330,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5472,12 +5370,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5476: checking for gethostbyname" >&5 +echo "configure:5374: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5521,7 +5419,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5525: checking for gethostbyname in -lnsl" >&5 +echo "configure:5423: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5529,7 +5427,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5570,12 +5468,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:5574: checking for connect" >&5 +echo "configure:5472: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -5619,7 +5517,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:5623: checking for connect in -lsocket" >&5 +echo "configure:5521: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5627,7 +5525,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5662,12 +5560,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:5666: checking for remove" >&5 +echo "configure:5564: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -5711,7 +5609,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:5715: checking for remove in -lposix" >&5 +echo "configure:5613: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5719,7 +5617,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5754,12 +5652,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:5758: checking for shmat" >&5 +echo "configure:5656: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -5803,7 +5701,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:5807: checking for shmat in -lipc" >&5 +echo "configure:5705: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5811,7 +5709,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5855,7 +5753,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:5859: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:5757: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5863,7 +5761,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6328,7 +6226,7 @@ if test "$GNU_CXX"; then _USE_CPP_INCLUDE_FLAG=1 echo $ac_n "checking whether the compiler supports -Wno-invalid-offsetof""... $ac_c" 1>&6 -echo "configure:6332: checking whether the compiler supports -Wno-invalid-offsetof" >&5 +echo "configure:6230: checking whether the compiler supports -Wno-invalid-offsetof" >&5 if eval "test \"`echo '$''{'ac_has_wno_invalid_offsetof'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6344,14 +6242,14 @@ cross_compiling=$ac_cv_prog_cxx_cross _SAVE_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS ${_COMPILER_PREFIX}-Wno-invalid-offsetof" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_has_wno_invalid_offsetof="yes" else @@ -6378,7 +6276,7 @@ echo "$ac_t""$ac_has_wno_invalid_offsetof" 1>&6 fi echo $ac_n "checking whether the compiler supports -Wno-variadic-macros""... $ac_c" 1>&6 -echo "configure:6382: checking whether the compiler supports -Wno-variadic-macros" >&5 +echo "configure:6280: checking whether the compiler supports -Wno-variadic-macros" >&5 if eval "test \"`echo '$''{'ac_has_wno_variadic_macros'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6394,14 +6292,14 @@ cross_compiling=$ac_cv_prog_cxx_cross _SAVE_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS ${_COMPILER_PREFIX}-Wno-variadic-macros" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_has_wno_variadic_macros="yes" else @@ -6428,7 +6326,7 @@ echo "$ac_t""$ac_has_wno_variadic_macros" 1>&6 fi echo $ac_n "checking whether the compiler supports -Werror=return-type""... $ac_c" 1>&6 -echo "configure:6432: checking whether the compiler supports -Werror=return-type" >&5 +echo "configure:6330: checking whether the compiler supports -Werror=return-type" >&5 if eval "test \"`echo '$''{'ac_has_werror_return_type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6444,14 +6342,14 @@ cross_compiling=$ac_cv_prog_cxx_cross _SAVE_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -Werror=return-type" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_has_werror_return_type="yes" else @@ -6487,7 +6385,7 @@ MKSHLIB_UNFORCE_ALL= if test "$COMPILE_ENVIRONMENT"; then if test "$GNU_CC"; then echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 -echo "configure:6491: checking whether ld has archive extraction flags" >&5 +echo "configure:6389: checking whether ld has archive extraction flags" >&5 if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6504,14 +6402,14 @@ LOOP_INPUT LDFLAGS=$force LIBS=$unforce cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_mkshlib_force_and_unforce=$line; break else @@ -6544,7 +6442,7 @@ configure_static_assert_macros=' ' echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 -echo "configure:6548: checking that static assertion macros used in autoconf tests work" >&5 +echo "configure:6446: checking that static assertion macros used in autoconf tests work" >&5 if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6558,14 +6456,14 @@ cross_compiling=$ac_cv_prog_cc_cross ac_cv_static_assertion_macros_work="yes" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6575,14 +6473,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_static_assertion_macros_work="no" else @@ -6598,14 +6496,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6615,14 +6513,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_static_assertion_macros_work="no" else @@ -6656,16 +6554,16 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 -echo "configure:6660: checking for 64-bit OS" >&5 +echo "configure:6558: checking for 64-bit OS" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else @@ -6736,19 +6634,19 @@ fi if test -n "$MOZ_VALGRIND"; then ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6 -echo "configure:6740: checking for valgrind/valgrind.h" >&5 +echo "configure:6638: checking for valgrind/valgrind.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 < int main() { ; return 0; } EOF -if { (eval echo configure:6752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -6923,7 +6821,7 @@ case "$host" in esac echo $ac_n "checking for Python version >= $PYTHON_VERSION but not 3.x""... $ac_c" 1>&6 -echo "configure:6927: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 +echo "configure:6825: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 $PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1] or sys.version[:2] != '2.')" $PYTHON_VERSION _python_res=$? @@ -7001,9 +6899,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for IBM XLC/C++ compiler version >= 9.0.0.7""... $ac_c" 1>&6 -echo "configure:7005: checking for IBM XLC/C++ compiler version >= 9.0.0.7" >&5 +echo "configure:6903: checking for IBM XLC/C++ compiler version >= 9.0.0.7" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -7050,19 +6948,19 @@ cross_compiling=$ac_cv_prog_cc_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7054: checking for $ac_hdr" >&5 +echo "configure:6952: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:7066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -7141,18 +7039,18 @@ EOF echo "Skipping -dead_strip because DTrace is enabled. See bug 403132." else echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 -echo "configure:7145: checking for -dead_strip option to ld" >&5 +echo "configure:7043: checking for -dead_strip option to ld" >&5 _SAVE_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-dead_strip" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* _HAVE_DEAD_STRIP=1 else @@ -7537,17 +7435,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7541: checking for $ac_hdr" >&5 +echo "configure:7439: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7449: \"$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* @@ -7585,19 +7483,19 @@ cross_compiling=$ac_cv_prog_cxx_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7589: checking for $ac_hdr" >&5 +echo "configure:7487: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:7601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -7652,19 +7550,19 @@ cross_compiling=$ac_cv_prog_cc_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7656: checking for $ac_hdr" >&5 +echo "configure:7554: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:7668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -7825,19 +7723,19 @@ EOF _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__" echo $ac_n "checking for __declspec(dllexport)""... $ac_c" 1>&6 -echo "configure:7829: checking for __declspec(dllexport)" >&5 +echo "configure:7727: checking for __declspec(dllexport)" >&5 if eval "test \"`echo '$''{'ac_os2_declspec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_os2_declspec="yes" else @@ -7932,14 +7830,14 @@ EOF _SAVE_LDFLAGS=$LDFLAGS LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:7943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -7967,7 +7865,7 @@ rm -f conftest* CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` echo $ac_n "checking for Sun C++ compiler version >= 5.9""... $ac_c" 1>&6 -echo "configure:7971: checking for Sun C++ compiler version >= 5.9" >&5 +echo "configure:7869: checking for Sun C++ compiler version >= 5.9" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -7977,7 +7875,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -8003,7 +7901,7 @@ rm -f conftest* _res="yes" fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _ABOVE_SS12U1= else @@ -8148,12 +8046,12 @@ fi if test -z "$SKIP_COMPILER_CHECKS"; then echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:8152: checking for ANSI C header files" >&5 +echo "configure:8050: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8161,7 +8059,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8063: \"$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* @@ -8178,7 +8076,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -8196,7 +8094,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -8217,7 +8115,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -8228,7 +8126,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:8232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8252,12 +8150,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:8256: checking for working const" >&5 +echo "configure:8154: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -8327,12 +8225,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:8331: checking for mode_t" >&5 +echo "configure:8229: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8360,12 +8258,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:8364: checking for off_t" >&5 +echo "configure:8262: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8393,12 +8291,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:8397: checking for pid_t" >&5 +echo "configure:8295: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8426,12 +8324,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:8430: checking for size_t" >&5 +echo "configure:8328: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8466,12 +8364,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for __stdcall""... $ac_c" 1>&6 -echo "configure:8470: checking for __stdcall" >&5 +echo "configure:8368: checking for __stdcall" >&5 if eval "test \"`echo '$''{'ac_cv___stdcall'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct foo; template <> struct foo {}; @@ -8480,7 +8378,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv___stdcall=true else @@ -8509,12 +8407,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:8513: checking for ssize_t" >&5 +echo "configure:8411: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8522,7 +8420,7 @@ int main() { ssize_t foo = 0; ; return 0; } EOF -if { (eval echo configure:8526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_ssize_t=true else @@ -8544,12 +8442,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:8548: checking for st_blksize in struct stat" >&5 +echo "configure:8446: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8557,7 +8455,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:8561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -8578,12 +8476,12 @@ EOF fi echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 -echo "configure:8582: checking for siginfo_t" >&5 +echo "configure:8480: checking for siginfo_t" >&5 if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -8591,7 +8489,7 @@ int main() { siginfo_t* info; ; return 0; } EOF -if { (eval echo configure:8595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_siginfo_t=true else @@ -8614,12 +8512,12 @@ else fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:8618: checking for int16_t" >&5 +echo "configure:8516: checking for int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8627,7 +8525,7 @@ int main() { int16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:8631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int16_t=true else @@ -8649,12 +8547,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:8653: checking for int32_t" >&5 +echo "configure:8551: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8662,7 +8560,7 @@ int main() { int32_t foo = 0; ; return 0; } EOF -if { (eval echo configure:8666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int32_t=true else @@ -8684,12 +8582,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:8688: checking for int64_t" >&5 +echo "configure:8586: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8697,7 +8595,7 @@ int main() { int64_t foo = 0; ; return 0; } EOF -if { (eval echo configure:8701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64_t=true else @@ -8719,12 +8617,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64""... $ac_c" 1>&6 -echo "configure:8723: checking for int64" >&5 +echo "configure:8621: checking for int64" >&5 if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8732,7 +8630,7 @@ int main() { int64 foo = 0; ; return 0; } EOF -if { (eval echo configure:8736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64=true else @@ -8754,12 +8652,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:8758: checking for uint" >&5 +echo "configure:8656: checking for uint" >&5 if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8767,7 +8665,7 @@ int main() { uint foo = 0; ; return 0; } EOF -if { (eval echo configure:8771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint=true else @@ -8789,12 +8687,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 -echo "configure:8793: checking for uint_t" >&5 +echo "configure:8691: checking for uint_t" >&5 if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8802,7 +8700,7 @@ int main() { uint_t foo = 0; ; return 0; } EOF -if { (eval echo configure:8806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint_t=true else @@ -8824,12 +8722,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:8828: checking for uint16_t" >&5 +echo "configure:8726: checking for uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8837,7 +8735,7 @@ int main() { uint16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:8841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint16_t=true else @@ -8868,12 +8766,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 -echo "configure:8872: checking for uname.domainname" >&5 +echo "configure:8770: checking for uname.domainname" >&5 if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -8881,7 +8779,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->domainname; } ; return 0; } EOF -if { (eval echo configure:8885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_domainname_field=true else @@ -8905,12 +8803,12 @@ else fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 -echo "configure:8909: checking for uname.__domainname" >&5 +echo "configure:8807: checking for uname.__domainname" >&5 if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -8918,7 +8816,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->__domainname; } ; return 0; } EOF -if { (eval echo configure:8922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_us_domainname_field=true else @@ -8978,19 +8876,19 @@ if test "$GNU_CXX"; then if test -z "$_MOZ_USE_RTTI"; then CXXFLAGS="$CXXFLAGS $_MOZ_RTTI_FLAGS" echo $ac_n "checking for gcc c++0x headers bug without rtti""... $ac_c" 1>&6 -echo "configure:8982: checking for gcc c++0x headers bug without rtti" >&5 +echo "configure:8880: checking for gcc c++0x headers bug without rtti" >&5 if eval "test \"`echo '$''{'ac_cv_cxx0x_headers_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:8994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cxx0x_headers_bug="no" else @@ -9011,12 +8909,12 @@ echo "$ac_t""$ac_cv_cxx0x_headers_bug" 1>&6 fi echo $ac_n "checking for usable char16_t (2 bytes, unsigned)""... $ac_c" 1>&6 -echo "configure:9015: checking for usable char16_t (2 bytes, unsigned)" >&5 +echo "configure:8913: checking for usable char16_t (2 bytes, unsigned)" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_char16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < u'\x0') ; return 0; } EOF -if { (eval echo configure:9031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_usable_char16_t="yes" else @@ -9052,12 +8950,12 @@ fi echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 -echo "configure:9056: checking for usable wchar_t (2 bytes, unsigned)" >&5 +echo "configure:8954: checking for usable wchar_t (2 bytes, unsigned)" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < $configure_static_assert_macros @@ -9066,7 +8964,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) ; return 0; } EOF -if { (eval echo configure:9070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_usable_wchar_v2="yes" else @@ -9091,12 +8989,12 @@ elif test "$ac_cv_have_usable_char16_t" != "yes"; then CXXFLAGS="$CXXFLAGS -fshort-wchar" echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 -echo "configure:9095: checking for compiler -fshort-wchar option" >&5 +echo "configure:8993: checking for compiler -fshort-wchar option" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < $configure_static_assert_macros @@ -9105,7 +9003,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) ; return 0; } EOF -if { (eval echo configure:9109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_usable_wchar_option_v2="yes" else @@ -9148,7 +9046,7 @@ cross_compiling=$ac_cv_prog_cc_cross if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 -echo "configure:9152: checking for visibility(hidden) attribute" >&5 +echo "configure:9050: checking for visibility(hidden) attribute" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9173,7 +9071,7 @@ EOF echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 -echo "configure:9177: checking for visibility(default) attribute" >&5 +echo "configure:9075: checking for visibility(default) attribute" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9198,7 +9096,7 @@ EOF echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 -echo "configure:9202: checking for visibility pragma support" >&5 +echo "configure:9100: checking for visibility pragma support" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9223,7 +9121,7 @@ fi echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 if test "$ac_cv_visibility_pragma" = "yes"; then echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 -echo "configure:9227: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 +echo "configure:9125: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9251,7 +9149,7 @@ fi echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 -echo "configure:9255: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 +echo "configure:9153: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9305,19 +9203,19 @@ if test "$GNU_CC"; then CFLAGS_save="${CFLAGS}" CFLAGS="${CFLAGS} -Werror" echo $ac_n "checking for __force_align_arg_pointer__ attribute""... $ac_c" 1>&6 -echo "configure:9309: checking for __force_align_arg_pointer__ attribute" >&5 +echo "configure:9207: checking for __force_align_arg_pointer__ attribute" >&5 if eval "test \"`echo '$''{'ac_cv_force_align_arg_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_force_align_arg_pointer="yes" else @@ -9344,12 +9242,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:9348: checking for $ac_hdr that defines DIR" >&5 +echo "configure:9246: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -9357,7 +9255,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:9361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -9382,7 +9280,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:9386: checking for opendir in -ldir" >&5 +echo "configure:9284: 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 @@ -9390,7 +9288,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9423,7 +9321,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:9427: checking for opendir in -lx" >&5 +echo "configure:9325: 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 @@ -9431,7 +9329,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9474,19 +9372,19 @@ esac do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9478: checking for $ac_hdr" >&5 +echo "configure:9376: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:9490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -9516,19 +9414,19 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9520: checking for $ac_hdr" >&5 +echo "configure:9418: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:9532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -9558,19 +9456,19 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9562: checking for $ac_hdr" >&5 +echo "configure:9460: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:9574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -9600,19 +9498,19 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9604: checking for $ac_hdr" >&5 +echo "configure:9502: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:9616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -9642,19 +9540,19 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9646: checking for $ac_hdr" >&5 +echo "configure:9544: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:9658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -9684,19 +9582,19 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9688: checking for $ac_hdr" >&5 +echo "configure:9586: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:9700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -9727,19 +9625,19 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9731: checking for $ac_hdr" >&5 +echo "configure:9629: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:9743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -9770,19 +9668,19 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9774: checking for $ac_hdr" >&5 +echo "configure:9672: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:9786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -9812,19 +9710,19 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9816: checking for $ac_hdr" >&5 +echo "configure:9714: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:9828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -9855,19 +9753,19 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9859: checking for $ac_hdr" >&5 +echo "configure:9757: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:9871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -9904,19 +9802,19 @@ cross_compiling=$ac_cv_prog_cxx_cross NEW_H=new.h ac_safe=`echo "new" | sed 'y%./+-%__p_%'` echo $ac_n "checking for new""... $ac_c" 1>&6 -echo "configure:9908: checking for new" >&5 +echo "configure:9806: checking for new" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:9920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -9957,19 +9855,19 @@ fi if test "x$enable_dtrace" = "xyes"; then ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6 -echo "configure:9961: checking for sys/sdt.h" >&5 +echo "configure:9859: checking for sys/sdt.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 < int main() { ; return 0; } EOF -if { (eval echo configure:9973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -10008,19 +9906,19 @@ case $target in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10012: checking for $ac_hdr" >&5 +echo "configure:9910: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:10024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -10054,7 +9952,7 @@ case $target in ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:10058: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:9956: checking for gethostbyname_r in -lc_r" >&5 ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10062,7 +9960,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10111,14 +10009,14 @@ case $target in *) echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 -echo "configure:10115: checking for library containing dlopen" >&5 +echo "configure:10013: checking for library containing dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_dlopen="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_dlopen="none required" else @@ -10140,7 +10038,7 @@ rm -f conftest* test "$ac_cv_search_dlopen" = "no" && for i in dl; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_dlopen="-l$i" break @@ -10169,19 +10067,19 @@ if test "$ac_cv_search_dlopen" != "no"; then test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS" ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:10173: checking for dlfcn.h" >&5 +echo "configure:10071: checking for dlfcn.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 < int main() { ; return 0; } EOF -if { (eval echo configure:10185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -10215,12 +10113,12 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE" for ac_func in dladdr memmem do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10219: checking for $ac_func" >&5 +echo "configure:10117: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10145: \"$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 @@ -10274,7 +10172,7 @@ if test ! "$GNU_CXX"; then case $target in *-aix*) echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 -echo "configure:10278: checking for demangle in -lC_r" >&5 +echo "configure:10176: checking for demangle in -lC_r" >&5 ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10282,7 +10180,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lC_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10323,7 +10221,7 @@ fi ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:10327: checking for demangle in -lC" >&5 +echo "configure:10225: checking for demangle in -lC" >&5 ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10331,7 +10229,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lC $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10378,7 +10276,7 @@ case $target in ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:10382: checking for socket in -lsocket" >&5 +echo "configure:10280: 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 @@ -10386,7 +10284,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10443,7 +10341,7 @@ EOF _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:10447: checking for XDrawLines in -lX11" >&5 +echo "configure:10345: checking for XDrawLines in -lX11" >&5 ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10451,7 +10349,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10484,7 +10382,7 @@ MISSING_X="$MISSING_X -lX11" fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:10488: checking for XextAddDisplay in -lXext" >&5 +echo "configure:10386: checking for XextAddDisplay in -lXext" >&5 ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10492,7 +10390,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10526,7 +10424,7 @@ fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:10530: checking for XtFree in -lXt" >&5 +echo "configure:10428: checking for XtFree in -lXt" >&5 ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10534,7 +10432,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10566,7 +10464,7 @@ else unset ac_cv_lib_Xt_XtFree echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:10570: checking for IceFlush in -lICE" >&5 +echo "configure:10468: checking for IceFlush in -lICE" >&5 ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10574,7 +10472,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $XT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10606,7 +10504,7 @@ else fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:10610: checking for SmcCloseConnection in -lSM" >&5 +echo "configure:10508: checking for SmcCloseConnection in -lSM" >&5 ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10614,7 +10512,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lSM $XT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10646,7 +10544,7 @@ else fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:10650: checking for XtFree in -lXt" >&5 +echo "configure:10548: checking for XtFree in -lXt" >&5 ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10654,7 +10552,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10699,7 +10597,7 @@ fi esac echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 -echo "configure:10703: checking for XShmCreateImage in -lXext" >&5 +echo "configure:10601: checking for XShmCreateImage in -lXext" >&5 ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10707,7 +10605,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10741,19 +10639,19 @@ fi ac_safe=`echo "X11/extensions/scrnsaver.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/scrnsaver.h""... $ac_c" 1>&6 -echo "configure:10745: checking for X11/extensions/scrnsaver.h" >&5 +echo "configure:10643: checking for X11/extensions/scrnsaver.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 < int main() { ; return 0; } EOF -if { (eval echo configure:10757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -10768,7 +10666,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XScreenSaverQueryInfo in -lXss""... $ac_c" 1>&6 -echo "configure:10772: checking for XScreenSaverQueryInfo in -lXss" >&5 +echo "configure:10670: checking for XScreenSaverQueryInfo in -lXss" >&5 ac_lib_var=`echo Xss'_'XScreenSaverQueryInfo | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10776,7 +10674,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXss $XEXT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10859,7 +10757,7 @@ fi # Extract the first word of "freetype-config", so it can be a program name with args. set dummy freetype-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10863: checking for $ac_word" >&5 +echo "configure:10761: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10895,7 +10793,7 @@ fi min_ft_version=6.1.0 echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 -echo "configure:10899: checking for FreeType - version >= $min_ft_version" >&5 +echo "configure:10797: checking for FreeType - version >= $min_ft_version" >&5 no_ft="" if test "$FT2_CONFIG" = "no" ; then no_ft=yes @@ -10943,7 +10841,7 @@ else echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -10969,7 +10867,7 @@ main() } EOF -if { (eval echo configure:10973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -11019,12 +10917,12 @@ fi CFLAGS="$CFLAGS $FT2_CFLAGS" echo $ac_n "checking for FT_Bitmap_Size.y_ppem""... $ac_c" 1>&6 -echo "configure:11023: checking for FT_Bitmap_Size.y_ppem" >&5 +echo "configure:10921: checking for FT_Bitmap_Size.y_ppem" >&5 if eval "test \"`echo '$''{'ac_cv_member_FT_Bitmap_Size_y_ppem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include FT_FREETYPE_H @@ -11034,7 +10932,7 @@ FT_Bitmap_Size s; return 1 ; return 0; } EOF -if { (eval echo configure:11038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_member_FT_Bitmap_Size_y_ppem=yes else @@ -11060,12 +10958,12 @@ EOF for ac_func in FT_GlyphSlot_Embolden FT_Load_Sfnt_Table FT_Select_Size do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11064: checking for $ac_func" >&5 +echo "configure:10962: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10990: \"$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 @@ -11133,7 +11031,7 @@ darwin*) *) echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:11137: checking for pthread_create in -lpthreads" >&5 +echo "configure:11035: checking for pthread_create in -lpthreads" >&5 echo " #include #include @@ -11156,7 +11054,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:11160: checking for pthread_create in -lpthread" >&5 +echo "configure:11058: checking for pthread_create in -lpthread" >&5 echo " #include #include @@ -11179,7 +11077,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:11183: checking for pthread_create in -lc_r" >&5 +echo "configure:11081: checking for pthread_create in -lc_r" >&5 echo " #include #include @@ -11202,7 +11100,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:11206: checking for pthread_create in -lc" >&5 +echo "configure:11104: checking for pthread_create in -lc" >&5 echo " #include #include @@ -11261,7 +11159,7 @@ then rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:11265: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:11163: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -11284,7 +11182,7 @@ echo "configure:11265: checking whether ${CC-cc} accepts -pthread" >&5 ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:11288: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:11186: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -11379,7 +11277,7 @@ EOF fi echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 -echo "configure:11383: checking whether mmap() sees write()s" >&5 +echo "configure:11281: checking whether mmap() sees write()s" >&5 mmap_test_prog=' @@ -11418,11 +11316,11 @@ if test "$cross_compiling" = yes; then result="yes" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -11447,13 +11345,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:11451: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:11349: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -11471,7 +11369,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -11493,7 +11391,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:11497: checking for 8-bit clean memcmp" >&5 +echo "configure:11395: 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 @@ -11501,7 +11399,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11413: \"$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 @@ -11531,12 +11429,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 truncate64 statvfs64 setbuf isatty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11535: checking for $ac_func" >&5 +echo "configure:11433: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11461: \"$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 @@ -11586,12 +11484,12 @@ done for ac_func in flockfile getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11590: checking for $ac_func" >&5 +echo "configure:11488: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11516: \"$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 @@ -11641,12 +11539,12 @@ done for ac_func in localtime_r strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11645: checking for $ac_func" >&5 +echo "configure:11543: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11571: \"$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 @@ -11697,12 +11595,12 @@ done _SAVE_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -lrt" echo $ac_n "checking for clock_gettime(CLOCK_MONOTONIC) and -lrt""... $ac_c" 1>&6 -echo "configure:11701: checking for clock_gettime(CLOCK_MONOTONIC) and -lrt" >&5 +echo "configure:11599: checking for clock_gettime(CLOCK_MONOTONIC) and -lrt" >&5 if eval "test \"`echo '$''{'ac_cv_have_clock_monotonic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -11710,7 +11608,7 @@ int main() { clock_gettime(CLOCK_MONOTONIC, &ts); ; return 0; } EOF -if { (eval echo configure:11714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_clock_monotonic=yes else @@ -11745,19 +11643,19 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 -echo "configure:11749: checking for wcrtomb" >&5 +echo "configure:11647: checking for wcrtomb" >&5 if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { mbstate_t ps={0};wcrtomb(0,'f',&ps); ; return 0; } EOF -if { (eval echo configure:11761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_wcrtomb="yes" else @@ -11777,19 +11675,19 @@ EOF fi echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 -echo "configure:11781: checking for mbrtowc" >&5 +echo "configure:11679: checking for mbrtowc" >&5 if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { mbstate_t ps={0};mbrtowc(0,0,0,&ps); ; return 0; } EOF -if { (eval echo configure:11793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_mbrtowc="yes" else @@ -11818,12 +11716,12 @@ cross_compiling=$ac_cv_prog_cc_cross fi echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 -echo "configure:11822: checking for res_ninit()" >&5 +echo "configure:11720: checking for res_ninit()" >&5 if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_res_ninit=yes else @@ -11865,12 +11763,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 -echo "configure:11869: checking for gnu_get_libc_version()" >&5 +echo "configure:11767: checking for gnu_get_libc_version()" >&5 if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_gnu_get_libc_version=yes else @@ -11910,7 +11808,7 @@ case $target_os in *) echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 -echo "configure:11914: checking for iconv in -lc" >&5 +echo "configure:11812: checking for iconv in -lc" >&5 ac_lib_var=`echo c'_'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 @@ -11918,7 +11816,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11951,7 +11849,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:11955: checking for iconv in -liconv" >&5 +echo "configure:11853: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'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 @@ -11959,7 +11857,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11992,7 +11890,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -echo "configure:11996: checking for libiconv in -liconv" >&5 +echo "configure:11894: checking for libiconv in -liconv" >&5 ac_lib_var=`echo iconv'_'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 @@ -12000,7 +11898,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12041,12 +11939,12 @@ fi _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" echo $ac_n "checking for iconv()""... $ac_c" 1>&6 -echo "configure:12045: checking for iconv()" >&5 +echo "configure:11943: 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 < @@ -12060,7 +11958,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_iconv=yes else @@ -12084,12 +11982,12 @@ EOF LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" LIBICONV="$_ICONV_LIBS" echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 -echo "configure:12088: checking for iconv() with const input" >&5 +echo "configure:11986: checking for iconv() with const input" >&5 if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -12104,7 +12002,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_const_iconv=yes else @@ -12133,19 +12031,19 @@ esac echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:12137: checking for nl_langinfo and CODESET" >&5 +echo "configure:12035: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:12149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -12177,7 +12075,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 -echo "configure:12181: checking for an implementation of va_copy()" >&5 +echo "configure:12079: checking for an implementation of va_copy()" >&5 if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12187,7 +12085,7 @@ else else cat > conftest.$ac_ext < @@ -12201,7 +12099,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:12205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_va_copy=yes else @@ -12218,7 +12116,7 @@ fi echo "$ac_t""$ac_cv_va_copy" 1>&6 echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 -echo "configure:12222: checking for an implementation of __va_copy()" >&5 +echo "configure:12120: checking for an implementation of __va_copy()" >&5 if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12228,7 +12126,7 @@ else else cat > conftest.$ac_ext < @@ -12242,7 +12140,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:12246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv___va_copy=yes else @@ -12259,7 +12157,7 @@ fi echo "$ac_t""$ac_cv___va_copy" 1>&6 echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 -echo "configure:12263: checking whether va_lists can be copied by value" >&5 +echo "configure:12161: checking whether va_lists can be copied by value" >&5 if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12269,7 +12167,7 @@ else else cat > conftest.$ac_ext < @@ -12283,7 +12181,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:12287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_va_val_copy=yes else @@ -12339,12 +12237,12 @@ HAVE_GCC3_ABI= if test "$GNU_CC"; then if test "$CPU_ARCH" = "arm" ; then echo $ac_n "checking for ARM EABI""... $ac_c" 1>&6 -echo "configure:12343: checking for ARM EABI" >&5 +echo "configure:12241: checking for ARM EABI" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_arm_eabi'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_arm_eabi="yes" else @@ -12379,12 +12277,12 @@ echo "$ac_t""$ac_cv_gcc_arm_eabi" 1>&6 fi echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 -echo "configure:12383: checking for gcc 3.0 ABI" >&5 +echo "configure:12281: checking for gcc 3.0 ABI" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_three_abi="yes" else @@ -12421,12 +12319,12 @@ fi echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 -echo "configure:12425: checking for C++ \"explicit\" keyword" >&5 +echo "configure:12323: checking for C++ \"explicit\" keyword" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else @@ -12457,12 +12355,12 @@ EOF fi echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 -echo "configure:12461: checking for C++ \"typename\" keyword" >&5 +echo "configure:12359: checking for C++ \"typename\" keyword" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < A; A.foo(0); ; return 0; } EOF -if { (eval echo configure:12485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_typename=yes else @@ -12502,12 +12400,12 @@ EOF fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 -echo "configure:12506: checking for modern C++ template specialization syntax support" >&5 +echo "configure:12404: checking for modern C++ template specialization syntax support" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct X { int a; }; class Y {}; @@ -12517,7 +12415,7 @@ X int_x; X y_x; ; return 0; } EOF -if { (eval echo configure:12521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else @@ -12539,12 +12437,12 @@ fi echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 -echo "configure:12543: checking whether partial template specialization works" >&5 +echo "configure:12441: checking whether partial template specialization works" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class Foo {}; template class Foo {}; @@ -12552,7 +12450,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:12556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_partial_specialization=yes else @@ -12573,12 +12471,12 @@ EOF fi echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 -echo "configure:12577: checking whether operators must be re-defined for templates derived from templates" >&5 +echo "configure:12475: checking whether operators must be re-defined for templates derived from templates" >&5 if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class Base { }; template @@ -12590,7 +12488,7 @@ Derived a, b; return 0; ; return 0; } EOF -if { (eval echo configure:12594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_derived_template_operators=no else @@ -12612,12 +12510,12 @@ fi echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 -echo "configure:12616: checking whether we need to cast a derived template to pass as its base class" >&5 +echo "configure:12514: checking whether we need to cast a derived template to pass as its base class" >&5 if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class Base { }; template class Derived : public Base { }; @@ -12626,7 +12524,7 @@ int main() { Derived bar; return foo(bar); ; return 0; } EOF -if { (eval echo configure:12630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_cpp_template_cast_to_base=no else @@ -12647,12 +12545,12 @@ EOF fi echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 -echo "configure:12651: checking whether the compiler can resolve const ambiguities for templates" >&5 +echo "configure:12549: checking whether the compiler can resolve const ambiguities for templates" >&5 if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class ptrClass { @@ -12673,7 +12571,7 @@ int main() { a(&i); ; return 0; } EOF -if { (eval echo configure:12677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_can_resolve_const_ambiguity=yes else @@ -12695,12 +12593,12 @@ fi echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 -echo "configure:12699: checking whether the C++ \"using\" keyword can change access" >&5 +echo "configure:12597: checking whether the C++ \"using\" keyword can change access" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_access_changing_using2=no else @@ -12747,12 +12645,12 @@ EOF fi echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 -echo "configure:12751: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 +echo "configure:12649: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_ambiguity_resolving_using=yes else @@ -12789,19 +12687,19 @@ EOF fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 -echo "configure:12793: checking for \"std::\" namespace" >&5 +echo "configure:12691: checking for \"std::\" namespace" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return std::min(0, 1); ; return 0; } EOF -if { (eval echo configure:12805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespace_std=yes else @@ -12822,12 +12720,12 @@ EOF fi echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 -echo "configure:12826: checking whether standard template operator!=() is ambiguous" >&5 +echo "configure:12724: checking whether standard template operator!=() is ambiguous" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct T1 {}; @@ -12837,7 +12735,7 @@ int main() { T1 a,b; return a != b; ; return 0; } EOF -if { (eval echo configure:12841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_unambiguous_std_notequal=unambiguous else @@ -12859,12 +12757,12 @@ fi echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 -echo "configure:12863: checking for C++ reinterpret_cast" >&5 +echo "configure:12761: checking for C++ reinterpret_cast" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <(z); ; return 0; } EOF -if { (eval echo configure:12876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else @@ -12893,7 +12791,7 @@ EOF fi echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 -echo "configure:12897: checking for C++ dynamic_cast to void*" >&5 +echo "configure:12795: checking for C++ dynamic_cast to void*" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12901,8 +12799,11 @@ else ac_cv_cpp_dynamic_cast_void_ptr=no else cat > conftest.$ac_ext <(suby)))); } EOF -if { (eval echo configure:12921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_cpp_dynamic_cast_void_ptr=yes else @@ -12941,19 +12842,19 @@ fi echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 -echo "configure:12945: checking whether C++ requires implementation of unused virtual methods" >&5 +echo "configure:12846: checking whether C++ requires implementation of unused virtual methods" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_cpp_unused_required=no else @@ -12976,12 +12877,12 @@ fi echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 -echo "configure:12980: checking for trouble comparing to zero near std::operator!=()" >&5 +echo "configure:12881: checking for trouble comparing to zero near std::operator!=()" >&5 if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < template class Foo {}; @@ -12992,7 +12893,7 @@ int main() { Foo f; return (0 != f); ; return 0; } EOF -if { (eval echo configure:12996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_trouble_comparing_to_zero=no else @@ -13019,19 +12920,19 @@ fi _SAVE_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $DSO_PIC_CFLAGS $DSO_LDOPTS $MOZ_OPTIMIZE_LDFLAGS" echo $ac_n "checking for __thread keyword for TLS variables""... $ac_c" 1>&6 -echo "configure:13023: checking for __thread keyword for TLS variables" >&5 +echo "configure:12924: checking for __thread keyword for TLS variables" >&5 if eval "test \"`echo '$''{'ac_cv_thread_keyword'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_thread_keyword=yes else @@ -13068,19 +12969,19 @@ fi MALLOC_H= ac_safe=`echo "malloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for malloc.h""... $ac_c" 1>&6 -echo "configure:13072: checking for malloc.h" >&5 +echo "configure:12973: checking for malloc.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 < int main() { ; return 0; } EOF -if { (eval echo configure:13084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -13103,19 +13004,19 @@ fi if test "$MALLOC_H" = ""; then ac_safe=`echo "malloc/malloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for malloc/malloc.h""... $ac_c" 1>&6 -echo "configure:13107: checking for malloc/malloc.h" >&5 +echo "configure:13008: checking for malloc/malloc.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 < int main() { ; return 0; } EOF -if { (eval echo configure:13119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -13138,19 +13039,19 @@ fi if test "$MALLOC_H" = ""; then ac_safe=`echo "sys/malloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/malloc.h""... $ac_c" 1>&6 -echo "configure:13142: checking for sys/malloc.h" >&5 +echo "configure:13043: checking for sys/malloc.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 < int main() { ; return 0; } EOF -if { (eval echo configure:13154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -13183,12 +13084,12 @@ MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" for ac_func in strndup posix_memalign memalign valloc do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13187: checking for $ac_func" >&5 +echo "configure:13088: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13119: \"$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 @@ -13241,19 +13142,19 @@ done echo $ac_n "checking for __attribute__((always_inline))""... $ac_c" 1>&6 -echo "configure:13245: checking for __attribute__((always_inline))" >&5 +echo "configure:13146: checking for __attribute__((always_inline))" >&5 if eval "test \"`echo '$''{'ac_cv_attribute_always_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_attribute_always_inline=yes else @@ -13268,19 +13169,19 @@ fi echo "$ac_t""$ac_cv_attribute_always_inline" 1>&6 echo $ac_n "checking for __attribute__((malloc))""... $ac_c" 1>&6 -echo "configure:13272: checking for __attribute__((malloc))" >&5 +echo "configure:13173: checking for __attribute__((malloc))" >&5 if eval "test \"`echo '$''{'ac_cv_attribute_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_attribute_malloc=yes else @@ -13295,19 +13196,19 @@ fi echo "$ac_t""$ac_cv_attribute_malloc" 1>&6 echo $ac_n "checking for __attribute__((warn_unused_result))""... $ac_c" 1>&6 -echo "configure:13299: checking for __attribute__((warn_unused_result))" >&5 +echo "configure:13200: checking for __attribute__((warn_unused_result))" >&5 if eval "test \"`echo '$''{'ac_cv_attribute_warn_unused'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_attribute_warn_unused=yes else @@ -13322,19 +13223,19 @@ fi echo "$ac_t""$ac_cv_attribute_warn_unused" 1>&6 echo $ac_n "checking for __attribute__((noreturn))""... $ac_c" 1>&6 -echo "configure:13326: checking for __attribute__((noreturn))" >&5 +echo "configure:13227: checking for __attribute__((noreturn))" >&5 if eval "test \"`echo '$''{'ac_cv_attribute_noreturn'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_attribute_noreturn=yes else @@ -13358,19 +13259,19 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:13362: checking for LC_MESSAGES" >&5 +echo "configure:13263: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { int category = LC_MESSAGES; ; return 0; } EOF -if { (eval echo configure:13374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_i18n_lc_messages=yes else @@ -13393,12 +13294,12 @@ fi for ac_func in localeconv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13397: checking for $ac_func" >&5 +echo "configure:13298: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13326: \"$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 @@ -13610,7 +13511,7 @@ fi # Extract the first word of "nspr-config", so it can be a program name with args. set dummy nspr-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13614: checking for $ac_word" >&5 +echo "configure:13515: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13645,7 +13546,7 @@ fi min_nspr_version=4.8.8 echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6 -echo "configure:13649: checking for NSPR - version >= $min_nspr_version" >&5 +echo "configure:13550: checking for NSPR - version >= $min_nspr_version" >&5 no_nspr="" if test "$NSPR_CONFIG" != "no"; then @@ -13704,7 +13605,7 @@ if test -n "$MOZ_NATIVE_NSPR"; then _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $NSPR_CFLAGS" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* MOZ_NATIVE_NSPR=1 else @@ -13758,19 +13659,19 @@ else LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" ac_safe=`echo "event.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for event.h""... $ac_c" 1>&6 -echo "configure:13762: checking for event.h" >&5 +echo "configure:13663: checking for event.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 < int main() { ; return 0; } EOF -if { (eval echo configure:13774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -13793,7 +13694,7 @@ fi fi echo $ac_n "checking for event_init in -levent""... $ac_c" 1>&6 -echo "configure:13797: checking for event_init in -levent" >&5 +echo "configure:13698: checking for event_init in -levent" >&5 ac_lib_var=`echo event'_'event_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13801,7 +13702,7 @@ else ac_save_LIBS="$LIBS" LIBS="-levent $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13895,7 +13796,7 @@ fi # Extract the first word of "nss-config", so it can be a program name with args. set dummy nss-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13899: checking for $ac_word" >&5 +echo "configure:13800: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13930,7 +13831,7 @@ fi min_nss_version=3.12.10 echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6 -echo "configure:13934: checking for NSS - version >= $min_nss_version" >&5 +echo "configure:13835: checking for NSS - version >= $min_nss_version" >&5 no_nss="" if test "$NSS_CONFIG" = "no"; then @@ -14003,13 +13904,13 @@ fi echo $ac_n "checking for YASM assembler""... $ac_c" 1>&6 -echo "configure:14007: checking for YASM assembler" >&5 +echo "configure:13908: checking for YASM assembler" >&5 for ac_prog in yasm 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:14013: checking for $ac_word" >&5 +echo "configure:13914: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YASM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14071,7 +13972,7 @@ if test -z "$JPEG_DIR" -o "$JPEG_DIR" = no; then SYSTEM_JPEG= else echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:14075: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:13976: checking for jpeg_destroy_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14079,7 +13980,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $JPEG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13995: \"$ac_link\") 1>&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 +14017,7 @@ fi if test "$SYSTEM_JPEG" = 1; then LIBS="$JPEG_LIBS $LIBS" cat > conftest.$ac_ext < #include @@ -14127,7 +14028,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:14131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SYSTEM_JPEG=1 else @@ -14165,7 +14066,7 @@ if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then SYSTEM_ZLIB= else echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 -echo "configure:14169: checking for gzread in -lz" >&5 +echo "configure:14070: checking for gzread in -lz" >&5 ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14173,7 +14074,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $ZLIB_LIBS $LIBS" cat > conftest.$ac_ext <&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_lib_$ac_lib_var=yes" else @@ -14209,7 +14110,7 @@ fi if test "$SYSTEM_ZLIB" = 1; then LIBS="$ZLIB_LIBS $LIBS" cat > conftest.$ac_ext < #include @@ -14220,7 +14121,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:14224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SYSTEM_ZLIB=1 else @@ -14258,7 +14159,7 @@ if test -z "$BZ2_DIR" -o "$BZ2_DIR" = no; then SYSTEM_BZ2= else echo $ac_n "checking for BZ2_bzread in -lbz2""... $ac_c" 1>&6 -echo "configure:14262: checking for BZ2_bzread in -lbz2" >&5 +echo "configure:14163: checking for BZ2_bzread in -lbz2" >&5 ac_lib_var=`echo bz2'_'BZ2_bzread | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14266,7 +14167,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbz2 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14329,7 +14230,7 @@ if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then else _SAVE_PNG_LIBS=$PNG_LIBS echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:14333: checking for png_get_valid in -lpng" >&5 +echo "configure:14234: checking for png_get_valid in -lpng" >&5 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14337,7 +14238,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $PNG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14370,7 +14271,7 @@ else fi echo $ac_n "checking for png_get_acTL in -lpng""... $ac_c" 1>&6 -echo "configure:14374: checking for png_get_acTL in -lpng" >&5 +echo "configure:14275: checking for png_get_acTL in -lpng" >&5 ac_lib_var=`echo png'_'png_get_acTL | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14378,7 +14279,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $_SAVE_PNG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14421,7 +14322,7 @@ fi if test "$SYSTEM_PNG" = 1; then LIBS="$PNG_LIBS $LIBS" cat > conftest.$ac_ext < #include @@ -14435,7 +14336,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:14439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SYSTEM_PNG=1 else @@ -14477,7 +14378,7 @@ if test -n "$SYSTEM_HUNSPELL"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14481: checking for $ac_word" >&5 +echo "configure:14382: 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 @@ -14521,19 +14422,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for hunspell""... $ac_c" 1>&6 -echo "configure:14525: checking for hunspell" >&5 +echo "configure:14426: checking for hunspell" >&5 if $PKG_CONFIG --exists "hunspell" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_HUNSPELL_CFLAGS""... $ac_c" 1>&6 -echo "configure:14532: checking MOZ_HUNSPELL_CFLAGS" >&5 +echo "configure:14433: checking MOZ_HUNSPELL_CFLAGS" >&5 MOZ_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` echo "$ac_t""$MOZ_HUNSPELL_CFLAGS" 1>&6 echo $ac_n "checking MOZ_HUNSPELL_LIBS""... $ac_c" 1>&6 -echo "configure:14537: checking MOZ_HUNSPELL_LIBS" >&5 +echo "configure:14438: checking MOZ_HUNSPELL_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_HUNSPELL_LIBS="`$PKG_CONFIG --libs \"hunspell\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_HUNSPELL_LIBS" 1>&6 @@ -14589,7 +14490,7 @@ if test -n "$MOZ_NATIVE_FFI"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14593: checking for $ac_word" >&5 +echo "configure:14494: 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 @@ -14633,19 +14534,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libffi > 3.0.9""... $ac_c" 1>&6 -echo "configure:14637: checking for libffi > 3.0.9" >&5 +echo "configure:14538: checking for libffi > 3.0.9" >&5 if $PKG_CONFIG --exists "libffi > 3.0.9" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 -echo "configure:14644: checking MOZ_FFI_CFLAGS" >&5 +echo "configure:14545: checking MOZ_FFI_CFLAGS" >&5 MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi > 3.0.9"` echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 -echo "configure:14649: checking MOZ_FFI_LIBS" >&5 +echo "configure:14550: checking MOZ_FFI_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi > 3.0.9\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 @@ -14681,7 +14582,7 @@ echo "configure:14649: checking MOZ_FFI_LIBS" >&5 # 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:14685: checking for $ac_word" >&5 +echo "configure:14586: 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 @@ -14725,19 +14626,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libffi >= 3.0.9""... $ac_c" 1>&6 -echo "configure:14729: checking for libffi >= 3.0.9" >&5 +echo "configure:14630: checking for libffi >= 3.0.9" >&5 if $PKG_CONFIG --exists "libffi >= 3.0.9" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 -echo "configure:14736: checking MOZ_FFI_CFLAGS" >&5 +echo "configure:14637: checking MOZ_FFI_CFLAGS" >&5 MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0.9"` echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 -echo "configure:14741: checking MOZ_FFI_LIBS" >&5 +echo "configure:14642: checking MOZ_FFI_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi >= 3.0.9\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 @@ -14905,7 +14806,7 @@ fi echo $ac_n "checking for application to build""... $ac_c" 1>&6 -echo "configure:14909: checking for application to build" >&5 +echo "configure:14810: checking for application to build" >&5 if test -z "$MOZ_BUILD_APP"; then echo "$ac_t""browser" 1>&6 MOZ_BUILD_APP=browser @@ -14923,7 +14824,7 @@ fi # Allow the application to influence configure with a confvars.sh script. echo $ac_n "checking if app-specific confvars.sh exists""... $ac_c" 1>&6 -echo "configure:14927: checking if app-specific confvars.sh exists" >&5 +echo "configure:14828: checking if app-specific confvars.sh exists" >&5 if test -f "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" ; then echo "$ac_t""${srcdir}/${MOZ_BUILD_APP}/confvars.sh" 1>&6 . "${srcdir}/${MOZ_BUILD_APP}/confvars.sh" @@ -15180,7 +15081,7 @@ if test "$COMPILE_ENVIRONMENT"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15184: checking for $ac_word" >&5 +echo "configure:15085: 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 @@ -15224,19 +15125,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for directfb >= 1.1.0""... $ac_c" 1>&6 -echo "configure:15228: checking for directfb >= 1.1.0" >&5 +echo "configure:15129: checking for directfb >= 1.1.0" >&5 if $PKG_CONFIG --exists "directfb >= 1.1.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_DFB_CFLAGS""... $ac_c" 1>&6 -echo "configure:15235: checking MOZ_DFB_CFLAGS" >&5 +echo "configure:15136: checking MOZ_DFB_CFLAGS" >&5 MOZ_DFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= 1.1.0"` echo "$ac_t""$MOZ_DFB_CFLAGS" 1>&6 echo $ac_n "checking MOZ_DFB_LIBS""... $ac_c" 1>&6 -echo "configure:15240: checking MOZ_DFB_LIBS" >&5 +echo "configure:15141: checking MOZ_DFB_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_DFB_LIBS="`$PKG_CONFIG --libs \"directfb >= 1.1.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_DFB_LIBS" 1>&6 @@ -15274,7 +15175,7 @@ echo "configure:15240: checking MOZ_DFB_LIBS" >&5 # 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:15278: checking for $ac_word" >&5 +echo "configure:15179: 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 @@ -15318,19 +15219,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES""... $ac_c" 1>&6 -echo "configure:15322: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" >&5 +echo "configure:15223: checking for gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" >&5 if $PKG_CONFIG --exists "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 -echo "configure:15329: checking MOZ_GTK2_CFLAGS" >&5 +echo "configure:15230: checking MOZ_GTK2_CFLAGS" >&5 MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES"` echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 -echo "configure:15334: checking MOZ_GTK2_LIBS" >&5 +echo "configure:15235: checking MOZ_GTK2_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 @@ -15409,7 +15310,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15413: checking for $ac_word" >&5 +echo "configure:15314: 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 @@ -15453,19 +15354,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6 -echo "configure:15457: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 +echo "configure:15358: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6 -echo "configure:15464: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 +echo "configure:15365: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"` echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6 echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6 -echo "configure:15469: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 +echo "configure:15370: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6 @@ -15531,7 +15432,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15535: checking for $ac_word" >&5 +echo "configure:15436: 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 @@ -15575,19 +15476,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for QtGui QtNetwork QtCore QtOpenGL""... $ac_c" 1>&6 -echo "configure:15579: checking for QtGui QtNetwork QtCore QtOpenGL" >&5 +echo "configure:15480: checking for QtGui QtNetwork QtCore QtOpenGL" >&5 if $PKG_CONFIG --exists "QtGui QtNetwork QtCore QtOpenGL" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_QT_CFLAGS""... $ac_c" 1>&6 -echo "configure:15586: checking MOZ_QT_CFLAGS" >&5 +echo "configure:15487: checking MOZ_QT_CFLAGS" >&5 MOZ_QT_CFLAGS=`$PKG_CONFIG --cflags "QtGui QtNetwork QtCore QtOpenGL"` echo "$ac_t""$MOZ_QT_CFLAGS" 1>&6 echo $ac_n "checking MOZ_QT_LIBS""... $ac_c" 1>&6 -echo "configure:15591: checking MOZ_QT_LIBS" >&5 +echo "configure:15492: checking MOZ_QT_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_QT_LIBS="`$PKG_CONFIG --libs \"QtGui QtNetwork QtCore QtOpenGL\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_QT_LIBS" 1>&6 @@ -15621,7 +15522,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15625: checking for $ac_word" >&5 +echo "configure:15526: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15677,7 +15578,7 @@ incorrect" 1>&2; exit 1; } # 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:15681: checking for $ac_word" >&5 +echo "configure:15582: 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 @@ -15721,19 +15622,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for qmsystem2""... $ac_c" 1>&6 -echo "configure:15725: checking for qmsystem2" >&5 +echo "configure:15626: checking for qmsystem2" >&5 if $PKG_CONFIG --exists "qmsystem2" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking _QMSYSTEM2_CFLAGS""... $ac_c" 1>&6 -echo "configure:15732: checking _QMSYSTEM2_CFLAGS" >&5 +echo "configure:15633: checking _QMSYSTEM2_CFLAGS" >&5 _QMSYSTEM2_CFLAGS=`$PKG_CONFIG --cflags "qmsystem2"` echo "$ac_t""$_QMSYSTEM2_CFLAGS" 1>&6 echo $ac_n "checking _QMSYSTEM2_LIBS""... $ac_c" 1>&6 -echo "configure:15737: checking _QMSYSTEM2_LIBS" >&5 +echo "configure:15638: checking _QMSYSTEM2_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic _QMSYSTEM2_LIBS="`$PKG_CONFIG --libs \"qmsystem2\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$_QMSYSTEM2_LIBS" 1>&6 @@ -15780,7 +15681,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15784: checking for $ac_word" >&5 +echo "configure:15685: 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 @@ -15824,19 +15725,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for QtNetwork >= 4.7""... $ac_c" 1>&6 -echo "configure:15828: checking for QtNetwork >= 4.7" >&5 +echo "configure:15729: checking for QtNetwork >= 4.7" >&5 if $PKG_CONFIG --exists "QtNetwork >= 4.7" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking _QTNETWORK_CFLAGS""... $ac_c" 1>&6 -echo "configure:15835: checking _QTNETWORK_CFLAGS" >&5 +echo "configure:15736: checking _QTNETWORK_CFLAGS" >&5 _QTNETWORK_CFLAGS=`$PKG_CONFIG --cflags "QtNetwork >= 4.7"` echo "$ac_t""$_QTNETWORK_CFLAGS" 1>&6 echo $ac_n "checking _QTNETWORK_LIBS""... $ac_c" 1>&6 -echo "configure:15840: checking _QTNETWORK_LIBS" >&5 +echo "configure:15741: checking _QTNETWORK_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic _QTNETWORK_LIBS="`$PKG_CONFIG --libs \"QtNetwork >= 4.7\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$_QTNETWORK_LIBS" 1>&6 @@ -15881,7 +15782,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15885: checking for $ac_word" >&5 +echo "configure:15786: 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 @@ -15925,19 +15826,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for QtSensors""... $ac_c" 1>&6 -echo "configure:15929: checking for QtSensors" >&5 +echo "configure:15830: checking for QtSensors" >&5 if $PKG_CONFIG --exists "QtSensors" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking _QTMOBILITY_CFLAGS""... $ac_c" 1>&6 -echo "configure:15936: checking _QTMOBILITY_CFLAGS" >&5 +echo "configure:15837: checking _QTMOBILITY_CFLAGS" >&5 _QTMOBILITY_CFLAGS=`$PKG_CONFIG --cflags "QtSensors"` echo "$ac_t""$_QTMOBILITY_CFLAGS" 1>&6 echo $ac_n "checking _QTMOBILITY_LIBS""... $ac_c" 1>&6 -echo "configure:15941: checking _QTMOBILITY_LIBS" >&5 +echo "configure:15842: checking _QTMOBILITY_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic _QTMOBILITY_LIBS="`$PKG_CONFIG --libs \"QtSensors\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$_QTMOBILITY_LIBS" 1>&6 @@ -15972,7 +15873,7 @@ echo "configure:15941: checking _QTMOBILITY_LIBS" >&5 MOZ_QT_LIBS="$MOZ_QT_LIBS $_QTMOBILITY_LIBS" else echo $ac_n "checking for main in -lQtSensors""... $ac_c" 1>&6 -echo "configure:15976: checking for main in -lQtSensors" >&5 +echo "configure:15877: checking for main in -lQtSensors" >&5 ac_lib_var=`echo QtSensors'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15980,14 +15881,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lQtSensors $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16139,7 +16040,7 @@ then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16143: checking for $ac_word" >&5 +echo "configure:16044: 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 @@ -16183,19 +16084,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pango >= $PANGO_VERSION""... $ac_c" 1>&6 -echo "configure:16187: checking for pango >= $PANGO_VERSION" >&5 +echo "configure:16088: checking for pango >= $PANGO_VERSION" >&5 if $PKG_CONFIG --exists "pango >= $PANGO_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 -echo "configure:16194: checking _PANGOCHK_CFLAGS" >&5 +echo "configure:16095: checking _PANGOCHK_CFLAGS" >&5 _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION"` echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 -echo "configure:16199: checking _PANGOCHK_LIBS" >&5 +echo "configure:16100: checking _PANGOCHK_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic _PANGOCHK_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 @@ -16231,7 +16132,7 @@ echo "configure:16199: checking _PANGOCHK_LIBS" >&5 # 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:16235: checking for $ac_word" >&5 +echo "configure:16136: 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 @@ -16275,19 +16176,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION""... $ac_c" 1>&6 -echo "configure:16279: checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" >&5 +echo "configure:16180: checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" >&5 if $PKG_CONFIG --exists "pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 -echo "configure:16286: checking MOZ_PANGO_CFLAGS" >&5 +echo "configure:16187: checking MOZ_PANGO_CFLAGS" >&5 MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION"` echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 -echo "configure:16291: checking MOZ_PANGO_LIBS" >&5 +echo "configure:16192: checking MOZ_PANGO_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 @@ -16331,7 +16232,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16335: checking for $ac_word" >&5 +echo "configure:16236: 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 @@ -16375,19 +16276,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for freetype2 > 6.1.0 fontconfig""... $ac_c" 1>&6 -echo "configure:16379: checking for freetype2 > 6.1.0 fontconfig" >&5 +echo "configure:16280: checking for freetype2 > 6.1.0 fontconfig" >&5 if $PKG_CONFIG --exists "freetype2 > 6.1.0 fontconfig" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking FT2_CFLAGS""... $ac_c" 1>&6 -echo "configure:16386: checking FT2_CFLAGS" >&5 +echo "configure:16287: checking FT2_CFLAGS" >&5 FT2_CFLAGS=`$PKG_CONFIG --cflags "freetype2 > 6.1.0 fontconfig"` echo "$ac_t""$FT2_CFLAGS" 1>&6 echo $ac_n "checking FT2_LIBS""... $ac_c" 1>&6 -echo "configure:16391: checking FT2_LIBS" >&5 +echo "configure:16292: checking FT2_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic FT2_LIBS="`$PKG_CONFIG --libs \"freetype2 > 6.1.0 fontconfig\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$FT2_LIBS" 1>&6 @@ -16431,7 +16332,7 @@ then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16435: checking for $ac_word" >&5 +echo "configure:16336: 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 @@ -16475,19 +16376,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION""... $ac_c" 1>&6 -echo "configure:16479: checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" >&5 +echo "configure:16380: checking for pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" >&5 if $PKG_CONFIG --exists "pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 -echo "configure:16486: checking MOZ_PANGO_CFLAGS" >&5 +echo "configure:16387: checking MOZ_PANGO_CFLAGS" >&5 MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION"` echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 -echo "configure:16491: checking MOZ_PANGO_LIBS" >&5 +echo "configure:16392: checking MOZ_PANGO_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= $PANGO_VERSION pangoft2 >= $PANGO_VERSION pangocairo >= $PANGO_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 @@ -16560,7 +16461,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16564: checking for $ac_word" >&5 +echo "configure:16465: 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 @@ -16604,19 +16505,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 -echo "configure:16608: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 +echo "configure:16509: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 -echo "configure:16615: checking MOZ_GNOMEVFS_CFLAGS" >&5 +echo "configure:16516: checking MOZ_GNOMEVFS_CFLAGS" >&5 MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 -echo "configure:16620: checking MOZ_GNOMEVFS_LIBS" >&5 +echo "configure:16521: checking MOZ_GNOMEVFS_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6 @@ -16666,7 +16567,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16670: checking for $ac_word" >&5 +echo "configure:16571: 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 @@ -16710,19 +16611,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 -echo "configure:16714: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 +echo "configure:16615: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 -echo "configure:16721: checking MOZ_GNOMEVFS_CFLAGS" >&5 +echo "configure:16622: checking MOZ_GNOMEVFS_CFLAGS" >&5 MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 -echo "configure:16726: checking MOZ_GNOMEVFS_LIBS" >&5 +echo "configure:16627: checking MOZ_GNOMEVFS_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6 @@ -16781,7 +16682,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16785: checking for $ac_word" >&5 +echo "configure:16686: 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 @@ -16825,19 +16726,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gtk+-2.0 >= 2.14""... $ac_c" 1>&6 -echo "configure:16829: checking for gtk+-2.0 >= 2.14" >&5 +echo "configure:16730: checking for gtk+-2.0 >= 2.14" >&5 if $PKG_CONFIG --exists "gtk+-2.0 >= 2.14" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking _GTKCHECK_CFLAGS""... $ac_c" 1>&6 -echo "configure:16836: checking _GTKCHECK_CFLAGS" >&5 +echo "configure:16737: checking _GTKCHECK_CFLAGS" >&5 _GTKCHECK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.14"` echo "$ac_t""$_GTKCHECK_CFLAGS" 1>&6 echo $ac_n "checking _GTKCHECK_LIBS""... $ac_c" 1>&6 -echo "configure:16841: checking _GTKCHECK_LIBS" >&5 +echo "configure:16742: checking _GTKCHECK_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic _GTKCHECK_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= 2.14\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$_GTKCHECK_LIBS" 1>&6 @@ -16872,7 +16773,7 @@ echo "configure:16841: checking _GTKCHECK_LIBS" >&5 # 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:16876: checking for $ac_word" >&5 +echo "configure:16777: 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 @@ -16916,19 +16817,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gio-2.0 >= $GIO_VERSION""... $ac_c" 1>&6 -echo "configure:16920: checking for gio-2.0 >= $GIO_VERSION" >&5 +echo "configure:16821: checking for gio-2.0 >= $GIO_VERSION" >&5 if $PKG_CONFIG --exists "gio-2.0 >= $GIO_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GIO_CFLAGS""... $ac_c" 1>&6 -echo "configure:16927: checking MOZ_GIO_CFLAGS" >&5 +echo "configure:16828: checking MOZ_GIO_CFLAGS" >&5 MOZ_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_VERSION"` echo "$ac_t""$MOZ_GIO_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GIO_LIBS""... $ac_c" 1>&6 -echo "configure:16932: checking MOZ_GIO_LIBS" >&5 +echo "configure:16833: checking MOZ_GIO_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_GIO_LIBS="`$PKG_CONFIG --libs \"gio-2.0 >= $GIO_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_GIO_LIBS" 1>&6 @@ -16997,7 +16898,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17001: checking for $ac_word" >&5 +echo "configure:16902: 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 @@ -17041,19 +16942,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION gobject-2.0 ""... $ac_c" 1>&6 -echo "configure:17045: checking for gconf-2.0 >= $GCONF_VERSION gobject-2.0 " >&5 +echo "configure:16946: checking for gconf-2.0 >= $GCONF_VERSION gobject-2.0 " >&5 if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION gobject-2.0 " ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 -echo "configure:17052: checking MOZ_GCONF_CFLAGS" >&5 +echo "configure:16953: checking MOZ_GCONF_CFLAGS" >&5 MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION gobject-2.0 "` echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 -echo "configure:17057: checking MOZ_GCONF_LIBS" >&5 +echo "configure:16958: checking MOZ_GCONF_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_GCONF_LIBS="`$PKG_CONFIG --libs \"gconf-2.0 >= $GCONF_VERSION gobject-2.0 \" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6 @@ -17131,7 +17032,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17135: checking for $ac_word" >&5 +echo "configure:17036: 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 @@ -17175,19 +17076,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libproxy-1.0""... $ac_c" 1>&6 -echo "configure:17179: checking for libproxy-1.0" >&5 +echo "configure:17080: checking for libproxy-1.0" >&5 if $PKG_CONFIG --exists "libproxy-1.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_LIBPROXY_CFLAGS""... $ac_c" 1>&6 -echo "configure:17186: checking MOZ_LIBPROXY_CFLAGS" >&5 +echo "configure:17087: checking MOZ_LIBPROXY_CFLAGS" >&5 MOZ_LIBPROXY_CFLAGS=`$PKG_CONFIG --cflags "libproxy-1.0"` echo "$ac_t""$MOZ_LIBPROXY_CFLAGS" 1>&6 echo $ac_n "checking MOZ_LIBPROXY_LIBS""... $ac_c" 1>&6 -echo "configure:17191: checking MOZ_LIBPROXY_LIBS" >&5 +echo "configure:17092: checking MOZ_LIBPROXY_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_LIBPROXY_LIBS="`$PKG_CONFIG --libs \"libproxy-1.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_LIBPROXY_LIBS" 1>&6 @@ -17265,7 +17166,7 @@ then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17269: checking for $ac_word" >&5 +echo "configure:17170: 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 @@ -17309,19 +17210,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libnotify >= $LIBNOTIFY_VERSION""... $ac_c" 1>&6 -echo "configure:17313: checking for libnotify >= $LIBNOTIFY_VERSION" >&5 +echo "configure:17214: checking for libnotify >= $LIBNOTIFY_VERSION" >&5 if $PKG_CONFIG --exists "libnotify >= $LIBNOTIFY_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_LIBNOTIFY_CFLAGS""... $ac_c" 1>&6 -echo "configure:17320: checking MOZ_LIBNOTIFY_CFLAGS" >&5 +echo "configure:17221: checking MOZ_LIBNOTIFY_CFLAGS" >&5 MOZ_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_VERSION"` echo "$ac_t""$MOZ_LIBNOTIFY_CFLAGS" 1>&6 echo $ac_n "checking MOZ_LIBNOTIFY_LIBS""... $ac_c" 1>&6 -echo "configure:17325: checking MOZ_LIBNOTIFY_LIBS" >&5 +echo "configure:17226: checking MOZ_LIBNOTIFY_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_LIBNOTIFY_LIBS="`$PKG_CONFIG --libs \"libnotify >= $LIBNOTIFY_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_LIBNOTIFY_LIBS" 1>&6 @@ -17396,7 +17297,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17400: checking for $ac_word" >&5 +echo "configure:17301: 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 @@ -17440,19 +17341,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 -echo "configure:17444: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 +echo "configure:17345: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 -echo "configure:17451: checking MOZ_GNOMEUI_CFLAGS" >&5 +echo "configure:17352: checking MOZ_GNOMEUI_CFLAGS" >&5 MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 -echo "configure:17456: checking MOZ_GNOMEUI_LIBS" >&5 +echo "configure:17357: checking MOZ_GNOMEUI_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs \"libgnomeui-2.0 >= $GNOMEUI_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6 @@ -17530,7 +17431,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17534: checking for $ac_word" >&5 +echo "configure:17435: 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 @@ -17574,19 +17475,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for dbus-1 >= $DBUS_VERSION""... $ac_c" 1>&6 -echo "configure:17578: checking for dbus-1 >= $DBUS_VERSION" >&5 +echo "configure:17479: checking for dbus-1 >= $DBUS_VERSION" >&5 if $PKG_CONFIG --exists "dbus-1 >= $DBUS_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_DBUS_CFLAGS""... $ac_c" 1>&6 -echo "configure:17585: checking MOZ_DBUS_CFLAGS" >&5 +echo "configure:17486: checking MOZ_DBUS_CFLAGS" >&5 MOZ_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= $DBUS_VERSION"` echo "$ac_t""$MOZ_DBUS_CFLAGS" 1>&6 echo $ac_n "checking MOZ_DBUS_LIBS""... $ac_c" 1>&6 -echo "configure:17590: checking MOZ_DBUS_LIBS" >&5 +echo "configure:17491: checking MOZ_DBUS_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_DBUS_LIBS="`$PKG_CONFIG --libs \"dbus-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_DBUS_LIBS" 1>&6 @@ -17621,7 +17522,7 @@ echo "configure:17590: checking MOZ_DBUS_LIBS" >&5 # 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:17625: checking for $ac_word" >&5 +echo "configure:17526: 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 @@ -17665,19 +17566,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for dbus-glib-1 >= $DBUS_VERSION""... $ac_c" 1>&6 -echo "configure:17669: checking for dbus-glib-1 >= $DBUS_VERSION" >&5 +echo "configure:17570: checking for dbus-glib-1 >= $DBUS_VERSION" >&5 if $PKG_CONFIG --exists "dbus-glib-1 >= $DBUS_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6 -echo "configure:17676: checking MOZ_DBUS_GLIB_CFLAGS" >&5 +echo "configure:17577: checking MOZ_DBUS_GLIB_CFLAGS" >&5 MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_VERSION"` echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6 echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6 -echo "configure:17681: checking MOZ_DBUS_GLIB_LIBS" >&5 +echo "configure:17582: checking MOZ_DBUS_GLIB_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs \"dbus-glib-1 >= $DBUS_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6 @@ -17920,7 +17821,7 @@ EOF esac echo $ac_n "checking __attribute__ ((aligned ())) support""... $ac_c" 1>&6 -echo "configure:17924: checking __attribute__ ((aligned ())) support" >&5 +echo "configure:17825: checking __attribute__ ((aligned ())) support" >&5 if eval "test \"`echo '$''{'ac_cv_c_attribute_aligned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17930,14 +17831,14 @@ else for ac_cv_c_attr_align_try in 64 32 16 8; do echo "trying $ac_cv_c_attr_align_try" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_attribute_aligned="${ac_cv_c_attr_align_try}" else @@ -18002,19 +17903,19 @@ EOF LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" ac_safe=`echo "vpx/vpx_decoder.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vpx/vpx_decoder.h""... $ac_c" 1>&6 -echo "configure:18006: checking for vpx/vpx_decoder.h" >&5 +echo "configure:17907: checking for vpx/vpx_decoder.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 < int main() { ; return 0; } EOF -if { (eval echo configure:18018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -18037,7 +17938,7 @@ fi fi echo $ac_n "checking for vpx_codec_dec_init_ver in -lvpx""... $ac_c" 1>&6 -echo "configure:18041: checking for vpx_codec_dec_init_ver in -lvpx" >&5 +echo "configure:17942: checking for vpx_codec_dec_init_ver in -lvpx" >&5 ac_lib_var=`echo vpx'_'vpx_codec_dec_init_ver | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18045,7 +17946,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lvpx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -18243,7 +18144,7 @@ linux*) # 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:18247: checking for $ac_word" >&5 +echo "configure:18148: 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 @@ -18287,19 +18188,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for alsa""... $ac_c" 1>&6 -echo "configure:18291: checking for alsa" >&5 +echo "configure:18192: checking for alsa" >&5 if $PKG_CONFIG --exists "alsa" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_ALSA_CFLAGS""... $ac_c" 1>&6 -echo "configure:18298: checking MOZ_ALSA_CFLAGS" >&5 +echo "configure:18199: checking MOZ_ALSA_CFLAGS" >&5 MOZ_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa"` echo "$ac_t""$MOZ_ALSA_CFLAGS" 1>&6 echo $ac_n "checking MOZ_ALSA_LIBS""... $ac_c" 1>&6 -echo "configure:18303: checking MOZ_ALSA_LIBS" >&5 +echo "configure:18204: checking MOZ_ALSA_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_ALSA_LIBS="`$PKG_CONFIG --libs \"alsa\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_ALSA_LIBS" 1>&6 @@ -18414,7 +18315,7 @@ fi # Extract the first word of "java", so it can be a program name with args. set dummy java; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18418: checking for $ac_word" >&5 +echo "configure:18319: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18463,7 +18364,7 @@ fi # Extract the first word of "javac", so it can be a program name with args. set dummy javac; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18467: checking for $ac_word" >&5 +echo "configure:18368: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18512,7 +18413,7 @@ fi # Extract the first word of "jar", so it can be a program name with args. set dummy jar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18516: checking for $ac_word" >&5 +echo "configure:18417: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18702,7 +18603,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18706: checking for $ac_word" >&5 +echo "configure:18607: 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 @@ -18746,19 +18647,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gthread-2.0""... $ac_c" 1>&6 -echo "configure:18750: checking for gthread-2.0" >&5 +echo "configure:18651: checking for gthread-2.0" >&5 if $PKG_CONFIG --exists "gthread-2.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GTHREAD_CFLAGS""... $ac_c" 1>&6 -echo "configure:18757: checking MOZ_GTHREAD_CFLAGS" >&5 +echo "configure:18658: checking MOZ_GTHREAD_CFLAGS" >&5 MOZ_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0"` echo "$ac_t""$MOZ_GTHREAD_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GTHREAD_LIBS""... $ac_c" 1>&6 -echo "configure:18762: checking MOZ_GTHREAD_LIBS" >&5 +echo "configure:18663: checking MOZ_GTHREAD_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_GTHREAD_LIBS="`$PKG_CONFIG --libs \"gthread-2.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_GTHREAD_LIBS" 1>&6 @@ -18794,19 +18695,19 @@ echo "configure:18762: checking MOZ_GTHREAD_LIBS" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18798: checking for $ac_hdr" >&5 +echo "configure:18699: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:18810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -18915,13 +18816,13 @@ fi if test -n "$LIBJPEG_TURBO_X86_ASM" -o -n "$LIBJPEG_TURBO_X64_ASM" ; then echo $ac_n "checking for YASM assembler""... $ac_c" 1>&6 -echo "configure:18919: checking for YASM assembler" >&5 +echo "configure:18820: checking for YASM assembler" >&5 for ac_prog in yasm 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:18925: checking for $ac_word" >&5 +echo "configure:18826: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LIBJPEG_TURBO_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19151,7 +19052,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19155: checking for $ac_word" >&5 +echo "configure:19056: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MAKENSISU'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19210,7 +19111,7 @@ done MAKENSISU_MINOR_VER=`echo $MAKENSISU_VER | $AWK -F\. '{ print $2 }'` fi echo $ac_n "checking for Unicode NSIS with major version == $REQ_NSIS_MAJOR_VER and minor version >= $MIN_NSIS_MINOR_VER""... $ac_c" 1>&6 -echo "configure:19214: checking for Unicode NSIS with major version == $REQ_NSIS_MAJOR_VER and minor version >= $MIN_NSIS_MINOR_VER" >&5 +echo "configure:19115: checking for Unicode NSIS with major version == $REQ_NSIS_MAJOR_VER and minor version >= $MIN_NSIS_MINOR_VER" >&5 if test "$MAKENSISU_VER" = "" || test ! "$MAKENSISU_MAJOR_VER" = "$REQ_NSIS_MAJOR_VER" -o \ ! "$MAKENSISU_MINOR_VER" -ge $MIN_NSIS_MINOR_VER; then @@ -19223,13 +19124,13 @@ fi echo $ac_n "checking for tar archiver""... $ac_c" 1>&6 -echo "configure:19227: checking for tar archiver" >&5 +echo "configure:19128: checking for tar archiver" >&5 for ac_prog in gnutar gtar tar 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:19233: checking for $ac_word" >&5 +echo "configure:19134: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19266,13 +19167,13 @@ echo "$ac_t""$TAR" 1>&6 echo $ac_n "checking for wget""... $ac_c" 1>&6 -echo "configure:19270: checking for wget" >&5 +echo "configure:19171: checking for wget" >&5 for ac_prog in wget 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:19276: checking for $ac_word" >&5 +echo "configure:19177: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WGET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19464,7 +19365,7 @@ else # 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:19468: checking for $ac_word" >&5 +echo "configure:19369: 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 @@ -19508,19 +19409,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for sqlite3 >= $SQLITE_VERSION""... $ac_c" 1>&6 -echo "configure:19512: checking for sqlite3 >= $SQLITE_VERSION" >&5 +echo "configure:19413: checking for sqlite3 >= $SQLITE_VERSION" >&5 if $PKG_CONFIG --exists "sqlite3 >= $SQLITE_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking SQLITE_CFLAGS""... $ac_c" 1>&6 -echo "configure:19519: checking SQLITE_CFLAGS" >&5 +echo "configure:19420: checking SQLITE_CFLAGS" >&5 SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= $SQLITE_VERSION"` echo "$ac_t""$SQLITE_CFLAGS" 1>&6 echo $ac_n "checking SQLITE_LIBS""... $ac_c" 1>&6 -echo "configure:19524: checking SQLITE_LIBS" >&5 +echo "configure:19425: checking SQLITE_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic SQLITE_LIBS="`$PKG_CONFIG --libs \"sqlite3 >= $SQLITE_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$SQLITE_LIBS" 1>&6 @@ -19551,7 +19452,7 @@ echo "configure:19524: checking SQLITE_LIBS" >&5 echo $ac_n "checking for SQLITE_SECURE_DELETE support in system SQLite""... $ac_c" 1>&6 -echo "configure:19555: checking for SQLITE_SECURE_DELETE support in system SQLite" >&5 +echo "configure:19456: checking for SQLITE_SECURE_DELETE support in system SQLite" >&5 _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $SQLITE_CFLAGS" _SAVE_LIBS="$LIBS" @@ -19565,7 +19466,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sqlite_secure_delete=yes else @@ -19597,7 +19498,7 @@ fi fi echo $ac_n "checking for SQLITE_THREADSAFE support in system SQLite""... $ac_c" 1>&6 -echo "configure:19601: checking for SQLITE_THREADSAFE support in system SQLite" >&5 +echo "configure:19502: checking for SQLITE_THREADSAFE support in system SQLite" >&5 _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $SQLITE_CFLAGS" _SAVE_LIBS="$LIBS" @@ -19611,7 +19512,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sqlite_threadsafe=yes else @@ -19643,7 +19544,7 @@ fi fi echo $ac_n "checking for SQLITE_ENABLE_FTS3 support in system SQLite""... $ac_c" 1>&6 -echo "configure:19647: checking for SQLITE_ENABLE_FTS3 support in system SQLite" >&5 +echo "configure:19548: checking for SQLITE_ENABLE_FTS3 support in system SQLite" >&5 _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $SQLITE_CFLAGS" _SAVE_LIBS="$LIBS" @@ -19657,7 +19558,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sqlite_enable_fts3=yes else @@ -19689,7 +19590,7 @@ fi fi echo $ac_n "checking for SQLITE_ENABLE_UNLOCK_NOTIFY support in system SQLite""... $ac_c" 1>&6 -echo "configure:19693: checking for SQLITE_ENABLE_UNLOCK_NOTIFY support in system SQLite" >&5 +echo "configure:19594: checking for SQLITE_ENABLE_UNLOCK_NOTIFY support in system SQLite" >&5 _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $SQLITE_CFLAGS" _SAVE_LIBS="$LIBS" @@ -19703,7 +19604,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sqlite_enable_unlock_notify=yes else @@ -19835,7 +19736,7 @@ if test -n "$MOZ_ENABLE_LIBCONIC"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19839: checking for $ac_word" >&5 +echo "configure:19740: 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 @@ -19879,19 +19780,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for conic""... $ac_c" 1>&6 -echo "configure:19883: checking for conic" >&5 +echo "configure:19784: checking for conic" >&5 if $PKG_CONFIG --exists "conic" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBCONIC_CFLAGS""... $ac_c" 1>&6 -echo "configure:19890: checking LIBCONIC_CFLAGS" >&5 +echo "configure:19791: checking LIBCONIC_CFLAGS" >&5 LIBCONIC_CFLAGS=`$PKG_CONFIG --cflags "conic"` echo "$ac_t""$LIBCONIC_CFLAGS" 1>&6 echo $ac_n "checking LIBCONIC_LIBS""... $ac_c" 1>&6 -echo "configure:19895: checking LIBCONIC_LIBS" >&5 +echo "configure:19796: checking LIBCONIC_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic LIBCONIC_LIBS="`$PKG_CONFIG --libs \"conic\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$LIBCONIC_LIBS" 1>&6 @@ -19977,19 +19878,19 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:19981: checking for $ac_hdr" >&5 +echo "configure:19882: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:19993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -20016,7 +19917,7 @@ EOF done echo $ac_n "checking for XCompositeRedirectWindow in -lXcomposite""... $ac_c" 1>&6 -echo "configure:20020: checking for XCompositeRedirectWindow in -lXcomposite" >&5 +echo "configure:19921: checking for XCompositeRedirectWindow in -lXcomposite" >&5 ac_lib_var=`echo Xcomposite'_'XCompositeRedirectWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20024,7 +19925,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXcomposite $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -20065,7 +19966,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20069: checking for $ac_word" >&5 +echo "configure:19970: 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 @@ -20109,19 +20010,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libhildonmime""... $ac_c" 1>&6 -echo "configure:20113: checking for libhildonmime" >&5 +echo "configure:20014: checking for libhildonmime" >&5 if $PKG_CONFIG --exists "libhildonmime" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBHILDONMIME_CFLAGS""... $ac_c" 1>&6 -echo "configure:20120: checking LIBHILDONMIME_CFLAGS" >&5 +echo "configure:20021: checking LIBHILDONMIME_CFLAGS" >&5 LIBHILDONMIME_CFLAGS=`$PKG_CONFIG --cflags "libhildonmime"` echo "$ac_t""$LIBHILDONMIME_CFLAGS" 1>&6 echo $ac_n "checking LIBHILDONMIME_LIBS""... $ac_c" 1>&6 -echo "configure:20125: checking LIBHILDONMIME_LIBS" >&5 +echo "configure:20026: checking LIBHILDONMIME_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic LIBHILDONMIME_LIBS="`$PKG_CONFIG --libs \"libhildonmime\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$LIBHILDONMIME_LIBS" 1>&6 @@ -20163,7 +20064,7 @@ echo "configure:20125: checking LIBHILDONMIME_LIBS" >&5 # 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:20167: checking for $ac_word" >&5 +echo "configure:20068: 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 @@ -20207,19 +20108,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libosso""... $ac_c" 1>&6 -echo "configure:20211: checking for libosso" >&5 +echo "configure:20112: checking for libosso" >&5 if $PKG_CONFIG --exists "libosso" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBOSSO_CFLAGS""... $ac_c" 1>&6 -echo "configure:20218: checking LIBOSSO_CFLAGS" >&5 +echo "configure:20119: checking LIBOSSO_CFLAGS" >&5 LIBOSSO_CFLAGS=`$PKG_CONFIG --cflags "libosso"` echo "$ac_t""$LIBOSSO_CFLAGS" 1>&6 echo $ac_n "checking LIBOSSO_LIBS""... $ac_c" 1>&6 -echo "configure:20223: checking LIBOSSO_LIBS" >&5 +echo "configure:20124: checking LIBOSSO_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic LIBOSSO_LIBS="`$PKG_CONFIG --libs \"libosso\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$LIBOSSO_LIBS" 1>&6 @@ -20260,7 +20161,7 @@ echo "configure:20223: checking LIBOSSO_LIBS" >&5 # 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:20264: checking for $ac_word" >&5 +echo "configure:20165: 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 @@ -20304,19 +20205,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for hildon-fm-2""... $ac_c" 1>&6 -echo "configure:20308: checking for hildon-fm-2" >&5 +echo "configure:20209: checking for hildon-fm-2" >&5 if $PKG_CONFIG --exists "hildon-fm-2" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBHILDONFM_CFLAGS""... $ac_c" 1>&6 -echo "configure:20315: checking LIBHILDONFM_CFLAGS" >&5 +echo "configure:20216: checking LIBHILDONFM_CFLAGS" >&5 LIBHILDONFM_CFLAGS=`$PKG_CONFIG --cflags "hildon-fm-2"` echo "$ac_t""$LIBHILDONFM_CFLAGS" 1>&6 echo $ac_n "checking LIBHILDONFM_LIBS""... $ac_c" 1>&6 -echo "configure:20320: checking LIBHILDONFM_LIBS" >&5 +echo "configure:20221: checking LIBHILDONFM_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic LIBHILDONFM_LIBS="`$PKG_CONFIG --libs \"hildon-fm-2\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$LIBHILDONFM_LIBS" 1>&6 @@ -20374,7 +20275,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20378: checking for $ac_word" >&5 +echo "configure:20279: 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 @@ -20418,19 +20319,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for contentaction-0.1""... $ac_c" 1>&6 -echo "configure:20422: checking for contentaction-0.1" >&5 +echo "configure:20323: checking for contentaction-0.1" >&5 if $PKG_CONFIG --exists "contentaction-0.1" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBCONTENTACTION_CFLAGS""... $ac_c" 1>&6 -echo "configure:20429: checking LIBCONTENTACTION_CFLAGS" >&5 +echo "configure:20330: checking LIBCONTENTACTION_CFLAGS" >&5 LIBCONTENTACTION_CFLAGS=`$PKG_CONFIG --cflags "contentaction-0.1"` echo "$ac_t""$LIBCONTENTACTION_CFLAGS" 1>&6 echo $ac_n "checking LIBCONTENTACTION_LIBS""... $ac_c" 1>&6 -echo "configure:20434: checking LIBCONTENTACTION_LIBS" >&5 +echo "configure:20335: checking LIBCONTENTACTION_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic LIBCONTENTACTION_LIBS="`$PKG_CONFIG --libs \"contentaction-0.1\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$LIBCONTENTACTION_LIBS" 1>&6 @@ -20491,7 +20392,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20495: checking for $ac_word" >&5 +echo "configure:20396: 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 @@ -20535,19 +20436,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for meegotouchcore""... $ac_c" 1>&6 -echo "configure:20539: checking for meegotouchcore" >&5 +echo "configure:20440: checking for meegotouchcore" >&5 if $PKG_CONFIG --exists "meegotouchcore" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_MEEGOTOUCH_CFLAGS""... $ac_c" 1>&6 -echo "configure:20546: checking MOZ_MEEGOTOUCH_CFLAGS" >&5 +echo "configure:20447: checking MOZ_MEEGOTOUCH_CFLAGS" >&5 MOZ_MEEGOTOUCH_CFLAGS=`$PKG_CONFIG --cflags "meegotouchcore"` echo "$ac_t""$MOZ_MEEGOTOUCH_CFLAGS" 1>&6 echo $ac_n "checking MOZ_MEEGOTOUCH_LIBS""... $ac_c" 1>&6 -echo "configure:20551: checking MOZ_MEEGOTOUCH_LIBS" >&5 +echo "configure:20452: checking MOZ_MEEGOTOUCH_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_MEEGOTOUCH_LIBS="`$PKG_CONFIG --libs \"meegotouchcore\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_MEEGOTOUCH_LIBS" 1>&6 @@ -20595,7 +20496,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20599: checking for $ac_word" >&5 +echo "configure:20500: 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 @@ -20639,19 +20540,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for liblocation""... $ac_c" 1>&6 -echo "configure:20643: checking for liblocation" >&5 +echo "configure:20544: checking for liblocation" >&5 if $PKG_CONFIG --exists "liblocation" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBLOCATION_CFLAGS""... $ac_c" 1>&6 -echo "configure:20650: checking LIBLOCATION_CFLAGS" >&5 +echo "configure:20551: checking LIBLOCATION_CFLAGS" >&5 LIBLOCATION_CFLAGS=`$PKG_CONFIG --cflags "liblocation"` echo "$ac_t""$LIBLOCATION_CFLAGS" 1>&6 echo $ac_n "checking LIBLOCATION_LIBS""... $ac_c" 1>&6 -echo "configure:20655: checking LIBLOCATION_LIBS" >&5 +echo "configure:20556: checking LIBLOCATION_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic LIBLOCATION_LIBS="`$PKG_CONFIG --libs \"liblocation\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$LIBLOCATION_LIBS" 1>&6 @@ -20699,7 +20600,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20703: checking for $ac_word" >&5 +echo "configure:20604: 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 @@ -20743,19 +20644,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri""... $ac_c" 1>&6 -echo "configure:20747: checking for ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri" >&5 +echo "configure:20648: checking for ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri" >&5 if $PKG_CONFIG --exists "ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBMEEGOTOUCHSHARE_CFLAGS""... $ac_c" 1>&6 -echo "configure:20754: checking LIBMEEGOTOUCHSHARE_CFLAGS" >&5 +echo "configure:20655: checking LIBMEEGOTOUCHSHARE_CFLAGS" >&5 LIBMEEGOTOUCHSHARE_CFLAGS=`$PKG_CONFIG --cflags "ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri"` echo "$ac_t""$LIBMEEGOTOUCHSHARE_CFLAGS" 1>&6 echo $ac_n "checking LIBMEEGOTOUCHSHARE_LIBS""... $ac_c" 1>&6 -echo "configure:20759: checking LIBMEEGOTOUCHSHARE_LIBS" >&5 +echo "configure:20660: checking LIBMEEGOTOUCHSHARE_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic LIBMEEGOTOUCHSHARE_LIBS="`$PKG_CONFIG --libs \"ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$LIBMEEGOTOUCHSHARE_LIBS" 1>&6 @@ -20916,14 +20817,14 @@ no) _SAVE_CFLAGS="$CFLAGS" CFLAGS="$arch_flag" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* MOZ_THUMB2=1 else @@ -20992,16 +20893,16 @@ if test -n "$all_flags"; then _SAVE_CFLAGS="$CFLAGS" CFLAGS="$all_flags" echo $ac_n "checking whether the chosen combination of compiler flags ($all_flags) works""... $ac_c" 1>&6 -echo "configure:20996: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 +echo "configure:20897: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -21024,18 +20925,18 @@ fi if test "$CPU_ARCH" = "arm"; then echo $ac_n "checking for ARM SIMD support in compiler""... $ac_c" 1>&6 -echo "configure:21028: checking for ARM SIMD support in compiler" >&5 +echo "configure:20929: checking for ARM SIMD support in compiler" >&5 # We try to link so that this also fails when # building with LTO. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* result="yes" else @@ -21055,18 +20956,18 @@ EOF fi echo $ac_n "checking for ARM NEON support in compiler""... $ac_c" 1>&6 -echo "configure:21059: checking for ARM NEON support in compiler" >&5 +echo "configure:20960: checking for ARM NEON support in compiler" >&5 # We try to link so that this also fails when # building with LTO. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* result="yes" else @@ -21163,18 +21064,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED" if test -n "$MOZ_DEBUG"; then echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 -echo "configure:21167: checking for valid debug flags" >&5 +echo "configure:21068: checking for valid debug flags" >&5 _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:21178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -21237,18 +21138,18 @@ fi if test "$COMPILE_ENVIRONMENT"; then if test -n "$MOZ_OPTIMIZE"; then echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 -echo "configure:21241: checking for valid optimization flags" >&5 +echo "configure:21142: checking for valid optimization flags" >&5 _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:21252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -21316,7 +21217,7 @@ fi if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$MOZ_DISABLE_ICF"; then echo $ac_n "checking whether the linker supports Identical Code Folding""... $ac_c" 1>&6 -echo "configure:21320: checking whether the linker supports Identical Code Folding" >&5 +echo "configure:21221: checking whether the linker supports Identical Code Folding" >&5 if eval "test \"`echo '$''{'LD_SUPPORTS_ICF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -21325,7 +21226,7 @@ else 'int main() {return foo() - bar();}' > conftest.${ac_ext} # If the linker supports ICF, foo and bar symbols will have # the same address - if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:21329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && + if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:21230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext} && objdump -t conftest${ac_exeext} | awk '{a[$6] = $1} END {if (a["foo"] && (a["foo"] != a["bar"])) { exit 1 }}'; then LD_SUPPORTS_ICF=yes @@ -21346,15 +21247,15 @@ fi if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -n "$MOZ_DEBUG_FLAGS"; then echo $ac_n "checking whether removing dead symbols breaks debugging""... $ac_c" 1>&6 -echo "configure:21350: checking whether removing dead symbols breaks debugging" >&5 +echo "configure:21251: checking whether removing dead symbols breaks debugging" >&5 if eval "test \"`echo '$''{'GC_SECTIONS_BREAKS_DEBUG_RANGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'int foo() {return 42;}' \ 'int bar() {return 1;}' \ 'int main() {return foo();}' > conftest.${ac_ext} - if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -ffunction-sections -c conftest.${ac_ext} 1>&2'; { (eval echo configure:21357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && - { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:21358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && + if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -ffunction-sections -c conftest.${ac_ext} 1>&2'; { (eval echo configure:21258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && + { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:21259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext} -a -s conftest.${ac_objext}; then if test "`$PYTHON "$_topsrcdir"/build/unix/check_debug_ranges.py conftest.${ac_objext} conftest.${ac_ext}`" = \ "`$PYTHON "$_topsrcdir"/build/unix/check_debug_ranges.py conftest${ac_exeext} conftest.${ac_ext}`"; then @@ -21513,7 +21414,7 @@ EOF fi else echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:21517: checking size of int *" >&5 +echo "configure:21418: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -21521,18 +21422,19 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < -int main() +#include +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:21536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:21438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -21630,7 +21532,7 @@ EOF EOF echo $ac_n "checking for VC2005/2008++ CRT source""... $ac_c" 1>&6 -echo "configure:21634: checking for VC2005/2008++ CRT source" >&5 +echo "configure:21536: checking for VC2005/2008++ CRT source" >&5 if test "$CC_VERSION" == "14.00.50727.762" -o "$CC_VERSION" == "15.00.30729.01"; then if test -z "$WIN32_CRT_SRC_DIR" -a -n "$VCINSTALLDIR"; then WIN32_CRT_SRC_DIR="$VCINSTALLDIR\crt\src" @@ -21885,7 +21787,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:21889: checking for $ac_word" >&5 +echo "configure:21791: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -22039,12 +21941,12 @@ fi if test "$USE_ELF_HACK" = 1; then echo $ac_n "checking whether linker creates PT_GNU_RELRO segments""... $ac_c" 1>&6 -echo "configure:22043: checking whether linker creates PT_GNU_RELRO segments" >&5 +echo "configure:21945: checking whether linker creates PT_GNU_RELRO segments" >&5 if eval "test \"`echo '$''{'LINK_WITH_PT_GNU_RELRO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo "int main() {return 0;}" > conftest.${ac_ext} - if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:22048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && + if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:21950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then if readelf -l conftest${ac_exeext} | grep GNU_RELRO > /dev/null; then LINK_WITH_PT_GNU_RELRO=yes @@ -22172,12 +22074,12 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_func in __cxa_demangle do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22176: checking for $ac_func" >&5 +echo "configure:22078: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22109: \"$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 @@ -22251,19 +22153,19 @@ fi if test "$HAVE_GCC3_ABI" -a -z "$SKIP_LIBRARY_CHECKS"; then ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unwind.h""... $ac_c" 1>&6 -echo "configure:22255: checking for unwind.h" >&5 +echo "configure:22157: checking for unwind.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 < int main() { ; return 0; } EOF -if { (eval echo configure:22267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:22169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -22280,12 +22182,12 @@ fi for ac_func in _Unwind_Backtrace do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22284: checking for $ac_func" >&5 +echo "configure:22186: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22214: \"$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 @@ -22452,7 +22354,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then # Compiler Options echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 -echo "configure:22456: checking for gcc -pipe support" >&5 +echo "configure:22358: checking for gcc -pipe support" >&5 if test -n "$GNU_CC" -a -n "$GNU_CXX" -a -n "$GNU_AS"; then echo '#include ' > dummy-hello.c echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c @@ -22467,14 +22369,14 @@ if test -n "$GNU_CC" -a -n "$GNU_CXX" -a -n "$GNU_AS"; then _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -pipe" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:22478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:22380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -22504,16 +22406,16 @@ _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 -echo "configure:22508: checking whether C compiler supports -fprofile-generate" >&5 +echo "configure:22410: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:22419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" @@ -22577,16 +22479,16 @@ if test "$_PEDANTIC"; then _SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic ${_COMPILER_PREFIX}-Wno-long-long" echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 -echo "configure:22581: checking whether C++ compiler has -pedantic long long bug" >&5 +echo "configure:22483: checking whether C++ compiler has -pedantic long long bug" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:22492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="no" else @@ -22611,13 +22513,16 @@ rm -f conftest* fi echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 -echo "configure:22615: checking for correct temporary object destruction order" >&5 +echo "configure:22517: checking for correct temporary object destruction order" >&5 if test "$cross_compiling" = yes; then result="maybe" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:22545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -22657,12 +22562,12 @@ fi _SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 -echo "configure:22661: checking for correct overload resolution with const and templates" >&5 +echo "configure:22566: checking for correct overload resolution with const and templates" >&5 if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -22692,7 +22597,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:22696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:22601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_nscap_nonconst_opeq_bug="no" else @@ -22763,18 +22668,18 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking what kind of list files are supported by the linker""... $ac_c" 1>&6 -echo "configure:22767: checking what kind of list files are supported by the linker" >&5 +echo "configure:22672: checking what kind of list files are supported by the linker" >&5 if eval "test \"`echo '$''{'EXPAND_LIBS_LIST_STYLE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo "int main() {return 0;}" > conftest.${ac_ext} - if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&2'; { (eval echo configure:22772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then + if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&2'; { (eval echo configure:22677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list - if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&2'; { (eval echo configure:22774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then + if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&2'; { (eval echo configure:22679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then EXPAND_LIBS_LIST_STYLE=linkerscript else echo "conftest.${OBJ_SUFFIX}" > conftest.list - if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&2'; { (eval echo configure:22778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then + if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&2'; { (eval echo configure:22683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then EXPAND_LIBS_LIST_STYLE=list else EXPAND_LIBS_LIST_STYLE=none @@ -23009,7 +22914,7 @@ then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:23013: checking for $ac_word" >&5 +echo "configure:22918: 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 @@ -23053,19 +22958,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6 -echo "configure:23057: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5 +echo "configure:22962: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking HOST_LIBIDL_CFLAGS""... $ac_c" 1>&6 -echo "configure:23064: checking HOST_LIBIDL_CFLAGS" >&5 +echo "configure:22969: checking HOST_LIBIDL_CFLAGS" >&5 HOST_LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0"` echo "$ac_t""$HOST_LIBIDL_CFLAGS" 1>&6 echo $ac_n "checking HOST_LIBIDL_LIBS""... $ac_c" 1>&6 -echo "configure:23069: checking HOST_LIBIDL_LIBS" >&5 +echo "configure:22974: checking HOST_LIBIDL_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic HOST_LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$HOST_LIBIDL_LIBS" 1>&6 @@ -23190,7 +23095,7 @@ fi # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:23194: checking for $ac_word" >&5 +echo "configure:23099: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -23225,7 +23130,7 @@ fi min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:23229: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:23134: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -23248,7 +23153,7 @@ echo "configure:23229: checking for GLIB - version >= $min_glib_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -23324,7 +23229,7 @@ main () } EOF -if { (eval echo configure:23328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:23233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -23358,7 +23263,7 @@ fi CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -23368,7 +23273,7 @@ int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:23372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -23412,7 +23317,7 @@ rm -f conftest* # Extract the first word of "libIDL-config", so it can be a program name with args. set dummy libIDL-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:23416: checking for $ac_word" >&5 +echo "configure:23321: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_HOST_LIBIDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -23447,7 +23352,7 @@ fi min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:23451: checking for libIDL - version >= $min_libIDL_version" >&5 +echo "configure:23356: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$HOST_LIBIDL_CONFIG" = "no" ; then no_libIDL=yes @@ -23470,7 +23375,7 @@ echo "configure:23451: checking for libIDL - version >= $min_libIDL_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -23556,7 +23461,7 @@ main () } EOF -if { (eval echo configure:23560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:23465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -23590,7 +23495,7 @@ fi CFLAGS="$CFLAGS $HOST_LIBIDL_CFLAGS" LIBS="$LIBS $HOST_LIBIDL_LIBS" cat > conftest.$ac_ext < @@ -23601,7 +23506,7 @@ int main() { return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:23605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding libIDL or finding the wrong" @@ -23641,7 +23546,7 @@ rm -f conftest* # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:23645: checking for $ac_word" >&5 +echo "configure:23550: 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 @@ -23685,19 +23590,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 -echo "configure:23689: checking for libIDL-2.0 >= 0.8.0" >&5 +echo "configure:23594: checking for libIDL-2.0 >= 0.8.0" >&5 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking HOST_LIBIDL_CFLAGS""... $ac_c" 1>&6 -echo "configure:23696: checking HOST_LIBIDL_CFLAGS" >&5 +echo "configure:23601: checking HOST_LIBIDL_CFLAGS" >&5 HOST_LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` echo "$ac_t""$HOST_LIBIDL_CFLAGS" 1>&6 echo $ac_n "checking HOST_LIBIDL_LIBS""... $ac_c" 1>&6 -echo "configure:23701: checking HOST_LIBIDL_LIBS" >&5 +echo "configure:23606: checking HOST_LIBIDL_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic HOST_LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$HOST_LIBIDL_LIBS" 1>&6 @@ -23734,7 +23639,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:23738: checking for $ac_word" >&5 +echo "configure:23643: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -23784,7 +23689,7 @@ done if test -n "$ORBIT_CONFIG"; then echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 -echo "configure:23788: checking for ORBit libIDL usability" >&5 +echo "configure:23693: checking for ORBit libIDL usability" >&5 _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` @@ -23801,7 +23706,7 @@ echo "configure:23788: checking for ORBit libIDL usability" >&5 result="maybe" else cat > conftest.$ac_ext < @@ -23816,7 +23721,7 @@ int main() { } EOF -if { (eval echo configure:23820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:23725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then _LIBIDL_FOUND=1 result="yes" @@ -23898,7 +23803,7 @@ if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:23902: checking for $ac_word" >&5 +echo "configure:23807: 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 @@ -23942,19 +23847,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for glib-2.0 >= 1.3.7 gobject-2.0""... $ac_c" 1>&6 -echo "configure:23946: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 +echo "configure:23851: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7 gobject-2.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 -echo "configure:23953: checking GLIB_CFLAGS" >&5 +echo "configure:23858: checking GLIB_CFLAGS" >&5 GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7 gobject-2.0"` echo "$ac_t""$GLIB_CFLAGS" 1>&6 echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 -echo "configure:23958: checking GLIB_LIBS" >&5 +echo "configure:23863: checking GLIB_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$GLIB_LIBS" 1>&6 @@ -24039,7 +23944,7 @@ fi # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:24043: checking for $ac_word" >&5 +echo "configure:23948: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -24074,7 +23979,7 @@ fi min_glib_version=${GLIB_VERSION} echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:24078: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:23983: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -24097,7 +24002,7 @@ echo "configure:24078: checking for GLIB - version >= $min_glib_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -24173,7 +24078,7 @@ main () } EOF -if { (eval echo configure:24177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:24082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -24207,7 +24112,7 @@ fi CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -24217,7 +24122,7 @@ int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:24221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -24311,19 +24216,19 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:24315: checking for $ac_hdr" >&5 +echo "configure:24220: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:24327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:24232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -24397,19 +24302,19 @@ EOF ac_safe=`echo "d3d9.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for d3d9.h""... $ac_c" 1>&6 -echo "configure:24401: checking for d3d9.h" >&5 +echo "configure:24306: checking for d3d9.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 < int main() { ; return 0; } EOF -if { (eval echo configure:24413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:24318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -24433,19 +24338,19 @@ fi if test -n "$WIN32_D2D_SURFACE_FEATURE"; then ac_safe=`echo "d3d10.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for d3d10.h""... $ac_c" 1>&6 -echo "configure:24437: checking for d3d10.h" >&5 +echo "configure:24342: checking for d3d10.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 < int main() { ; return 0; } EOF -if { (eval echo configure:24449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:24354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -24529,7 +24434,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:24533: checking for $ac_word" >&5 +echo "configure:24438: 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 @@ -24573,19 +24478,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pixman-1 >= 0.19.2""... $ac_c" 1>&6 -echo "configure:24577: checking for pixman-1 >= 0.19.2" >&5 +echo "configure:24482: checking for pixman-1 >= 0.19.2" >&5 if $PKG_CONFIG --exists "pixman-1 >= 0.19.2" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking PIXMAN_CFLAGS""... $ac_c" 1>&6 -echo "configure:24584: checking PIXMAN_CFLAGS" >&5 +echo "configure:24489: checking PIXMAN_CFLAGS" >&5 PIXMAN_CFLAGS=`$PKG_CONFIG --cflags "pixman-1 >= 0.19.2"` echo "$ac_t""$PIXMAN_CFLAGS" 1>&6 echo $ac_n "checking PIXMAN_LIBS""... $ac_c" 1>&6 -echo "configure:24589: checking PIXMAN_LIBS" >&5 +echo "configure:24494: checking PIXMAN_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic PIXMAN_LIBS="`$PKG_CONFIG --libs \"pixman-1 >= 0.19.2\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$PIXMAN_LIBS" 1>&6 @@ -24632,7 +24537,7 @@ else # 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:24636: checking for $ac_word" >&5 +echo "configure:24541: 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 @@ -24676,19 +24581,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig""... $ac_c" 1>&6 -echo "configure:24680: checking for cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig" >&5 +echo "configure:24585: checking for cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig" >&5 if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 -echo "configure:24687: checking CAIRO_CFLAGS" >&5 +echo "configure:24592: checking CAIRO_CFLAGS" >&5 CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig"` echo "$ac_t""$CAIRO_CFLAGS" 1>&6 echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 -echo "configure:24692: checking CAIRO_LIBS" >&5 +echo "configure:24597: checking CAIRO_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$CAIRO_LIBS" 1>&6 @@ -24725,7 +24630,7 @@ echo "configure:24692: checking CAIRO_LIBS" >&5 # 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:24729: checking for $ac_word" >&5 +echo "configure:24634: 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 @@ -24769,19 +24674,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for cairo-tee >= $CAIRO_VERSION""... $ac_c" 1>&6 -echo "configure:24773: checking for cairo-tee >= $CAIRO_VERSION" >&5 +echo "configure:24678: checking for cairo-tee >= $CAIRO_VERSION" >&5 if $PKG_CONFIG --exists "cairo-tee >= $CAIRO_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking CAIRO_TEE_CFLAGS""... $ac_c" 1>&6 -echo "configure:24780: checking CAIRO_TEE_CFLAGS" >&5 +echo "configure:24685: checking CAIRO_TEE_CFLAGS" >&5 CAIRO_TEE_CFLAGS=`$PKG_CONFIG --cflags "cairo-tee >= $CAIRO_VERSION"` echo "$ac_t""$CAIRO_TEE_CFLAGS" 1>&6 echo $ac_n "checking CAIRO_TEE_LIBS""... $ac_c" 1>&6 -echo "configure:24785: checking CAIRO_TEE_LIBS" >&5 +echo "configure:24690: checking CAIRO_TEE_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic CAIRO_TEE_LIBS="`$PKG_CONFIG --libs \"cairo-tee >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$CAIRO_TEE_LIBS" 1>&6 @@ -24817,7 +24722,7 @@ echo "configure:24785: checking CAIRO_TEE_LIBS" >&5 # 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:24821: checking for $ac_word" >&5 +echo "configure:24726: 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 @@ -24861,19 +24766,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for cairo-xlib-xrender >= $CAIRO_VERSION""... $ac_c" 1>&6 -echo "configure:24865: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 +echo "configure:24770: checking for cairo-xlib-xrender >= $CAIRO_VERSION" >&5 if $PKG_CONFIG --exists "cairo-xlib-xrender >= $CAIRO_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking CAIRO_XRENDER_CFLAGS""... $ac_c" 1>&6 -echo "configure:24872: checking CAIRO_XRENDER_CFLAGS" >&5 +echo "configure:24777: checking CAIRO_XRENDER_CFLAGS" >&5 CAIRO_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "cairo-xlib-xrender >= $CAIRO_VERSION"` echo "$ac_t""$CAIRO_XRENDER_CFLAGS" 1>&6 echo $ac_n "checking CAIRO_XRENDER_LIBS""... $ac_c" 1>&6 -echo "configure:24877: checking CAIRO_XRENDER_LIBS" >&5 +echo "configure:24782: checking CAIRO_XRENDER_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic CAIRO_XRENDER_LIBS="`$PKG_CONFIG --libs \"cairo-xlib-xrender >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$CAIRO_XRENDER_LIBS" 1>&6 @@ -25064,19 +24969,19 @@ if test -z "$SKIP_LIBRARY_CHECKS" -a "$NECKO_WIFI" -a "$OS_ARCH" = "Linux" then ac_safe=`echo "iwlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iwlib.h""... $ac_c" 1>&6 -echo "configure:25068: checking for iwlib.h" >&5 +echo "configure:24973: checking for iwlib.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 < int main() { ; return 0; } EOF -if { (eval echo configure:25080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:24985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -25512,9 +25417,9 @@ if test "$USING_HCC"; then fi echo $ac_n "checking for posix_fallocate""... $ac_c" 1>&6 -echo "configure:25516: checking for posix_fallocate" >&5 +echo "configure:25421: checking for posix_fallocate" >&5 cat > conftest.$ac_ext < @@ -25522,7 +25427,7 @@ int main() { posix_fallocate(0, 0, 0); ; return 0; } EOF -if { (eval echo configure:25526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv___posix_fallocate=true else @@ -25548,7 +25453,7 @@ if test "$MOZ_X11"; then _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $XCFLAGS" cat > conftest.$ac_ext < @@ -25567,7 +25472,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:25571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:25476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -25587,19 +25492,19 @@ fi # MOZ_X11 if test -n "$MOZ_WEBGL_GLX"; then ac_safe=`echo "GL/glx.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/glx.h""... $ac_c" 1>&6 -echo "configure:25591: checking for GL/glx.h" >&5 +echo "configure:25496: checking for GL/glx.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 < int main() { ; return 0; } EOF -if { (eval echo configure:25603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:25508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else @@ -25633,17 +25538,17 @@ if test "$USE_FC_FREETYPE"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:25637: checking for $ac_hdr" >&5 +echo "configure:25542: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:25647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:25552: \"$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* @@ -25861,34 +25766,15 @@ fi # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs MOZ_DEFINES=$DEFS @@ -26941,7 +26827,7 @@ if test "$no_recursion" != yes; then fi fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -27081,7 +26967,7 @@ if test "$no_recursion" != yes; then fi fi - cd $ac_popdir + cd "$ac_popdir" done fi @@ -27221,7 +27107,7 @@ if test "$no_recursion" != yes; then fi fi - cd $ac_popdir + cd "$ac_popdir" done fi diff --git a/content/base/src/nsAttrValue.cpp b/content/base/src/nsAttrValue.cpp index 70ce9bd4..2aab0e39 100644 --- a/content/base/src/nsAttrValue.cpp +++ b/content/base/src/nsAttrValue.cpp @@ -62,35 +62,53 @@ nsTArray* nsAttrValue::sEnumTableArray = nsnull; nsAttrValue::nsAttrValue() : mBits(0) + #ifdef TAINTED + , mTainted(0) + #endif { } nsAttrValue::nsAttrValue(const nsAttrValue& aOther) : mBits(0) + #ifdef TAINTED + , mTainted(0) + #endif { SetTo(aOther); } nsAttrValue::nsAttrValue(const nsAString& aValue) : mBits(0) + #ifdef TAINTED + , mTainted(0) + #endif { SetTo(aValue); } nsAttrValue::nsAttrValue(css::StyleRule* aValue, const nsAString* aSerialized) : mBits(0) + #ifdef TAINTED + , mTainted(0) + #endif { SetTo(aValue, aSerialized); } nsAttrValue::nsAttrValue(nsISVGValue* aValue) : mBits(0) + #ifdef TAINTED + , mTainted(0) + #endif { SetTo(aValue); } nsAttrValue::nsAttrValue(const nsIntMargin& aValue) : mBits(0) + #ifdef TAINTED + , mTainted(0) + #endif { SetTo(aValue); } @@ -187,6 +205,13 @@ nsAttrValue::SetTo(const nsAttrValue& aOther) str->AddRef(); SetPtrValueAndType(str, eStringBase); } + #ifdef TAINTED + if(aOther.isTainted()==1){ + + mTainted=1; + mJSStr=aOther.mJSStr; + } + #endif return; } case eOtherBase: @@ -296,6 +321,15 @@ nsAttrValue::SetTo(const nsAString& aValue) if (buf) { SetPtrValueAndType(buf, eStringBase); } + #ifdef TAINTED + if(aValue.isTainted()==1){ + #ifdef DEBUG + printf("This Attribute is tainted! %x \n",this); + #endif + mTainted=1; + mJSStr=aValue.getJSReference(); + } + #endif } void @@ -342,6 +376,12 @@ nsAttrValue::SwapValueWith(nsAttrValue& aOther) PtrBits tmp = aOther.mBits; aOther.mBits = mBits; mBits = tmp; +#ifdef TAINTED + if(aOther.isTainted()==1){ + mTainted=1; + mJSStr=aOther.mJSStr; + } +#endif } void @@ -841,6 +881,12 @@ nsAttrValue::ParseAtom(const nsAString& aValue) if (atom) { SetPtrValueAndType(atom, eAtomBase); } + #ifdef TAINTED + if(aValue.isTainted()==1){ + mTainted=1; + mJSStr=aValue.getJSReference(); + } + #endif } void diff --git a/content/base/src/nsAttrValue.h b/content/base/src/nsAttrValue.h index 68304442..cdf26031 100644 --- a/content/base/src/nsAttrValue.h +++ b/content/base/src/nsAttrValue.h @@ -146,6 +146,11 @@ class nsAttrValue { // Methods to get value. These methods do not convert so only use them // to retrieve the datatype that this nsAttrValue has. +#ifdef TAINTED + inline int isTainted() const; + inline void *getJSReference() const; +#endif + inline PRBool IsEmptyString() const; const nsCheapString GetStringValue() const; inline nsIAtom* GetAtomValue() const; @@ -386,12 +391,32 @@ class nsAttrValue { static nsTArray* sEnumTableArray; +#ifdef TAINTED + int mTainted; + void *mJSStr; +#endif PtrBits mBits; }; /** * Implementation of inline methods */ +#ifdef TAINTED +inline int +nsAttrValue::isTainted() const +{ +#ifdef DEBUG + if(mTainted) + printf("PRENDEREI %d\n",mTainted); +#endif + return mTainted; +} +inline void * +nsAttrValue::getJSReference() const +{ + return mJSStr; +} +#endif inline nsIAtom* nsAttrValue::GetAtomValue() const diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index d6ad5cb1..92755847 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -4619,6 +4619,15 @@ nsGenericElement::GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, } val->ToString(aResult); + #ifdef TAINTED + if(val->isTainted()==1){ + #ifdef DEBUG + printf("Risultato: %s %x\n",(static_cast(aResult)).get(),val); + #endif + aResult.setTainted(1,val->getJSReference()); + + } + #endif return PR_TRUE; } diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp index 8aba719e..7d8b5c8c 100644 --- a/content/html/content/src/nsGenericHTMLElement.cpp +++ b/content/html/content/src/nsGenericHTMLElement.cpp @@ -2296,6 +2296,12 @@ nsGenericHTMLElement::GetURIAttr(nsIAtom* aAttr, nsIAtom* aBaseAttr, nsAString& nsCAutoString spec; uri->GetSpec(spec); CopyUTF8toUTF16(spec, aResult); + #ifdef TAINTED + const nsAttrValue* attr = mAttrsAndChildren.GetAttr(aAttr); + if(attr->isTainted()==1){ + aResult.setTainted(1,attr->getJSReference()); + } + #endif return NS_OK; } diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp index d51b0e8b..d15cf33c 100644 --- a/content/html/content/src/nsHTMLInputElement.cpp +++ b/content/html/content/src/nsHTMLInputElement.cpp @@ -612,6 +612,9 @@ nsHTMLInputElement::nsHTMLInputElement(already_AddRefed aNodeInfo, : nsGenericHTMLFormElement(aNodeInfo), mType(kInputDefaultType->value), mBitField(0) +#ifdef TAINTED + , mTainted(0) +#endif { SET_BOOLBIT(mBitField, BF_PARSER_CREATING, aFromParser); SET_BOOLBIT(mBitField, BF_INHIBIT_RESTORATION, @@ -993,6 +996,10 @@ nsHTMLInputElement::GetValueInternal(nsAString& aValue) const switch (GetValueMode()) { case VALUE_MODE_VALUE: mInputData.mState->GetValue(aValue, PR_TRUE); + #ifdef TAINTED + if(mTainted==1) + aValue.setTainted(1, mJSStr); + #endif return NS_OK; case VALUE_MODE_FILENAME: diff --git a/content/html/content/src/nsHTMLInputElement.h b/content/html/content/src/nsHTMLInputElement.h index 2d0bbd61..da533403 100644 --- a/content/html/content/src/nsHTMLInputElement.h +++ b/content/html/content/src/nsHTMLInputElement.h @@ -216,6 +216,11 @@ class nsHTMLInputElement : public nsGenericHTMLFormElement, NS_IMETHOD_(void) OnValueChanged(PRBool aNotify); NS_IMETHOD_(PRBool) HasCachedSelection(); + #ifdef TAINTED + int isTainted(){return mTainted;} + void * getJSReference(){return mJSStr;} + #endif + void GetDisplayFileName(nsAString& aFileName) const; const nsCOMArray& GetFiles() const; void SetFiles(const nsCOMArray& aFiles, bool aSetValueChanged); @@ -607,6 +612,10 @@ class nsHTMLInputElement : public nsGenericHTMLFormElement, */ nsTextEditorState* mState; } mInputData; + #ifdef TAINTED + int mTainted; + void *mJSStr; + #endif /** * The value of the input if it is a file input. This is the list of filenames * used when uploading a file. It is vital that this is kept separate from diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index a8c614f9..36d1c4d3 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -8472,6 +8472,12 @@ nsDOMStringMapSH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx, if (valBuf) { propVal.ForgetSharedBuffer(); } +#ifdef TAINTED + if(propVal.isTainted()){ + JSVAL_TO_STRING(*vp)->setTainted(); + JS_addTaintInfoOneArg(cx,(JSString *) propVal.getJSReference(),JSVAL_TO_STRING(*vp ),NULL,GET); + } +#endif return NS_SUCCESS_I_DID_SOMETHING; } diff --git a/dom/base/nsJSUtils.h b/dom/base/nsJSUtils.h index e58f1058..9c910df3 100644 --- a/dom/base/nsJSUtils.h +++ b/dom/base/nsJSUtils.h @@ -49,6 +49,10 @@ #include "jsapi.h" #include "nsString.h" +#ifdef TAINTED +#include "vm/String.h" +#endif + class nsIDOMEventListener; class nsIScriptContext; class nsIScriptGlobalObject; @@ -115,6 +119,12 @@ class nsDependentJSString : public nsDependentString NS_ASSERTION(IsEmpty(), "init() on initialized string"); nsDependentString* base = this; new(base) nsDependentString(chars, length); + #ifdef TAINTED + if(str->isTainted()){ + mTainted=1; + mJSStr=str; + } + #endif return JS_TRUE; } diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index 2116bc7b..92a4fec4 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -6208,6 +6208,23 @@ JS_ScheduleGC(JSContext *cx, uint32 count, JSBool compartment) } #endif +#ifdef TAINTED + +JS_PUBLIC_API(JSBool) + JS_addTaintInfoOneArg(JSContext *cx,JSString *argStr,JSString *retStr,char *desc, TaintOp op) { + + return addTaintInfoOneArg(cx,argStr,retStr,desc,op); +} + +JS_PUBLIC_API(JSString * ) + JS_newTaintedString(JSContext *cx, JSString *str ) { + + return taint_newTaintedString ( cx, str); +} + + +#endif + /************************************************************************/ #if !defined(STATIC_EXPORTABLE_JS_API) && !defined(STATIC_JS_API) && defined(XP_WIN) diff --git a/js/src/jsapi.h b/js/src/jsapi.h index b5fc2d66..ab394d4b 100644 --- a/js/src/jsapi.h +++ b/js/src/jsapi.h @@ -3821,6 +3821,44 @@ JS_IsConstructing_PossiblyWithGivenThisObject(JSContext *cx, const jsval *vp, extern JS_PUBLIC_API(JSObject *) JS_NewObjectForConstructor(JSContext *cx, const jsval *vp); +#ifdef TAINTED +#ifndef TAINTSTRUCTS +#define TAINTSTRUCTS +typedef enum taintop {NONEOP,GET,SET,SOURCE,SINK,CHARAT,SUBSTRING,LOWERCASE,UPPERCASE,JOIN,SPLIT,SLICE,REPLACE,REGEXP,CONCAT,CONCATLEFT,CONCATRIGHT,ESCAPE,UNESCAPE,ENCODEURI,UNENCODEURI,ENCODEURICOMPONENT,UNENCODEURICOMPONENT,TRIM,TAGIFY,QUOTE,DEPEND,ATOB,BTOA} TaintOp; +/* +typedef struct GlobalObjectWithTainting{ + JSObject *gObj; + GlobalObjectWithTainting *next; +} GlobalObjectWithTainting; +*/ +typedef struct InfoTaintEntry{ + JSString *str; + jsuint refCount; + TaintOp op; + JSString *source; + struct InfoTaintDep *dep; + struct InfoTaintEntry *next; +} InfoTaintEntry; + + +typedef struct InfoTaintDep{ + InfoTaintEntry *entry; + int spos; + int epos; + char *desc; + struct InfoTaintDep *next; +} InfoTaintDep; +#endif /*IfNotDef TAINTSTRUCTS*/ + + +extern JS_PUBLIC_API(JSBool) + JS_addTaintInfoOneArg(JSContext *cx,JSString *argStr,JSString *retStr,char *desc, TaintOp op) ; + +extern JS_PUBLIC_API(JSString *) + JS_newTaintedString(JSContext *cx, JSString *str ) ; + +#endif + /************************************************************************/ #ifdef DEBUG diff --git a/js/src/taint.cpp b/js/src/taint.cpp index 1905d6bc..67c4786e 100644 --- a/js/src/taint.cpp +++ b/js/src/taint.cpp @@ -98,7 +98,12 @@ void traverseInfoTaintDep(JSContext *cx ,InfoTaintDep *ITD,JSString *str,JSObjec v=INT_TO_JSVAL( tmpITD->epos); JS_SetProperty(cx,entryObj,"endPos",&v); - + + if( tmpITD->desc != NULL){ + v=STRING_TO_JSVAL( js_NewStringCopyZ(cx,tmpITD->desc)); + JS_SetProperty(cx,entryObj,"desc",&v); + } + v=OBJECT_TO_JSVAL(entryObj ); JS_SetElement(cx,depArr,i,&v); @@ -329,6 +334,9 @@ JSBool removeInfoTaintEntryDeps( InfoTaintEntry *ITE){ JS_ASSERT(tmpITD->entry->refCount>0); tmpITD->entry->refCount--; } + if(tmpITD->desc){ + free(tmpITD->desc); + } nextITD=tmpITD->next; free(tmpITD); tmpITD=nextITD; @@ -1111,44 +1119,33 @@ JSBool taint_newTaintedDependency(JSContext *cx, uintN argc, jsval *vp) jsval *argv; const jschar *chars; size_t len; - JSString *str1,*astr; - /* argv = vp + 2; - JS_ASSERT(argc <= JS_ARGS_LENGTH_MAX); - // Set "" if JSVAL IS NULL or argc ==0 - - if(JSVAL_IS_STRING(argv[0])){ - str1= JSVAL_TO_STRING(argv[0]); - if(!JSSTRING_IS_TAINTED(str1)){ - // str1->getCharsAndLength(chars,len); - chars=str1->getChars(cx); - len= str1->length(); - - astr=js_NewStringCopyN(cx,chars,len); - if (!astr) { - // cx->free(chars); - return JS_FALSE; - } - JSSTRING_SET_TAINTED(astr); - }else{ - astr=str1; - } - if(!JSVAL_IS_NULL(argv[1]) && JSVAL_IS_STRING(argv[1])){ - JSString *bindStr; - bindStr= JSVAL_TO_STRING(argv[1]); - - addToTaintTable(cx,astr,bindStr,SOURCE); + argv = vp + 2; + JS_ASSERT(argc <= js::StackSpace::ARGS_LENGTH_MAX); + + if(argc==3 && JSVAL_IS_STRING(argv[0])&& JSVAL_IS_STRING(argv[1])&& JSVAL_IS_STRING(argv[2]) ){ + JSString *newStr,*oldStr,*op; + const jschar *chars; + size_t nchars; + char *opChars ; + newStr = JSVAL_TO_STRING(argv[0]); + if(!newStr->isTainted()){ + return JS_FALSE; + } + oldStr =JSVAL_TO_STRING(argv[1]); + if(! oldStr->isTainted()){ + return JS_FALSE; + } - }else{ - JSString *bindStr; - bindStr= cx->runtime->emptyString; - addToTaintTable(cx,astr,bindStr,SOURCE); - - } - - *vp = STRING_TO_JSVAL(astr); - return JS_TRUE; - }*/ + op=JSVAL_TO_STRING(argv[2]); + + chars= JS_GetStringCharsAndLength(cx, op , &nchars); + opChars=js::DeflateString(cx,chars,nchars); + addTaintInfoOneArg( cx,oldStr , newStr, opChars,DEPEND); + *vp = JSVAL_VOID; + return JS_TRUE; + } + return JS_FALSE; } @@ -1159,13 +1156,8 @@ taint_newTaintedString(JSContext *cx, JSString *oriStr) const jschar *chars; size_t len; JSString *str,*str1,*astr; - - //XXXStefano Note: is this the correct one? - // Trying to prevent some race condition on GC - // js::AutoLockGC lock(cx->runtime); str1= oriStr; - // str1->getCharsAndLength(const_cast (chars),len); chars= str1->getChars(cx); len= str1->length(); astr=js_NewStringCopyN(cx,chars,len); @@ -1174,7 +1166,6 @@ taint_newTaintedString(JSContext *cx, JSString *oriStr) return JS_FALSE; } JSSTRING_SET_TAINTED(astr); - //JS_AddNamedStringRoot(cx,&astr,"Taint"); return astr; } diff --git a/js/src/taint.h b/js/src/taint.h index 4dc40bda..68bc03f9 100644 --- a/js/src/taint.h +++ b/js/src/taint.h @@ -97,10 +97,14 @@ typedef struct InfoTaintDep{ } \ static JSBool str_getAllTaintInfo(JSContext *cx, uintN argc, jsval *vp){\ return taint_getAllTaintInfo(cx,argc,vp);\ - } + } \ + static JSBool str_newTaintedDependency(JSContext *cx, uintN argc, jsval *vp){\ + return taint_newTaintedDependency(cx,argc,vp);\ + } #define SET_NEWTAINTED() JS_FN("newTainted", str_newTainted, 2,0),\ JS_FN("unTaint", str_unTaint, 1,0),\ + JS_FN("addTaintOp", str_newTaintedDependency , 3,0),\ JS_FN("getTaintInfo", str_getTaintInfo, 1,0),\ JS_FN("getAllTaintInfo", str_getAllTaintInfo, 0,0), @@ -133,6 +137,7 @@ extern JSBool taint_deTaint(JSContext *cx, uintN argc, jsval *vp); extern JSBool taint_GetTainted(JSContext *cx, JSString *str, jsval *vp); extern JSBool taint_getTaintInfo(JSContext *cx, uintN argc, jsval *vp); extern JSBool taint_getAllTaintInfo(JSContext *cx, uintN argc, jsval *vp); +extern JSBool taint_newTaintedDependency(JSContext *cx, uintN argc, jsval *vp); extern JSBool taint_setTaintConcatN(JSContext *cx,jsval *sp,int argc,JSString **resStr); extern JSBool js_ObjectHasKeyTainted(JSContext *cx,JSObject *obj); diff --git a/js/src/xpconnect/src/xpcconvert.cpp b/js/src/xpconnect/src/xpcconvert.cpp index eadedc10..d3b82e4f 100644 --- a/js/src/xpconnect/src/xpcconvert.cpp +++ b/js/src/xpconnect/src/xpcconvert.cpp @@ -53,6 +53,11 @@ #include "AccessCheck.h" #include "nsJSUtils.h" +#ifdef TAINTED +#include "nsIDOMElement.h" +#include "nsIDOMWindow.h" +#endif + //#define STRICT_CHECK_OF_UNICODE #ifdef STRICT_CHECK_OF_UNICODE #define ILLEGAL_RANGE(c) (0!=((c) & 0xFF80)) @@ -356,6 +361,27 @@ XPCConvert::NativeData2JS(XPCLazyCallContext& lccx, jsval* d, const void* s, return JS_FALSE; if(buf) buf->AddRef(); + #ifdef TAINTED + XPCCallContext& ccx= lccx.GetXPCCallContext(); + if(p->isTainted()==1 && ccx.GetXPCContext()->CallerTypeIsJavaScript()){ + JSString *jstr = JS_ValueToString(cx,str); + if(jstr->length()==0) + jstr=JS_newTaintedString(cx,jstr); + jstr->setTainted(); + const char *mname; + mname=JS_EncodeString(cx,JSID_TO_STRING(ccx.GetMember()->GetName())); + + TaintOp op=SET; + if(!strcmp("atob", mname )) + op=ATOB; + else if(!strcmp("btoa", mname )) + op=BTOA; + JS_addTaintInfoOneArg(cx,(JSString *)p->getJSReference(),jstr,NULL,op); + /* printf( "Setto str currentObject %s su globalObject Class: %s val: %s\n", STOBJ_GET_CLASS(ccx.GetCurrentJSObject())->name ,((cx->globalObject)->getClass())->name, + JS_GetStringBytes((JSString *)p->getJSReference() ) + ); */ + } + #endif *d = str; } @@ -737,6 +763,9 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s, { static const PRUnichar EMPTY_STRING[] = { '\0' }; static const PRUnichar VOID_STRING[] = { 'u', 'n', 'd', 'e', 'f', 'i', 'n', 'e', 'd', '\0' }; +#ifdef TAINTED + JSBool setTaint= JS_FALSE; +#endif const PRUnichar* chars; JSString* str = nsnull; @@ -761,6 +790,63 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s, str = JS_ValueToString(cx, s); if(!str) return JS_FALSE; + #ifdef TAINTED + if( ccx.GetXPCContext()->CallerTypeIsJavaScript()){ + JSScript* script = nsnull; + JSContext *cx= ccx.GetJSContext(); + js::StackFrame* fp = cx->maybefp(); + while(fp) { + script = fp->maybeScript(); + if(script) + { + // callee = fp->callee; + break; + } + fp = fp->prev();; + } + uint32 flags = 0; + //XXX Stefano Don't we need it anymore? + //flags = script ? JS_GetScriptFilenameFlags(script) : 0; + if(/*!(flags & JSFILENAME_PROTECTED || flags & JSFILENAME_SYSTEM) &&*/ str->isTainted()){ + // Errore di fondo: + // anche i log diventano parte del tainting..giustamente. dobbiamo trovare un modo per fermare questo...:/ + nsIDOMElement* wn; + if(NS_SUCCEEDED(ccx.GetTearOff()->GetNative()->QueryInterface(NS_GET_IID(nsIDOMElement),(void**)&wn))){ + + setTaint=JS_TRUE; + NS_RELEASE(wn); + #ifdef DEBUG + printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>String: is tainted!!!! Interface: %s<<<<<<<<<<<<<<<<<<<<GetInterface()->GetNameString(),useAllocator); + js_DumpString(str); + #endif + }else if(NS_SUCCEEDED(ccx.GetTearOff()->GetNative()->QueryInterface(NS_GET_IID(nsIDOMWindowInternal),(void**)&wn))){ + const char* mname; + static const char* skipClasses[] = { + "postMessage", + "atob", + "btoa", + nsnull + }; +// mname=JS_GetStringBytes(JSID_TO_STRING( ccx.GetMember()->GetName())); + mname = JS_EncodeString(cx,JSID_TO_STRING(ccx.GetMember()->GetName())) ; + for(const char** name = skipClasses; *name; name++) + { + if(!strcmp(*name, mname )) + { + setTaint=JS_TRUE; + break; + } + } + + NS_RELEASE(wn); + #ifdef DEBUG + printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Stringa: Tainted tainted!!!! Interface: %s<<<<<<<<<<<<<<<<<<<<GetInterface()->GetNameString(),useAllocator); + js_DumpString(str); + #endif + } + } + } + #endif length = (PRUint32) JS_GetStringLength(str); if(length) @@ -794,6 +880,11 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s, return JS_FALSE; *((const nsAString**)d) = wrapper; + #ifdef TAINTED + (*((nsAString**)d))->setTainted((setTaint?1:0),(void *)str); +// if(setTaint) + // JS_addTaintInfoOneArg(cx,(JSString *)p->getJSReference(),str,SET); + #endif } else if(JSVAL_IS_NULL(s)) { @@ -806,8 +897,14 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s, } else { + #ifdef TAINTED + + const nsAString *rs = new nsString((void *)(setTaint && str && str->isTainted() ?str:0),chars, length); + + #else // use nsString to encourage sharing const nsAString *rs = new nsString(chars, length); + #endif if(!rs) return JS_FALSE; *((const nsAString**)d) = rs; diff --git a/js/src/xpconnect/src/xpcquickstubs.cpp b/js/src/xpconnect/src/xpcquickstubs.cpp index 6dd0516f..8ba905d0 100644 --- a/js/src/xpconnect/src/xpcquickstubs.cpp +++ b/js/src/xpconnect/src/xpcquickstubs.cpp @@ -732,7 +732,19 @@ xpc_qsDOMString::xpc_qsDOMString(JSContext *cx, jsval v, jsval *pval, return; } +#ifdef TAINTED + // JSString *nStr= JS_CopyZString(s); + if(s->isTainted()){ + + #ifdef DEBUG + js_DumpString(s); + #endif + } + new(mBuf) implementation_type(s->isTainted(),(void *)s,chars, len); + // JS_addTaintInfoOneArg(cx,s,nStr,NULL,SET); +#else new(mBuf) implementation_type(chars, len); +#endif mValid = JS_TRUE; } @@ -1086,6 +1098,21 @@ xpc_qsStringToJsval(JSContext *cx, nsString &str, jsval *rval) jsval jsstr = XPCStringConvert::ReadableToJSVal(cx, str, &sharedBuffer); if (JSVAL_IS_NULL(jsstr)) return JS_FALSE; +#ifdef TAINTED + if(str.isTainted()){ + JSVAL_TO_STRING(jsstr)->setTainted(); + JSObject *ob=JSVAL_TO_OBJECT( *rval); + if(VALUE_IS_FUNCTION(cx, *rval)){ + JSFunction *fun = GET_FUNCTION_PRIVATE(cx, ob); + #ifdef DEBUG + printf("Nome Funzione\n"); + js_DumpString(fun->atom); + #endif + } + JS_addTaintInfoOneArg(cx,(JSString *)str.getJSReference(),JSVAL_TO_STRING(jsstr),NULL,GET); + } +#endif + *rval = jsstr; if (sharedBuffer) { diff --git a/js/src/xpconnect/src/xpcquickstubs.h b/js/src/xpconnect/src/xpcquickstubs.h index 634e3f5a..9a99c54e 100644 --- a/js/src/xpconnect/src/xpcquickstubs.h +++ b/js/src/xpconnect/src/xpcquickstubs.h @@ -294,6 +294,10 @@ class xpc_qsBasicString public: typedef S interface_type; typedef T implementation_type; +#ifdef TAINTED + int mTainted; + void *mJSStr; +#endif ~xpc_qsBasicString() { diff --git a/tainttests/unit_tests.js b/tainttests/unit_tests.js index 7319573a..748d025b 100644 --- a/tainttests/unit_tests.js +++ b/tainttests/unit_tests.js @@ -6,6 +6,9 @@ var zerolengthuntaintedNewString=new String(""); var zerolengthuntainted=""; ts.tainted +__domIntruderObj={domILog:function(a,b,c,d){print(a,b,c,d)}}; + + /////////////////////////// // [String in Object Test] @@ -344,4 +347,17 @@ assert("Array join ","v.tainted",true); String.getTaintInfo(v) +/////////////////////////// +/// Array Objects. +var ts=String.newTainted("ddddd\nddd","dd") +c='ddd'+ts +cv=[c,ts,'dddd'] +cv[] + +//////////////////// +/// Eval tests +var tse=String.newTainted("test","dd") +eval("print('"+tse+"')") + + printResults(); diff --git a/xpcom/string/public/nsString.h b/xpcom/string/public/nsString.h index 01bc9f00..270b9a4e 100644 --- a/xpcom/string/public/nsString.h +++ b/xpcom/string/public/nsString.h @@ -165,7 +165,7 @@ class NS_ConvertUTF16toUTF8 : public nsCAutoString // NOT TO BE IMPLEMENTED NS_ConvertUTF16toUTF8( char ); }; - + class NS_ConvertUTF8toUTF16 : public nsAutoString { @@ -185,6 +185,11 @@ class NS_ConvertUTF8toUTF16 : public nsAutoString NS_ConvertUTF8toUTF16( const nsACString& aCString ) { AppendUTF8toUTF16(aCString, *this); + #ifdef TAINTED + if( aCString.isTainted()==1){\ + setTainted(1, aCString.getJSReference( ) );\ + } + #endif } private: diff --git a/xpcom/string/public/nsTDependentString.h b/xpcom/string/public/nsTDependentString.h index 4bd57b30..c13b9831 100644 --- a/xpcom/string/public/nsTDependentString.h +++ b/xpcom/string/public/nsTDependentString.h @@ -83,6 +83,15 @@ class nsTDependentString_CharT : public nsTString_CharT { AssertValid(); } +#ifdef TAINTED + nsTDependentString_CharT(int tainted,void *jsstr, const char_type* data, PRUint32 length ) + : string_type(const_cast(data), length, F_TERMINATED) + { + AssertValid(); + mTainted=tainted; + mJSStr=jsstr; + } +#endif explicit nsTDependentString_CharT( const char_type* data ) diff --git a/xpcom/string/public/nsTString.h b/xpcom/string/public/nsTString.h index b70289a8..f61392d5 100644 --- a/xpcom/string/public/nsTString.h +++ b/xpcom/string/public/nsTString.h @@ -99,6 +99,21 @@ class nsTString_CharT : public nsTSubstring_CharT Assign(readable); } + #ifdef TAINTED + explicit + nsTString_CharT(void *tainted, const char_type* data, size_type length = size_type(-1) ) + : substring_type() + { + Assign(data, length); + if(tainted){ + mTainted=1; + mJSStr=tainted; + }else{ + mTainted=0; + mJSStr=0; + } + } + #endif // |operator=| does not inherit, so we must define our own self_type& operator=( char_type c ) { Assign(c); return *this; } diff --git a/xpcom/string/public/nsTSubstring.h b/xpcom/string/public/nsTSubstring.h index a9d97ecc..69dde0bb 100644 --- a/xpcom/string/public/nsTSubstring.h +++ b/xpcom/string/public/nsTSubstring.h @@ -197,6 +197,17 @@ class nsTSubstring_CharT return iter = EnsureMutable() ? (mData + mLength) : char_iterator(0); } +#ifdef TAINTED + NS_COM int isTainted() const{ + return mTainted; + } + NS_COM void * getJSReference( ) const{ + return mJSStr; + } + NS_COM void setTainted(int tainted); + NS_COM void setTainted(int tainted,void *str); + +#endif /** * accessors @@ -571,6 +582,9 @@ class nsTSubstring_CharT : mData(nsnull), mLength(0), mFlags(F_NONE) +#ifdef TAINTED + ,mTainted(0) +#endif { Assign(tuple); } @@ -590,7 +604,11 @@ class nsTSubstring_CharT nsTSubstring_CharT( char_type *data, size_type length, PRUint32 flags ) : mData(data), mLength(length), - mFlags(flags) {} + mFlags(flags) +#ifdef TAINTED +, mTainted(0) +#endif + {} #endif /* DEBUG || FORCE_BUILD_REFCNT_LOGGING */ protected: @@ -604,24 +622,41 @@ class nsTSubstring_CharT char_type* mData; size_type mLength; PRUint32 mFlags; +#ifdef TAINTED + int mTainted; + void *mJSStr; +#endif // default initialization nsTSubstring_CharT() : mData(char_traits::sEmptyBuffer), mLength(0), - mFlags(F_TERMINATED) {} + mFlags(F_TERMINATED) +#ifdef TAINTED +, mTainted(0) +#endif +{} // version of constructor that leaves mData and mLength uninitialized explicit nsTSubstring_CharT( PRUint32 flags ) - : mFlags(flags) {} + : mFlags(flags) +#ifdef TAINTED +, mTainted(0) +#endif + {} // copy-constructor, constructs as dependent on given object // (NOTE: this is for internal use only) nsTSubstring_CharT( const self_type& str ) : mData(str.mData), mLength(str.mLength), - mFlags(str.mFlags & (F_TERMINATED | F_VOIDED)) {} + mFlags(str.mFlags & (F_TERMINATED | F_VOIDED)) +#ifdef TAINTED +, mTainted(str.mTainted) +, mJSStr(str.mJSStr) +#endif + {} /** * this function releases mData and does not change the value of diff --git a/xpcom/string/public/nsXPCOMStrings.h b/xpcom/string/public/nsXPCOMStrings.h index 2619c5f3..0df0f5bd 100644 --- a/xpcom/string/public/nsXPCOMStrings.h +++ b/xpcom/string/public/nsXPCOMStrings.h @@ -157,6 +157,10 @@ struct nsStringContainer_base void *d1; PRUint32 d2; PRUint32 d3; +#ifdef TAINTED + int d4; + void *d5; +#endif }; /** diff --git a/xpcom/string/src/nsReadableUtils.cpp b/xpcom/string/src/nsReadableUtils.cpp index 81b9cc00..ced8d84a 100644 --- a/xpcom/string/src/nsReadableUtils.cpp +++ b/xpcom/string/src/nsReadableUtils.cpp @@ -41,12 +41,21 @@ #include "nsString.h" #include "nsUTF8Utils.h" +#ifdef TAINTED +#define COPY_TAINT(src,dest) if((src).isTainted()==1){\ + (dest).setTainted(1,(src).getJSReference( ) );\ + } +#endif + NS_COM void LossyCopyUTF16toASCII( const nsAString& aSource, nsACString& aDest ) { aDest.Truncate(); LossyAppendUTF16toASCII(aSource, aDest); + #ifdef TAINTED + COPY_TAINT(aSource,aDest) + #endif } NS_COM @@ -55,6 +64,9 @@ CopyASCIItoUTF16( const nsACString& aSource, nsAString& aDest ) { aDest.Truncate(); AppendASCIItoUTF16(aSource, aDest); + #ifdef TAINTED + COPY_TAINT(aSource,aDest) + #endif } NS_COM @@ -83,6 +95,9 @@ CopyUTF16toUTF8( const nsAString& aSource, nsACString& aDest ) { aDest.Truncate(); AppendUTF16toUTF8(aSource, aDest); + #ifdef TAINTED + COPY_TAINT(aSource,aDest) + #endif } NS_COM @@ -91,6 +106,9 @@ CopyUTF8toUTF16( const nsACString& aSource, nsAString& aDest ) { aDest.Truncate(); AppendUTF8toUTF16(aSource, aDest); + #ifdef TAINTED + COPY_TAINT(aSource,aDest) + #endif } NS_COM diff --git a/xpcom/string/src/nsTSubstring.cpp b/xpcom/string/src/nsTSubstring.cpp index 988a4667..b58ec0a6 100644 --- a/xpcom/string/src/nsTSubstring.cpp +++ b/xpcom/string/src/nsTSubstring.cpp @@ -43,6 +43,9 @@ nsTSubstring_CharT::nsTSubstring_CharT( char_type *data, size_type length, : mData(data), mLength(length), mFlags(flags) +#ifdef TAINTED +, mTainted(0) +#endif { if (flags & F_OWNED) { STRING_STAT_INCREMENT(Adopt); @@ -328,7 +331,11 @@ nsTSubstring_CharT::Assign( const char_type* data, size_type length ) if (IsDependentOn(data, data + length)) { // take advantage of sharing here... - Assign(string_type(data, length)); + #ifdef TAINTED + Assign(string_type((mTainted?mJSStr:NULL),data, length)); + #else + Assign(string_type(data, length)); + #endif return; } @@ -369,6 +376,9 @@ nsTSubstring_CharT::Assign( const self_type& str ) if (&str == this) return; + #ifdef TAINTED + setTainted(str.isTainted(),str.getJSReference()); + #endif if (!str.mLength) { Truncate(); @@ -852,3 +862,12 @@ nsTSubstring_CharT::DoAppendFloat( double aFloat, int digits ) AppendASCII(buf); } +#ifdef TAINTED +void nsTSubstring_CharT::setTainted(int tainted){ + mTainted = tainted; +} +void nsTSubstring_CharT::setTainted(int tainted,void *str){ + mTainted = tainted; + mJSStr=str; +} +#endif