From 015a1fa3b8dddaddda8ba4253340fbc6010b6253 Mon Sep 17 00:00:00 2001 From: "alex.fritze%crocodile-clips.com" Date: Tue, 18 Mar 2003 13:15:21 +0000 Subject: [PATCH] merge from trunk. git-svn-id: svn://10.0.0.236/branches/SVG_20020806_BRANCH@139666 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/autoconf.mk.in | 4 - mozilla/configure | 1561 +++++++++-------- mozilla/configure.in | 339 ++-- .../content/html/style/src/nsCSSParser.cpp | 296 +++- mozilla/htmlparser/src/nsExpatDriver.cpp | 10 +- .../parser/htmlparser/src/nsExpatDriver.cpp | 10 +- 6 files changed, 1249 insertions(+), 971 deletions(-) diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index e95e22299e4..cd3dd46650f 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -100,8 +100,6 @@ MOZ_INSTALLER = @MOZ_INSTALLER@ MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@ MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@ XPC_IDISPATCH_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@ -MOZ_JSLOADER = @MOZ_JSLOADER@ -MOZ_XPINSTALL = @MOZ_XPINSTALL@ MOZ_XPFE_COMPONENTS = @MOZ_XPFE_COMPONENTS@ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@ @@ -383,8 +381,6 @@ MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ COMPILER_DEPEND = @COMPILER_DEPEND@ MDDEPDIR := @MDDEPDIR@ -MOZ_DISABLE_DTD_DEBUG = @MOZ_DISABLE_DTD_DEBUG@ - MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@ # XXX - these need to be cleaned up and have real checks added -cls diff --git a/mozilla/configure b/mozilla/configure index 7c046cdead0..61b65818550 100755 --- a/mozilla/configure +++ b/mozilla/configure @@ -44,7 +44,14 @@ ac_help="$ac_help Use system libmng [installed at prefix PFX]" ac_help="$ac_help --enable-default-toolkit=TK - Select default toolkit (default=)" + Select default toolkit + Platform specific defaults: + BeOS - beos + Mac OS X - mac (carbon) + Neutrino/QNX - photon + OS/2 - os2 + Win32 - windows + * - gtk" ac_help="$ac_help --with-gtk-prefix=PFX Prefix where GTK is installed (optional)" ac_help="$ac_help @@ -86,15 +93,16 @@ ac_help="$ac_help ac_help="$ac_help --disable-accessibility Disable accessibility support" ac_help="$ac_help - --disable-xpfe-components Disable xpfe components" + --disable-xpfe-components + Disable xpfe components" ac_help="$ac_help - --disable-xpinstall Disable xpinstall support" + --disable-xpinstall Disable xpinstall support" ac_help="$ac_help --enable-single-profile Enable single profile support " ac_help="$ac_help - --disable-jsloader Disable xpcom js loader support" + --disable-jsloader Disable xpcom js loader support" ac_help="$ac_help - --enable-native-uconv enable iconv support" + --enable-native-uconv Enable iconv support" ac_help="$ac_help --enable-plaintext-editor-only Allow only plaintext editing" @@ -109,7 +117,7 @@ ac_help="$ac_help --enable-ldap-experimental Enable LDAP experimental features" ac_help="$ac_help - --disable-mathml Disable MathML" + --disable-mathml Disable MathML support" ac_help="$ac_help --enable-svg Enable SVG " ac_help="$ac_help @@ -122,19 +130,18 @@ ac_help="$ac_help --disable-activex Disable building of ActiveX control (win32 only)" ac_help="$ac_help --enable-activex-scripting - Enable building of ActiveX scripting and plugin support (win32 only)" + Enable building of ActiveX scripting + and plugin support (win32 only)" +ac_help="$ac_help + --enable-leaky Build leaky memory tool" +ac_help="$ac_help + --enable-xpctools Build JS profiling tool" ac_help="$ac_help --disable-tests Do not build test libraries & programs" ac_help="$ac_help - --enable-xpcom-lea Enable Lea malloc in xpcom " + --enable-xpcom-lea Use Lea malloc in xpcom " ac_help="$ac_help - --enable-js-ultrasparc Enable UltraSPARC optimizations in JS" -ac_help="$ac_help - --enable-leaky Enable leaky memory tool (needs mozilla/tools/leaky)" -ac_help="$ac_help - --enable-jprof Enable jprof profiling tool (needs mozilla/tools/jprof)" -ac_help="$ac_help - --enable-xpctools Build JS profiling tool (needs mozilla/js/src/xpconnect/tools)" + --enable-js-ultrasparc Use UltraSPARC optimizations in JS" ac_help="$ac_help --disable-debug Disable building with debug info" ac_help="$ac_help @@ -144,8 +151,6 @@ ac_help="$ac_help ac_help="$ac_help --enable-debugger-info-modules Enable/disable debugger info for specific modules" -ac_help="$ac_help - --disable-dtd-debug Disable DTD debugging code in the parser" ac_help="$ac_help --enable-boehm Enable the Boehm Garbage Collector" ac_help="$ac_help @@ -167,12 +172,16 @@ ac_help="$ac_help --with-wrap-malloc=DIR Location of malloc wrapper library" ac_help="$ac_help --enable-efence Link with Electric Fence" +ac_help="$ac_help + --enable-jprof Enable jprof profiling tool (needs mozilla/tools/jprof)" ac_help="$ac_help --enable-strip Enable stripping of libs & executables " ac_help="$ac_help --enable-elf-dynstr-gc Enable elf dynstr garbage collector (opt builds only)" ac_help="$ac_help - --enable-old-abi-compat-wrappers Support old GCC ABI symbols to ease the pain of the linux compiler change" + --enable-old-abi-compat-wrappers + Support old GCC ABI symbols to ease the pain + of the linux compiler change" ac_help="$ac_help --enable-prebinding Enable prebinding (Mac OS X only)" ac_help="$ac_help @@ -831,7 +840,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:835: checking host system type" >&5 +echo "configure:844: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -852,7 +861,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:856: checking target system type" >&5 +echo "configure:865: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -870,7 +879,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:874: checking build system type" >&5 +echo "configure:883: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -987,14 +996,14 @@ if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then _SAVE_LDFLAGS="$LDFLAGS" echo $ac_n "checking for host c compiler""... $ac_c" 1>&6 -echo "configure:991: checking for host c compiler" >&5 +echo "configure:1000: checking for host c compiler" >&5 if test -z "$HOST_CC"; then for ac_prog in gcc cc /usr/ucb/cc cl icc 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:998: checking for $ac_word" >&5 +echo "configure:1007: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1030,14 +1039,14 @@ test -n "$HOST_CC" || HOST_CC="""" fi echo "$ac_t""$HOST_CC" 1>&6 echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6 -echo "configure:1034: checking for host c++ compiler" >&5 +echo "configure:1043: checking for host c++ compiler" >&5 if test -z "$HOST_CXX"; then for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl icc 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:1041: checking for $ac_word" >&5 +echo "configure:1050: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1086,7 +1095,7 @@ test -n "$HOST_CXX" || HOST_CXX="""" # 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:1090: checking for $ac_word" >&5 +echo "configure:1099: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1118,7 +1127,7 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1122: checking for $ac_word" >&5 +echo "configure:1131: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1151,16 +1160,16 @@ fi LDFLAGS="$HOST_LDFLAGS" echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1155: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1164: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6 else @@ -1175,16 +1184,16 @@ rm -f conftest* CFLAGS="$HOST_CXXFLAGS" echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1179: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1188: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6 else @@ -1205,7 +1214,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:1209: checking for $ac_word" >&5 +echo "configure:1218: 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 @@ -1240,7 +1249,7 @@ test -n "$CC" || CC=":" # 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:1244: checking for $ac_word" >&5 +echo "configure:1253: 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 @@ -1270,7 +1279,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:1274: checking for $ac_word" >&5 +echo "configure:1283: 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 @@ -1321,7 +1330,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:1325: checking for $ac_word" >&5 +echo "configure:1334: 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 @@ -1353,7 +1362,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1357: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1366: 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. @@ -1364,12 +1373,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1368 "configure" +#line 1377 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1382: \"$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 @@ -1395,12 +1404,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:1399: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1408: 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:1404: checking whether we are using GNU C" >&5 +echo "configure:1413: 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 @@ -1409,7 +1418,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1413: \"$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:1422: \"$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 @@ -1428,7 +1437,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:1432: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1441: 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 @@ -1465,7 +1474,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:1469: checking for $ac_word" >&5 +echo "configure:1478: 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 @@ -1502,7 +1511,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:1506: checking for $ac_word" >&5 +echo "configure:1515: 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 @@ -1534,7 +1543,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1538: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1547: 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. @@ -1545,12 +1554,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1549 "configure" +#line 1558 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1563: \"$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 @@ -1576,12 +1585,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:1580: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1589: 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:1585: checking whether we are using GNU C++" >&5 +echo "configure:1594: 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 @@ -1590,7 +1599,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1594: \"$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:1603: \"$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 @@ -1609,7 +1618,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:1613: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1622: 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 @@ -1646,7 +1655,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:1650: checking for $ac_word" >&5 +echo "configure:1659: 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 @@ -1683,7 +1692,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:1687: checking for $ac_word" >&5 +echo "configure:1696: 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 @@ -1720,7 +1729,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:1724: checking for $ac_word" >&5 +echo "configure:1733: 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 @@ -1763,7 +1772,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:1767: checking for $ac_word" >&5 +echo "configure:1776: 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 @@ -1800,7 +1809,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:1804: checking for $ac_word" >&5 +echo "configure:1813: 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 @@ -1837,7 +1846,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:1841: checking for $ac_word" >&5 +echo "configure:1850: 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 @@ -1876,7 +1885,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:1880: checking for $ac_word" >&5 +echo "configure:1889: 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 @@ -1906,7 +1915,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:1910: checking for $ac_word" >&5 +echo "configure:1919: 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 @@ -1957,7 +1966,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:1961: checking for $ac_word" >&5 +echo "configure:1970: 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 @@ -1989,7 +1998,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1993: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2002: 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. @@ -2000,12 +2009,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2004 "configure" +#line 2013 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2018: \"$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 @@ -2031,12 +2040,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:2035: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2044: 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:2040: checking whether we are using GNU C" >&5 +echo "configure:2049: 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 @@ -2045,7 +2054,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2049: \"$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:2058: \"$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 @@ -2064,7 +2073,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:2068: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2077: 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 @@ -2100,7 +2109,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:2104: checking for $ac_word" >&5 +echo "configure:2113: 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 @@ -2132,7 +2141,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2136: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2145: 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. @@ -2143,12 +2152,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2147 "configure" +#line 2156 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2161: \"$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 @@ -2174,12 +2183,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:2178: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2187: 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:2183: checking whether we are using GNU C++" >&5 +echo "configure:2192: 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 @@ -2188,7 +2197,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2192: \"$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:2201: \"$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 @@ -2207,7 +2216,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:2211: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2220: 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 @@ -2241,7 +2250,7 @@ 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:2245: checking for $ac_word" >&5 +echo "configure:2254: 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 @@ -2273,7 +2282,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:2277: checking for $ac_word" >&5 +echo "configure:2286: 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 @@ -2314,7 +2323,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:2318: checking for $ac_word" >&5 +echo "configure:2327: 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 @@ -2349,7 +2358,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:2353: checking for $ac_word" >&5 +echo "configure:2362: 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 @@ -2384,7 +2393,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:2388: checking for $ac_word" >&5 +echo "configure:2397: 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 @@ -2419,7 +2428,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:2423: checking for $ac_word" >&5 +echo "configure:2432: 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 @@ -2503,7 +2512,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:2507: checking for $ac_word" >&5 +echo "configure:2516: 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 @@ -2545,14 +2554,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:2556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2570,14 +2579,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() { cout << "Hello World" << endl; ; return 0; } EOF -if { (eval echo configure:2581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2636,7 +2645,7 @@ if test -n "$_WIN32_MSVC"; then SKIP_COMPILER_CHECKS=1 SKIP_LIBRARY_CHECKS=1 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2640: checking how to run the C preprocessor" >&5 +echo "configure:2649: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2651,13 +2660,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:2661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2670: \"$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 : @@ -2668,13 +2677,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:2678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2687: \"$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 : @@ -2685,13 +2694,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:2695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2704: \"$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 : @@ -2719,17 +2728,17 @@ for ac_hdr in mmintrin.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2723: checking for $ac_hdr" >&5 +echo "configure:2732: 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:2733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2742: \"$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* @@ -2760,10 +2769,10 @@ fi 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:2764: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:2773: 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:2767: checking whether cc understands -c and -o together" >&5 +echo "configure:2776: 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]/_/'`" @@ -2775,16 +2784,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:2779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:2788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2789: \"$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:2785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2794: \"$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:2787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:2796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -2826,7 +2835,7 @@ fi if test -z "$SKIP_PATH_CHECKS"; then echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2830: checking how to run the C preprocessor" >&5 +echo "configure:2839: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2841,13 +2850,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:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2858,13 +2867,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:2868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2877: \"$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 : @@ -2875,13 +2884,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:2885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2894: \"$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 : @@ -2906,7 +2915,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2910: checking how to run the C++ preprocessor" >&5 +echo "configure:2919: 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 @@ -2919,12 +2928,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:2928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2937: \"$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 : @@ -2960,7 +2969,7 @@ echo "$ac_t""$CXXCPP" 1>&6 # 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:2964: checking for a BSD compatible install" >&5 +echo "configure:2973: 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 @@ -3013,7 +3022,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:3017: checking whether ln -s works" >&5 +echo "configure:3026: 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 @@ -3038,7 +3047,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:3042: checking for $ac_word" >&5 +echo "configure:3051: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3072,7 +3081,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:3076: checking for $ac_word" >&5 +echo "configure:3085: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3106,7 +3115,7 @@ if test -z "$PERL" || test "$PERL" = ":"; then fi echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 -echo "configure:3110: checking for minimum required perl version >= $PERL_VERSION" >&5 +echo "configure:3119: 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 @@ -3116,7 +3125,7 @@ if test "$_perl_res" != 0; then fi echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 -echo "configure:3120: checking for full perl installation" >&5 +echo "configure:3129: 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 @@ -3129,7 +3138,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:3133: checking for $ac_word" >&5 +echo "configure:3142: 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 @@ -3165,7 +3174,7 @@ fi # Extract the first word of "whoami", so it can be a program name with args. set dummy whoami; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3169: checking for $ac_word" >&5 +echo "configure:3178: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3201,7 +3210,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:3205: checking for $ac_word" >&5 +echo "configure:3214: 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 @@ -3237,7 +3246,7 @@ fi # Extract the first word of "unzip", so it can be a program name with args. set dummy unzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3241: checking for $ac_word" >&5 +echo "configure:3250: 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 @@ -3275,7 +3284,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:3279: checking for $ac_word" >&5 +echo "configure:3288: 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 @@ -3316,7 +3325,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:3320: checking for $ac_word" >&5 +echo "configure:3329: 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 @@ -3351,7 +3360,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:3355: checking for $ac_word" >&5 +echo "configure:3364: 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 @@ -3392,7 +3401,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:3396: checking for $ac_word" >&5 +echo "configure:3405: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3455,7 +3464,7 @@ fi # 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:3459: checking for X" >&5 +echo "configure:3468: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3517,12 +3526,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:3526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3535: \"$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* @@ -3591,14 +3600,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:3611: \"$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. @@ -3704,17 +3713,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:3708: checking whether -R must be followed by a space" >&5 +echo "configure:3717: 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:3727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -3730,14 +3739,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:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -3769,7 +3778,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:3773: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3782: 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 @@ -3777,7 +3786,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:3801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3810,7 +3819,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:3814: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3823: 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 @@ -3818,7 +3827,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:3842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3858,12 +3867,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:3862: checking for gethostbyname" >&5 +echo "configure:3871: 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:3899: \"$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 @@ -3907,7 +3916,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3911: checking for gethostbyname in -lnsl" >&5 +echo "configure:3920: 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 @@ -3915,7 +3924,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:3939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3956,12 +3965,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:3960: checking for connect" >&5 +echo "configure:3969: 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:3997: \"$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 @@ -4005,7 +4014,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4009: checking for connect in -lsocket" >&5 +echo "configure:4018: 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 @@ -4013,7 +4022,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:4037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4048,12 +4057,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:4052: checking for remove" >&5 +echo "configure:4061: 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:4089: \"$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 @@ -4097,7 +4106,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4101: checking for remove in -lposix" >&5 +echo "configure:4110: 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 @@ -4105,7 +4114,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:4129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4140,12 +4149,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4144: checking for shmat" >&5 +echo "configure:4153: 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:4181: \"$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 @@ -4189,7 +4198,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4193: checking for shmat in -lipc" >&5 +echo "configure:4202: 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 @@ -4197,7 +4206,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:4221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4241,7 +4250,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:4245: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4254: 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 @@ -4249,7 +4258,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:4273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4517,7 +4526,7 @@ MKSHLIB_FORCE_ALL= MKSHLIB_UNFORCE_ALL= if test "$GNU_CC"; then echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 -echo "configure:4521: checking whether ld has archive extraction flags" >&5 +echo "configure:4530: 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 @@ -4534,14 +4543,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:4554: \"$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 @@ -4640,7 +4649,7 @@ EOF TK_LIBS='-lbe -lroot' LIBS="$LIBS -lbe" echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 -echo "configure:4644: checking for main in -lbind" >&5 +echo "configure:4653: checking for main in -lbind" >&5 ac_lib_var=`echo bind'_'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 @@ -4648,14 +4657,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5505,7 +5514,7 @@ case "$target" in ;; *-darwin*) echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 -echo "configure:5509: checking for -exported_symbols_list option to ld" >&5 +echo "configure:5518: checking for -exported_symbols_list option to ld" >&5 if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5541,12 +5550,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 ANSI C header files""... $ac_c" 1>&6 -echo "configure:5545: checking for ANSI C header files" >&5 +echo "configure:5554: 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 @@ -5554,7 +5563,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5567: \"$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* @@ -5571,7 +5580,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 @@ -5589,7 +5598,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 @@ -5610,7 +5619,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5621,7 +5630,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:5625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5645,12 +5654,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5649: checking for working const" >&5 +echo "configure:5658: 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:5712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5720,12 +5729,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:5724: checking for mode_t" >&5 +echo "configure:5733: 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 @@ -5753,12 +5762,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:5757: checking for off_t" >&5 +echo "configure:5766: 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 @@ -5786,12 +5795,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:5790: checking for pid_t" >&5 +echo "configure:5799: 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 @@ -5819,12 +5828,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5823: checking for size_t" >&5 +echo "configure:5832: 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 @@ -5852,12 +5861,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5856: checking for uid_t in sys/types.h" >&5 +echo "configure:5865: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -5886,12 +5895,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:5890: checking for st_blksize in struct stat" >&5 +echo "configure:5899: 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 @@ -5899,7 +5908,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:5903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -5920,12 +5929,12 @@ EOF fi echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 -echo "configure:5924: checking for siginfo_t" >&5 +echo "configure:5933: 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 < @@ -5933,7 +5942,7 @@ int main() { siginfo_t* info; ; return 0; } EOF -if { (eval echo configure:5937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_siginfo_t=true else @@ -5967,12 +5976,12 @@ EOF fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:5971: checking for int16_t" >&5 +echo "configure:5980: 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 @@ -5980,7 +5989,7 @@ int main() { int16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:5984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int16_t=true else @@ -6002,12 +6011,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:6006: checking for int32_t" >&5 +echo "configure:6015: 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 @@ -6015,7 +6024,7 @@ int main() { int32_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int32_t=true else @@ -6037,12 +6046,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:6041: checking for int64_t" >&5 +echo "configure:6050: 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 @@ -6050,7 +6059,7 @@ int main() { int64_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64_t=true else @@ -6072,12 +6081,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64""... $ac_c" 1>&6 -echo "configure:6076: checking for int64" >&5 +echo "configure:6085: 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 @@ -6085,7 +6094,7 @@ int main() { int64 foo = 0; ; return 0; } EOF -if { (eval echo configure:6089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64=true else @@ -6107,12 +6116,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:6111: checking for uint" >&5 +echo "configure:6120: 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 @@ -6120,7 +6129,7 @@ int main() { uint foo = 0; ; return 0; } EOF -if { (eval echo configure:6124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint=true else @@ -6142,12 +6151,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 -echo "configure:6146: checking for uint_t" >&5 +echo "configure:6155: 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 @@ -6155,7 +6164,7 @@ int main() { uint_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint_t=true else @@ -6177,12 +6186,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:6181: checking for uint16_t" >&5 +echo "configure:6190: 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 @@ -6190,7 +6199,7 @@ int main() { uint16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint16_t=true else @@ -6221,12 +6230,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 -echo "configure:6225: checking for uname.domainname" >&5 +echo "configure:6234: 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() { @@ -6234,7 +6243,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->domainname; } ; return 0; } EOF -if { (eval echo configure:6238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_domainname_field=true else @@ -6258,12 +6267,12 @@ else fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 -echo "configure:6262: checking for uname.__domainname" >&5 +echo "configure:6271: 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() { @@ -6271,7 +6280,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->__domainname; } ; return 0; } EOF -if { (eval echo configure:6275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_us_domainname_field=true else @@ -6303,17 +6312,17 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 -echo "configure:6307: checking for 64-bit OS" >&5 +echo "configure:6316: checking for 64-bit OS" >&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:6326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -6343,7 +6352,7 @@ fi echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 -echo "configure:6347: checking for usable wchar_t (2 bytes, unsigned)" >&5 +echo "configure:6356: checking for usable wchar_t (2 bytes, unsigned)" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6351,14 +6360,14 @@ else ac_cv_have_usable_wchar="maybe" else cat > conftest.$ac_ext < int main () { return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ; } EOF -if { (eval echo configure:6362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_have_usable_wchar="yes" else @@ -6393,7 +6402,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGS -fshort-wchar" echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 -echo "configure:6397: checking for compiler -fshort-wchar option" >&5 +echo "configure:6406: checking for compiler -fshort-wchar option" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6401,7 +6410,7 @@ else ac_cv_have_usable_wchar_option="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:6424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_have_usable_wchar_option="yes" else @@ -6454,19 +6463,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:6458: checking for wcrtomb" >&5 +echo "configure:6467: 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:6470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_wcrtomb="yes" else @@ -6486,19 +6495,19 @@ EOF fi echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 -echo "configure:6490: checking for mbrtowc" >&5 +echo "configure:6499: 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:6502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_mbrtowc="yes" else @@ -6530,12 +6539,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:6534: checking for $ac_hdr that defines DIR" >&5 +echo "configure:6543: 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> @@ -6543,7 +6552,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:6547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -6568,7 +6577,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:6572: checking for opendir in -ldir" >&5 +echo "configure:6581: 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 @@ -6576,7 +6585,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:6600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6609,7 +6618,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:6613: checking for opendir in -lx" >&5 +echo "configure:6622: 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 @@ -6617,7 +6626,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:6641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6663,17 +6672,17 @@ for ac_hdr in sys/byteorder.h compat.h getopt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6667: checking for $ac_hdr" >&5 +echo "configure:6676: 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:6677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6686: \"$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* @@ -6703,17 +6712,17 @@ for ac_hdr in sys/bitypes.h memory.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6707: checking for $ac_hdr" >&5 +echo "configure:6716: 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:6717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6726: \"$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* @@ -6743,17 +6752,17 @@ for ac_hdr in gnu/libc-version.h nl_types.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6747: checking for $ac_hdr" >&5 +echo "configure:6756: 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:6757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6766: \"$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* @@ -6783,17 +6792,17 @@ for ac_hdr in malloc.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6787: checking for $ac_hdr" >&5 +echo "configure:6796: 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:6797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6806: \"$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* @@ -6823,17 +6832,17 @@ for ac_hdr in X11/XKBlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6827: checking for $ac_hdr" >&5 +echo "configure:6836: 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:6837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6846: \"$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* @@ -6864,17 +6873,17 @@ for ac_hdr in sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6868: checking for $ac_hdr" >&5 +echo "configure:6877: 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:6878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6887: \"$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* @@ -6905,17 +6914,17 @@ for ac_hdr in mmintrin.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6909: checking for $ac_hdr" >&5 +echo "configure:6918: 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:6919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6928: \"$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* @@ -6952,17 +6961,17 @@ 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:6956: checking for new" >&5 +echo "configure:6965: 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 < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6975: \"$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* @@ -7003,17 +7012,17 @@ 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:7007: checking for $ac_hdr" >&5 +echo "configure:7016: 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:7017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7026: \"$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* @@ -7047,7 +7056,7 @@ case $target in ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:7051: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:7060: 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 @@ -7055,7 +7064,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:7079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7096,7 +7105,7 @@ fi ;; esac echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 -echo "configure:7100: checking for atan in -lm" >&5 +echo "configure:7109: checking for atan in -lm" >&5 ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7104,7 +7113,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7149,7 +7158,7 @@ case $target in ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7153: checking for dlopen in -ldl" >&5 +echo "configure:7162: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7157,7 +7166,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7202,7 +7211,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:7206: checking for demangle in -lC_r" >&5 +echo "configure:7215: 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 @@ -7210,7 +7219,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:7234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7251,7 +7260,7 @@ fi ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:7255: checking for demangle in -lC" >&5 +echo "configure:7264: 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 @@ -7259,7 +7268,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:7283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7301,7 +7310,7 @@ fi esac fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:7305: checking for socket in -lsocket" >&5 +echo "configure:7314: 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 @@ -7309,7 +7318,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:7333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7365,7 +7374,7 @@ EOF _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:7369: checking for XDrawLines in -lX11" >&5 +echo "configure:7378: 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 @@ -7373,7 +7382,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:7397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7406,7 +7415,7 @@ MISSING_X="$MISSING_X -lX11" fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:7410: checking for XextAddDisplay in -lXext" >&5 +echo "configure:7419: 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 @@ -7414,7 +7423,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:7438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7449,7 +7458,7 @@ fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:7453: checking for XtFree in -lXt" >&5 +echo "configure:7462: 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 @@ -7457,7 +7466,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:7481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7489,7 +7498,7 @@ else unset ac_cv_lib_Xt_XtFree echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:7493: checking for IceFlush in -lICE" >&5 +echo "configure:7502: 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 @@ -7497,7 +7506,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:7521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7529,7 +7538,7 @@ else fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:7533: checking for SmcCloseConnection in -lSM" >&5 +echo "configure:7542: 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 @@ -7537,7 +7546,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:7561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7569,7 +7578,7 @@ else fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:7573: checking for XtFree in -lXt" >&5 +echo "configure:7582: 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 @@ -7577,7 +7586,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:7601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7623,7 +7632,7 @@ fi echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 -echo "configure:7627: checking for XineramaIsActive in -lXinerama" >&5 +echo "configure:7636: checking for XineramaIsActive in -lXinerama" >&5 ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7631,7 +7640,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7664,17 +7673,17 @@ fi ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6 -echo "configure:7668: checking for X11/extensions/Xinerama.h" >&5 +echo "configure:7677: checking for X11/extensions/Xinerama.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7687: \"$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* @@ -7697,7 +7706,7 @@ fi echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 -echo "configure:7701: checking for XShmCreateImage in -lXext" >&5 +echo "configure:7710: 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 @@ -7705,7 +7714,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:7729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7738,17 +7747,17 @@ fi ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 -echo "configure:7742: checking for X11/extensions/XShm.h" >&5 +echo "configure:7751: checking for X11/extensions/XShm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7761: \"$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* @@ -7778,7 +7787,7 @@ EOF fi echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 -echo "configure:7782: checking for XieFloGeometry in -lXIE" >&5 +echo "configure:7791: checking for XieFloGeometry in -lXIE" >&5 ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7786,7 +7795,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7819,17 +7828,17 @@ fi ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 -echo "configure:7823: checking for X11/extensions/XIElib.h" >&5 +echo "configure:7832: checking for X11/extensions/XIElib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7842: \"$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* @@ -7866,7 +7875,7 @@ fi _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $XCFLAGS" cat > conftest.$ac_ext < @@ -7882,7 +7891,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7901,7 +7910,7 @@ fi # $no_x echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:7905: checking for pthread_create in -lpthreads" >&5 +echo "configure:7914: checking for pthread_create in -lpthreads" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -7923,7 +7932,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:7927: checking for pthread_create in -lpthread" >&5 +echo "configure:7936: checking for pthread_create in -lpthread" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -7945,7 +7954,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:7949: checking for pthread_create in -lc_r" >&5 +echo "configure:7958: checking for pthread_create in -lc_r" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -7967,7 +7976,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:7971: checking for pthread_create in -lc" >&5 +echo "configure:7980: checking for pthread_create in -lc" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -8023,7 +8032,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:8027: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:8036: 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 @@ -8046,7 +8055,7 @@ echo "configure:8027: 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:8050: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:8059: 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 @@ -8186,7 +8195,7 @@ esac echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 -echo "configure:8190: checking whether mmap() sees write()s" >&5 +echo "configure:8199: checking whether mmap() sees write()s" >&5 mmap_test_prog=' @@ -8225,11 +8234,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:8242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -8254,13 +8263,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:8258: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:8267: 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 @@ -8278,7 +8287,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -8300,7 +8309,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:8304: checking for 8-bit clean memcmp" >&5 +echo "configure:8313: 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 @@ -8308,7 +8317,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:8331: \"$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 @@ -8338,12 +8347,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 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8342: checking for $ac_func" >&5 +echo "configure:8351: 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:8379: \"$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 @@ -8393,12 +8402,12 @@ done for ac_func in nl_langinfo flockfile do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8397: checking for $ac_func" >&5 +echo "configure:8406: 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:8434: \"$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 @@ -8450,12 +8459,12 @@ if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "10 for ac_func in localtime_r strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8454: checking for $ac_func" >&5 +echo "configure:8463: 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:8491: \"$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 @@ -8505,12 +8514,12 @@ done fi echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 -echo "configure:8509: checking for res_ninit()" >&5 +echo "configure:8518: 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:8535: \"$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 @@ -8552,12 +8561,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:8556: checking for gnu_get_libc_version()" >&5 +echo "configure:8565: 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:8581: \"$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 @@ -8597,7 +8606,7 @@ case $target_os in *) echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:8601: checking for iconv in -liconv" >&5 +echo "configure:8610: 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 @@ -8605,7 +8614,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:8632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8638,7 +8647,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:8642: checking for libiconv in -liconv" >&5 +echo "configure:8651: 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 @@ -8646,7 +8655,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:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8685,12 +8694,12 @@ fi _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" echo $ac_n "checking for iconv()""... $ac_c" 1>&6 -echo "configure:8689: checking for iconv()" >&5 +echo "configure:8698: 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 < @@ -8704,7 +8713,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_iconv=yes else @@ -8727,12 +8736,12 @@ EOF XPCOM_LIBS="$XPCOM_LIBS $_ICONV_LIBS" LIBICONV="$_ICONV_LIBS" echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 -echo "configure:8731: checking for iconv() with const input" >&5 +echo "configure:8740: 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 < @@ -8747,7 +8756,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_const_iconv=yes else @@ -8783,7 +8792,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 -echo "configure:8787: checking for an implementation of va_copy()" >&5 +echo "configure:8796: 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 @@ -8793,7 +8802,7 @@ else else cat > conftest.$ac_ext < @@ -8807,7 +8816,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:8811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8820: \"$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 @@ -8824,7 +8833,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:8828: checking for an implementation of __va_copy()" >&5 +echo "configure:8837: 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 @@ -8834,7 +8843,7 @@ else else cat > conftest.$ac_ext < @@ -8848,7 +8857,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:8852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8861: \"$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 @@ -8865,7 +8874,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:8869: checking whether va_lists can be copied by value" >&5 +echo "configure:8878: 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 @@ -8875,7 +8884,7 @@ else else cat > conftest.$ac_ext < @@ -8889,7 +8898,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:8893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8902: \"$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 @@ -8985,7 +8994,7 @@ esac if test "$GNU_CXX"; then echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 -echo "configure:8989: checking for C++ exceptions flag" >&5 +echo "configure:8998: checking for C++ exceptions flag" >&5 if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9020,12 +9029,12 @@ cross_compiling=$ac_cv_prog_cxx_cross HAVE_GCC3_ABI= if test "$GNU_CC"; then echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 -echo "configure:9024: checking for gcc 3.0 ABI" >&5 +echo "configure:9033: 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:9051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_three_abi="yes" else @@ -9059,12 +9068,12 @@ fi echo $ac_n "checking for ios::binary""... $ac_c" 1>&6 -echo "configure:9063: checking for ios::binary" >&5 +echo "configure:9072: checking for ios::binary" >&5 if eval "test \"`echo '$''{'ac_cv_ios_binary'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -9073,7 +9082,7 @@ char *buffer = "config.log"; fstream *mFileStream=new fstream(buffer, ios::binary); ; return 0; } EOF -if { (eval echo configure:9077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ios_binary=true else @@ -9097,12 +9106,12 @@ fi echo $ac_n "checking for ios::bin""... $ac_c" 1>&6 -echo "configure:9101: checking for ios::bin" >&5 +echo "configure:9110: checking for ios::bin" >&5 if eval "test \"`echo '$''{'ac_cv_ios_bin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -9111,7 +9120,7 @@ char *buffer = "config.log"; fstream *mFileStream=new fstream(buffer, ios::bin); ; return 0; } EOF -if { (eval echo configure:9115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ios_bin=true else @@ -9134,12 +9143,12 @@ else fi echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 -echo "configure:9138: checking for C++ \"explicit\" keyword" >&5 +echo "configure:9147: 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:9162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else @@ -9170,12 +9179,12 @@ EOF fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 -echo "configure:9174: checking for modern C++ template specialization syntax support" >&5 +echo "configure:9183: 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 {}; @@ -9185,7 +9194,7 @@ X int_x; X y_x; ; return 0; } EOF -if { (eval echo configure:9189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else @@ -9207,12 +9216,12 @@ fi echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 -echo "configure:9211: checking whether partial template specialization works" >&5 +echo "configure:9220: 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 {}; @@ -9220,7 +9229,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:9224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_partial_specialization=yes else @@ -9241,12 +9250,12 @@ EOF fi echo $ac_n "checking for extern explicit template instantiation""... $ac_c" 1>&6 -echo "configure:9245: checking for extern explicit template instantiation" >&5 +echo "configure:9254: checking for extern explicit template instantiation" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_extern_instantiation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class Foo{ T a; }; extern template class Foo; @@ -9254,7 +9263,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_extern_instantiation=yes else @@ -9276,12 +9285,12 @@ fi echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 -echo "configure:9280: checking whether operators must be re-defined for templates derived from templates" >&5 +echo "configure:9289: 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 @@ -9293,7 +9302,7 @@ Derived a, b; return 0; ; return 0; } EOF -if { (eval echo configure:9297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_derived_template_operators=no else @@ -9315,12 +9324,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:9319: checking whether we need to cast a derived template to pass as its base class" >&5 +echo "configure:9328: 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 { }; @@ -9329,7 +9338,7 @@ int main() { Derived bar; return foo(bar); ; return 0; } EOF -if { (eval echo configure:9333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_cpp_template_cast_to_base=no else @@ -9350,12 +9359,12 @@ EOF fi echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 -echo "configure:9354: checking whether the compiler can resolve const ambiguities for templates" >&5 +echo "configure:9363: 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 { @@ -9376,7 +9385,7 @@ int main() { a(&i); ; return 0; } EOF -if { (eval echo configure:9380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_can_resolve_const_ambiguity=yes else @@ -9398,36 +9407,51 @@ fi echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 -echo "configure:9402: checking whether the C++ \"using\" keyword can change access" >&5 -if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using'+set}'`\" = set"; then +echo "configure:9411: 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:9424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_cpp_access_changing_using=yes + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cpp_access_changing_using2=no else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_cpp_access_changing_using=no + ac_cv_cpp_access_changing_using2=yes +fi +rm -f conftest* +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cpp_access_changing_using2=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_cpp_access_changing_using" 1>&6 -if test "$ac_cv_cpp_access_changing_using" = yes ; then +echo "$ac_t""$ac_cv_cpp_access_changing_using2" 1>&6 +if test "$ac_cv_cpp_access_changing_using2" = yes ; then cat >> confdefs.h <<\EOF #define HAVE_CPP_ACCESS_CHANGING_USING 1 EOF @@ -9435,12 +9459,12 @@ EOF fi echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 -echo "configure:9439: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 +echo "configure:9463: 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:9484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_ambiguity_resolving_using=yes else @@ -9477,19 +9501,19 @@ EOF fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 -echo "configure:9481: checking for \"std::\" namespace" >&5 +echo "configure:9505: 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:9493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespace_std=yes else @@ -9510,12 +9534,12 @@ EOF fi echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 -echo "configure:9514: checking whether standard template operator!=() is ambiguous" >&5 +echo "configure:9538: 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 {}; @@ -9525,7 +9549,7 @@ int main() { T1 a,b; return a != b; ; return 0; } EOF -if { (eval echo configure:9529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_unambiguous_std_notequal=unambiguous else @@ -9547,12 +9571,12 @@ fi echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 -echo "configure:9551: checking for C++ reinterpret_cast" >&5 +echo "configure:9575: 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:9564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else @@ -9581,7 +9605,7 @@ EOF fi echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 -echo "configure:9585: checking for C++ dynamic_cast to void*" >&5 +echo "configure:9609: 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 @@ -9589,7 +9613,7 @@ else ac_cv_cpp_dynamic_cast_void_ptr=no else cat > conftest.$ac_ext <(suby)))); } EOF -if { (eval echo configure:9612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9636: \"$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 @@ -9632,19 +9656,19 @@ fi echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 -echo "configure:9636: checking whether C++ requires implementation of unused virtual methods" >&5 +echo "configure:9660: 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:9672: \"$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 @@ -9667,12 +9691,12 @@ fi echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 -echo "configure:9671: checking for trouble comparing to zero near std::operator!=()" >&5 +echo "configure:9695: 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 {}; @@ -9683,7 +9707,7 @@ int main() { Foo f; return (0 != f); ; return 0; } EOF -if { (eval echo configure:9687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_trouble_comparing_to_zero=no else @@ -9715,19 +9739,19 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:9719: checking for LC_MESSAGES" >&5 +echo "configure:9743: 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:9731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_i18n_lc_messages=yes else @@ -9803,7 +9827,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:9807: checking for $ac_word" >&5 +echo "configure:9831: 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 @@ -9838,7 +9862,7 @@ fi min_nspr_version=4.0.0 echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 -echo "configure:9842: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 +echo "configure:9866: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 no_nspr="" if test "$NSPR_CONFIG" = "no"; then @@ -9905,7 +9929,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:9909: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:9933: 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 @@ -9913,7 +9937,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:9952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9953,7 +9977,7 @@ if test "$SYSTEM_JPEG" = 1; then SYSTEM_JPEG= else cat > conftest.$ac_ext < #include @@ -9967,7 +9991,7 @@ else } EOF -if { (eval echo configure:9971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else @@ -10008,7 +10032,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:10012: checking for gzread in -lz" >&5 +echo "configure:10036: 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 @@ -10016,7 +10040,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:10055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10055,7 +10079,7 @@ if test "$SYSTEM_ZLIB" = 1; then SYSTEM_ZLIB= else cat > conftest.$ac_ext < @@ -10076,7 +10100,7 @@ else } EOF -if { (eval echo configure:10080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_ZLIB=1 else @@ -10119,7 +10143,7 @@ if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then SYSTEM_PNG= else echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:10123: checking for png_get_valid in -lpng" >&5 +echo "configure:10147: 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 @@ -10127,7 +10151,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:10166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10166,7 +10190,7 @@ if test "$SYSTEM_PNG" = 1; then SYSTEM_PNG= else cat > conftest.$ac_ext < #include @@ -10180,7 +10204,7 @@ else } EOF -if { (eval echo configure:10184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else @@ -10223,7 +10247,7 @@ if test -z "$MNG_DIR" -o "$MNG_DIR" = no; then SYSTEM_MNG= else echo $ac_n "checking for mng_initialize in -lmng""... $ac_c" 1>&6 -echo "configure:10227: checking for mng_initialize in -lmng" >&5 +echo "configure:10251: checking for mng_initialize in -lmng" >&5 ac_lib_var=`echo mng'_'mng_initialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10231,7 +10255,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmng $MNG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10270,7 +10294,7 @@ if test "$SYSTEM_MNG" = 1; then SYSTEM_MNG= else cat > conftest.$ac_ext < #include @@ -10284,7 +10308,7 @@ else } EOF -if { (eval echo configure:10288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_MNG=1 else @@ -10465,7 +10489,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:10469: checking for $ac_word" >&5 +echo "configure:10493: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10500,7 +10524,7 @@ fi min_gtk_version=$GTK_VERSION echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:10504: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:10528: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -10523,7 +10547,7 @@ echo "configure:10504: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -10601,7 +10625,7 @@ main () } EOF -if { (eval echo configure:10605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -10636,7 +10660,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -10646,7 +10670,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:10650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10674: \"$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 GTK or finding the wrong" @@ -10698,7 +10722,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:10702: checking for $ac_word" >&5 +echo "configure:10726: 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 @@ -10742,19 +10766,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 >= 1.3.7""... $ac_c" 1>&6 -echo "configure:10746: checking for gtk+-2.0 >= 1.3.7" >&5 +echo "configure:10770: checking for gtk+-2.0 >= 1.3.7" >&5 if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 -echo "configure:10753: checking MOZ_GTK2_CFLAGS" >&5 +echo "configure:10777: checking MOZ_GTK2_CFLAGS" >&5 MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 -echo "configure:10758: checking MOZ_GTK2_LIBS" >&5 +echo "configure:10782: checking MOZ_GTK2_LIBS" >&5 MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"` echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 else @@ -10860,7 +10884,7 @@ if test "${enable_ldap+set}" = set; then if test "$enableval" = "no"; then MOZ_LDAP_XPCOM= elif test "$enableval" = "yes"; then - : + MOZ_LDAP_XPCOM=1 else { echo "configure: error: Option, ldap, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -10887,9 +10911,9 @@ fi if test "${enable_freetype2+set}" = set; then enableval="$enable_freetype2" if test "$enableval" = "no"; then - _NO_FREETYPE2=1 + _NO_FREETYPE2=1 elif test "$enableval" = "yes"; then - : + _NO_FREETYPE2= else { echo "configure: error: Option, freetype2, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -10941,7 +10965,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:10945: checking for $ac_word" >&5 +echo "configure:10969: 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 @@ -10977,7 +11001,7 @@ fi min_ft_version=6.1.0 echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 -echo "configure:10981: checking for FreeType - version >= $min_ft_version" >&5 +echo "configure:11005: checking for FreeType - version >= $min_ft_version" >&5 no_ft="" if test "$FT2_CONFIG" = "no" ; then no_ft=yes @@ -11025,7 +11049,7 @@ else echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -11051,7 +11075,7 @@ main() } EOF -if { (eval echo configure:11055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -11102,13 +11126,8 @@ if test "${enable_xft+set}" = set; then enableval="$enable_xft" if test "$enableval" = "yes"; then MOZ_ENABLE_XFT=1 - cat >> confdefs.h <<\EOF -#define MOZ_ENABLE_XFT 1 -EOF - - elif test "$enableval" = "no"; then - : + MOZ_ENABLE_XFT= else { echo "configure: error: Option, xft, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11117,6 +11136,10 @@ fi if test "$MOZ_ENABLE_XFT" then + cat >> confdefs.h <<\EOF +#define MOZ_ENABLE_XFT 1 +EOF + succeeded=no @@ -11124,7 +11147,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:11128: checking for $ac_word" >&5 +echo "configure:11151: 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 @@ -11168,19 +11191,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 xft""... $ac_c" 1>&6 -echo "configure:11172: checking for xft" >&5 +echo "configure:11195: checking for xft" >&5 if $PKG_CONFIG --exists "xft" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 -echo "configure:11179: checking MOZ_XFT_CFLAGS" >&5 +echo "configure:11202: checking MOZ_XFT_CFLAGS" >&5 MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"` echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6 echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6 -echo "configure:11184: checking MOZ_XFT_LIBS" >&5 +echo "configure:11207: checking MOZ_XFT_LIBS" >&5 MOZ_XFT_LIBS=`$PKG_CONFIG --libs "xft"` echo "$ac_t""$MOZ_XFT_LIBS" 1>&6 else @@ -11214,7 +11237,7 @@ echo "configure:11184: checking MOZ_XFT_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:11218: checking for $ac_word" >&5 +echo "configure:11241: 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 @@ -11258,19 +11281,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 >= 1.1.0""... $ac_c" 1>&6 -echo "configure:11262: checking for pango >= 1.1.0" >&5 +echo "configure:11285: checking for pango >= 1.1.0" >&5 if $PKG_CONFIG --exists "pango >= 1.1.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 -echo "configure:11269: checking _PANGOCHK_CFLAGS" >&5 +echo "configure:11292: checking _PANGOCHK_CFLAGS" >&5 _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 -echo "configure:11274: checking _PANGOCHK_LIBS" >&5 +echo "configure:11297: checking _PANGOCHK_LIBS" >&5 _PANGOCHK_LIBS=`$PKG_CONFIG --libs "pango >= 1.1.0"` echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 else @@ -11303,7 +11326,7 @@ fi -MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS:-1} +MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-1} if test "$MOZ_ENABLE_COREXFONTS" then cat >> confdefs.h <<\EOF @@ -11334,7 +11357,7 @@ then _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 -echo "configure:11338: checking for XpGetPrinterList in -lXp" >&5 +echo "configure:11361: checking for XpGetPrinterList in -lXp" >&5 ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11342,7 +11365,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11435,7 +11458,7 @@ if test "${enable_jsd+set}" = set; then if test "$enableval" = "no"; then MOZ_JSDEBUGGER= elif test "$enableval" = "yes"; then - : + MOZ_JSDEBUGGER=1 else { echo "configure: error: Option, jsd, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11447,22 +11470,24 @@ fi if test "${enable_xinerama+set}" = set; then enableval="$enable_xinerama" if test "$enableval" = "yes"; then - if test -n "$MOZ_XINERAMA_LIBS" && \ - test -n "$ac_cv_header_X11_extensions_Xinerama_h"; then - MOZ_ENABLE_XINERAMA=1 - cat >> confdefs.h <<\EOF -#define MOZ_ENABLE_XINERAMA 1 -EOF - -fi + _ENABLE_XINERAMA=1 elif test "$enableval" = "no"; then - : + _ENABLE_XINERAMA= else { echo "configure: error: Option, xinerama, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$_ENABLE_XINERAMA" -a -n "$MOZ_XINERAMA_LIBS" -a \ + -n "$ac_cv_header_X11_extensions_Xinerama_h"; then + MOZ_ENABLE_XINERAMA=1 + cat >> confdefs.h <<\EOF +#define MOZ_ENABLE_XINERAMA 1 +EOF + +fi + IBMBIDI=1 cat >> confdefs.h <<\EOF #define IBMBIDI 1 @@ -11488,9 +11513,9 @@ ACCESSIBILITY=1 if test "${enable_accessibility+set}" = set; then enableval="$enable_accessibility" if test "$enableval" = "no"; then - ACCESSIBILITY= + ACCESSIBILITY= elif test "$enableval" = "yes"; then - : + ACCESSIBILITY=1 else { echo "configure: error: Option, accessibility, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11508,9 +11533,9 @@ MOZ_XPFE_COMPONENTS=1 if test "${enable_xpfe_components+set}" = set; then enableval="$enable_xpfe_components" if test "$enableval" = "no"; then - MOZ_XPFE_COMPONENTS= + MOZ_XPFE_COMPONENTS= elif test "$enableval" = "yes"; then - : + MOZ_XPFE_COMPONENTS=1 else { echo "configure: error: Option, xpfe-components, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11522,9 +11547,9 @@ MOZ_XPINSTALL=1 if test "${enable_xpinstall+set}" = set; then enableval="$enable_xpinstall" if test "$enableval" = "no"; then - MOZ_XPINSTALL= + MOZ_XPINSTALL= elif test "$enableval" = "yes"; then - : + MOZ_XPINSTALL=1 else { echo "configure: error: Option, xpinstall, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11556,9 +11581,9 @@ MOZ_JSLOADER=1 if test "${enable_jsloader+set}" = set; then enableval="$enable_jsloader" if test "$enableval" = "no"; then - MOZ_JSLOADER= + MOZ_JSLOADER= elif test "$enableval" = "yes"; then - : + MOZ_JSLOADER=1 else { echo "configure: error: Option, jsloader, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11576,9 +11601,9 @@ MOZ_USE_NATIVE_UCONV= if test "${enable_native_uconv+set}" = set; then enableval="$enable_native_uconv" if test "$enableval" = "yes"; then - MOZ_USE_NATIVE_UCONV=1 + MOZ_USE_NATIVE_UCONV=1 elif test "$enableval" = "no"; then - : + MOZ_USE_NATIVE_UCONV= else { echo "configure: error: Option, native-uconv, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11597,9 +11622,9 @@ MOZ_PLAINTEXT_EDITOR_ONLY= if test "${enable_plaintext_editor_only+set}" = set; then enableval="$enable_plaintext_editor_only" if test "$enableval" = "yes"; then - MOZ_PLAINTEXT_EDITOR_ONLY=1 + MOZ_PLAINTEXT_EDITOR_ONLY=1 elif test "$enableval" = "no"; then - : + MOZ_PLAINTEXT_EDITOR_ONLY= else { echo "configure: error: Option, plaintext-editor-only, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11612,9 +11637,9 @@ MOZ_COMPOSER=1 if test "${enable_composer+set}" = set; then enableval="$enable_composer" if test "$enableval" = "no"; then - MOZ_COMPOSER= + MOZ_COMPOSER= elif test "$enableval" = "yes"; then - : + MOZ_COMPOSER=1 else { echo "configure: error: Option, composer, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11720,7 +11745,7 @@ if test "${enable_ldap_experimental+set}" = set; then if test "$enableval" = "yes"; then MOZ_LDAP_XPCOM_EXPERIMENTAL=1 elif test "$enableval" = "no"; then - : + MOZ_LDAP_XPCOM_EXPERIMENTAL= else { echo "configure: error: Option, ldap-experimental, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11732,9 +11757,9 @@ MOZ_MATHML=1 if test "${enable_mathml+set}" = set; then enableval="$enable_mathml" if test "$enableval" = "no"; then - MOZ_MATHML= + MOZ_MATHML= elif test "$enableval" = "yes"; then - : + MOZ_MATHML=1 else { echo "configure: error: Option, mathml, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11752,17 +11777,19 @@ if test "${enable_svg+set}" = set; then enableval="$enable_svg" if test "$enableval" = "yes"; then MOZ_SVG=1 - cat >> confdefs.h <<\EOF -#define MOZ_SVG 1 -EOF - elif test "$enableval" = "no"; then - : + MOZ_SVG= else { echo "configure: error: Option, svg, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$MOZ_SVG"; then + cat >> confdefs.h <<\EOF +#define MOZ_SVG 1 +EOF + +fi # Check whether --enable-svg-renderer-gdiplus or --disable-svg-renderer-gdiplus was given. @@ -11770,10 +11797,7 @@ if test "${enable_svg_renderer_gdiplus+set}" = set; then enableval="$enable_svg_renderer_gdiplus" if test "$enableval" = "yes"; then MOZ_SVG_RENDERER_GDIPLUS=1 - cat >> confdefs.h <<\EOF -#define MOZ_SVG_RENDERER_GDIPLUS 1 -EOF - + MOZ_SVG_RENDERER_GDIPLUS= elif test "$enableval" = "no"; then : else @@ -11781,6 +11805,12 @@ EOF fi fi +if test -n "MOZ_SVG_RENDERER_GDIPLUS"; then + cat >> confdefs.h <<\EOF +#define MOZ_SVG_RENDERER_GDIPLUS 1 +EOF + +fi # Check whether --enable-svg-renderer-libart or --disable-svg-renderer-libart was given. @@ -11788,10 +11818,7 @@ if test "${enable_svg_renderer_libart+set}" = set; then enableval="$enable_svg_renderer_libart" if test "$enableval" = "yes"; then MOZ_SVG_RENDERER_LIBART=1 - cat >> confdefs.h <<\EOF -#define MOZ_SVG_RENDERER_LIBART 1 -EOF - + MOZ_SVG_RENDERER_LIBART= elif test "$enableval" = "no"; then : else @@ -11799,6 +11826,12 @@ EOF fi fi +if test -n "MOZ_SVG_RENDERER_LIBART"; then + cat >> confdefs.h <<\EOF +#define MOZ_SVG_RENDERER_LIBART 1 +EOF + +fi if test "$TX_EXE"; then @@ -11826,6 +11859,10 @@ if test "${enable_installer+set}" = set; then fi fi +# Automatically disable installer if xpinstall isn't built +if test -z "$MOZ_XPINSTALL"; then + MOZ_INSTALLER= +fi MOZ_NO_ACTIVEX_SUPPORT=1 @@ -11874,14 +11911,42 @@ then fi +# Check whether --enable-leaky or --disable-leaky was given. +if test "${enable_leaky+set}" = set; then + enableval="$enable_leaky" + if test "$enableval" = "yes"; then + MOZ_LEAKY=1 + elif test "$enableval" = "no"; then + MOZ_LEAKY= + else + { echo "configure: error: Option, leaky, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + + + +# Check whether --enable-xpctools or --disable-xpctools was given. +if test "${enable_xpctools+set}" = set; then + enableval="$enable_xpctools" + if test "$enableval" = "yes"; then + MOZ_XPCTOOLS=1 + elif test "$enableval" = "no"; then + MOZ_XPCTOOLS= + else + { echo "configure: error: Option, xpctools, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + + + ENABLE_TESTS=1 # Check whether --enable-tests or --disable-tests was given. if test "${enable_tests+set}" = set; then enableval="$enable_tests" if test "$enableval" = "no"; then - ENABLE_TESTS= + ENABLE_TESTS= elif test "$enableval" = "yes"; then - : + ENABLE_TESTS=1 else { echo "configure: error: Option, tests, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -11894,86 +11959,40 @@ fi if test "${enable_xpcom_lea+set}" = set; then enableval="$enable_xpcom_lea" if test "$enableval" = "yes"; then - XPCOM_USE_LEA=1 - cat >> confdefs.h <<\EOF -#define XPCOM_USE_LEA 1 -EOF - + XPCOM_USE_LEA=1 elif test "$enableval" = "no"; then - : + XPCOM_USE_LEA= else { echo "configure: error: Option, xpcom-lea, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$XPCOM_USE_LEA"; then + cat >> confdefs.h <<\EOF +#define XPCOM_USE_LEA 1 +EOF + +fi # Check whether --enable-js-ultrasparc or --disable-js-ultrasparc was given. if test "${enable_js_ultrasparc+set}" = set; then enableval="$enable_js_ultrasparc" if test "$enableval" = "yes"; then - case "$target_os" in - solaris*) - case $OS_TEST in - sun4u) - JS_ULTRASPARC_OPTS=1 - ;; - esac - ;; -esac - + JS_ULTRASPARC_OPTS=1 elif test "$enableval" = "no"; then - : + JS_ULTRASPARC_OPTS= else { echo "configure: error: Option, js-ultrasparc, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi - -# Features that require extra sources - -# Check whether --enable-leaky or --disable-leaky was given. -if test "${enable_leaky+set}" = set; then - enableval="$enable_leaky" - if test "$enableval" = "yes"; then - MOZ_LEAKY=1 - elif test "$enableval" = "no"; then - : - else - { echo "configure: error: Option, leaky, does not take an argument ($enableval)." 1>&2; exit 1; } - fi +if test `echo "$target_os" | grep -c \^solaris 2>/dev/null` = 0 -o \ + "$OS_TEST" != "sun4u"; then + JS_ULTRASPARC_OPTS= fi -# Check whether --enable-jprof or --disable-jprof was given. -if test "${enable_jprof+set}" = set; then - enableval="$enable_jprof" - if test "$enableval" = "yes"; then - MOZ_JPROF=1 - cat >> confdefs.h <<\EOF -#define MOZ_JPROF 1 -EOF - - elif test "$enableval" = "no"; then - : - else - { echo "configure: error: Option, jprof, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - - -# Check whether --enable-xpctools or --disable-xpctools was given. -if test "${enable_xpctools+set}" = set; then - enableval="$enable_xpctools" - if test "$enableval" = "yes"; then - MOZ_XPCTOOLS=1 - elif test "$enableval" = "no"; then - : - else - { echo "configure: error: Option, xpctools, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - # Debugging and Optimizations @@ -12077,40 +12096,24 @@ if test "${enable_debugger_info_modules+set}" = set; then fi -MOZ_DISABLE_DTD_DEBUG= -# Check whether --enable-dtd-debug or --disable-dtd-debug was given. -if test "${enable_dtd_debug+set}" = set; then - enableval="$enable_dtd_debug" - if test "$enableval" = "no"; then - MOZ_DISABLE_DTD_DEBUG=1 - cat >> confdefs.h <<\EOF -#define MOZ_DISABLE_DTD_DEBUG 1 -EOF - - elif test "$enableval" = "yes"; then - : - else - { echo "configure: error: Option, dtd-debug, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - - # Check whether --enable-boehm or --disable-boehm was given. if test "${enable_boehm+set}" = set; then enableval="$enable_boehm" if test "$enableval" = "yes"; then - cat >> confdefs.h <<\EOF -#define GC_LEAK_DETECTOR 1 -EOF - GC_LEAK_DETECTOR=1 elif test "$enableval" = "no"; then - : + GC_LEAK_DETECTOR= else { echo "configure: error: Option, boehm, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$GC_LEAK_DETECTOR"; then + cat >> confdefs.h <<\EOF +#define GC_LEAK_DETECTOR 1 +EOF + +fi # Check whether --enable-logging or --disable-logging was given. if test "${enable_logging+set}" = set; then @@ -12118,7 +12121,7 @@ if test "${enable_logging+set}" = set; then if test "$enableval" = "no"; then NS_DISABLE_LOGGING=1 elif test "$enableval" = "yes"; then - : + NS_DISABLE_LOGGING= else { echo "configure: error: Option, logging, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -12140,62 +12143,74 @@ fi if test "${enable_crash_on_assert+set}" = set; then enableval="$enable_crash_on_assert" if test "$enableval" = "yes"; then - cat >> confdefs.h <<\EOF -#define UNIX_CRASH_ON_ASSERT 1 -EOF - + _CRASH_ON_ASSERT=1 elif test "$enableval" = "no"; then - : + _CRASH_ON_ASSERT= else { echo "configure: error: Option, crash-on-assert, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test "$_CRASH_ON_ASSERT"; then + cat >> confdefs.h <<\EOF +#define UNIX_CRASH_ON_ASSERT 1 +EOF + +fi MOZ_REORDER= # Check whether --enable-reorder or --disable-reorder was given. if test "${enable_reorder+set}" = set; then enableval="$enable_reorder" if test "$enableval" = "yes"; then - if test -z "$GNU_LD"; then - echo "configure: warning: Reordering only works with GNU ld. Not reordering." 1>&2 -else - MOZ_REORDER=1 -fi + _ENABLE_REORDER=1 elif test "$enableval" = "no"; then - : + _ENABLE_REORDER= else { echo "configure: error: Option, reorder, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$_ENABLE_REORDER"; then + if test -z "$GNU_LD"; then + echo "configure: warning: Reordering only works with GNU ld. Not reordering." 1>&2 + else + MOZ_REORDER=1 + fi +fi +_ENABLE_LOGREFCNT=42 # Check whether --enable-logrefcnt or --disable-logrefcnt was given. if test "${enable_logrefcnt+set}" = set; then enableval="$enable_logrefcnt" if test "$enableval" = "yes"; then - cat >> confdefs.h <<\EOF -#define FORCE_BUILD_REFCNT_LOGGING 1 -EOF - + _ENABLE_LOGREFCNT=1 elif test "$enableval" = "no"; then - cat >> confdefs.h <<\EOF -#define NO_BUILD_REFCNT_LOGGING 1 -EOF - + _ENABLE_LOGREFCNT= else { echo "configure: error: Option, logrefcnt, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test "$_ENABLE_LOGREFCNT" = "1"; then + cat >> confdefs.h <<\EOF +#define FORCE_BUILD_REFCNT_LOGGING 1 +EOF + +elif test -z "$_ENABLE_LOGREFCNT"; then + cat >> confdefs.h <<\EOF +#define NO_BUILD_REFCNT_LOGGING 1 +EOF + +fi # Check whether --enable-detect-webshell-leaks or --disable-detect-webshell-leaks was given. if test "${enable_detect_webshell_leaks+set}" = set; then enableval="$enable_detect_webshell_leaks" if test "$enableval" = "yes"; then - _DETECT_WEBSHELL_LEAKS=1 + _DETECT_WEBSHELL_LEAKS=1 elif test "$enableval" = "no"; then - : + _DETECT_WEBSHELL_LEAKS= else { echo "configure: error: Option, detect-webshell-leaks, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -12218,18 +12233,22 @@ fi if test "${enable_wrap_malloc+set}" = set; then enableval="$enable_wrap_malloc" if test "$enableval" = "yes"; then - if test "$GNU_CC"; then - WRAP_MALLOC_CFLAGS="${LDFLAGS} -Wl,--wrap -Wl,malloc -Wl,--wrap -Wl,free -Wl,--wrap -Wl,realloc -Wl,--wrap -Wl,__builtin_new -Wl,--wrap -Wl,__builtin_vec_new -Wl,--wrap -Wl,__builtin_delete -Wl,--wrap -Wl,__builtin_vec_delete -Wl,--wrap -Wl,PR_Free -Wl,--wrap -Wl,PR_Malloc -Wl,--wrap -Wl,PR_Calloc -Wl,--wrap -Wl,PR_Realloc" - MKSHLIB='$(CXX) $(DSO_LDOPTS) $(WRAP_MALLOC_CFLAGS) -o $@' -fi + _WRAP_MALLOC=1 elif test "$enableval" = "no"; then - : + _WRAP_MALLOC= else { echo "configure: error: Option, wrap-malloc, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$_WRAP_MALLOC"; then + if test "$GNU_CC"; then + WRAP_MALLOC_CFLAGS="${LDFLAGS} -Wl,--wrap -Wl,malloc -Wl,--wrap -Wl,free -Wl,--wrap -Wl,realloc -Wl,--wrap -Wl,__builtin_new -Wl,--wrap -Wl,__builtin_vec_new -Wl,--wrap -Wl,__builtin_delete -Wl,--wrap -Wl,__builtin_vec_delete -Wl,--wrap -Wl,PR_Free -Wl,--wrap -Wl,PR_Malloc -Wl,--wrap -Wl,PR_Calloc -Wl,--wrap -Wl,PR_Realloc" + MKSHLIB='$(CXX) $(DSO_LDOPTS) $(WRAP_MALLOC_CFLAGS) -o $@' + fi +fi + # Check whether --with-wrap-malloc or --without-wrap-malloc was given. if test "${with_wrap_malloc+set}" = set; then withval="$with_wrap_malloc" @@ -12241,8 +12260,17 @@ fi if test "${enable_efence+set}" = set; then enableval="$enable_efence" if test "$enableval" = "yes"; then + _ENABLE_EFENCE=1 + elif test "$enableval" = "no"; then + _ENABLE_EFENCE= + else + { echo "configure: error: Option, efence, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + +if test -n "$_ENABLE_EFENCE"; then echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 -echo "configure:12246: checking for malloc in -lefence" >&5 +echo "configure:12274: checking for malloc in -lefence" >&5 ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12250,7 +12278,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lefence $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12276,7 +12304,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo efence | sed -e 's/^a-zA-Z0-9_/_/g' \ + ac_tr_lib=HAVE_LIB`echo efence | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 fi +fi + +# Check whether --enable-jprof or --disable-jprof was given. +if test "${enable_jprof+set}" = set; then + enableval="$enable_jprof" + if test "$enableval" = "yes"; then + MOZ_JPROF=1 elif test "$enableval" = "no"; then - : + MOZ_JPROF= else - { echo "configure: error: Option, efence, does not take an argument ($enableval)." 1>&2; exit 1; } + { echo "configure: error: Option, jprof, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$MOZ_JPROF"; then + cat >> confdefs.h <<\EOF +#define MOZ_JPROF 1 +EOF + +fi + # Check whether --enable-strip or --disable-strip was given. if test "${enable_strip+set}" = set; then @@ -12302,7 +12344,7 @@ if test "${enable_strip+set}" = set; then if test "$enableval" = "yes"; then ENABLE_STRIP=1 elif test "$enableval" = "no"; then - : + ENABLE_STRIP= else { echo "configure: error: Option, strip, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -12347,12 +12389,12 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12351: checking for $ac_func" >&5 +echo "configure:12393: 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:12424: \"$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 @@ -12435,18 +12477,20 @@ MOZ_TIMELINE= if test "${enable_timeline+set}" = set; then enableval="$enable_timeline" if test "$enableval" = "yes"; then - cat >> confdefs.h <<\EOF -#define MOZ_TIMELINE 1 -EOF - MOZ_TIMELINE=1 elif test "$enableval" = "no"; then - : + MOZ_TIMELINE= else { echo "configure: error: Option, timeline, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$MOZ_TIMELINE"; then + cat >> confdefs.h <<\EOF +#define MOZ_TIMELINE 1 +EOF + +fi MOZ_REFLOW_PERF= # Check whether --enable-reflow-perf or --disable-reflow-perf was given. @@ -12454,17 +12498,19 @@ if test "${enable_reflow_perf+set}" = set; then enableval="$enable_reflow_perf" if test "$enableval" = "yes"; then MOZ_REFLOW_PERF=1 - cat >> confdefs.h <<\EOF -#define MOZ_REFLOW_PREF 1 -EOF - elif test "$enableval" = "no"; then - : + MOZ_REFLOW_PERF= else { echo "configure: error: Option, reflow-perf, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$MOZ_REFLOW_PREF"; then + cat >> confdefs.h <<\EOF +#define MOZ_REFLOW_PREF 1 +EOF + +fi # Check whether --enable-perf-metrics or --disable-perf-metrics was given. @@ -12472,43 +12518,48 @@ if test "${enable_perf_metrics+set}" = set; then enableval="$enable_perf_metrics" if test "$enableval" = "yes"; then MOZ_PERF_METRICS=1 - cat >> confdefs.h <<\EOF -#define MOZ_PERF_METRICS 1 -EOF - elif test "$enableval" = "no"; then - : + MOZ_PERF_METRICS= else { echo "configure: error: Option, perf-metrics, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$MOZ_PERF_METRICS"; then + cat >> confdefs.h <<\EOF +#define MOZ_PERF_METRICS 1 +EOF + +fi # Check whether --enable-codesighs or --disable-codesighs was given. if test "${enable_codesighs+set}" = set; then enableval="$enable_codesighs" if test "$enableval" = "yes"; then - if test -d $srcdir/tools/codesighs; then - MOZ_MAPINFO=1 -else - { echo "configure: error: Codesighs directory ./tools/codesighs required." 1>&2; exit 1; } -fi + _ENABLE_CODESIGHS=1 elif test "$enableval" = "no"; then - : + _ENABLE_CODESIGHS= else { echo "configure: error: Option, codesighs, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$_ENABLE_CODESIGHS"; then + if test -d $srcdir/tools/codesighs; then + MOZ_MAPINFO=1 + else + { echo "configure: error: Codesighs directory $srcdir/tools/codesighs required." 1>&2; exit 1; } + fi +fi NS_TRACE_MALLOC=${MOZ_TRACE_MALLOC} # Check whether --enable-trace-malloc or --disable-trace-malloc was given. if test "${enable_trace_malloc+set}" = set; then enableval="$enable_trace_malloc" if test "$enableval" = "yes"; then - NS_TRACE_MALLOC=1 + NS_TRACE_MALLOC=1 elif test "$enableval" = "no"; then - : + NS_TRACE_MALLOC= else { echo "configure: error: Option, trace-malloc, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -12530,6 +12581,14 @@ if test "${enable_eazel_profiler_support+set}" = set; then enableval="$enable_eazel_profiler_support" if test "$enableval" = "yes"; then ENABLE_EAZEL_PROFILER=1 + elif test "$enableval" = "no"; then + ENABLE_EAZEL_PROFILER= + else + { echo "configure: error: Option, eazel-profiler-support, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + +if test -n "$ENABLE_EAZEL_PROFILER"; then cat >> confdefs.h <<\EOF #define ENABLE_EAZEL_PROFILER 1 EOF @@ -12538,14 +12597,8 @@ EOF MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS= EAZEL_PROFILER_CFLAGS="-g -O -gdwarf-2 -finstrument-functions -D__NO_STRING_INLINES -D__NO_MATH_INLINES" EAZEL_PROFILER_LIBS="-lprofiler -lpthread" - elif test "$enableval" = "no"; then - : - else - { echo "configure: error: Option, eazel-profiler-support, does not take an argument ($enableval)." 1>&2; exit 1; } - fi fi - # Check whether --enable-profile-modules or --disable-profile-modules was given. if test "${enable_profile_modules+set}" = set; then enableval="$enable_profile_modules" @@ -12557,14 +12610,20 @@ fi if test "${enable_insure+set}" = set; then enableval="$enable_insure" if test "$enableval" = "yes"; then - MOZ_INSURE="insure" MOZ_INSURIFYING=1 MOZ_INSURE_DIRS="." MOZ_INSURE_EXCLUDE_DIRS="config" + _ENABLE_INSURE=1 elif test "$enableval" = "no"; then - : + _ENABLE_INSURE= else { echo "configure: error: Option, insure, does not take an argument ($enableval)." 1>&2; exit 1; } fi fi +if test -n "$_ENABLE_INSURE"; then + MOZ_INSURE="insure" + MOZ_INSURIFYING=1 + MOZ_INSURE_DIRS="." + MOZ_INSURE_EXCLUDE_DIRS="config" +fi # Check whether --with-insure-dirs or --without-insure-dirs was given. if test "${with_insure_dirs+set}" = set; then @@ -12582,7 +12641,7 @@ fi if test -z "$SKIP_LIBRARY_CHECKS"; then echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6 -echo "configure:12586: checking for cplus_demangle in -liberty" >&5 +echo "configure:12645: checking for cplus_demangle in -liberty" >&5 ac_lib_var=`echo iberty'_'cplus_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 @@ -12590,7 +12649,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liberty "-liberty" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12668,7 +12727,7 @@ if test "${enable_xterm_updates+set}" = set; then if test "$enableval" = "yes"; then MOZ_UPDATE_XTERM=1 elif test "$enableval" = "no"; then - : + MOZ_UPDATE_XTERM= else { echo "configure: error: Option, xterm-updates, does not take an argument ($enableval)." 1>&2; exit 1; } fi @@ -12754,7 +12813,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then # Compiler Options echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 -echo "configure:12758: checking for gcc -pipe support" >&5 +echo "configure:12817: checking for gcc -pipe support" >&5 if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then echo '#include ' > dummy-hello.c echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c @@ -12769,14 +12828,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -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:12780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -12825,12 +12884,12 @@ if test "$_PEDANTIC"; then _SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 -echo "configure:12829: checking whether C++ compiler has -pedantic long long bug" >&5 +echo "configure:12888: checking whether C++ compiler has -pedantic long long bug" >&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:12902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="no" else @@ -12871,12 +12930,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:12875: checking for correct overload resolution with const and templates" >&5 +echo "configure:12934: 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 < @@ -12906,7 +12965,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_nscap_nonconst_opeq_bug="no" else @@ -12946,16 +13005,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 -echo "configure:12950: checking whether compiler supports -Wno-long-long" >&5 +echo "configure:13009: checking whether compiler supports -Wno-long-long" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" @@ -13180,7 +13239,7 @@ case "$target" in # Extract the first word of "makeC++SharedLib_r", so it can be a program name with args. set dummy makeC++SharedLib_r; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13184: checking for $ac_word" >&5 +echo "configure:13243: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13282,7 +13341,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:13286: checking for $ac_word" >&5 +echo "configure:13345: 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 @@ -13326,19 +13385,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:13330: checking for libIDL-2.0 >= 0.8.0" >&5 +echo "configure:13389: 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 LIBIDL_CFLAGS""... $ac_c" 1>&6 -echo "configure:13337: checking LIBIDL_CFLAGS" >&5 +echo "configure:13396: checking LIBIDL_CFLAGS" >&5 LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 -echo "configure:13342: checking LIBIDL_LIBS" >&5 +echo "configure:13401: checking LIBIDL_LIBS" >&5 LIBIDL_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"` echo "$ac_t""$LIBIDL_LIBS" 1>&6 else @@ -13458,7 +13517,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:13462: checking for $ac_word" >&5 +echo "configure:13521: 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 @@ -13493,7 +13552,7 @@ fi min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:13497: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:13556: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -13516,7 +13575,7 @@ echo "configure:13497: checking for GLIB - version >= $min_glib_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -13592,7 +13651,7 @@ main () } EOF -if { (eval echo configure:13596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -13626,7 +13685,7 @@ fi CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -13636,7 +13695,7 @@ int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:13640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13699: \"$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" @@ -13680,7 +13739,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:13684: checking for $ac_word" >&5 +echo "configure:13743: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13715,7 +13774,7 @@ fi min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:13719: checking for libIDL - version >= $min_libIDL_version" >&5 +echo "configure:13778: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes @@ -13742,7 +13801,7 @@ echo "configure:13719: checking for libIDL - version >= $min_libIDL_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -13828,7 +13887,7 @@ main () } EOF -if { (eval echo configure:13832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -13862,7 +13921,7 @@ fi CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < @@ -13873,7 +13932,7 @@ int main() { return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:13877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13936: \"$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" @@ -13913,7 +13972,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:13917: checking for $ac_word" >&5 +echo "configure:13976: 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 @@ -14035,7 +14094,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:14039: checking for $ac_word" >&5 +echo "configure:14098: 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 @@ -14070,7 +14129,7 @@ fi min_glib_version=${GLIB_VERSION} echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:14074: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:14133: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -14093,7 +14152,7 @@ echo "configure:14074: checking for GLIB - version >= $min_glib_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -14169,7 +14228,7 @@ main () } EOF -if { (eval echo configure:14173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -14203,7 +14262,7 @@ fi CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -14213,7 +14272,7 @@ int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:14217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14276: \"$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" @@ -14357,14 +14416,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() { int x = 1; x++; ; return 0; } EOF -if { (eval echo configure:14368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -14597,7 +14656,6 @@ COMPILE_CXXFLAGS=`echo \ - cat >> confdefs.h <)], + Select default toolkit + Platform specific defaults: + BeOS - beos + Mac OS X - mac (carbon) + Neutrino/QNX - photon + OS/2 - os2 + Win32 - windows + * - gtk], [ _DEFAULT_TOOLKIT=$enableval ], [ _DEFAULT_TOOLKIT=$_PLATFORM_DEFAULT_TOOLKIT]) @@ -3199,7 +3210,8 @@ dnl ========================================================= MOZ_LDAP_XPCOM=1 MOZ_ARG_DISABLE_BOOL(ldap, [ --disable-ldap Disable LDAP support], - MOZ_LDAP_XPCOM=) + MOZ_LDAP_XPCOM=, + MOZ_LDAP_XPCOM=1) dnl ======================================================== dnl = Phoenix @@ -3219,7 +3231,8 @@ dnl = FreeType2 dnl ======================================================== MOZ_ARG_DISABLE_BOOL(freetype2, [ --disable-freetype2 Disable FreeType2 support ], - _NO_FREETYPE2=1 ) + _NO_FREETYPE2=1, + _NO_FREETYPE2= ) if test "$no_x" = "yes"; then _NO_FREETYPE2=1 @@ -3236,12 +3249,12 @@ dnl = Xft dnl ======================================================== MOZ_ARG_ENABLE_BOOL(xft, [ --enable-xft Enable Xft support ], - MOZ_ENABLE_XFT=1 - AC_DEFINE(MOZ_ENABLE_XFT) -) + MOZ_ENABLE_XFT=1, + MOZ_ENABLE_XFT= ) if test "$MOZ_ENABLE_XFT" then + AC_DEFINE(MOZ_ENABLE_XFT) PKG_CHECK_MODULES(MOZ_XFT, xft) if test "$MOZ_ENABLE_GTK2"; then PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0) @@ -3255,7 +3268,7 @@ AC_SUBST(MOZ_XFT_LIBS) dnl ======================================================== dnl = disabling x11 core support, enabled by default dnl ======================================================== -MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS:-1} +MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-1} if test "$MOZ_ENABLE_COREXFONTS" then AC_DEFINE(MOZ_ENABLE_COREXFONTS) @@ -3333,7 +3346,8 @@ dnl ======================================================== MOZ_JSDEBUGGER=1 MOZ_ARG_DISABLE_BOOL(jsd, [ --disable-jsd Disable JavaScript debug library], - MOZ_JSDEBUGGER=) + MOZ_JSDEBUGGER=, + MOZ_JSDEBUGGER=1) dnl ======================================================== @@ -3346,11 +3360,14 @@ dnl ======================================================== MOZ_ARG_ENABLE_BOOL(xinerama, [ --enable-xinerama Enable Xinerama support ( not safe for Red Hat 7.0 ) ], -[ if test -n "$MOZ_XINERAMA_LIBS" && \ - test -n "$ac_cv_header_X11_extensions_Xinerama_h"; then + _ENABLE_XINERAMA=1, + _ENABLE_XINERAMA= ) + +if test -n "$_ENABLE_XINERAMA" -a -n "$MOZ_XINERAMA_LIBS" -a \ + -n "$ac_cv_header_X11_extensions_Xinerama_h"; then MOZ_ENABLE_XINERAMA=1 AC_DEFINE(MOZ_ENABLE_XINERAMA) -fi ]) +fi dnl bi-directional support always on IBMBIDI=1 @@ -3371,7 +3388,8 @@ dnl ======================================================== ACCESSIBILITY=1 MOZ_ARG_DISABLE_BOOL(accessibility, [ --disable-accessibility Disable accessibility support], - ACCESSIBILITY= ) + ACCESSIBILITY=, + ACCESSIBILITY=1 ) if test "$ACCESSIBILITY"; then AC_DEFINE(ACCESSIBILITY) fi @@ -3381,16 +3399,19 @@ dnl xpfe/components on by default dnl ======================================================== MOZ_XPFE_COMPONENTS=1 MOZ_ARG_DISABLE_BOOL(xpfe-components, -[ --disable-xpfe-components Disable xpfe components], - MOZ_XPFE_COMPONENTS= ) +[ --disable-xpfe-components + Disable xpfe components], + MOZ_XPFE_COMPONENTS=, + MOZ_XPFE_COMPONENTS=1 ) dnl ======================================================== dnl xpinstall support on by default dnl ======================================================== MOZ_XPINSTALL=1 MOZ_ARG_DISABLE_BOOL(xpinstall, -[ --disable-xpinstall Disable xpinstall support], - MOZ_XPINSTALL= ) +[ --disable-xpinstall Disable xpinstall support], + MOZ_XPINSTALL=, + MOZ_XPINSTALL=1 ) if test "$MOZ_XPINSTALL"; then AC_DEFINE(MOZ_XPINSTALL) fi @@ -3409,8 +3430,9 @@ dnl xpcom js loader support on by default dnl ======================================================== MOZ_JSLOADER=1 MOZ_ARG_DISABLE_BOOL(jsloader, -[ --disable-jsloader Disable xpcom js loader support], - MOZ_JSLOADER= ) +[ --disable-jsloader Disable xpcom js loader support], + MOZ_JSLOADER=, + MOZ_JSLOADER=1 ) if test "$MOZ_JSLOADER"; then AC_DEFINE(MOZ_JSLOADER) fi @@ -3420,8 +3442,9 @@ dnl use native unicode converters dnl ======================================================== MOZ_USE_NATIVE_UCONV= MOZ_ARG_ENABLE_BOOL(native-uconv, -[ --enable-native-uconv enable iconv support], - MOZ_USE_NATIVE_UCONV=1 ) +[ --enable-native-uconv Enable iconv support], + MOZ_USE_NATIVE_UCONV=1, + MOZ_USE_NATIVE_UCONV= ) if test "$MOZ_USE_NATIVE_UCONV"; then AC_DEFINE(MOZ_USE_NATIVE_UCONV) fi @@ -3436,7 +3459,8 @@ MOZ_PLAINTEXT_EDITOR_ONLY= MOZ_ARG_ENABLE_BOOL(plaintext-editor-only, [ --enable-plaintext-editor-only Allow only plaintext editing], - MOZ_PLAINTEXT_EDITOR_ONLY=1 ) + MOZ_PLAINTEXT_EDITOR_ONLY=1, + MOZ_PLAINTEXT_EDITOR_ONLY= ) dnl Note the #define is MOZILLA, not MOZ, for compat with the Mac build. AC_SUBST(MOZ_PLAINTEXT_EDITOR_ONLY) @@ -3446,7 +3470,8 @@ dnl ======================================================== MOZ_COMPOSER=1 MOZ_ARG_DISABLE_BOOL(composer, [ --disable-composer Disable building of Composer], - MOZ_COMPOSER= ) + MOZ_COMPOSER=, + MOZ_COMPOSER=1 ) AC_SUBST(MOZ_COMPOSER) dnl ======================================================== @@ -3550,15 +3575,17 @@ dnl ======================================================== MOZ_ARG_ENABLE_BOOL(ldap-experimental, [ --enable-ldap-experimental Enable LDAP experimental features], - MOZ_LDAP_XPCOM_EXPERIMENTAL=1) + MOZ_LDAP_XPCOM_EXPERIMENTAL=1, + MOZ_LDAP_XPCOM_EXPERIMENTAL=) dnl ======================================================== dnl MathML on by default dnl ======================================================== MOZ_MATHML=1 MOZ_ARG_DISABLE_BOOL(mathml, -[ --disable-mathml Disable MathML], - MOZ_MATHML= ) +[ --disable-mathml Disable MathML support], + MOZ_MATHML=, + MOZ_MATHML=1 ) if test "$MOZ_MATHML"; then AC_DEFINE(MOZ_MATHML) fi @@ -3568,20 +3595,29 @@ dnl SVG dnl ======================================================== MOZ_ARG_ENABLE_BOOL(svg, [ --enable-svg Enable SVG ], - MOZ_SVG=1 - AC_DEFINE(MOZ_SVG)) + MOZ_SVG=1, + MOZ_SVG= ) +if test -n "$MOZ_SVG"; then + AC_DEFINE(MOZ_SVG) +fi AC_SUBST(MOZ_SVG) MOZ_ARG_ENABLE_BOOL(svg-renderer-gdiplus, [ --enable-svg-renderer-gdiplus Enable SVG gdi+ renderer ], MOZ_SVG_RENDERER_GDIPLUS=1 - AC_DEFINE(MOZ_SVG_RENDERER_GDIPLUS)) + MOZ_SVG_RENDERER_GDIPLUS= ) +if test -n "MOZ_SVG_RENDERER_GDIPLUS"; then + AC_DEFINE(MOZ_SVG_RENDERER_GDIPLUS) +fi AC_SUBST(MOZ_SVG_RENDERER_GDIPLUS) MOZ_ARG_ENABLE_BOOL(svg-renderer-libart, [ --enable-svg-renderer-libart Enable SVG libart renderer ], MOZ_SVG_RENDERER_LIBART=1 - AC_DEFINE(MOZ_SVG_RENDERER_LIBART)) + MOZ_SVG_RENDERER_LIBART= ) +if test -n "MOZ_SVG_RENDERER_LIBART"; then + AC_DEFINE(MOZ_SVG_RENDERER_LIBART) +fi AC_SUBST(MOZ_SVG_RENDERER_LIBART) dnl To build transformiix standalone, set TX_EXE while configuring @@ -3602,6 +3638,10 @@ MOZ_ARG_DISABLE_BOOL(installer, [ --disable-installer Disable building of installer], MOZ_INSTALLER=, MOZ_INSTALLER=1 ) +# Automatically disable installer if xpinstall isn't built +if test -z "$MOZ_XPINSTALL"; then + MOZ_INSTALLER= +fi AC_SUBST(MOZ_INSTALLER) dnl ======================================================== @@ -3626,7 +3666,8 @@ MOZ_ACTIVEX_SCRIPTING_SUPPORT= if test -n "$_WIN32_MSVC"; then MOZ_ARG_ENABLE_BOOL(activex-scripting, [ --enable-activex-scripting - Enable building of ActiveX scripting and plugin support (win32 only)], + Enable building of ActiveX scripting + and plugin support (win32 only)], MOZ_ACTIVEX_SCRIPTING_SUPPORT=1, MOZ_ACTIVEX_SCRIPTING_SUPPORT=) fi @@ -3638,13 +3679,32 @@ then fi +dnl ======================================================== +dnl leaky +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(leaky, +[ --enable-leaky Build leaky memory tool], + MOZ_LEAKY=1, + MOZ_LEAKY=) + + +dnl ======================================================== +dnl xpctools +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(xpctools, +[ --enable-xpctools Build JS profiling tool], + MOZ_XPCTOOLS=1, + MOZ_XPCTOOLS= ) + + dnl ======================================================== dnl build the tests by default dnl ======================================================== ENABLE_TESTS=1 MOZ_ARG_DISABLE_BOOL(tests, [ --disable-tests Do not build test libraries & programs], - ENABLE_TESTS= ) + ENABLE_TESTS=, + ENABLE_TESTS=1 ) dnl ======================================================== dnl = @@ -3657,25 +3717,26 @@ dnl ======================================================== dnl = Enable Lea malloc in xpcom. OFF by default. dnl ======================================================== MOZ_ARG_ENABLE_BOOL(xpcom-lea, -[ --enable-xpcom-lea Enable Lea malloc in xpcom ], -[ XPCOM_USE_LEA=1 - AC_DEFINE(XPCOM_USE_LEA)]) +[ --enable-xpcom-lea Use Lea malloc in xpcom ], + XPCOM_USE_LEA=1, + XPCOM_USE_LEA= ) +if test -n "$XPCOM_USE_LEA"; then + AC_DEFINE(XPCOM_USE_LEA) +fi dnl ======================================================== dnl = Enable Ultrasparc specific optimizations for JS dnl ======================================================== MOZ_ARG_ENABLE_BOOL(js-ultrasparc, -[ --enable-js-ultrasparc Enable UltraSPARC optimizations in JS], -[case "$target_os" in - solaris*) - case $OS_TEST in - sun4u) - JS_ULTRASPARC_OPTS=1 - ;; - esac - ;; -esac -]) +[ --enable-js-ultrasparc Use UltraSPARC optimizations in JS], + JS_ULTRASPARC_OPTS=1, + JS_ULTRASPARC_OPTS= ) + +dnl only enable option for ultrasparcs +if test `echo "$target_os" | grep -c \^solaris 2>/dev/null` = 0 -o \ + "$OS_TEST" != "sun4u"; then + JS_ULTRASPARC_OPTS= +fi AC_SUBST(JS_ULTRASPARC_OPTS) dnl ======================================================== @@ -3683,29 +3744,7 @@ dnl = dnl = Feature options that require extra sources to be pulled dnl = dnl ======================================================== -MOZ_ARG_HEADER(Features that require extra sources) - -dnl ======================================================== -dnl mozilla/tools/leaky not part of default build. -dnl ======================================================== -MOZ_ARG_ENABLE_BOOL(leaky, -[ --enable-leaky Enable leaky memory tool (needs mozilla/tools/leaky)], - MOZ_LEAKY=1) - -dnl ======================================================== -dnl mozilla/tools/jprof not part of default build. -dnl ======================================================== -MOZ_ARG_ENABLE_BOOL(jprof, -[ --enable-jprof Enable jprof profiling tool (needs mozilla/tools/jprof)], - MOZ_JPROF=1 - AC_DEFINE(MOZ_JPROF)) - -dnl ======================================================== -dnl mozilla/js/src/xpconnect/tools is not part of default build. -dnl ======================================================== -MOZ_ARG_ENABLE_BOOL(xpctools, -[ --enable-xpctools Build JS profiling tool (needs mozilla/js/src/xpconnect/tools)], - MOZ_XPCTOOLS=1) +dnl MOZ_ARG_HEADER(Features that require extra sources) dnl ======================================================== dnl = @@ -3817,31 +3856,24 @@ MOZ_ARG_ENABLE_STRING(debugger-info-modules, MOZ_DBGRINFO_MODULES="$i $MOZ_DBGRINFO_MODULES"; done ]) -dnl ======================================================== -dnl = Disable some DTD debugging code in the parser that -dnl = breaks on some compilers because of evil and broken -dnl = streams code in htmlparser/src/prstrm.cpp -dnl ======================================================== -MOZ_DISABLE_DTD_DEBUG= -MOZ_ARG_DISABLE_BOOL(dtd-debug, -[ --disable-dtd-debug Disable DTD debugging code in the parser], - MOZ_DISABLE_DTD_DEBUG=1 - AC_DEFINE(MOZ_DISABLE_DTD_DEBUG) ) - dnl ======================================================== dnl Enable garbage collector dnl ======================================================== MOZ_ARG_ENABLE_BOOL(boehm, [ --enable-boehm Enable the Boehm Garbage Collector], + GC_LEAK_DETECTOR=1, + GC_LEAK_DETECTOR= ) +if test -n "$GC_LEAK_DETECTOR"; then AC_DEFINE(GC_LEAK_DETECTOR) - GC_LEAK_DETECTOR=1) +fi dnl ======================================================== dnl Disable runtime logging checks dnl ======================================================== MOZ_ARG_DISABLE_BOOL(logging, [ --disable-logging Disable logging facilities], - NS_DISABLE_LOGGING=1) + NS_DISABLE_LOGGING=1, + NS_DISABLE_LOGGING= ) if test "$NS_DISABLE_LOGGING"; then AC_DEFINE(NS_DISABLE_LOGGING) else @@ -3854,7 +3886,11 @@ dnl ======================================================== MOZ_ARG_ENABLE_BOOL(crash-on-assert, [ --enable-crash-on-assert Make NS_ASSERTION crash on Unix], - AC_DEFINE(UNIX_CRASH_ON_ASSERT)) + _CRASH_ON_ASSERT=1, + _CRASH_ON_ASSERT= ) +if test "$_CRASH_ON_ASSERT"; then + AC_DEFINE(UNIX_CRASH_ON_ASSERT) +fi dnl ======================================================== dnl = Enable function reordering. Off by default @@ -3862,19 +3898,29 @@ dnl ======================================================== MOZ_REORDER= MOZ_ARG_ENABLE_BOOL(reorder, [ --enable-reorder Enable function reordering (requires GNU ld) ], -[ if test -z "$GNU_LD"; then - AC_MSG_WARN([Reordering only works with GNU ld. Not reordering.]) -else - MOZ_REORDER=1 -fi]) + _ENABLE_REORDER=1, + _ENABLE_REORDER= ) +if test -n "$_ENABLE_REORDER"; then + if test -z "$GNU_LD"; then + AC_MSG_WARN([Reordering only works with GNU ld. Not reordering.]) + else + MOZ_REORDER=1 + fi +fi dnl ======================================================== dnl = dnl This will enable logging of addref, release, ctor, dtor. dnl ======================================================== +_ENABLE_LOGREFCNT=42 MOZ_ARG_ENABLE_BOOL(logrefcnt, [ --enable-logrefcnt Enable logging of refcounts (default=debug) ], - AC_DEFINE(FORCE_BUILD_REFCNT_LOGGING), - AC_DEFINE(NO_BUILD_REFCNT_LOGGING)) + _ENABLE_LOGREFCNT=1, + _ENABLE_LOGREFCNT= ) +if test "$_ENABLE_LOGREFCNT" = "1"; then + AC_DEFINE(FORCE_BUILD_REFCNT_LOGGING) +elif test -z "$_ENABLE_LOGREFCNT"; then + AC_DEFINE(NO_BUILD_REFCNT_LOGGING) +fi dnl ======================================================== dnl = detect webshell leaks @@ -3883,7 +3929,8 @@ MOZ_ARG_ENABLE_BOOL(detect-webshell-leaks, [ --enable-detect-webshell-leaks Enable detection of webshell leaks (default=debug)], - _DETECT_WEBSHELL_LEAKS=1 , , + _DETECT_WEBSHELL_LEAKS=1, + _DETECT_WEBSHELL_LEAKS=, [ if test "$MOZ_DEBUG"; then _DETECT_WEBSHELL_LEAKS=1 fi]) @@ -3898,10 +3945,15 @@ dnl = Use malloc wrapper lib dnl ======================================================== MOZ_ARG_ENABLE_BOOL(wrap-malloc, [ --enable-wrap-malloc Wrap malloc calls (gnu linker only)], -[ if test "$GNU_CC"; then + _WRAP_MALLOC=1, + _WRAP_MALLOC= ) + +if test -n "$_WRAP_MALLOC"; then + if test "$GNU_CC"; then WRAP_MALLOC_CFLAGS="${LDFLAGS} -Wl,--wrap -Wl,malloc -Wl,--wrap -Wl,free -Wl,--wrap -Wl,realloc -Wl,--wrap -Wl,__builtin_new -Wl,--wrap -Wl,__builtin_vec_new -Wl,--wrap -Wl,__builtin_delete -Wl,--wrap -Wl,__builtin_vec_delete -Wl,--wrap -Wl,PR_Free -Wl,--wrap -Wl,PR_Malloc -Wl,--wrap -Wl,PR_Calloc -Wl,--wrap -Wl,PR_Realloc" MKSHLIB='$(CXX) $(DSO_LDOPTS) $(WRAP_MALLOC_CFLAGS) -o $@' -fi]) + fi +fi dnl ======================================================== dnl = Location of malloc wrapper lib @@ -3915,14 +3967,31 @@ dnl = Use Electric Fence dnl ======================================================== MOZ_ARG_ENABLE_BOOL(efence, [ --enable-efence Link with Electric Fence], - AC_CHECK_LIB(efence,malloc)) + _ENABLE_EFENCE=1, + _ENABLE_EFENCE= ) +if test -n "$_ENABLE_EFENCE"; then + AC_CHECK_LIB(efence,malloc) +fi + +dnl ======================================================== +dnl jprof +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(jprof, +[ --enable-jprof Enable jprof profiling tool (needs mozilla/tools/jprof)], + MOZ_JPROF=1, + MOZ_JPROF= ) +if test -n "$MOZ_JPROF"; then + AC_DEFINE(MOZ_JPROF) +fi + dnl ======================================================== dnl = Enable stripping of libs & executables dnl ======================================================== MOZ_ARG_ENABLE_BOOL(strip, [ --enable-strip Enable stripping of libs & executables ], - ENABLE_STRIP=1) + ENABLE_STRIP=1, + ENABLE_STRIP= ) dnl ======================================================== dnl = --enable-elf-dynstr-gc @@ -3945,7 +4014,9 @@ dnl to true on x86 linux, and false everywhere else. dnl MOZ_ARG_ENABLE_BOOL(old-abi-compat-wrappers, -[ --enable-old-abi-compat-wrappers Support old GCC ABI symbols to ease the pain of the linux compiler change], +[ --enable-old-abi-compat-wrappers + Support old GCC ABI symbols to ease the pain + of the linux compiler change], MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1, MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= ) if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then @@ -3979,8 +4050,11 @@ dnl ======================================================== MOZ_TIMELINE= MOZ_ARG_ENABLE_BOOL(timeline, [ --enable-timeline Enable timeline services ], + MOZ_TIMELINE=1, + MOZ_TIMELINE= ) +if test -n "$MOZ_TIMELINE"; then AC_DEFINE(MOZ_TIMELINE) - MOZ_TIMELINE=1) +fi dnl ======================================================== dnl Turn on reflow counting @@ -3988,8 +4062,11 @@ dnl ======================================================== MOZ_REFLOW_PERF= MOZ_ARG_ENABLE_BOOL(reflow-perf, [ --enable-reflow-perf Enable reflow performance tracing], - MOZ_REFLOW_PERF=1 - AC_DEFINE(MOZ_REFLOW_PREF) ) + MOZ_REFLOW_PERF=1, + MOZ_REFLOW_PERF= ) +if test -n "$MOZ_REFLOW_PREF"; then + AC_DEFINE(MOZ_REFLOW_PREF) +fi AC_SUBST(MOZ_REFLOW_PERF) dnl ======================================================== @@ -3997,19 +4074,26 @@ dnl Enable performance metrics. dnl ======================================================== MOZ_ARG_ENABLE_BOOL(perf-metrics, [ --enable-perf-metrics Enable performance metrics], - MOZ_PERF_METRICS=1 - AC_DEFINE(MOZ_PERF_METRICS)) + MOZ_PERF_METRICS=1, + MOZ_PERF_METRICS= ) +if test -n "$MOZ_PERF_METRICS"; then + AC_DEFINE(MOZ_PERF_METRICS) +fi dnl ======================================================== dnl Enable code size metrics. dnl ======================================================== MOZ_ARG_ENABLE_BOOL(codesighs, [ --enable-codesighs Enable code size analysis tools], -[ if test -d $srcdir/tools/codesighs; then - MOZ_MAPINFO=1 -else - AC_MSG_ERROR([Codesighs directory ./tools/codesighs required.]) -fi]) + _ENABLE_CODESIGHS=1, + _ENABLE_CODESIGHS= ) +if test -n "$_ENABLE_CODESIGHS"; then + if test -d $srcdir/tools/codesighs; then + MOZ_MAPINFO=1 + else + AC_MSG_ERROR([Codesighs directory $srcdir/tools/codesighs required.]) + fi +fi dnl ======================================================== dnl = Enable trace malloc @@ -4017,7 +4101,8 @@ dnl ======================================================== NS_TRACE_MALLOC=${MOZ_TRACE_MALLOC} MOZ_ARG_ENABLE_BOOL(trace-malloc, [ --enable-trace-malloc Enable malloc tracing], - NS_TRACE_MALLOC=1 ) + NS_TRACE_MALLOC=1, + NS_TRACE_MALLOC= ) if test "$NS_TRACE_MALLOC"; then # Please, Mr. Linker Man, don't take away our symbol names MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS= @@ -4032,12 +4117,15 @@ dnl ======================================================== MOZ_ARG_ENABLE_BOOL(eazel-profiler-support, [ --enable-eazel-profiler-support Enable Corel/Eazel profiler support], - ENABLE_EAZEL_PROFILER=1 + ENABLE_EAZEL_PROFILER=1, + ENABLE_EAZEL_PROFILER= ) +if test -n "$ENABLE_EAZEL_PROFILER"; then AC_DEFINE(ENABLE_EAZEL_PROFILER) USE_ELF_DYNSTR_GC= MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS= EAZEL_PROFILER_CFLAGS="-g -O -gdwarf-2 -finstrument-functions -D__NO_STRING_INLINES -D__NO_MATH_INLINES" - EAZEL_PROFILER_LIBS="-lprofiler -lpthread") + EAZEL_PROFILER_LIBS="-lprofiler -lpthread" +fi MOZ_ARG_ENABLE_STRING(profile-modules, [ --enable-profile-modules @@ -4046,7 +4134,14 @@ MOZ_ARG_ENABLE_STRING(profile-modules, MOZ_ARG_ENABLE_BOOL(insure, [ --enable-insure Enable insure++ instrumentation (linux only)], -[ MOZ_INSURE="insure" MOZ_INSURIFYING=1 MOZ_INSURE_DIRS="." MOZ_INSURE_EXCLUDE_DIRS="config" ]) + _ENABLE_INSURE=1, + _ENABLE_INSURE= ) +if test -n "$_ENABLE_INSURE"; then + MOZ_INSURE="insure" + MOZ_INSURIFYING=1 + MOZ_INSURE_DIRS="." + MOZ_INSURE_EXCLUDE_DIRS="config" +fi MOZ_ARG_WITH_STRING(insure-dirs, [ --with-insure-dirs=DIRS @@ -4108,7 +4203,8 @@ dnl update xterm title dnl ======================================================== MOZ_ARG_ENABLE_BOOL(xterm-updates, [ --enable-xterm-updates Update XTERM titles with current command.], - MOZ_UPDATE_XTERM=1) + MOZ_UPDATE_XTERM=1, + MOZ_UPDATE_XTERM= ) dnl ========================================================= dnl = Chrome format @@ -4912,7 +5008,6 @@ AC_SUBST(OS_ARCH) AC_SUBST(OS_RELEASE) AC_SUBST(OS_TEST) -AC_SUBST(MOZ_DISABLE_DTD_DEBUG) AC_SUBST(MOZ_DISABLE_JAR_PACKAGING) AC_SUBST(MOZ_CHROME_FILE_FORMAT) diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp index 1c762fb27b9..6bab40a3c53 100644 --- a/mozilla/content/html/style/src/nsCSSParser.cpp +++ b/mozilla/content/html/style/src/nsCSSParser.cpp @@ -61,6 +61,7 @@ #include "nsIAtom.h" #include "nsVoidArray.h" #include "nsISupportsArray.h" +#include "nsCOMArray.h" #include "nsColor.h" #include "nsStyleConsts.h" #include "nsLayoutAtoms.h" @@ -69,8 +70,10 @@ #include "nsINameSpace.h" #include "nsThemeConstants.h" #include "nsContentErrors.h" +#include "nsUnitConversion.h" #include "prprf.h" +#include "math.h" // XXX TODO: // - rework aErrorCode stuff: switch over to nsresult @@ -149,10 +152,6 @@ public: NS_DECL_ISUPPORTS - NS_IMETHOD Init(nsICSSStyleSheet* aSheet); - - NS_IMETHOD GetInfoMask(PRUint32& aResult); - NS_IMETHOD SetStyleSheet(nsICSSStyleSheet* aSheet); NS_IMETHOD SetCaseSensitive(PRBool aCaseSensitive); @@ -309,6 +308,11 @@ protected: PRBool ParseColor(PRInt32& aErrorCode, nsCSSValue& aValue); PRBool ParseColorComponent(PRInt32& aErrorCode, PRUint8& aComponent, PRInt32& aType, char aStop); + // ParseHSLColor parses everything starting with the opening '(' up through + // and including the aStop char. + PRBool ParseHSLColor(PRInt32& aErrorCode, nscolor& aColor, char aStop); + // ParseColorOpacity will enforce that the color ends with a ')' after the opacity + PRBool ParseColorOpacity(PRInt32& aErrorCode, PRUint8& aOpacity); PRBool ParseEnum(PRInt32& aErrorCode, nsCSSValue& aValue, const PRInt32 aKeywordTable[]); PRInt32 SearchKeywordTable(nsCSSKeyword aKeyword, const PRInt32 aTable[]); PRBool ParseVariant(PRInt32& aErrorCode, nsCSSValue& aValue, @@ -323,37 +327,57 @@ protected: PRBool TranslateDimension(PRInt32& aErrorCode, nsCSSValue& aValue, PRInt32 aVariantMask, float aNumber, const nsString& aUnit); + void SetParsingCompoundProperty(PRBool aBool) { + mParsingCompoundProperty = aBool; + } + PRBool IsParsingCompoundProperty(void) { + return mParsingCompoundProperty; + } + // Current token. The value is valid after calling GetToken nsCSSToken mToken; - // After an UngetToken is done this flag is true. The next call to - // GetToken clears the flag. - PRBool mHavePushBack; - + // Our scanner. We own this and are responsible for deallocating it. nsCSSScanner* mScanner; - nsIURI* mURL; - nsICSSStyleSheet* mSheet; + + // The URI to be used as a base for relative URIs. + nsCOMPtr mURL; + + // The sheet we're parsing into + nsCOMPtr mSheet; + + // Used for @import rules nsICSSLoader* mChildLoader; // not ref counted, it owns us + // Sheet section we're in. This is used to enforce correct ordering of the + // various rule types (eg the fact that a @charset rule must come before + // anything else). enum nsCSSSection { eCSSSection_Charset, eCSSSection_Import, eCSSSection_NameSpace, eCSSSection_General }; - nsCSSSection mSection; - PRBool mNavQuirkMode; - PRBool mCaseSensitive; + nsCOMPtr mNameSpace; - nsINameSpace* mNameSpace; + // After an UngetToken is done this flag is true. The next call to + // GetToken clears the flag. + PRPackedBool mHavePushBack; - nsISupportsArray* mGroupStack; + // True if we are in quirks mode; false in standards or almost standards mode + PRPackedBool mNavQuirkMode; - PRBool mParsingCompoundProperty; - void SetParsingCompoundProperty(PRBool aBool) {mParsingCompoundProperty = aBool;}; - PRBool IsParsingCompoundProperty(void) {return mParsingCompoundProperty;}; + // True if tagnames and attributes are case-sensitive + PRPackedBool mCaseSensitive; + + // This flag is set when parsing a non-box shorthand; it's used to not apply + // some quirks during shorthand parsing + PRPackedBool mParsingCompoundProperty; + + // Stack of rule groups; used for @media and such. + nsCOMArray mGroupStack; }; PR_STATIC_CALLBACK(void) AppendRuleToArray(nsICSSRule* aRule, void* aArray) @@ -423,48 +447,20 @@ static void ReportUnexpectedToken(nsCSSScanner *sc, CSSParserImpl::CSSParserImpl() : mToken(), - mHavePushBack(PR_FALSE), mScanner(nsnull), - mURL(nsnull), - mSheet(nsnull), mChildLoader(nsnull), mSection(eCSSSection_Charset), + mHavePushBack(PR_FALSE), mNavQuirkMode(PR_FALSE), mCaseSensitive(PR_FALSE), - mNameSpace(nsnull), - mGroupStack(nsnull), mParsingCompoundProperty(PR_FALSE) { } -NS_IMETHODIMP -CSSParserImpl::Init(nsICSSStyleSheet* aSheet) -{ - NS_IF_RELEASE(mGroupStack); - NS_IF_RELEASE(mNameSpace); - NS_IF_RELEASE(mSheet); - mSheet = aSheet; - if (mSheet) { - NS_ADDREF(aSheet); - mSheet->GetNameSpace(mNameSpace); - } - return NS_OK; -} - NS_IMPL_ISUPPORTS1(CSSParserImpl, nsICSSParser) CSSParserImpl::~CSSParserImpl() { - NS_IF_RELEASE(mGroupStack); - NS_IF_RELEASE(mNameSpace); - NS_IF_RELEASE(mSheet); -} - -NS_IMETHODIMP -CSSParserImpl::GetInfoMask(PRUint32& aResult) -{ - aResult = NS_CSS_GETINFO_CSS1 | NS_CSS_GETINFO_CSSP; - return NS_OK; } NS_IMETHODIMP @@ -477,12 +473,9 @@ CSSParserImpl::SetStyleSheet(nsICSSStyleSheet* aSheet) if (aSheet != mSheet) { // Switch to using the new sheet - NS_IF_RELEASE(mGroupStack); - NS_IF_RELEASE(mNameSpace); - NS_IF_RELEASE(mSheet); + mGroupStack.Clear(); mSheet = aSheet; - NS_ADDREF(mSheet); - mSheet->GetNameSpace(mNameSpace); + mSheet->GetNameSpace(*getter_AddRefs(mNameSpace)); } return NS_OK; @@ -519,9 +512,7 @@ CSSParserImpl::InitScanner(nsIUnicharInputStream* aInput, nsIURI* aURI) return NS_ERROR_OUT_OF_MEMORY; } mScanner->Init(aInput, aURI); - NS_IF_RELEASE(mURL); mURL = aURI; - NS_IF_ADDREF(mURL); mHavePushBack = PR_FALSE; @@ -535,7 +526,7 @@ CSSParserImpl::ReleaseScanner(void) delete mScanner; mScanner = nsnull; } - NS_IF_RELEASE(mURL); + mURL = nsnull; return NS_OK; } @@ -548,7 +539,7 @@ CSSParserImpl::Parse(nsIUnicharInputStream* aInput, NS_ASSERTION(nsnull != aInputURL, "need base URL"); if (! mSheet) { - NS_NewCSSStyleSheet(&mSheet, aInputURL); + NS_NewCSSStyleSheet(getter_AddRefs(mSheet), aInputURL); } #ifdef DEBUG else { @@ -1327,8 +1318,7 @@ PRBool CSSParserImpl::ProcessNameSpace(PRInt32& aErrorCode, const nsString& aPre NS_NewCSSNameSpaceRule(getter_AddRefs(rule), prefix, aURLSpec); if (rule) { (*aAppendFunc)(rule, aData); - NS_IF_RELEASE(mNameSpace); - mSheet->GetNameSpace(mNameSpace); + mSheet->GetNameSpace(*getter_AddRefs(mNameSpace)); } return result; @@ -1428,37 +1418,25 @@ void CSSParserImpl::SkipRuleSet(PRInt32& aErrorCode) PRBool CSSParserImpl::PushGroup(nsICSSGroupRule* aRule) { - if (! mGroupStack) { - NS_NewISupportsArray(&mGroupStack); - } - if (mGroupStack) { - mGroupStack->AppendElement(aRule); + if (mGroupStack.AppendObject(aRule)) return PR_TRUE; - } + return PR_FALSE; } void CSSParserImpl::PopGroup(void) { - if (mGroupStack) { - PRUint32 count; - mGroupStack->Count(&count); - if (0 < count) { - mGroupStack->RemoveElementAt(count - 1); - } + PRInt32 count = mGroupStack.Count(); + if (0 < count) { + mGroupStack.RemoveObjectAt(count - 1); } } void CSSParserImpl::AppendRule(nsICSSRule* aRule) { - PRUint32 count = 0; - if (mGroupStack) { - mGroupStack->Count(&count); - } + PRInt32 count = mGroupStack.Count(); if (0 < count) { - nsICSSGroupRule* group = (nsICSSGroupRule*)mGroupStack->ElementAt(count - 1); - group->AppendStyleRule(aRule); - NS_RELEASE(group); + mGroupStack[count - 1]->AppendStyleRule(aRule); } else { mSheet->AppendStyleRule(aRule); @@ -2483,7 +2461,6 @@ PRBool CSSParserImpl::ParseColor(PRInt32& aErrorCode, nsCSSValue& aValue) return PR_FALSE; } - nsCSSToken* tk = &mToken; nscolor rgba; switch (tk->mType) { @@ -2520,12 +2497,47 @@ PRBool CSSParserImpl::ParseColor(PRInt32& aErrorCode, nsCSSValue& aValue) ParseColorComponent(aErrorCode, r, type, ',') && ParseColorComponent(aErrorCode, g, type, ',') && ParseColorComponent(aErrorCode, b, type, ')')) { - rgba = NS_RGB(r,g,b); - aValue.SetColorValue(rgba); + aValue.SetColorValue(NS_RGB(r,g,b)); return PR_TRUE; } return PR_FALSE; // already pushed back } + else if (mToken.mIdent.EqualsIgnoreCase("-moz-rgba")) { + // rgba ( component , component , component , opacity ) + PRUint8 r, g, b, a; + PRInt32 type = COLOR_TYPE_UNKNOWN; + if (ExpectSymbol(aErrorCode, '(', PR_FALSE) && // this won't fail + ParseColorComponent(aErrorCode, r, type, ',') && + ParseColorComponent(aErrorCode, g, type, ',') && + ParseColorComponent(aErrorCode, b, type, ',') && + ParseColorOpacity(aErrorCode, a)) { + aValue.SetColorValue(NS_RGBA(r, g, b, a)); + return PR_TRUE; + } + return PR_FALSE; // already pushed back + } + else if (mToken.mIdent.EqualsIgnoreCase("-moz-hsl")) { + // hsl ( hue , saturation , lightness ) + // "hue" is a number, "saturation" and "lightness" are percentages. + if (ParseHSLColor(aErrorCode, rgba, ')')) { + aValue.SetColorValue(rgba); + return PR_TRUE; + } + return PR_FALSE; + } + else if (mToken.mIdent.EqualsIgnoreCase("-moz-hsla")) { + // hsla ( hue , saturation , lightness , opacity ) + // "hue" is a number, "saturation" and "lightness" are percentages, + // "opacity" is a number. + PRUint8 a; + if (ParseHSLColor(aErrorCode, rgba, ',') && + ParseColorOpacity(aErrorCode, a)) { + aValue.SetColorValue(NS_RGBA(NS_GET_R(rgba), NS_GET_G(rgba), + NS_GET_B(rgba), a)); + return PR_TRUE; + } + return PR_FALSE; + } break; default: break; @@ -2656,12 +2668,121 @@ PRBool CSSParserImpl::ParseColorComponent(PRInt32& aErrorCode, PRUnichar stopString[2]; stopString[0] = PRUnichar(aStop); stopString[1] = PRUnichar(0); - REPORT_UNEXPECTED_TOKEN(NS_LITERAL_STRING("Expected ") + + REPORT_UNEXPECTED_TOKEN(NS_LITERAL_STRING("Expected '") + nsDependentString(stopString, 1) + - NS_LITERAL_STRING(" but found")); + NS_LITERAL_STRING("' but found")); return PR_FALSE; } + +PRBool CSSParserImpl::ParseHSLColor(PRInt32& aErrorCode, nscolor& aColor, + char aStop) +{ + float h, s, l; + if (!ExpectSymbol(aErrorCode, '(', PR_FALSE)) { + NS_ERROR("How did this get to be a function token?"); + return PR_FALSE; + } + + // Get the hue + if (!GetToken(aErrorCode, PR_TRUE)) { + REPORT_UNEXPECTED_EOF(NS_LITERAL_STRING("hue")); + return PR_FALSE; + } + if (mToken.mType != eCSSToken_Number) { + REPORT_UNEXPECTED_TOKEN( + NS_LITERAL_STRING("Expected a number but found")); + UngetToken(); + return PR_FALSE; + } + h = mToken.mNumber; + h /= 360.0f; + // hue values are wraparound + h = h - floor(h); + + if (!ExpectSymbol(aErrorCode, ',', PR_TRUE)) { + REPORT_UNEXPECTED_TOKEN(NS_LITERAL_STRING("Expected ',' but found")); + return PR_FALSE; + } + + // Get the saturation + if (!GetToken(aErrorCode, PR_TRUE)) { + REPORT_UNEXPECTED_EOF(NS_LITERAL_STRING("saturation")); + return PR_FALSE; + } + if (mToken.mType != eCSSToken_Percentage) { + REPORT_UNEXPECTED_TOKEN( + NS_LITERAL_STRING("Expected a percentage but found")); + UngetToken(); + return PR_FALSE; + } + s = mToken.mNumber; + if (s < 0.0f) s = 0.0f; + if (s > 1.0f) s = 1.0f; + + if (!ExpectSymbol(aErrorCode, ',', PR_TRUE)) { + REPORT_UNEXPECTED_TOKEN(NS_LITERAL_STRING("Expected ',' but found")); + return PR_FALSE; + } + + // Get the lightness + if (!GetToken(aErrorCode, PR_TRUE)) { + REPORT_UNEXPECTED_EOF(NS_LITERAL_STRING("lightness")); + return PR_FALSE; + } + if (mToken.mType != eCSSToken_Percentage) { + REPORT_UNEXPECTED_TOKEN( + NS_LITERAL_STRING("Expected a percentage but found")); + UngetToken(); + return PR_FALSE; + } + l = mToken.mNumber; + if (l < 0.0f) l = 0.0f; + if (l > 1.0f) l = 1.0f; + + if (ExpectSymbol(aErrorCode, aStop, PR_TRUE)) { + aColor = NS_HSL2RGB(h, s, l); + return PR_TRUE; + } + + PRUnichar stopString[2]; + stopString[0] = PRUnichar(aStop); + stopString[1] = PRUnichar(0); + REPORT_UNEXPECTED_TOKEN(NS_LITERAL_STRING("Expected '") + + nsDependentString(stopString, 1) + + NS_LITERAL_STRING("' but found")); + return PR_FALSE; +} + + +PRBool CSSParserImpl::ParseColorOpacity(PRInt32& aErrorCode, PRUint8& aOpacity) +{ + if (!GetToken(aErrorCode, PR_TRUE)) { + REPORT_UNEXPECTED_EOF(NS_LITERAL_STRING("opacity in color value")); + return PR_FALSE; + } + + if (mToken.mType != eCSSToken_Number) { + REPORT_UNEXPECTED_TOKEN( + NS_LITERAL_STRING("Expected a number but found")); + UngetToken(); + return PR_FALSE; + } + + PRUint32 value = (PRUint32)NSToIntRound(mToken.mNumber*255); + + if (!ExpectSymbol(aErrorCode, ')', PR_TRUE)) { + REPORT_UNEXPECTED_TOKEN(NS_LITERAL_STRING("Expected ')' but found")); + return PR_FALSE; + } + + if (value < 0) value = 0; + if (value > 255) value = 255; + aOpacity = (PRUint8)value; + + return PR_TRUE; +} + #ifdef INCLUDE_XUL PRBool CSSParserImpl::ParseTreePseudoElement(PRInt32& aErrorCode, nsCSSSelector& aSelector) @@ -3124,7 +3245,10 @@ PRBool CSSParserImpl::ParseVariant(PRInt32& aErrorCode, nsCSSValue& aValue, (eCSSToken_ID == tk->mType) || (eCSSToken_Ident == tk->mType) || ((eCSSToken_Function == tk->mType) && - (tk->mIdent.EqualsIgnoreCase("rgb")))) { + (tk->mIdent.EqualsIgnoreCase("rgb") || + tk->mIdent.EqualsIgnoreCase("-moz-hsl") || + tk->mIdent.EqualsIgnoreCase("-moz-rgba") || + tk->mIdent.EqualsIgnoreCase("-moz-hsla")))) { // Put token back so that parse color can get it UngetToken(); if (ParseColor(aErrorCode, aValue)) { @@ -3346,7 +3470,7 @@ PRBool CSSParserImpl::ParseURL(PRInt32& aErrorCode, nsCSSValue& aValue) // the style sheet. // XXX editors won't like this - too bad for now nsAutoString absURL; - if (nsnull != mURL && css_RequiresAbsoluteURI(tk->mIdent)) { + if (mURL && css_RequiresAbsoluteURI(tk->mIdent)) { nsresult rv; rv = NS_MakeAbsoluteURI(absURL, tk->mIdent, mURL); if (NS_FAILED(rv)) { @@ -4017,7 +4141,9 @@ PRBool CSSParserImpl::ParseSingleValueProperty(PRInt32& aErrorCode, return ParseVariant(aErrorCode, aValue, VARIANT_AHK, nsCSSProps::kTableLayoutKTable); case eCSSProperty_text_align: - return ParseVariant(aErrorCode, aValue, VARIANT_HK | VARIANT_STRING, + // When we support aligning on a string, we can parse text-align + // as a string.... + return ParseVariant(aErrorCode, aValue, VARIANT_HK /* | VARIANT_STRING */, nsCSSProps::kTextAlignKTable); case eCSSProperty_text_decoration: return ParseTextDecoration(aErrorCode, aValue); diff --git a/mozilla/htmlparser/src/nsExpatDriver.cpp b/mozilla/htmlparser/src/nsExpatDriver.cpp index d14a9bc35fa..5e298bfaf8c 100644 --- a/mozilla/htmlparser/src/nsExpatDriver.cpp +++ b/mozilla/htmlparser/src/nsExpatDriver.cpp @@ -53,7 +53,6 @@ #include "nsCRT.h" static const char* kWhitespace = " \r\n\t"; // Optimized for typical cases -static const char kDTDDirectory[] = "res/dtd/"; /***************************** EXPAT CALL BACKS *******************************/ @@ -278,9 +277,12 @@ IsLoadableDTD(const nsCatalogData* aCatalogData, nsCOMPtr* aDTD) nsCOMPtr lfile = do_QueryInterface(dtdPath); - nsCAutoString path; - path = NS_LITERAL_CSTRING(kDTDDirectory) + fileName; - lfile->AppendRelativeNativePath(path); + // append res/dtd/ + // can't do AppendRelativeNativePath("res/dtd/" + fileName) + // as that won't work on all platforms. + lfile->AppendNative(NS_LITERAL_CSTRING("res")); + lfile->AppendNative(NS_LITERAL_CSTRING("dtd")); + lfile->AppendNative(fileName); PRBool exists; dtdPath->Exists(&exists); diff --git a/mozilla/parser/htmlparser/src/nsExpatDriver.cpp b/mozilla/parser/htmlparser/src/nsExpatDriver.cpp index d14a9bc35fa..5e298bfaf8c 100644 --- a/mozilla/parser/htmlparser/src/nsExpatDriver.cpp +++ b/mozilla/parser/htmlparser/src/nsExpatDriver.cpp @@ -53,7 +53,6 @@ #include "nsCRT.h" static const char* kWhitespace = " \r\n\t"; // Optimized for typical cases -static const char kDTDDirectory[] = "res/dtd/"; /***************************** EXPAT CALL BACKS *******************************/ @@ -278,9 +277,12 @@ IsLoadableDTD(const nsCatalogData* aCatalogData, nsCOMPtr* aDTD) nsCOMPtr lfile = do_QueryInterface(dtdPath); - nsCAutoString path; - path = NS_LITERAL_CSTRING(kDTDDirectory) + fileName; - lfile->AppendRelativeNativePath(path); + // append res/dtd/ + // can't do AppendRelativeNativePath("res/dtd/" + fileName) + // as that won't work on all platforms. + lfile->AppendNative(NS_LITERAL_CSTRING("res")); + lfile->AppendNative(NS_LITERAL_CSTRING("dtd")); + lfile->AppendNative(fileName); PRBool exists; dtdPath->Exists(&exists);