diff --git a/configure b/configure index 2ee23619f1f7..8636eb36eab6 100755 --- a/configure +++ b/configure @@ -1,10 +1,5 @@ #! /bin/sh -# Read in '.mozconfig' script to set the initial options. -# See the mozconfig2configure script for more details. -_AUTOCONF_TOOLS_DIR=`dirname $0`/./build/autoconf -. $_AUTOCONF_TOOLS_DIR/mozconfig2configure - # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -16,294 +11,13 @@ _AUTOCONF_TOOLS_DIR=`dirname $0`/./build/autoconf ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: -ac_help="$ac_help - --with-macos-sdk=dir Location of platform SDK to use (Mac OS X only)" -ac_help="$ac_help - --with-java-include-path=dir Location of Java SDK headers" -ac_help="$ac_help - --with-java-bin-path=dir Location of Java binaries (java, javac, jar)" ac_help="$ac_help --with-x use the X Window System" -ac_help="$ac_help - --with-ft-prefix=PFX Prefix where FreeType is installed (optional)" -ac_help="$ac_help - --with-ft-exec-prefix=PFX - Exec prefix where FreeType is installed (optional)" -ac_help="$ac_help - --disable-freetypetest - Do not try to compile and run a test FreeType program" -ac_help="$ac_help - --with-pthreads Force use of system pthread library with NSPR " -ac_help="$ac_help - --enable-macos-target=VER (default=10.1) - Set the minimum MacOS version needed at runtime" -ac_help="$ac_help - --with-system-nspr Use system installed NSPR" ac_help="$ac_help --with-nspr-prefix=PFX Prefix where NSPR is installed" ac_help="$ac_help --with-nspr-exec-prefix=PFX Exec prefix where NSPR is installed" -ac_help="$ac_help - --with-system-jpeg[=PFX] - Use system libjpeg [installed at prefix PFX]" -ac_help="$ac_help - --with-system-zlib[=PFX] - Use system libz [installed at prefix PFX]" -ac_help="$ac_help - --with-system-png[=PFX] - Use system libpng [installed at prefix PFX]" -ac_help="$ac_help - --enable-cairo Enable Cairo-specific features (Canvas)" -ac_help="$ac_help - --enable-default-toolkit=TK - 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 - --with-gtk-exec-prefix=PFX - Exec prefix where GTK is installed (optional)" -ac_help="$ac_help - --disable-gtktest Do not try to compile and run a test GTK program" -ac_help="$ac_help - --with-qtdir=\$dir Specify Qt directory " -ac_help="$ac_help - --enable-application=APP - Options include: - suite - browser (Firefox) - mail (Thunderbird) - composer - calendar - xulrunner - macbrowser (Camino) - standalone (use this for standalone - xpcom/xpconnect or to manually drive a build)" -ac_help="$ac_help - --enable-ui-locale=ab-CD - Select the user interface locale (default: en-US)" -ac_help="$ac_help - --enable-calendar Enable building of the calendar client" -ac_help="$ac_help - --disable-mailnews Disable building of mail & news components" -ac_help="$ac_help - --enable-static-mail Enable static mail build support" -ac_help="$ac_help - --disable-ldap Disable LDAP support" -ac_help="$ac_help - --enable-official-branding Enable Official mozilla.org Branding - Do not distribute builds with - --enable-official-branding unless you have - permission to use trademarks per - http://www.mozilla.org/foundation/trademarks/ ." -ac_help="$ac_help - --with-distribution-id=ID Set distribution-specific id (default=org.mozilla)" -ac_help="$ac_help - --disable-freetype2 Disable FreeType2 support " -ac_help="$ac_help - --disable-xft Disable Xft support " -ac_help="$ac_help - --enable-pango Enable Pango font rendering support" -ac_help="$ac_help - --disable-postscript Disable PostScript printing support " -ac_help="$ac_help - --disable-xprint Disable Xprint printing support " -ac_help="$ac_help - --disable-gnomevfs Disable GnomeVFS support " -ac_help="$ac_help - --disable-gnomeui Disable libgnomeui support (default: auto, optional at runtime) " -ac_help="$ac_help - --disable-crypto Disable crypto support (Personal Security Manager)" -ac_help="$ac_help - --disable-jsd Disable JavaScript debug library" -ac_help="$ac_help - --disable-plugins Disable plugins support" -ac_help="$ac_help - --disable-oji Disable Open JVM Integration support" -ac_help="$ac_help - --enable-xinerama Enable Xinerama support - ( not safe for Red Hat 7.0 ) " -ac_help="$ac_help - --enable-ctl Enable Thai Complex Script support" -ac_help="$ac_help - --disable-view-source Disable view source support" -ac_help="$ac_help - --disable-accessibility Disable accessibility support" -ac_help="$ac_help - --disable-xpfe-components - Disable xpfe components" -ac_help="$ac_help - --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" -ac_help="$ac_help - --enable-native-uconv Enable iconv support" -ac_help="$ac_help - --enable-plaintext-editor-only - Allow only plaintext editing" -ac_help="$ac_help - --disable-composer Disable building of Composer" -ac_help="$ac_help - --disable-xtf Disable XTF (pluggable xml tags) support" -ac_help="$ac_help - --enable-extensions Enable extensions" -ac_help="$ac_help - --with-gssapi=PFX Location of GSSAPI libraries" -ac_help="$ac_help - --enable-image-decoders[={mod1,mod2,default,all,none}] - Enable specific image decoders" -ac_help="$ac_help - --enable-ldap-experimental - Enable LDAP experimental features" -ac_help="$ac_help - --disable-mathml Disable MathML support" -ac_help="$ac_help - --enable-svg Enable SVG support" -ac_help="$ac_help - --enable-svg-renderer={gdiplus,libart,cairo}" -ac_help="$ac_help - --disable-installer Disable building of installer" -ac_help="$ac_help - --disable-activex Disable building of ActiveX control (win32 only)" -ac_help="$ac_help - --disable-activex-scripting - Disable building of ActiveX scripting support (win32)" -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 Use Lea malloc in xpcom " -ac_help="$ac_help - --enable-storage Enable mozStorage module and related components" -ac_help="$ac_help - --enable-js-ultrasparc Use UltraSPARC optimizations in JS" -ac_help="$ac_help - --enable-debug Enable building with developer debug info" -ac_help="$ac_help - --disable-optimize Disable compiler optimization - --enable-optimize=[OPT] Specify compiler optimization flags [OPT=-O]" -ac_help="$ac_help - --enable-debug-modules Enable/disable debug info for specific modules" -ac_help="$ac_help - --enable-debugger-info-modules - Enable/disable debugger info for specific modules" -ac_help="$ac_help - --enable-boehm Enable the Boehm Garbage Collector" -ac_help="$ac_help - --disable-logging Disable logging facilities" -ac_help="$ac_help - --enable-crash-on-assert - Make NS_ASSERTION crash on Unix" -ac_help="$ac_help - --enable-reorder Enable function reordering (requires GNU ld) " -ac_help="$ac_help - --enable-logrefcnt Enable logging of refcounts (default=debug) " -ac_help="$ac_help - --enable-detect-webshell-leaks - Enable detection of webshell leaks - (default=debug)" -ac_help="$ac_help - --enable-wrap-malloc Wrap malloc calls (gnu linker only)" -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" -ac_help="$ac_help - --enable-prebinding Enable prebinding (Mac OS X only)" -ac_help="$ac_help - --enable-timeline Enable timeline services " -ac_help="$ac_help - --enable-reflow-perf Enable reflow performance tracing" -ac_help="$ac_help - --enable-perf-metrics Enable performance metrics" -ac_help="$ac_help - --enable-codesighs Enable code size analysis tools" -ac_help="$ac_help - --enable-trace-malloc Enable malloc tracing" -ac_help="$ac_help - --enable-eazel-profiler-support - Enable Corel/Eazel profiler support" -ac_help="$ac_help - --enable-profile-modules - Enable/disable profiling for specific modules" -ac_help="$ac_help - --enable-insure Enable insure++ instrumentation (linux only)" -ac_help="$ac_help - --with-insure-dirs=DIRS - Dirs to instrument with insure " -ac_help="$ac_help - --with-insure-exclude-dirs=DIRS - Dirs to not instrument with insure " -ac_help="$ac_help - --enable-quantify Enable Quantify support (Windows only) " -ac_help="$ac_help - --enable-xterm-updates Update XTERM titles with current command." -ac_help="$ac_help - --enable-chrome-format=jar|flat|both|symlink - Select FORMAT of chrome files (default=jar)" -ac_help="$ac_help - --with-default-mozilla-five-home - Set the default value for MOZILLA_FIVE_HOME" -ac_help="$ac_help - --with-user-appdir=DIR Set user-specific appdir (default=.mozilla)" -ac_help="$ac_help - --with-doc-input-dirs=DIRS - Header/idl dirs to create docs from" -ac_help="$ac_help - --with-doc-include-dirs=DIRS - Include dirs to preprocess doc headers" -ac_help="$ac_help - --with-doc-output-dir=DIR - Dir to generate docs into" -ac_help="$ac_help - --enable-long-long-warning - Warn about use of non-ANSI long long type" -ac_help="$ac_help - --disable-pedantic Issue all warnings demanded by strict ANSI C " -ac_help="$ac_help - --enable-cpp-rtti Enable C++ RTTI " -ac_help="$ac_help - --enable-cpp-exceptions Enable C++ exceptions " -ac_help="$ac_help - --disable-auto-deps Do not automatically generate dependency info" -ac_help="$ac_help - --disable-md Do not use compiler-based dependencies " -ac_help="$ac_help - --disable-shared Disable building of internal shared libs" -ac_help="$ac_help - --enable-static Enable building of internal static libs" -ac_help="$ac_help - --enable-libxul Enable building of libxul" -ac_help="$ac_help - --disable-static-component-loader - Disable the static component loader" -ac_help="$ac_help - --enable-standalone-modules=mod1[,mod2] - Enable standalone build of specific modules" -ac_help="$ac_help - --without-libIDL Skip check for libIDL (standalone modules only)" ac_help="$ac_help --with-libIDL-prefix=PFX Prefix where libIDL is installed (optional)" @@ -312,41 +26,6 @@ ac_help="$ac_help Exec prefix where libIDL is installed (optional)" ac_help="$ac_help --disable-libIDLtest Do not try to compile and run a test libIDL program" -ac_help="$ac_help - --with-glib-prefix=PFX Prefix where GLIB is installed (optional)" -ac_help="$ac_help - --with-glib-exec-prefix=PFX - Exec prefix where GLIB is installed (optional)" -ac_help="$ac_help - --disable-glibtest Do not try to compile and run a test GLIB program" -ac_help="$ac_help - --with-glib-prefix=PFX Prefix where GLIB is installed (optional)" -ac_help="$ac_help - --with-glib-exec-prefix=PFX - Exec prefix where GLIB is installed (optional)" -ac_help="$ac_help - --disable-glibtest Do not try to compile and run a test GLIB program" -ac_help="$ac_help - --enable-system-cairo Use system cairo (located with pkgconfig)" -ac_help="$ac_help - --disable-xul Disable XUL" -ac_help="$ac_help - --disable-profilesharing Disable profile sharing" -ac_help="$ac_help - --disable-profilelocking Disable profile locking" -ac_help="$ac_help - --enable-necko-protocols[={http,ftp,default,all,none}] - Enable/disable specific protocol handlers" -ac_help="$ac_help - --disable-necko-disk-cache - Disable necko disk cache" -ac_help="$ac_help - --enable-necko-small-buffers - Minimize size of necko's i/o buffers" -ac_help="$ac_help - --disable-cookies Disable cookie support" -ac_help="$ac_help - --disable-v1-string-abi Disable binary compatibility layer for strings" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -904,7 +583,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:908: checking host system type" >&5 +echo "configure:587: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -925,7 +604,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:929: checking target system type" >&5 +echo "configure:608: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -943,7 +622,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:947: checking build system type" >&5 +echo "configure:626: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1071,13 +750,13 @@ 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:1075: checking for host c compiler" >&5 +echo "configure:754: checking for host c compiler" >&5 for ac_prog in $HOST_CC 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:1081: checking for $ac_word" >&5 +echo "configure:760: 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 @@ -1112,13 +791,13 @@ 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:1116: checking for host c++ compiler" >&5 +echo "configure:795: checking for host c++ compiler" >&5 for ac_prog in $HOST_CXX $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:1122: checking for $ac_word" >&5 +echo "configure:801: 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 @@ -1167,7 +846,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:1171: checking for $ac_word" >&5 +echo "configure:850: 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 @@ -1202,7 +881,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:1206: checking for $ac_word" >&5 +echo "configure:885: 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 @@ -1237,16 +916,16 @@ test -n "$HOST_AR" || HOST_AR="ar" 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:1241: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:920: 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:929: \"$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 @@ -1261,16 +940,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:1265: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:944: 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:953: \"$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 @@ -1290,7 +969,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:1294: checking for $ac_word" >&5 +echo "configure:973: 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 @@ -1324,7 +1003,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:1328: checking for $ac_word" >&5 +echo "configure:1007: 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 @@ -1354,7 +1033,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:1358: checking for $ac_word" >&5 +echo "configure:1037: 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 @@ -1405,7 +1084,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:1409: checking for $ac_word" >&5 +echo "configure:1088: 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 @@ -1437,7 +1116,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1441: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1120: 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. @@ -1448,12 +1127,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1452 "configure" +#line 1131 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1136: \"$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 @@ -1479,12 +1158,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:1483: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1162: 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:1488: checking whether we are using GNU C" >&5 +echo "configure:1167: 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 @@ -1493,7 +1172,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1497: \"$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:1176: \"$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 @@ -1512,7 +1191,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:1516: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1195: 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 @@ -1548,7 +1227,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:1552: checking for $ac_word" >&5 +echo "configure:1231: 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 @@ -1584,7 +1263,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:1588: checking for $ac_word" >&5 +echo "configure:1267: 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 @@ -1616,7 +1295,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1620: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1299: 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. @@ -1627,12 +1306,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1631 "configure" +#line 1310 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1315: \"$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 @@ -1658,12 +1337,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:1662: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1341: 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:1667: checking whether we are using GNU C++" >&5 +echo "configure:1346: 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 @@ -1672,7 +1351,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1676: \"$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:1355: \"$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 @@ -1691,7 +1370,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:1695: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1374: 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 @@ -1732,7 +1411,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext < $ac_declaration @@ -1740,7 +1419,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:1744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1750,14 +1429,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -1778,7 +1457,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:1782: checking for $ac_word" >&5 +echo "configure:1461: 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 @@ -1813,7 +1492,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:1817: checking for $ac_word" >&5 +echo "configure:1496: 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 @@ -1848,7 +1527,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:1852: checking for $ac_word" >&5 +echo "configure:1531: 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 @@ -1889,7 +1568,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:1893: checking for $ac_word" >&5 +echo "configure:1572: 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 @@ -1924,7 +1603,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:1928: checking for $ac_word" >&5 +echo "configure:1607: 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 @@ -1959,7 +1638,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:1963: checking for $ac_word" >&5 +echo "configure:1642: 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 @@ -1997,7 +1676,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:2001: checking for $ac_word" >&5 +echo "configure:1680: 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 @@ -2027,7 +1706,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:2031: checking for $ac_word" >&5 +echo "configure:1710: 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 @@ -2078,7 +1757,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:2082: checking for $ac_word" >&5 +echo "configure:1761: 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 @@ -2110,7 +1789,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2114: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1793: 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. @@ -2121,12 +1800,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2125 "configure" +#line 1804 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1809: \"$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 @@ -2152,12 +1831,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:2156: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1835: 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:2161: checking whether we are using GNU C" >&5 +echo "configure:1840: 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 @@ -2166,7 +1845,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2170: \"$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:1849: \"$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 @@ -2185,7 +1864,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:2189: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1868: 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 @@ -2221,7 +1900,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:2225: checking for $ac_word" >&5 +echo "configure:1904: 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 @@ -2253,7 +1932,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2257: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1936: 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. @@ -2264,12 +1943,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2268 "configure" +#line 1947 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1952: \"$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 @@ -2295,12 +1974,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:2299: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1978: 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:2304: checking whether we are using GNU C++" >&5 +echo "configure:1983: 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 @@ -2309,7 +1988,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2313: \"$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:1992: \"$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 @@ -2328,7 +2007,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:2332: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2011: 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 @@ -2369,7 +2048,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext < $ac_declaration @@ -2377,7 +2056,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:2381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2387,14 +2066,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -2413,7 +2092,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:2417: checking for $ac_word" >&5 +echo "configure:2096: 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 @@ -2445,7 +2124,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:2449: checking for $ac_word" >&5 +echo "configure:2128: 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 @@ -2486,7 +2165,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:2490: checking for $ac_word" >&5 +echo "configure:2169: 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 @@ -2521,7 +2200,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:2525: checking for $ac_word" >&5 +echo "configure:2204: 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 @@ -2556,7 +2235,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:2560: checking for $ac_word" >&5 +echo "configure:2239: 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 @@ -2591,7 +2270,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:2595: checking for $ac_word" >&5 +echo "configure:2274: 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 @@ -2675,7 +2354,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:2679: checking for $ac_word" >&5 +echo "configure:2358: 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 @@ -2715,7 +2394,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:2719: checking for $ac_word" >&5 +echo "configure:2398: 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 @@ -2757,14 +2436,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:2768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2782,14 +2461,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { unsigned *test = new unsigned(42); ; return 0; } EOF -if { (eval echo configure:2793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2847,7 +2526,7 @@ cross_compiling=$ac_cv_prog_cc_cross # Add flags if necessary echo $ac_n "checking for midl flags""... $ac_c" 1>&6 -echo "configure:2851: checking for midl flags" >&5 +echo "configure:2530: checking for midl flags" >&5 if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then # Starting with MIDL version 6.0.359, the MIDL compiler # generates /Oicf /robust stubs by default, which is not @@ -2866,9 +2545,9 @@ echo "configure:2851: checking for midl flags" >&5 _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 -echo "configure:2870: checking for w32api version >= $W32API_VERSION" >&5 +echo "configure:2549: checking for w32api version >= $W32API_VERSION" >&5 cat > conftest.$ac_ext < int main() { @@ -2880,7 +2559,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* res=yes else @@ -2896,7 +2575,7 @@ rm -f conftest* fi # Check windres version echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 -echo "configure:2900: checking for windres version >= $WINDRES_VERSION" >&5 +echo "configure:2579: checking for windres version >= $WINDRES_VERSION" >&5 _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` echo "$ac_t""$_WINDRES_VERSION" 1>&6 _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` @@ -2926,7 +2605,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:2930: checking how to run the C preprocessor" >&5 +echo "configure:2609: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2941,13 +2620,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:2951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2630: \"$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 : @@ -2958,13 +2637,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:2968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2647: \"$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 : @@ -2975,13 +2654,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:2985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2664: \"$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 : @@ -3009,17 +2688,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:3013: checking for $ac_hdr" >&5 +echo "configure:2692: 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:3023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2702: \"$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* @@ -3050,10 +2729,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:3054: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:2733: 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:3057: checking whether cc understands -c and -o together" >&5 +echo "configure:2736: 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]/_/'`" @@ -3065,16 +2744,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:3069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:3070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:2748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2749: \"$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:3075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2754: \"$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:3077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:3078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:2756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -3115,12 +2794,9 @@ fi MACOS_SDK_DIR= -# Check whether --with-macos-sdk or --without-macos-sdk was given. -if test "${with_macos_sdk+set}" = set; then - withval="$with_macos_sdk" - MACOS_SDK_DIR=$withval -fi - +MOZ_ARG_WITH_STRING(macos-sdk, + --with-macos-sdk=dir Location of platform SDK to use (Mac OS X only), + MACOS_SDK_DIR=$withval) @@ -3135,23 +2811,17 @@ if test "$MACOS_SDK_DIR"; then fi JAVA_INCLUDE_PATH= -# Check whether --with-java-include-path or --without-java-include-path was given. -if test "${with_java_include_path+set}" = set; then - withval="$with_java_include_path" - JAVA_INCLUDE_PATH=$withval -fi - +MOZ_ARG_WITH_STRING(java-include-path, + --with-java-include-path=dir Location of Java SDK headers, + JAVA_INCLUDE_PATH=$withval) JAVA_BIN_PATH= -# Check whether --with-java-bin-path or --without-java-bin-path was given. -if test "${with_java_bin_path+set}" = set; then - withval="$with_java_bin_path" - JAVA_BIN_PATH=$withval -fi - +MOZ_ARG_WITH_STRING(java-bin-path, + --with-java-bin-path=dir Location of Java binaries (java, javac, jar), + JAVA_BIN_PATH=$withval) echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3155: checking how to run the C preprocessor" >&5 +echo "configure:2825: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3166,13 +2836,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:3176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2846: \"$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 : @@ -3183,13 +2853,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:3193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2863: \"$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 : @@ -3200,13 +2870,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:3210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2880: \"$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 : @@ -3231,7 +2901,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:3235: checking how to run the C++ preprocessor" >&5 +echo "configure:2905: 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 @@ -3244,12 +2914,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:3253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2923: \"$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 : @@ -3285,7 +2955,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:3289: checking for a BSD compatible install" >&5 +echo "configure:2959: 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 @@ -3338,7 +3008,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:3342: checking whether ln -s works" >&5 +echo "configure:3012: 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 @@ -3363,7 +3033,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:3367: checking for $ac_word" >&5 +echo "configure:3037: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3403,7 +3073,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:3407: checking for minimum required perl version >= $PERL_VERSION" >&5 +echo "configure:3077: 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 @@ -3413,7 +3083,7 @@ if test "$_perl_res" != 0; then fi echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 -echo "configure:3417: checking for full perl installation" >&5 +echo "configure:3087: 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 @@ -3426,7 +3096,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:3430: checking for $ac_word" >&5 +echo "configure:3100: 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 @@ -3462,7 +3132,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:3466: checking for $ac_word" >&5 +echo "configure:3136: 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 @@ -3498,7 +3168,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:3502: checking for $ac_word" >&5 +echo "configure:3172: 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 @@ -3534,7 +3204,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:3538: checking for $ac_word" >&5 +echo "configure:3208: 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 @@ -3572,7 +3242,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:3576: checking for $ac_word" >&5 +echo "configure:3246: 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 @@ -3613,7 +3283,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:3617: checking for $ac_word" >&5 +echo "configure:3287: 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 @@ -3648,7 +3318,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:3652: checking for $ac_word" >&5 +echo "configure:3322: 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 @@ -3690,7 +3360,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:3694: checking for $ac_word" >&5 +echo "configure:3364: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3735,7 +3405,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:3739: checking for $ac_word" >&5 +echo "configure:3409: 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 @@ -3778,7 +3448,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:3782: checking for $ac_word" >&5 +echo "configure:3452: 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 @@ -3844,7 +3514,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:3848: checking for X" >&5 +echo "configure:3518: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3906,12 +3576,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:3915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3585: \"$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* @@ -3980,14 +3650,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:3661: \"$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. @@ -4093,17 +3763,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:4097: checking whether -R must be followed by a space" >&5 +echo "configure:3767: 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:3777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -4119,14 +3789,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:3800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -4158,7 +3828,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:4162: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3832: 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 @@ -4166,7 +3836,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:3851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4199,7 +3869,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:4203: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3873: 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 @@ -4207,7 +3877,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:3892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4247,12 +3917,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:4251: checking for gethostbyname" >&5 +echo "configure:3921: 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:3949: \"$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 @@ -4296,7 +3966,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4300: checking for gethostbyname in -lnsl" >&5 +echo "configure:3970: 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 @@ -4304,7 +3974,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:3989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4345,12 +4015,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:4349: checking for connect" >&5 +echo "configure:4019: 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:4047: \"$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 @@ -4394,7 +4064,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4398: checking for connect in -lsocket" >&5 +echo "configure:4068: 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 @@ -4402,7 +4072,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:4087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4437,12 +4107,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:4441: checking for remove" >&5 +echo "configure:4111: 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:4139: \"$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 @@ -4486,7 +4156,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4490: checking for remove in -lposix" >&5 +echo "configure:4160: 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 @@ -4494,7 +4164,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:4179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4529,12 +4199,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4533: checking for shmat" >&5 +echo "configure:4203: 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:4231: \"$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 @@ -4578,7 +4248,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4582: checking for shmat in -lipc" >&5 +echo "configure:4252: 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 @@ -4586,7 +4256,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:4271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4630,7 +4300,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:4634: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4304: 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 @@ -4638,7 +4308,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:4323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4911,7 +4581,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:4915: checking whether ld has archive extraction flags" >&5 +echo "configure:4585: 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 @@ -4928,14 +4598,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:4609: \"$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 @@ -4968,17 +4638,17 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 -echo "configure:4972: checking for 64-bit OS" >&5 +echo "configure:4642: 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:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -5113,9 +4783,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 -echo "configure:5117: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 +echo "configure:4787: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -5159,17 +4829,17 @@ cross_compiling=$ac_cv_prog_cc_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5163: checking for $ac_hdr" >&5 +echo "configure:4833: 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:5173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4843: \"$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* @@ -5209,7 +4879,7 @@ EOF TK_LIBS='-lbe -lroot' LIBS="$LIBS -lbe" echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 -echo "configure:5213: checking for main in -lbind" >&5 +echo "configure:4883: 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 @@ -5217,14 +4887,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:4898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5245,7 +4915,7 @@ else fi echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 -echo "configure:5249: checking for main in -lzeta" >&5 +echo "configure:4919: checking for main in -lzeta" >&5 ac_lib_var=`echo zeta'_'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 @@ -5253,14 +4923,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lzeta $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6007,9 +5677,9 @@ EOF CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 -echo "configure:6011: checking for Forte compiler version >= WS6U2" >&5 +echo "configure:5681: checking for Forte compiler version >= WS6U2" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -6140,7 +5810,7 @@ case "$target" in ;; *-darwin*) echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 -echo "configure:6144: checking for -exported_symbols_list option to ld" >&5 +echo "configure:5814: 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 @@ -6176,12 +5846,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:6180: checking for ANSI C header files" >&5 +echo "configure:5850: 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 @@ -6189,7 +5859,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5863: \"$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* @@ -6206,7 +5876,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 @@ -6224,7 +5894,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 @@ -6245,7 +5915,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6256,7 +5926,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:6260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6280,12 +5950,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6284: checking for working const" >&5 +echo "configure:5954: 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:6008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6355,12 +6025,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:6359: checking for mode_t" >&5 +echo "configure:6029: 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 @@ -6388,12 +6058,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6392: checking for off_t" >&5 +echo "configure:6062: 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 @@ -6421,12 +6091,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6425: checking for pid_t" >&5 +echo "configure:6095: 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 @@ -6454,12 +6124,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6458: checking for size_t" >&5 +echo "configure:6128: 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 @@ -6487,12 +6157,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:6491: checking for uid_t in sys/types.h" >&5 +echo "configure:6161: 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 @@ -6521,12 +6191,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:6525: checking for st_blksize in struct stat" >&5 +echo "configure:6195: 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 @@ -6534,7 +6204,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:6538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -6555,12 +6225,12 @@ EOF fi echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 -echo "configure:6559: checking for siginfo_t" >&5 +echo "configure:6229: 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 < @@ -6568,7 +6238,7 @@ int main() { siginfo_t* info; ; return 0; } EOF -if { (eval echo configure:6572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_siginfo_t=true else @@ -6602,12 +6272,12 @@ EOF fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:6606: checking for int16_t" >&5 +echo "configure:6276: 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 @@ -6615,7 +6285,7 @@ int main() { int16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int16_t=true else @@ -6637,12 +6307,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:6641: checking for int32_t" >&5 +echo "configure:6311: 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 @@ -6650,7 +6320,7 @@ int main() { int32_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int32_t=true else @@ -6672,12 +6342,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:6676: checking for int64_t" >&5 +echo "configure:6346: 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 @@ -6685,7 +6355,7 @@ int main() { int64_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64_t=true else @@ -6707,12 +6377,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64""... $ac_c" 1>&6 -echo "configure:6711: checking for int64" >&5 +echo "configure:6381: 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 @@ -6720,7 +6390,7 @@ int main() { int64 foo = 0; ; return 0; } EOF -if { (eval echo configure:6724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64=true else @@ -6742,12 +6412,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:6746: checking for uint" >&5 +echo "configure:6416: 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 @@ -6755,7 +6425,7 @@ int main() { uint foo = 0; ; return 0; } EOF -if { (eval echo configure:6759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint=true else @@ -6777,12 +6447,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 -echo "configure:6781: checking for uint_t" >&5 +echo "configure:6451: 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 @@ -6790,7 +6460,7 @@ int main() { uint_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint_t=true else @@ -6812,12 +6482,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:6816: checking for uint16_t" >&5 +echo "configure:6486: 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 @@ -6825,7 +6495,7 @@ int main() { uint16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint16_t=true else @@ -6856,12 +6526,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 -echo "configure:6860: checking for uname.domainname" >&5 +echo "configure:6530: 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() { @@ -6869,7 +6539,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->domainname; } ; return 0; } EOF -if { (eval echo configure:6873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_domainname_field=true else @@ -6893,12 +6563,12 @@ else fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 -echo "configure:6897: checking for uname.__domainname" >&5 +echo "configure:6567: 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() { @@ -6906,7 +6576,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->__domainname; } ; return 0; } EOF -if { (eval echo configure:6910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_us_domainname_field=true else @@ -6939,7 +6609,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 -echo "configure:6943: checking for usable wchar_t (2 bytes, unsigned)" >&5 +echo "configure:6613: 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 @@ -6947,14 +6617,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:6958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6628: \"$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 @@ -6989,7 +6659,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:6993: checking for compiler -fshort-wchar option" >&5 +echo "configure:6663: 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 @@ -6997,14 +6667,14 @@ else ac_cv_have_usable_wchar_option="maybe" else cat > conftest.$ac_ext < int main () { return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ; } EOF -if { (eval echo configure:7008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6678: \"$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 @@ -7040,7 +6710,7 @@ fi if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 -echo "configure:7044: checking for visibility(hidden) attribute" >&5 +echo "configure:6714: checking for visibility(hidden) attribute" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7064,7 +6734,7 @@ echo "$ac_t""$ac_cv_visibility_hidden" 1>&6 EOF echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 -echo "configure:7068: checking for visibility pragma support" >&5 +echo "configure:6738: checking for visibility pragma support" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7106,12 +6776,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:7110: checking for $ac_hdr that defines DIR" >&5 +echo "configure:6780: 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> @@ -7119,7 +6789,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:7123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -7144,7 +6814,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:7148: checking for opendir in -ldir" >&5 +echo "configure:6818: 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 @@ -7152,7 +6822,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:6837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7185,7 +6855,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:7189: checking for opendir in -lx" >&5 +echo "configure:6859: 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 @@ -7193,7 +6863,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:6878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7236,17 +6906,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:7240: checking for $ac_hdr" >&5 +echo "configure:6910: 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:7250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6920: \"$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* @@ -7276,17 +6946,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:7280: checking for $ac_hdr" >&5 +echo "configure:6950: 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:7290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6960: \"$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* @@ -7316,17 +6986,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:7320: checking for $ac_hdr" >&5 +echo "configure:6990: 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:7330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7000: \"$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* @@ -7356,17 +7026,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:7360: checking for $ac_hdr" >&5 +echo "configure:7030: 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:7370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7040: \"$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* @@ -7396,17 +7066,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:7400: checking for $ac_hdr" >&5 +echo "configure:7070: 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:7410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7080: \"$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* @@ -7437,17 +7107,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:7441: checking for $ac_hdr" >&5 +echo "configure:7111: 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:7451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7121: \"$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* @@ -7478,17 +7148,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:7482: checking for $ac_hdr" >&5 +echo "configure:7152: 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:7492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7162: \"$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* @@ -7525,17 +7195,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:7529: checking for new" >&5 +echo "configure:7199: 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:7539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7209: \"$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* @@ -7576,17 +7246,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:7580: checking for $ac_hdr" >&5 +echo "configure:7250: 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:7590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7260: \"$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* @@ -7620,7 +7290,7 @@ case $target in ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:7624: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:7294: 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 @@ -7628,7 +7298,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:7313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7669,7 +7339,7 @@ fi ;; esac echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 -echo "configure:7673: checking for atan in -lm" >&5 +echo "configure:7343: 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 @@ -7677,7 +7347,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:7362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7722,7 +7392,7 @@ case $target in ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7726: checking for dlopen in -ldl" >&5 +echo "configure:7396: 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 @@ -7730,7 +7400,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:7415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7758,17 +7428,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:7762: checking for dlfcn.h" >&5 +echo "configure:7432: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7442: \"$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* @@ -7804,7 +7474,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:7808: checking for demangle in -lC_r" >&5 +echo "configure:7478: 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 @@ -7812,7 +7482,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:7497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7853,7 +7523,7 @@ fi ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:7857: checking for demangle in -lC" >&5 +echo "configure:7527: 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 @@ -7861,7 +7531,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:7546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7903,7 +7573,7 @@ fi esac fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:7907: checking for socket in -lsocket" >&5 +echo "configure:7577: 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 @@ -7911,7 +7581,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:7596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7967,7 +7637,7 @@ EOF _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:7971: checking for XDrawLines in -lX11" >&5 +echo "configure:7641: 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 @@ -7975,7 +7645,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:7660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8008,7 +7678,7 @@ MISSING_X="$MISSING_X -lX11" fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:8012: checking for XextAddDisplay in -lXext" >&5 +echo "configure:7682: 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 @@ -8016,7 +7686,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:7701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8051,7 +7721,7 @@ fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:8055: checking for XtFree in -lXt" >&5 +echo "configure:7725: 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 @@ -8059,7 +7729,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:7744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8091,7 +7761,7 @@ else unset ac_cv_lib_Xt_XtFree echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:8095: checking for IceFlush in -lICE" >&5 +echo "configure:7765: 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 @@ -8099,7 +7769,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:7784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8131,7 +7801,7 @@ else fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:8135: checking for SmcCloseConnection in -lSM" >&5 +echo "configure:7805: 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 @@ -8139,7 +7809,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:7824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8171,7 +7841,7 @@ else fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:8175: checking for XtFree in -lXt" >&5 +echo "configure:7845: 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 @@ -8179,7 +7849,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:7864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8224,7 +7894,7 @@ fi esac echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 -echo "configure:8228: checking for XineramaIsActive in -lXinerama" >&5 +echo "configure:7898: 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 @@ -8232,7 +7902,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:7917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8265,17 +7935,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:8269: checking for X11/extensions/Xinerama.h" >&5 +echo "configure:7939: 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:8279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7949: \"$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* @@ -8298,7 +7968,7 @@ fi echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 -echo "configure:8302: checking for XShmCreateImage in -lXext" >&5 +echo "configure:7972: 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 @@ -8306,7 +7976,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:7991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8339,17 +8009,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:8343: checking for X11/extensions/XShm.h" >&5 +echo "configure:8013: 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:8353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8023: \"$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* @@ -8379,7 +8049,7 @@ EOF fi echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 -echo "configure:8383: checking for XieFloGeometry in -lXIE" >&5 +echo "configure:8053: 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 @@ -8387,7 +8057,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:8072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8420,17 +8090,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:8424: checking for X11/extensions/XIElib.h" >&5 +echo "configure:8094: 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:8434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8104: \"$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* @@ -8464,198 +8134,7 @@ fi LDFLAGS="$_SAVE_LDFLAGS" - # Check whether --with-freetype-prefix or --without-freetype-prefix was given. -if test "${with_freetype_prefix+set}" = set; then - withval="$with_freetype_prefix" - ft_config_prefix="$withval" -else - ft_config_prefix="" -fi - -# Check whether --with-freetype-exec-prefix or --without-freetype-exec-prefix was given. -if test "${with_freetype_exec_prefix+set}" = set; then - withval="$with_freetype_exec_prefix" - ft_config_exec_prefix="$withval" -else - ft_config_exec_prefix="" -fi - -# Check whether --enable-freetypetest or --disable-freetypetest was given. -if test "${enable_freetypetest+set}" = set; then - enableval="$enable_freetypetest" - : -else - enable_fttest=yes -fi - - -if test x$ft_config_exec_prefix != x ; then - ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix" - if test x${FT2_CONFIG+set} != xset ; then - FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config - fi -fi -if test x$ft_config_prefix != x ; then - ft_config_args="$ft_config_args --prefix=$ft_config_prefix" - if test x${FT2_CONFIG+set} != xset ; then - FT2_CONFIG=$ft_config_prefix/bin/freetype-config - fi -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:8508: 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 - case "$FT2_CONFIG" in - /*) - ac_cv_path_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_FT2_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_FT2_CONFIG" && ac_cv_path_FT2_CONFIG="no" - ;; -esac -fi -FT2_CONFIG="$ac_cv_path_FT2_CONFIG" -if test -n "$FT2_CONFIG"; then - echo "$ac_t""$FT2_CONFIG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -min_ft_version=6.1.0 -echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 -echo "configure:8544: checking for FreeType - version >= $min_ft_version" >&5 -no_ft="" -if test "$FT2_CONFIG" = "no" ; then - no_ft=yes -else - FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags` - FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs` - ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - ft_min_major_version=`echo $min_ft_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - ft_min_minor_version=`echo $min_ft_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - ft_min_micro_version=`echo $min_ft_version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_fttest" = "xyes" ; then - ft_config_is_lt=no - if test $ft_config_major_version -lt $ft_min_major_version ; then - ft_config_is_lt=yes - else - if test $ft_config_major_version -eq $ft_min_major_version ; then - if test $ft_config_minor_version -lt $ft_min_minor_version ; then - ft_config_is_lt=yes - else - if test $ft_config_minor_version -eq $ft_min_minor_version ; then - if test $ft_config_micro_version -lt $ft_min_micro_version ; then - ft_config_is_lt=yes - fi - fi - fi - fi - fi - if test "x$ft_config_is_lt" = "xyes" ; then - _HAVE_FREETYPE2= - echo "$ac_t""no" 1>&6 - else - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $FT2_CFLAGS" - LIBS="$FT2_LIBS $LIBS" - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat > conftest.$ac_ext < -#include FT_FREETYPE_H -#include -#include - -int -main() -{ - FT_Library library; - FT_Error error; - - error = FT_Init_FreeType(&library); - - if (error) - return 1; - else - { - FT_Done_FreeType(library); - return 0; - } -} - -EOF -if { (eval echo configure:8618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - no_ft=yes -fi -rm -fr conftest* -fi - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi # test $ft_config_version -lt $ft_min_version - fi # test "x$enable_fttest" = "xyes" -fi # test "$FT2_CONFIG" = "no" -if test "x$ft_config_is_lt" != "xyes" ; then - if test "x$no_ft" = x ; then - echo "$ac_t""yes" 1>&6 - _HAVE_FREETYPE2=1 - else - echo "$ac_t""no" 1>&6 - if test "$FT2_CONFIG" = "no" ; then - echo "*** The freetype-config script installed by FreeType 2 could not be found." - echo "*** If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the FT2_CONFIG environment variable to the" - echo "*** full path to freetype-config." - else - echo "*** The FreeType test program failed to run. If your system uses" - echo "*** shared libraries and they are installed outside the normal" - echo "*** system library path, make sure the variable LD_LIBRARY_PATH" - echo "*** (or whatever is appropiate for your system) is correctly set." - fi - FT2_CFLAGS="" - FT2_LIBS="" - _HAVE_FREETYPE2= - fi - - -fi - + AC_CHECK_FT2(6.1.0, _HAVE_FREETYPE2=1, _HAVE_FREETYPE2=) fi # $no_x @@ -8664,131 +8143,34 @@ fi # $no_x +MOZ_CHECK_PTHREADS(pthreads, + USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", + MOZ_CHECK_PTHREADS(pthread, + USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", + MOZ_CHECK_PTHREADS(c_r, + USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", + MOZ_CHECK_PTHREADS(c, + USE_PTHREADS=1 + ) + ) + ) +) -echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:8670: checking for pthread_create in -lpthreads" >&5 -echo " - #include - void *foo(void *v) { int a = 1; } - int main() { - pthread_t t; - if (!pthread_create(&t, 0, &foo, 0)) { - pthread_join(t, 0); - } - exit(0); - }" > dummy.c ; - echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthreads $LDFLAGS $LIBS" 1>&5; - ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthreads $LDFLAGS $LIBS 2>&5; - _res=$? ; - rm -f dummy.c dummy${ac_exeext} ; - if test "$_res" = "0"; then - echo "$ac_t""yes" 1>&6 - USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads" - else - echo "$ac_t""no" 1>&6 - -echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:8692: checking for pthread_create in -lpthread" >&5 -echo " - #include - void *foo(void *v) { int a = 1; } - int main() { - pthread_t t; - if (!pthread_create(&t, 0, &foo, 0)) { - pthread_join(t, 0); - } - exit(0); - }" > dummy.c ; - echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthread $LDFLAGS $LIBS" 1>&5; - ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthread $LDFLAGS $LIBS 2>&5; - _res=$? ; - rm -f dummy.c dummy${ac_exeext} ; - if test "$_res" = "0"; then - echo "$ac_t""yes" 1>&6 - USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread" - else - echo "$ac_t""no" 1>&6 - -echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:8714: checking for pthread_create in -lc_r" >&5 -echo " - #include - void *foo(void *v) { int a = 1; } - int main() { - pthread_t t; - if (!pthread_create(&t, 0, &foo, 0)) { - pthread_join(t, 0); - } - exit(0); - }" > dummy.c ; - echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lc_r $LDFLAGS $LIBS" 1>&5; - ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lc_r $LDFLAGS $LIBS 2>&5; - _res=$? ; - rm -f dummy.c dummy${ac_exeext} ; - if test "$_res" = "0"; then - echo "$ac_t""yes" 1>&6 - USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r" - else - echo "$ac_t""no" 1>&6 - -echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:8736: checking for pthread_create in -lc" >&5 -echo " - #include - void *foo(void *v) { int a = 1; } - int main() { - pthread_t t; - if (!pthread_create(&t, 0, &foo, 0)) { - pthread_join(t, 0); - } - exit(0); - }" > dummy.c ; - echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lc $LDFLAGS $LIBS" 1>&5; - ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lc $LDFLAGS $LIBS 2>&5; - _res=$? ; - rm -f dummy.c dummy${ac_exeext} ; - if test "$_res" = "0"; then - echo "$ac_t""yes" 1>&6 - USE_PTHREADS=1 - - else - echo "$ac_t""no" 1>&6 - - fi - - - fi - - - fi - - - fi - - -# Check whether --with-pthreads or --without-pthreads was given. -if test "${with_pthreads+set}" = set; then - withval="$with_pthreads" - if test "$withval" = "yes"; then - if test "$USE_PTHREADS"x = x; then - { echo "configure: error: --with-pthreads specified for a system without pthread support " 1>&2; exit 1; }; -fi - elif test "$withval" = "no"; then +MOZ_ARG_WITH_BOOL(pthreads, + --with-pthreads Force use of system pthread library with NSPR , + if test "$USE_PTHREADS"x = x; then + AC_MSG_ERROR([ --with-pthreads specified for a system without pthread support ]); +fi, USE_PTHREADS= _PTHREAD_LDFLAGS= - - else - { echo "configure: error: Option, pthreads, does not take an argument ($withval)." 1>&2; exit 1; } - fi -fi - +) if test "$USE_PTHREADS"x != x 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:8792: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:8174: 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 @@ -8811,7 +8193,7 @@ echo "configure:8792: 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:8815: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:8197: 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 @@ -8906,14 +8288,11 @@ EOF fi -# Check whether --enable-macos-target or --disable-macos-target was given. -if test "${enable_macos_target+set}" = set; then - enableval="$enable_macos_target" - MACOS_DEPLOYMENT_TARGET_STR=$enableval -else - MACOS_DEPLOYMENT_TARGET_STR=10.1 -fi - +MOZ_ARG_ENABLE_STRING(macos-target, + --enable-macos-target=VER (default=10.1) + Set the minimum MacOS version needed at runtime, + MACOS_DEPLOYMENT_TARGET_STR=$enableval, + MACOS_DEPLOYMENT_TARGET_STR=10.1) case "$target" in *-darwin*) @@ -8942,7 +8321,7 @@ esac echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 -echo "configure:8946: checking whether mmap() sees write()s" >&5 +echo "configure:8325: checking whether mmap() sees write()s" >&5 mmap_test_prog=' @@ -8981,11 +8360,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:8368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -9010,13 +8389,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:9014: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:8393: 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 @@ -9034,7 +8413,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -9056,7 +8435,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:9060: checking for 8-bit clean memcmp" >&5 +echo "configure:8439: 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 @@ -9064,7 +8443,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:8457: \"$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 @@ -9094,12 +8473,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9098: checking for $ac_func" >&5 +echo "configure:8477: 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:8505: \"$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 @@ -9149,12 +8528,12 @@ done for ac_func in flockfile getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9153: checking for $ac_func" >&5 +echo "configure:8532: 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:8560: \"$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 @@ -9206,12 +8585,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:9210: checking for $ac_func" >&5 +echo "configure:8589: 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:8617: \"$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 @@ -9270,19 +8649,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:9274: checking for wcrtomb" >&5 +echo "configure:8653: 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:9286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_wcrtomb="yes" else @@ -9302,19 +8681,19 @@ EOF fi echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 -echo "configure:9306: checking for mbrtowc" >&5 +echo "configure:8685: 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:9318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_mbrtowc="yes" else @@ -9343,12 +8722,12 @@ cross_compiling=$ac_cv_prog_cc_cross fi echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 -echo "configure:9347: checking for res_ninit()" >&5 +echo "configure:8726: 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:8743: \"$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 @@ -9390,12 +8769,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:9394: checking for gnu_get_libc_version()" >&5 +echo "configure:8773: 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:8789: \"$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 @@ -9435,7 +8814,7 @@ case $target_os in *) echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 -echo "configure:9439: checking for iconv in -lc" >&5 +echo "configure:8818: checking for iconv in -lc" >&5 ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9443,7 +8822,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:8840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9476,7 +8855,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:9480: checking for iconv in -liconv" >&5 +echo "configure:8859: 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 @@ -9484,7 +8863,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:8881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9517,7 +8896,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:9521: checking for libiconv in -liconv" >&5 +echo "configure:8900: 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 @@ -9525,7 +8904,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:8922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9566,12 +8945,12 @@ fi _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" echo $ac_n "checking for iconv()""... $ac_c" 1>&6 -echo "configure:9570: checking for iconv()" >&5 +echo "configure:8949: 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 < @@ -9585,7 +8964,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_iconv=yes else @@ -9609,12 +8988,12 @@ EOF LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" LIBICONV="$_ICONV_LIBS" echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 -echo "configure:9613: checking for iconv() with const input" >&5 +echo "configure:8992: 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 < @@ -9629,7 +9008,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_const_iconv=yes else @@ -9656,42 +9035,7 @@ LIBS=$_SAVE_LIBS ;; esac - - echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:9662: checking for nl_langinfo and CODESET" >&5 -if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -int main() { -char* cs = nl_langinfo(CODESET); -; return 0; } -EOF -if { (eval echo configure:9674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_langinfo_codeset=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - am_cv_langinfo_codeset=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 - if test $am_cv_langinfo_codeset = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_LANGINFO_CODESET 1 -EOF - - HAVE_LANGINFO_CODESET=1 - fi - +AM_LANGINFO_CODESET ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -9702,7 +9046,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 -echo "configure:9706: checking for an implementation of va_copy()" >&5 +echo "configure:9050: 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 @@ -9712,7 +9056,7 @@ else else cat > conftest.$ac_ext < @@ -9726,7 +9070,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:9730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9074: \"$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 @@ -9743,7 +9087,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:9747: checking for an implementation of __va_copy()" >&5 +echo "configure:9091: 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 @@ -9753,7 +9097,7 @@ else else cat > conftest.$ac_ext < @@ -9767,7 +9111,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:9771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9115: \"$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 @@ -9784,7 +9128,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:9788: checking whether va_lists can be copied by value" >&5 +echo "configure:9132: 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 @@ -9794,7 +9138,7 @@ else else cat > conftest.$ac_ext < @@ -9808,7 +9152,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:9812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9156: \"$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 @@ -9907,7 +9251,7 @@ esac if test "$GNU_CXX"; then echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 -echo "configure:9911: checking for C++ exceptions flag" >&5 +echo "configure:9255: 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 @@ -9942,12 +9286,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:9946: checking for gcc 3.0 ABI" >&5 +echo "configure:9290: 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:9308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_three_abi="yes" else @@ -9981,12 +9325,12 @@ fi echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 -echo "configure:9985: checking for C++ \"explicit\" keyword" >&5 +echo "configure:9329: 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:9344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else @@ -10017,12 +9361,12 @@ EOF fi echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 -echo "configure:10021: checking for C++ \"typename\" keyword" >&5 +echo "configure:9365: checking for C++ \"typename\" keyword" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < A; A.foo(0); ; return 0; } EOF -if { (eval echo configure:10045: \"$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_cpp_typename=yes else @@ -10062,12 +9406,12 @@ EOF fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 -echo "configure:10066: checking for modern C++ template specialization syntax support" >&5 +echo "configure:9410: 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 {}; @@ -10077,7 +9421,7 @@ X int_x; X y_x; ; return 0; } EOF -if { (eval echo configure:10081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else @@ -10099,12 +9443,12 @@ fi echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 -echo "configure:10103: checking whether partial template specialization works" >&5 +echo "configure:9447: 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 {}; @@ -10112,7 +9456,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:10116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_partial_specialization=yes else @@ -10133,12 +9477,12 @@ EOF fi echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 -echo "configure:10137: checking whether operators must be re-defined for templates derived from templates" >&5 +echo "configure:9481: 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 @@ -10150,7 +9494,7 @@ Derived a, b; return 0; ; return 0; } EOF -if { (eval echo configure:10154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_derived_template_operators=no else @@ -10172,12 +9516,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:10176: checking whether we need to cast a derived template to pass as its base class" >&5 +echo "configure:9520: 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 { }; @@ -10186,7 +9530,7 @@ int main() { Derived bar; return foo(bar); ; return 0; } EOF -if { (eval echo configure:10190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_cpp_template_cast_to_base=no else @@ -10207,12 +9551,12 @@ EOF fi echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 -echo "configure:10211: checking whether the compiler can resolve const ambiguities for templates" >&5 +echo "configure:9555: 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 { @@ -10233,7 +9577,7 @@ int main() { a(&i); ; return 0; } EOF -if { (eval echo configure:10237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_can_resolve_const_ambiguity=yes else @@ -10255,12 +9599,12 @@ fi echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 -echo "configure:10259: checking whether the C++ \"using\" keyword can change access" >&5 +echo "configure:9603: 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:9616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_access_changing_using2=no else @@ -10307,12 +9651,12 @@ EOF fi echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 -echo "configure:10311: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 +echo "configure:9655: 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:9676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_ambiguity_resolving_using=yes else @@ -10349,19 +9693,19 @@ EOF fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 -echo "configure:10353: checking for \"std::\" namespace" >&5 +echo "configure:9697: 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:10365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespace_std=yes else @@ -10382,12 +9726,12 @@ EOF fi echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 -echo "configure:10386: checking whether standard template operator!=() is ambiguous" >&5 +echo "configure:9730: 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 {}; @@ -10397,7 +9741,7 @@ int main() { T1 a,b; return a != b; ; return 0; } EOF -if { (eval echo configure:10401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_unambiguous_std_notequal=unambiguous else @@ -10419,12 +9763,12 @@ fi echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 -echo "configure:10423: checking for C++ reinterpret_cast" >&5 +echo "configure:9767: 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:10436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else @@ -10453,7 +9797,7 @@ EOF fi echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 -echo "configure:10457: checking for C++ dynamic_cast to void*" >&5 +echo "configure:9801: 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 @@ -10461,7 +9805,7 @@ else ac_cv_cpp_dynamic_cast_void_ptr=no else cat > conftest.$ac_ext <(suby)))); } EOF -if { (eval echo configure:10481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9825: \"$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 @@ -10501,19 +9845,19 @@ fi echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 -echo "configure:10505: checking whether C++ requires implementation of unused virtual methods" >&5 +echo "configure:9849: 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:9861: \"$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 @@ -10536,12 +9880,12 @@ fi echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 -echo "configure:10540: checking for trouble comparing to zero near std::operator!=()" >&5 +echo "configure:9884: 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 {}; @@ -10552,7 +9896,7 @@ int main() { Foo f; return (0 != f); ; return 0; } EOF -if { (eval echo configure:10556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_trouble_comparing_to_zero=no else @@ -10584,19 +9928,19 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:10588: checking for LC_MESSAGES" >&5 +echo "configure:9932: 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:10600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_i18n_lc_messages=yes else @@ -10620,20 +9964,11 @@ fi # SKIP_COMPILER_CHECKS -# External Packages - -# Check whether --with-system-nspr or --without-system-nspr was given. -if test "${with_system_nspr+set}" = set; then - withval="$with_system_nspr" - if test "$withval" = "yes"; then - _USE_SYSTEM_NSPR=1 - elif test "$withval" = "no"; then - : - else - { echo "configure: error: Option, system-nspr, does not take an argument ($withval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_HEADER(External Packages) +MOZ_ARG_WITH_BOOL(system-nspr, + --with-system-nspr Use system installed NSPR, + _USE_SYSTEM_NSPR=1 ) if test -n "$_USE_SYSTEM_NSPR"; then @@ -10672,7 +10007,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:10676: checking for $ac_word" >&5 +echo "configure:10011: 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 @@ -10707,7 +10042,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:10711: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 +echo "configure:10046: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 no_nspr="" if test "$NSPR_CONFIG" = "no"; then @@ -10756,12 +10091,10 @@ if test -z "$MOZ_NATIVE_NSPR"; then fi if test -z "$SKIP_LIBRARY_CHECKS"; then -# Check whether --with-system-jpeg or --without-system-jpeg was given. -if test "${with_system_jpeg+set}" = set; then - withval="$with_system_jpeg" - JPEG_DIR=$withval -fi - +MOZ_ARG_WITH_STRING(system-jpeg, + --with-system-jpeg[=PFX] + Use system libjpeg [installed at prefix PFX], + JPEG_DIR=$withval) _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS @@ -10774,7 +10107,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:10778: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:10111: 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 @@ -10782,7 +10115,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:10130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10822,7 +10155,7 @@ if test "$SYSTEM_JPEG" = 1; then SYSTEM_JPEG= else cat > conftest.$ac_ext < #include @@ -10836,7 +10169,7 @@ else } EOF -if { (eval echo configure:10840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else @@ -10859,12 +10192,10 @@ if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$SYSTEM_JPEG" = 1; then JPEG_LIBS="-L${JPEG_DIR}/lib ${JPEG_LIBS}" fi -# Check whether --with-system-zlib or --without-system-zlib was given. -if test "${with_system_zlib+set}" = set; then - withval="$with_system_zlib" - ZLIB_DIR=$withval -fi - +MOZ_ARG_WITH_STRING(system-zlib, + --with-system-zlib[=PFX] + Use system libz [installed at prefix PFX], + ZLIB_DIR=$withval) _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS @@ -10877,7 +10208,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:10881: checking for gzread in -lz" >&5 +echo "configure:10212: 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 @@ -10885,7 +10216,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:10231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10924,7 +10255,7 @@ if test "$SYSTEM_ZLIB" = 1; then SYSTEM_ZLIB= else cat > conftest.$ac_ext < @@ -10945,7 +10276,7 @@ else } EOF -if { (eval echo configure:10949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_ZLIB=1 else @@ -10968,12 +10299,10 @@ if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" fi -# Check whether --with-system-png or --without-system-png was given. -if test "${with_system_png+set}" = set; then - withval="$with_system_png" - PNG_DIR=$withval -fi - +MOZ_ARG_WITH_STRING(system-png, + --with-system-png[=PFX] + Use system libpng [installed at prefix PFX], + PNG_DIR=$withval) _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS @@ -10988,7 +10317,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:10992: checking for png_get_valid in -lpng" >&5 +echo "configure:10321: 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 @@ -10996,7 +10325,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:10340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11035,7 +10364,7 @@ if test "$SYSTEM_PNG" = 1; then SYSTEM_PNG= else cat > conftest.$ac_ext < #include @@ -11049,7 +10378,7 @@ else } EOF -if { (eval echo configure:11053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else @@ -11072,18 +10401,10 @@ if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}" fi -# Check whether --enable-cairo or --disable-cairo was given. -if test "${enable_cairo+set}" = set; then - enableval="$enable_cairo" - if test "$enableval" = "yes"; then - MOZ_ENABLE_CAIRO=1 - elif test "$enableval" = "no"; then - MOZ_ENABLE_CAIRO= - else - { echo "configure: error: Option, cairo, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(cairo, + --enable-cairo Enable Cairo-specific features (Canvas), + MOZ_ENABLE_CAIRO=1, + MOZ_ENABLE_CAIRO= ) if test "$MOZ_ENABLE_CAIRO"; then cat >> confdefs.h <<\EOF #define MOZ_ENABLE_CAIRO 1 @@ -11093,16 +10414,20 @@ fi fi # SKIP_LIBRARY_CHECKS -# Toolkit Options - - # Check whether --enable-default-toolkit or --disable-default-toolkit was given. -if test "${enable_default_toolkit+set}" = set; then - enableval="$enable_default_toolkit" - _DEFAULT_TOOLKIT=$enableval -else - _DEFAULT_TOOLKIT=$_PLATFORM_DEFAULT_TOOLKIT -fi +MOZ_ARG_HEADER(Toolkit Options) + MOZ_ARG_ENABLE_STRING(default-toolkit, + --enable-default-toolkit=TK + 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) if test "$_DEFAULT_TOOLKIT" = "gtk" \ -o "$_DEFAULT_TOOLKIT" = "qt" \ @@ -11247,268 +10572,8 @@ fi if test "$MOZ_ENABLE_GTK" then - # Check whether --with-gtk-prefix or --without-gtk-prefix was given. -if test "${with_gtk_prefix+set}" = set; then - withval="$with_gtk_prefix" - gtk_config_prefix="$withval" -else - gtk_config_prefix="" -fi - -# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. -if test "${with_gtk_exec_prefix+set}" = set; then - withval="$with_gtk_exec_prefix" - gtk_config_exec_prefix="$withval" -else - gtk_config_exec_prefix="" -fi - -# Check whether --enable-gtktest or --disable-gtktest was given. -if test "${enable_gtktest+set}" = set; then - enableval="$enable_gtktest" - : -else - enable_gtktest=yes -fi - - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - unset ac_cv_path_GTK_CONFIG - - # 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:11294: 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 - case "$GTK_CONFIG" in - /*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -esac -fi -GTK_CONFIG="$ac_cv_path_GTK_CONFIG" -if test -n "$GTK_CONFIG"; then - echo "$ac_t""$GTK_CONFIG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - min_gtk_version=$GTK_VERSION - echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:11329: checking for GTK - version >= $min_gtk_version" >&5 - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - rm -f conf.gtktest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat > conftest.$ac_ext < -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} - -EOF -if { (eval echo configure:11430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - no_gtk=yes -fi -rm -fr conftest* -fi - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - echo "$ac_t""yes" 1>&6 - : - else - echo "$ac_t""no" 1>&6 - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found." - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - echo "*** GTK+ is available from ftp://ftp.gtk.org/pub/gtk" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - cat > conftest.$ac_ext < -#include - -int main() { - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); -; return 0; } -EOF -if { (eval echo configure:11475: \"$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" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -fi -rm -f conftest* - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - { echo "configure: error: Test for GTK failed." 1>&2; exit 1; } - fi - - - rm -f conf.gtktest - + AM_PATH_GTK($GTK_VERSION,, + { echo "configure: error: Test for GTK failed." 1>&2; exit 1; }) MOZ_GTK_LDFLAGS=$GTK_LIBS MOZ_GTK_CFLAGS=$GTK_CFLAGS @@ -11523,7 +10588,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:11527: checking for $ac_word" >&5 +echo "configure:10592: 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 @@ -11567,19 +10632,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:11571: checking for gtk+-2.0 >= 1.3.7" >&5 +echo "configure:10636: 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:11578: checking MOZ_GTK2_CFLAGS" >&5 +echo "configure:10643: 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:11583: checking MOZ_GTK2_LIBS" >&5 +echo "configure:10648: checking MOZ_GTK2_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`" @@ -11618,12 +10683,9 @@ fi if test "$MOZ_ENABLE_QT" then - # Check whether --with-qtdir or --without-qtdir was given. -if test "${with_qtdir+set}" = set; then - withval="$with_qtdir" - QTDIR=$withval -fi - + MOZ_ARG_WITH_STRING(qtdir, + --with-qtdir=\$dir Specify Qt directory , + QTDIR=$withval) if test -z "$QTDIR"; then QTDIR="/usr" @@ -11644,7 +10706,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:11648: checking for $ac_word" >&5 +echo "configure:10710: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11696,7 +10758,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 -echo "configure:11700: checking for main in -lqt" >&5 +echo "configure:10762: checking for main in -lqt" >&5 ac_lib_var=`echo qt'_'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 @@ -11704,14 +10766,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lqt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11730,7 +10792,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 main in -lqt-mt""... $ac_c" 1>&6 -echo "configure:11734: checking for main in -lqt-mt" >&5 +echo "configure:10796: checking for main in -lqt-mt" >&5 ac_lib_var=`echo qt-mt'_'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 @@ -11738,14 +10800,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lqt-mt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11781,9 +10843,9 @@ fi LIBS="$LIBS $QT_LIBS" echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 -echo "configure:11785: checking Qt - version >= $QT_VERSION" >&5 +echo "configure:10847: checking Qt - version >= $QT_VERSION" >&5 cat > conftest.$ac_ext < int main() { @@ -11794,7 +10856,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else @@ -11862,7 +10924,7 @@ fi -# Application +MOZ_ARG_HEADER(Application) MOZ_CALENDAR= MOZ_MAIL_NEWS= @@ -11873,12 +10935,19 @@ MOZ_IPCD= MOZ_PROFILELOCKING=1 MOZ_ENABLE_LIBXUL= -# Check whether --enable-application or --disable-application was given. -if test "${enable_application+set}" = set; then - enableval="$enable_application" - MOZ_BUILD_APP=$enableval -fi - +MOZ_ARG_ENABLE_STRING(application, + --enable-application=APP + Options include: + suite + browser (Firefox) + mail (Thunderbird) + composer + calendar + xulrunner + macbrowser (Camino) + standalone (use this for standalone + xpcom/xpconnect or to manually drive a build), + MOZ_BUILD_APP=$enableval ) case "$MOZ_BUILD_APP" in suite) @@ -12004,59 +11073,33 @@ EOF fi -# Components and Features +MOZ_ARG_HEADER(Components and Features) MOZ_UI_LOCALE=en-US -# Check whether --enable-ui-locale or --disable-ui-locale was given. -if test "${enable_ui_locale+set}" = set; then - enableval="$enable_ui_locale" - MOZ_UI_LOCALE=$enableval -fi +MOZ_ARG_ENABLE_STRING(ui-locale, + --enable-ui-locale=ab-CD + Select the user interface locale (default: en-US), + MOZ_UI_LOCALE=$enableval ) - -# Check whether --enable-calendar or --disable-calendar was given. -if test "${enable_calendar+set}" = set; then - enableval="$enable_calendar" - if test "$enableval" = "yes"; then - MOZ_CALENDAR=1 - elif test "$enableval" = "no"; then - MOZ_CALENDAR= - else - { echo "configure: error: Option, calendar, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_ENABLE_BOOL(calendar, + --enable-calendar Enable building of the calendar client, + MOZ_CALENDAR=1, + MOZ_CALENDAR= ) - -# Check whether --enable-mailnews or --disable-mailnews was given. -if test "${enable_mailnews+set}" = set; then - enableval="$enable_mailnews" - if test "$enableval" = "no"; then - MOZ_MAIL_NEWS= - elif test "$enableval" = "yes"; then - MOZ_MAIL_NEWS=1 - else - { echo "configure: error: Option, mailnews, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_DISABLE_BOOL(mailnews, + --disable-mailnews Disable building of mail & news components, + MOZ_MAIL_NEWS=, + MOZ_MAIL_NEWS=1 ) - -# Check whether --enable-static-mail or --disable-static-mail was given. -if test "${enable_static_mail+set}" = set; then - enableval="$enable_static_mail" - if test "$enableval" = "yes"; then - MOZ_STATIC_MAIL_BUILD=1 - elif test "$enableval" = "no"; then - MOZ_STATIC_MAIL_BUILD= - else - { echo "configure: error: Option, static-mail, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(static-mail, + --enable-static-mail Enable static mail build support, + MOZ_STATIC_MAIL_BUILD=1, + MOZ_STATIC_MAIL_BUILD= ) if test "$MOZ_STATIC_MAIL_BUILD"; then cat >> confdefs.h <<\EOF @@ -12067,41 +11110,26 @@ fi -# Check whether --enable-ldap or --disable-ldap was given. -if test "${enable_ldap+set}" = set; then - enableval="$enable_ldap" - 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 -fi +MOZ_ARG_DISABLE_BOOL(ldap, + --disable-ldap Disable LDAP support, + MOZ_LDAP_XPCOM=, + MOZ_LDAP_XPCOM=1) - -# Check whether --enable-official-branding or --disable-official-branding was given. -if test "${enable_official_branding+set}" = set; then - enableval="$enable_official_branding" - if test "$enableval" = "yes"; then - MOZ_USE_OFFICIAL_BRANDING=1 - elif test "$enableval" = "no"; then - MOZ_USE_OFFICIAL_BRANDING= - else - { echo "configure: error: Option, official-branding, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_ENABLE_BOOL(official-branding, + --enable-official-branding Enable Official mozilla.org Branding + Do not distribute builds with + --enable-official-branding unless you have + permission to use trademarks per + http://www.mozilla.org/foundation/trademarks/ ., + MOZ_USE_OFFICIAL_BRANDING=1, + MOZ_USE_OFFICIAL_BRANDING= ) - -# Check whether --with-distribution-id or --without-distribution-id was given. -if test "${with_distribution_id+set}" = set; then - withval="$with_distribution_id" - val=`echo $withval` - MOZ_DISTRIBUTION_ID="$val" -fi - +MOZ_ARG_WITH_STRING(distribution-id, + --with-distribution-id=ID Set distribution-specific id (default=org.mozilla), + val=`echo $withval` + MOZ_DISTRIBUTION_ID="$val") if test -z "$MOZ_DISTRIBUTION_ID"; then MOZ_DISTRIBUTION_ID="org.mozilla" @@ -12113,22 +11141,13 @@ EOF -# Check whether --enable-freetype2 or --disable-freetype2 was given. -if test "${enable_freetype2+set}" = set; then - enableval="$enable_freetype2" - if test "$enableval" = "no"; then - MOZ_ENABLE_FREETYPE2= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_FREETYPE2=1 - else - { echo "configure: error: Option, freetype2, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -else - if test "$MOZ_X11" -a "$_HAVE_FREETYPE2"; then +MOZ_ARG_DISABLE_BOOL(freetype2, + --disable-freetype2 Disable FreeType2 support , + MOZ_ENABLE_FREETYPE2=, + MOZ_ENABLE_FREETYPE2=1, + if test "$MOZ_X11" -a "$_HAVE_FREETYPE2"; then MOZ_ENABLE_FREETYPE2=1 - fi -fi - + fi) if test "$MOZ_ENABLE_FREETYPE2" && test -z "$MOZ_X11" -o -z "$_HAVE_FREETYPE2"; then { echo "configure: error: Cannot enable FreeType2 support for non-X11 toolkits or if FreeType2 is not detected." 1>&2; exit 1; } @@ -12147,18 +11166,10 @@ if test "$MOZ_ENABLE_GTK2"; then MOZ_ENABLE_XFT=1 fi -# Check whether --enable-xft or --disable-xft was given. -if test "${enable_xft+set}" = set; then - enableval="$enable_xft" - if test "$enableval" = "no"; then - MOZ_ENABLE_XFT= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_XFT=1 - else - { echo "configure: error: Option, xft, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(xft, + --disable-xft Disable Xft support , + MOZ_ENABLE_XFT=, + MOZ_ENABLE_XFT=1) if test "$MOZ_ENABLE_XFT" && test -z "$MOZ_ENABLE_GTK2"; then { echo "configure: error: Cannot enable XFT support for non-GTK2 toolkits." 1>&2; exit 1; } @@ -12181,7 +11192,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12185: checking for $ac_word" >&5 +echo "configure:11196: 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 @@ -12225,19 +11236,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:12229: checking for xft" >&5 +echo "configure:11240: 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:12236: checking MOZ_XFT_CFLAGS" >&5 +echo "configure:11247: 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:12241: checking MOZ_XFT_LIBS" >&5 +echo "configure:11252: checking MOZ_XFT_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_XFT_LIBS="`$PKG_CONFIG --libs-only-L \"xft\"` `$PKG_CONFIG --libs-only-l \"xft\"`" @@ -12272,7 +11283,7 @@ echo "configure:12241: 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:12276: checking for $ac_word" >&5 +echo "configure:11287: 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 @@ -12316,19 +11327,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:12320: checking for pango >= 1.1.0" >&5 +echo "configure:11331: 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:12327: checking _PANGOCHK_CFLAGS" >&5 +echo "configure:11338: 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:12332: checking _PANGOCHK_LIBS" >&5 +echo "configure:11343: checking _PANGOCHK_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic _PANGOCHK_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.1.0\"`" @@ -12362,18 +11373,10 @@ fi -# Check whether --enable-pango or --disable-pango was given. -if test "${enable_pango+set}" = set; then - enableval="$enable_pango" - if test "$enableval" = "yes"; then - MOZ_ENABLE_PANGO=1 - elif test "$enableval" = "no"; then - MOZ_ENABLE_PANGO= - else - { echo "configure: error: Option, pango, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(pango, + --enable-pango Enable Pango font rendering support, + MOZ_ENABLE_PANGO=1, + MOZ_ENABLE_PANGO=) if test "$MOZ_ENABLE_PANGO" then @@ -12388,7 +11391,7 @@ EOF # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12392: checking for $ac_word" >&5 +echo "configure:11395: 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 @@ -12432,19 +11435,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.5.0""... $ac_c" 1>&6 -echo "configure:12436: checking for pango >= 1.5.0" >&5 +echo "configure:11439: checking for pango >= 1.5.0" >&5 if $PKG_CONFIG --exists "pango >= 1.5.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 -echo "configure:12443: checking MOZ_PANGO_CFLAGS" >&5 +echo "configure:11446: checking MOZ_PANGO_CFLAGS" >&5 MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.5.0"` echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 -echo "configure:12448: checking MOZ_PANGO_LIBS" >&5 +echo "configure:11451: checking MOZ_PANGO_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.5.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.5.0\"`" @@ -12478,7 +11481,7 @@ echo "configure:12448: checking MOZ_PANGO_LIBS" >&5 CFLAGS="$MOZ_PANGO_CFLAGS $CFLAGS" LDFLAGS="$MOZ_PANGO_LIBS $LDFLAGS" echo $ac_n "checking for pango_fc_font_map_add_decoder_find_func in -lpangoft2-1.0""... $ac_c" 1>&6 -echo "configure:12482: checking for pango_fc_font_map_add_decoder_find_func in -lpangoft2-1.0" >&5 +echo "configure:11485: checking for pango_fc_font_map_add_decoder_find_func in -lpangoft2-1.0" >&5 ac_lib_var=`echo pangoft2-1.0'_'pango_fc_font_map_add_decoder_find_func | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12486,7 +11489,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpangoft2-1.0 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12544,18 +11547,10 @@ fi -# Check whether --enable-postscript or --disable-postscript was given. -if test "${enable_postscript+set}" = set; then - enableval="$enable_postscript" - if test "$enableval" = "no"; then - MOZ_ENABLE_POSTSCRIPT= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_POSTSCRIPT=1 - else - { echo "configure: error: Option, postscript, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(postscript, + --disable-postscript Disable PostScript printing support , + MOZ_ENABLE_POSTSCRIPT=, + MOZ_ENABLE_POSTSCRIPT=1 ) if test "$MOZ_X11" then @@ -12564,7 +11559,7 @@ then _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 -echo "configure:12568: checking for XpGetPrinterList in -lXp" >&5 +echo "configure:11563: 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 @@ -12572,7 +11567,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:11582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12610,18 +11605,10 @@ fi MOZ_XPRINT_LDFLAGS="$XLDFLAGS $XPRINT_LIBS" MOZ_XPRINT_LDFLAGS="$MOZ_XPRINT_LDFLAGS $XEXT_LIBS $X11_LIBS" - # Check whether --enable-xprint or --disable-xprint was given. -if test "${enable_xprint+set}" = set; then - enableval="$enable_xprint" - if test "$enableval" = "no"; then - MOZ_ENABLE_XPRINT= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_XPRINT=1 - else - { echo "configure: error: Option, xprint, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - + MOZ_ARG_DISABLE_BOOL(xprint, + --disable-xprint Disable Xprint printing support , + MOZ_ENABLE_XPRINT=, + MOZ_ENABLE_XPRINT=1 ) fi @@ -12634,18 +11621,10 @@ then MOZ_ENABLE_LIBGNOME=1 fi - # Check whether --enable-gnomevfs or --disable-gnomevfs was given. -if test "${enable_gnomevfs+set}" = set; then - enableval="$enable_gnomevfs" - if test "$enableval" = "no"; then - MOZ_ENABLE_GNOMEVFS= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_GNOMEVFS=force - else - { echo "configure: error: Option, gnomevfs, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - + MOZ_ARG_DISABLE_BOOL(gnomevfs, + --disable-gnomevfs Disable GnomeVFS support , + MOZ_ENABLE_GNOMEVFS=, + MOZ_ENABLE_GNOMEVFS=force) if test "$MOZ_ENABLE_GNOMEVFS" then @@ -12656,7 +11635,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12660: checking for $ac_word" >&5 +echo "configure:11639: 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 @@ -12700,19 +11679,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 -echo "configure:12704: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 +echo "configure:11683: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 -echo "configure:12711: checking MOZ_GNOMEVFS_CFLAGS" >&5 +echo "configure:11690: checking MOZ_GNOMEVFS_CFLAGS" >&5 MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 -echo "configure:12716: checking MOZ_GNOMEVFS_LIBS" >&5 +echo "configure:11695: checking MOZ_GNOMEVFS_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs-only-L \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"` `$PKG_CONFIG --libs-only-l \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\"`" @@ -12762,7 +11741,7 @@ echo "configure:12716: checking MOZ_GNOMEVFS_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:12766: checking for $ac_word" >&5 +echo "configure:11745: 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 @@ -12806,19 +11785,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 -echo "configure:12810: checking for gconf-2.0 >= $GCONF_VERSION" >&5 +echo "configure:11789: checking for gconf-2.0 >= $GCONF_VERSION" >&5 if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 -echo "configure:12817: checking MOZ_GCONF_CFLAGS" >&5 +echo "configure:11796: checking MOZ_GCONF_CFLAGS" >&5 MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"` echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 -echo "configure:12822: checking MOZ_GCONF_LIBS" >&5 +echo "configure:11801: checking MOZ_GCONF_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_GCONF_LIBS="`$PKG_CONFIG --libs-only-L \"gconf-2.0 >= $GCONF_VERSION\"` `$PKG_CONFIG --libs-only-l \"gconf-2.0 >= $GCONF_VERSION\"`" @@ -12864,7 +11843,7 @@ echo "configure:12822: checking MOZ_GCONF_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:12868: checking for $ac_word" >&5 +echo "configure:11847: 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 @@ -12908,19 +11887,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 libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 -echo "configure:12912: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 +echo "configure:11891: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 -echo "configure:12919: checking MOZ_LIBGNOME_CFLAGS" >&5 +echo "configure:11898: checking MOZ_LIBGNOME_CFLAGS" >&5 MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"` echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6 echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6 -echo "configure:12924: checking MOZ_LIBGNOME_LIBS" >&5 +echo "configure:11903: checking MOZ_LIBGNOME_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs-only-L \"libgnome-2.0 >= $LIBGNOME_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnome-2.0 >= $LIBGNOME_VERSION\"`" @@ -12975,18 +11954,10 @@ if test "$MOZ_ENABLE_GTK2" then MOZ_ENABLE_GNOMEUI=1 - # Check whether --enable-gnomeui or --disable-gnomeui was given. -if test "${enable_gnomeui+set}" = set; then - enableval="$enable_gnomeui" - if test "$enableval" = "no"; then - MOZ_ENABLE_GNOMEUI= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_GNOMEUI=force - else - { echo "configure: error: Option, gnomeui, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - + MOZ_ARG_DISABLE_BOOL(gnomeui, + --disable-gnomeui Disable libgnomeui support (default: auto, optional at runtime) , + MOZ_ENABLE_GNOMEUI=, + MOZ_ENABLE_GNOMEUI=force) if test "$MOZ_ENABLE_GNOMEUI" then @@ -12997,7 +11968,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13001: checking for $ac_word" >&5 +echo "configure:11972: 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 @@ -13041,19 +12012,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 -echo "configure:13045: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 +echo "configure:12016: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 -echo "configure:13052: checking MOZ_GNOMEUI_CFLAGS" >&5 +echo "configure:12023: checking MOZ_GNOMEUI_CFLAGS" >&5 MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 -echo "configure:13057: checking MOZ_GNOMEUI_LIBS" >&5 +echo "configure:12028: checking MOZ_GNOMEUI_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs-only-L \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"` `$PKG_CONFIG --libs-only-l \"libgnomeui-2.0 >= $GNOMEUI_VERSION\"`" @@ -13117,18 +12088,10 @@ fi MOZ_PSM=1 -# Check whether --enable-crypto or --disable-crypto was given. -if test "${enable_crypto+set}" = set; then - enableval="$enable_crypto" - if test "$enableval" = "no"; then - MOZ_PSM= - elif test "$enableval" = "yes"; then - MOZ_PSM=1 - else - { echo "configure: error: Option, crypto, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(crypto, + --disable-crypto Disable crypto support (Personal Security Manager), + MOZ_PSM=, + MOZ_PSM=1 ) case $target in *-cygwin*|*-mingw*|*-msvc*|*-mks*) if test -n "$MOZ_PSM" -a ! -e "$AS_BIN"; then @@ -13138,47 +12101,23 @@ case $target in esac MOZ_JSDEBUGGER=1 -# Check whether --enable-jsd or --disable-jsd was given. -if test "${enable_jsd+set}" = set; then - enableval="$enable_jsd" - 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 -fi - +MOZ_ARG_DISABLE_BOOL(jsd, + --disable-jsd Disable JavaScript debug library, + MOZ_JSDEBUGGER=, + MOZ_JSDEBUGGER=1) MOZ_PLUGINS=1 -# Check whether --enable-plugins or --disable-plugins was given. -if test "${enable_plugins+set}" = set; then - enableval="$enable_plugins" - if test "$enableval" = "no"; then - MOZ_PLUGINS= - elif test "$enableval" = "yes"; then - MOZ_PLUGINS=1 - else - { echo "configure: error: Option, plugins, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(plugins, + --disable-plugins Disable plugins support, + MOZ_PLUGINS=, + MOZ_PLUGINS=1) MOZ_OJI=1 -# Check whether --enable-oji or --disable-oji was given. -if test "${enable_oji+set}" = set; then - enableval="$enable_oji" - if test "$enableval" = "no"; then - MOZ_OJI= - elif test "$enableval" = "yes"; then - MOZ_OJI=1 - else - { echo "configure: error: Option, oji, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(oji, + --disable-oji Disable Open JVM Integration support, + MOZ_OJI=, + MOZ_OJI=1) if test -n "$MOZ_OJI"; then cat >> confdefs.h <<\EOF #define OJI 1 @@ -13186,18 +12125,11 @@ EOF fi -# Check whether --enable-xinerama or --disable-xinerama was given. -if test "${enable_xinerama+set}" = set; then - enableval="$enable_xinerama" - if test "$enableval" = "yes"; then - _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 - +MOZ_ARG_ENABLE_BOOL(xinerama, + --enable-xinerama Enable Xinerama support + ( not safe for Red Hat 7.0 ) , + _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 @@ -13215,32 +12147,16 @@ EOF SUNCTL= -# Check whether --enable-ctl or --disable-ctl was given. -if test "${enable_ctl+set}" = set; then - enableval="$enable_ctl" - if test "$enableval" = "yes"; then - SUNCTL=1 - elif test "$enableval" = "no"; then - SUNCTL= - else - { echo "configure: error: Option, ctl, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(ctl, + --enable-ctl Enable Thai Complex Script support, + SUNCTL=1, + SUNCTL= ) MOZ_VIEW_SOURCE=1 -# Check whether --enable-view-source or --disable-view-source was given. -if test "${enable_view_source+set}" = set; then - enableval="$enable_view_source" - if test "$enableval" = "no"; then - MOZ_VIEW_SOURCE= - elif test "$enableval" = "yes"; then - MOZ_VIEW_SOURCE=1 - else - { echo "configure: error: Option, view-source, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(view-source, + --disable-view-source Disable view source support, + MOZ_VIEW_SOURCE=, + MOZ_VIEW_SOURCE=1 ) if test "$MOZ_VIEW_SOURCE"; then cat >> confdefs.h <<\EOF #define MOZ_VIEW_SOURCE 1 @@ -13250,18 +12166,10 @@ fi ACCESSIBILITY=1 -# Check whether --enable-accessibility or --disable-accessibility was given. -if test "${enable_accessibility+set}" = set; then - enableval="$enable_accessibility" - if test "$enableval" = "no"; then - 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 -fi - +MOZ_ARG_DISABLE_BOOL(accessibility, + --disable-accessibility Disable accessibility support, + ACCESSIBILITY=, + ACCESSIBILITY=1 ) if test "$ACCESSIBILITY"; then cat >> confdefs.h <<\EOF #define ACCESSIBILITY 1 @@ -13270,32 +12178,17 @@ EOF fi MOZ_XPFE_COMPONENTS=1 -# Check whether --enable-xpfe-components or --disable-xpfe-components was given. -if test "${enable_xpfe_components+set}" = set; then - enableval="$enable_xpfe_components" - if test "$enableval" = "no"; then - 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 -fi - +MOZ_ARG_DISABLE_BOOL(xpfe-components, + --disable-xpfe-components + Disable xpfe components, + MOZ_XPFE_COMPONENTS=, + MOZ_XPFE_COMPONENTS=1 ) MOZ_XPINSTALL=1 -# Check whether --enable-xpinstall or --disable-xpinstall was given. -if test "${enable_xpinstall+set}" = set; then - enableval="$enable_xpinstall" - if test "$enableval" = "no"; then - 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 -fi - +MOZ_ARG_DISABLE_BOOL(xpinstall, + --disable-xpinstall Disable xpinstall support, + MOZ_XPINSTALL=, + MOZ_XPINSTALL=1 ) if test "$MOZ_XPINSTALL"; then cat >> confdefs.h <<\EOF #define MOZ_XPINSTALL 1 @@ -13303,32 +12196,16 @@ EOF fi -# Check whether --enable-single-profile or --disable-single-profile was given. -if test "${enable_single_profile+set}" = set; then - enableval="$enable_single_profile" - if test "$enableval" = "yes"; then - MOZ_SINGLE_PROFILE=1 - elif test "$enableval" = "no"; then - MOZ_SINGLE_PROFILE= - else - { echo "configure: error: Option, single-profile, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(single-profile, + --enable-single-profile Enable single profile support , + MOZ_SINGLE_PROFILE=1, + MOZ_SINGLE_PROFILE= ) MOZ_JSLOADER=1 -# Check whether --enable-jsloader or --disable-jsloader was given. -if test "${enable_jsloader+set}" = set; then - enableval="$enable_jsloader" - if test "$enableval" = "no"; then - 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 -fi - +MOZ_ARG_DISABLE_BOOL(jsloader, + --disable-jsloader Disable xpcom js loader support, + MOZ_JSLOADER=, + MOZ_JSLOADER=1 ) if test "$MOZ_JSLOADER"; then cat >> confdefs.h <<\EOF #define MOZ_JSLOADER 1 @@ -13337,18 +12214,10 @@ EOF fi MOZ_USE_NATIVE_UCONV= -# Check whether --enable-native-uconv or --disable-native-uconv was given. -if test "${enable_native_uconv+set}" = set; then - enableval="$enable_native_uconv" - if test "$enableval" = "yes"; then - 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 -fi - +MOZ_ARG_ENABLE_BOOL(native-uconv, + --enable-native-uconv Enable iconv support, + MOZ_USE_NATIVE_UCONV=1, + MOZ_USE_NATIVE_UCONV= ) if test "$MOZ_USE_NATIVE_UCONV"; then cat >> confdefs.h <<\EOF #define MOZ_USE_NATIVE_UCONV 1 @@ -13360,47 +12229,24 @@ if test "$MOZ_USE_NATIVE_UCONV" -a "$ac_cv_func_iconv" != "yes"; then fi MOZ_PLAINTEXT_EDITOR_ONLY= -# Check whether --enable-plaintext-editor-only or --disable-plaintext-editor-only was given. -if test "${enable_plaintext_editor_only+set}" = set; then - enableval="$enable_plaintext_editor_only" - if test "$enableval" = "yes"; then - 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 -fi +MOZ_ARG_ENABLE_BOOL(plaintext-editor-only, + --enable-plaintext-editor-only + Allow only plaintext editing, + MOZ_PLAINTEXT_EDITOR_ONLY=1, + MOZ_PLAINTEXT_EDITOR_ONLY= ) - -# Check whether --enable-composer or --disable-composer was given. -if test "${enable_composer+set}" = set; then - enableval="$enable_composer" - if test "$enableval" = "no"; then - 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 -fi - +MOZ_ARG_DISABLE_BOOL(composer, + --disable-composer Disable building of Composer, + MOZ_COMPOSER=, + MOZ_COMPOSER=1 ) MOZ_XTF=1 -# Check whether --enable-xtf or --disable-xtf was given. -if test "${enable_xtf+set}" = set; then - enableval="$enable_xtf" - if test "$enableval" = "no"; then - MOZ_XTF= - elif test "$enableval" = "yes"; then - MOZ_XTF=1 - else - { echo "configure: error: Option, xtf, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(xtf, + --disable-xtf Disable XTF (pluggable xml tags) support, + MOZ_XTF=, + MOZ_XTF=1 ) if test "$MOZ_XTF"; then cat >> confdefs.h <<\EOF #define MOZ_XTF 1 @@ -13411,10 +12257,9 @@ fi MOZ_EXTENSIONS_ALL=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming xmlterm datetime finger cview layout-debug tasks sql xforms permissions schema-validation" -# Check whether --enable-extensions or --disable-extensions was given. -if test "${enable_extensions+set}" = set; then - enableval="$enable_extensions" - for option in `echo $enableval | sed 's/,/ /g'`; do +MOZ_ARG_ENABLE_STRING(extensions, + --enable-extensions Enable extensions, + for option in `echo $enableval | sed 's/,/ /g'`; do if test "$option" = "yes" || test "$option" = "all"; then MOZ_EXTENSIONS="$MOZ_EXTENSIONS $MOZ_EXTENSIONS_ALL" elif test "$option" = "no" || test "$option" = "none"; then @@ -13427,11 +12272,8 @@ if test "${enable_extensions+set}" = set; then else MOZ_EXTENSIONS="$MOZ_EXTENSIONS $option" fi -done -else - MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT" -fi - +done, + MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT") if test -z "$MOZ_ENABLE_GTK" && test `echo "$MOZ_EXTENSIONS" | grep -c xmlterm` -ne 0; then echo "configure: warning: Cannot build xmlterm without gtk toolkit. Removing xmlterm from MOZ_EXTENSIONS." 1>&2 @@ -13507,7 +12349,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c java` -ne 0; then # Extract the first word of "javac", so it can be a program name with args. set dummy javac; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13511: checking for $ac_word" >&5 +echo "configure:12353: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13543,7 +12385,7 @@ fi # Extract the first word of "jar", so it can be a program name with args. set dummy jar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13547: checking for $ac_word" >&5 +echo "configure:12389: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13583,7 +12425,7 @@ fi # Extract the first word of "javac", so it can be a program name with args. set dummy javac; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13587: checking for $ac_word" >&5 +echo "configure:12429: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13619,7 +12461,7 @@ fi # Extract the first word of "jar", so it can be a program name with args. set dummy jar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13623: checking for $ac_word" >&5 +echo "configure:12465: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13660,12 +12502,9 @@ fi if test -n "$USE_GSSAPI" && test `echo "$MOZ_EXTENSIONS" | grep -c negotiateauth` -ne 0; then - # Check whether --with-gssapi or --without-gssapi was given. -if test "${with_gssapi+set}" = set; then - withval="$with_gssapi" - GSSAPI_DIR=$withval -fi - + MOZ_ARG_WITH_STRING(gssapi, + --with-gssapi=PFX Location of GSSAPI libraries, + GSSAPI_DIR=$withval) if test -z "$GSSAPI_DIR"; then if test -d "/usr/kerberos/include"; then @@ -13686,17 +12525,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13690: checking for $ac_hdr" >&5 +echo "configure:12529: 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:13700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12539: \"$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* @@ -13727,17 +12566,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13731: checking for $ac_hdr" >&5 +echo "configure:12570: 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:13741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12580: \"$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* @@ -13767,7 +12606,7 @@ done CPPFLAGS="$_SAVE_CPPFLAGS $GSSAPI_INCLUDES" echo $ac_n "checking for gss_init_sec_context in -lgss""... $ac_c" 1>&6 -echo "configure:13771: checking for gss_init_sec_context in -lgss" >&5 +echo "configure:12610: checking for gss_init_sec_context in -lgss" >&5 ac_lib_var=`echo gss'_'gss_init_sec_context | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13775,7 +12614,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgss $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13811,12 +12650,12 @@ fi _GSS_LIBS="-L$GSSAPI_DIR/lib -lgssapi_krb5" LIBS="$LIBS $_GSS_LIBS" echo $ac_n "checking for gss_init_sec_context""... $ac_c" 1>&6 -echo "configure:13815: checking for gss_init_sec_context" >&5 +echo "configure:12654: checking for gss_init_sec_context" >&5 if eval "test \"`echo '$''{'ac_cv_func_gss_init_sec_context'+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:12682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gss_init_sec_context=yes" else @@ -13869,7 +12708,7 @@ fi LIBS="$LIBS $TMP_GSSAPI_LIBS" echo $ac_n "checking for gss_init_sec_context in -lgssapi""... $ac_c" 1>&6 -echo "configure:13873: checking for gss_init_sec_context in -lgssapi" >&5 +echo "configure:12712: checking for gss_init_sec_context in -lgssapi" >&5 ac_lib_var=`echo gssapi'_'gss_init_sec_context | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13877,7 +12716,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgssapi $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13924,17 +12763,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13928: checking for $ac_hdr" >&5 +echo "configure:12767: 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:13938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12777: \"$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* @@ -13964,17 +12803,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13968: checking for $ac_hdr" >&5 +echo "configure:12807: 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:13978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12817: \"$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* @@ -14002,7 +12841,7 @@ done cat > conftest.$ac_ext < @@ -14013,7 +12852,7 @@ int main() { gss_OID oid = GSS_C_NT_HOSTBASED_SERVICE; ; return 0; } EOF -if { (eval echo configure:14017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1 @@ -14059,10 +12898,10 @@ darwin*) ;; esac -# Check whether --enable-image-decoders or --disable-image-decoders was given. -if test "${enable_image_decoders+set}" = set; then - enableval="$enable_image_decoders" - for option in `echo $enableval | sed 's/,/ /g'`; do +MOZ_ARG_ENABLE_STRING(image-decoders, + --enable-image-decoders[={mod1,mod2,default,all,none}] + Enable specific image decoders, + for option in `echo $enableval | sed 's/,/ /g'`; do if test "$option" = "yes" || test "$option" = "all"; then MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS $MOZ_IMG_DECODERS_DEFAULT" elif test "$option" = "no" || test "$option" = "none"; then @@ -14075,40 +12914,22 @@ if test "${enable_image_decoders+set}" = set; then else MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS $option" fi -done -else - MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS_DEFAULT" -fi - +done, + MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS_DEFAULT") MOZ_IMG_DECODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_DECODERS}` -# Check whether --enable-ldap-experimental or --disable-ldap-experimental was given. -if test "${enable_ldap_experimental+set}" = set; then - enableval="$enable_ldap_experimental" - 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 -fi - +MOZ_ARG_ENABLE_BOOL(ldap-experimental, + --enable-ldap-experimental + Enable LDAP experimental features, + MOZ_LDAP_XPCOM_EXPERIMENTAL=1, + MOZ_LDAP_XPCOM_EXPERIMENTAL=) MOZ_MATHML=1 -# Check whether --enable-mathml or --disable-mathml was given. -if test "${enable_mathml+set}" = set; then - enableval="$enable_mathml" - if test "$enableval" = "no"; then - 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 -fi - +MOZ_ARG_DISABLE_BOOL(mathml, + --disable-mathml Disable MathML support, + MOZ_MATHML=, + MOZ_MATHML=1 ) if test "$MOZ_MATHML"; then cat >> confdefs.h <<\EOF #define MOZ_MATHML 1 @@ -14116,18 +12937,10 @@ EOF fi -# Check whether --enable-svg or --disable-svg was given. -if test "${enable_svg+set}" = set; then - enableval="$enable_svg" - if test "$enableval" = "yes"; then - MOZ_SVG=1 - 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 - +MOZ_ARG_ENABLE_BOOL(svg, + --enable-svg Enable SVG support, + MOZ_SVG=1, + MOZ_SVG= ) if test -n "$MOZ_SVG"; then cat >> confdefs.h <<\EOF #define MOZ_SVG 1 @@ -14143,20 +12956,16 @@ EOF ;; esac - # Check whether --enable-svg-renderer or --disable-svg-renderer was given. -if test "${enable_svg_renderer+set}" = set; then - enableval="$enable_svg_renderer" - SVG_RENDERER=$enableval -else - SVG_RENDERER=$SVG_DEFAULT_RENDERER -fi - + MOZ_ARG_ENABLE_STRING(svg-renderer, + --enable-svg-renderer={gdiplus,libart,cairo}, + SVG_RENDERER=$enableval , + SVG_RENDERER=$SVG_DEFAULT_RENDERER) case "$SVG_RENDERER" in gdiplus) MOZ_SVG_RENDERER_GDIPLUS=1 echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 -echo "configure:14160: checking for Gdiplus.h" >&5 +echo "configure:12969: checking for Gdiplus.h" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -14166,7 +12975,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < #include @@ -14175,7 +12984,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -14234,18 +13043,10 @@ case "$target_os" in ;; esac -# Check whether --enable-installer or --disable-installer was given. -if test "${enable_installer+set}" = set; then - enableval="$enable_installer" - if test "$enableval" = "no"; then - MOZ_INSTALLER= - elif test "$enableval" = "yes"; then - MOZ_INSTALLER=1 - else - { echo "configure: error: Option, installer, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +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= @@ -14263,32 +13064,17 @@ case "$target_os" in ;; esac -# Check whether --enable-activex or --disable-activex was given. -if test "${enable_activex+set}" = set; then - enableval="$enable_activex" - if test "$enableval" = "no"; then - MOZ_NO_ACTIVEX_SUPPORT=1 - elif test "$enableval" = "yes"; then - MOZ_NO_ACTIVEX_SUPPORT= - else - { echo "configure: error: Option, activex, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_DISABLE_BOOL(activex, + --disable-activex Disable building of ActiveX control (win32 only), + MOZ_NO_ACTIVEX_SUPPORT=1, + MOZ_NO_ACTIVEX_SUPPORT= ) - -# Check whether --enable-activex-scripting or --disable-activex-scripting was given. -if test "${enable_activex_scripting+set}" = set; then - enableval="$enable_activex_scripting" - if test "$enableval" = "no"; then - MOZ_ACTIVEX_SCRIPTING_SUPPORT= - elif test "$enableval" = "yes"; then - MOZ_ACTIVEX_SCRIPTING_SUPPORT=1 - else - { echo "configure: error: Option, activex-scripting, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(activex-scripting, + --disable-activex-scripting + Disable building of ActiveX scripting support (win32), + MOZ_ACTIVEX_SCRIPTING_SUPPORT=, + MOZ_ACTIVEX_SCRIPTING_SUPPORT=1) if test -n "$MOZ_NO_ACTIVEX_SUPPORT" -a -n "$MOZ_ACTIVEX_SCRIPTING_SUPPORT"; @@ -14297,62 +13083,30 @@ 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 +MOZ_ARG_ENABLE_BOOL(leaky, + --enable-leaky Build leaky memory tool, + MOZ_LEAKY=1, + MOZ_LEAKY=) - -# 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 - +MOZ_ARG_ENABLE_BOOL(xpctools, + --enable-xpctools Build JS profiling tool, + MOZ_XPCTOOLS=1, + MOZ_XPCTOOLS= ) 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= - 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 -fi +MOZ_ARG_DISABLE_BOOL(tests, + --disable-tests Do not build test libraries & programs, + ENABLE_TESTS=, + ENABLE_TESTS=1 ) +MOZ_ARG_HEADER(Individual module options) -# Individual module options - -# Check whether --enable-xpcom-lea or --disable-xpcom-lea was given. -if test "${enable_xpcom_lea+set}" = set; then - enableval="$enable_xpcom_lea" - if test "$enableval" = "yes"; then - 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 - +MOZ_ARG_ENABLE_BOOL(xpcom-lea, + --enable-xpcom-lea Use Lea malloc in xpcom , + XPCOM_USE_LEA=1, + XPCOM_USE_LEA= ) if test -n "$XPCOM_USE_LEA"; then cat >> confdefs.h <<\EOF #define XPCOM_USE_LEA 1 @@ -14363,18 +13117,10 @@ fi if test -n "$MOZ_CALENDAR"; then MOZ_STORAGE=1 fi -# Check whether --enable-storage or --disable-storage was given. -if test "${enable_storage+set}" = set; then - enableval="$enable_storage" - if test "$enableval" = "yes"; then - MOZ_STORAGE=1 - elif test "$enableval" = "no"; then - MOZ_STORAGE= - else - { echo "configure: error: Option, storage, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(storage, + --enable-storage Enable mozStorage module and related components, + MOZ_STORAGE=1, + MOZ_STORAGE= ) if test -n "$MOZ_STORAGE"; then cat >> confdefs.h <<\EOF #define MOZ_STORAGE 1 @@ -14382,18 +13128,10 @@ 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 - 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 - +MOZ_ARG_ENABLE_BOOL(js-ultrasparc, + --enable-js-ultrasparc Use UltraSPARC optimizations in JS, + JS_ULTRASPARC_OPTS=1, + JS_ULTRASPARC_OPTS= ) if test `echo "$target_os" | grep -c \^solaris 2>/dev/null` = 0 -o \ "$OS_TEST" != "sun4u"; then @@ -14402,7 +13140,7 @@ fi -# Debugging and Optimizations +MOZ_ARG_HEADER(Debugging and Optimizations) if test -z "$MOZ_DEBUG_FLAGS" then @@ -14428,18 +13166,10 @@ then esac fi -# Check whether --enable-debug or --disable-debug was given. -if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - if test "$enableval" = "yes"; then - MOZ_DEBUG=1 - elif test "$enableval" = "no"; then - MOZ_DEBUG= - else - { echo "configure: error: Option, debug, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(debug, + --enable-debug Enable building with developer debug info, + MOZ_DEBUG=1, + MOZ_DEBUG=) MOZ_DEBUG_ENABLE_DEFS="-DDEBUG -D_DEBUG" case "${target_os}" in @@ -14461,10 +13191,10 @@ if test -z "$MOZ_OPTIMIZE_FLAGS"; then MOZ_OPTIMIZE_FLAGS="-O" fi -# Check whether --enable-optimize or --disable-optimize was given. -if test "${enable_optimize+set}" = set; then - enableval="$enable_optimize" - if test "$enableval" != "no"; then +MOZ_ARG_ENABLE_STRING(optimize, + --disable-optimize Disable compiler optimization + --enable-optimize=[OPT] Specify compiler optimization flags [OPT=-O], + if test "$enableval" != "no"; then MOZ_OPTIMIZE=1 if test -n "$enableval" && test "$enableval" != "yes"; then MOZ_OPTIMIZE_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` @@ -14472,26 +13202,22 @@ if test "${enable_optimize+set}" = set; then fi else MOZ_OPTIMIZE= -fi -else - MOZ_OPTIMIZE=1 -fi - +fi , MOZ_OPTIMIZE=1) if test -n "$MOZ_OPTIMIZE"; then echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 -echo "configure:14484: checking for valid optimization flags" >&5 +echo "configure:13210: checking for valid optimization flags" >&5 _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:14495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -14512,41 +13238,31 @@ fi -# Check whether --enable-debug-modules or --disable-debug-modules was given. -if test "${enable_debug_modules+set}" = set; then - enableval="$enable_debug_modules" - MOZ_DEBUG_MODULES=`echo $enableval| sed 's/,/ /g'` -fi - +MOZ_ARG_ENABLE_STRING(debug-modules, + --enable-debug-modules Enable/disable debug info for specific modules, + MOZ_DEBUG_MODULES=`echo $enableval| sed 's/,/ /g'` ) MOZ_DBGRINFO_MODULES= -# Check whether --enable-debugger-info-modules or --disable-debugger-info-modules was given. -if test "${enable_debugger_info_modules+set}" = set; then - enableval="$enable_debugger_info_modules" - for i in `echo $enableval | sed 's/,/ /g'`; do - if test "$i" = "no"; then +MOZ_ARG_ENABLE_STRING(debugger-info-modules, + --enable-debugger-info-modules + Enable/disable debugger info for specific modules, + for i in `echo $enableval | sed 's/,/ /g'`; do + dnl note that the list of module names is reversed as it is copied + dnl this is important, as it will allow config.mk to interpret stuff like + dnl "^ALL_MODULES xpcom" properly + if test "$i" = "no"; then i="^ALL_MODULES" fi if test "$i" = "yes"; then i="ALL_MODULES" fi MOZ_DBGRINFO_MODULES="$i $MOZ_DBGRINFO_MODULES"; - done -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 - 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 + done ) +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 cat >> confdefs.h <<\EOF #define GC_LEAK_DETECTOR 1 @@ -14554,18 +13270,10 @@ EOF fi -# Check whether --enable-logging or --disable-logging was given. -if test "${enable_logging+set}" = set; then - enableval="$enable_logging" - 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 -fi - +MOZ_ARG_DISABLE_BOOL(logging, + --disable-logging Disable logging facilities, + NS_DISABLE_LOGGING=1, + NS_DISABLE_LOGGING= ) if test "$NS_DISABLE_LOGGING"; then cat >> confdefs.h <<\EOF #define NS_DISABLE_LOGGING 1 @@ -14578,18 +13286,11 @@ EOF fi -# Check whether --enable-crash-on-assert or --disable-crash-on-assert was given. -if test "${enable_crash_on_assert+set}" = set; then - enableval="$enable_crash_on_assert" - if test "$enableval" = "yes"; then - _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 - +MOZ_ARG_ENABLE_BOOL(crash-on-assert, + --enable-crash-on-assert + Make NS_ASSERTION crash on Unix, + _CRASH_ON_ASSERT=1, + _CRASH_ON_ASSERT= ) if test "$_CRASH_ON_ASSERT"; then cat >> confdefs.h <<\EOF #define UNIX_CRASH_ON_ASSERT 1 @@ -14598,18 +13299,10 @@ 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 - _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 - +MOZ_ARG_ENABLE_BOOL(reorder, + --enable-reorder Enable function reordering (requires GNU ld) , + _ENABLE_REORDER=1, + _ENABLE_REORDER= ) 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 @@ -14619,18 +13312,10 @@ if test -n "$_ENABLE_REORDER"; then 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 - _ENABLE_LOGREFCNT=1 - elif test "$enableval" = "no"; then - _ENABLE_LOGREFCNT= - else - { echo "configure: error: Option, logrefcnt, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(logrefcnt, + --enable-logrefcnt Enable logging of refcounts (default=debug) , + _ENABLE_LOGREFCNT=1, + _ENABLE_LOGREFCNT= ) if test "$_ENABLE_LOGREFCNT" = "1"; then cat >> confdefs.h <<\EOF #define FORCE_BUILD_REFCNT_LOGGING 1 @@ -14643,22 +13328,15 @@ 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 - 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 -else - if test "$MOZ_DEBUG"; then +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=, + if test "$MOZ_DEBUG"; then _DETECT_WEBSHELL_LEAKS=1 - fi -fi - + fi) if test "$_DETECT_WEBSHELL_LEAKS"; then cat >> confdefs.h <<\EOF @@ -14668,18 +13346,10 @@ EOF fi -# Check whether --enable-wrap-malloc or --disable-wrap-malloc was given. -if test "${enable_wrap_malloc+set}" = set; then - enableval="$enable_wrap_malloc" - if test "$enableval" = "yes"; then - _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 - +MOZ_ARG_ENABLE_BOOL(wrap-malloc, + --enable-wrap-malloc Wrap malloc calls (gnu linker only), + _WRAP_MALLOC=1, + _WRAP_MALLOC= ) if test -n "$_WRAP_MALLOC"; then if test "$GNU_CC"; then @@ -14688,28 +13358,17 @@ if test -n "$_WRAP_MALLOC"; then 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" - WRAP_MALLOC_LIB=$withval -fi - - -# Check whether --enable-efence or --disable-efence was given. -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 +MOZ_ARG_WITH_STRING(wrap-malloc, + --with-wrap-malloc=DIR Location of malloc wrapper library, + WRAP_MALLOC_LIB=$withval) +MOZ_ARG_ENABLE_BOOL(efence, + --enable-efence Link with Electric Fence, + _ENABLE_EFENCE=1, + _ENABLE_EFENCE= ) if test -n "$_ENABLE_EFENCE"; then echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 -echo "configure:14713: checking for malloc in -lefence" >&5 +echo "configure:13372: 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 @@ -14717,7 +13376,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:13391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14757,18 +13416,10 @@ 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, jprof, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +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 cat >> confdefs.h <<\EOF #define MOZ_JPROF 1 @@ -14777,45 +13428,23 @@ EOF fi -# Check whether --enable-strip or --disable-strip was given. -if test "${enable_strip+set}" = set; then - enableval="$enable_strip" - 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 -fi +MOZ_ARG_ENABLE_BOOL(strip, + --enable-strip Enable stripping of libs & executables , + ENABLE_STRIP=1, + ENABLE_STRIP= ) + +MOZ_ARG_ENABLE_BOOL(elf-dynstr-gc, + --enable-elf-dynstr-gc Enable elf dynstr garbage collector (opt builds only), + USE_ELF_DYNSTR_GC=1, + USE_ELF_DYNSTR_GC= ) -# Check whether --enable-elf-dynstr-gc or --disable-elf-dynstr-gc was given. -if test "${enable_elf_dynstr_gc+set}" = set; then - enableval="$enable_elf_dynstr_gc" - if test "$enableval" = "yes"; then - USE_ELF_DYNSTR_GC=1 - elif test "$enableval" = "no"; then - USE_ELF_DYNSTR_GC= - else - { echo "configure: error: Option, elf-dynstr-gc, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - - - -# Check whether --enable-old-abi-compat-wrappers or --disable-old-abi-compat-wrappers was given. -if test "${enable_old_abi_compat_wrappers+set}" = set; then - enableval="$enable_old_abi_compat_wrappers" - if test "$enableval" = "yes"; then - MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1 - elif test "$enableval" = "no"; then - MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= - else - { echo "configure: error: Option, old-abi-compat-wrappers, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +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, + MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1, + MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= ) if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then ac_ext=C @@ -14828,12 +13457,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:14832: checking for $ac_func" >&5 +echo "configure:13461: 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:13492: \"$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 @@ -14896,34 +13525,18 @@ EOF fi -# Check whether --enable-prebinding or --disable-prebinding was given. -if test "${enable_prebinding+set}" = set; then - enableval="$enable_prebinding" - if test "$enableval" = "yes"; then - USE_PREBINDING=1 - elif test "$enableval" = "no"; then - USE_PREBINDING= - else - { echo "configure: error: Option, prebinding, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_ENABLE_BOOL(prebinding, + --enable-prebinding Enable prebinding (Mac OS X only), + USE_PREBINDING=1, + USE_PREBINDING= ) - -# Profiling and Instrumenting +MOZ_ARG_HEADER(Profiling and Instrumenting) MOZ_TIMELINE= -# Check whether --enable-timeline or --disable-timeline was given. -if test "${enable_timeline+set}" = set; then - enableval="$enable_timeline" - if test "$enableval" = "yes"; then - 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 - +MOZ_ARG_ENABLE_BOOL(timeline, + --enable-timeline Enable timeline services , + MOZ_TIMELINE=1, + MOZ_TIMELINE= ) if test -n "$MOZ_TIMELINE"; then cat >> confdefs.h <<\EOF #define MOZ_TIMELINE 1 @@ -14932,18 +13545,10 @@ EOF fi MOZ_REFLOW_PERF= -# Check whether --enable-reflow-perf or --disable-reflow-perf was given. -if test "${enable_reflow_perf+set}" = set; then - enableval="$enable_reflow_perf" - if test "$enableval" = "yes"; then - MOZ_REFLOW_PERF=1 - 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 - +MOZ_ARG_ENABLE_BOOL(reflow-perf, + --enable-reflow-perf Enable reflow performance tracing, + MOZ_REFLOW_PERF=1, + MOZ_REFLOW_PERF= ) if test -n "$MOZ_REFLOW_PREF"; then cat >> confdefs.h <<\EOF #define MOZ_REFLOW_PREF 1 @@ -14952,18 +13557,10 @@ EOF fi -# Check whether --enable-perf-metrics or --disable-perf-metrics was given. -if test "${enable_perf_metrics+set}" = set; then - enableval="$enable_perf_metrics" - if test "$enableval" = "yes"; then - MOZ_PERF_METRICS=1 - 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 - +MOZ_ARG_ENABLE_BOOL(perf-metrics, + --enable-perf-metrics Enable performance metrics, + MOZ_PERF_METRICS=1, + MOZ_PERF_METRICS= ) if test -n "$MOZ_PERF_METRICS"; then cat >> confdefs.h <<\EOF #define MOZ_PERF_METRICS 1 @@ -14971,18 +13568,10 @@ 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 - _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 - +MOZ_ARG_ENABLE_BOOL(codesighs, + --enable-codesighs Enable code size analysis tools, + _ENABLE_CODESIGHS=1, + _ENABLE_CODESIGHS= ) if test -n "$_ENABLE_CODESIGHS"; then if test -d $srcdir/tools/codesighs; then MOZ_MAPINFO=1 @@ -14992,18 +13581,10 @@ if test -n "$_ENABLE_CODESIGHS"; then 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 - 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 -fi - +MOZ_ARG_ENABLE_BOOL(trace-malloc, + --enable-trace-malloc Enable malloc tracing, + 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= @@ -15015,18 +13596,11 @@ EOF fi -# Check whether --enable-eazel-profiler-support or --disable-eazel-profiler-support was given. -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 - +MOZ_ARG_ENABLE_BOOL(eazel-profiler-support, + --enable-eazel-profiler-support + Enable Corel/Eazel profiler support, + ENABLE_EAZEL_PROFILER=1, + ENABLE_EAZEL_PROFILER= ) if test -n "$ENABLE_EAZEL_PROFILER"; then cat >> confdefs.h <<\EOF #define ENABLE_EAZEL_PROFILER 1 @@ -15038,25 +13612,15 @@ EOF EAZEL_PROFILER_LIBS="-lprofiler -lpthread" fi -# Check whether --enable-profile-modules or --disable-profile-modules was given. -if test "${enable_profile_modules+set}" = set; then - enableval="$enable_profile_modules" - MOZ_PROFILE_MODULES=`echo $enableval| sed 's/,/ /g'` -fi - - -# Check whether --enable-insure or --disable-insure was given. -if test "${enable_insure+set}" = set; then - enableval="$enable_insure" - if test "$enableval" = "yes"; then - _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 +MOZ_ARG_ENABLE_STRING(profile-modules, + --enable-profile-modules + Enable/disable profiling for specific modules, + MOZ_PROFILE_MODULES=`echo $enableval| sed 's/,/ /g'` ) +MOZ_ARG_ENABLE_BOOL(insure, + --enable-insure Enable insure++ instrumentation (linux only), + _ENABLE_INSURE=1, + _ENABLE_INSURE= ) if test -n "$_ENABLE_INSURE"; then MOZ_INSURE="insure" MOZ_INSURIFYING=1 @@ -15064,32 +13628,20 @@ if test -n "$_ENABLE_INSURE"; then 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 - withval="$with_insure_dirs" - MOZ_INSURE_DIRS=$withval -fi +MOZ_ARG_WITH_STRING(insure-dirs, + --with-insure-dirs=DIRS + Dirs to instrument with insure , + MOZ_INSURE_DIRS=$withval ) +MOZ_ARG_WITH_STRING(insure-exclude-dirs, + --with-insure-exclude-dirs=DIRS + Dirs to not instrument with insure , + MOZ_INSURE_EXCLUDE_DIRS="config $withval" ) -# Check whether --with-insure-exclude-dirs or --without-insure-exclude-dirs was given. -if test "${with_insure_exclude_dirs+set}" = set; then - withval="$with_insure_exclude_dirs" - MOZ_INSURE_EXCLUDE_DIRS="config $withval" -fi - - -# Check whether --enable-quantify or --disable-quantify was given. -if test "${enable_quantify+set}" = set; then - enableval="$enable_quantify" - if test "$enableval" = "yes"; then - MOZ_QUANTIFY=1 - elif test "$enableval" = "no"; then - MOZ_QUANTIFY= - else - { echo "configure: error: Option, quantify, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(quantify, + --enable-quantify Enable Quantify support (Windows only) , + MOZ_QUANTIFY=1, + MOZ_QUANTIFY= ) if test -z "$SKIP_LIBRARY_CHECKS"; then @@ -15103,12 +13655,12 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_func in __cxa_demangle do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15107: checking for $ac_func" >&5 +echo "configure:13659: 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:13690: \"$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 @@ -15180,27 +13732,17 @@ fi -# Misc. Options +MOZ_ARG_HEADER(Misc. Options) -# Check whether --enable-xterm-updates or --disable-xterm-updates was given. -if test "${enable_xterm_updates+set}" = set; then - enableval="$enable_xterm_updates" - 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 -fi - - -# Check whether --enable-chrome-format or --disable-chrome-format was given. -if test "${enable_chrome_format+set}" = set; then - enableval="$enable_chrome_format" - MOZ_CHROME_FILE_FORMAT=`echo $enableval | tr A-Z a-z` -fi +MOZ_ARG_ENABLE_BOOL(xterm-updates, + --enable-xterm-updates Update XTERM titles with current command., + MOZ_UPDATE_XTERM=1, + MOZ_UPDATE_XTERM= ) +MOZ_ARG_ENABLE_STRING(chrome-format, + --enable-chrome-format=jar|flat|both|symlink + Select FORMAT of chrome files (default=jar), + MOZ_CHROME_FILE_FORMAT=`echo $enableval | tr A-Z a-z`) if test -z "$MOZ_CHROME_FILE_FORMAT"; then MOZ_CHROME_FILE_FORMAT=jar @@ -15213,28 +13755,20 @@ if test "$MOZ_CHROME_FILE_FORMAT" != "jar" && { echo "configure: error: --enable-chrome-format must be set to either jar, flat, both, or symlink" 1>&2; exit 1; } fi -# Check whether --with-default-mozilla-five-home or --without-default-mozilla-five-home was given. -if test "${with_default_mozilla_five_home+set}" = set; then - withval="$with_default_mozilla_five_home" - val=`echo $withval` - cat >> confdefs.h </dev/null; then - { echo "configure: error: "Homedir must be single relative path."" 1>&2; exit 1; } + AC_MSG_ERROR("Homedir must be single relative path.") else MOZ_USER_DIR="$val" -fi -fi - +fi) cat >> confdefs.h <&6 -echo "configure:15276: checking for gcc -pipe support" >&5 +echo "configure:13804: 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 @@ -15287,14 +13815,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:15298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -15319,33 +13847,26 @@ else echo "$ac_t""no" 1>&6 fi -# Check whether --enable-long-long-warning or --disable-long-long-warning was given. -if test "${enable_long_long_warning+set}" = set; then - enableval="$enable_long_long_warning" - if test "$enableval" = "yes"; then - _IGNORE_LONG_LONG_WARNINGS= - elif test "$enableval" = "no"; then - _IGNORE_LONG_LONG_WARNINGS=1 - else - { echo "configure: error: Option, long-long-warning, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(long-long-warning, + --enable-long-long-warning + Warn about use of non-ANSI long long type, + _IGNORE_LONG_LONG_WARNINGS=, + _IGNORE_LONG_LONG_WARNINGS=1) 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:15340: checking whether compiler supports -Wno-long-long" >&5 +echo "configure:13861: checking whether compiler supports -Wno-long-long" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13870: \"$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" @@ -15366,16 +13887,16 @@ _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fprofile-generate" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 -echo "configure:15370: checking whether C compiler supports -fprofile-generate" >&5 +echo "configure:13891: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" @@ -15393,16 +13914,16 @@ if test $result = "yes"; then else CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 -echo "configure:15397: checking whether C compiler supports -fprofile-arcs" >&5 +echo "configure:13918: checking whether C compiler supports -fprofile-arcs" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-arcs" result="yes" @@ -15432,34 +13953,25 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross -# Check whether --enable-pedantic or --disable-pedantic was given. -if test "${enable_pedantic+set}" = set; then - enableval="$enable_pedantic" - if test "$enableval" = "no"; then - _PEDANTIC= - elif test "$enableval" = "yes"; then - : - else - { echo "configure: error: Option, pedantic, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(pedantic, + --disable-pedantic Issue all warnings demanded by strict ANSI C , +_PEDANTIC= ) 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:15452: checking whether C++ compiler has -pedantic long long bug" >&5 +echo "configure:13964: 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:13975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="no" else @@ -15489,12 +14001,12 @@ fi fi echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 -echo "configure:15493: checking for correct temporary object destruction order" >&5 +echo "configure:14005: checking for correct temporary object destruction order" >&5 if test "$cross_compiling" = yes; then result="maybe" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -15535,12 +14047,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:15539: checking for correct overload resolution with const and templates" >&5 +echo "configure:14051: 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 < @@ -15570,7 +14082,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_nscap_nonconst_opeq_bug="no" else @@ -15593,18 +14105,10 @@ EOF fi fi -# Check whether --enable-cpp-rtti or --disable-cpp-rtti was given. -if test "${enable_cpp_rtti+set}" = set; then - enableval="$enable_cpp_rtti" - if test "$enableval" = "yes"; then - _MOZ_USE_RTTI=1 - elif test "$enableval" = "no"; then - _MOZ_USE_RTTI= - else - { echo "configure: error: Option, cpp-rtti, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(cpp-rtti, + --enable-cpp-rtti Enable C++ RTTI , + _MOZ_USE_RTTI=1 , + _MOZ_USE_RTTI= ) if test "$_MOZ_USE_RTTI"; then _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_ON @@ -15612,18 +14116,10 @@ else _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_OFF fi -# Check whether --enable-cpp-exceptions or --disable-cpp-exceptions was given. -if test "${enable_cpp_exceptions+set}" = set; then - enableval="$enable_cpp_exceptions" - if test "$enableval" = "yes"; then - _MOZ_CPP_EXCEPTIONS=1 - elif test "$enableval" = "no"; then - _MOZ_CPP_EXCEPTIONS= - else - { echo "configure: error: Option, cpp-exceptions, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(cpp-exceptions, + --enable-cpp-exceptions Enable C++ exceptions , + _MOZ_CPP_EXCEPTIONS=1 , + _MOZ_CPP_EXCEPTIONS= ) if test "$_MOZ_CPP_EXCEPTIONS"; then _MOZ_EXCEPTIONS_FLAGS=$_MOZ_EXCEPTIONS_FLAGS_ON @@ -15652,40 +14148,24 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross -# Build dependencies +MOZ_ARG_HEADER(Build dependencies) MOZ_AUTO_DEPS=1 -# Check whether --enable-auto-deps or --disable-auto-deps was given. -if test "${enable_auto_deps+set}" = set; then - enableval="$enable_auto_deps" - if test "$enableval" = "no"; then - MOZ_AUTO_DEPS= - elif test "$enableval" = "yes"; then - MOZ_AUTO_DEPS=1 - else - { echo "configure: error: Option, auto-deps, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(auto-deps, + --disable-auto-deps Do not automatically generate dependency info, + MOZ_AUTO_DEPS=, + MOZ_AUTO_DEPS=1) if test -n "$MOZ_AUTO_DEPS"; then _cpp_md_flag= -# Check whether --enable-md or --disable-md was given. -if test "${enable_md+set}" = set; then - enableval="$enable_md" - if test "$enableval" = "no"; then - _cpp_md_flag= - elif test "$enableval" = "yes"; then - _cpp_md_flag=1 - else - { echo "configure: error: Option, md, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -else - if test "$GNU_CC" -a "$GNU_CXX" -a "$OS_ARCH" != "WINNT"; then +MOZ_ARG_DISABLE_BOOL(md, + --disable-md Do not use compiler-based dependencies , + _cpp_md_flag=, + _cpp_md_flag=1, + dnl Default is to turn on -MD if using GNU-compatible compilers + if test "$GNU_CC" -a "$GNU_CXX" -a "$OS_ARCH" != "WINNT"; then _cpp_md_flag=1 - fi -fi - + fi) if test "$_cpp_md_flag"; then COMPILER_DEPEND=1 if test "$OS_ARCH" = "OpenVMS"; then @@ -15706,56 +14186,30 @@ MDDEPDIR='.deps' -# Static build options +MOZ_ARG_HEADER(Static build options) BUILD_SHARED_LIBS=1 BUILD_STATIC_LIBS= MOZ_STATIC_COMPONENT_LIBS= -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - if test "$enableval" = "no"; then - BUILD_SHARED_LIBS= - elif test "$enableval" = "yes"; then - : - else - { echo "configure: error: Option, shared, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_DISABLE_BOOL(shared, + --disable-shared Disable building of internal shared libs, + BUILD_SHARED_LIBS=) - -# Check whether --enable-static or --disable-static was given. -if test "${enable_static+set}" = set; then - enableval="$enable_static" - if test "$enableval" = "yes"; then +MOZ_ARG_ENABLE_BOOL(static, + --enable-static Enable building of internal static libs, BUILD_STATIC_LIBS=1 - MOZ_STATIC_COMPONENT_LIBS=1 - elif test "$enableval" = "no"; then - : - else - { echo "configure: error: Option, static, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - + MOZ_STATIC_COMPONENT_LIBS=1) if (test -z "$BUILD_SHARED_LIBS" && test -z "$BUILD_STATIC_LIBS") || (test -n "$BUILD_SHARED_LIBS" && test -n "$BUILD_STATIC_LIBS") ; then { echo "configure: error: Only one of --enable-shared or --enable-static must be specified." 1>&2; exit 1; } fi -# Check whether --enable-libxul or --disable-libxul was given. -if test "${enable_libxul+set}" = set; then - enableval="$enable_libxul" - if test "$enableval" = "yes"; then - MOZ_ENABLE_LIBXUL=1 - elif test "$enableval" = "no"; then - MOZ_ENABLE_LIBXUL= - else - { echo "configure: error: Option, libxul, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(libxul, + --enable-libxul Enable building of libxul, + MOZ_ENABLE_LIBXUL=1, + MOZ_ENABLE_LIBXUL=) if test -n "$MOZ_ENABLE_LIBXUL" -a -n "$BUILD_STATIC_LIBS"; then { echo "configure: error: --enable-libxul is not compatible with --enable-static" 1>&2; exit 1; } @@ -15776,18 +14230,10 @@ else fi MOZ_STATIC_COMPONENT_LOADER=1 -# Check whether --enable-static-component-loader or --disable-static-component-loader was given. -if test "${enable_static_component_loader+set}" = set; then - enableval="$enable_static_component_loader" - if test "$enableval" = "no"; then - MOZ_STATIC_COMPONENT_LOADER= - elif test "$enableval" = "yes"; then - : - else - { echo "configure: error: Option, static-component-loader, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(static-component-loader, + --disable-static-component-loader + Disable the static component loader, + MOZ_STATIC_COMPONENT_LOADER=) if test -n "$MOZ_STATIC_COMPONENT_LOADER"; then cat >> confdefs.h <<\EOF @@ -15796,15 +14242,13 @@ EOF fi -# Standalone module options (Not for building Mozilla) +MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla)) BUILD_MODULES=all -# Check whether --enable-standalone-modules or --disable-standalone-modules was given. -if test "${enable_standalone_modules+set}" = set; then - enableval="$enable_standalone_modules" - BUILD_MODULES=`echo $enableval | sed 's/,/ /g'` -fi - +MOZ_ARG_ENABLE_STRING(standalone-modules, + --enable-standalone-modules=mod1[,mod2] + Enable standalone build of specific modules, + BUILD_MODULES=`echo $enableval | sed 's/,/ /g'` ) if test "$BUILD_MODULES" != "all" && test `echo "$BUILD_MODULES" | grep -c ldap` = 0 && @@ -15821,18 +14265,9 @@ msvc*|mks*|cygwin*|mingw*) ;; esac -# Check whether --with-libIDL or --without-libIDL was given. -if test "${with_libIDL+set}" = set; then - withval="$with_libIDL" - if test "$withval" = "no"; then - SKIP_IDL_CHECK="yes" - elif test "$withval" = "yes"; then - : - else - { echo "configure: error: Option, libIDL, does not take an argument ($withval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_WITHOUT_BOOL(libIDL, + --without-libIDL Skip check for libIDL (standalone modules only), + SKIP_IDL_CHECK="yes") if test "$SKIP_IDL_CHECK" = "no" then @@ -15852,7 +14287,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:15856: checking for $ac_word" >&5 +echo "configure:14291: 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 @@ -15896,19 +14331,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:15900: checking for libIDL-2.0 >= 0.8.0" >&5 +echo "configure:14335: 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:15907: checking LIBIDL_CFLAGS" >&5 +echo "configure:14342: 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:15912: checking LIBIDL_LIBS" >&5 +echo "configure:14347: checking LIBIDL_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic LIBIDL_LIBS="`$PKG_CONFIG --libs-only-L \"libIDL-2.0 >= 0.8.0\"` `$PKG_CONFIG --libs-only-l \"libIDL-2.0 >= 0.8.0\"`" @@ -15976,284 +14411,14 @@ fi fi fi - # Check whether --with-glib-prefix or --without-glib-prefix was given. -if test "${with_glib_prefix+set}" = set; then - withval="$with_glib_prefix" - glib_config_prefix="$withval" -else - glib_config_prefix="" -fi - -# Check whether --with-glib-exec-prefix or --without-glib-exec-prefix was given. -if test "${with_glib_exec_prefix+set}" = set; then - withval="$with_glib_exec_prefix" - glib_config_exec_prefix="$withval" -else - glib_config_exec_prefix="" -fi - -# Check whether --enable-glibtest or --disable-glibtest was given. -if test "${enable_glibtest+set}" = set; then - enableval="$enable_glibtest" - : -else - enable_glibtest=yes -fi - - - if test x$glib_config_exec_prefix != x ; then - glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config - fi - fi - if test x$glib_config_prefix != x ; then - glib_config_args="$glib_config_args --prefix=$glib_config_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_prefix/bin/glib-config - fi - fi - - for module in . - do - case "$module" in - gmodule) - glib_config_args="$glib_config_args gmodule" - ;; - gthread) - glib_config_args="$glib_config_args gthread" - ;; - esac - done - - unset ac_cv_path_GLIB_CONFIG - - # 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:16035: 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 - case "$GLIB_CONFIG" in - /*) - ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GLIB_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no" - ;; -esac -fi -GLIB_CONFIG="$ac_cv_path_GLIB_CONFIG" -if test -n "$GLIB_CONFIG"; then - echo "$ac_t""$GLIB_CONFIG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - min_glib_version=1.2.0 - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:16070: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes - else - GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` - glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" - rm -f conf.glibtest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat > conftest.$ac_ext < -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If glib-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); - printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the glib-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); - printf("*** correct copy of glib-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} - -EOF -if { (eval echo configure:16169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - no_glib=yes -fi -rm -fr conftest* -fi - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - echo "$ac_t""yes" 1>&6 - : - else - echo "$ac_t""no" 1>&6 - if test "$GLIB_CONFIG" = "no" ; then - echo "*** The glib-config script installed by GLIB could not be found" - echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GLIB_CONFIG environment variable to the" - echo "*** full path to glib-config." - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext < -#include - -int main() { - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); -; return 0; } -EOF -if { (eval echo configure:16213: \"$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" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" - echo "*** may want to edit the glib-config script: $GLIB_CONFIG" -fi -rm -f conftest* - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - : - fi - - - rm -f conf.glibtest - + AM_PATH_GLIB(1.2.0) unset ac_cv_path_LIBIDL_CONFIG # 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:16257: checking for $ac_word" >&5 +echo "configure:14422: 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 @@ -16288,7 +14453,7 @@ fi min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:16292: checking for libIDL - version >= $min_libIDL_version" >&5 +echo "configure:14457: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes @@ -16315,7 +14480,7 @@ echo "configure:16292: checking for libIDL - version >= $min_libIDL_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -16401,7 +14566,7 @@ main () } EOF -if { (eval echo configure:16405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -16435,7 +14600,7 @@ fi CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < @@ -16446,7 +14611,7 @@ int main() { return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:16450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14615: \"$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" @@ -16486,7 +14651,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:16490: checking for $ac_word" >&5 +echo "configure:14655: 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 @@ -16565,7 +14730,7 @@ if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16569: checking for $ac_word" >&5 +echo "configure:14734: 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 @@ -16609,19 +14774,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6 -echo "configure:16613: checking for glib-2.0 >= 1.3.7" >&5 +echo "configure:14778: checking for glib-2.0 >= 1.3.7" >&5 if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 -echo "configure:16620: checking GLIB_CFLAGS" >&5 +echo "configure:14785: checking GLIB_CFLAGS" >&5 GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"` echo "$ac_t""$GLIB_CFLAGS" 1>&6 echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 -echo "configure:16625: checking GLIB_LIBS" >&5 +echo "configure:14790: checking GLIB_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic GLIB_LIBS="`$PKG_CONFIG --libs-only-L \"glib-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"glib-2.0 >= 1.3.7\"`" @@ -16650,277 +14815,7 @@ echo "configure:16625: checking GLIB_LIBS" >&5 fi else - # Check whether --with-glib-prefix or --without-glib-prefix was given. -if test "${with_glib_prefix+set}" = set; then - withval="$with_glib_prefix" - glib_config_prefix="$withval" -else - glib_config_prefix="" -fi - -# Check whether --with-glib-exec-prefix or --without-glib-exec-prefix was given. -if test "${with_glib_exec_prefix+set}" = set; then - withval="$with_glib_exec_prefix" - glib_config_exec_prefix="$withval" -else - glib_config_exec_prefix="" -fi - -# Check whether --enable-glibtest or --disable-glibtest was given. -if test "${enable_glibtest+set}" = set; then - enableval="$enable_glibtest" - : -else - enable_glibtest=yes -fi - - - if test x$glib_config_exec_prefix != x ; then - glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config - fi - fi - if test x$glib_config_prefix != x ; then - glib_config_args="$glib_config_args --prefix=$glib_config_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_prefix/bin/glib-config - fi - fi - - for module in . - do - case "$module" in - gmodule) - glib_config_args="$glib_config_args gmodule" - ;; - gthread) - glib_config_args="$glib_config_args gthread" - ;; - esac - done - - unset ac_cv_path_GLIB_CONFIG - - # 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:16709: 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 - case "$GLIB_CONFIG" in - /*) - ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GLIB_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no" - ;; -esac -fi -GLIB_CONFIG="$ac_cv_path_GLIB_CONFIG" -if test -n "$GLIB_CONFIG"; then - echo "$ac_t""$GLIB_CONFIG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - min_glib_version=${GLIB_VERSION} - echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:16744: checking for GLIB - version >= $min_glib_version" >&5 - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes - else - GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` - glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" - rm -f conf.glibtest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat > conftest.$ac_ext < -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If glib-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); - printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the glib-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); - printf("*** correct copy of glib-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} - -EOF -if { (eval echo configure:16843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - no_glib=yes -fi -rm -fr conftest* -fi - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - echo "$ac_t""yes" 1>&6 - : - else - echo "$ac_t""no" 1>&6 - if test "$GLIB_CONFIG" = "no" ; then - echo "*** The glib-config script installed by GLIB could not be found" - echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GLIB_CONFIG environment variable to the" - echo "*** full path to glib-config." - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - cat > conftest.$ac_ext < -#include - -int main() { - return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); -; return 0; } -EOF -if { (eval echo configure:16887: \"$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" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" - echo "*** may want to edit the glib-config script: $GLIB_CONFIG" -fi -rm -f conftest* - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - : - fi - - - rm -f conf.glibtest - + AM_PATH_GLIB(${GLIB_VERSION}) fi fi fi @@ -16962,19 +14857,19 @@ mk_add_options MOZ_CO_MODULE=mozilla/other-licenses/libart_lgpl" 1>&2; exit 1; } # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:16966: checking for working alloca.h" >&5 +echo "configure:14861: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:16978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -16995,12 +14890,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:16999: checking for alloca" >&5 +echo "configure:14894: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -17060,12 +14955,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:17064: checking whether alloca needs Cray hooks" >&5 +echo "configure:14959: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17094: checking for $ac_func" >&5 +echo "configure:14989: 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:15017: \"$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 @@ -17145,7 +15040,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:17149: checking stack direction for C alloca" >&5 +echo "configure:15044: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17153,7 +15048,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -17207,18 +15102,10 @@ if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CAIRO" ; then fi MOZ_TREE_CAIRO=1 - # Check whether --enable-system-cairo or --disable-system-cairo was given. -if test "${enable_system_cairo+set}" = set; then - enableval="$enable_system_cairo" - if test "$enableval" = "yes"; then - MOZ_TREE_CAIRO= - elif test "$enableval" = "no"; then - MOZ_TREE_CAIRO=1 - else - { echo "configure: error: Option, system-cairo, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - + MOZ_ARG_ENABLE_BOOL(system-cairo, + --enable-system-cairo Use system cairo (located with pkgconfig), + MOZ_TREE_CAIRO=, + MOZ_TREE_CAIRO=1 ) if test -z "$MOZ_TREE_CAIRO"; then @@ -17228,7 +15115,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17232: checking for $ac_word" >&5 +echo "configure:15119: 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 @@ -17272,19 +15159,19 @@ fi PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 -echo "configure:17276: checking for cairo >= $CAIRO_VERSION" >&5 +echo "configure:15163: checking for cairo >= $CAIRO_VERSION" >&5 if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 -echo "configure:17283: checking CAIRO_CFLAGS" >&5 +echo "configure:15170: checking CAIRO_CFLAGS" >&5 CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` echo "$ac_t""$CAIRO_CFLAGS" 1>&6 echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 -echo "configure:17288: checking CAIRO_LIBS" >&5 +echo "configure:15175: checking CAIRO_LIBS" >&5 ## don't use --libs since that can do evil things like add ## -Wl,--export-dynamic CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`" @@ -17322,18 +15209,9 @@ fi MOZ_XUL=1 -# Check whether --enable-xul or --disable-xul was given. -if test "${enable_xul+set}" = set; then - enableval="$enable_xul" - if test "$enableval" = "no"; then - MOZ_XUL= - elif test "$enableval" = "yes"; then - : - else - { echo "configure: error: Option, xul, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(xul, + --disable-xul Disable XUL, + MOZ_XUL= ) if test "$MOZ_XUL"; then cat >> confdefs.h <<\EOF #define MOZ_XUL 1 @@ -17345,18 +15223,10 @@ fi -# Check whether --enable-profilesharing or --disable-profilesharing was given. -if test "${enable_profilesharing+set}" = set; then - enableval="$enable_profilesharing" - if test "$enableval" = "no"; then - MOZ_PROFILESHARING= - elif test "$enableval" = "yes"; then - MOZ_PROFILESHARING=1 - else - { echo "configure: error: Option, profilesharing, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(profilesharing, + --disable-profilesharing Disable profile sharing, + MOZ_PROFILESHARING=, + MOZ_PROFILESHARING=1 ) if test "$MOZ_PROFILESHARING"; then MOZ_IPCD=1 cat >> confdefs.h <<\EOF @@ -17365,18 +15235,10 @@ EOF fi -# Check whether --enable-profilelocking or --disable-profilelocking was given. -if test "${enable_profilelocking+set}" = set; then - enableval="$enable_profilelocking" - if test "$enableval" = "no"; then - MOZ_PROFILELOCKING= - elif test "$enableval" = "yes"; then - MOZ_PROFILELOCKING=1 - else - { echo "configure: error: Option, profilelocking, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(profilelocking, + --disable-profilelocking Disable profile locking, + MOZ_PROFILELOCKING=, + MOZ_PROFILELOCKING=1 ) if test "$MOZ_PROFILELOCKING"; then cat >> confdefs.h <<\EOF #define MOZ_PROFILELOCKING 1 @@ -17387,10 +15249,10 @@ fi NECKO_PROTOCOLS_DEFAULT="about data file ftp gopher http keyword res viewsource" -# Check whether --enable-necko-protocols or --disable-necko-protocols was given. -if test "${enable_necko_protocols+set}" = set; then - enableval="$enable_necko_protocols" - for option in `echo $enableval | sed 's/,/ /g'`; do +MOZ_ARG_ENABLE_STRING(necko-protocols, + --enable-necko-protocols[={http,ftp,default,all,none}] + Enable/disable specific protocol handlers, + for option in `echo $enableval | sed 's/,/ /g'`; do if test "$option" = "yes" || test "$option" = "all"; then NECKO_PROTOCOLS="$NECKO_PROTOCOLS $NECKO_PROTOCOLS_DEFAULT" elif test "$option" = "no" || test "$option" = "none"; then @@ -17403,11 +15265,8 @@ if test "${enable_necko_protocols+set}" = set; then else NECKO_PROTOCOLS="$NECKO_PROTOCOLS $option" fi -done -else - NECKO_PROTOCOLS="$NECKO_PROTOCOLS_DEFAULT" -fi - +done, + NECKO_PROTOCOLS="$NECKO_PROTOCOLS_DEFAULT") NECKO_PROTOCOLS=`${PERL} ${srcdir}/build/unix/uniq.pl ${NECKO_PROTOCOLS}` for p in $NECKO_PROTOCOLS; do @@ -17418,18 +15277,11 @@ EOF done NECKO_DISK_CACHE=1 -# Check whether --enable-necko-disk-cache or --disable-necko-disk-cache was given. -if test "${enable_necko_disk_cache+set}" = set; then - enableval="$enable_necko_disk_cache" - if test "$enableval" = "no"; then - NECKO_DISK_CACHE= - elif test "$enableval" = "yes"; then - NECKO_DISK_CACHE=1 - else - { echo "configure: error: Option, necko-disk-cache, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(necko-disk-cache, + --disable-necko-disk-cache + Disable necko disk cache, + NECKO_DISK_CACHE=, + NECKO_DISK_CACHE=1) if test "$NECKO_DISK_CACHE"; then cat >> confdefs.h <<\EOF @@ -17439,18 +15291,11 @@ EOF fi NECKO_SMALL_BUFFERS= -# Check whether --enable-necko-small-buffers or --disable-necko-small-buffers was given. -if test "${enable_necko_small_buffers+set}" = set; then - enableval="$enable_necko_small_buffers" - if test "$enableval" = "yes"; then - NECKO_SMALL_BUFFERS=1 - elif test "$enableval" = "no"; then - NECKO_SMALL_BUFFERS= - else - { echo "configure: error: Option, necko-small-buffers, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(necko-small-buffers, + --enable-necko-small-buffers + Minimize size of necko's i/o buffers, + NECKO_SMALL_BUFFERS=1, + NECKO_SMALL_BUFFERS=) if test "$NECKO_SMALL_BUFFERS"; then cat >> confdefs.h <<\EOF @@ -17460,18 +15305,10 @@ EOF fi NECKO_COOKIES=1 -# Check whether --enable-cookies or --disable-cookies was given. -if test "${enable_cookies+set}" = set; then - enableval="$enable_cookies" - if test "$enableval" = "no"; then - NECKO_COOKIES= - elif test "$enableval" = "yes"; then - NECKO_COOKIES=1 - else - { echo "configure: error: Option, cookies, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(cookies, + --disable-cookies Disable cookie support, + NECKO_COOKIES=, + NECKO_COOKIES=1) if test "$NECKO_COOKIES"; then cat >> confdefs.h <<\EOF @@ -17483,18 +15320,10 @@ fi _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_" MOZ_V1_STRING_ABI=1 -# Check whether --enable-v1-string-abi or --disable-v1-string-abi was given. -if test "${enable_v1_string_abi+set}" = set; then - enableval="$enable_v1_string_abi" - if test "$enableval" = "no"; then - MOZ_V1_STRING_ABI= - elif test "$enableval" = "yes"; then - MOZ_V1_STRING_ABI=1 - else - { echo "configure: error: Option, v1-string-abi, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(v1-string-abi, + --disable-v1-string-abi Disable binary compatibility layer for strings, + MOZ_V1_STRING_ABI=, + MOZ_V1_STRING_ABI=1) if test "$MOZ_V1_STRING_ABI"; then cat >> confdefs.h <<\EOF @@ -17540,14 +15369,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:17551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -17833,7 +15662,7 @@ if test -n "$MOZ_X11"; then _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $XCFLAGS" cat > conftest.$ac_ext < @@ -17849,7 +15678,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -18304,9 +16133,6 @@ s%@AIX_OBJMODEL@%$AIX_OBJMODEL%g s%@NO_LD_ARCHIVE_FLAGS@%$NO_LD_ARCHIVE_FLAGS%g s%@WRAP_SYSTEM_INCLUDES@%$WRAP_SYSTEM_INCLUDES%g s%@VISIBILITY_FLAGS@%$VISIBILITY_FLAGS%g -s%@FT2_CONFIG@%$FT2_CONFIG%g -s%@FT2_CFLAGS@%$FT2_CFLAGS%g -s%@FT2_LIBS@%$FT2_LIBS%g s%@XCFLAGS@%$XCFLAGS%g s%@XLDFLAGS@%$XLDFLAGS%g s%@XLIBS@%$XLIBS%g @@ -18317,14 +16143,12 @@ s%@HAVE_GCC3_ABI@%$HAVE_GCC3_ABI%g s%@NSPR_CONFIG@%$NSPR_CONFIG%g s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g s%@NSPR_LIBS@%$NSPR_LIBS%g -s%@GTK_CONFIG@%$GTK_CONFIG%g -s%@GTK_CFLAGS@%$GTK_CFLAGS%g -s%@GTK_LIBS@%$GTK_LIBS%g s%@PKG_CONFIG@%$PKG_CONFIG%g s%@MOZ_GTK2_CFLAGS@%$MOZ_GTK2_CFLAGS%g s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g s%@HOST_MOC@%$HOST_MOC%g s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g +s%@GTK_CONFIG@%$GTK_CONFIG%g s%@TK_CFLAGS@%$TK_CFLAGS%g s%@TK_LIBS@%$TK_LIBS%g s%@MOZ_ENABLE_CAIRO@%$MOZ_ENABLE_CAIRO%g @@ -18405,11 +16229,10 @@ s%@COMPILER_DEPEND@%$COMPILER_DEPEND%g s%@MDDEPDIR@%$MDDEPDIR%g s%@LIBIDL_CFLAGS@%$LIBIDL_CFLAGS%g s%@LIBIDL_LIBS@%$LIBIDL_LIBS%g -s%@GLIB_CONFIG@%$GLIB_CONFIG%g -s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g -s%@GLIB_LIBS@%$GLIB_LIBS%g s%@LIBIDL_CONFIG@%$LIBIDL_CONFIG%g s%@ORBIT_CONFIG@%$ORBIT_CONFIG%g +s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g +s%@GLIB_LIBS@%$GLIB_LIBS%g s%@GLIB_GMODULE_LIBS@%$GLIB_GMODULE_LIBS%g s%@HOST_LIBIDL_CONFIG@%$HOST_LIBIDL_CONFIG%g s%@HOST_LIBIDL_CFLAGS@%$HOST_LIBIDL_CFLAGS%g