diff --git a/mozilla/configure b/mozilla/configure index 13ecd636646..87264eb5ab6 100755 --- a/mozilla/configure +++ b/mozilla/configure @@ -1,5 +1,10 @@ #! /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. @@ -11,8 +16,367 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --disable-compile-environment + Disable compiler/library checks." +ac_help="$ac_help + --with-macos-sdk=dir Location of platform SDK to use (Mac OS X only)" 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.2/ppc, 10.4/x86) + 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-canvas Enable html:canvas feature" +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 + --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) + minimo + 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 + --enable-branding Enable branding from the specified directory." +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-xpcom-obsolete Disable XPCOM Obsolete Library" +ac_help="$ac_help + --disable-xtf Disable XTF (pluggable xml tags) support" +ac_help="$ac_help + --enable-javaxpcom + Enable Java-XPCOM bridge" +ac_help="$ac_help + --enable-extensions Enable extensions" +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-updater Disable building of updater" +ac_help="$ac_help + --enable-update-channel=CHANNEL + Select application update channel (default=default)" +ac_help="$ac_help + --enable-update-packaging + Enable tools/update-packaging" +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[=DBG] Enable building with developer debug info + (Using compiler flags DBG)" +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 + --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)" +ac_help="$ac_help + --with-libIDL-exec-prefix=PFX + 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-libIDL-prefix=PFX + Prefix where libIDL is installed (optional)" +ac_help="$ac_help + --with-libIDL-exec-prefix=PFX + 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 @@ -570,7 +934,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:574: checking host system type" >&5 +echo "configure:938: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -591,7 +955,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:595: checking target system type" >&5 +echo "configure:959: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -609,7 +973,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:613: checking build system type" >&5 +echo "configure:977: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -683,7 +1047,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:687: checking for $ac_word" >&5 +echo "configure:1051: 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 @@ -763,18 +1127,25 @@ esac fi COMPILE_ENVIRONMENT=1 -MOZ_ARG_ENABLE_BOOL(compile-environment, - --disable-compile-environment - Disable compiler/library checks., - COMPILE_ENVIRONMENT=1, - COMPILE_ENVIRONMENT= ) +# Check whether --enable-compile-environment or --disable-compile-environment was given. +if test "${enable_compile_environment+set}" = set; then + enableval="$enable_compile_environment" + if test "$enableval" = "yes"; then + COMPILE_ENVIRONMENT=1 + elif test "$enableval" = "no"; then + COMPILE_ENVIRONMENT= + else + { echo "configure: error: Option, compile-environment, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + for ac_prog in nsinstall 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:778: checking for $ac_word" >&5 +echo "configure:1149: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -847,13 +1218,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:851: checking for host c compiler" >&5 +echo "configure:1222: 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:857: checking for $ac_word" >&5 +echo "configure:1228: 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 @@ -888,13 +1259,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:892: checking for host c++ compiler" >&5 +echo "configure:1263: 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:898: checking for $ac_word" >&5 +echo "configure:1269: 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 @@ -943,7 +1314,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:947: checking for $ac_word" >&5 +echo "configure:1318: 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 @@ -978,7 +1349,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:982: checking for $ac_word" >&5 +echo "configure:1353: 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 @@ -1013,16 +1384,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:1017: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1388: 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:1397: \"$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 @@ -1037,16 +1408,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:1041: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1412: 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:1421: \"$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 @@ -1075,7 +1446,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:1079: checking for $ac_word" >&5 +echo "configure:1450: 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 @@ -1109,7 +1480,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:1113: checking for $ac_word" >&5 +echo "configure:1484: 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 @@ -1139,7 +1510,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:1143: checking for $ac_word" >&5 +echo "configure:1514: 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 @@ -1190,7 +1561,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:1194: checking for $ac_word" >&5 +echo "configure:1565: 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 @@ -1222,7 +1593,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1226: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1597: 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. @@ -1233,12 +1604,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1237 "configure" +#line 1608 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1613: \"$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 @@ -1264,12 +1635,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:1268: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1639: 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:1273: checking whether we are using GNU C" >&5 +echo "configure:1644: 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 @@ -1278,7 +1649,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1282: \"$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:1653: \"$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 @@ -1297,7 +1668,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:1301: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1672: 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 @@ -1333,7 +1704,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:1337: checking for $ac_word" >&5 +echo "configure:1708: 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 @@ -1369,7 +1740,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:1373: checking for $ac_word" >&5 +echo "configure:1744: 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 @@ -1401,7 +1772,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1405: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1776: 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. @@ -1412,12 +1783,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1416 "configure" +#line 1787 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1792: \"$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 @@ -1443,12 +1814,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:1447: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1818: 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:1452: checking whether we are using GNU C++" >&5 +echo "configure:1823: 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 @@ -1457,7 +1828,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1461: \"$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:1832: \"$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 @@ -1476,7 +1847,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:1480: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1851: 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 @@ -1517,7 +1888,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext < $ac_declaration @@ -1525,7 +1896,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:1529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1535,14 +1906,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -1571,7 +1942,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:1575: checking for $ac_word" >&5 +echo "configure:1946: 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 @@ -1606,7 +1977,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:1610: checking for $ac_word" >&5 +echo "configure:1981: 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 @@ -1641,7 +2012,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:1645: checking for $ac_word" >&5 +echo "configure:2016: 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 @@ -1682,7 +2053,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:1686: checking for $ac_word" >&5 +echo "configure:2057: 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 @@ -1717,7 +2088,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:1721: checking for $ac_word" >&5 +echo "configure:2092: 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 @@ -1752,7 +2123,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:1756: checking for $ac_word" >&5 +echo "configure:2127: 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 @@ -1790,7 +2161,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:1794: checking for $ac_word" >&5 +echo "configure:2165: 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 @@ -1820,7 +2191,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:1824: checking for $ac_word" >&5 +echo "configure:2195: 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 @@ -1871,7 +2242,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:1875: checking for $ac_word" >&5 +echo "configure:2246: 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 @@ -1903,7 +2274,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1907: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2278: 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. @@ -1914,12 +2285,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1918 "configure" +#line 2289 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2294: \"$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 @@ -1945,12 +2316,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:1949: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2320: 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:1954: checking whether we are using GNU C" >&5 +echo "configure:2325: 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 @@ -1959,7 +2330,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1963: \"$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:2334: \"$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 @@ -1978,7 +2349,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:1982: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2353: 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 @@ -2014,7 +2385,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:2018: checking for $ac_word" >&5 +echo "configure:2389: 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 @@ -2046,7 +2417,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2050: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2421: 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. @@ -2057,12 +2428,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2061 "configure" +#line 2432 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2437: \"$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 @@ -2088,12 +2459,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:2092: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2463: 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:2097: checking whether we are using GNU C++" >&5 +echo "configure:2468: 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 @@ -2102,7 +2473,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2106: \"$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:2477: \"$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 @@ -2121,7 +2492,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:2125: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2496: 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 @@ -2162,7 +2533,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext < $ac_declaration @@ -2170,7 +2541,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:2174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2180,14 +2551,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -2206,7 +2577,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:2210: checking for $ac_word" >&5 +echo "configure:2581: 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 @@ -2238,7 +2609,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:2242: checking for $ac_word" >&5 +echo "configure:2613: 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 @@ -2279,7 +2650,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:2283: checking for $ac_word" >&5 +echo "configure:2654: 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 @@ -2314,7 +2685,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2318: checking for $ac_word" >&5 +echo "configure:2689: 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 @@ -2349,7 +2720,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2353: checking for $ac_word" >&5 +echo "configure:2724: 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 @@ -2384,7 +2755,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2388: checking for $ac_word" >&5 +echo "configure:2759: 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 @@ -2473,7 +2844,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:2477: checking for $ac_word" >&5 +echo "configure:2848: 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 @@ -2515,14 +2886,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:2526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2540,14 +2911,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:2551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2603,7 +2974,7 @@ cross_compiling=$ac_cv_prog_cc_cross _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` # Add flags if necessary echo $ac_n "checking for midl flags""... $ac_c" 1>&6 -echo "configure:2607: checking for midl flags" >&5 +echo "configure:2978: 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 @@ -2625,9 +2996,9 @@ echo "configure:2607: 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:2629: checking for w32api version >= $W32API_VERSION" >&5 +echo "configure:3000: checking for w32api version >= $W32API_VERSION" >&5 cat > conftest.$ac_ext < int main() { @@ -2639,7 +3010,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* res=yes else @@ -2655,7 +3026,7 @@ rm -f conftest* fi # Check windres version echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 -echo "configure:2659: checking for windres version >= $WINDRES_VERSION" >&5 +echo "configure:3030: 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 }'` @@ -2682,7 +3053,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:2686: checking how to run the C preprocessor" >&5 +echo "configure:3057: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2697,13 +3068,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:2707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3078: \"$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 : @@ -2714,13 +3085,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:2724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3095: \"$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 : @@ -2731,13 +3102,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:2741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3112: \"$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 : @@ -2765,17 +3136,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:2769: checking for $ac_hdr" >&5 +echo "configure:3140: 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:2779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3150: \"$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* @@ -2806,10 +3177,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:2810: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:3181: 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:2813: checking whether cc understands -c and -o together" >&5 +echo "configure:3184: 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]/_/'`" @@ -2821,16 +3192,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:2825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:3196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:3197: \"$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:2831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3202: \"$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:2833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:3204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:3205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -2866,7 +3237,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2870: checking how to run the C preprocessor" >&5 +echo "configure:3241: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2881,13 +3252,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:2891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3262: \"$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 : @@ -2898,13 +3269,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:2908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3279: \"$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 : @@ -2915,13 +3286,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:2925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3296: \"$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 : @@ -2946,7 +3317,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2950: checking how to run the C++ preprocessor" >&5 +echo "configure:3321: 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 @@ -2959,12 +3330,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:2968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3339: \"$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 : @@ -3011,7 +3382,7 @@ fi # COMPILE_ENVIRONMENT # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3015: checking for a BSD compatible install" >&5 +echo "configure:3386: 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 @@ -3064,7 +3435,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:3068: checking whether ln -s works" >&5 +echo "configure:3439: 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 @@ -3089,7 +3460,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:3093: checking for $ac_word" >&5 +echo "configure:3464: 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 @@ -3129,7 +3500,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:3133: checking for minimum required perl version >= $PERL_VERSION" >&5 +echo "configure:3504: 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 @@ -3139,7 +3510,7 @@ if test "$_perl_res" != 0; then fi echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 -echo "configure:3143: checking for full perl installation" >&5 +echo "configure:3514: 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 @@ -3152,7 +3523,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:3156: checking for $ac_word" >&5 +echo "configure:3527: 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 @@ -3188,7 +3559,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:3192: checking for $ac_word" >&5 +echo "configure:3563: 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 @@ -3224,7 +3595,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:3228: checking for $ac_word" >&5 +echo "configure:3599: 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 @@ -3260,7 +3631,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:3264: checking for $ac_word" >&5 +echo "configure:3635: 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 @@ -3298,7 +3669,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:3302: checking for $ac_word" >&5 +echo "configure:3673: 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 @@ -3339,7 +3710,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:3343: checking for $ac_word" >&5 +echo "configure:3714: 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 @@ -3374,7 +3745,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:3378: checking for $ac_word" >&5 +echo "configure:3749: 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 @@ -3437,7 +3808,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:3441: checking for $ac_word" >&5 +echo "configure:3812: 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 @@ -3487,7 +3858,7 @@ done # Extract the first word of "sdp", so it can be a program name with args. set dummy sdp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3491: checking for $ac_word" >&5 +echo "configure:3862: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3531,9 +3902,12 @@ esac MACOS_SDK_DIR= NEXT_ROOT= -MOZ_ARG_WITH_STRING(macos-sdk, - --with-macos-sdk=dir Location of platform SDK to use (Mac OS X only), - MACOS_SDK_DIR=$withval) +# 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 + @@ -3580,7 +3954,7 @@ tools are selected during the Xcode/Developer Tools installation." 1>&2; exit 1; fi echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 -echo "configure:3584: checking for valid compiler/Mac OS X SDK combination" >&5 +echo "configure:3958: checking for valid compiler/Mac OS X SDK combination" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -3589,7 +3963,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { return 0; } @@ -3597,7 +3971,7 @@ int main() { result=yes ; return 0; } EOF -if { (eval echo configure:3601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result=no else @@ -3622,7 +3996,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:3626: checking for $ac_word" >&5 +echo "configure:4000: 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 @@ -3665,7 +4039,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:3669: checking for $ac_word" >&5 +echo "configure:4043: 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 @@ -3733,7 +4107,7 @@ if test "$COMPILE_ENVIRONMENT"; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3737: checking for X" >&5 +echo "configure:4111: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3795,12 +4169,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:3804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4178: \"$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* @@ -3869,14 +4243,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:4254: \"$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. @@ -3982,17 +4356,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:3986: checking whether -R must be followed by a space" >&5 +echo "configure:4360: 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:4370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -4008,14 +4382,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:4393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -4047,7 +4421,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:4051: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4425: 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 @@ -4055,7 +4429,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:4447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4091,7 +4465,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:4095: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4469: 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 @@ -4099,7 +4473,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:4491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4142,12 +4516,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:4146: checking for gethostbyname" >&5 +echo "configure:4520: 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:4551: \"$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 @@ -4194,7 +4568,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4198: checking for gethostbyname in -lnsl" >&5 +echo "configure:4572: 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 @@ -4202,7 +4576,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:4594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4246,12 +4620,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:4250: checking for connect" >&5 +echo "configure:4624: 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:4655: \"$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 @@ -4298,7 +4672,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4302: checking for connect in -lsocket" >&5 +echo "configure:4676: 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 @@ -4306,7 +4680,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:4698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4344,12 +4718,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:4348: checking for remove" >&5 +echo "configure:4722: 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:4753: \"$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 @@ -4396,7 +4770,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4400: checking for remove in -lposix" >&5 +echo "configure:4774: 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 @@ -4404,7 +4778,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:4796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4442,12 +4816,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4446: checking for shmat" >&5 +echo "configure:4820: 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:4851: \"$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 @@ -4494,7 +4868,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4498: checking for shmat in -lipc" >&5 +echo "configure:4872: 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 @@ -4502,7 +4876,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:4894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4549,7 +4923,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:4553: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4927: 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 @@ -4557,7 +4931,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:4949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4999,7 +5373,7 @@ MKSHLIB_UNFORCE_ALL= if test "$COMPILE_ENVIRONMENT"; then if test "$GNU_CC"; then echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 -echo "configure:5003: checking whether ld has archive extraction flags" >&5 +echo "configure:5377: 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 @@ -5016,14 +5390,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:5401: \"$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 @@ -5058,17 +5432,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:5062: checking for 64-bit OS" >&5 +echo "configure:5436: 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:5446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -5227,9 +5601,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:5231: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 +echo "configure:5605: 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:5616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -5276,17 +5650,17 @@ cross_compiling=$ac_cv_prog_cxx_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5280: checking for $ac_hdr" >&5 +echo "configure:5654: 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:5290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5664: \"$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* @@ -5328,7 +5702,7 @@ EOF LIBS="$LIBS -lbe" if test "$COMPILE_ENVIRONMENT"; then echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 -echo "configure:5332: checking for main in -lbind" >&5 +echo "configure:5706: 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 @@ -5336,14 +5710,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:5721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5364,7 +5738,7 @@ else fi echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 -echo "configure:5368: checking for main in -lzeta" >&5 +echo "configure:5742: 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 @@ -5372,14 +5746,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:5757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5440,18 +5814,18 @@ fi MACOSX=1 echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 -echo "configure:5444: checking for -dead_strip option to ld" >&5 +echo "configure:5818: checking for -dead_strip option to ld" >&5 _SAVE_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-dead_strip" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* _HAVE_DEAD_STRIP=1 else @@ -6290,7 +6664,7 @@ 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:6294: checking for Forte compiler version >= WS6U2" >&5 +echo "configure:6668: checking for Forte compiler version >= WS6U2" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -6300,7 +6674,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -6438,7 +6812,7 @@ case "$target" in ;; *-darwin*) echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 -echo "configure:6442: checking for -exported_symbols_list option to ld" >&5 +echo "configure:6816: 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 @@ -6478,12 +6852,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:6482: checking for ANSI C header files" >&5 +echo "configure:6856: 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 @@ -6491,7 +6865,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6869: \"$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* @@ -6508,7 +6882,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 @@ -6526,7 +6900,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 @@ -6547,7 +6921,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6558,7 +6932,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:6562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6582,12 +6956,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6586: checking for working const" >&5 +echo "configure:6960: 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:7014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6657,12 +7031,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:6661: checking for mode_t" >&5 +echo "configure:7035: 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 @@ -6690,12 +7064,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6694: checking for off_t" >&5 +echo "configure:7068: 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 @@ -6723,12 +7097,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6727: checking for pid_t" >&5 +echo "configure:7101: 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 @@ -6756,12 +7130,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6760: checking for size_t" >&5 +echo "configure:7134: 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 @@ -6789,12 +7163,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:6793: checking for st_blksize in struct stat" >&5 +echo "configure:7167: 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 @@ -6802,7 +7176,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:6806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -6823,12 +7197,12 @@ EOF fi echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 -echo "configure:6827: checking for siginfo_t" >&5 +echo "configure:7201: 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 < @@ -6836,7 +7210,7 @@ int main() { siginfo_t* info; ; return 0; } EOF -if { (eval echo configure:6840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_siginfo_t=true else @@ -6870,12 +7244,12 @@ EOF fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:6874: checking for int16_t" >&5 +echo "configure:7248: 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 @@ -6883,7 +7257,7 @@ int main() { int16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int16_t=true else @@ -6905,12 +7279,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:6909: checking for int32_t" >&5 +echo "configure:7283: 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 @@ -6918,7 +7292,7 @@ int main() { int32_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int32_t=true else @@ -6940,12 +7314,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:6944: checking for int64_t" >&5 +echo "configure:7318: 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 @@ -6953,7 +7327,7 @@ int main() { int64_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64_t=true else @@ -6975,12 +7349,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64""... $ac_c" 1>&6 -echo "configure:6979: checking for int64" >&5 +echo "configure:7353: 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 @@ -6988,7 +7362,7 @@ int main() { int64 foo = 0; ; return 0; } EOF -if { (eval echo configure:6992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64=true else @@ -7010,12 +7384,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:7014: checking for uint" >&5 +echo "configure:7388: 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 @@ -7023,7 +7397,7 @@ int main() { uint foo = 0; ; return 0; } EOF -if { (eval echo configure:7027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint=true else @@ -7045,12 +7419,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 -echo "configure:7049: checking for uint_t" >&5 +echo "configure:7423: 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 @@ -7058,7 +7432,7 @@ int main() { uint_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint_t=true else @@ -7080,12 +7454,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:7084: checking for uint16_t" >&5 +echo "configure:7458: 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 @@ -7093,7 +7467,7 @@ int main() { uint16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint16_t=true else @@ -7124,12 +7498,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 -echo "configure:7128: checking for uname.domainname" >&5 +echo "configure:7502: 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() { @@ -7137,7 +7511,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->domainname; } ; return 0; } EOF -if { (eval echo configure:7141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_domainname_field=true else @@ -7161,12 +7535,12 @@ else fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 -echo "configure:7165: checking for uname.__domainname" >&5 +echo "configure:7539: 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() { @@ -7174,7 +7548,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->__domainname; } ; return 0; } EOF -if { (eval echo configure:7178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_us_domainname_field=true else @@ -7207,7 +7581,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:7211: checking for usable wchar_t (2 bytes, unsigned)" >&5 +echo "configure:7585: 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 @@ -7215,14 +7589,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:7226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7600: \"$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 @@ -7257,7 +7631,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:7261: checking for compiler -fshort-wchar option" >&5 +echo "configure:7635: 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 @@ -7265,14 +7639,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:7276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7650: \"$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 @@ -7308,7 +7682,7 @@ fi if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 -echo "configure:7312: checking for visibility(hidden) attribute" >&5 +echo "configure:7686: 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 @@ -7332,7 +7706,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:7336: checking for visibility pragma support" >&5 +echo "configure:7710: 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 @@ -7374,12 +7748,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:7378: checking for $ac_hdr that defines DIR" >&5 +echo "configure:7752: 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> @@ -7387,7 +7761,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:7391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -7412,7 +7786,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:7416: checking for opendir in -ldir" >&5 +echo "configure:7790: 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 @@ -7420,7 +7794,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:7809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7453,7 +7827,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:7457: checking for opendir in -lx" >&5 +echo "configure:7831: 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 @@ -7461,7 +7835,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:7850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7504,17 +7878,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:7508: checking for $ac_hdr" >&5 +echo "configure:7882: 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:7518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7892: \"$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* @@ -7544,17 +7918,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:7548: checking for $ac_hdr" >&5 +echo "configure:7922: 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:7558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7932: \"$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* @@ -7584,17 +7958,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:7588: checking for $ac_hdr" >&5 +echo "configure:7962: 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:7598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7972: \"$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* @@ -7624,17 +7998,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:7628: checking for $ac_hdr" >&5 +echo "configure:8002: 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:7638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8012: \"$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* @@ -7664,17 +8038,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:7668: checking for $ac_hdr" >&5 +echo "configure:8042: 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:7678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8052: \"$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* @@ -7705,17 +8079,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:7709: checking for $ac_hdr" >&5 +echo "configure:8083: 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:7719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8093: \"$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* @@ -7746,17 +8120,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:7750: checking for $ac_hdr" >&5 +echo "configure:8124: 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:7760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8134: \"$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* @@ -7793,17 +8167,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:7797: checking for new" >&5 +echo "configure:8171: 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:7807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8181: \"$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* @@ -7844,17 +8218,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:7848: checking for $ac_hdr" >&5 +echo "configure:8222: 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:7858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8232: \"$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* @@ -7888,7 +8262,7 @@ case $target in ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:7892: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:8266: 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 @@ -7896,7 +8270,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:8285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7937,7 +8311,7 @@ fi ;; esac echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 -echo "configure:7941: checking for atan in -lm" >&5 +echo "configure:8315: 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 @@ -7945,7 +8319,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:8334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7990,7 +8364,7 @@ case $target in ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7994: checking for dlopen in -ldl" >&5 +echo "configure:8368: 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 @@ -7998,7 +8372,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:8387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8026,17 +8400,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:8030: checking for dlfcn.h" >&5 +echo "configure:8404: 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:8040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8414: \"$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* @@ -8072,7 +8446,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:8076: checking for demangle in -lC_r" >&5 +echo "configure:8450: 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 @@ -8080,7 +8454,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:8469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8121,7 +8495,7 @@ fi ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:8125: checking for demangle in -lC" >&5 +echo "configure:8499: 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 @@ -8129,7 +8503,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:8518: \"$ac_link\") 1>&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 +8545,7 @@ fi esac fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:8175: checking for socket in -lsocket" >&5 +echo "configure:8549: 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 @@ -8179,7 +8553,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:8568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8235,7 +8609,7 @@ EOF _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:8239: checking for XDrawLines in -lX11" >&5 +echo "configure:8613: 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 @@ -8243,7 +8617,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:8632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8276,7 +8650,7 @@ MISSING_X="$MISSING_X -lX11" fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:8280: checking for XextAddDisplay in -lXext" >&5 +echo "configure:8654: 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 @@ -8284,7 +8658,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:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8319,7 +8693,7 @@ fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:8323: checking for XtFree in -lXt" >&5 +echo "configure:8697: 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 @@ -8327,7 +8701,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:8716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8359,7 +8733,7 @@ else unset ac_cv_lib_Xt_XtFree echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:8363: checking for IceFlush in -lICE" >&5 +echo "configure:8737: 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 @@ -8367,7 +8741,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:8756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8399,7 +8773,7 @@ else fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:8403: checking for SmcCloseConnection in -lSM" >&5 +echo "configure:8777: 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 @@ -8407,7 +8781,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:8796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8439,7 +8813,7 @@ else fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:8443: checking for XtFree in -lXt" >&5 +echo "configure:8817: 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 @@ -8447,7 +8821,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:8836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8492,7 +8866,7 @@ fi esac echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 -echo "configure:8496: checking for XineramaIsActive in -lXinerama" >&5 +echo "configure:8870: 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 @@ -8500,7 +8874,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:8889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8533,17 +8907,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:8537: checking for X11/extensions/Xinerama.h" >&5 +echo "configure:8911: 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:8547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8921: \"$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* @@ -8566,7 +8940,7 @@ fi echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 -echo "configure:8570: checking for XShmCreateImage in -lXext" >&5 +echo "configure:8944: 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 @@ -8574,7 +8948,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:8963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8607,17 +8981,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:8611: checking for X11/extensions/XShm.h" >&5 +echo "configure:8985: 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:8621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8995: \"$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* @@ -8647,7 +9021,7 @@ EOF fi echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 -echo "configure:8651: checking for XieFloGeometry in -lXIE" >&5 +echo "configure:9025: 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 @@ -8655,7 +9029,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:9044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8688,17 +9062,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:8692: checking for X11/extensions/XIElib.h" >&5 +echo "configure:9066: 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:8702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9076: \"$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* @@ -8732,7 +9106,198 @@ fi LDFLAGS="$_SAVE_LDFLAGS" - AC_CHECK_FT2(6.1.0, _HAVE_FREETYPE2=1, _HAVE_FREETYPE2=) + # 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:9150: 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:9186: 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:9260: \"$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 + fi # $no_x @@ -8741,34 +9306,131 @@ 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 - ) - ) - ) -) -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, +echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +echo "configure:9312: 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:9334: 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:9356: 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:9378: 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 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:8772: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:9434: 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 @@ -8791,7 +9453,7 @@ echo "configure:8772: 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:8795: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:9457: 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 @@ -8886,10 +9548,12 @@ EOF fi -MOZ_ARG_ENABLE_STRING(macos-target, - --enable-macos-target=VER (default=10.2/ppc, 10.4/x86) - Set the minimum MacOS version needed at runtime, - _MACOSX_DEPLOYMENT_TARGET=$enableval) +# Check whether --enable-macos-target or --disable-macos-target was given. +if test "${enable_macos_target+set}" = set; then + enableval="$enable_macos_target" + _MACOSX_DEPLOYMENT_TARGET=$enableval +fi + case "$target" in *-darwin*) @@ -8911,7 +9575,7 @@ esac echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 -echo "configure:8915: checking whether mmap() sees write()s" >&5 +echo "configure:9579: checking whether mmap() sees write()s" >&5 mmap_test_prog=' @@ -8950,11 +9614,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:9622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -8979,13 +9643,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:8983: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:9647: 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 @@ -9003,7 +9667,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -9025,7 +9689,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:9029: checking for 8-bit clean memcmp" >&5 +echo "configure:9693: 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 @@ -9033,7 +9697,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:9711: \"$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 @@ -9063,12 +9727,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:9067: checking for $ac_func" >&5 +echo "configure:9731: 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:9759: \"$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 @@ -9118,12 +9782,12 @@ done for ac_func in flockfile getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9122: checking for $ac_func" >&5 +echo "configure:9786: 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:9814: \"$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 @@ -9175,12 +9839,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:9179: checking for $ac_func" >&5 +echo "configure:9843: 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:9871: \"$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 @@ -9239,19 +9903,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:9243: checking for wcrtomb" >&5 +echo "configure:9907: 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:9255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_wcrtomb="yes" else @@ -9271,19 +9935,19 @@ EOF fi echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 -echo "configure:9275: checking for mbrtowc" >&5 +echo "configure:9939: 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:9287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_mbrtowc="yes" else @@ -9312,12 +9976,12 @@ cross_compiling=$ac_cv_prog_cc_cross fi echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 -echo "configure:9316: checking for res_ninit()" >&5 +echo "configure:9980: 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:9997: \"$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 @@ -9359,12 +10023,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:9363: checking for gnu_get_libc_version()" >&5 +echo "configure:10027: 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:10043: \"$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 @@ -9404,7 +10068,7 @@ case $target_os in *) echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 -echo "configure:9408: checking for iconv in -lc" >&5 +echo "configure:10072: 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 @@ -9412,7 +10076,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:10094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9445,7 +10109,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:9449: checking for iconv in -liconv" >&5 +echo "configure:10113: 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 @@ -9453,7 +10117,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:10135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9486,7 +10150,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:9490: checking for libiconv in -liconv" >&5 +echo "configure:10154: 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 @@ -9494,7 +10158,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:10176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9535,12 +10199,12 @@ fi _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" echo $ac_n "checking for iconv()""... $ac_c" 1>&6 -echo "configure:9539: checking for iconv()" >&5 +echo "configure:10203: 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 < @@ -9554,7 +10218,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_iconv=yes else @@ -9578,12 +10242,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:9582: checking for iconv() with const input" >&5 +echo "configure:10246: 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 < @@ -9598,7 +10262,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_const_iconv=yes else @@ -9625,7 +10289,42 @@ LIBS=$_SAVE_LIBS ;; esac -AM_LANGINFO_CODESET + + echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +echo "configure:10295: 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:10307: \"$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 + ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -9636,7 +10335,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 -echo "configure:9640: checking for an implementation of va_copy()" >&5 +echo "configure:10339: 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 @@ -9646,7 +10345,7 @@ else else cat > conftest.$ac_ext < @@ -9660,7 +10359,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:9664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10363: \"$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 @@ -9677,7 +10376,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:9681: checking for an implementation of __va_copy()" >&5 +echo "configure:10380: 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 @@ -9687,7 +10386,7 @@ else else cat > conftest.$ac_ext < @@ -9701,7 +10400,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:9705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10404: \"$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 @@ -9718,7 +10417,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:9722: checking whether va_lists can be copied by value" >&5 +echo "configure:10421: 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 @@ -9728,7 +10427,7 @@ else else cat > conftest.$ac_ext < @@ -9742,7 +10441,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:9746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10445: \"$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 @@ -9841,7 +10540,7 @@ esac if test "$GNU_CXX"; then echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 -echo "configure:9845: checking for C++ exceptions flag" >&5 +echo "configure:10544: 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 @@ -9876,12 +10575,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:9880: checking for gcc 3.0 ABI" >&5 +echo "configure:10579: 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:10597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_three_abi="yes" else @@ -9918,12 +10617,12 @@ fi echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 -echo "configure:9922: checking for C++ \"explicit\" keyword" >&5 +echo "configure:10621: 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:10636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else @@ -9954,12 +10653,12 @@ EOF fi echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 -echo "configure:9958: checking for C++ \"typename\" keyword" >&5 +echo "configure:10657: 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:9982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_typename=yes else @@ -9999,12 +10698,12 @@ EOF fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 -echo "configure:10003: checking for modern C++ template specialization syntax support" >&5 +echo "configure:10702: 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 {}; @@ -10014,7 +10713,7 @@ X int_x; X y_x; ; return 0; } EOF -if { (eval echo configure:10018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else @@ -10036,12 +10735,12 @@ fi echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 -echo "configure:10040: checking whether partial template specialization works" >&5 +echo "configure:10739: 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 {}; @@ -10049,7 +10748,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:10053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_partial_specialization=yes else @@ -10070,12 +10769,12 @@ EOF fi echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 -echo "configure:10074: checking whether operators must be re-defined for templates derived from templates" >&5 +echo "configure:10773: 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 @@ -10087,7 +10786,7 @@ Derived a, b; return 0; ; return 0; } EOF -if { (eval echo configure:10091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_derived_template_operators=no else @@ -10109,12 +10808,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:10113: checking whether we need to cast a derived template to pass as its base class" >&5 +echo "configure:10812: 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 { }; @@ -10123,7 +10822,7 @@ int main() { Derived bar; return foo(bar); ; return 0; } EOF -if { (eval echo configure:10127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_cpp_template_cast_to_base=no else @@ -10144,12 +10843,12 @@ EOF fi echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 -echo "configure:10148: checking whether the compiler can resolve const ambiguities for templates" >&5 +echo "configure:10847: 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 { @@ -10170,7 +10869,7 @@ int main() { a(&i); ; return 0; } EOF -if { (eval echo configure:10174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_can_resolve_const_ambiguity=yes else @@ -10192,12 +10891,12 @@ fi echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 -echo "configure:10196: checking whether the C++ \"using\" keyword can change access" >&5 +echo "configure:10895: 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:10908: \"$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:10919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_access_changing_using2=no else @@ -10244,12 +10943,12 @@ EOF fi echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 -echo "configure:10248: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 +echo "configure:10947: 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:10968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_ambiguity_resolving_using=yes else @@ -10286,19 +10985,19 @@ EOF fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 -echo "configure:10290: checking for \"std::\" namespace" >&5 +echo "configure:10989: 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:10302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespace_std=yes else @@ -10319,12 +11018,12 @@ EOF fi echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 -echo "configure:10323: checking whether standard template operator!=() is ambiguous" >&5 +echo "configure:11022: 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 {}; @@ -10334,7 +11033,7 @@ int main() { T1 a,b; return a != b; ; return 0; } EOF -if { (eval echo configure:10338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_unambiguous_std_notequal=unambiguous else @@ -10356,12 +11055,12 @@ fi echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 -echo "configure:10360: checking for C++ reinterpret_cast" >&5 +echo "configure:11059: 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:10373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else @@ -10390,7 +11089,7 @@ EOF fi echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 -echo "configure:10394: checking for C++ dynamic_cast to void*" >&5 +echo "configure:11093: 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 @@ -10398,7 +11097,7 @@ else ac_cv_cpp_dynamic_cast_void_ptr=no else cat > conftest.$ac_ext <(suby)))); } EOF -if { (eval echo configure:10418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11117: \"$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 @@ -10438,19 +11137,19 @@ fi echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 -echo "configure:10442: checking whether C++ requires implementation of unused virtual methods" >&5 +echo "configure:11141: 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:11153: \"$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 @@ -10473,12 +11172,12 @@ fi echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 -echo "configure:10477: checking for trouble comparing to zero near std::operator!=()" >&5 +echo "configure:11176: 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 {}; @@ -10489,7 +11188,7 @@ int main() { Foo f; return (0 != f); ; return 0; } EOF -if { (eval echo configure:10493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_trouble_comparing_to_zero=no else @@ -10521,19 +11220,19 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:10525: checking for LC_MESSAGES" >&5 +echo "configure:11224: 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:10537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_i18n_lc_messages=yes else @@ -10562,14 +11261,122 @@ fi -MOZ_ARG_HEADER(External Packages) +# 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_WITH_BOOL(system-nspr, - --with-system-nspr Use system installed NSPR, - _USE_SYSTEM_NSPR=1 ) if test -n "$_USE_SYSTEM_NSPR"; then - AM_PATH_NSPR(4.0.0, MOZ_NATIVE_NSPR=1, MOZ_NATIVE_NSPR=) + +# Check whether --with-nspr-prefix or --without-nspr-prefix was given. +if test "${with_nspr_prefix+set}" = set; then + withval="$with_nspr_prefix" + nspr_config_prefix="$withval" +else + nspr_config_prefix="" +fi + + +# Check whether --with-nspr-exec-prefix or --without-nspr-exec-prefix was given. +if test "${with_nspr_exec_prefix+set}" = set; then + withval="$with_nspr_exec_prefix" + nspr_config_exec_prefix="$withval" +else + nspr_config_exec_prefix="" +fi + + + if test -n "$nspr_config_exec_prefix"; then + nspr_config_args="$nspr_config_args --exec-prefix=$nspr_config_exec_prefix" + if test -z "$NSPR_CONFIG"; then + NSPR_CONFIG=$nspr_config_exec_prefix/bin/nspr-config + fi + fi + if test -n "$nspr_config_prefix"; then + nspr_config_args="$nspr_config_args --prefix=$nspr_config_prefix" + if test -z "$NSPR_CONFIG"; then + NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config + fi + fi + + unset ac_cv_path_NSPR_CONFIG + # 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:11317: 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 + case "$NSPR_CONFIG" in + /*) + ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_NSPR_CONFIG="$NSPR_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_NSPR_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_NSPR_CONFIG" && ac_cv_path_NSPR_CONFIG="no" + ;; +esac +fi +NSPR_CONFIG="$ac_cv_path_NSPR_CONFIG" +if test -n "$NSPR_CONFIG"; then + echo "$ac_t""$NSPR_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + min_nspr_version=4.0.0 + echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 +echo "configure:11352: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 + + no_nspr="" + if test "$NSPR_CONFIG" = "no"; then + no_nspr="yes" + else + NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags` + NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs` + + nspr_config_major_version=`$NSPR_CONFIG $nspr_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + nspr_config_minor_version=`$NSPR_CONFIG $nspr_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + nspr_config_micro_version=`$NSPR_CONFIG $nspr_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + fi + + if test -z "$no_nspr"; then + echo "$ac_t""yes" 1>&6 + MOZ_NATIVE_NSPR=1 + else + echo "$ac_t""no" 1>&6 + fi + + + + + + fi if test -z "$MOZ_NATIVE_NSPR"; then @@ -10593,10 +11400,12 @@ if test -z "$MOZ_NATIVE_NSPR"; then fi if test -z "$SKIP_LIBRARY_CHECKS"; then -MOZ_ARG_WITH_STRING(system-jpeg, - --with-system-jpeg[=PFX] - Use system libjpeg [installed at prefix PFX], - JPEG_DIR=$withval) +# 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 + _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS @@ -10609,7 +11418,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:10613: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:11422: 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 @@ -10617,7 +11426,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:11441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10657,7 +11466,7 @@ if test "$SYSTEM_JPEG" = 1; then SYSTEM_JPEG= else cat > conftest.$ac_ext < #include @@ -10671,7 +11480,7 @@ else } EOF -if { (eval echo configure:10675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else @@ -10694,10 +11503,12 @@ if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$SYSTEM_JPEG" = 1; then JPEG_LIBS="-L${JPEG_DIR}/lib ${JPEG_LIBS}" fi -MOZ_ARG_WITH_STRING(system-zlib, - --with-system-zlib[=PFX] - Use system libz [installed at prefix PFX], - ZLIB_DIR=$withval) +# 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 + _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS @@ -10710,7 +11521,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:10714: checking for gzread in -lz" >&5 +echo "configure:11525: 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 @@ -10718,7 +11529,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:11544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10757,7 +11568,7 @@ if test "$SYSTEM_ZLIB" = 1; then SYSTEM_ZLIB= else cat > conftest.$ac_ext < @@ -10778,7 +11589,7 @@ else } EOF -if { (eval echo configure:10782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_ZLIB=1 else @@ -10801,10 +11612,12 @@ if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" fi -MOZ_ARG_WITH_STRING(system-png, - --with-system-png[=PFX] - Use system libpng [installed at prefix PFX], - PNG_DIR=$withval) +# 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 + _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS @@ -10819,7 +11632,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:10823: checking for png_get_valid in -lpng" >&5 +echo "configure:11636: 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 @@ -10827,7 +11640,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:11655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10866,7 +11679,7 @@ if test "$SYSTEM_PNG" = 1; then SYSTEM_PNG= else cat > conftest.$ac_ext < #include @@ -10880,7 +11693,7 @@ else } EOF -if { (eval echo configure:10884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else @@ -10905,10 +11718,18 @@ fi fi # SKIP_LIBRARY_CHECKS -MOZ_ARG_ENABLE_BOOL(canvas, - --enable-canvas Enable html:canvas feature, - MOZ_ENABLE_CANVAS=1, - MOZ_ENABLE_CANVAS= ) +# Check whether --enable-canvas or --disable-canvas was given. +if test "${enable_canvas+set}" = set; then + enableval="$enable_canvas" + if test "$enableval" = "yes"; then + MOZ_ENABLE_CANVAS=1 + elif test "$enableval" = "no"; then + MOZ_ENABLE_CANVAS= + else + { echo "configure: error: Option, canvas, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test "$MOZ_ENABLE_CANVAS"; then cat >> confdefs.h <<\EOF #define MOZ_ENABLE_CANVAS 1 @@ -10917,29 +11738,31 @@ EOF fi JAVA_INCLUDE_PATH= -MOZ_ARG_WITH_STRING(java-include-path, - --with-java-include-path=dir Location of Java SDK headers, - JAVA_INCLUDE_PATH=$withval) +# 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 + JAVA_BIN_PATH= -MOZ_ARG_WITH_STRING(java-bin-path, - --with-java-bin-path=dir Location of Java binaries (java, javac, jar), - JAVA_BIN_PATH=$withval) +# 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_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) +# 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 + if test "$_DEFAULT_TOOLKIT" = "gtk" \ -o "$_DEFAULT_TOOLKIT" = "qt" \ @@ -11096,8 +11919,268 @@ fi if test "$COMPILE_ENVIRONMENT"; then if test "$MOZ_ENABLE_GTK" then - AM_PATH_GTK($GTK_VERSION,, - { echo "configure: error: Test for GTK failed." 1>&2; exit 1; }) + # 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:11966: 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:12001: 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:12102: \"$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:12147: \"$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 + MOZ_GTK_LDFLAGS=$GTK_LIBS MOZ_GTK_CFLAGS=$GTK_CFLAGS @@ -11105,7 +12188,97 @@ fi if test "$MOZ_ENABLE_GTK2" then - PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= 1.3.7) + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:12199: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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:12243: 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:12250: 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:12255: 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\"`" + echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 + else + MOZ_GTK2_CFLAGS="" + MOZ_GTK2_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + MOZ_GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 1.3.7"` + echo $MOZ_GTK2_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + { echo "configure: error: Library requirements (gtk+-2.0 >= 1.3.7) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + fi + fi if test "$MOZ_ENABLE_XLIB" @@ -11117,9 +12290,12 @@ fi if test "$MOZ_ENABLE_QT" then - MOZ_ARG_WITH_STRING(qtdir, - --with-qtdir=\$dir Specify Qt directory , - QTDIR=$withval) + # Check whether --with-qtdir or --without-qtdir was given. +if test "${with_qtdir+set}" = set; then + withval="$with_qtdir" + QTDIR=$withval +fi + if test -z "$QTDIR"; then QTDIR="/usr" @@ -11140,7 +12316,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:11144: checking for $ac_word" >&5 +echo "configure:12320: 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 @@ -11192,7 +12368,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:11196: checking for main in -lqt" >&5 +echo "configure:12372: 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 @@ -11200,14 +12376,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:12387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11226,7 +12402,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:11230: checking for main in -lqt-mt" >&5 +echo "configure:12406: 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 @@ -11234,14 +12410,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:12421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11277,9 +12453,9 @@ fi LIBS="$LIBS $QT_LIBS" echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 -echo "configure:11281: checking Qt - version >= $QT_VERSION" >&5 +echo "configure:12457: checking Qt - version >= $QT_VERSION" >&5 cat > conftest.$ac_ext < int main() { @@ -11290,7 +12466,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else @@ -11359,7 +12535,7 @@ fi -MOZ_ARG_HEADER(Application) +# Application ACCESSIBILITY=1 BUILD_MODULES=all @@ -11425,20 +12601,12 @@ case "$target_os" in ;; esac -MOZ_ARG_ENABLE_STRING(application, - --enable-application=APP - Options include: - suite - browser (Firefox) - mail (Thunderbird) - minimo - composer - calendar - xulrunner - macbrowser (Camino) - standalone (use this for standalone - xpcom/xpconnect or to manually drive a build), - MOZ_BUILD_APP=$enableval ) +# Check whether --enable-application or --disable-application was given. +if test "${enable_application+set}" = set; then + enableval="$enable_application" + MOZ_BUILD_APP=$enableval +fi + case "$MOZ_BUILD_APP" in suite) @@ -11624,30 +12792,56 @@ EOF fi -MOZ_ARG_HEADER(Components and Features) +# Components and Features -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-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_BOOL(calendar, - --enable-calendar Enable building of the calendar client, - MOZ_CALENDAR=1, - MOZ_CALENDAR= ) + +# 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_DISABLE_BOOL(mailnews, - --disable-mailnews Disable building of mail & news components, - MOZ_MAIL_NEWS=, - MOZ_MAIL_NEWS=1 ) + +# 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_ENABLE_BOOL(static-mail, - --enable-static-mail Enable static mail build support, - MOZ_STATIC_MAIL_BUILD=1, - MOZ_STATIC_MAIL_BUILD= ) + +# 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 + if test "$MOZ_STATIC_MAIL_BUILD"; then cat >> confdefs.h <<\EOF @@ -11658,18 +12852,24 @@ fi -MOZ_ARG_DISABLE_BOOL(ldap, - --disable-ldap Disable LDAP support, - MOZ_LDAP_XPCOM=, - MOZ_LDAP_XPCOM=1) +# 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_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/ ., -case "$MOZ_BUILD_APP" in + +# 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 + case "$MOZ_BUILD_APP" in browser) MOZ_BRANDING_DIRECTORY=other-licenses/branding/firefox MOZ_APP_DISPLAYNAME=Firefox @@ -11682,18 +12882,31 @@ mail) *) { echo "configure: error: Official branding is only available for Firefox and Thunderbird." 1>&2; exit 1; } esac -) -MOZ_ARG_WITH_STRING(branding, - --enable-branding Enable branding from the specified directory., - MOZ_BRANDING_DIRECTORY=$withval) + elif test "$enableval" = "no"; then + : + else + { echo "configure: error: Option, official-branding, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + + +# Check whether --with-branding or --without-branding was given. +if test "${with_branding+set}" = set; then + withval="$with_branding" + MOZ_BRANDING_DIRECTORY=$withval +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") + +# 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 + if test -z "$MOZ_DISTRIBUTION_ID"; then MOZ_DISTRIBUTION_ID="org.mozilla" @@ -11705,10 +12918,18 @@ EOF -MOZ_ARG_DISABLE_BOOL(freetype2, - --disable-freetype2 Disable FreeType2 support , - MOZ_ENABLE_FREETYPE2=, - MOZ_ENABLE_FREETYPE2=1) +# 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 +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; } @@ -11727,10 +12948,18 @@ if test "$MOZ_ENABLE_GTK2"; then MOZ_ENABLE_XFT=1 fi -MOZ_ARG_DISABLE_BOOL(xft, - --disable-xft Disable Xft support , - MOZ_ENABLE_XFT=, - MOZ_ENABLE_XFT=1) +# 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 + 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; } @@ -11746,18 +12975,206 @@ then #define MOZ_ENABLE_XFT 1 EOF - PKG_CHECK_MODULES(MOZ_XFT, xft) - PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0) + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:12986: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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:13030: 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:13037: 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:13042: 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\"`" + echo "$ac_t""$MOZ_XFT_LIBS" 1>&6 + else + MOZ_XFT_CFLAGS="" + MOZ_XFT_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + MOZ_XFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xft"` + echo $MOZ_XFT_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + { echo "configure: error: Library requirements (xft) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + fi + + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:13077: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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:13121: 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:13128: 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:13133: 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\"`" + echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 + else + _PANGOCHK_CFLAGS="" + _PANGOCHK_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + _PANGOCHK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.1.0"` + echo $_PANGOCHK_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + { echo "configure: error: Library requirements (pango >= 1.1.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 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=) +# 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 + if test "$MOZ_ENABLE_PANGO" then @@ -11765,7 +13182,97 @@ then #define MOZ_ENABLE_PANGO 1 EOF - PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0) + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:13193: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6 +echo "configure:13237: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 + + if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 +echo "configure:13244: checking MOZ_PANGO_CFLAGS" >&5 + MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"` + echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 +echo "configure:13249: 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.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`" + echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 + else + MOZ_PANGO_CFLAGS="" + MOZ_PANGO_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + MOZ_PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= 1.6.0 pangoft2 >= 1.6.0"` + echo $MOZ_PANGO_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + { echo "configure: error: Library requirements (pango >= 1.6.0 pangoft2 >= 1.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + fi + @@ -11788,17 +13295,25 @@ fi -MOZ_ARG_DISABLE_BOOL(postscript, - --disable-postscript Disable PostScript printing support , - MOZ_ENABLE_POSTSCRIPT=, - MOZ_ENABLE_POSTSCRIPT=1 ) +# 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 + if test "$MOZ_X11" then _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 -echo "configure:11802: checking for XpGetPrinterList in -lXp" >&5 +echo "configure:13317: 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 @@ -11806,7 +13321,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:13336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11844,10 +13359,18 @@ fi MOZ_XPRINT_LDFLAGS="$XLDFLAGS $XPRINT_LIBS" MOZ_XPRINT_LDFLAGS="$MOZ_XPRINT_LDFLAGS $XEXT_LIBS $X11_LIBS" - MOZ_ARG_DISABLE_BOOL(xprint, - --disable-xprint Disable Xprint printing support , - MOZ_ENABLE_XPRINT=, - MOZ_ENABLE_XPRINT=1 ) + # 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 + fi @@ -11860,22 +13383,120 @@ then MOZ_ENABLE_LIBGNOME=1 fi - MOZ_ARG_DISABLE_BOOL(gnomevfs, - --disable-gnomevfs Disable GnomeVFS support , - MOZ_ENABLE_GNOMEVFS=, - MOZ_ENABLE_GNOMEVFS=force) + # 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 + if test "$MOZ_ENABLE_GNOMEVFS" then - PKG_CHECK_MODULES(MOZ_GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION, + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:13409: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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:13453: 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:13460: 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:13465: 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\"`" + echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6 + else + MOZ_GNOMEVFS_CFLAGS="" + MOZ_GNOMEVFS_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + MOZ_GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + MOZ_ENABLE_GNOMEVFS=1 - , + + else + if test "$MOZ_ENABLE_GNOMEVFS" = "force" then - AC_MSG_ERROR([* * * Could not find gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION]) + { echo "configure: error: * * * Could not find gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" 1>&2; exit 1; } fi MOZ_ENABLE_GNOMEVFS= - ) + + fi + fi @@ -11883,11 +13504,101 @@ then if test "$MOZ_ENABLE_GCONF" then - PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION, + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:13515: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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:13559: 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:13566: 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:13571: 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\"`" + echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6 + else + MOZ_GCONF_CFLAGS="" + MOZ_GCONF_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + MOZ_GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= $GCONF_VERSION"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + MOZ_ENABLE_GCONF=1 - , + + else + MOZ_ENABLE_GCONF= - ) + + fi + fi @@ -11895,11 +13606,101 @@ then if test "$MOZ_ENABLE_LIBGNOME" then - PKG_CHECK_MODULES(MOZ_LIBGNOME, libgnome-2.0 >= $LIBGNOME_VERSION, + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:13617: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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:13661: 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:13668: 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:13673: 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\"`" + echo "$ac_t""$MOZ_LIBGNOME_LIBS" 1>&6 + else + MOZ_LIBGNOME_CFLAGS="" + MOZ_LIBGNOME_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + MOZ_LIBGNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnome-2.0 >= $LIBGNOME_VERSION"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + MOZ_ENABLE_LIBGNOME=1 - , + + else + MOZ_ENABLE_LIBGNOME= - ) + + fi + fi @@ -11923,21 +13724,118 @@ if test "$MOZ_ENABLE_GTK2" then MOZ_ENABLE_GNOMEUI=1 - MOZ_ARG_DISABLE_BOOL(gnomeui, - --disable-gnomeui Disable libgnomeui support (default: auto, optional at runtime) , - MOZ_ENABLE_GNOMEUI=, - MOZ_ENABLE_GNOMEUI=force) + # 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 + if test "$MOZ_ENABLE_GNOMEUI" then - PKG_CHECK_MODULES(MOZ_GNOMEUI, libgnomeui-2.0 >= $GNOMEUI_VERSION, - MOZ_ENABLE_GNOMEUI=1, + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:13750: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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:13794: 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:13801: 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:13806: 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\"`" + echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6 + else + MOZ_GNOMEUI_CFLAGS="" + MOZ_GNOMEUI_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + MOZ_GNOMEUI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 >= $GNOMEUI_VERSION"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + MOZ_ENABLE_GNOMEUI=1 + else + if test "$MOZ_ENABLE_GNOMEUI" = "force" then - AC_MSG_ERROR([* * * Could not find libgnomeui-2.0 >= $GNOMEUI_VERSION]) + { echo "configure: error: * * * Could not find libgnomeui-2.0 >= $GNOMEUI_VERSION" 1>&2; exit 1; } fi MOZ_ENABLE_GNOMEUI= - ) + + fi + fi if test "$MOZ_ENABLE_GNOMEUI"; then @@ -11965,10 +13863,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(crypto, - --disable-crypto Disable crypto support (Personal Security Manager), - MOZ_PSM=, - 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 + if test "$COMPILE_ENVIRONMENT"; then case $target in @@ -11980,21 +13886,45 @@ if test "$COMPILE_ENVIRONMENT"; then esac fi -MOZ_ARG_DISABLE_BOOL(jsd, - --disable-jsd Disable JavaScript debug library, - MOZ_JSDEBUGGER=, - 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(plugins, - --disable-plugins Disable plugins support, - MOZ_PLUGINS=, - MOZ_PLUGINS=1) -MOZ_ARG_DISABLE_BOOL(oji, - --disable-oji Disable Open JVM Integration support, - MOZ_OJI=, - MOZ_OJI=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 + + +# 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 + if test -n "$MOZ_OJI"; then cat >> confdefs.h <<\EOF #define OJI 1 @@ -12002,11 +13932,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(xinerama, - --enable-xinerama Enable Xinerama support - ( not safe for Red Hat 7.0 ) , - _ENABLE_XINERAMA=1, - _ENABLE_XINERAMA= ) +# 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 + if test -n "$_ENABLE_XINERAMA" -a -n "$MOZ_XINERAMA_LIBS" -a \ -n "$ac_cv_header_X11_extensions_Xinerama_h"; then @@ -12023,15 +13960,31 @@ cat >> confdefs.h <<\EOF EOF -MOZ_ARG_ENABLE_BOOL(ctl, - --enable-ctl Enable Thai Complex Script support, - SUNCTL=1, - 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 + + +# 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 @@ -12040,10 +13993,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(accessibility, - --disable-accessibility Disable accessibility support, - ACCESSIBILITY=, - 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 + if test "$ACCESSIBILITY"; then cat >> confdefs.h <<\EOF #define ACCESSIBILITY 1 @@ -12051,16 +14012,31 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(xpfe-components, - --disable-xpfe-components - Disable xpfe components, - MOZ_XPFE_COMPONENTS=, - 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 + + +# 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 @@ -12068,15 +14044,31 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(single-profile, - --enable-single-profile Enable single profile support , - MOZ_SINGLE_PROFILE=1, - MOZ_SINGLE_PROFILE= ) +# 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 + + +# 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 @@ -12084,10 +14076,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(native-uconv, - --enable-native-uconv Enable iconv support, - MOZ_USE_NATIVE_UCONV=1, - 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 + if test "$MOZ_USE_NATIVE_UCONV"; then cat >> confdefs.h <<\EOF #define MOZ_USE_NATIVE_UCONV 1 @@ -12099,24 +14099,47 @@ if test "$OS_ARCH" != "WINCE" -a "$MOZ_USE_NATIVE_UCONV" -a "$ac_cv_func_iconv" 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= ) - - -MOZ_ARG_DISABLE_BOOL(composer, - --disable-composer Disable building of Composer, - MOZ_COMPOSER=, - MOZ_COMPOSER=1 ) +# 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_DISABLE_BOOL(xpcom-obsolete, - --disable-xpcom-obsolete Disable XPCOM Obsolete Library, - MOZ_NO_XPCOM_OBSOLETE=, - MOZ_NO_XPCOM_OBSOLETE=1) +# 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 + + + + +# Check whether --enable-xpcom-obsolete or --disable-xpcom-obsolete was given. +if test "${enable_xpcom_obsolete+set}" = set; then + enableval="$enable_xpcom_obsolete" + if test "$enableval" = "no"; then + MOZ_NO_XPCOM_OBSOLETE= + elif test "$enableval" = "yes"; then + MOZ_NO_XPCOM_OBSOLETE=1 + else + { echo "configure: error: Option, xpcom-obsolete, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test -n "$MOZ_NO_XPCOM_OBSOLETE"; then if test -n "$MOZ_XPINSTALL"; then @@ -12131,10 +14154,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(xtf, - --disable-xtf Disable XTF (pluggable xml tags) support, - MOZ_XTF=, - 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 + if test "$MOZ_XTF"; then cat >> confdefs.h <<\EOF #define MOZ_XTF 1 @@ -12142,11 +14173,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(javaxpcom, - --enable-javaxpcom - Enable Java-XPCOM bridge, - MOZ_JAVAXPCOM=1, - MOZ_JAVAXPCOM= ) +# Check whether --enable-javaxpcom or --disable-javaxpcom was given. +if test "${enable_javaxpcom+set}" = set; then + enableval="$enable_javaxpcom" + if test "$enableval" = "yes"; then + MOZ_JAVAXPCOM=1 + elif test "$enableval" = "no"; then + MOZ_JAVAXPCOM= + else + { echo "configure: error: Option, javaxpcom, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test -n "${MOZ_JAVAXPCOM}"; then case "$host_os" in @@ -12184,7 +14222,7 @@ if test -n "${MOZ_JAVAXPCOM}"; 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:12188: checking for $ac_word" >&5 +echo "configure:14226: 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 @@ -12220,7 +14258,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:12224: checking for $ac_word" >&5 +echo "configure:14262: 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 @@ -12260,9 +14298,10 @@ fi -MOZ_ARG_ENABLE_STRING(extensions, - --enable-extensions Enable extensions, - for option in `echo $enableval | sed 's/,/ /g'`; do +# 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 if test "$option" = "yes" || test "$option" = "all"; then MOZ_EXTENSIONS="$MOZ_EXTENSIONS $MOZ_EXTENSIONS_ALL" elif test "$option" = "no" || test "$option" = "none"; then @@ -12275,8 +14314,11 @@ MOZ_ARG_ENABLE_STRING(extensions, else MOZ_EXTENSIONS="$MOZ_EXTENSIONS $option" fi -done, - MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT") +done +else + MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT" +fi + 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 @@ -12348,10 +14390,10 @@ darwin*) ;; esac -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 +# 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 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 @@ -12364,21 +14406,39 @@ MOZ_ARG_ENABLE_STRING(image-decoders, else MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS $option" fi -done, - MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS_DEFAULT") +done +else + MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS_DEFAULT" +fi + MOZ_IMG_DECODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_DECODERS}` -MOZ_ARG_ENABLE_BOOL(ldap-experimental, - --enable-ldap-experimental - Enable LDAP experimental features, - MOZ_LDAP_XPCOM_EXPERIMENTAL=1, - MOZ_LDAP_XPCOM_EXPERIMENTAL=) +# 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 + + +# 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 @@ -12386,10 +14446,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(svg, - --enable-svg Enable SVG support, - MOZ_SVG=1, - MOZ_SVG= ) +# 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 + if test -n "$MOZ_SVG"; then cat >> confdefs.h <<\EOF #define MOZ_SVG 1 @@ -12398,16 +14466,20 @@ EOF SVG_DEFAULT_RENDERER=cairo - MOZ_ARG_ENABLE_STRING(svg-renderer, - --enable-svg-renderer={gdiplus,libart,cairo}, - SVG_RENDERER=$enableval , - SVG_RENDERER=$SVG_DEFAULT_RENDERER) + # 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 + case "$SVG_RENDERER" in gdiplus) MOZ_SVG_RENDERER_GDIPLUS=1 echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 -echo "configure:12411: checking for Gdiplus.h" >&5 +echo "configure:14483: checking for Gdiplus.h" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -12417,7 +14489,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 @@ -12426,7 +14498,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -12486,10 +14558,18 @@ case "$target_os" in ;; esac -MOZ_ARG_DISABLE_BOOL(installer, - --disable-installer Disable building of installer, - MOZ_INSTALLER=, - MOZ_INSTALLER=1 ) +# 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 + # Automatically disable installer if xpinstall isn't built if test -z "$MOZ_XPINSTALL"; then MOZ_INSTALLER= @@ -12500,23 +14580,31 @@ if test "$MOZ_XUL_APP"; then MOZ_UPDATER=1 fi -MOZ_ARG_DISABLE_BOOL(updater, - --disable-updater Disable building of updater, - MOZ_UPDATER=, - MOZ_UPDATER=1 ) +# Check whether --enable-updater or --disable-updater was given. +if test "${enable_updater+set}" = set; then + enableval="$enable_updater" + if test "$enableval" = "no"; then + MOZ_UPDATER= + elif test "$enableval" = "yes"; then + MOZ_UPDATER=1 + else + { echo "configure: error: Option, updater, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + # The Windows build requires the iconv command line utility # in order to build the updater. case "$target_os" in msvc*|mks*|cygwin*|mingw*|wince*) if test -n "$MOZ_UPDATER"; then echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:12514: checking for iconv" >&5 +echo "configure:14602: checking for iconv" >&5 for ac_prog in $HOST_ICONV "iconv" 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:12520: checking for $ac_word" >&5 +echo "configure:14608: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12555,10 +14643,12 @@ esac # app update channel is 'default' when not supplied. -MOZ_ARG_ENABLE_STRING(update-channel, - --enable-update-channel=CHANNEL - Select application update channel (default=default), - MOZ_UPDATE_CHANNEL=`echo $enableval | tr A-Z a-z`) +# Check whether --enable-update-channel or --disable-update-channel was given. +if test "${enable_update_channel+set}" = set; then + enableval="$enable_update_channel" + MOZ_UPDATE_CHANNEL=`echo $enableval | tr A-Z a-z` +fi + if test -z "$MOZ_UPDATE_CHANNEL"; then MOZ_UPDATE_CHANNEL=default @@ -12569,24 +14659,46 @@ EOF # tools/update-packaging is not checked out by default. -MOZ_ARG_ENABLE_BOOL(update-packaging, - --enable-update-packaging - Enable tools/update-packaging, - MOZ_UPDATE_PACKAGING=1, - MOZ_UPDATE_PACKAGING= ) +# Check whether --enable-update-packaging or --disable-update-packaging was given. +if test "${enable_update_packaging+set}" = set; then + enableval="$enable_update_packaging" + if test "$enableval" = "yes"; then + MOZ_UPDATE_PACKAGING=1 + elif test "$enableval" = "no"; then + MOZ_UPDATE_PACKAGING= + else + { echo "configure: error: Option, update-packaging, 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 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-scripting, - --disable-activex-scripting - Disable building of ActiveX scripting support (win32), - MOZ_ACTIVEX_SCRIPTING_SUPPORT=, - MOZ_ACTIVEX_SCRIPTING_SUPPORT=1) + +# 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 + if test -n "$MOZ_NO_ACTIVEX_SUPPORT" -a -n "$MOZ_ACTIVEX_SCRIPTING_SUPPORT"; @@ -12594,29 +14706,61 @@ then { echo "configure: error: Cannot enable ActiveX scripting support when ActiveX support is disabled." 1>&2; exit 1; } fi -MOZ_ARG_ENABLE_BOOL(leaky, - --enable-leaky Build leaky memory tool, - MOZ_LEAKY=1, - MOZ_LEAKY=) +# 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(xpctools, - --enable-xpctools Build JS profiling tool, - MOZ_XPCTOOLS=1, - MOZ_XPCTOOLS= ) + +# 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_DISABLE_BOOL(tests, - --disable-tests Do not build test libraries & programs, - ENABLE_TESTS=, - ENABLE_TESTS=1 ) -MOZ_ARG_HEADER(Individual module options) +# 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 + + +# 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 @@ -12627,10 +14771,18 @@ fi if test -n "$MOZ_CALENDAR"; then MOZ_STORAGE=1 fi -MOZ_ARG_ENABLE_BOOL(storage, - --enable-storage Enable mozStorage module and related components, - MOZ_STORAGE=1, - MOZ_STORAGE= ) +# 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 + if test -n "$MOZ_STORAGE"; then cat >> confdefs.h <<\EOF #define MOZ_STORAGE 1 @@ -12638,10 +14790,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(js-ultrasparc, - --enable-js-ultrasparc Use UltraSPARC optimizations in JS, - JS_ULTRASPARC_OPTS=1, - JS_ULTRASPARC_OPTS= ) +# 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 + if test `echo "$target_os" | grep -c \^solaris 2>/dev/null` = 0 -o \ "$OS_TEST" != "sun4u"; then @@ -12650,7 +14810,7 @@ fi -MOZ_ARG_HEADER(Debugging and Optimizations) +# Debugging and Optimizations if test -z "$MOZ_DEBUG_FLAGS" then @@ -12676,18 +14836,21 @@ then esac fi -MOZ_ARG_ENABLE_STRING(debug, - --enable-debug[=DBG] Enable building with developer debug info - (Using compiler flags DBG), - if test "$enableval" != "no"; then +# Check whether --enable-debug or --disable-debug was given. +if test "${enable_debug+set}" = set; then + enableval="$enable_debug" + if test "$enableval" != "no"; then MOZ_DEBUG=1 if test -n "$enableval" && test "$enableval" != "yes"; then MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` fi else MOZ_DEBUG= - fi , - MOZ_DEBUG=) + fi +else + MOZ_DEBUG= +fi + MOZ_DEBUG_ENABLE_DEFS="-DDEBUG -D_DEBUG" case "${target_os}" in @@ -12707,18 +14870,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED" if test -n "$MOZ_DEBUG"; then echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 -echo "configure:12711: checking for valid debug flags" >&5 +echo "configure:14874: checking for valid debug flags" >&5 _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:12722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -12739,10 +14902,10 @@ if test -z "$MOZ_OPTIMIZE_FLAGS"; then MOZ_OPTIMIZE_FLAGS="-O" fi -MOZ_ARG_ENABLE_STRING(optimize, - --disable-optimize Disable compiler optimization - --enable-optimize=[OPT] Specify compiler optimization flags [OPT=-O], - if test "$enableval" != "no"; then +# 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_OPTIMIZE=1 if test -n "$enableval" && test "$enableval" != "yes"; then MOZ_OPTIMIZE_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` @@ -12750,23 +14913,27 @@ MOZ_ARG_ENABLE_STRING(optimize, fi else MOZ_OPTIMIZE= -fi , MOZ_OPTIMIZE=1) +fi +else + MOZ_OPTIMIZE=1 +fi + if test "$COMPILE_ENVIRONMENT"; then if test -n "$MOZ_OPTIMIZE"; then echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 -echo "configure:12759: checking for valid optimization flags" >&5 +echo "configure:14926: 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:12770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -12788,30 +14955,40 @@ fi # COMPILE_ENVIRONMENT -MOZ_ARG_ENABLE_STRING(debug-modules, - --enable-debug-modules Enable/disable debug info for specific modules, - MOZ_DEBUG_MODULES=`echo $enableval| sed 's/,/ /g'` ) +# 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(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 + +# 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 i="^ALL_MODULES" fi if test "$i" = "yes"; then i="ALL_MODULES" fi MOZ_DBGRINFO_MODULES="$i $MOZ_DBGRINFO_MODULES"; - done ) + 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 -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 @@ -12819,10 +14996,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(logging, - --disable-logging Disable logging facilities, - NS_DISABLE_LOGGING=1, - NS_DISABLE_LOGGING= ) +# 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 + if test "$NS_DISABLE_LOGGING"; then cat >> confdefs.h <<\EOF #define NS_DISABLE_LOGGING 1 @@ -12835,11 +15020,18 @@ EOF 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= ) +# 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 + if test "$_CRASH_ON_ASSERT"; then cat >> confdefs.h <<\EOF #define UNIX_CRASH_ON_ASSERT 1 @@ -12847,10 +15039,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(reorder, - --enable-reorder Enable function reordering (requires GNU ld) , - _ENABLE_REORDER=1, - _ENABLE_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 + 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 @@ -12860,10 +15060,18 @@ if test -n "$_ENABLE_REORDER"; then fi _ENABLE_LOGREFCNT=42 -MOZ_ARG_ENABLE_BOOL(logrefcnt, - --enable-logrefcnt Enable logging of refcounts (default=debug) , - _ENABLE_LOGREFCNT=1, - _ENABLE_LOGREFCNT= ) +# 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 + if test "$_ENABLE_LOGREFCNT" = "1"; then cat >> confdefs.h <<\EOF #define FORCE_BUILD_REFCNT_LOGGING 1 @@ -12876,15 +15084,22 @@ EOF fi -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 +# 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 _DETECT_WEBSHELL_LEAKS=1 - fi) + fi +fi + if test "$_DETECT_WEBSHELL_LEAKS"; then cat >> confdefs.h <<\EOF @@ -12894,10 +15109,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(wrap-malloc, - --enable-wrap-malloc Wrap malloc calls (gnu linker only), - _WRAP_MALLOC=1, - _WRAP_MALLOC= ) +# 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 + if test -n "$_WRAP_MALLOC"; then if test "$GNU_CC"; then @@ -12906,17 +15129,28 @@ if test -n "$_WRAP_MALLOC"; then fi fi -MOZ_ARG_WITH_STRING(wrap-malloc, - --with-wrap-malloc=DIR Location of malloc wrapper library, - WRAP_MALLOC_LIB=$withval) +# 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_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:12920: checking for malloc in -lefence" >&5 +echo "configure:15154: 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 @@ -12924,7 +15158,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:15173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12964,10 +15198,18 @@ fi fi -MOZ_ARG_ENABLE_BOOL(jprof, - --enable-jprof Enable jprof profiling tool (needs mozilla/tools/jprof), - MOZ_JPROF=1, - MOZ_JPROF= ) +# 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 + if test -n "$MOZ_JPROF"; then cat >> confdefs.h <<\EOF #define MOZ_JPROF 1 @@ -12976,23 +15218,45 @@ EOF 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-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(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= ) +# 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 + if test "$COMPILE_ENVIRONMENT"; then if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then @@ -13006,12 +15270,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:13010: checking for $ac_func" >&5 +echo "configure:15274: 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:15305: \"$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 @@ -13075,17 +15339,33 @@ EOF fi fi # COMPILE_ENVIRONMENT -MOZ_ARG_ENABLE_BOOL(prebinding, - --enable-prebinding Enable prebinding (Mac OS X only), - USE_PREBINDING=1, - USE_PREBINDING= ) +# 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_HEADER(Profiling and Instrumenting) -MOZ_ARG_ENABLE_BOOL(timeline, - --enable-timeline Enable timeline services , - MOZ_TIMELINE=1, - MOZ_TIMELINE= ) +# Profiling and Instrumenting + +# 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 + if test -n "$MOZ_TIMELINE"; then cat >> confdefs.h <<\EOF #define MOZ_TIMELINE 1 @@ -13093,10 +15373,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(reflow-perf, - --enable-reflow-perf Enable reflow performance tracing, - MOZ_REFLOW_PERF=1, - 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 + if test -n "$MOZ_REFLOW_PREF"; then cat >> confdefs.h <<\EOF #define MOZ_REFLOW_PREF 1 @@ -13105,10 +15393,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(perf-metrics, - --enable-perf-metrics Enable performance metrics, - MOZ_PERF_METRICS=1, - MOZ_PERF_METRICS= ) +# 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 + if test -n "$MOZ_PERF_METRICS"; then cat >> confdefs.h <<\EOF #define MOZ_PERF_METRICS 1 @@ -13116,10 +15412,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(codesighs, - --enable-codesighs Enable code size analysis tools, - _ENABLE_CODESIGHS=1, - _ENABLE_CODESIGHS= ) +# 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 + if test -n "$_ENABLE_CODESIGHS"; then if test -d $srcdir/tools/codesighs; then MOZ_MAPINFO=1 @@ -13129,10 +15433,18 @@ if test -n "$_ENABLE_CODESIGHS"; then fi NS_TRACE_MALLOC=${MOZ_TRACE_MALLOC} -MOZ_ARG_ENABLE_BOOL(trace-malloc, - --enable-trace-malloc Enable malloc tracing, - NS_TRACE_MALLOC=1, - NS_TRACE_MALLOC= ) +# 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 + if test "$NS_TRACE_MALLOC"; then # Please, Mr. Linker Man, don't take away our symbol names MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS= @@ -13144,11 +15456,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(eazel-profiler-support, - --enable-eazel-profiler-support - Enable Corel/Eazel profiler support, - ENABLE_EAZEL_PROFILER=1, - ENABLE_EAZEL_PROFILER= ) +# 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 + if test -n "$ENABLE_EAZEL_PROFILER"; then cat >> confdefs.h <<\EOF #define ENABLE_EAZEL_PROFILER 1 @@ -13160,15 +15479,25 @@ EOF EAZEL_PROFILER_LIBS="-lprofiler -lpthread" fi -MOZ_ARG_ENABLE_STRING(profile-modules, - --enable-profile-modules - Enable/disable profiling for specific modules, - MOZ_PROFILE_MODULES=`echo $enableval| sed 's/,/ /g'` ) +# 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_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 @@ -13176,20 +15505,32 @@ if test -n "$_ENABLE_INSURE"; then MOZ_INSURE_EXCLUDE_DIRS="config" fi -MOZ_ARG_WITH_STRING(insure-dirs, - --with-insure-dirs=DIRS - Dirs to instrument with insure , - MOZ_INSURE_DIRS=$withval ) +# 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-exclude-dirs, - --with-insure-exclude-dirs=DIRS - Dirs to not instrument with insure , - MOZ_INSURE_EXCLUDE_DIRS="config $withval" ) -MOZ_ARG_ENABLE_BOOL(quantify, - --enable-quantify Enable Quantify support (Windows only) , - MOZ_QUANTIFY=1, - MOZ_QUANTIFY= ) +# 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 + if test -z "$SKIP_LIBRARY_CHECKS"; then @@ -13203,12 +15544,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:13207: checking for $ac_func" >&5 +echo "configure:15548: 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:15579: \"$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 @@ -13280,17 +15621,27 @@ fi -MOZ_ARG_HEADER(Misc. Options) +# Misc. Options -MOZ_ARG_ENABLE_BOOL(xterm-updates, - --enable-xterm-updates Update XTERM titles with current command., - MOZ_UPDATE_XTERM=1, - MOZ_UPDATE_XTERM= ) +# 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_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 @@ -13303,20 +15654,28 @@ 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 -MOZ_ARG_WITH_STRING(default-mozilla-five-home, - --with-default-mozilla-five-home - Set the default value for MOZILLA_FIVE_HOME, - val=`echo $withval` - AC_DEFINE_UNQUOTED(MOZ_DEFAULT_MOZILLA_FIVE_HOME,"$val") ) +# 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 - AC_MSG_ERROR("Homedir must be single relative path.") + { echo "configure: error: "Homedir must be single relative path."" 1>&2; exit 1; } else MOZ_USER_DIR="$val" -fi) +fi +fi + cat >> confdefs.h <&6 -echo "configure:13352: checking for gcc -pipe support" >&5 +echo "configure:15717: 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 @@ -13363,14 +15728,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:13374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -13395,26 +15760,33 @@ else echo "$ac_t""no" 1>&6 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) +# 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 + 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:13409: checking whether compiler supports -Wno-long-long" >&5 +echo "configure:15781: checking whether compiler supports -Wno-long-long" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15790: \"$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" @@ -13435,16 +15807,16 @@ _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fprofile-generate" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 -echo "configure:13439: checking whether C compiler supports -fprofile-generate" >&5 +echo "configure:15811: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" @@ -13462,16 +15834,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:13466: checking whether C compiler supports -fprofile-arcs" >&5 +echo "configure:15838: checking whether C compiler supports -fprofile-arcs" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-arcs" result="yes" @@ -13501,25 +15873,34 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross -MOZ_ARG_DISABLE_BOOL(pedantic, - --disable-pedantic Issue all warnings demanded by strict ANSI C , -_PEDANTIC= ) +# 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 + 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:13512: checking whether C++ compiler has -pedantic long long bug" >&5 +echo "configure:15893: 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:15904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="no" else @@ -13549,12 +15930,12 @@ fi fi echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 -echo "configure:13553: checking for correct temporary object destruction order" >&5 +echo "configure:15934: 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:15959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -13595,12 +15976,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:13599: checking for correct overload resolution with const and templates" >&5 +echo "configure:15980: 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 < @@ -13630,7 +16011,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_nscap_nonconst_opeq_bug="no" else @@ -13653,10 +16034,18 @@ EOF fi fi # SKIP_COMPILER_CHECKS -MOZ_ARG_ENABLE_BOOL(cpp-rtti, - --enable-cpp-rtti Enable C++ RTTI , - _MOZ_USE_RTTI=1 , - _MOZ_USE_RTTI= ) +# 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 + if test "$_MOZ_USE_RTTI"; then _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_ON @@ -13664,10 +16053,18 @@ else _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_OFF fi -MOZ_ARG_ENABLE_BOOL(cpp-exceptions, - --enable-cpp-exceptions Enable C++ exceptions , - _MOZ_CPP_EXCEPTIONS=1 , - _MOZ_CPP_EXCEPTIONS= ) +# 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 + if test "$_MOZ_CPP_EXCEPTIONS"; then _MOZ_EXCEPTIONS_FLAGS=$_MOZ_EXCEPTIONS_FLAGS_ON @@ -13696,24 +16093,40 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross -MOZ_ARG_HEADER(Build dependencies) +# Build dependencies MOZ_AUTO_DEPS=1 -MOZ_ARG_DISABLE_BOOL(auto-deps, - --disable-auto-deps Do not automatically generate dependency info, - MOZ_AUTO_DEPS=, - 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 + if test -n "$MOZ_AUTO_DEPS"; then _cpp_md_flag= -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" -a "$OS_ARCH" != "WINCE"; then +# 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" -a "$OS_ARCH" != "WINCE"; then _cpp_md_flag=1 - fi) + fi +fi + if test "$_cpp_md_flag"; then COMPILER_DEPEND=1 if test "$OS_ARCH" = "OpenVMS"; then @@ -13734,25 +16147,51 @@ MDDEPDIR='.deps' -MOZ_ARG_HEADER(Static build options) -MOZ_ARG_DISABLE_BOOL(shared, - --disable-shared Disable building of internal shared libs, - BUILD_SHARED_LIBS=) +# Static build options +# 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_ENABLE_BOOL(static, - --enable-static Enable building of internal static 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 BUILD_STATIC_LIBS=1 - MOZ_STATIC_COMPONENT_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 + 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 -MOZ_ARG_ENABLE_BOOL(libxul, - --enable-libxul Enable building of libxul, - MOZ_ENABLE_LIBXUL=1, - MOZ_ENABLE_LIBXUL=) +# 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 + 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; } @@ -13772,12 +16211,14 @@ else XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS" fi -MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla)) +# Standalone module options (Not for building Mozilla) + +# 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 && @@ -13798,9 +16239,18 @@ if test -z "$COMPILE_ENVIRONMENT"; then SKIP_IDL_CHECK="yes" fi -MOZ_ARG_WITHOUT_BOOL(libIDL, - --without-libIDL Skip check for libIDL (standalone modules only), - SKIP_IDL_CHECK="yes") +# 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 + if test "$SKIP_IDL_CHECK" = "no" then @@ -13819,15 +16269,1275 @@ then fi if test "$MOZ_ENABLE_GTK2"; then - PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1,_LIBIDL_FOUND=) + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:16280: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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:16324: 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:16331: 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:16336: 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\"`" + echo "$ac_t""$LIBIDL_LIBS" 1>&6 + else + LIBIDL_CFLAGS="" + LIBIDL_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + LIBIDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libIDL-2.0 >= 0.8.0"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + _LIBIDL_FOUND=1 + else + _LIBIDL_FOUND= + fi + fi if test "$MOZ_ENABLE_GTK"; then - AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1) + # Check whether --with-libIDL-prefix or --without-libIDL-prefix was given. +if test "${with_libIDL_prefix+set}" = set; then + withval="$with_libIDL_prefix" + libIDL_config_prefix="$withval" +else + libIDL_config_prefix="" +fi + +# Check whether --with-libIDL-exec-prefix or --without-libIDL-exec-prefix was given. +if test "${with_libIDL_exec_prefix+set}" = set; then + withval="$with_libIDL_exec_prefix" + libIDL_config_exec_prefix="$withval" +else + libIDL_config_exec_prefix="" +fi + +# Check whether --enable-libIDLtest or --disable-libIDLtest was given. +if test "${enable_libIDLtest+set}" = set; then + enableval="$enable_libIDLtest" + : +else + enable_libIDLtest=yes +fi + + + if test x$libIDL_config_exec_prefix != x ; then + libIDL_config_args="$libIDL_config_args --exec-prefix=$libIDL_config_exec_prefix" + if test x${LIBIDL_CONFIG+set} != xset ; then + LIBIDL_CONFIG=$libIDL_config_exec_prefix/bin/libIDL-config + fi + fi + if test x$libIDL_config_prefix != x ; then + libIDL_config_args="$libIDL_config_args --prefix=$libIDL_config_prefix" + if test x${LIBIDL_CONFIG+set} != xset ; then + LIBIDL_CONFIG=$libIDL_config_prefix/bin/libIDL-config + 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:16459: 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:16494: 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:16593: \"$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:16637: \"$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 + + + 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:16681: 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 + case "$LIBIDL_CONFIG" in + /*) + ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_LIBIDL_CONFIG="$LIBIDL_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_LIBIDL_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_LIBIDL_CONFIG" && ac_cv_path_LIBIDL_CONFIG="no" + ;; +esac +fi +LIBIDL_CONFIG="$ac_cv_path_LIBIDL_CONFIG" +if test -n "$LIBIDL_CONFIG"; then + echo "$ac_t""$LIBIDL_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +echo "configure:16716: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes + else + LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags` + LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs` + # hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove + # this after we start requiring libIDL 0.6.8 or anything higher + LIBIDL_CFLAGS="$GLIB_CFLAGS $LIBIDL_CFLAGS" + LIBIDL_LIBS="$GLIB_LIBS $LIBIDL_LIBS" + libIDL_config_major_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + libIDL_config_minor_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + libIDL_config_micro_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + if test "x$enable_libIDLtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBIDL_LIBS $LIBS" + rm -f conf.libIDLtest + 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; + int libIDL_major_version; + int libIDL_minor_version; + int libIDL_micro_version; + char *tmp_version; + + system ("touch conf.libIDLtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup ("$min_libIDL_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_libIDL_version"); + exit(1); + } + tmp_version = g_strdup (IDL_get_libver_string ()); + if (sscanf(tmp_version, "%d.%d.%d", + &libIDL_major_version, + &libIDL_minor_version, + &libIDL_micro_version) != 3) { + printf("%s, bad version string\n", tmp_version); + exit(1); + } + + if ((libIDL_major_version != $libIDL_config_major_version) || + (libIDL_minor_version != $libIDL_config_minor_version) || + (libIDL_micro_version != $libIDL_config_micro_version)) + { + printf("\n*** 'libIDL-config --version' returned %d.%d.%d, but libIDL (%d.%d.%d)\n", + $libIDL_config_major_version, $libIDL_config_minor_version, $libIDL_config_micro_version, + libIDL_major_version, libIDL_minor_version, libIDL_micro_version); + printf ("*** was found! If libIDL-config was correct, then it is best\n"); + printf ("*** to remove the old version of LIBIDL. 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 libIDL-config was wrong, set the environment variable LIBIDL_CONFIG\n"); + printf("*** to point to the correct copy of libIDL-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ((libIDL_major_version != LIBIDL_MAJOR_VERSION) || + (libIDL_minor_version != LIBIDL_MINOR_VERSION) || + (libIDL_micro_version != LIBIDL_MICRO_VERSION)) + { + printf("\n*** libIDL header files (version %d.%d.%d) do not match\n", + LIBIDL_MAJOR_VERSION, LIBIDL_MINOR_VERSION, LIBIDL_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + libIDL_major_version, libIDL_minor_version, libIDL_micro_version); + } + else + { + if ((libIDL_major_version > major) || + ((libIDL_major_version == major) && (libIDL_minor_version > minor)) || + ((libIDL_major_version == major) && (libIDL_minor_version == minor) && (libIDL_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of libIDL (%d.%d.%d) was found.\n", + libIDL_major_version, libIDL_minor_version, libIDL_micro_version); + printf("*** You need at least libIDL version %d.%d.%d.\n", + major, minor, micro); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the libIDL-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of libIDL, but you can also set the LIBIDL_CONFIG environment to point to the\n"); + printf("*** correct copy of libIDL-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:16829: \"$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_libIDL=yes +fi +rm -fr conftest* +fi + + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_libIDL" = x ; then + echo "$ac_t""yes" 1>&6 + _LIBIDL_FOUND=1 + else + echo "$ac_t""no" 1>&6 + if test "$LIBIDL_CONFIG" = "no" ; then + echo "*** The libIDL-config script installed by libIDL could not be found" + echo "*** If libIDL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the LIBIDL_CONFIG environment variable to the" + echo "*** full path to libIDL-config." + else + if test -f conf.libIDLtest ; then + : + else + echo "*** Could not run libIDL test program, checking why..." + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +#include +#include + +int main() { + return IDL_get_libver_string ? 1 : 0; +; return 0; } +EOF +if { (eval echo configure:16874: \"$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" + echo "*** version of LIBIDL. If it is not finding libIDL, 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" +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 libIDL was incorrectly installed" + echo "*** or that you have moved libIDL since it was installed. In the latter case, you" + echo "*** may want to edit the libIDL-config script: $LIBIDL_CONFIG" +fi +rm -f conftest* + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + LIBIDL_CFLAGS="" + LIBIDL_LIBS="" + : + fi + + + rm -f conf.libIDLtest + fi if test -z "$_LIBIDL_FOUND"; then - AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1) + # Check whether --with-libIDL-prefix or --without-libIDL-prefix was given. +if test "${with_libIDL_prefix+set}" = set; then + withval="$with_libIDL_prefix" + libIDL_config_prefix="$withval" +else + libIDL_config_prefix="" +fi + +# Check whether --with-libIDL-exec-prefix or --without-libIDL-exec-prefix was given. +if test "${with_libIDL_exec_prefix+set}" = set; then + withval="$with_libIDL_exec_prefix" + libIDL_config_exec_prefix="$withval" +else + libIDL_config_exec_prefix="" +fi + +# Check whether --enable-libIDLtest or --disable-libIDLtest was given. +if test "${enable_libIDLtest+set}" = set; then + enableval="$enable_libIDLtest" + : +else + enable_libIDLtest=yes +fi + + + if test x$libIDL_config_exec_prefix != x ; then + libIDL_config_args="$libIDL_config_args --exec-prefix=$libIDL_config_exec_prefix" + if test x${LIBIDL_CONFIG+set} != xset ; then + LIBIDL_CONFIG=$libIDL_config_exec_prefix/bin/libIDL-config + fi + fi + if test x$libIDL_config_prefix != x ; then + libIDL_config_args="$libIDL_config_args --prefix=$libIDL_config_prefix" + if test x${LIBIDL_CONFIG+set} != xset ; then + LIBIDL_CONFIG=$libIDL_config_prefix/bin/libIDL-config + 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:17002: 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:17037: 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:17136: \"$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:17180: \"$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 + + + 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:17224: 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 + case "$LIBIDL_CONFIG" in + /*) + ac_cv_path_LIBIDL_CONFIG="$LIBIDL_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_LIBIDL_CONFIG="$LIBIDL_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_LIBIDL_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_LIBIDL_CONFIG" && ac_cv_path_LIBIDL_CONFIG="no" + ;; +esac +fi +LIBIDL_CONFIG="$ac_cv_path_LIBIDL_CONFIG" +if test -n "$LIBIDL_CONFIG"; then + echo "$ac_t""$LIBIDL_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + min_libIDL_version=$LIBIDL_VERSION + echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 +echo "configure:17259: checking for libIDL - version >= $min_libIDL_version" >&5 + no_libIDL="" + if test "$LIBIDL_CONFIG" = "no" ; then + no_libIDL=yes + else + LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags` + LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs` + # hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove + # this after we start requiring libIDL 0.6.8 or anything higher + LIBIDL_CFLAGS="$GLIB_CFLAGS $LIBIDL_CFLAGS" + LIBIDL_LIBS="$GLIB_LIBS $LIBIDL_LIBS" + libIDL_config_major_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + libIDL_config_minor_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + libIDL_config_micro_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + if test "x$enable_libIDLtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBIDL_LIBS $LIBS" + rm -f conf.libIDLtest + 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; + int libIDL_major_version; + int libIDL_minor_version; + int libIDL_micro_version; + char *tmp_version; + + system ("touch conf.libIDLtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup ("$min_libIDL_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_libIDL_version"); + exit(1); + } + tmp_version = g_strdup (IDL_get_libver_string ()); + if (sscanf(tmp_version, "%d.%d.%d", + &libIDL_major_version, + &libIDL_minor_version, + &libIDL_micro_version) != 3) { + printf("%s, bad version string\n", tmp_version); + exit(1); + } + + if ((libIDL_major_version != $libIDL_config_major_version) || + (libIDL_minor_version != $libIDL_config_minor_version) || + (libIDL_micro_version != $libIDL_config_micro_version)) + { + printf("\n*** 'libIDL-config --version' returned %d.%d.%d, but libIDL (%d.%d.%d)\n", + $libIDL_config_major_version, $libIDL_config_minor_version, $libIDL_config_micro_version, + libIDL_major_version, libIDL_minor_version, libIDL_micro_version); + printf ("*** was found! If libIDL-config was correct, then it is best\n"); + printf ("*** to remove the old version of LIBIDL. 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 libIDL-config was wrong, set the environment variable LIBIDL_CONFIG\n"); + printf("*** to point to the correct copy of libIDL-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ((libIDL_major_version != LIBIDL_MAJOR_VERSION) || + (libIDL_minor_version != LIBIDL_MINOR_VERSION) || + (libIDL_micro_version != LIBIDL_MICRO_VERSION)) + { + printf("\n*** libIDL header files (version %d.%d.%d) do not match\n", + LIBIDL_MAJOR_VERSION, LIBIDL_MINOR_VERSION, LIBIDL_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + libIDL_major_version, libIDL_minor_version, libIDL_micro_version); + } + else + { + if ((libIDL_major_version > major) || + ((libIDL_major_version == major) && (libIDL_minor_version > minor)) || + ((libIDL_major_version == major) && (libIDL_minor_version == minor) && (libIDL_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of libIDL (%d.%d.%d) was found.\n", + libIDL_major_version, libIDL_minor_version, libIDL_micro_version); + printf("*** You need at least libIDL version %d.%d.%d.\n", + major, minor, micro); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the libIDL-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of libIDL, but you can also set the LIBIDL_CONFIG environment to point to the\n"); + printf("*** correct copy of libIDL-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:17372: \"$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_libIDL=yes +fi +rm -fr conftest* +fi + + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_libIDL" = x ; then + echo "$ac_t""yes" 1>&6 + _LIBIDL_FOUND=1 + else + echo "$ac_t""no" 1>&6 + if test "$LIBIDL_CONFIG" = "no" ; then + echo "*** The libIDL-config script installed by libIDL could not be found" + echo "*** If libIDL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the LIBIDL_CONFIG environment variable to the" + echo "*** full path to libIDL-config." + else + if test -f conf.libIDLtest ; then + : + else + echo "*** Could not run libIDL test program, checking why..." + CFLAGS="$CFLAGS $LIBIDL_CFLAGS" + LIBS="$LIBS $LIBIDL_LIBS" + cat > conftest.$ac_ext < +#include +#include + +int main() { + return IDL_get_libver_string ? 1 : 0; +; return 0; } +EOF +if { (eval echo configure:17417: \"$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" + echo "*** version of LIBIDL. If it is not finding libIDL, 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" +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 libIDL was incorrectly installed" + echo "*** or that you have moved libIDL since it was installed. In the latter case, you" + echo "*** may want to edit the libIDL-config script: $LIBIDL_CONFIG" +fi +rm -f conftest* + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + LIBIDL_CFLAGS="" + LIBIDL_LIBS="" + : + fi + + + rm -f conf.libIDLtest + if test -z "$_LIBIDL_FOUND"; then - PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1) + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:17458: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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:17502: 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:17509: 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:17514: 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\"`" + echo "$ac_t""$LIBIDL_LIBS" 1>&6 + else + LIBIDL_CFLAGS="" + LIBIDL_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + LIBIDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libIDL-2.0 >= 0.8.0"` + echo $LIBIDL_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + _LIBIDL_FOUND=1 + else + { echo "configure: error: Library requirements (libIDL-2.0 >= 0.8.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + fi + fi fi if test -z "$_LIBIDL_FOUND" && test -z "$CROSS_COMPILE"; then @@ -13836,7 +17546,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:13840: checking for $ac_word" >&5 +echo "configure:17550: 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 @@ -13873,7 +17583,7 @@ done if test -n "$ORBIT_CONFIG"; then echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 -echo "configure:13877: checking for ORBit libIDL usability" >&5 +echo "configure:17587: checking for ORBit libIDL usability" >&5 _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` @@ -13890,7 +17600,7 @@ echo "configure:13877: checking for ORBit libIDL usability" >&5 result="maybe" else cat > conftest.$ac_ext < @@ -13905,7 +17615,7 @@ int main() { } EOF -if { (eval echo configure:13909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then _LIBIDL_FOUND=1 result="yes" @@ -13955,9 +17665,369 @@ fi if test -z "$SKIP_PATH_CHECKS"; then if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then if test "$MOZ_ENABLE_GTK2"; then - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7) + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:17676: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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:17720: 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:17727: 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:17732: 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\"`" + echo "$ac_t""$GLIB_LIBS" 1>&6 + else + GLIB_CFLAGS="" + GLIB_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 1.3.7"` + echo $GLIB_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + { echo "configure: error: Library requirements (glib-2.0 >= 1.3.7) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + fi + else - AM_PATH_GLIB(${GLIB_VERSION}) + # 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:17816: 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:17851: 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:17950: \"$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:17994: \"$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 + fi fi fi @@ -13999,19 +18069,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:14003: checking for working alloca.h" >&5 +echo "configure:18073: 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:14015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18085: \"$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 @@ -14032,12 +18102,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:14036: checking for alloca" >&5 +echo "configure:18106: 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:18139: \"$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 @@ -14097,12 +18167,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:14101: checking whether alloca needs Cray hooks" >&5 +echo "configure:18171: 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:14131: checking for $ac_func" >&5 +echo "configure:18201: 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:18229: \"$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 @@ -14182,7 +18252,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:14186: checking stack direction for C alloca" >&5 +echo "configure:18256: 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 @@ -14190,7 +18260,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:18283: \"$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 @@ -14239,10 +18309,18 @@ if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_ MOZ_CAIRO_CFLAGS='-I$(DIST)/include/cairo' MOZ_TREE_CAIRO=1 - MOZ_ARG_ENABLE_BOOL(system-cairo, - --enable-system-cairo Use system cairo (located with pkgconfig), - MOZ_TREE_CAIRO=, - 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 + if test "$MOZ_TREE_CAIRO"; then # Check for headers defining standard int types. @@ -14250,17 +18328,17 @@ if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14254: checking for $ac_hdr" >&5 +echo "configure:18332: 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:14264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18342: \"$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* @@ -14333,7 +18411,97 @@ EOF fi fi else - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION) + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:18422: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + 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:18466: 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:18473: 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:18478: 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\"`" + echo "$ac_t""$CAIRO_LIBS" 1>&6 + else + CAIRO_CFLAGS="" + CAIRO_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= $CAIRO_VERSION"` + echo $CAIRO_PKG_ERRORS + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + : + else + { echo "configure: error: Library requirements (cairo >= $CAIRO_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + fi + MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS MOZ_CAIRO_LIBS=$CAIRO_LIBS fi @@ -14343,9 +18511,18 @@ fi -MOZ_ARG_DISABLE_BOOL(xul, - --disable-xul Disable XUL, - MOZ_XUL= ) +# 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 + if test "$MOZ_XUL"; then cat >> confdefs.h <<\EOF #define MOZ_XUL 1 @@ -14362,7 +18539,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c python/xpcom` -ne 0; then # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14366: checking for $ac_word" >&5 +echo "configure:18543: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14437,10 +18614,18 @@ fi -MOZ_ARG_DISABLE_BOOL(profilesharing, - --disable-profilesharing Disable profile sharing, - MOZ_PROFILESHARING=, - MOZ_PROFILESHARING=1 ) +# 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 + if test "$MOZ_PROFILESHARING"; then MOZ_IPCD=1 cat >> confdefs.h <<\EOF @@ -14449,10 +18634,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(profilelocking, - --disable-profilelocking Disable profile locking, - MOZ_PROFILELOCKING=, - MOZ_PROFILELOCKING=1 ) +# 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 + if test "$MOZ_PROFILELOCKING"; then cat >> confdefs.h <<\EOF #define MOZ_PROFILELOCKING 1 @@ -14463,10 +18656,10 @@ fi NECKO_PROTOCOLS_DEFAULT="about data file ftp gopher http keyword res viewsource" -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 +# 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 if test "$option" = "yes" || test "$option" = "all"; then NECKO_PROTOCOLS="$NECKO_PROTOCOLS $NECKO_PROTOCOLS_DEFAULT" elif test "$option" = "no" || test "$option" = "none"; then @@ -14479,8 +18672,11 @@ MOZ_ARG_ENABLE_STRING(necko-protocols, else NECKO_PROTOCOLS="$NECKO_PROTOCOLS $option" fi -done, - NECKO_PROTOCOLS="$NECKO_PROTOCOLS_DEFAULT") +done +else + NECKO_PROTOCOLS="$NECKO_PROTOCOLS_DEFAULT" +fi + NECKO_PROTOCOLS=`${PERL} ${srcdir}/build/unix/uniq.pl ${NECKO_PROTOCOLS}` for p in $NECKO_PROTOCOLS; do @@ -14490,11 +18686,18 @@ EOF done -MOZ_ARG_DISABLE_BOOL(necko-disk-cache, - --disable-necko-disk-cache - Disable necko disk cache, - NECKO_DISK_CACHE=, - 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 + if test "$NECKO_DISK_CACHE"; then cat >> confdefs.h <<\EOF @@ -14503,11 +18706,18 @@ EOF 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=) +# 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 + if test "$NECKO_SMALL_BUFFERS"; then cat >> confdefs.h <<\EOF @@ -14516,10 +18726,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(cookies, - --disable-cookies Disable cookie support, - NECKO_COOKIES=, - 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 + if test "$NECKO_COOKIES"; then cat >> confdefs.h <<\EOF @@ -14530,10 +18748,18 @@ fi _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_" -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) +# 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 + if test "$MOZ_V1_STRING_ABI"; then cat >> confdefs.h <<\EOF @@ -14574,14 +18800,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:14585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -14876,7 +19102,7 @@ if test "$MOZ_X11"; then _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $XCFLAGS" cat > conftest.$ac_ext < @@ -14892,7 +19118,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -15359,6 +19585,9 @@ 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 @@ -15366,9 +19595,17 @@ s%@XT_LIBS@%$XT_LIBS%g s%@MACOSX_DEPLOYMENT_TARGET@%$MACOSX_DEPLOYMENT_TARGET%g s%@LIBOBJS@%$LIBOBJS%g 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_CANVAS@%$MOZ_ENABLE_CANVAS%g @@ -15382,8 +19619,6 @@ s%@MOZ_ENABLE_CAIRO_GFX@%$MOZ_ENABLE_CAIRO_GFX%g s%@MOZ_ENABLE_XREMOTE@%$MOZ_ENABLE_XREMOTE%g s%@MOZ_GTK_CFLAGS@%$MOZ_GTK_CFLAGS%g s%@MOZ_GTK_LDFLAGS@%$MOZ_GTK_LDFLAGS%g -s%@MOZ_GTK2_CFLAGS@%$MOZ_GTK2_CFLAGS%g -s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g s%@MOZ_XLIB_CFLAGS@%$MOZ_XLIB_CFLAGS%g s%@MOZ_XLIB_LDFLAGS@%$MOZ_XLIB_LDFLAGS%g s%@MOZ_QT_CFLAGS@%$MOZ_QT_CFLAGS%g @@ -15405,12 +19640,14 @@ s%@MOZ_STATIC_MAIL_BUILD@%$MOZ_STATIC_MAIL_BUILD%g s%@MOZ_BRANDING_DIRECTORY@%$MOZ_BRANDING_DIRECTORY%g s%@MOZ_DISTRIBUTION_ID@%$MOZ_DISTRIBUTION_ID%g s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g -s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g -s%@MOZ_ENABLE_PANGO@%$MOZ_ENABLE_PANGO%g +s%@_PANGOCHK_CFLAGS@%$_PANGOCHK_CFLAGS%g +s%@_PANGOCHK_LIBS@%$_PANGOCHK_LIBS%g +s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g s%@MOZ_PANGO_CFLAGS@%$MOZ_PANGO_CFLAGS%g s%@MOZ_PANGO_LIBS@%$MOZ_PANGO_LIBS%g +s%@MOZ_ENABLE_PANGO@%$MOZ_ENABLE_PANGO%g s%@MOZ_ENABLE_COREXFONTS@%$MOZ_ENABLE_COREXFONTS%g s%@MOZ_GNOMEVFS_CFLAGS@%$MOZ_GNOMEVFS_CFLAGS%g s%@MOZ_GNOMEVFS_LIBS@%$MOZ_GNOMEVFS_LIBS%g @@ -15419,9 +19656,9 @@ s%@MOZ_GCONF_LIBS@%$MOZ_GCONF_LIBS%g s%@MOZ_LIBGNOME_CFLAGS@%$MOZ_LIBGNOME_CFLAGS%g s%@MOZ_LIBGNOME_LIBS@%$MOZ_LIBGNOME_LIBS%g s%@MOZ_ENABLE_GNOME_COMPONENT@%$MOZ_ENABLE_GNOME_COMPONENT%g -s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g s%@MOZ_GNOMEUI_CFLAGS@%$MOZ_GNOMEUI_CFLAGS%g s%@MOZ_GNOMEUI_LIBS@%$MOZ_GNOMEUI_LIBS%g +s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g s%@MOZ_EXTRA_X11CONVERTERS@%$MOZ_EXTRA_X11CONVERTERS%g s%@MOZ_PLAINTEXT_EDITOR_ONLY@%$MOZ_PLAINTEXT_EDITOR_ONLY%g s%@MOZ_COMPOSER@%$MOZ_COMPOSER%g @@ -15449,11 +19686,13 @@ s%@PROFILE_USE_CFLAGS@%$PROFILE_USE_CFLAGS%g s%@MOZ_AUTO_DEPS@%$MOZ_AUTO_DEPS%g s%@COMPILER_DEPEND@%$COMPILER_DEPEND%g s%@MDDEPDIR@%$MDDEPDIR%g -s%@ORBIT_CONFIG@%$ORBIT_CONFIG%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_GMODULE_LIBS@%$GLIB_GMODULE_LIBS%g s%@HOST_LIBIDL_CONFIG@%$HOST_LIBIDL_CONFIG%g s%@HOST_LIBIDL_CFLAGS@%$HOST_LIBIDL_CFLAGS%g @@ -15472,6 +19711,8 @@ s%@FT_FONT_FEATURE@%$FT_FONT_FEATURE%g s%@WIN32_FONT_FEATURE@%$WIN32_FONT_FEATURE%g s%@ATSUI_FONT_FEATURE@%$ATSUI_FONT_FEATURE%g s%@PNG_FUNCTIONS_FEATURE@%$PNG_FUNCTIONS_FEATURE%g +s%@CAIRO_CFLAGS@%$CAIRO_CFLAGS%g +s%@CAIRO_LIBS@%$CAIRO_LIBS%g s%@MOZ_TREE_CAIRO@%$MOZ_TREE_CAIRO%g s%@MOZ_CAIRO_CFLAGS@%$MOZ_CAIRO_CFLAGS%g s%@MOZ_CAIRO_LIBS@%$MOZ_CAIRO_LIBS%g @@ -15637,8 +19878,6 @@ s%@MOZ_ZLIB_CFLAGS@%$MOZ_ZLIB_CFLAGS%g s%@MOZ_ZLIB_LIBS@%$MOZ_ZLIB_LIBS%g s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g -s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g -s%@NSPR_LIBS@%$NSPR_LIBS%g s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g