From 3ce1069a0ad3ff1d9689136039eeef2efd1104ce Mon Sep 17 00:00:00 2001 From: cltbld Date: Sun, 1 Apr 2007 12:01:32 +0000 Subject: [PATCH] Automated update from host egg.build.mozilla.org git-svn-id: svn://10.0.0.236/trunk@223971 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/configure | 7596 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 6292 insertions(+), 1304 deletions(-) diff --git a/mozilla/configure b/mozilla/configure index 7c736f53e40..5b2581fd3fc 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,431 @@ 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-windows-version=WINVER + Minimum Windows version (WINVER) to support + 400: Windows 95 + 500: Windows 2000 + 501: Windows XP" +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 + --enable-os2-high-mem Enable high-memory support on OS/2" +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.3/ppc, 10.4/x86) + Set the minimum MacOS version needed at runtime" +ac_help="$ac_help + --with-libxul-sdk=PFX Use the libXUL SDK at " +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-nss Use system installed NSS" +ac_help="$ac_help + --with-nss-prefix=PFX Prefix where NSS is installed" +ac_help="$ac_help + --with-nss-exec-prefix=PFX + Exec prefix where NSS 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-glitz Enable Glitz for use with Cairo" +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-application=APP + Options include: + suite + browser (Firefox) + mail (Thunderbird) + minimo + composer + calendar (Sunbird) + xulrunner + camino + content/xslt (Standalone Transformiix XSLT) + netwerk (Standalone Necko) + tools/update-packaging (AUS-related packaging tools) + standalone (use this for standalone + xpcom/xpconnect or to manually drive a build)" +ac_help="$ac_help + --with-embedding-profile=default|basic|minimal + see http://wiki.mozilla.org/Gecko:Small_Device_Support" +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-startup-notification Enable startup-notification support (default: disabled) " +ac_help="$ac_help + --enable-ui-locale=ab-CD + Select the user interface locale (default: en-US)" +ac_help="$ac_help +" +ac_help="$ac_help + --disable-mailnews Disable building of mail & news components" +ac_help="$ac_help + --enable-static-mail Enable static mail build support" +ac_help="$ac_help + --disable-ldap Disable LDAP support" +ac_help="$ac_help + --enable-official-branding Enable Official mozilla.org Branding + Do not distribute builds with + --enable-official-branding unless you have + permission to use trademarks per + http://www.mozilla.org/foundation/trademarks/ ." +ac_help="$ac_help + --with-branding=dir Use 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-dbus Disable dbus 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 (off by default on OS X)" +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 + --disable-printing Disable printing 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-xpcom-fastload Disable XPCOM fastload support" +ac_help="$ac_help + --disable-permissions Disable permissions (popup and cookie blocking)" +ac_help="$ac_help + --disable-negotiateauth Disable GSS-API negotiation " +ac_help="$ac_help + --disable-xtf Disable XTF (pluggable xml tags) support" +ac_help="$ac_help + --disable-inspector-apis Disable the DOM inspection APIs " +ac_help="$ac_help + --disable-xmlextras Disable XMLExtras such as XPointer support " +ac_help="$ac_help + --disable-webservices Disable Webservices/SOAP support " +ac_help="$ac_help + --disable-pref-extensions + Disable pref extensions such as autoconfig and + system-pref" +ac_help="$ac_help + --disable-universalchardet + Disable universal encoding detection" +ac_help="$ac_help + --enable-javaxpcom + Enable Java-XPCOM bridge" +ac_help="$ac_help + --disable-airbag Disable airbag crash reporting" +ac_help="$ac_help + --disable-mochitest Disable mochitest harness" +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-image-encoders[={mod1,mod2,default,all,none}] + Enable specific image encoders" +ac_help="$ac_help + --enable-ldap-experimental + Enable LDAP experimental features" +ac_help="$ac_help + --disable-mathml Disable MathML support" +ac_help="$ac_help + --disable-canvas Disable html:canvas feature" +ac_help="$ac_help + --disable-svg Disable SVG support" +ac_help="$ac_help + --disable-svg-foreignobject + Disable SVG support" +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-xpconnect-idispatch + Disable building of xpconnect support for IDispatch + (win32 only)" +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-places Enable 'places' bookmark/history implementation" +ac_help="$ac_help + --enable-places_bookmarks Enable 'places' for bookmarks backend" +ac_help="$ac_help + --disable-feeds Disable feed handling and processing components" +ac_help="$ac_help + --enable-storage Enable mozStorage module and related components" +ac_help="$ac_help + --enable-safe-browsing Enable safe browsing (anti-phishing) implementation" +ac_help="$ac_help + --enable-url-classifier Enable url classifier module" +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-logrefcnt Enable logging of refcounts (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 + --enable-static Enable building of internal static libs" +ac_help="$ac_help + --enable-libxul Enable building of libxul" +ac_help="$ac_help + --enable-js-static-build Force js to be a static lib" +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 + --enable-ipcd Enable IPC daemon" +ac_help="$ac_help + --disable-profilelocking Disable profile locking" +ac_help="$ac_help + --disable-rdf Disable RDF" +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 +998,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:1002: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -591,7 +1019,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:1023: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -609,7 +1037,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:1041: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -688,7 +1116,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:692: checking for $ac_word" >&5 +echo "configure:1120: 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 @@ -768,18 +1196,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:783: checking for $ac_word" >&5 +echo "configure:1218: 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 @@ -848,13 +1283,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:852: checking for host c compiler" >&5 +echo "configure:1287: 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:858: checking for $ac_word" >&5 +echo "configure:1293: 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 @@ -889,13 +1324,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:893: checking for host c++ compiler" >&5 +echo "configure:1328: 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:899: checking for $ac_word" >&5 +echo "configure:1334: 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 @@ -944,7 +1379,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:948: checking for $ac_word" >&5 +echo "configure:1383: 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 @@ -979,7 +1414,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:983: checking for $ac_word" >&5 +echo "configure:1418: 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 @@ -1014,16 +1449,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:1018: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1453: 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:1462: \"$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 @@ -1038,16 +1473,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:1042: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1477: 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:1486: \"$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 @@ -1076,7 +1511,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1080: checking for $ac_word" >&5 +echo "configure:1515: 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 @@ -1110,7 +1545,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:1114: checking for $ac_word" >&5 +echo "configure:1549: 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 @@ -1140,7 +1575,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:1144: checking for $ac_word" >&5 +echo "configure:1579: 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 @@ -1191,7 +1626,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:1195: checking for $ac_word" >&5 +echo "configure:1630: 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 @@ -1223,7 +1658,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1227: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1662: 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. @@ -1234,12 +1669,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1238 "configure" +#line 1673 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1678: \"$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 @@ -1265,12 +1700,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:1269: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1704: 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:1274: checking whether we are using GNU C" >&5 +echo "configure:1709: 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 @@ -1279,7 +1714,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1283: \"$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:1718: \"$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 @@ -1298,7 +1733,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:1302: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1737: 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 @@ -1334,7 +1769,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:1338: checking for $ac_word" >&5 +echo "configure:1773: 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 @@ -1370,7 +1805,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:1374: checking for $ac_word" >&5 +echo "configure:1809: 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 @@ -1402,7 +1837,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1406: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1841: 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. @@ -1413,12 +1848,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1417 "configure" +#line 1852 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1857: \"$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 @@ -1444,12 +1879,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:1448: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1883: 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:1453: checking whether we are using GNU C++" >&5 +echo "configure:1888: 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 @@ -1458,7 +1893,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1462: \"$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:1897: \"$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 @@ -1477,7 +1912,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:1481: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1916: 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 @@ -1518,7 +1953,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext < $ac_declaration @@ -1526,7 +1961,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:1530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1536,14 +1971,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -1572,7 +2007,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:1576: checking for $ac_word" >&5 +echo "configure:2011: 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 @@ -1607,7 +2042,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:1611: checking for $ac_word" >&5 +echo "configure:2046: 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 @@ -1642,7 +2077,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:1646: checking for $ac_word" >&5 +echo "configure:2081: 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 @@ -1683,7 +2118,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1687: checking for $ac_word" >&5 +echo "configure:2122: 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 @@ -1718,7 +2153,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:1722: checking for $ac_word" >&5 +echo "configure:2157: 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 @@ -1753,7 +2188,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:1757: checking for $ac_word" >&5 +echo "configure:2192: 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 @@ -1791,7 +2226,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:1795: checking for $ac_word" >&5 +echo "configure:2230: 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 @@ -1821,7 +2256,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:1825: checking for $ac_word" >&5 +echo "configure:2260: 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 @@ -1872,7 +2307,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:1876: checking for $ac_word" >&5 +echo "configure:2311: 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 @@ -1904,7 +2339,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1908: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2343: 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. @@ -1915,12 +2350,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1919 "configure" +#line 2354 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2359: \"$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 @@ -1946,12 +2381,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:1950: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2385: 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:1955: checking whether we are using GNU C" >&5 +echo "configure:2390: 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 @@ -1960,7 +2395,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1964: \"$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:2399: \"$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 @@ -1979,7 +2414,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:1983: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2418: 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 @@ -2015,7 +2450,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:2019: checking for $ac_word" >&5 +echo "configure:2454: 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 @@ -2047,7 +2482,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2051: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2486: 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. @@ -2058,12 +2493,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2062 "configure" +#line 2497 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2502: \"$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 @@ -2089,12 +2524,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:2093: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2528: 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:2098: checking whether we are using GNU C++" >&5 +echo "configure:2533: 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 @@ -2103,7 +2538,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2107: \"$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:2542: \"$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 @@ -2122,7 +2557,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:2126: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2561: 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 @@ -2163,7 +2598,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext < $ac_declaration @@ -2171,7 +2606,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:2175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2181,14 +2616,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -2207,7 +2642,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:2211: checking for $ac_word" >&5 +echo "configure:2646: 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 @@ -2239,7 +2674,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:2243: checking for $ac_word" >&5 +echo "configure:2678: 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 @@ -2280,7 +2715,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:2284: checking for $ac_word" >&5 +echo "configure:2719: 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 @@ -2315,7 +2750,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:2319: checking for $ac_word" >&5 +echo "configure:2754: 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 @@ -2350,7 +2785,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:2354: checking for $ac_word" >&5 +echo "configure:2789: 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 @@ -2385,7 +2820,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:2389: checking for $ac_word" >&5 +echo "configure:2824: 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 @@ -2477,13 +2912,12 @@ case "$target" in ;; esac -MOZ_ARG_WITH_STRING(windows-version, - --with-windows-version=WINVER - Minimum Windows version (WINVER) to support - 400: Windows 95 - 500: Windows 2000 - 501: Windows XP, - WINVER=$withval) +# Check whether --with-windows-version or --without-windows-version was given. +if test "${with_windows_version+set}" = set; then + withval="$with_windows_version" + WINVER=$withval +fi + case "$WINVER" in 400|500|501) @@ -2505,7 +2939,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:2509: checking for $ac_word" >&5 +echo "configure:2943: 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 @@ -2547,14 +2981,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:2558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2572,14 +3006,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:2583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2682,7 +3116,7 @@ EOF _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` # Add flags if necessary echo $ac_n "checking for midl flags""... $ac_c" 1>&6 -echo "configure:2686: checking for midl flags" >&5 +echo "configure:3120: 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 @@ -2704,9 +3138,9 @@ echo "configure:2686: 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:2708: checking for w32api version >= $W32API_VERSION" >&5 +echo "configure:3142: checking for w32api version >= $W32API_VERSION" >&5 cat > conftest.$ac_ext < int main() { @@ -2718,7 +3152,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* res=yes else @@ -2734,7 +3168,7 @@ rm -f conftest* fi # Check windres version echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 -echo "configure:2738: checking for windres version >= $WINDRES_VERSION" >&5 +echo "configure:3172: 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 }'` @@ -2775,7 +3209,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:2779: checking how to run the C preprocessor" >&5 +echo "configure:3213: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2790,13 +3224,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:2800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3234: \"$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 : @@ -2807,13 +3241,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:2817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3251: \"$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 : @@ -2824,13 +3258,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:2834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2858,17 +3292,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:2862: checking for $ac_hdr" >&5 +echo "configure:3296: 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:2872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3306: \"$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* @@ -2899,10 +3333,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:2903: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:3337: 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:2906: checking whether cc understands -c and -o together" >&5 +echo "configure:3340: 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]/_/'`" @@ -2914,16 +3348,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:2918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:3352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:3353: \"$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:2924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3358: \"$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:2926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:2927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:3360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:3361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -2959,7 +3393,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2963: checking how to run the C preprocessor" >&5 +echo "configure:3397: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2974,13 +3408,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:2984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3418: \"$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 : @@ -2991,13 +3425,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:3001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3435: \"$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 : @@ -3008,13 +3442,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:3018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3452: \"$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 : @@ -3039,7 +3473,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:3043: checking how to run the C++ preprocessor" >&5 +echo "configure:3477: 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 @@ -3052,12 +3486,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:3061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3495: \"$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 : @@ -3104,7 +3538,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:3108: checking for a BSD compatible install" >&5 +echo "configure:3542: 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 @@ -3157,7 +3591,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:3161: checking whether ln -s works" >&5 +echo "configure:3595: 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 @@ -3182,7 +3616,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:3186: checking for $ac_word" >&5 +echo "configure:3620: 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 @@ -3223,7 +3657,7 @@ fi if test -z "$TINDERBOX_SKIP_PERL_VERSION_CHECK"; then echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 -echo "configure:3227: checking for minimum required perl version >= $PERL_VERSION" >&5 +echo "configure:3661: 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 @@ -3234,7 +3668,7 @@ fi fi echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 -echo "configure:3238: checking for full perl installation" >&5 +echo "configure:3672: 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 @@ -3249,7 +3683,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:3253: checking for $ac_word" >&5 +echo "configure:3687: 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 @@ -3292,7 +3726,7 @@ echo PYTHON="$PYTHON" # 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:3296: checking for $ac_word" >&5 +echo "configure:3730: 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 @@ -3328,7 +3762,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:3332: checking for $ac_word" >&5 +echo "configure:3766: 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 @@ -3364,7 +3798,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:3368: checking for $ac_word" >&5 +echo "configure:3802: 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 @@ -3400,7 +3834,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:3404: checking for $ac_word" >&5 +echo "configure:3838: 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 @@ -3438,7 +3872,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:3442: checking for $ac_word" >&5 +echo "configure:3876: 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 @@ -3479,7 +3913,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:3483: checking for $ac_word" >&5 +echo "configure:3917: 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 @@ -3514,7 +3948,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:3518: checking for $ac_word" >&5 +echo "configure:3952: 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 @@ -3577,7 +4011,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:3581: checking for $ac_word" >&5 +echo "configure:4015: 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 @@ -3627,7 +4061,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:3631: checking for $ac_word" >&5 +echo "configure:4065: 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 @@ -3671,9 +4105,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 + @@ -3721,7 +4158,7 @@ tools are selected during the Xcode/Developer Tools installation." 1>&2; exit 1; echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 -echo "configure:3725: checking for valid compiler/Mac OS X SDK combination" >&5 +echo "configure:4162: 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' @@ -3730,7 +4167,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; } @@ -3738,7 +4175,7 @@ int main() { result=yes ; return 0; } EOF -if { (eval echo configure:3742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result=no else @@ -3769,7 +4206,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:3773: checking for $ac_word" >&5 +echo "configure:4210: 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 @@ -3812,7 +4249,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:3816: checking for $ac_word" >&5 +echo "configure:4253: 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 @@ -3880,7 +4317,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:3884: checking for X" >&5 +echo "configure:4321: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3942,12 +4379,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:3951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4388: \"$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* @@ -4016,14 +4453,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:4464: \"$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. @@ -4129,17 +4566,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:4133: checking whether -R must be followed by a space" >&5 +echo "configure:4570: 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:4580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -4155,14 +4592,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:4603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -4194,7 +4631,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:4198: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4635: 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 @@ -4202,7 +4639,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:4654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4235,7 +4672,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:4239: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4676: 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 @@ -4243,7 +4680,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:4695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4283,12 +4720,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:4287: checking for gethostbyname" >&5 +echo "configure:4724: 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:4752: \"$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 @@ -4332,7 +4769,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4336: checking for gethostbyname in -lnsl" >&5 +echo "configure:4773: 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 @@ -4340,7 +4777,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:4792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4381,12 +4818,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:4385: checking for connect" >&5 +echo "configure:4822: 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:4850: \"$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 @@ -4430,7 +4867,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4434: checking for connect in -lsocket" >&5 +echo "configure:4871: 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 @@ -4438,7 +4875,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:4890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4473,12 +4910,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:4477: checking for remove" >&5 +echo "configure:4914: 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:4942: \"$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 @@ -4522,7 +4959,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4526: checking for remove in -lposix" >&5 +echo "configure:4963: 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 @@ -4530,7 +4967,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:4982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4565,12 +5002,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4569: checking for shmat" >&5 +echo "configure:5006: 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:5034: \"$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 @@ -4614,7 +5051,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4618: checking for shmat in -lipc" >&5 +echo "configure:5055: 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 @@ -4622,7 +5059,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:5074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4666,7 +5103,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:4670: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:5107: 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 @@ -4674,7 +5111,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:5126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5123,7 +5560,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:5127: checking whether ld has archive extraction flags" >&5 +echo "configure:5564: 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 @@ -5140,14 +5577,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:5588: \"$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 @@ -5180,7 +5617,7 @@ configure_static_assert_macros=' ' echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 -echo "configure:5184: checking that static assertion macros used in autoconf tests work" >&5 +echo "configure:5621: checking that static assertion macros used in autoconf tests work" >&5 if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5194,14 +5631,14 @@ cross_compiling=$ac_cv_prog_cc_cross ac_cv_static_assertion_macros_work="yes" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5211,14 +5648,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_static_assertion_macros_work="no" else @@ -5234,14 +5671,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5251,14 +5688,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_static_assertion_macros_work="no" else @@ -5293,16 +5730,16 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 -echo "configure:5297: checking for 64-bit OS" >&5 +echo "configure:5734: checking for 64-bit OS" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else @@ -5330,10 +5767,18 @@ cross_compiling=$ac_cv_prog_cc_cross fi # COMPILE_ENVIRONMENT -MOZ_ARG_ENABLE_BOOL(os2-high-mem, - --enable-os2-high-mem Enable high-memory support on OS/2, - MOZ_OS2_HIGH_MEMORY=1, - MOZ_OS2_HIGH_MEMORY= ) +# Check whether --enable-os2-high-mem or --disable-os2-high-mem was given. +if test "${enable_os2_high_mem+set}" = set; then + enableval="$enable_os2_high_mem" + if test "$enableval" = "yes"; then + MOZ_OS2_HIGH_MEMORY=1 + elif test "$enableval" = "no"; then + MOZ_OS2_HIGH_MEMORY= + else + { echo "configure: error: Option, os2-high-mem, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + case "$host" in @@ -5463,9 +5908,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:5467: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 +echo "configure:5912: 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:5923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -5512,17 +5957,17 @@ cross_compiling=$ac_cv_prog_cc_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5516: checking for $ac_hdr" >&5 +echo "configure:5961: 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:5526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5971: \"$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* @@ -5564,7 +6009,7 @@ EOF LIBS="$LIBS -lbe" if test "$COMPILE_ENVIRONMENT"; then echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 -echo "configure:5568: checking for main in -lbind" >&5 +echo "configure:6013: 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 @@ -5572,14 +6017,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:6028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5600,7 +6045,7 @@ else fi echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 -echo "configure:5604: checking for main in -lzeta" >&5 +echo "configure:6049: 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 @@ -5608,14 +6053,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:6064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5679,18 +6124,18 @@ fi MACOSX=1 echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 -echo "configure:5683: checking for -dead_strip option to ld" >&5 +echo "configure:6128: 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:6139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* _HAVE_DEAD_STRIP=1 else @@ -6388,19 +6833,19 @@ EOF _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__" echo $ac_n "checking for __declspec(dllexport)""... $ac_c" 1>&6 -echo "configure:6392: checking for __declspec(dllexport)" >&5 +echo "configure:6837: checking for __declspec(dllexport)" >&5 if eval "test \"`echo '$''{'ac_os2_declspec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_os2_declspec="yes" else @@ -6576,14 +7021,14 @@ EOF _SAVE_LDFLAGS=$LDFLAGS LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:6587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -6611,7 +7056,7 @@ rm -f conftest* CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 -echo "configure:6615: checking for Forte compiler version >= WS6U2" >&5 +echo "configure:7060: 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. @@ -6621,7 +7066,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:7079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -6759,7 +7204,7 @@ case "$target" in ;; *-darwin*) echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 -echo "configure:6763: checking for -exported_symbols_list option to ld" >&5 +echo "configure:7208: 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 @@ -6799,12 +7244,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:6803: checking for ANSI C header files" >&5 +echo "configure:7248: 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 @@ -6812,7 +7257,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7261: \"$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* @@ -6829,7 +7274,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 @@ -6847,7 +7292,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 @@ -6868,7 +7313,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6879,7 +7324,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:6883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6903,12 +7348,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6907: checking for working const" >&5 +echo "configure:7352: 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:7406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6978,12 +7423,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:6982: checking for mode_t" >&5 +echo "configure:7427: 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 @@ -7011,12 +7456,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:7015: checking for off_t" >&5 +echo "configure:7460: 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 @@ -7044,12 +7489,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:7048: checking for pid_t" >&5 +echo "configure:7493: 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 @@ -7077,12 +7522,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:7081: checking for size_t" >&5 +echo "configure:7526: 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 @@ -7110,12 +7555,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:7114: checking for st_blksize in struct stat" >&5 +echo "configure:7559: 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 @@ -7123,7 +7568,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:7127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -7144,12 +7589,12 @@ EOF fi echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 -echo "configure:7148: checking for siginfo_t" >&5 +echo "configure:7593: 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 < @@ -7157,7 +7602,7 @@ int main() { siginfo_t* info; ; return 0; } EOF -if { (eval echo configure:7161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_siginfo_t=true else @@ -7191,12 +7636,12 @@ EOF fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:7195: checking for int16_t" >&5 +echo "configure:7640: 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 @@ -7204,7 +7649,7 @@ int main() { int16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int16_t=true else @@ -7226,12 +7671,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:7230: checking for int32_t" >&5 +echo "configure:7675: 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 @@ -7239,7 +7684,7 @@ int main() { int32_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int32_t=true else @@ -7261,12 +7706,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:7265: checking for int64_t" >&5 +echo "configure:7710: 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 @@ -7274,7 +7719,7 @@ int main() { int64_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64_t=true else @@ -7296,12 +7741,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64""... $ac_c" 1>&6 -echo "configure:7300: checking for int64" >&5 +echo "configure:7745: 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 @@ -7309,7 +7754,7 @@ int main() { int64 foo = 0; ; return 0; } EOF -if { (eval echo configure:7313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64=true else @@ -7331,12 +7776,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:7335: checking for uint" >&5 +echo "configure:7780: 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 @@ -7344,7 +7789,7 @@ int main() { uint foo = 0; ; return 0; } EOF -if { (eval echo configure:7348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint=true else @@ -7366,12 +7811,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 -echo "configure:7370: checking for uint_t" >&5 +echo "configure:7815: 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 @@ -7379,7 +7824,7 @@ int main() { uint_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint_t=true else @@ -7401,12 +7846,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:7405: checking for uint16_t" >&5 +echo "configure:7850: 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 @@ -7414,7 +7859,7 @@ int main() { uint16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint16_t=true else @@ -7445,12 +7890,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 -echo "configure:7449: checking for uname.domainname" >&5 +echo "configure:7894: 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() { @@ -7458,7 +7903,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->domainname; } ; return 0; } EOF -if { (eval echo configure:7462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_domainname_field=true else @@ -7482,12 +7927,12 @@ else fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 -echo "configure:7486: checking for uname.__domainname" >&5 +echo "configure:7931: 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() { @@ -7495,7 +7940,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->__domainname; } ; return 0; } EOF -if { (eval echo configure:7499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_us_domainname_field=true else @@ -7528,12 +7973,12 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 -echo "configure:7532: checking for usable wchar_t (2 bytes, unsigned)" >&5 +echo "configure:7977: checking for usable wchar_t (2 bytes, unsigned)" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_v2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < $configure_static_assert_macros @@ -7542,7 +7987,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) ; return 0; } EOF -if { (eval echo configure:7546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_usable_wchar_v2="yes" else @@ -7575,12 +8020,12 @@ 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:7579: checking for compiler -fshort-wchar option" >&5 +echo "configure:8024: checking for compiler -fshort-wchar option" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option_v2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < $configure_static_assert_macros @@ -7589,7 +8034,7 @@ CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2); CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0) ; return 0; } EOF -if { (eval echo configure:7593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_usable_wchar_option_v2="yes" else @@ -7623,7 +8068,7 @@ fi if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 -echo "configure:7627: checking for visibility(hidden) attribute" >&5 +echo "configure:8072: 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 @@ -7648,7 +8093,7 @@ EOF echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 -echo "configure:7652: checking for visibility(default) attribute" >&5 +echo "configure:8097: checking for visibility(default) attribute" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7673,7 +8118,7 @@ EOF echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 -echo "configure:7677: checking for visibility pragma support" >&5 +echo "configure:8122: 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 @@ -7698,7 +8143,7 @@ fi echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 if test "$ac_cv_visibility_pragma" = "yes"; then echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 -echo "configure:7702: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 +echo "configure:8147: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7726,7 +8171,7 @@ fi echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 -echo "configure:7730: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 +echo "configure:8175: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7774,12 +8219,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:7778: checking for $ac_hdr that defines DIR" >&5 +echo "configure:8223: 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> @@ -7787,7 +8232,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:7791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -7812,7 +8257,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:7816: checking for opendir in -ldir" >&5 +echo "configure:8261: 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 @@ -7820,7 +8265,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:8280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7853,7 +8298,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:7857: checking for opendir in -lx" >&5 +echo "configure:8302: 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 @@ -7861,7 +8306,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:8321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7904,17 +8349,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:7908: checking for $ac_hdr" >&5 +echo "configure:8353: 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:7918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8363: \"$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* @@ -7944,17 +8389,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:7948: checking for $ac_hdr" >&5 +echo "configure:8393: 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:7958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8403: \"$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* @@ -7984,17 +8429,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:7988: checking for $ac_hdr" >&5 +echo "configure:8433: 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:7998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8443: \"$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* @@ -8024,17 +8469,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:8028: checking for $ac_hdr" >&5 +echo "configure:8473: 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:8038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8483: \"$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* @@ -8064,17 +8509,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:8068: checking for $ac_hdr" >&5 +echo "configure:8513: 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:8078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8523: \"$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* @@ -8105,17 +8550,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:8109: checking for $ac_hdr" >&5 +echo "configure:8554: 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:8119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8564: \"$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* @@ -8146,17 +8591,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:8150: checking for $ac_hdr" >&5 +echo "configure:8595: 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:8160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8605: \"$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* @@ -8193,17 +8638,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:8197: checking for new" >&5 +echo "configure:8642: 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:8207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8652: \"$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* @@ -8244,17 +8689,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:8248: checking for $ac_hdr" >&5 +echo "configure:8693: 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:8258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8703: \"$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* @@ -8288,7 +8733,7 @@ case $target in ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:8292: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:8737: 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 @@ -8296,7 +8741,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: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 @@ -8344,7 +8789,7 @@ case $target in ;; *) echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 -echo "configure:8348: checking for atan in -lm" >&5 +echo "configure:8793: 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 @@ -8352,7 +8797,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:8812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8391,7 +8836,7 @@ else fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:8395: checking for dlopen in -ldl" >&5 +echo "configure:8840: 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 @@ -8399,7 +8844,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:8859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8427,17 +8872,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:8431: checking for dlfcn.h" >&5 +echo "configure:8876: 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:8441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8886: \"$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* @@ -8473,7 +8918,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:8477: checking for demangle in -lC_r" >&5 +echo "configure:8922: 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 @@ -8481,7 +8926,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:8941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8522,7 +8967,7 @@ fi ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:8526: checking for demangle in -lC" >&5 +echo "configure:8971: 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 @@ -8530,7 +8975,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:8990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8572,7 +9017,7 @@ fi esac fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:8576: checking for socket in -lsocket" >&5 +echo "configure:9021: 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 @@ -8580,7 +9025,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:9040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8636,7 +9081,7 @@ EOF _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:8640: checking for XDrawLines in -lX11" >&5 +echo "configure:9085: 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 @@ -8644,7 +9089,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:9104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8677,7 +9122,7 @@ MISSING_X="$MISSING_X -lX11" fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:8681: checking for XextAddDisplay in -lXext" >&5 +echo "configure:9126: 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 @@ -8685,7 +9130,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:9145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8720,7 +9165,7 @@ fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:8724: checking for XtFree in -lXt" >&5 +echo "configure:9169: 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 @@ -8728,7 +9173,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:9188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8760,7 +9205,7 @@ else unset ac_cv_lib_Xt_XtFree echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:8764: checking for IceFlush in -lICE" >&5 +echo "configure:9209: 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 @@ -8768,7 +9213,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:9228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8800,7 +9245,7 @@ else fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:8804: checking for SmcCloseConnection in -lSM" >&5 +echo "configure:9249: 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 @@ -8808,7 +9253,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:9268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8840,7 +9285,7 @@ else fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:8844: checking for XtFree in -lXt" >&5 +echo "configure:9289: 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 @@ -8848,7 +9293,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:9308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8893,7 +9338,7 @@ fi esac echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 -echo "configure:8897: checking for XineramaIsActive in -lXinerama" >&5 +echo "configure:9342: 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 @@ -8901,7 +9346,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:9361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8934,17 +9379,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:8938: checking for X11/extensions/Xinerama.h" >&5 +echo "configure:9383: 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:8948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9393: \"$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* @@ -8967,7 +9412,7 @@ fi echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 -echo "configure:8971: checking for XShmCreateImage in -lXext" >&5 +echo "configure:9416: 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 @@ -8975,7 +9420,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:9435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9008,17 +9453,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:9012: checking for X11/extensions/XShm.h" >&5 +echo "configure:9457: 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:9022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9467: \"$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* @@ -9048,7 +9493,7 @@ EOF fi echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 -echo "configure:9052: checking for XieFloGeometry in -lXIE" >&5 +echo "configure:9497: 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 @@ -9056,7 +9501,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:9516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9089,17 +9534,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:9093: checking for X11/extensions/XIElib.h" >&5 +echo "configure:9538: 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:9103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9548: \"$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* @@ -9133,7 +9578,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:9622: 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:9658: 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:9732: \"$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 @@ -9147,36 +9783,133 @@ darwin*) USE_PTHREADS=1 ;; *) - MOZ_CHECK_PTHREADS(pthreads, - USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", - MOZ_CHECK_PTHREADS(pthread, - USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", - MOZ_CHECK_PTHREADS(c_r, - USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", - MOZ_CHECK_PTHREADS(c, - USE_PTHREADS=1 - ) - ) - ) - ) + +echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 +echo "configure:9789: 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:9811: 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:9833: 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:9855: 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 + ;; esac -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, +# 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:9180: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:9913: 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 @@ -9199,7 +9932,7 @@ echo "configure:9180: 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:9203: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:9936: 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 @@ -9294,10 +10027,12 @@ EOF fi -MOZ_ARG_ENABLE_STRING(macos-target, - --enable-macos-target=VER (default=10.3/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*) @@ -9319,7 +10054,7 @@ esac echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 -echo "configure:9323: checking whether mmap() sees write()s" >&5 +echo "configure:10058: checking whether mmap() sees write()s" >&5 mmap_test_prog=' @@ -9358,11 +10093,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:10101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -9387,13 +10122,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:9391: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:10126: 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 @@ -9411,7 +10146,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -9433,7 +10168,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:9437: checking for 8-bit clean memcmp" >&5 +echo "configure:10172: 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 @@ -9441,7 +10176,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:10190: \"$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 @@ -9471,12 +10206,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:9475: checking for $ac_func" >&5 +echo "configure:10210: 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:10238: \"$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 @@ -9526,12 +10261,12 @@ done for ac_func in flockfile getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9530: checking for $ac_func" >&5 +echo "configure:10265: 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:10293: \"$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 @@ -9583,12 +10318,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:9587: checking for $ac_func" >&5 +echo "configure:10322: 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:10350: \"$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 @@ -9647,19 +10382,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:9651: checking for wcrtomb" >&5 +echo "configure:10386: 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:9663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_wcrtomb="yes" else @@ -9679,19 +10414,19 @@ EOF fi echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 -echo "configure:9683: checking for mbrtowc" >&5 +echo "configure:10418: 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:9695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_mbrtowc="yes" else @@ -9720,12 +10455,12 @@ cross_compiling=$ac_cv_prog_cc_cross fi echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 -echo "configure:9724: checking for res_ninit()" >&5 +echo "configure:10459: 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:10476: \"$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 @@ -9767,12 +10502,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:9771: checking for gnu_get_libc_version()" >&5 +echo "configure:10506: 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:10522: \"$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 @@ -9812,7 +10547,7 @@ case $target_os in *) echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 -echo "configure:9816: checking for iconv in -lc" >&5 +echo "configure:10551: 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 @@ -9820,7 +10555,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:10573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9853,7 +10588,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:9857: checking for iconv in -liconv" >&5 +echo "configure:10592: 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 @@ -9861,7 +10596,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:10614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9894,7 +10629,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:9898: checking for libiconv in -liconv" >&5 +echo "configure:10633: 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 @@ -9902,7 +10637,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:10655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9943,12 +10678,12 @@ fi _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" echo $ac_n "checking for iconv()""... $ac_c" 1>&6 -echo "configure:9947: checking for iconv()" >&5 +echo "configure:10682: 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 < @@ -9962,7 +10697,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_iconv=yes else @@ -9986,12 +10721,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:9990: checking for iconv() with const input" >&5 +echo "configure:10725: 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 < @@ -10006,7 +10741,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_const_iconv=yes else @@ -10033,7 +10768,42 @@ LIBS=$_SAVE_LIBS ;; esac -AM_LANGINFO_CODESET + + echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +echo "configure:10774: 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:10786: \"$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. @@ -10044,7 +10814,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 -echo "configure:10048: checking for an implementation of va_copy()" >&5 +echo "configure:10818: 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 @@ -10054,7 +10824,7 @@ else else cat > conftest.$ac_ext < @@ -10068,7 +10838,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10842: \"$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 @@ -10085,7 +10855,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:10089: checking for an implementation of __va_copy()" >&5 +echo "configure:10859: 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 @@ -10095,7 +10865,7 @@ else else cat > conftest.$ac_ext < @@ -10109,7 +10879,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10883: \"$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 @@ -10126,7 +10896,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:10130: checking whether va_lists can be copied by value" >&5 +echo "configure:10900: 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 @@ -10136,7 +10906,7 @@ else else cat > conftest.$ac_ext < @@ -10150,7 +10920,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10924: \"$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 @@ -10249,7 +11019,7 @@ esac if test "$GNU_CXX"; then echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 -echo "configure:10253: checking for C++ exceptions flag" >&5 +echo "configure:11023: 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 @@ -10284,12 +11054,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:10288: checking for gcc 3.0 ABI" >&5 +echo "configure:11058: 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:11076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_three_abi="yes" else @@ -10326,12 +11096,12 @@ fi echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 -echo "configure:10330: checking for C++ \"explicit\" keyword" >&5 +echo "configure:11100: 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:11115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else @@ -10362,12 +11132,12 @@ EOF fi echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 -echo "configure:10366: checking for C++ \"typename\" keyword" >&5 +echo "configure:11136: 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:10390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_typename=yes else @@ -10407,12 +11177,12 @@ EOF fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 -echo "configure:10411: checking for modern C++ template specialization syntax support" >&5 +echo "configure:11181: 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 {}; @@ -10422,7 +11192,7 @@ X int_x; X y_x; ; return 0; } EOF -if { (eval echo configure:10426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else @@ -10444,12 +11214,12 @@ fi echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 -echo "configure:10448: checking whether partial template specialization works" >&5 +echo "configure:11218: 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 {}; @@ -10457,7 +11227,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:10461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_partial_specialization=yes else @@ -10478,12 +11248,12 @@ EOF fi echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 -echo "configure:10482: checking whether operators must be re-defined for templates derived from templates" >&5 +echo "configure:11252: 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 @@ -10495,7 +11265,7 @@ Derived a, b; return 0; ; return 0; } EOF -if { (eval echo configure:10499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_derived_template_operators=no else @@ -10517,12 +11287,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:10521: checking whether we need to cast a derived template to pass as its base class" >&5 +echo "configure:11291: 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 { }; @@ -10531,7 +11301,7 @@ int main() { Derived bar; return foo(bar); ; return 0; } EOF -if { (eval echo configure:10535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_cpp_template_cast_to_base=no else @@ -10552,12 +11322,12 @@ EOF fi echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 -echo "configure:10556: checking whether the compiler can resolve const ambiguities for templates" >&5 +echo "configure:11326: 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 { @@ -10578,7 +11348,7 @@ int main() { a(&i); ; return 0; } EOF -if { (eval echo configure:10582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_can_resolve_const_ambiguity=yes else @@ -10600,12 +11370,12 @@ fi echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 -echo "configure:10604: checking whether the C++ \"using\" keyword can change access" >&5 +echo "configure:11374: 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:11387: \"$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:11398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_access_changing_using2=no else @@ -10652,12 +11422,12 @@ EOF fi echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 -echo "configure:10656: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 +echo "configure:11426: 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:11447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_ambiguity_resolving_using=yes else @@ -10694,19 +11464,19 @@ EOF fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 -echo "configure:10698: checking for \"std::\" namespace" >&5 +echo "configure:11468: 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:10710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespace_std=yes else @@ -10727,12 +11497,12 @@ EOF fi echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 -echo "configure:10731: checking whether standard template operator!=() is ambiguous" >&5 +echo "configure:11501: 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 {}; @@ -10742,7 +11512,7 @@ int main() { T1 a,b; return a != b; ; return 0; } EOF -if { (eval echo configure:10746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_unambiguous_std_notequal=unambiguous else @@ -10764,12 +11534,12 @@ fi echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 -echo "configure:10768: checking for C++ reinterpret_cast" >&5 +echo "configure:11538: 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:10781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else @@ -10798,7 +11568,7 @@ EOF fi echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 -echo "configure:10802: checking for C++ dynamic_cast to void*" >&5 +echo "configure:11572: 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 @@ -10806,7 +11576,7 @@ else ac_cv_cpp_dynamic_cast_void_ptr=no else cat > conftest.$ac_ext <(suby)))); } EOF -if { (eval echo configure:10826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11596: \"$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 @@ -10846,19 +11616,19 @@ fi echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 -echo "configure:10850: checking whether C++ requires implementation of unused virtual methods" >&5 +echo "configure:11620: 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:11632: \"$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 @@ -10881,12 +11651,12 @@ fi echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 -echo "configure:10885: checking for trouble comparing to zero near std::operator!=()" >&5 +echo "configure:11655: 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 {}; @@ -10897,7 +11667,7 @@ int main() { Foo f; return (0 != f); ; return 0; } EOF -if { (eval echo configure:10901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_trouble_comparing_to_zero=no else @@ -10929,19 +11699,19 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:10933: checking for LC_MESSAGES" >&5 +echo "configure:11703: 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:10945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_i18n_lc_messages=yes else @@ -10970,13 +11740,16 @@ fi -MOZ_ARG_HEADER(External Packages) +# External Packages MOZ_ENABLE_LIBXUL= -MOZ_ARG_WITH_STRING(libxul-sdk, - --with-libxul-sdk=PFX Use the libXUL SDK at , - LIBXUL_SDK_DIR=$withval) +# Check whether --with-libxul-sdk or --without-libxul-sdk was given. +if test "${with_libxul_sdk+set}" = set; then + withval="$with_libxul_sdk" + LIBXUL_SDK_DIR=$withval +fi + if test "$LIBXUL_SDK_DIR" = "yes"; then { echo "configure: error: --with-libxul-sdk must specify a path" 1>&2; exit 1; } @@ -10991,12 +11764,120 @@ elif test -n "$LIBXUL_SDK_DIR" -a "$LIBXUL_SDK_DIR" != "no"; then fi -MOZ_ARG_WITH_BOOL(system-nspr, - --with-system-nspr Use system installed NSPR, - _USE_SYSTEM_NSPR=1 ) +# 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 + 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:11818: 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:11853: 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 @@ -11020,12 +11901,120 @@ if test -z "$MOZ_NATIVE_NSPR"; then fi -MOZ_ARG_WITH_BOOL(system-nss, - --with-system-nss Use system installed NSS, - _USE_SYSTEM_NSS=1 ) +# Check whether --with-system-nss or --without-system-nss was given. +if test "${with_system_nss+set}" = set; then + withval="$with_system_nss" + if test "$withval" = "yes"; then + _USE_SYSTEM_NSS=1 + elif test "$withval" = "no"; then + : + else + { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; exit 1; } + fi +fi + if test -n "$_USE_SYSTEM_NSS"; then - AM_PATH_NSS(3.0.0, MOZ_NATIVE_NSS=1, MOZ_NATIVE_NSS=) + +# Check whether --with-nss-prefix or --without-nss-prefix was given. +if test "${with_nss_prefix+set}" = set; then + withval="$with_nss_prefix" + nss_config_prefix="$withval" +else + nss_config_prefix="" +fi + + +# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given. +if test "${with_nss_exec_prefix+set}" = set; then + withval="$with_nss_exec_prefix" + nss_config_exec_prefix="$withval" +else + nss_config_exec_prefix="" +fi + + + if test -n "$nss_config_exec_prefix"; then + nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config + fi + fi + if test -n "$nss_config_prefix"; then + nss_config_args="$nss_config_args --prefix=$nss_config_prefix" + if test -z "$NSS_CONFIG"; then + NSS_CONFIG=$nss_config_prefix/bin/nss-config + fi + fi + + unset ac_cv_path_NSS_CONFIG + # Extract the first word of "nss-config", so it can be a program name with args. +set dummy nss-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:11955: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$NSS_CONFIG" in + /*) + ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_NSS_CONFIG="$NSS_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_NSS_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no" + ;; +esac +fi +NSS_CONFIG="$ac_cv_path_NSS_CONFIG" +if test -n "$NSS_CONFIG"; then + echo "$ac_t""$NSS_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + min_nss_version=3.0.0 + echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6 +echo "configure:11990: checking for NSS - version >= $min_nss_version (skipping)" >&5 + + no_nss="" + if test "$NSS_CONFIG" = "no"; then + no_nss="yes" + else + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags` + NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs` + + nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + fi + + if test -z "$no_nss"; then + echo "$ac_t""yes" 1>&6 + MOZ_NATIVE_NSS=1 + else + echo "$ac_t""no" 1>&6 + fi + + + + + + fi if test -n "$MOZ_NATIVE_NSS"; then @@ -11052,10 +12041,12 @@ else 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 @@ -11068,7 +12059,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:11072: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:12063: 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 @@ -11076,7 +12067,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:12082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11113,7 +12104,7 @@ fi if test "$SYSTEM_JPEG" = 1; then LIBS="$JPEG_LIBS $LIBS" cat > conftest.$ac_ext < #include @@ -11124,7 +12115,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:11128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SYSTEM_JPEG=1 else @@ -11144,10 +12135,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 @@ -11160,7 +12153,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:11164: checking for gzread in -lz" >&5 +echo "configure:12157: 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 @@ -11168,7 +12161,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:12176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11204,7 +12197,7 @@ fi if test "$SYSTEM_ZLIB" = 1; then LIBS="$ZLIB_LIBS $LIBS" cat > conftest.$ac_ext < #include @@ -11215,7 +12208,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:11219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SYSTEM_ZLIB=1 else @@ -11235,10 +12228,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 @@ -11254,7 +12249,7 @@ if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then else _SAVE_PNG_LIBS=$PNG_LIBS echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:11258: checking for png_get_valid in -lpng" >&5 +echo "configure:12253: 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 @@ -11262,7 +12257,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:12272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11295,7 +12290,7 @@ SYSTEM_PNG= fi echo $ac_n "checking for png_get_acTl in -lpng""... $ac_c" 1>&6 -echo "configure:11299: checking for png_get_acTl in -lpng" >&5 +echo "configure:12294: checking for png_get_acTl in -lpng" >&5 ac_lib_var=`echo png'_'png_get_acTl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11303,7 +12298,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $_SAVE_PNG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11346,7 +12341,7 @@ fi if test "$SYSTEM_PNG" = 1; then LIBS="$PNG_LIBS $LIBS" cat > conftest.$ac_ext < #include @@ -11360,7 +12355,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:11364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SYSTEM_PNG=1 else @@ -11382,10 +12377,18 @@ fi fi # SKIP_LIBRARY_CHECKS -MOZ_ARG_ENABLE_BOOL(glitz, - --enable-glitz Enable Glitz for use with Cairo, - MOZ_ENABLE_GLITZ=1, - MOZ_ENABLE_GLITZ= ) +# Check whether --enable-glitz or --disable-glitz was given. +if test "${enable_glitz+set}" = set; then + enableval="$enable_glitz" + if test "$enableval" = "yes"; then + MOZ_ENABLE_GLITZ=1 + elif test "$enableval" = "no"; then + MOZ_ENABLE_GLITZ= + else + { echo "configure: error: Option, glitz, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test "$MOZ_ENABLE_GLITZ"; then cat >> confdefs.h <<\EOF #define MOZ_ENABLE_GLITZ 1 @@ -11394,17 +12397,23 @@ 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(Application) + +# Application BUILD_STATIC_LIBS= ENABLE_TESTS=1 @@ -11503,23 +12512,12 @@ case "$target_os" in ;; esac -MOZ_ARG_ENABLE_STRING(application, - --enable-application=APP - Options include: - suite - browser (Firefox) - mail (Thunderbird) - minimo - composer - calendar (Sunbird) - xulrunner - camino - content/xslt (Standalone Transformiix XSLT) - netwerk (Standalone Necko) - tools/update-packaging (AUS-related packaging tools) - 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 + if test "$MOZ_BUILD_APP" = "macbrowser"; then MOZ_BUILD_APP=camino @@ -11535,10 +12533,12 @@ minimo) ;; esac -MOZ_ARG_WITH_STRING(embedding-profile, - --with-embedding-profile=default|basic|minimal - see http://wiki.mozilla.org/Gecko:Small_Device_Support, - MOZ_EMBEDDING_PROFILE=$withval ) +# Check whether --with-embedding-profile or --without-embedding-profile was given. +if test "${with_embedding_profile+set}" = set; then + withval="$with_embedding_profile" + MOZ_EMBEDDING_PROFILE=$withval +fi + case "$MOZ_EMBEDDING_PROFILE" in default) @@ -11914,20 +12914,16 @@ EOF fi -MOZ_ARG_HEADER(Toolkit Options) +# Toolkit Options + + # Check whether --enable-default-toolkit or --disable-default-toolkit was given. +if test "${enable_default_toolkit+set}" = set; then + enableval="$enable_default_toolkit" + _DEFAULT_TOOLKIT=$enableval +else + _DEFAULT_TOOLKIT=$_PLATFORM_DEFAULT_TOOLKIT +fi - MOZ_ARG_ENABLE_STRING(default-toolkit, - --enable-default-toolkit=TK - Select default toolkit - Platform specific defaults: - BeOS - beos - Mac OS X - mac (carbon) - Neutrino/QNX - photon - OS/2 - os2 - Win32 - windows - * - gtk, - _DEFAULT_TOOLKIT=$enableval , - _DEFAULT_TOOLKIT=$_PLATFORM_DEFAULT_TOOLKIT) if test "$_DEFAULT_TOOLKIT" = "gtk" \ -o "$_DEFAULT_TOOLKIT" = "qt" \ @@ -12143,8 +13139,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:13186: 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:13221: 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:13322: \"$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:13367: \"$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 @@ -12152,7 +13408,95 @@ fi if test "$MOZ_ENABLE_GTK2" then - PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.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:13418: 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 gdk-x11-2.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6 +echo "configure:13462: checking for gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0" >&5 + + if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 +echo "configure:13469: checking MOZ_GTK2_CFLAGS" >&5 + MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0"` + echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 +echo "configure:13474: checking MOZ_GTK2_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" + 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 gdk-x11-2.0 glib-2.0 gobject-2.0"` + 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 gdk-x11-2.0 glib-2.0 gobject-2.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 if test "$MOZ_ENABLE_XLIB" @@ -12164,9 +13508,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" @@ -12187,7 +13534,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:12191: checking for $ac_word" >&5 +echo "configure:13538: 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 @@ -12239,7 +13586,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:12243: checking for main in -lqt" >&5 +echo "configure:13590: 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 @@ -12247,14 +13594,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:13605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12273,7 +13620,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:12277: checking for main in -lqt-mt" >&5 +echo "configure:13624: 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 @@ -12281,14 +13628,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:13639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12324,9 +13671,9 @@ fi LIBS="$LIBS $QT_LIBS" echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 -echo "configure:12328: checking Qt - version >= $QT_VERSION" >&5 +echo "configure:13675: checking Qt - version >= $QT_VERSION" >&5 cat > conftest.$ac_ext < int main() { @@ -12337,7 +13684,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else @@ -12372,21 +13719,115 @@ if test "$MOZ_ENABLE_GTK2" then MOZ_ENABLE_STARTUP_NOTIFICATION= - MOZ_ARG_ENABLE_BOOL(startup-notification, - --enable-startup-notification Enable startup-notification support (default: disabled) , - MOZ_ENABLE_STARTUP_NOTIFICATION=force, - MOZ_ENABLE_STARTUP_NOTIFICATION=) + # Check whether --enable-startup-notification or --disable-startup-notification was given. +if test "${enable_startup_notification+set}" = set; then + enableval="$enable_startup_notification" + if test "$enableval" = "yes"; then + MOZ_ENABLE_STARTUP_NOTIFICATION=force + elif test "$enableval" = "no"; then + MOZ_ENABLE_STARTUP_NOTIFICATION= + else + { echo "configure: error: Option, startup-notification, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" then - PKG_CHECK_MODULES(MOZ_STARTUP_NOTIFICATION, - libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION, - MOZ_ENABLE_STARTUP_NOTIFICATION=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:13743: 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 libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION""... $ac_c" 1>&6 +echo "configure:13787: checking for libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" >&5 + + if $PKG_CONFIG --exists "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_CFLAGS""... $ac_c" 1>&6 +echo "configure:13794: checking MOZ_STARTUP_NOTIFICATION_CFLAGS" >&5 + MOZ_STARTUP_NOTIFICATION_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"` + echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_STARTUP_NOTIFICATION_LIBS""... $ac_c" 1>&6 +echo "configure:13799: checking MOZ_STARTUP_NOTIFICATION_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs \"libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_STARTUP_NOTIFICATION_LIBS" 1>&6 + else + MOZ_STARTUP_NOTIFICATION_CFLAGS="" + MOZ_STARTUP_NOTIFICATION_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + MOZ_STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_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_STARTUP_NOTIFICATION=1 + else + if test "$MOZ_ENABLE_STARTUP_NOTIFICATION" = "force" then - AC_MSG_ERROR([* * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION]) + { echo "configure: error: * * * Could not find startup-notification >= $STARTUP_NOTIFICATION_VERSION" 1>&2; exit 1; } fi MOZ_ENABLE_STARTUP_NOTIFICATION= - ) + + fi + fi if test "$MOZ_ENABLE_STARTUP_NOTIFICATION"; then @@ -12451,17 +13892,28 @@ 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,, - MOZ_OLD_CALENDAR=1, - MOZ_OLD_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_OLD_CALENDAR=1 + elif test "$enableval" = "no"; then + MOZ_OLD_CALENDAR= + else + { echo "configure: error: Option, calendar, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test "$MOZ_OLD_CALENDAR"; then echo "configure: warning: Building with the calendar extension is no longer supported." 1>&2 @@ -12476,16 +13928,32 @@ 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 @@ -12496,18 +13964,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 @@ -12525,11 +13999,21 @@ mail) *) { echo "configure: error: Official branding is only available for Firefox Sunbird and Thunderbird." 1>&2; exit 1; } esac -) -MOZ_ARG_WITH_STRING(branding, - --with-branding=dir Use 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 + REAL_BRANDING_DIRECTORY="${MOZ_BRANDING_DIRECTORY}" if test -z "$REAL_BRANDING_DIRECTORY"; then @@ -12542,10 +14026,13 @@ 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" @@ -12557,10 +14044,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; } @@ -12579,10 +14074,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; } @@ -12598,18 +14101,202 @@ 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:14111: 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:14155: 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:14162: 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:14167: checking MOZ_XFT_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_XFT_LIBS="`$PKG_CONFIG --libs \"xft\" |sed s/-Wl,--export-dynamic//g`" + 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:14200: 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:14244: 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:14251: 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:14256: checking _PANGOCHK_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + _PANGOCHK_LIBS="`$PKG_CONFIG --libs \"pango >= 1.1.0\" |sed s/-Wl,--export-dynamic//g`" + 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" && test -z "$MOZ_ENABLE_CAIRO_GFX" then @@ -12617,7 +14304,95 @@ then #define MOZ_ENABLE_PANGO 1 EOF - PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 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:14314: 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 pangoxft >= 1.6.0""... $ac_c" 1>&6 +echo "configure:14358: checking for pangoxft >= 1.6.0" >&5 + + if $PKG_CONFIG --exists "pangoxft >= 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:14365: checking MOZ_PANGO_CFLAGS" >&5 + MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pangoxft >= 1.6.0"` + echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 +echo "configure:14370: checking MOZ_PANGO_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pangoxft >= 1.6.0\" |sed s/-Wl,--export-dynamic//g`" + 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 "pangoxft >= 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 (pangoxft >= 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 + @@ -12641,9 +14416,185 @@ then EOF if test "$MOZ_X11"; then - PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 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:14426: 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 pangoxft >= 1.6.0""... $ac_c" 1>&6 +echo "configure:14470: checking for pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0" >&5 + + if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 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:14477: checking MOZ_PANGO_CFLAGS" >&5 + MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0"` + echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 +echo "configure:14482: checking MOZ_PANGO_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= 1.6.0 pangoft2 >= 1.6.0 pangoxft >= 1.6.0\" |sed s/-Wl,--export-dynamic//g`" + 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 pangoxft >= 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 pangoxft >= 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 + else - 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:14516: 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:14560: 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:14567: 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:14572: checking MOZ_PANGO_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= 1.6.0 pangoft2 >= 1.6.0\" |sed s/-Wl,--export-dynamic//g`" + 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 + fi @@ -12667,17 +14618,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:12681: checking for XpGetPrinterList in -lXp" >&5 +echo "configure:14640: 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 @@ -12685,7 +14644,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:14659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12723,10 +14682,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 @@ -12739,23 +14706,119 @@ 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:14731: 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:14775: 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:14782: 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:14787: checking MOZ_GNOMEVFS_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6 + 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_GNOMEVFS_LIBS=`echo $MOZ_GNOMEVFS_LIBS | sed 's/-llinc\>//'` 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 @@ -12763,12 +14826,100 @@ 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:14836: 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:14880: 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:14887: 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:14892: checking MOZ_GCONF_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_GCONF_LIBS="`$PKG_CONFIG --libs \"gconf-2.0 >= $GCONF_VERSION\" |sed s/-Wl,--export-dynamic//g`" + 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_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'` MOZ_ENABLE_GCONF=1 - , + + else + MOZ_ENABLE_GCONF= - ) + + fi + fi @@ -12776,12 +14927,100 @@ 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:14937: 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:14981: 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:14988: 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:14993: checking MOZ_LIBGNOME_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs \"libgnome-2.0 >= $LIBGNOME_VERSION\" |sed s/-Wl,--export-dynamic//g`" + 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_LIBGNOME_LIBS=`echo $MOZ_LIBGNOME_LIBS | sed 's/-llinc\>//'` MOZ_ENABLE_LIBGNOME=1 - , + + else + MOZ_ENABLE_LIBGNOME= - ) + + fi + fi @@ -12805,24 +15044,119 @@ 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, + 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:15069: 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:15113: 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:15120: 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:15125: checking MOZ_GNOMEUI_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs \"libgnomeui-2.0 >= $GNOMEUI_VERSION\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6 + 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_GNOMEUI_LIBS=`echo $MOZ_GNOMEUI_LIBS | sed 's/-llinc\>//'` 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 @@ -12841,23 +15175,118 @@ if test "$MOZ_ENABLE_GTK2" then MOZ_ENABLE_DBUS=1 - MOZ_ARG_DISABLE_BOOL(dbus, - --disable-dbus Disable dbus support (default: auto, optional at runtime) , - MOZ_ENABLE_DBUS=, - MOZ_ENABLE_DBUS=force) + # Check whether --enable-dbus or --disable-dbus was given. +if test "${enable_dbus+set}" = set; then + enableval="$enable_dbus" + if test "$enableval" = "no"; then + MOZ_ENABLE_DBUS= + elif test "$enableval" = "yes"; then + MOZ_ENABLE_DBUS=force + else + { echo "configure: error: Option, dbus, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test "$MOZ_ENABLE_DBUS" then - PKG_CHECK_MODULES(MOZ_DBUS_GLIB, dbus-glib-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:15200: 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 dbus-glib-1""... $ac_c" 1>&6 +echo "configure:15244: checking for dbus-glib-1" >&5 + + if $PKG_CONFIG --exists "dbus-glib-1" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking MOZ_DBUS_GLIB_CFLAGS""... $ac_c" 1>&6 +echo "configure:15251: checking MOZ_DBUS_GLIB_CFLAGS" >&5 + MOZ_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1"` + echo "$ac_t""$MOZ_DBUS_GLIB_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_DBUS_GLIB_LIBS""... $ac_c" 1>&6 +echo "configure:15256: checking MOZ_DBUS_GLIB_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + MOZ_DBUS_GLIB_LIBS="`$PKG_CONFIG --libs \"dbus-glib-1\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$MOZ_DBUS_GLIB_LIBS" 1>&6 + else + MOZ_DBUS_GLIB_CFLAGS="" + MOZ_DBUS_GLIB_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + MOZ_DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1"` + + 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_DBUS=1 - , + + else + if test "$MOZ_ENABLE_DBUS" = "force" then - AC_MSG_ERROR([* * * Could not find dbus-glib-1]) + { echo "configure: error: * * * Could not find dbus-glib-1" 1>&2; exit 1; } fi MOZ_ENABLE_DBUS= - ) + + fi + fi if test "$MOZ_ENABLE_DBUS"; then @@ -12885,26 +15314,58 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(crypto, - --disable-crypto Disable crypto support (Personal Security Manager), - MOZ_PSM=, - MOZ_PSM=1 ) - -MOZ_ARG_DISABLE_BOOL(jsd, - --disable-jsd Disable JavaScript debug library, - MOZ_JSDEBUGGER=, - MOZ_JSDEBUGGER=1) +# Check whether --enable-crypto or --disable-crypto was given. +if test "${enable_crypto+set}" = set; then + enableval="$enable_crypto" + if test "$enableval" = "no"; then + MOZ_PSM= + elif test "$enableval" = "yes"; then + MOZ_PSM=1 + else + { echo "configure: error: Option, crypto, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi -MOZ_ARG_DISABLE_BOOL(plugins, - --disable-plugins Disable plugins support, - MOZ_PLUGINS=, - MOZ_PLUGINS=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 + + + +# 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 -MOZ_ARG_DISABLE_BOOL(oji, - --disable-oji Disable Open JVM Integration support, - MOZ_OJI=, - MOZ_OJI=1) if test -n "$MOZ_OJI"; then cat >> confdefs.h <<\EOF #define OJI 1 @@ -12912,11 +15373,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 @@ -12933,15 +15401,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 @@ -12950,10 +15434,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(accessibility, - --disable-accessibility Disable accessibility support (off by default on OS X), - 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 @@ -12961,16 +15453,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 @@ -12978,15 +15485,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 @@ -12994,10 +15517,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(printing, - --disable-printing Disable printing support, - NS_PRINTING=, - NS_PRINTING=1 ) +# Check whether --enable-printing or --disable-printing was given. +if test "${enable_printing+set}" = set; then + enableval="$enable_printing" + if test "$enableval" = "no"; then + NS_PRINTING= + elif test "$enableval" = "yes"; then + NS_PRINTING=1 + else + { echo "configure: error: Option, printing, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test "$NS_PRINTING"; then cat >> confdefs.h <<\EOF @@ -13010,10 +15541,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 @@ -13025,24 +15564,47 @@ if test "$OS_ARCH" != "WINCE" -a "$OS_ARCH" != "WINNT" -a "$MOZ_USE_NATIVE_UCONV 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=1, - MOZ_NO_XPCOM_OBSOLETE=) +# 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=1 + elif test "$enableval" = "yes"; then + MOZ_NO_XPCOM_OBSOLETE= + 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 -z "$MOZ_SINGLE_PROFILE"; then @@ -13054,10 +15616,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(xpcom-fastload, - --disable-xpcom-fastload Disable XPCOM fastload support, - MOZ_NO_FAST_LOAD=1, - MOZ_NO_FAST_LOAD=) +# Check whether --enable-xpcom-fastload or --disable-xpcom-fastload was given. +if test "${enable_xpcom_fastload+set}" = set; then + enableval="$enable_xpcom_fastload" + if test "$enableval" = "no"; then + MOZ_NO_FAST_LOAD=1 + elif test "$enableval" = "yes"; then + MOZ_NO_FAST_LOAD= + else + { echo "configure: error: Option, xpcom-fastload, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + @@ -13068,21 +15638,45 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(permissions, - --disable-permissions Disable permissions (popup and cookie blocking), - MOZ_PERMISSIONS=, +# Check whether --enable-permissions or --disable-permissions was given. +if test "${enable_permissions+set}" = set; then + enableval="$enable_permissions" + if test "$enableval" = "no"; then + MOZ_PERMISSIONS= + elif test "$enableval" = "yes"; then MOZ_PERMISSIONS=1 -) -MOZ_ARG_DISABLE_BOOL(negotiateauth, - --disable-negotiateauth Disable GSS-API negotiation , - MOZ_AUTH_EXTENSION=, - MOZ_AUTH_EXTENSION=1 ) + else + { echo "configure: error: Option, permissions, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + + +# Check whether --enable-negotiateauth or --disable-negotiateauth was given. +if test "${enable_negotiateauth+set}" = set; then + enableval="$enable_negotiateauth" + if test "$enableval" = "no"; then + MOZ_AUTH_EXTENSION= + elif test "$enableval" = "yes"; then + MOZ_AUTH_EXTENSION=1 + else + { echo "configure: error: Option, negotiateauth, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + + +# Check whether --enable-xtf or --disable-xtf was given. +if test "${enable_xtf+set}" = set; then + enableval="$enable_xtf" + if test "$enableval" = "no"; then + MOZ_XTF= + elif test "$enableval" = "yes"; then + MOZ_XTF=1 + else + { echo "configure: error: Option, xtf, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi -MOZ_ARG_DISABLE_BOOL(xtf, - --disable-xtf Disable XTF (pluggable xml tags) support, - MOZ_XTF=, - MOZ_XTF=1 ) if test "$MOZ_XTF"; then cat >> confdefs.h <<\EOF #define MOZ_XTF 1 @@ -13090,39 +15684,83 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(inspector-apis, - --disable-inspector-apis Disable the DOM inspection APIs , - MOZ_NO_INSPECTOR_APIS=1, - MOZ_NO_INSPECTOR_APIS= ) +# Check whether --enable-inspector-apis or --disable-inspector-apis was given. +if test "${enable_inspector_apis+set}" = set; then + enableval="$enable_inspector_apis" + if test "$enableval" = "no"; then + MOZ_NO_INSPECTOR_APIS=1 + elif test "$enableval" = "yes"; then + MOZ_NO_INSPECTOR_APIS= + else + { echo "configure: error: Option, inspector-apis, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi -MOZ_ARG_DISABLE_BOOL(xmlextras, - --disable-xmlextras Disable XMLExtras such as XPointer support , - MOZ_XMLEXTRAS=, - MOZ_XMLEXTRAS=1 ) -MOZ_ARG_DISABLE_BOOL(webservices, - --disable-webservices Disable Webservices/SOAP support , - MOZ_WEBSERVICES=, - MOZ_WEBSERVICES=1 ) +# Check whether --enable-xmlextras or --disable-xmlextras was given. +if test "${enable_xmlextras+set}" = set; then + enableval="$enable_xmlextras" + if test "$enableval" = "no"; then + MOZ_XMLEXTRAS= + elif test "$enableval" = "yes"; then + MOZ_XMLEXTRAS=1 + else + { echo "configure: error: Option, xmlextras, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi -MOZ_ARG_DISABLE_BOOL(pref-extensions, - --disable-pref-extensions - Disable pref extensions such as autoconfig and - system-pref, - MOZ_PREF_EXTENSIONS=, - MOZ_PREF_EXTENSIONS=1 ) -MOZ_ARG_DISABLE_BOOL(universalchardet, - --disable-universalchardet - Disable universal encoding detection, - MOZ_UNIVERSALCHARDET=, - MOZ_UNIVERSALCHARDET=1 ) +# Check whether --enable-webservices or --disable-webservices was given. +if test "${enable_webservices+set}" = set; then + enableval="$enable_webservices" + if test "$enableval" = "no"; then + MOZ_WEBSERVICES= + elif test "$enableval" = "yes"; then + MOZ_WEBSERVICES=1 + else + { echo "configure: error: Option, webservices, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + + +# Check whether --enable-pref-extensions or --disable-pref-extensions was given. +if test "${enable_pref_extensions+set}" = set; then + enableval="$enable_pref_extensions" + if test "$enableval" = "no"; then + MOZ_PREF_EXTENSIONS= + elif test "$enableval" = "yes"; then + MOZ_PREF_EXTENSIONS=1 + else + { echo "configure: error: Option, pref-extensions, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + + +# Check whether --enable-universalchardet or --disable-universalchardet was given. +if test "${enable_universalchardet+set}" = set; then + enableval="$enable_universalchardet" + if test "$enableval" = "no"; then + MOZ_UNIVERSALCHARDET= + elif test "$enableval" = "yes"; then + MOZ_UNIVERSALCHARDET=1 + else + { echo "configure: error: Option, universalchardet, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + + +# 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 -MOZ_ARG_ENABLE_BOOL(javaxpcom, - --enable-javaxpcom - Enable Java-XPCOM bridge, - MOZ_JAVAXPCOM=1, - MOZ_JAVAXPCOM= ) if test -n "${MOZ_JAVAXPCOM}"; then case "$host_os" in @@ -13165,7 +15803,7 @@ if test -n "${MOZ_JAVAXPCOM}"; then # Extract the first word of "java", so it can be a program name with args. set dummy java; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13169: checking for $ac_word" >&5 +echo "configure:15807: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13201,7 +15839,7 @@ fi # Extract the first word of "javac", so it can be a program name with args. set dummy javac; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13205: checking for $ac_word" >&5 +echo "configure:15843: 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 @@ -13237,7 +15875,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:13241: checking for $ac_word" >&5 +echo "configure:15879: 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 @@ -13280,10 +15918,18 @@ if test "$OS_ARCH" = "WINNT" -a -z "$GNU_CC"; then MOZ_AIRBAG=1 fi -MOZ_ARG_DISABLE_BOOL(airbag, - --disable-airbag Disable airbag crash reporting, - MOZ_AIRBAG=, - MOZ_AIRBAG=1) +# Check whether --enable-airbag or --disable-airbag was given. +if test "${enable_airbag+set}" = set; then + enableval="$enable_airbag" + if test "$enableval" = "no"; then + MOZ_AIRBAG= + elif test "$enableval" = "yes"; then + MOZ_AIRBAG=1 + else + { echo "configure: error: Option, airbag, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test -n "$MOZ_AIRBAG"; then cat >> confdefs.h <<\EOF @@ -13292,15 +15938,24 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(mochitest, - --disable-mochitest Disable mochitest harness, - MOZ_MOCHITEST=, - MOZ_MOCHITEST=1 ) +# Check whether --enable-mochitest or --disable-mochitest was given. +if test "${enable_mochitest+set}" = set; then + enableval="$enable_mochitest" + if test "$enableval" = "no"; then + MOZ_MOCHITEST= + elif test "$enableval" = "yes"; then + MOZ_MOCHITEST=1 + else + { echo "configure: error: Option, mochitest, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +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 @@ -13313,8 +15968,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_GNOMEVFS" && test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then # Suppress warning on non-X11 platforms @@ -13415,10 +16073,10 @@ beos|windows|os2|mac|cocoa) ;; 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 @@ -13431,15 +16089,18 @@ 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 + if test `echo "$MOZ_IMG_DECODERS" | grep -c png` -ne 0; then MOZ_PNG_CFLAGS="$MOZ_PNG_CFLAGS -DMOZ_PNG_READ" echo $ac_n "checking if pnggccrd.c can be compiled without PNG_NO_MMX_CODE""... $ac_c" 1>&6 -echo "configure:13441: checking if pnggccrd.c can be compiled without PNG_NO_MMX_CODE" >&5 +echo "configure:16102: checking if pnggccrd.c can be compiled without PNG_NO_MMX_CODE" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -13464,10 +16125,10 @@ rm -f conftest* fi -MOZ_ARG_ENABLE_STRING(image-encoders, - --enable-image-encoders[={mod1,mod2,default,all,none}] - Enable specific image encoders, - for option in `echo $enableval | sed 's/,/ /g'`; do +# Check whether --enable-image-encoders or --disable-image-encoders was given. +if test "${enable_image_encoders+set}" = set; then + enableval="$enable_image_encoders" + for option in `echo $enableval | sed 's/,/ /g'`; do if test "$option" = "yes" || test "$option" = "all"; then addencoder="$MOZ_IMG_ENCODERS_DEFAULT" elif test "$option" = "no" || test "$option" = "none"; then @@ -13482,8 +16143,11 @@ MOZ_ARG_ENABLE_STRING(image-encoders, addencoder="$option" fi MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS $addencoder" -done, - MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS_DEFAULT") +done +else + MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS_DEFAULT" +fi + if test `echo "$MOZ_IMG_ENCODERS" | grep -c png` -ne 0; then MOZ_PNG_CFLAGS="$MOZ_PNG_CFLAGS -DMOZ_PNG_WRITE" @@ -13492,16 +16156,31 @@ fi MOZ_IMG_DECODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_DECODERS}` MOZ_IMG_ENCODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_ENCODERS}` -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 @@ -13509,10 +16188,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(canvas, - --disable-canvas Disable html:canvas feature, - MOZ_ENABLE_CANVAS=, - MOZ_ENABLE_CANVAS=1 ) +# Check whether --enable-canvas or --disable-canvas was given. +if test "${enable_canvas+set}" = set; then + enableval="$enable_canvas" + if test "$enableval" = "no"; then + MOZ_ENABLE_CANVAS= + elif test "$enableval" = "yes"; then + MOZ_ENABLE_CANVAS=1 + else + { echo "configure: error: Option, canvas, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test -n "$MOZ_ENABLE_CANVAS"; then cat >> confdefs.h <<\EOF #define MOZ_ENABLE_CANVAS 1 @@ -13521,10 +16208,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(svg, - --disable-svg Disable SVG support, - MOZ_SVG=, - MOZ_SVG=1 ) +# Check whether --enable-svg or --disable-svg was given. +if test "${enable_svg+set}" = set; then + enableval="$enable_svg" + if test "$enableval" = "no"; then + MOZ_SVG= + elif test "$enableval" = "yes"; then + MOZ_SVG=1 + else + { echo "configure: error: Option, svg, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test -n "$MOZ_SVG"; then if test -z "$MOZ_ENABLE_CAIRO_GFX"; then { echo "configure: error: SVG requires cairo gfx" 1>&2; exit 1; } @@ -13537,11 +16232,18 @@ EOF fi MOZ_SVG_FOREIGNOBJECT=$MOZ_ENABLE_CAIRO_GFX -MOZ_ARG_DISABLE_BOOL(svg-foreignobject, - --disable-svg-foreignobject - Disable SVG support, - MOZ_SVG_FOREIGNOBJECT=, - MOZ_SVG_FOREIGNOBJECT=1 ) +# Check whether --enable-svg-foreignobject or --disable-svg-foreignobject was given. +if test "${enable_svg_foreignobject+set}" = set; then + enableval="$enable_svg_foreignobject" + if test "$enableval" = "no"; then + MOZ_SVG_FOREIGNOBJECT= + elif test "$enableval" = "yes"; then + MOZ_SVG_FOREIGNOBJECT=1 + else + { echo "configure: error: Option, svg-foreignobject, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test "$MOZ_SVG_FOREIGNOBJECT"; then if test -z "$MOZ_ENABLE_CAIRO_GFX"; then { echo "configure: error: requires cairo gfx" 1>&2; exit 1; } @@ -13563,10 +16265,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 + if test -n "$MOZ_INSTALLER" -a -n "$MOZ_XUL_APP" -a "$OS_ARCH" = "WINNT"; then # Disable installer for Windows builds that use the new toolkit if NSIS # isn't in the path. @@ -13575,7 +16285,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:13579: checking for $ac_word" >&5 +echo "configure:16289: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13620,7 +16330,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:13624: checking for $ac_word" >&5 +echo "configure:16334: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13668,13 +16378,13 @@ fi echo $ac_n "checking for tar archiver""... $ac_c" 1>&6 -echo "configure:13672: checking for tar archiver" >&5 +echo "configure:16382: checking for tar archiver" >&5 for ac_prog in gnutar gtar tar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13678: checking for $ac_word" >&5 +echo "configure:16388: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13711,23 +16421,31 @@ echo "$ac_t""$TAR" 1>&6 -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:13725: checking for iconv" >&5 +echo "configure:16443: 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:13731: checking for $ac_word" >&5 +echo "configure:16449: 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 @@ -13766,10 +16484,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 @@ -13780,33 +16500,61 @@ 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(xpconnect-idispatch, - --disable-xpconnect-idispatch - Disable building of xpconnect support for IDispatch - (win32 only), - XPC_IDISPATCH_SUPPORT=, - XPC_IDISPATCH_SUPPORT=1) + +# Check whether --enable-xpconnect-idispatch or --disable-xpconnect-idispatch was given. +if test "${enable_xpconnect_idispatch+set}" = set; then + enableval="$enable_xpconnect_idispatch" + if test "$enableval" = "no"; then + XPC_IDISPATCH_SUPPORT= + elif test "$enableval" = "yes"; then + XPC_IDISPATCH_SUPPORT=1 + else + { echo "configure: error: Option, xpconnect-idispatch, 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"; @@ -13814,29 +16562,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 @@ -13844,10 +16624,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(places, - --enable-places Enable 'places' bookmark/history implementation, - MOZ_PLACES=1, - MOZ_PLACES= ) +# Check whether --enable-places or --disable-places was given. +if test "${enable_places+set}" = set; then + enableval="$enable_places" + if test "$enableval" = "yes"; then + MOZ_PLACES=1 + elif test "$enableval" = "no"; then + MOZ_PLACES= + else + { echo "configure: error: Option, places, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test -n "$MOZ_PLACES"; then cat >> confdefs.h <<\EOF #define MOZ_PLACES 1 @@ -13857,10 +16645,18 @@ EOF MOZ_MORKREADER=1 fi -MOZ_ARG_ENABLE_BOOL(places-bookmarks, - --enable-places_bookmarks Enable 'places' for bookmarks backend, - MOZ_PLACES_BOOKMARKS=1, - MOZ_PLACES_BOOKMARKS= ) +# Check whether --enable-places-bookmarks or --disable-places-bookmarks was given. +if test "${enable_places_bookmarks+set}" = set; then + enableval="$enable_places_bookmarks" + if test "$enableval" = "yes"; then + MOZ_PLACES_BOOKMARKS=1 + elif test "$enableval" = "no"; then + MOZ_PLACES_BOOKMARKS= + else + { echo "configure: error: Option, places-bookmarks, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test -n "$MOZ_PLACES_BOOKMARKS"; then cat >> confdefs.h <<\EOF #define MOZ_PLACES_BOOKMARKS 1 @@ -13868,10 +16664,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(feeds, - --disable-feeds Disable feed handling and processing components, - MOZ_FEEDS=, - MOZ_FEEDS=1 ) +# Check whether --enable-feeds or --disable-feeds was given. +if test "${enable_feeds+set}" = set; then + enableval="$enable_feeds" + if test "$enableval" = "no"; then + MOZ_FEEDS= + elif test "$enableval" = "yes"; then + MOZ_FEEDS=1 + else + { echo "configure: error: Option, feeds, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test -n "$MOZ_FEEDS"; then cat >> confdefs.h <<\EOF #define MOZ_FEEDS 1 @@ -13883,10 +16687,18 @@ else fi 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 @@ -13894,10 +16706,18 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(safe-browsing, - --enable-safe-browsing Enable safe browsing (anti-phishing) implementation, - MOZ_SAFE_BROWSING=1, - MOZ_SAFE_BROWSING= ) +# Check whether --enable-safe-browsing or --disable-safe-browsing was given. +if test "${enable_safe_browsing+set}" = set; then + enableval="$enable_safe_browsing" + if test "$enableval" = "yes"; then + MOZ_SAFE_BROWSING=1 + elif test "$enableval" = "no"; then + MOZ_SAFE_BROWSING= + else + { echo "configure: error: Option, safe-browsing, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test -n "$MOZ_SAFE_BROWSING"; then cat >> confdefs.h <<\EOF #define MOZ_SAFE_BROWSING 1 @@ -13909,10 +16729,18 @@ fi if test -n "$MOZ_SAFE_BROWSING"; then MOZ_URL_CLASSIFIER=1 fi -MOZ_ARG_ENABLE_BOOL(url-classifier, - --enable-url-classifier Enable url classifier module, - MOZ_URL_CLASSIFIER=1, - MOZ_URL_CLASSIFIER= ) +# Check whether --enable-url-classifier or --disable-url-classifier was given. +if test "${enable_url_classifier+set}" = set; then + enableval="$enable_url_classifier" + if test "$enableval" = "yes"; then + MOZ_URL_CLASSIFIER=1 + elif test "$enableval" = "no"; then + MOZ_URL_CLASSIFIER= + else + { echo "configure: error: Option, url-classifier, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test -n "$MOZ_URL_CLASSIFIER"; then cat >> confdefs.h <<\EOF #define MOZ_URL_CLASSIFIER 1 @@ -13921,10 +16749,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 @@ -13933,7 +16769,7 @@ fi -MOZ_ARG_HEADER(Debugging and Optimizations) +# Debugging and Optimizations if test -z "$MOZ_DEBUG_FLAGS" then @@ -13959,18 +16795,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 @@ -13990,18 +16829,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:13994: checking for valid debug flags" >&5 +echo "configure:16833: 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:14005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -14022,10 +16861,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'` @@ -14033,23 +16872,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:14042: checking for valid optimization flags" >&5 +echo "configure:16885: 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:14053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -14071,30 +16914,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 @@ -14102,10 +16955,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 @@ -14119,10 +16980,18 @@ EOF 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 @@ -14135,10 +17004,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 @@ -14147,17 +17024,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:14161: checking for malloc in -lefence" >&5 +echo "configure:17049: 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 @@ -14165,7 +17053,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:17068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14205,10 +17093,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 @@ -14217,23 +17113,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 @@ -14247,12 +17165,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:14251: checking for $ac_func" >&5 +echo "configure:17169: 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:17200: \"$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 @@ -14316,17 +17234,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 @@ -14334,10 +17268,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 @@ -14346,10 +17288,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 @@ -14357,10 +17307,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 @@ -14370,10 +17328,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= @@ -14385,11 +17351,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 @@ -14401,15 +17374,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 @@ -14417,20 +17400,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 @@ -14444,12 +17439,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:14448: checking for $ac_func" >&5 +echo "configure:17443: 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:17474: \"$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 @@ -14521,17 +17516,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 @@ -14544,20 +17549,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:14593: checking for gcc -pipe support" >&5 +echo "configure:17612: 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 @@ -14604,14 +17623,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:14615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -14636,26 +17655,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:14650: checking whether compiler supports -Wno-long-long" >&5 +echo "configure:17676: checking whether compiler supports -Wno-long-long" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17685: \"$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" @@ -14676,16 +17702,16 @@ _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fprofile-generate" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 -echo "configure:14680: checking whether C compiler supports -fprofile-generate" >&5 +echo "configure:17706: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" @@ -14703,16 +17729,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:14707: checking whether C compiler supports -fprofile-arcs" >&5 +echo "configure:17733: checking whether C compiler supports -fprofile-arcs" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-arcs" result="yes" @@ -14742,23 +17768,32 @@ 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:14753: checking whether C++ compiler has -pedantic long long bug" >&5 +echo "configure:17788: checking whether C++ compiler has -pedantic long long bug" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="no" else @@ -14783,12 +17818,12 @@ rm -f conftest* fi echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 -echo "configure:14787: checking for correct temporary object destruction order" >&5 +echo "configure:17822: 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:17847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -14829,12 +17864,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:14833: checking for correct overload resolution with const and templates" >&5 +echo "configure:17868: 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 < @@ -14864,7 +17899,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_nscap_nonconst_opeq_bug="no" else @@ -14887,10 +17922,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 @@ -14900,10 +17943,18 @@ 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 @@ -14932,24 +17983,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 @@ -14970,17 +18037,33 @@ MDDEPDIR='.deps' -MOZ_ARG_HEADER(Static build options) +# Static build options -MOZ_ARG_ENABLE_BOOL(static, - --enable-static Enable building of internal static libs, - BUILD_STATIC_LIBS=1, - BUILD_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 + elif test "$enableval" = "no"; then + BUILD_STATIC_LIBS= + else + { echo "configure: error: Option, static, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + + +# Check whether --enable-libxul or --disable-libxul was given. +if test "${enable_libxul+set}" = set; then + enableval="$enable_libxul" + if test "$enableval" = "yes"; then + MOZ_ENABLE_LIBXUL=1 + elif test "$enableval" = "no"; then + MOZ_ENABLE_LIBXUL= + else + { echo "configure: error: Option, libxul, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi -MOZ_ARG_ENABLE_BOOL(libxul, - --enable-libxul Enable building of libxul, - MOZ_ENABLE_LIBXUL=1, - MOZ_ENABLE_LIBXUL=) if test -n "$MOZ_ENABLE_LIBXUL" -a -n "$BUILD_STATIC_LIBS"; then { echo "configure: error: --enable-libxul is not compatible with --enable-static" 1>&2; exit 1; } @@ -15006,10 +18089,18 @@ EOF XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS" fi -MOZ_ARG_ENABLE_BOOL(js-static-build, - --enable-js-static-build Force js to be a static lib, - JS_STATIC_BUILD=1, - JS_STATIC_BUILD= ) +# Check whether --enable-js-static-build or --disable-js-static-build was given. +if test "${enable_js_static_build+set}" = set; then + enableval="$enable_js_static_build" + if test "$enableval" = "yes"; then + JS_STATIC_BUILD=1 + elif test "$enableval" = "no"; then + JS_STATIC_BUILD= + else + { echo "configure: error: Option, js-static-build, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + @@ -15025,7 +18116,7 @@ fi fi -MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla)) +# Standalone module options (Not for building Mozilla) case "$target_os" in msvc*|mks*|cygwin*|mingw*|wince*) @@ -15040,9 +18131,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 @@ -15061,15 +18161,1271 @@ then fi if test "$MOZ_ENABLE_GTK2"; then - PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.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:18171: 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 glib-2.0 gobject-2.0""... $ac_c" 1>&6 +echo "configure:18215: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5 + + if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 +echo "configure:18222: checking LIBIDL_CFLAGS" >&5 + LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 +echo "configure:18227: checking LIBIDL_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$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 glib-2.0 gobject-2.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:18349: 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:18384: 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:18483: \"$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:18527: \"$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:18571: 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:18606: 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:18719: \"$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:18764: \"$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:18892: 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:18927: 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:19026: \"$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:19070: \"$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:19114: 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:19149: 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:19262: \"$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:19307: \"$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:19347: 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:19391: 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:19398: 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:19403: checking LIBIDL_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0\" |sed s/-Wl,--export-dynamic//g`" + 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 @@ -15078,7 +19434,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:15082: checking for $ac_word" >&5 +echo "configure:19438: 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 @@ -15115,7 +19471,7 @@ done if test -n "$ORBIT_CONFIG"; then echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 -echo "configure:15119: checking for ORBit libIDL usability" >&5 +echo "configure:19475: 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}` @@ -15132,7 +19488,7 @@ echo "configure:15119: checking for ORBit libIDL usability" >&5 result="maybe" else cat > conftest.$ac_ext < @@ -15147,7 +19503,7 @@ int main() { } EOF -if { (eval echo configure:15151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19507: \"$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" @@ -15197,9 +19553,367 @@ 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 gobject-2.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:19563: 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 gobject-2.0""... $ac_c" 1>&6 +echo "configure:19607: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5 + + if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7 gobject-2.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 +echo "configure:19614: checking GLIB_CFLAGS" >&5 + GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7 gobject-2.0"` + echo "$ac_t""$GLIB_CFLAGS" 1>&6 + + echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 +echo "configure:19619: checking GLIB_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7 gobject-2.0\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$GLIB_LIBS" 1>&6 + 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 gobject-2.0"` + 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 gobject-2.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 + 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:19702: 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:19737: 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:19836: \"$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:19880: \"$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 @@ -15242,19 +19956,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:15246: checking for working alloca.h" >&5 +echo "configure:19960: 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:15258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19972: \"$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 @@ -15275,12 +19989,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:15279: checking for alloca" >&5 +echo "configure:19993: 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:20026: \"$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 @@ -15340,12 +20054,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:15344: checking whether alloca needs Cray hooks" >&5 +echo "configure:20058: 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:15374: checking for $ac_func" >&5 +echo "configure:20088: 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:20116: \"$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 @@ -15425,7 +20139,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:15429: checking stack direction for C alloca" >&5 +echo "configure:20143: 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 @@ -15433,7 +20147,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:20170: \"$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 @@ -15482,10 +20196,18 @@ if test "$MOZ_SVG" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_GFX" ; then MOZ_CAIRO_CFLAGS='-I$(LIBXUL_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. @@ -15493,17 +20215,17 @@ if test "$MOZ_SVG" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_GFX" ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:15497: checking for $ac_hdr" >&5 +echo "configure:20219: 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:15507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:20229: \"$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* @@ -15567,7 +20289,95 @@ EOF GLITZ_SURFACE_FEATURE="#define CAIRO_HAS_GLITZ_SURFACE 1" fi if test "$MOZ_WIDGET_TOOLKIT" = "beos"; then - PKG_CHECK_MODULES(CAIRO_FT, fontconfig freetype2) + 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:20299: 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 fontconfig freetype2""... $ac_c" 1>&6 +echo "configure:20343: checking for fontconfig freetype2" >&5 + + if $PKG_CONFIG --exists "fontconfig freetype2" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_FT_CFLAGS""... $ac_c" 1>&6 +echo "configure:20350: checking CAIRO_FT_CFLAGS" >&5 + CAIRO_FT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig freetype2"` + echo "$ac_t""$CAIRO_FT_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_FT_LIBS""... $ac_c" 1>&6 +echo "configure:20355: checking CAIRO_FT_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + CAIRO_FT_LIBS="`$PKG_CONFIG --libs \"fontconfig freetype2\" |sed s/-Wl,--export-dynamic//g`" + echo "$ac_t""$CAIRO_FT_LIBS" 1>&6 + else + CAIRO_FT_CFLAGS="" + CAIRO_FT_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + CAIRO_FT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig freetype2"` + echo $CAIRO_FT_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 (fontconfig freetype2) 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 + BEOS_SURFACE_FEATURE="#define CAIRO_HAS_BEOS_SURFACE 1" FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" MOZ_ENABLE_CAIRO_FT=1 @@ -15623,7 +20433,95 @@ EOF fi fi else - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION freetype2 fontconfig) + 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:20443: 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 freetype2 fontconfig""... $ac_c" 1>&6 +echo "configure:20487: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5 + + if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION freetype2 fontconfig" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 +echo "configure:20494: checking CAIRO_CFLAGS" >&5 + CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION freetype2 fontconfig"` + echo "$ac_t""$CAIRO_CFLAGS" 1>&6 + + echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 +echo "configure:20499: checking CAIRO_LIBS" >&5 + ## Remove evil flags like -Wl,--export-dynamic + CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION freetype2 fontconfig\" |sed s/-Wl,--export-dynamic//g`" + 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 freetype2 fontconfig"` + 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 freetype2 fontconfig) 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 @@ -15633,9 +20531,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 @@ -15701,10 +20608,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 @@ -15713,15 +20628,31 @@ EOF fi -MOZ_ARG_ENABLE_BOOL(ipcd, - --enable-ipcd Enable IPC daemon, - MOZ_IPCD=1, - MOZ_IPCD= ) +# Check whether --enable-ipcd or --disable-ipcd was given. +if test "${enable_ipcd+set}" = set; then + enableval="$enable_ipcd" + if test "$enableval" = "yes"; then + MOZ_IPCD=1 + elif test "$enableval" = "no"; then + MOZ_IPCD= + else + { echo "configure: error: Option, ipcd, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + + +# Check whether --enable-profilelocking or --disable-profilelocking was given. +if test "${enable_profilelocking+set}" = set; then + enableval="$enable_profilelocking" + if test "$enableval" = "no"; then + MOZ_PROFILELOCKING= + elif test "$enableval" = "yes"; then + MOZ_PROFILELOCKING=1 + else + { echo "configure: error: Option, profilelocking, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi -MOZ_ARG_DISABLE_BOOL(profilelocking, - --disable-profilelocking Disable profile locking, - MOZ_PROFILELOCKING=, - MOZ_PROFILELOCKING=1 ) if test "$MOZ_PROFILELOCKING"; then cat >> confdefs.h <<\EOF #define MOZ_PROFILELOCKING 1 @@ -15729,9 +20660,18 @@ EOF fi -MOZ_ARG_DISABLE_BOOL(rdf, - --disable-rdf Disable RDF, - MOZ_RDF= ) +# Check whether --enable-rdf or --disable-rdf was given. +if test "${enable_rdf+set}" = set; then + enableval="$enable_rdf" + if test "$enableval" = "no"; then + MOZ_RDF= + elif test "$enableval" = "yes"; then + : + else + { echo "configure: error: Option, rdf, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + if test "$MOZ_RDF"; then cat >> confdefs.h <<\EOF #define MOZ_RDF 1 @@ -15742,10 +20682,10 @@ fi -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 @@ -15758,8 +20698,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 @@ -15769,11 +20712,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 @@ -15782,11 +20732,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 @@ -15795,10 +20752,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 @@ -15809,10 +20774,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 @@ -15869,14 +20842,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:15880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -16188,7 +21161,7 @@ if test "$MOZ_X11"; then _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $XCFLAGS" cat > conftest.$ac_ext < @@ -16205,7 +21178,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -16679,6 +21652,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 @@ -16687,6 +21663,12 @@ s%@MACOSX_DEPLOYMENT_TARGET@%$MACOSX_DEPLOYMENT_TARGET%g s%@LIBOBJS@%$LIBOBJS%g s%@HAVE_GCC3_ABI@%$HAVE_GCC3_ABI%g s%@LIBXUL_SDK@%$LIBXUL_SDK%g +s%@NSPR_CONFIG@%$NSPR_CONFIG%g +s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g +s%@NSPR_LIBS@%$NSPR_LIBS%g +s%@NSS_CONFIG@%$NSS_CONFIG%g +s%@NSS_CFLAGS@%$NSS_CFLAGS%g +s%@NSS_LIBS@%$NSS_LIBS%g s%@MOZ_EMBEDDING_LEVEL_DEFAULT@%$MOZ_EMBEDDING_LEVEL_DEFAULT%g s%@MOZ_EMBEDDING_LEVEL_BASIC@%$MOZ_EMBEDDING_LEVEL_BASIC%g s%@MOZ_EMBEDDING_LEVEL_MINIMAL@%$MOZ_EMBEDDING_LEVEL_MINIMAL%g @@ -16698,12 +21680,17 @@ s%@MOZ_THUNDERBIRD@%$MOZ_THUNDERBIRD%g s%@MOZ_STANDALONE_COMPOSER@%$MOZ_STANDALONE_COMPOSER%g s%@MOZ_SUNBIRD@%$MOZ_SUNBIRD%g s%@MOZ_XULRUNNER@%$MOZ_XULRUNNER%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%@MOZ_ENABLE_STARTUP_NOTIFICATION@%$MOZ_ENABLE_STARTUP_NOTIFICATION%g s%@MOZ_STARTUP_NOTIFICATION_CFLAGS@%$MOZ_STARTUP_NOTIFICATION_CFLAGS%g s%@MOZ_STARTUP_NOTIFICATION_LIBS@%$MOZ_STARTUP_NOTIFICATION_LIBS%g -s%@GTK_CONFIG@%$GTK_CONFIG%g +s%@MOZ_ENABLE_STARTUP_NOTIFICATION@%$MOZ_ENABLE_STARTUP_NOTIFICATION%g s%@TK_CFLAGS@%$TK_CFLAGS%g s%@TK_LIBS@%$TK_LIBS%g s%@MOZ_ENABLE_GTK@%$MOZ_ENABLE_GTK%g @@ -16717,8 +21704,6 @@ s%@MOZ_ENABLE_GLITZ@%$MOZ_ENABLE_GLITZ%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 @@ -16732,12 +21717,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 @@ -16746,12 +21733,12 @@ 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_DBUS@%$MOZ_ENABLE_DBUS%g +s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g s%@MOZ_DBUS_GLIB_CFLAGS@%$MOZ_DBUS_GLIB_CFLAGS%g s%@MOZ_DBUS_GLIB_LIBS@%$MOZ_DBUS_GLIB_LIBS%g +s%@MOZ_ENABLE_DBUS@%$MOZ_ENABLE_DBUS%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 @@ -16788,12 +21775,14 @@ s%@MOZ_AUTO_DEPS@%$MOZ_AUTO_DEPS%g s%@COMPILER_DEPEND@%$COMPILER_DEPEND%g s%@MDDEPDIR@%$MDDEPDIR%g s%@JS_STATIC_BUILD@%$JS_STATIC_BUILD%g -s%@ORBIT_CONFIG@%$ORBIT_CONFIG%g s%@LIBIDL_CFLAGS@%$LIBIDL_CFLAGS%g s%@LIBIDL_LIBS@%$LIBIDL_LIBS%g -s%@STATIC_LIBIDL@%$STATIC_LIBIDL%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%@STATIC_LIBIDL@%$STATIC_LIBIDL%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 @@ -16801,8 +21790,9 @@ s%@HOST_LIBIDL_LIBS@%$HOST_LIBIDL_LIBS%g s%@ALLOCA@%$ALLOCA%g s%@MOZ_LIBART_CFLAGS@%$MOZ_LIBART_CFLAGS%g s%@MOZ_LIBART_LIBS@%$MOZ_LIBART_LIBS%g -s%@MOZ_ENABLE_CAIRO_FT@%$MOZ_ENABLE_CAIRO_FT%g s%@CAIRO_FT_CFLAGS@%$CAIRO_FT_CFLAGS%g +s%@CAIRO_FT_LIBS@%$CAIRO_FT_LIBS%g +s%@MOZ_ENABLE_CAIRO_FT@%$MOZ_ENABLE_CAIRO_FT%g s%@PS_SURFACE_FEATURE@%$PS_SURFACE_FEATURE%g s%@PDF_SURFACE_FEATURE@%$PDF_SURFACE_FEATURE%g s%@SVG_SURFACE_FEATURE@%$SVG_SURFACE_FEATURE%g @@ -16819,6 +21809,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 @@ -16995,11 +21987,7 @@ 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%@NSS_CFLAGS@%$NSS_CFLAGS%g -s%@NSS_LIBS@%$NSS_LIBS%g s%@NSS_DEP_LIBS@%$NSS_DEP_LIBS%g s%@MOZ_NATIVE_NSS@%$MOZ_NATIVE_NSS%g s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g