From 3746e94cdd42dbd8c73ffcfcedfcbcf7ebdb1adb Mon Sep 17 00:00:00 2001 From: cltbld Date: Sun, 1 Jan 2006 12:16:07 +0000 Subject: [PATCH] Automated update from host egg --- configure | 6943 ++++++++++------------------------------------------- 1 file changed, 1215 insertions(+), 5728 deletions(-) diff --git a/configure b/configure index 9bf2873c5b9d..352fdbd28afc 100755 --- a/configure +++ b/configure @@ -1,10 +1,5 @@ #! /bin/sh -# Read in '.mozconfig' script to set the initial options. -# See the mozconfig2configure script for more details. -_AUTOCONF_TOOLS_DIR=`dirname $0`/./build/autoconf -. $_AUTOCONF_TOOLS_DIR/mozconfig2configure - # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -16,399 +11,8 @@ _AUTOCONF_TOOLS_DIR=`dirname $0`/./build/autoconf ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: -ac_help="$ac_help - --disable-compile-environment - Disable compiler/library checks." -ac_help="$ac_help - --with-macos-sdk=dir Location of platform SDK to use (Mac OS X only)" ac_help="$ac_help --with-x use the X Window System" -ac_help="$ac_help - --with-ft-prefix=PFX Prefix where FreeType is installed (optional)" -ac_help="$ac_help - --with-ft-exec-prefix=PFX - Exec prefix where FreeType is installed (optional)" -ac_help="$ac_help - --disable-freetypetest - Do not try to compile and run a test FreeType program" -ac_help="$ac_help - --with-pthreads Force use of system pthread library with NSPR " -ac_help="$ac_help - --enable-macos-target=VER (default=10.2/ppc, 10.4/x86) - Set the minimum MacOS version needed at runtime" -ac_help="$ac_help - --with-system-nspr Use system installed NSPR" -ac_help="$ac_help - --with-nspr-prefix=PFX Prefix where NSPR is installed" -ac_help="$ac_help - --with-nspr-exec-prefix=PFX - Exec prefix where NSPR is installed" -ac_help="$ac_help - --with-system-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-canvas Enable html:canvas feature" -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-default-toolkit=TK - Select default toolkit - Platform specific defaults: - BeOS - beos - Mac OS X - mac (carbon) - Neutrino/QNX - photon - OS/2 - os2 - Win32 - windows - * - gtk" -ac_help="$ac_help - --with-gtk-prefix=PFX Prefix where GTK is installed (optional)" -ac_help="$ac_help - --with-gtk-exec-prefix=PFX - Exec prefix where GTK is installed (optional)" -ac_help="$ac_help - --disable-gtktest Do not try to compile and run a test GTK program" -ac_help="$ac_help - --with-qtdir=\$dir Specify Qt directory " -ac_help="$ac_help - --enable-application=APP - Options include: - suite - browser (Firefox) - mail (Thunderbird) - minimo - composer - calendar - xulrunner - macbrowser (Camino) - content/xslt (Standalone Transformiix XSLT) - standalone (use this for standalone - xpcom/xpconnect or to manually drive a build)" -ac_help="$ac_help - --enable-ui-locale=ab-CD - Select the user interface locale (default: en-US)" -ac_help="$ac_help - --enable-calendar Enable building of the calendar client" -ac_help="$ac_help - --disable-mailnews Disable building of mail & news components" -ac_help="$ac_help - --enable-static-mail Enable static mail build support" -ac_help="$ac_help - --disable-ldap Disable LDAP support" -ac_help="$ac_help - --enable-official-branding Enable Official mozilla.org Branding - Do not distribute builds with - --enable-official-branding unless you have - permission to use trademarks per - http://www.mozilla.org/foundation/trademarks/ ." -ac_help="$ac_help - --enable-branding Enable branding from the specified directory." -ac_help="$ac_help - --with-distribution-id=ID Set distribution-specific id (default=org.mozilla)" -ac_help="$ac_help - --disable-freetype2 Disable FreeType2 support " -ac_help="$ac_help - --disable-xft Disable Xft support " -ac_help="$ac_help - --enable-pango Enable Pango font rendering support" -ac_help="$ac_help - --disable-postscript Disable PostScript printing support " -ac_help="$ac_help - --disable-xprint Disable Xprint printing support " -ac_help="$ac_help - --disable-gnomevfs Disable GnomeVFS support " -ac_help="$ac_help - --disable-gnomeui Disable libgnomeui support (default: auto, optional at runtime) " -ac_help="$ac_help - --disable-crypto Disable crypto support (Personal Security Manager)" -ac_help="$ac_help - --disable-jsd Disable JavaScript debug library" -ac_help="$ac_help - --disable-plugins Disable plugins support" -ac_help="$ac_help - --disable-oji Disable Open JVM Integration support" -ac_help="$ac_help - --enable-xinerama Enable Xinerama support - ( not safe for Red Hat 7.0 ) " -ac_help="$ac_help - --enable-ctl Enable Thai Complex Script support" -ac_help="$ac_help - --disable-view-source Disable view source support" -ac_help="$ac_help - --disable-accessibility Disable accessibility support" -ac_help="$ac_help - --disable-xpfe-components - Disable xpfe components" -ac_help="$ac_help - --disable-xpinstall Disable xpinstall support" -ac_help="$ac_help - --enable-single-profile Enable single profile support " -ac_help="$ac_help - --disable-jsloader Disable xpcom js loader support" -ac_help="$ac_help - --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-negotiateauth Disable GSS-API negotiation " -ac_help="$ac_help - --disable-xtf Disable XTF (pluggable xml tags) support" -ac_help="$ac_help - --disable-xmlextras Disable XMLExtras such as XMLHttpRequest " -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 - --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 - --enable-svg Enable SVG support" -ac_help="$ac_help - --enable-svg-renderer={gdiplus,libart,cairo}" -ac_help="$ac_help - --disable-installer Disable building of installer" -ac_help="$ac_help - --disable-updater Disable building of updater" -ac_help="$ac_help - --enable-update-channel=CHANNEL - Select application update channel (default=default)" -ac_help="$ac_help - --enable-update-packaging - Enable tools/update-packaging" -ac_help="$ac_help - --disable-activex Disable building of ActiveX control (win32 only)" -ac_help="$ac_help - --disable-activex-scripting - Disable building of ActiveX scripting support (win32)" -ac_help="$ac_help - --enable-leaky Build leaky memory tool" -ac_help="$ac_help - --enable-xpctools Build JS profiling tool" -ac_help="$ac_help - --disable-tests Do not build test libraries & programs" -ac_help="$ac_help - --enable-xpcom-lea Use Lea malloc in xpcom " -ac_help="$ac_help - --enable-places Enable 'places' bookmark/history implementation" -ac_help="$ac_help - --enable-storage Enable mozStorage module and related components" -ac_help="$ac_help - --enable-js-ultrasparc Use UltraSPARC optimizations in JS" -ac_help="$ac_help - --enable-debug[=DBG] Enable building with developer debug info - (Using compiler flags DBG)" -ac_help="$ac_help - --disable-optimize Disable compiler optimization - --enable-optimize=[OPT] Specify compiler optimization flags [OPT=-O]" -ac_help="$ac_help - --enable-debug-modules Enable/disable debug info for specific modules" -ac_help="$ac_help - --enable-debugger-info-modules - Enable/disable debugger info for specific modules" -ac_help="$ac_help - --enable-boehm Enable the Boehm Garbage Collector" -ac_help="$ac_help - --disable-logging Disable logging facilities" -ac_help="$ac_help - --enable-crash-on-assert - Make NS_ASSERTION crash on Unix" -ac_help="$ac_help - --enable-reorder Enable function reordering (requires GNU ld) " -ac_help="$ac_help - --enable-logrefcnt Enable logging of refcounts (default=debug) " -ac_help="$ac_help - --enable-detect-webshell-leaks - Enable detection of webshell leaks - (default=debug)" -ac_help="$ac_help - --enable-wrap-malloc Wrap malloc calls (gnu linker only)" -ac_help="$ac_help - --with-wrap-malloc=DIR Location of malloc wrapper library" -ac_help="$ac_help - --enable-efence Link with Electric Fence" -ac_help="$ac_help - --enable-jprof Enable jprof profiling tool (needs mozilla/tools/jprof)" -ac_help="$ac_help - --enable-strip Enable stripping of libs & executables " -ac_help="$ac_help - --enable-elf-dynstr-gc Enable elf dynstr garbage collector (opt builds only)" -ac_help="$ac_help - --enable-old-abi-compat-wrappers - Support old GCC ABI symbols to ease the pain - of the linux compiler change" -ac_help="$ac_help - --enable-prebinding Enable prebinding (Mac OS X only)" -ac_help="$ac_help - --enable-timeline Enable timeline services " -ac_help="$ac_help - --enable-reflow-perf Enable reflow performance tracing" -ac_help="$ac_help - --enable-perf-metrics Enable performance metrics" -ac_help="$ac_help - --enable-codesighs Enable code size analysis tools" -ac_help="$ac_help - --enable-trace-malloc Enable malloc tracing" -ac_help="$ac_help - --enable-eazel-profiler-support - Enable Corel/Eazel profiler support" -ac_help="$ac_help - --enable-profile-modules - Enable/disable profiling for specific modules" -ac_help="$ac_help - --enable-insure Enable insure++ instrumentation (linux only)" -ac_help="$ac_help - --with-insure-dirs=DIRS - Dirs to instrument with insure " -ac_help="$ac_help - --with-insure-exclude-dirs=DIRS - Dirs to not instrument with insure " -ac_help="$ac_help - --enable-quantify Enable Quantify support (Windows only) " -ac_help="$ac_help - --enable-xterm-updates Update XTERM titles with current command." -ac_help="$ac_help - --enable-chrome-format=jar|flat|both|symlink - Select FORMAT of chrome files (default=jar)" -ac_help="$ac_help - --with-default-mozilla-five-home - Set the default value for MOZILLA_FIVE_HOME" -ac_help="$ac_help - --with-user-appdir=DIR Set user-specific appdir (default=.mozilla)" -ac_help="$ac_help - --with-doc-input-dirs=DIRS - Header/idl dirs to create docs from" -ac_help="$ac_help - --with-doc-include-dirs=DIRS - Include dirs to preprocess doc headers" -ac_help="$ac_help - --with-doc-output-dir=DIR - Dir to generate docs into" -ac_help="$ac_help - --enable-long-long-warning - Warn about use of non-ANSI long long type" -ac_help="$ac_help - --disable-pedantic Issue all warnings demanded by strict ANSI C " -ac_help="$ac_help - --enable-cpp-rtti Enable C++ RTTI " -ac_help="$ac_help - --enable-cpp-exceptions Enable C++ exceptions " -ac_help="$ac_help - --disable-auto-deps Do not automatically generate dependency info" -ac_help="$ac_help - --disable-md Do not use compiler-based dependencies " -ac_help="$ac_help - --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 - --enable-standalone-modules=mod1[,mod2] - Enable standalone build of specific modules" -ac_help="$ac_help - --without-libIDL Skip check for libIDL (standalone modules only)" -ac_help="$ac_help - --with-libIDL-prefix=PFX - Prefix where libIDL is installed (optional)" -ac_help="$ac_help - --with-libIDL-exec-prefix=PFX - Exec prefix where libIDL is installed (optional)" -ac_help="$ac_help - --disable-libIDLtest Do not try to compile and run a test libIDL program" -ac_help="$ac_help - --with-glib-prefix=PFX Prefix where GLIB is installed (optional)" -ac_help="$ac_help - --with-glib-exec-prefix=PFX - Exec prefix where GLIB is installed (optional)" -ac_help="$ac_help - --disable-glibtest Do not try to compile and run a test GLIB program" -ac_help="$ac_help - --with-libIDL-prefix=PFX - Prefix where libIDL is installed (optional)" -ac_help="$ac_help - --with-libIDL-exec-prefix=PFX - Exec prefix where libIDL is installed (optional)" -ac_help="$ac_help - --disable-libIDLtest Do not try to compile and run a test libIDL program" -ac_help="$ac_help - --with-glib-prefix=PFX Prefix where GLIB is installed (optional)" -ac_help="$ac_help - --with-glib-exec-prefix=PFX - Exec prefix where GLIB is installed (optional)" -ac_help="$ac_help - --disable-glibtest Do not try to compile and run a test GLIB program" -ac_help="$ac_help - --with-glib-prefix=PFX Prefix where GLIB is installed (optional)" -ac_help="$ac_help - --with-glib-exec-prefix=PFX - Exec prefix where GLIB is installed (optional)" -ac_help="$ac_help - --disable-glibtest Do not try to compile and run a test GLIB program" -ac_help="$ac_help - --enable-system-cairo Use system cairo (located with pkgconfig)" -ac_help="$ac_help - --disable-xul Disable XUL" -ac_help="$ac_help - --disable-profilesharing Disable profile sharing" -ac_help="$ac_help - --disable-profilelocking Disable profile locking" -ac_help="$ac_help - --enable-necko-protocols[={http,ftp,default,all,none}] - Enable/disable specific protocol handlers" -ac_help="$ac_help - --disable-necko-disk-cache - Disable necko disk cache" -ac_help="$ac_help - --enable-necko-small-buffers - Minimize size of necko's i/o buffers" -ac_help="$ac_help - --disable-cookies Disable cookie support" -ac_help="$ac_help - --disable-v1-string-abi Disable binary compatibility layer for strings" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -966,7 +570,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:970: checking host system type" >&5 +echo "configure:574: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -987,7 +591,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:991: checking target system type" >&5 +echo "configure:595: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1005,7 +609,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:1009: checking build system type" >&5 +echo "configure:613: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1081,7 +685,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:1085: checking for $ac_word" >&5 +echo "configure:689: 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 @@ -1161,25 +765,18 @@ esac fi COMPILE_ENVIRONMENT=1 -# 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 - +MOZ_ARG_ENABLE_BOOL(compile-environment, + --disable-compile-environment + Disable compiler/library checks., + COMPILE_ENVIRONMENT=1, + COMPILE_ENVIRONMENT= ) 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:1183: checking for $ac_word" >&5 +echo "configure:780: 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 @@ -1252,13 +849,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:1256: checking for host c compiler" >&5 +echo "configure:853: 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:1262: checking for $ac_word" >&5 +echo "configure:859: 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 @@ -1293,13 +890,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:1297: checking for host c++ compiler" >&5 +echo "configure:894: 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:1303: checking for $ac_word" >&5 +echo "configure:900: 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 @@ -1348,7 +945,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:1352: checking for $ac_word" >&5 +echo "configure:949: 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 @@ -1383,7 +980,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:1387: checking for $ac_word" >&5 +echo "configure:984: 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 @@ -1418,16 +1015,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:1422: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1019: 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:1028: \"$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 @@ -1442,16 +1039,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:1446: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1043: 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:1052: \"$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 @@ -1471,7 +1068,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:1475: checking for $ac_word" >&5 +echo "configure:1072: 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 @@ -1505,7 +1102,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:1509: checking for $ac_word" >&5 +echo "configure:1106: 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 @@ -1535,7 +1132,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:1539: checking for $ac_word" >&5 +echo "configure:1136: 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 @@ -1586,7 +1183,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:1590: checking for $ac_word" >&5 +echo "configure:1187: 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 @@ -1618,7 +1215,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1622: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1219: 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. @@ -1629,12 +1226,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1633 "configure" +#line 1230 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1235: \"$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 @@ -1660,12 +1257,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:1664: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1261: 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:1669: checking whether we are using GNU C" >&5 +echo "configure:1266: 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 @@ -1674,7 +1271,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1678: \"$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:1275: \"$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 @@ -1693,7 +1290,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:1697: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1294: 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 @@ -1729,7 +1326,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:1733: checking for $ac_word" >&5 +echo "configure:1330: 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 @@ -1765,7 +1362,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:1769: checking for $ac_word" >&5 +echo "configure:1366: 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 @@ -1797,7 +1394,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1801: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1398: 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. @@ -1808,12 +1405,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1812 "configure" +#line 1409 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1414: \"$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 @@ -1839,12 +1436,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:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1440: 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:1848: checking whether we are using GNU C++" >&5 +echo "configure:1445: 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 @@ -1853,7 +1450,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1857: \"$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:1454: \"$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 @@ -1872,7 +1469,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:1876: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1473: 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 @@ -1913,7 +1510,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext < $ac_declaration @@ -1921,7 +1518,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:1925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1931,14 +1528,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -1959,7 +1556,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1963: checking for $ac_word" >&5 +echo "configure:1560: 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 @@ -1994,7 +1591,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:1998: checking for $ac_word" >&5 +echo "configure:1595: 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 @@ -2029,7 +1626,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:2033: checking for $ac_word" >&5 +echo "configure:1630: 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 @@ -2070,7 +1667,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:2074: checking for $ac_word" >&5 +echo "configure:1671: 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 @@ -2105,7 +1702,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:2109: checking for $ac_word" >&5 +echo "configure:1706: 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 @@ -2140,7 +1737,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:2144: checking for $ac_word" >&5 +echo "configure:1741: 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 @@ -2178,7 +1775,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:2182: checking for $ac_word" >&5 +echo "configure:1779: 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 @@ -2208,7 +1805,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:2212: checking for $ac_word" >&5 +echo "configure:1809: 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 @@ -2259,7 +1856,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:2263: checking for $ac_word" >&5 +echo "configure:1860: 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 @@ -2291,7 +1888,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2295: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1892: 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. @@ -2302,12 +1899,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2306 "configure" +#line 1903 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1908: \"$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 @@ -2333,12 +1930,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:2337: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1934: 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:2342: checking whether we are using GNU C" >&5 +echo "configure:1939: 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 @@ -2347,7 +1944,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2351: \"$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:1948: \"$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 @@ -2366,7 +1963,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:2370: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1967: 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 @@ -2402,7 +1999,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:2406: checking for $ac_word" >&5 +echo "configure:2003: 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 @@ -2434,7 +2031,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2438: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2035: 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. @@ -2445,12 +2042,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2449 "configure" +#line 2046 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2051: \"$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 @@ -2476,12 +2073,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:2480: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2077: 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:2485: checking whether we are using GNU C++" >&5 +echo "configure:2082: 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 @@ -2490,7 +2087,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2494: \"$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:2091: \"$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 @@ -2509,7 +2106,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:2513: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2110: 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 @@ -2550,7 +2147,7 @@ for ac_declaration in \ 'void exit (int);' do cat > conftest.$ac_ext < $ac_declaration @@ -2558,7 +2155,7 @@ int main() { exit (42); ; return 0; } EOF -if { (eval echo configure:2562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2568,14 +2165,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* break else @@ -2594,7 +2191,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:2598: checking for $ac_word" >&5 +echo "configure:2195: 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 @@ -2626,7 +2223,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:2630: checking for $ac_word" >&5 +echo "configure:2227: 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 @@ -2667,7 +2264,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:2671: checking for $ac_word" >&5 +echo "configure:2268: 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 @@ -2702,7 +2299,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:2706: checking for $ac_word" >&5 +echo "configure:2303: 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 @@ -2737,7 +2334,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:2741: checking for $ac_word" >&5 +echo "configure:2338: 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 @@ -2772,7 +2369,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:2776: checking for $ac_word" >&5 +echo "configure:2373: 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 @@ -2861,7 +2458,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:2865: checking for $ac_word" >&5 +echo "configure:2462: 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 @@ -2903,14 +2500,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:2914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2928,14 +2525,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:2939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2993,7 +2590,7 @@ cross_compiling=$ac_cv_prog_cc_cross _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` # Add flags if necessary echo $ac_n "checking for midl flags""... $ac_c" 1>&6 -echo "configure:2997: checking for midl flags" >&5 +echo "configure:2594: 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 @@ -3015,9 +2612,9 @@ echo "configure:2997: 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:3019: checking for w32api version >= $W32API_VERSION" >&5 +echo "configure:2616: checking for w32api version >= $W32API_VERSION" >&5 cat > conftest.$ac_ext < int main() { @@ -3029,7 +2626,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* res=yes else @@ -3045,7 +2642,7 @@ rm -f conftest* fi # Check windres version echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 -echo "configure:3049: checking for windres version >= $WINDRES_VERSION" >&5 +echo "configure:2646: 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 }'` @@ -3072,7 +2669,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:3076: checking how to run the C preprocessor" >&5 +echo "configure:2673: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3087,13 +2684,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:3097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2694: \"$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,13 +2701,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:3114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2711: \"$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 : @@ -3121,13 +2718,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:3131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2728: \"$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 : @@ -3155,17 +2752,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:3159: checking for $ac_hdr" >&5 +echo "configure:2756: 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:3169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2766: \"$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* @@ -3196,10 +2793,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:3200: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:2797: 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:3203: checking whether cc understands -c and -o together" >&5 +echo "configure:2800: 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]/_/'`" @@ -3211,16 +2808,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:3215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:3216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:2812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2813: \"$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:3221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2818: \"$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:3223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:3224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:2820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:2821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -3256,7 +2853,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3260: checking how to run the C preprocessor" >&5 +echo "configure:2857: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3271,13 +2868,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:3281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2878: \"$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 : @@ -3288,13 +2885,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:3298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2895: \"$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 : @@ -3305,13 +2902,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:3315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2912: \"$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 : @@ -3336,7 +2933,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:3340: checking how to run the C++ preprocessor" >&5 +echo "configure:2937: 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 @@ -3349,12 +2946,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:3358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2955: \"$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 : @@ -3401,7 +2998,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:3405: checking for a BSD compatible install" >&5 +echo "configure:3002: 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 @@ -3454,7 +3051,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:3458: checking whether ln -s works" >&5 +echo "configure:3055: 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 @@ -3479,7 +3076,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:3483: checking for $ac_word" >&5 +echo "configure:3080: 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 @@ -3519,7 +3116,7 @@ if test -z "$PERL" || test "$PERL" = ":"; then fi echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 -echo "configure:3523: checking for minimum required perl version >= $PERL_VERSION" >&5 +echo "configure:3120: 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 @@ -3529,7 +3126,7 @@ if test "$_perl_res" != 0; then fi echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 -echo "configure:3533: checking for full perl installation" >&5 +echo "configure:3130: 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 @@ -3542,7 +3139,7 @@ fi # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3546: checking for $ac_word" >&5 +echo "configure:3143: 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 @@ -3578,7 +3175,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:3582: checking for $ac_word" >&5 +echo "configure:3179: 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 @@ -3614,7 +3211,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:3618: checking for $ac_word" >&5 +echo "configure:3215: 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 @@ -3650,7 +3247,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:3654: checking for $ac_word" >&5 +echo "configure:3251: 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 @@ -3688,7 +3285,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:3692: checking for $ac_word" >&5 +echo "configure:3289: 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 @@ -3729,7 +3326,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:3733: checking for $ac_word" >&5 +echo "configure:3330: 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 @@ -3764,7 +3361,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:3768: checking for $ac_word" >&5 +echo "configure:3365: 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 @@ -3827,7 +3424,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:3831: checking for $ac_word" >&5 +echo "configure:3428: 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 @@ -3877,7 +3474,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:3881: checking for $ac_word" >&5 +echo "configure:3478: 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 @@ -3919,12 +3516,9 @@ esac MACOS_SDK_DIR= NEXT_ROOT= -# Check whether --with-macos-sdk or --without-macos-sdk was given. -if test "${with_macos_sdk+set}" = set; then - withval="$with_macos_sdk" - MACOS_SDK_DIR=$withval -fi - +MOZ_ARG_WITH_STRING(macos-sdk, + --with-macos-sdk=dir Location of platform SDK to use (Mac OS X only), + MACOS_SDK_DIR=$withval) @@ -3966,7 +3560,7 @@ tools are selected during the Xcode/Developer Tools installation." 1>&2; exit 1; fi echo $ac_n "checking for valid compiler/Mac OS X SDK combination""... $ac_c" 1>&6 -echo "configure:3970: checking for valid compiler/Mac OS X SDK combination" >&5 +echo "configure:3564: 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' @@ -3978,12 +3572,12 @@ cross_compiling=$ac_cv_prog_cxx_cross result=maybe else cat > conftest.$ac_ext < int main() { return 0; } EOF -if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result=yes else @@ -4012,7 +3606,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:4016: checking for $ac_word" >&5 +echo "configure:3610: 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 @@ -4055,7 +3649,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:4059: checking for $ac_word" >&5 +echo "configure:3653: 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 @@ -4123,7 +3717,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:4127: checking for X" >&5 +echo "configure:3721: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -4185,12 +3779,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:4194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3788: \"$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* @@ -4259,14 +3853,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:3864: \"$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. @@ -4372,17 +3966,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:4376: checking whether -R must be followed by a space" >&5 +echo "configure:3970: 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:3980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -4398,14 +3992,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:4003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -4437,7 +4031,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:4441: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4035: 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 @@ -4445,7 +4039,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:4057: \"$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 @@ -4481,7 +4075,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:4485: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4079: 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 @@ -4489,7 +4083,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:4101: \"$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 @@ -4532,12 +4126,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:4536: checking for gethostbyname" >&5 +echo "configure:4130: 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:4161: \"$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 @@ -4584,7 +4178,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4588: checking for gethostbyname in -lnsl" >&5 +echo "configure:4182: 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 @@ -4592,7 +4186,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:4204: \"$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 @@ -4636,12 +4230,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:4640: checking for connect" >&5 +echo "configure:4234: 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:4265: \"$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 @@ -4688,7 +4282,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4692: checking for connect in -lsocket" >&5 +echo "configure:4286: 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 @@ -4696,7 +4290,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:4308: \"$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 @@ -4734,12 +4328,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:4738: checking for remove" >&5 +echo "configure:4332: 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:4363: \"$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 @@ -4786,7 +4380,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4790: checking for remove in -lposix" >&5 +echo "configure:4384: 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 @@ -4794,7 +4388,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:4406: \"$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 @@ -4832,12 +4426,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4836: checking for shmat" >&5 +echo "configure:4430: 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:4461: \"$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 @@ -4884,7 +4478,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4888: checking for shmat in -lipc" >&5 +echo "configure:4482: 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 @@ -4892,7 +4486,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:4504: \"$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 @@ -4939,7 +4533,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:4943: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4537: 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 @@ -4947,7 +4541,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:4559: \"$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 @@ -5375,7 +4969,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:5379: checking whether ld has archive extraction flags" >&5 +echo "configure:4973: 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 @@ -5392,14 +4986,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:4997: \"$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 @@ -5434,17 +5028,17 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 -echo "configure:5438: checking for 64-bit OS" >&5 +echo "configure:5032: checking for 64-bit OS" >&5 if test "$cross_compiling" = yes; then result="maybe" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -5597,9 +5191,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:5601: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 +echo "configure:5195: 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:5206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -5645,17 +5239,17 @@ cross_compiling=$ac_cv_prog_cxx_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5649: checking for $ac_hdr" >&5 +echo "configure:5243: 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:5659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5253: \"$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* @@ -5697,7 +5291,7 @@ EOF LIBS="$LIBS -lbe" if test "$COMPILE_ENVIRONMENT"; then echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 -echo "configure:5701: checking for main in -lbind" >&5 +echo "configure:5295: 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 @@ -5705,14 +5299,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:5310: \"$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 @@ -5733,7 +5327,7 @@ else fi echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 -echo "configure:5737: checking for main in -lzeta" >&5 +echo "configure:5331: 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 @@ -5741,14 +5335,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:5346: \"$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 @@ -5811,18 +5405,18 @@ fi MACOSX=1 echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 -echo "configure:5815: checking for -dead_strip option to ld" >&5 +echo "configure:5409: 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:5420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* _HAVE_DEAD_STRIP=1 else @@ -6683,7 +6277,7 @@ EOF CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 -echo "configure:6687: checking for Forte compiler version >= WS6U2" >&5 +echo "configure:6281: 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. @@ -6693,7 +6287,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:6300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -6831,7 +6425,7 @@ case "$target" in ;; *-darwin*) echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 -echo "configure:6835: checking for -exported_symbols_list option to ld" >&5 +echo "configure:6429: 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 @@ -6871,12 +6465,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:6875: checking for ANSI C header files" >&5 +echo "configure:6469: 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 @@ -6884,7 +6478,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6482: \"$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* @@ -6901,7 +6495,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 @@ -6919,7 +6513,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 @@ -6940,7 +6534,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6951,7 +6545,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:6955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6975,12 +6569,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6979: checking for working const" >&5 +echo "configure:6573: 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:6627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -7050,12 +6644,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:7054: checking for mode_t" >&5 +echo "configure:6648: 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 @@ -7083,12 +6677,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:7087: checking for off_t" >&5 +echo "configure:6681: 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 @@ -7116,12 +6710,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:7120: checking for pid_t" >&5 +echo "configure:6714: 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 @@ -7149,12 +6743,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:7153: checking for size_t" >&5 +echo "configure:6747: 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 @@ -7182,12 +6776,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:7186: checking for uid_t in sys/types.h" >&5 +echo "configure:6780: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -7216,12 +6810,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:7220: checking for st_blksize in struct stat" >&5 +echo "configure:6814: 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 @@ -7229,7 +6823,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:7233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -7250,12 +6844,12 @@ EOF fi echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 -echo "configure:7254: checking for siginfo_t" >&5 +echo "configure:6848: 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 < @@ -7263,7 +6857,7 @@ int main() { siginfo_t* info; ; return 0; } EOF -if { (eval echo configure:7267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_siginfo_t=true else @@ -7297,12 +6891,12 @@ EOF fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:7301: checking for int16_t" >&5 +echo "configure:6895: 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 @@ -7310,7 +6904,7 @@ int main() { int16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int16_t=true else @@ -7332,12 +6926,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:7336: checking for int32_t" >&5 +echo "configure:6930: 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 @@ -7345,7 +6939,7 @@ int main() { int32_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int32_t=true else @@ -7367,12 +6961,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:7371: checking for int64_t" >&5 +echo "configure:6965: 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 @@ -7380,7 +6974,7 @@ int main() { int64_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64_t=true else @@ -7402,12 +6996,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64""... $ac_c" 1>&6 -echo "configure:7406: checking for int64" >&5 +echo "configure:7000: 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 @@ -7415,7 +7009,7 @@ int main() { int64 foo = 0; ; return 0; } EOF -if { (eval echo configure:7419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64=true else @@ -7437,12 +7031,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:7441: checking for uint" >&5 +echo "configure:7035: 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 @@ -7450,7 +7044,7 @@ int main() { uint foo = 0; ; return 0; } EOF -if { (eval echo configure:7454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint=true else @@ -7472,12 +7066,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 -echo "configure:7476: checking for uint_t" >&5 +echo "configure:7070: 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 @@ -7485,7 +7079,7 @@ int main() { uint_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint_t=true else @@ -7507,12 +7101,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:7511: checking for uint16_t" >&5 +echo "configure:7105: 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 @@ -7520,7 +7114,7 @@ int main() { uint16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint16_t=true else @@ -7551,12 +7145,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 -echo "configure:7555: checking for uname.domainname" >&5 +echo "configure:7149: 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() { @@ -7564,7 +7158,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->domainname; } ; return 0; } EOF -if { (eval echo configure:7568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_domainname_field=true else @@ -7588,12 +7182,12 @@ else fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 -echo "configure:7592: checking for uname.__domainname" >&5 +echo "configure:7186: 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() { @@ -7601,7 +7195,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->__domainname; } ; return 0; } EOF -if { (eval echo configure:7605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_us_domainname_field=true else @@ -7634,7 +7228,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 -echo "configure:7638: checking for usable wchar_t (2 bytes, unsigned)" >&5 +echo "configure:7232: checking for usable wchar_t (2 bytes, unsigned)" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7642,14 +7236,14 @@ else ac_cv_have_usable_wchar="maybe" else cat > conftest.$ac_ext < int main () { return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ; } EOF -if { (eval echo configure:7653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_have_usable_wchar="yes" else @@ -7684,7 +7278,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGS -fshort-wchar" echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 -echo "configure:7688: checking for compiler -fshort-wchar option" >&5 +echo "configure:7282: checking for compiler -fshort-wchar option" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7692,14 +7286,14 @@ else ac_cv_have_usable_wchar_option="maybe" else cat > conftest.$ac_ext < int main () { return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ; } EOF -if { (eval echo configure:7703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_have_usable_wchar_option="yes" else @@ -7735,7 +7329,7 @@ fi if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 -echo "configure:7739: checking for visibility(hidden) attribute" >&5 +echo "configure:7333: 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 @@ -7760,7 +7354,7 @@ EOF echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 -echo "configure:7764: checking for visibility(default) attribute" >&5 +echo "configure:7358: 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 @@ -7785,7 +7379,7 @@ EOF echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 -echo "configure:7789: checking for visibility pragma support" >&5 +echo "configure:7383: 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 @@ -7810,7 +7404,7 @@ fi echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 if test "$ac_cv_visibility_pragma" = "yes"; then echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 -echo "configure:7814: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 +echo "configure:7408: 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 @@ -7853,12 +7447,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:7857: checking for $ac_hdr that defines DIR" >&5 +echo "configure:7451: 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> @@ -7866,7 +7460,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:7870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -7891,7 +7485,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:7895: checking for opendir in -ldir" >&5 +echo "configure:7489: 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 @@ -7899,7 +7493,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:7508: \"$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 @@ -7932,7 +7526,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:7936: checking for opendir in -lx" >&5 +echo "configure:7530: 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 @@ -7940,7 +7534,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:7549: \"$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 @@ -7983,17 +7577,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:7987: checking for $ac_hdr" >&5 +echo "configure:7581: 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:7997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7591: \"$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* @@ -8023,17 +7617,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:8027: checking for $ac_hdr" >&5 +echo "configure:7621: 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:8037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7631: \"$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* @@ -8063,17 +7657,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:8067: checking for $ac_hdr" >&5 +echo "configure:7661: 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:8077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7671: \"$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* @@ -8103,17 +7697,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:8107: checking for $ac_hdr" >&5 +echo "configure:7701: 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:8117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7711: \"$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* @@ -8143,17 +7737,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:8147: checking for $ac_hdr" >&5 +echo "configure:7741: 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:8157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7751: \"$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* @@ -8184,17 +7778,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:8188: checking for $ac_hdr" >&5 +echo "configure:7782: 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:8198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7792: \"$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* @@ -8225,17 +7819,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:8229: checking for $ac_hdr" >&5 +echo "configure:7823: 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:8239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7833: \"$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* @@ -8272,17 +7866,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:8276: checking for new" >&5 +echo "configure:7870: 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:8286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7880: \"$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* @@ -8323,17 +7917,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:8327: checking for $ac_hdr" >&5 +echo "configure:7921: 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:8337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7931: \"$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* @@ -8367,7 +7961,7 @@ case $target in ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:8371: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:7965: 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 @@ -8375,7 +7969,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:7984: \"$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 @@ -8423,7 +8017,7 @@ case $target in ;; *) echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 -echo "configure:8427: checking for atan in -lm" >&5 +echo "configure:8021: 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 @@ -8431,7 +8025,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:8040: \"$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 @@ -8470,7 +8064,7 @@ else fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:8474: checking for dlopen in -ldl" >&5 +echo "configure:8068: 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 @@ -8478,7 +8072,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:8087: \"$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 @@ -8506,17 +8100,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:8510: checking for dlfcn.h" >&5 +echo "configure:8104: 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:8520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8114: \"$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* @@ -8552,7 +8146,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:8556: checking for demangle in -lC_r" >&5 +echo "configure:8150: 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 @@ -8560,7 +8154,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:8169: \"$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 @@ -8601,7 +8195,7 @@ fi ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:8605: checking for demangle in -lC" >&5 +echo "configure:8199: 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 @@ -8609,7 +8203,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:8218: \"$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 @@ -8651,7 +8245,7 @@ fi esac fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:8655: checking for socket in -lsocket" >&5 +echo "configure:8249: 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 @@ -8659,7 +8253,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:8268: \"$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 @@ -8715,7 +8309,7 @@ EOF _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:8719: checking for XDrawLines in -lX11" >&5 +echo "configure:8313: 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 @@ -8723,7 +8317,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:8332: \"$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 @@ -8756,7 +8350,7 @@ MISSING_X="$MISSING_X -lX11" fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:8760: checking for XextAddDisplay in -lXext" >&5 +echo "configure:8354: 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 @@ -8764,7 +8358,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:8373: \"$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 @@ -8799,7 +8393,7 @@ fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:8803: checking for XtFree in -lXt" >&5 +echo "configure:8397: 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 @@ -8807,7 +8401,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:8416: \"$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 @@ -8839,7 +8433,7 @@ else unset ac_cv_lib_Xt_XtFree echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:8843: checking for IceFlush in -lICE" >&5 +echo "configure:8437: 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 @@ -8847,7 +8441,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:8456: \"$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 @@ -8879,7 +8473,7 @@ else fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:8883: checking for SmcCloseConnection in -lSM" >&5 +echo "configure:8477: 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 @@ -8887,7 +8481,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:8496: \"$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 @@ -8919,7 +8513,7 @@ else fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:8923: checking for XtFree in -lXt" >&5 +echo "configure:8517: 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 @@ -8927,7 +8521,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:8536: \"$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 @@ -8972,7 +8566,7 @@ fi esac echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 -echo "configure:8976: checking for XineramaIsActive in -lXinerama" >&5 +echo "configure:8570: 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 @@ -8980,7 +8574,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:8589: \"$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 @@ -9013,17 +8607,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:9017: checking for X11/extensions/Xinerama.h" >&5 +echo "configure:8611: 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:9027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8621: \"$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* @@ -9046,7 +8640,7 @@ fi echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 -echo "configure:9050: checking for XShmCreateImage in -lXext" >&5 +echo "configure:8644: 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 @@ -9054,7 +8648,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:8663: \"$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 @@ -9087,17 +8681,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:9091: checking for X11/extensions/XShm.h" >&5 +echo "configure:8685: 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:9101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8695: \"$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* @@ -9127,7 +8721,7 @@ EOF fi echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 -echo "configure:9131: checking for XieFloGeometry in -lXIE" >&5 +echo "configure:8725: 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 @@ -9135,7 +8729,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:8744: \"$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 @@ -9168,17 +8762,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:9172: checking for X11/extensions/XIElib.h" >&5 +echo "configure:8766: 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:9182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8776: \"$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* @@ -9212,198 +8806,7 @@ fi LDFLAGS="$_SAVE_LDFLAGS" - # Check whether --with-freetype-prefix or --without-freetype-prefix was given. -if test "${with_freetype_prefix+set}" = set; then - withval="$with_freetype_prefix" - ft_config_prefix="$withval" -else - ft_config_prefix="" -fi - -# Check whether --with-freetype-exec-prefix or --without-freetype-exec-prefix was given. -if test "${with_freetype_exec_prefix+set}" = set; then - withval="$with_freetype_exec_prefix" - ft_config_exec_prefix="$withval" -else - ft_config_exec_prefix="" -fi - -# Check whether --enable-freetypetest or --disable-freetypetest was given. -if test "${enable_freetypetest+set}" = set; then - enableval="$enable_freetypetest" - : -else - enable_fttest=yes -fi - - -if test x$ft_config_exec_prefix != x ; then - ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix" - if test x${FT2_CONFIG+set} != xset ; then - FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config - fi -fi -if test x$ft_config_prefix != x ; then - ft_config_args="$ft_config_args --prefix=$ft_config_prefix" - if test x${FT2_CONFIG+set} != xset ; then - FT2_CONFIG=$ft_config_prefix/bin/freetype-config - fi -fi -# Extract the first word of "freetype-config", so it can be a program name with args. -set dummy freetype-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9256: 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:9292: 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:9366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - no_ft=yes -fi -rm -fr conftest* -fi - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi # test $ft_config_version -lt $ft_min_version - fi # test "x$enable_fttest" = "xyes" -fi # test "$FT2_CONFIG" = "no" -if test "x$ft_config_is_lt" != "xyes" ; then - if test "x$no_ft" = x ; then - echo "$ac_t""yes" 1>&6 - _HAVE_FREETYPE2=1 - else - echo "$ac_t""no" 1>&6 - if test "$FT2_CONFIG" = "no" ; then - echo "*** The freetype-config script installed by FreeType 2 could not be found." - echo "*** If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the FT2_CONFIG environment variable to the" - echo "*** full path to freetype-config." - else - echo "*** The FreeType test program failed to run. If your system uses" - echo "*** shared libraries and they are installed outside the normal" - echo "*** system library path, make sure the variable LD_LIBRARY_PATH" - echo "*** (or whatever is appropiate for your system) is correctly set." - fi - FT2_CFLAGS="" - FT2_LIBS="" - _HAVE_FREETYPE2= - fi - - -fi - + AC_CHECK_FT2(6.1.0, _HAVE_FREETYPE2=1, _HAVE_FREETYPE2=) fi # $no_x @@ -9417,133 +8820,36 @@ darwin*) USE_PTHREADS=1 ;; *) - -echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:9423: 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:9445: 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:9467: 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:9489: 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 - + 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 + ) + ) + ) + ) ;; esac -# Check whether --with-pthreads or --without-pthreads was given. -if test "${with_pthreads+set}" = set; then - withval="$with_pthreads" - if test "$withval" = "yes"; then - if test "$USE_PTHREADS"x = x; then - { echo "configure: error: --with-pthreads specified for a system without pthread support " 1>&2; exit 1; }; -fi - elif test "$withval" = "no"; then +MOZ_ARG_WITH_BOOL(pthreads, + --with-pthreads Force use of system pthread library with NSPR , + if test "$USE_PTHREADS"x = x; then + AC_MSG_ERROR([ --with-pthreads specified for a system without pthread support ]); +fi, USE_PTHREADS= _PTHREAD_LDFLAGS= - - else - { echo "configure: error: Option, pthreads, does not take an argument ($withval)." 1>&2; exit 1; } - fi -fi - +) if test "$USE_PTHREADS"x != x then rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:9547: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:8853: 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 @@ -9566,7 +8872,7 @@ echo "configure:9547: 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:9570: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:8876: 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 @@ -9661,12 +8967,10 @@ EOF fi -# Check whether --enable-macos-target or --disable-macos-target was given. -if test "${enable_macos_target+set}" = set; then - enableval="$enable_macos_target" - _MACOSX_DEPLOYMENT_TARGET=$enableval -fi - +MOZ_ARG_ENABLE_STRING(macos-target, + --enable-macos-target=VER (default=10.2/ppc, 10.4/x86) + Set the minimum MacOS version needed at runtime, + _MACOSX_DEPLOYMENT_TARGET=$enableval) case "$target" in *-darwin*) @@ -9688,7 +8992,7 @@ esac echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 -echo "configure:9692: checking whether mmap() sees write()s" >&5 +echo "configure:8996: checking whether mmap() sees write()s" >&5 mmap_test_prog=' @@ -9727,11 +9031,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:9039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -9756,13 +9060,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:9760: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:9064: 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 @@ -9780,7 +9084,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -9802,7 +9106,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:9806: checking for 8-bit clean memcmp" >&5 +echo "configure:9110: 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 @@ -9810,7 +9114,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:9128: \"$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 @@ -9840,12 +9144,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:9844: checking for $ac_func" >&5 +echo "configure:9148: 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:9176: \"$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 @@ -9895,12 +9199,12 @@ done for ac_func in flockfile getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9899: checking for $ac_func" >&5 +echo "configure:9203: 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:9231: \"$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 @@ -9952,12 +9256,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:9956: checking for $ac_func" >&5 +echo "configure:9260: 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:9288: \"$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 @@ -10016,19 +9320,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:10020: checking for wcrtomb" >&5 +echo "configure:9324: 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:10032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_wcrtomb="yes" else @@ -10048,19 +9352,19 @@ EOF fi echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 -echo "configure:10052: checking for mbrtowc" >&5 +echo "configure:9356: 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:10064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_mbrtowc="yes" else @@ -10089,12 +9393,12 @@ cross_compiling=$ac_cv_prog_cc_cross fi echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 -echo "configure:10093: checking for res_ninit()" >&5 +echo "configure:9397: 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:9414: \"$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 @@ -10136,12 +9440,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:10140: checking for gnu_get_libc_version()" >&5 +echo "configure:9444: 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:9460: \"$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 @@ -10181,7 +9485,7 @@ case $target_os in *) echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 -echo "configure:10185: checking for iconv in -lc" >&5 +echo "configure:9489: 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 @@ -10189,7 +9493,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:9511: \"$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 @@ -10222,7 +9526,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:10226: checking for iconv in -liconv" >&5 +echo "configure:9530: 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 @@ -10230,7 +9534,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:9552: \"$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 @@ -10263,7 +9567,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:10267: checking for libiconv in -liconv" >&5 +echo "configure:9571: 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 @@ -10271,7 +9575,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:9593: \"$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 @@ -10312,12 +9616,12 @@ fi _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" echo $ac_n "checking for iconv()""... $ac_c" 1>&6 -echo "configure:10316: checking for iconv()" >&5 +echo "configure:9620: 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 < @@ -10331,7 +9635,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_iconv=yes else @@ -10355,12 +9659,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:10359: checking for iconv() with const input" >&5 +echo "configure:9663: 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 < @@ -10375,7 +9679,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_const_iconv=yes else @@ -10402,42 +9706,7 @@ LIBS=$_SAVE_LIBS ;; esac - - echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:10408: 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:10420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_langinfo_codeset=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - am_cv_langinfo_codeset=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 - if test $am_cv_langinfo_codeset = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_LANGINFO_CODESET 1 -EOF - - HAVE_LANGINFO_CODESET=1 - fi - +AM_LANGINFO_CODESET ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -10448,7 +9717,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 -echo "configure:10452: checking for an implementation of va_copy()" >&5 +echo "configure:9721: 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 @@ -10458,7 +9727,7 @@ else else cat > conftest.$ac_ext < @@ -10472,7 +9741,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9745: \"$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 @@ -10489,7 +9758,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:10493: checking for an implementation of __va_copy()" >&5 +echo "configure:9762: 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 @@ -10499,7 +9768,7 @@ else else cat > conftest.$ac_ext < @@ -10513,7 +9782,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9786: \"$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 @@ -10530,7 +9799,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:10534: checking whether va_lists can be copied by value" >&5 +echo "configure:9803: 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 @@ -10540,7 +9809,7 @@ else else cat > conftest.$ac_ext < @@ -10554,7 +9823,7 @@ else } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9827: \"$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 @@ -10653,7 +9922,7 @@ esac if test "$GNU_CXX"; then echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 -echo "configure:10657: checking for C++ exceptions flag" >&5 +echo "configure:9926: 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 @@ -10688,12 +9957,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:10692: checking for gcc 3.0 ABI" >&5 +echo "configure:9961: 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:9979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_three_abi="yes" else @@ -10730,12 +9999,12 @@ fi echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 -echo "configure:10734: checking for C++ \"explicit\" keyword" >&5 +echo "configure:10003: 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:10018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else @@ -10766,12 +10035,12 @@ EOF fi echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 -echo "configure:10770: checking for C++ \"typename\" keyword" >&5 +echo "configure:10039: 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:10794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_typename=yes else @@ -10811,12 +10080,12 @@ EOF fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 -echo "configure:10815: checking for modern C++ template specialization syntax support" >&5 +echo "configure:10084: 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 {}; @@ -10826,7 +10095,7 @@ X int_x; X y_x; ; return 0; } EOF -if { (eval echo configure:10830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else @@ -10848,12 +10117,12 @@ fi echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 -echo "configure:10852: checking whether partial template specialization works" >&5 +echo "configure:10121: 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 {}; @@ -10861,7 +10130,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:10865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_partial_specialization=yes else @@ -10882,12 +10151,12 @@ EOF fi echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 -echo "configure:10886: checking whether operators must be re-defined for templates derived from templates" >&5 +echo "configure:10155: 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 @@ -10899,7 +10168,7 @@ Derived a, b; return 0; ; return 0; } EOF -if { (eval echo configure:10903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_derived_template_operators=no else @@ -10921,12 +10190,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:10925: checking whether we need to cast a derived template to pass as its base class" >&5 +echo "configure:10194: 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 { }; @@ -10935,7 +10204,7 @@ int main() { Derived bar; return foo(bar); ; return 0; } EOF -if { (eval echo configure:10939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_cpp_template_cast_to_base=no else @@ -10956,12 +10225,12 @@ EOF fi echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 -echo "configure:10960: checking whether the compiler can resolve const ambiguities for templates" >&5 +echo "configure:10229: 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 { @@ -10982,7 +10251,7 @@ int main() { a(&i); ; return 0; } EOF -if { (eval echo configure:10986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_can_resolve_const_ambiguity=yes else @@ -11004,12 +10273,12 @@ fi echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 -echo "configure:11008: checking whether the C++ \"using\" keyword can change access" >&5 +echo "configure:10277: 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:10290: \"$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:10301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_access_changing_using2=no else @@ -11056,12 +10325,12 @@ EOF fi echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 -echo "configure:11060: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 +echo "configure:10329: 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:10350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_ambiguity_resolving_using=yes else @@ -11098,19 +10367,19 @@ EOF fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 -echo "configure:11102: checking for \"std::\" namespace" >&5 +echo "configure:10371: 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:11114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespace_std=yes else @@ -11131,12 +10400,12 @@ EOF fi echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 -echo "configure:11135: checking whether standard template operator!=() is ambiguous" >&5 +echo "configure:10404: 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 {}; @@ -11146,7 +10415,7 @@ int main() { T1 a,b; return a != b; ; return 0; } EOF -if { (eval echo configure:11150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_unambiguous_std_notequal=unambiguous else @@ -11168,12 +10437,12 @@ fi echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 -echo "configure:11172: checking for C++ reinterpret_cast" >&5 +echo "configure:10441: 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:11185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else @@ -11202,7 +10471,7 @@ EOF fi echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 -echo "configure:11206: checking for C++ dynamic_cast to void*" >&5 +echo "configure:10475: 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 @@ -11210,7 +10479,7 @@ else ac_cv_cpp_dynamic_cast_void_ptr=no else cat > conftest.$ac_ext <(suby)))); } EOF -if { (eval echo configure:11230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10499: \"$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 @@ -11250,19 +10519,19 @@ fi echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 -echo "configure:11254: checking whether C++ requires implementation of unused virtual methods" >&5 +echo "configure:10523: 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:10535: \"$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 @@ -11285,12 +10554,12 @@ fi echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 -echo "configure:11289: checking for trouble comparing to zero near std::operator!=()" >&5 +echo "configure:10558: 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 {}; @@ -11301,7 +10570,7 @@ int main() { Foo f; return (0 != f); ; return 0; } EOF -if { (eval echo configure:11305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_trouble_comparing_to_zero=no else @@ -11333,19 +10602,19 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:11337: checking for LC_MESSAGES" >&5 +echo "configure:10606: 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:11349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_i18n_lc_messages=yes else @@ -11374,122 +10643,14 @@ fi -# External Packages - -# Check whether --with-system-nspr or --without-system-nspr was given. -if test "${with_system_nspr+set}" = set; then - withval="$with_system_nspr" - if test "$withval" = "yes"; then - _USE_SYSTEM_NSPR=1 - elif test "$withval" = "no"; then - : - else - { echo "configure: error: Option, system-nspr, does not take an argument ($withval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_HEADER(External Packages) +MOZ_ARG_WITH_BOOL(system-nspr, + --with-system-nspr Use system installed NSPR, + _USE_SYSTEM_NSPR=1 ) if test -n "$_USE_SYSTEM_NSPR"; then - -# 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:11430: 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:11465: 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 - - - - - - + AM_PATH_NSPR(4.0.0, MOZ_NATIVE_NSPR=1, MOZ_NATIVE_NSPR=) fi if test -z "$MOZ_NATIVE_NSPR"; then @@ -11513,120 +10674,12 @@ if test -z "$MOZ_NATIVE_NSPR"; then fi -# 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 - +MOZ_ARG_WITH_BOOL(system-nss, + --with-system-nss Use system installed NSS, + _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then - -# 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:11567: 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:11602: 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 - - - - - - + AM_PATH_NSS(3.0.0, MOZ_NATIVE_NSS=1, MOZ_NATIVE_NSS=) fi if test -n "$MOZ_NATIVE_NSS"; then @@ -11653,12 +10706,10 @@ else fi if test -z "$SKIP_LIBRARY_CHECKS"; then -# Check whether --with-system-jpeg or --without-system-jpeg was given. -if test "${with_system_jpeg+set}" = set; then - withval="$with_system_jpeg" - JPEG_DIR=$withval -fi - +MOZ_ARG_WITH_STRING(system-jpeg, + --with-system-jpeg[=PFX] + Use system libjpeg [installed at prefix PFX], + JPEG_DIR=$withval) _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS @@ -11671,7 +10722,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:11675: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:10726: 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 @@ -11679,7 +10730,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:10745: \"$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 @@ -11719,7 +10770,7 @@ if test "$SYSTEM_JPEG" = 1; then SYSTEM_JPEG= else cat > conftest.$ac_ext < #include @@ -11733,7 +10784,7 @@ else } EOF -if { (eval echo configure:11737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else @@ -11756,12 +10807,10 @@ if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$SYSTEM_JPEG" = 1; then JPEG_LIBS="-L${JPEG_DIR}/lib ${JPEG_LIBS}" fi -# Check whether --with-system-zlib or --without-system-zlib was given. -if test "${with_system_zlib+set}" = set; then - withval="$with_system_zlib" - ZLIB_DIR=$withval -fi - +MOZ_ARG_WITH_STRING(system-zlib, + --with-system-zlib[=PFX] + Use system libz [installed at prefix PFX], + ZLIB_DIR=$withval) _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS @@ -11774,7 +10823,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:11778: checking for gzread in -lz" >&5 +echo "configure:10827: 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 @@ -11782,7 +10831,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:10846: \"$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 @@ -11821,7 +10870,7 @@ if test "$SYSTEM_ZLIB" = 1; then SYSTEM_ZLIB= else cat > conftest.$ac_ext < @@ -11842,7 +10891,7 @@ else } EOF -if { (eval echo configure:11846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_ZLIB=1 else @@ -11865,12 +10914,10 @@ if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" fi -# Check whether --with-system-png or --without-system-png was given. -if test "${with_system_png+set}" = set; then - withval="$with_system_png" - PNG_DIR=$withval -fi - +MOZ_ARG_WITH_STRING(system-png, + --with-system-png[=PFX] + Use system libpng [installed at prefix PFX], + PNG_DIR=$withval) _SAVE_CFLAGS=$CFLAGS _SAVE_LDFLAGS=$LDFLAGS @@ -11885,7 +10932,7 @@ if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then SYSTEM_PNG= else echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:11889: checking for png_get_valid in -lpng" >&5 +echo "configure:10936: 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 @@ -11893,7 +10940,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:10955: \"$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 @@ -11932,7 +10979,7 @@ if test "$SYSTEM_PNG" = 1; then SYSTEM_PNG= else cat > conftest.$ac_ext < #include @@ -11946,7 +10993,7 @@ else } EOF -if { (eval echo configure:11950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else @@ -11971,18 +11018,10 @@ fi fi # SKIP_LIBRARY_CHECKS -# Check whether --enable-canvas or --disable-canvas was given. -if test "${enable_canvas+set}" = set; then - enableval="$enable_canvas" - if test "$enableval" = "yes"; then - MOZ_ENABLE_CANVAS=1 - elif test "$enableval" = "no"; then - MOZ_ENABLE_CANVAS= - else - { echo "configure: error: Option, canvas, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(canvas, + --enable-canvas Enable html:canvas feature, + MOZ_ENABLE_CANVAS=1, + MOZ_ENABLE_CANVAS= ) if test "$MOZ_ENABLE_CANVAS"; then cat >> confdefs.h <<\EOF #define MOZ_ENABLE_CANVAS 1 @@ -11990,18 +11029,10 @@ EOF fi -# 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 - +MOZ_ARG_ENABLE_BOOL(glitz, + --enable-glitz Enable Glitz for use with Cairo, + MOZ_ENABLE_GLITZ=1, + MOZ_ENABLE_GLITZ= ) if test "$MOZ_ENABLE_GLITZ"; then cat >> confdefs.h <<\EOF #define MOZ_ENABLE_GLITZ 1 @@ -12010,31 +11041,29 @@ EOF fi JAVA_INCLUDE_PATH= -# Check whether --with-java-include-path or --without-java-include-path was given. -if test "${with_java_include_path+set}" = set; then - withval="$with_java_include_path" - JAVA_INCLUDE_PATH=$withval -fi - +MOZ_ARG_WITH_STRING(java-include-path, + --with-java-include-path=dir Location of Java SDK headers, + JAVA_INCLUDE_PATH=$withval) JAVA_BIN_PATH= -# Check whether --with-java-bin-path or --without-java-bin-path was given. -if test "${with_java_bin_path+set}" = set; then - withval="$with_java_bin_path" - JAVA_BIN_PATH=$withval -fi +MOZ_ARG_WITH_STRING(java-bin-path, + --with-java-bin-path=dir Location of Java binaries (java, javac, jar), + JAVA_BIN_PATH=$withval) +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" \ @@ -12198,268 +11227,8 @@ fi if test "$COMPILE_ENVIRONMENT"; then if test "$MOZ_ENABLE_GTK" then - # Check whether --with-gtk-prefix or --without-gtk-prefix was given. -if test "${with_gtk_prefix+set}" = set; then - withval="$with_gtk_prefix" - gtk_config_prefix="$withval" -else - gtk_config_prefix="" -fi - -# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. -if test "${with_gtk_exec_prefix+set}" = set; then - withval="$with_gtk_exec_prefix" - gtk_config_exec_prefix="$withval" -else - gtk_config_exec_prefix="" -fi - -# Check whether --enable-gtktest or --disable-gtktest was given. -if test "${enable_gtktest+set}" = set; then - enableval="$enable_gtktest" - : -else - enable_gtktest=yes -fi - - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - unset ac_cv_path_GTK_CONFIG - - # Extract the first word of "gtk-config", so it can be a program name with args. -set dummy gtk-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12245: 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:12280: 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:12381: \"$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:12426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -fi -rm -f conftest* - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - { echo "configure: error: Test for GTK failed." 1>&2; exit 1; } - fi - - - rm -f conf.gtktest - + AM_PATH_GTK($GTK_VERSION,, + { echo "configure: error: Test for GTK failed." 1>&2; exit 1; }) MOZ_GTK_LDFLAGS=$GTK_LIBS MOZ_GTK_CFLAGS=$GTK_CFLAGS @@ -12467,95 +11236,7 @@ fi if test "$MOZ_ENABLE_GTK2" then - 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:12477: 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:12521: 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:12528: 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:12533: 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 - + PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= 1.3.7 gdk-x11-2.0 glib-2.0 gobject-2.0) fi if test "$MOZ_ENABLE_XLIB" @@ -12567,12 +11248,9 @@ fi if test "$MOZ_ENABLE_QT" then - # Check whether --with-qtdir or --without-qtdir was given. -if test "${with_qtdir+set}" = set; then - withval="$with_qtdir" - QTDIR=$withval -fi - + MOZ_ARG_WITH_STRING(qtdir, + --with-qtdir=\$dir Specify Qt directory , + QTDIR=$withval) if test -z "$QTDIR"; then QTDIR="/usr" @@ -12593,7 +11271,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:12597: checking for $ac_word" >&5 +echo "configure:11275: 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 @@ -12645,7 +11323,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:12649: checking for main in -lqt" >&5 +echo "configure:11327: 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 @@ -12653,14 +11331,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:11342: \"$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 @@ -12679,7 +11357,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:12683: checking for main in -lqt-mt" >&5 +echo "configure:11361: 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 @@ -12687,14 +11365,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:11376: \"$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 @@ -12730,9 +11408,9 @@ fi LIBS="$LIBS $QT_LIBS" echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 -echo "configure:12734: checking Qt - version >= $QT_VERSION" >&5 +echo "configure:11412: checking Qt - version >= $QT_VERSION" >&5 cat > conftest.$ac_ext < int main() { @@ -12743,7 +11421,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else @@ -12825,7 +11503,7 @@ fi -# Application +MOZ_ARG_HEADER(Application) ACCESSIBILITY=1 BUILD_MODULES=all @@ -12901,12 +11579,21 @@ case "$target_os" in ;; esac -# Check whether --enable-application or --disable-application was given. -if test "${enable_application+set}" = set; then - enableval="$enable_application" - MOZ_BUILD_APP=$enableval -fi - +MOZ_ARG_ENABLE_STRING(application, + --enable-application=APP + Options include: + suite + browser (Firefox) + mail (Thunderbird) + minimo + composer + calendar + xulrunner + macbrowser (Camino) + content/xslt (Standalone Transformiix XSLT) + standalone (use this for standalone + xpcom/xpconnect or to manually drive a build), + MOZ_BUILD_APP=$enableval ) case "$MOZ_BUILD_APP" in suite) @@ -13125,56 +11812,30 @@ EOF fi -# Components and Features +MOZ_ARG_HEADER(Components and Features) -# Check whether --enable-ui-locale or --disable-ui-locale was given. -if test "${enable_ui_locale+set}" = set; then - enableval="$enable_ui_locale" - MOZ_UI_LOCALE=$enableval -fi +MOZ_ARG_ENABLE_STRING(ui-locale, + --enable-ui-locale=ab-CD + Select the user interface locale (default: en-US), + MOZ_UI_LOCALE=$enableval ) - -# Check whether --enable-calendar or --disable-calendar was given. -if test "${enable_calendar+set}" = set; then - enableval="$enable_calendar" - if test "$enableval" = "yes"; then - MOZ_CALENDAR=1 - elif test "$enableval" = "no"; then - MOZ_CALENDAR= - else - { echo "configure: error: Option, calendar, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_ENABLE_BOOL(calendar, + --enable-calendar Enable building of the calendar client, + MOZ_CALENDAR=1, + MOZ_CALENDAR= ) - -# Check whether --enable-mailnews or --disable-mailnews was given. -if test "${enable_mailnews+set}" = set; then - enableval="$enable_mailnews" - if test "$enableval" = "no"; then - MOZ_MAIL_NEWS= - elif test "$enableval" = "yes"; then - MOZ_MAIL_NEWS=1 - else - { echo "configure: error: Option, mailnews, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_DISABLE_BOOL(mailnews, + --disable-mailnews Disable building of mail & news components, + MOZ_MAIL_NEWS=, + MOZ_MAIL_NEWS=1 ) - -# Check whether --enable-static-mail or --disable-static-mail was given. -if test "${enable_static_mail+set}" = set; then - enableval="$enable_static_mail" - if test "$enableval" = "yes"; then - MOZ_STATIC_MAIL_BUILD=1 - elif test "$enableval" = "no"; then - MOZ_STATIC_MAIL_BUILD= - else - { echo "configure: error: Option, static-mail, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(static-mail, + --enable-static-mail Enable static mail build support, + MOZ_STATIC_MAIL_BUILD=1, + MOZ_STATIC_MAIL_BUILD= ) if test "$MOZ_STATIC_MAIL_BUILD"; then cat >> confdefs.h <<\EOF @@ -13185,24 +11846,18 @@ fi -# Check whether --enable-ldap or --disable-ldap was given. -if test "${enable_ldap+set}" = set; then - enableval="$enable_ldap" - if test "$enableval" = "no"; then - MOZ_LDAP_XPCOM= - elif test "$enableval" = "yes"; then - MOZ_LDAP_XPCOM=1 - else - { echo "configure: error: Option, ldap, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_DISABLE_BOOL(ldap, + --disable-ldap Disable LDAP support, + MOZ_LDAP_XPCOM=, + MOZ_LDAP_XPCOM=1) - -# Check whether --enable-official-branding or --disable-official-branding was given. -if test "${enable_official_branding+set}" = set; then - enableval="$enable_official_branding" - if test "$enableval" = "yes"; then - case "$MOZ_BUILD_APP" in +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 browser) MOZ_BRANDING_DIRECTORY=other-licenses/branding/firefox MOZ_APP_DISPLAYNAME=Firefox @@ -13215,31 +11870,18 @@ mail) *) { echo "configure: error: Official branding is only available for Firefox and Thunderbird." 1>&2; exit 1; } esac +) - elif test "$enableval" = "no"; then - : - else - { echo "configure: error: Option, official-branding, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - - -# Check whether --with-branding or --without-branding was given. -if test "${with_branding+set}" = set; then - withval="$with_branding" - MOZ_BRANDING_DIRECTORY=$withval -fi +MOZ_ARG_WITH_STRING(branding, + --enable-branding Enable branding from the specified directory., + MOZ_BRANDING_DIRECTORY=$withval) - -# Check whether --with-distribution-id or --without-distribution-id was given. -if test "${with_distribution_id+set}" = set; then - withval="$with_distribution_id" - val=`echo $withval` - MOZ_DISTRIBUTION_ID="$val" -fi - +MOZ_ARG_WITH_STRING(distribution-id, + --with-distribution-id=ID Set distribution-specific id (default=org.mozilla), + val=`echo $withval` + MOZ_DISTRIBUTION_ID="$val") if test -z "$MOZ_DISTRIBUTION_ID"; then MOZ_DISTRIBUTION_ID="org.mozilla" @@ -13251,18 +11893,10 @@ EOF -# Check whether --enable-freetype2 or --disable-freetype2 was given. -if test "${enable_freetype2+set}" = set; then - enableval="$enable_freetype2" - if test "$enableval" = "no"; then - MOZ_ENABLE_FREETYPE2= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_FREETYPE2=1 - else - { echo "configure: error: Option, freetype2, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(freetype2, + --disable-freetype2 Disable FreeType2 support , + MOZ_ENABLE_FREETYPE2=, + MOZ_ENABLE_FREETYPE2=1) 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; } @@ -13281,18 +11915,10 @@ if test "$MOZ_ENABLE_GTK2"; then MOZ_ENABLE_XFT=1 fi -# Check whether --enable-xft or --disable-xft was given. -if test "${enable_xft+set}" = set; then - enableval="$enable_xft" - if test "$enableval" = "no"; then - MOZ_ENABLE_XFT= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_XFT=1 - else - { echo "configure: error: Option, xft, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(xft, + --disable-xft Disable Xft support , + MOZ_ENABLE_XFT=, + MOZ_ENABLE_XFT=1) if test "$MOZ_ENABLE_XFT" && test -z "$MOZ_ENABLE_GTK2"; then { echo "configure: error: Cannot enable XFT support for non-GTK2 toolkits." 1>&2; exit 1; } @@ -13308,202 +11934,18 @@ then #define MOZ_ENABLE_XFT 1 EOF - 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:13318: 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:13362: 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:13369: 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:13374: 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:13407: 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:13451: 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:13458: 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:13463: 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 - + PKG_CHECK_MODULES(MOZ_XFT, xft) + PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0) fi -# Check whether --enable-pango or --disable-pango was given. -if test "${enable_pango+set}" = set; then - enableval="$enable_pango" - if test "$enableval" = "yes"; then - MOZ_ENABLE_PANGO=1 - elif test "$enableval" = "no"; then - MOZ_ENABLE_PANGO= - else - { echo "configure: error: Option, pango, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(pango, + --enable-pango Enable Pango font rendering support, + MOZ_ENABLE_PANGO=1, + MOZ_ENABLE_PANGO=) if test "$MOZ_ENABLE_PANGO" && test -z "$MOZ_ENABLE_CAIRO_GFX" then @@ -13511,95 +11953,7 @@ then #define MOZ_ENABLE_PANGO 1 EOF - 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:13521: 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:13565: 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:13572: 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:13577: 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 - + PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0) @@ -13612,95 +11966,7 @@ then #define MOZ_ENABLE_PANGO 1 EOF - 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:13622: 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.10.0 pangocairo >= 1.10.0""... $ac_c" 1>&6 -echo "configure:13666: checking for pango >= 1.10.0 pangocairo >= 1.10.0" >&5 - - if $PKG_CONFIG --exists "pango >= 1.10.0 pangocairo >= 1.10.0" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 -echo "configure:13673: checking MOZ_PANGO_CFLAGS" >&5 - MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.10.0 pangocairo >= 1.10.0"` - echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 - - echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 -echo "configure:13678: checking MOZ_PANGO_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= 1.10.0 pangocairo >= 1.10.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.10.0 pangocairo >= 1.10.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.10.0 pangocairo >= 1.10.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 - + PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.10.0 pangocairo >= 1.10.0) @@ -13723,25 +11989,17 @@ fi -# Check whether --enable-postscript or --disable-postscript was given. -if test "${enable_postscript+set}" = set; then - enableval="$enable_postscript" - if test "$enableval" = "no"; then - MOZ_ENABLE_POSTSCRIPT= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_POSTSCRIPT=1 - else - { echo "configure: error: Option, postscript, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(postscript, + --disable-postscript Disable PostScript printing support , + MOZ_ENABLE_POSTSCRIPT=, + MOZ_ENABLE_POSTSCRIPT=1 ) if test "$MOZ_X11" then _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 -echo "configure:13745: checking for XpGetPrinterList in -lXp" >&5 +echo "configure:12003: 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 @@ -13749,7 +12007,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:12022: \"$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 @@ -13787,18 +12045,10 @@ fi MOZ_XPRINT_LDFLAGS="$XLDFLAGS $XPRINT_LIBS" MOZ_XPRINT_LDFLAGS="$MOZ_XPRINT_LDFLAGS $XEXT_LIBS $X11_LIBS" - # Check whether --enable-xprint or --disable-xprint was given. -if test "${enable_xprint+set}" = set; then - enableval="$enable_xprint" - if test "$enableval" = "no"; then - MOZ_ENABLE_XPRINT= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_XPRINT=1 - else - { echo "configure: error: Option, xprint, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - + MOZ_ARG_DISABLE_BOOL(xprint, + --disable-xprint Disable Xprint printing support , + MOZ_ENABLE_XPRINT=, + MOZ_ENABLE_XPRINT=1 ) fi @@ -13811,118 +12061,22 @@ then MOZ_ENABLE_LIBGNOME=1 fi - # Check whether --enable-gnomevfs or --disable-gnomevfs was given. -if test "${enable_gnomevfs+set}" = set; then - enableval="$enable_gnomevfs" - if test "$enableval" = "no"; then - MOZ_ENABLE_GNOMEVFS= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_GNOMEVFS=force - else - { echo "configure: error: Option, gnomevfs, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - + MOZ_ARG_DISABLE_BOOL(gnomevfs, + --disable-gnomevfs Disable GnomeVFS support , + MOZ_ENABLE_GNOMEVFS=, + MOZ_ENABLE_GNOMEVFS=force) if test "$MOZ_ENABLE_GNOMEVFS" then - 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:13836: 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:13880: 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:13887: 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:13892: 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 - + PKG_CHECK_MODULES(MOZ_GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION, MOZ_ENABLE_GNOMEVFS=1 - - else - + , if test "$MOZ_ENABLE_GNOMEVFS" = "force" then - { echo "configure: error: * * * Could not find gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" 1>&2; exit 1; } + AC_MSG_ERROR([* * * Could not find gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION]) fi MOZ_ENABLE_GNOMEVFS= - - fi - + ) fi @@ -13930,99 +12084,11 @@ echo "configure:13892: checking MOZ_GNOMEVFS_LIBS" >&5 if test "$MOZ_ENABLE_GCONF" then - 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:13940: 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:13984: 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:13991: 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:13996: 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 - + PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION, MOZ_ENABLE_GCONF=1 - - else - + , MOZ_ENABLE_GCONF= - - fi - + ) fi @@ -14030,99 +12096,11 @@ echo "configure:13996: checking MOZ_GCONF_LIBS" >&5 if test "$MOZ_ENABLE_LIBGNOME" then - 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:14040: 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:14084: 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:14091: 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:14096: 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 - + PKG_CHECK_MODULES(MOZ_LIBGNOME, libgnome-2.0 >= $LIBGNOME_VERSION, MOZ_ENABLE_LIBGNOME=1 - - else - + , MOZ_ENABLE_LIBGNOME= - - fi - + ) fi @@ -14146,116 +12124,21 @@ if test "$MOZ_ENABLE_GTK2" then MOZ_ENABLE_GNOMEUI=1 - # Check whether --enable-gnomeui or --disable-gnomeui was given. -if test "${enable_gnomeui+set}" = set; then - enableval="$enable_gnomeui" - if test "$enableval" = "no"; then - MOZ_ENABLE_GNOMEUI= - elif test "$enableval" = "yes"; then - MOZ_ENABLE_GNOMEUI=force - else - { echo "configure: error: Option, gnomeui, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - + MOZ_ARG_DISABLE_BOOL(gnomeui, + --disable-gnomeui Disable libgnomeui support (default: auto, optional at runtime) , + MOZ_ENABLE_GNOMEUI=, + MOZ_ENABLE_GNOMEUI=force) if test "$MOZ_ENABLE_GNOMEUI" then - 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:14171: 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:14215: 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:14222: 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:14227: 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_ENABLE_GNOMEUI=1 - else - + PKG_CHECK_MODULES(MOZ_GNOMEUI, libgnomeui-2.0 >= $GNOMEUI_VERSION, + MOZ_ENABLE_GNOMEUI=1, if test "$MOZ_ENABLE_GNOMEUI" = "force" then - { echo "configure: error: * * * Could not find libgnomeui-2.0 >= $GNOMEUI_VERSION" 1>&2; exit 1; } + AC_MSG_ERROR([* * * Could not find libgnomeui-2.0 >= $GNOMEUI_VERSION]) fi MOZ_ENABLE_GNOMEUI= - - fi - + ) fi if test "$MOZ_ENABLE_GNOMEUI"; then @@ -14283,18 +12166,10 @@ EOF fi -# Check whether --enable-crypto or --disable-crypto was given. -if test "${enable_crypto+set}" = set; then - enableval="$enable_crypto" - if test "$enableval" = "no"; then - MOZ_PSM= - elif test "$enableval" = "yes"; then - MOZ_PSM=1 - else - { echo "configure: error: Option, crypto, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(crypto, + --disable-crypto Disable crypto support (Personal Security Manager), + MOZ_PSM=, + MOZ_PSM=1 ) if test "$COMPILE_ENVIRONMENT"; then case $target in @@ -14306,45 +12181,21 @@ if test "$COMPILE_ENVIRONMENT"; then esac fi -# Check whether --enable-jsd or --disable-jsd was given. -if test "${enable_jsd+set}" = set; then - enableval="$enable_jsd" - if test "$enableval" = "no"; then - MOZ_JSDEBUGGER= - elif test "$enableval" = "yes"; then - MOZ_JSDEBUGGER=1 - else - { echo "configure: error: Option, jsd, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_DISABLE_BOOL(jsd, + --disable-jsd Disable JavaScript debug library, + MOZ_JSDEBUGGER=, + MOZ_JSDEBUGGER=1) +MOZ_ARG_DISABLE_BOOL(plugins, + --disable-plugins Disable plugins support, + MOZ_PLUGINS=, + MOZ_PLUGINS=1) -# Check whether --enable-plugins or --disable-plugins was given. -if test "${enable_plugins+set}" = set; then - enableval="$enable_plugins" - if test "$enableval" = "no"; then - MOZ_PLUGINS= - elif test "$enableval" = "yes"; then - MOZ_PLUGINS=1 - else - { echo "configure: error: Option, plugins, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - - -# 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 @@ -14352,18 +12203,11 @@ EOF fi -# Check whether --enable-xinerama or --disable-xinerama was given. -if test "${enable_xinerama+set}" = set; then - enableval="$enable_xinerama" - if test "$enableval" = "yes"; then - _ENABLE_XINERAMA=1 - elif test "$enableval" = "no"; then - _ENABLE_XINERAMA= - else - { echo "configure: error: Option, xinerama, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(xinerama, + --enable-xinerama Enable Xinerama support + ( not safe for Red Hat 7.0 ) , + _ENABLE_XINERAMA=1, + _ENABLE_XINERAMA= ) if test -n "$_ENABLE_XINERAMA" -a -n "$MOZ_XINERAMA_LIBS" -a \ -n "$ac_cv_header_X11_extensions_Xinerama_h"; then @@ -14380,31 +12224,15 @@ cat >> confdefs.h <<\EOF EOF -# 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_ENABLE_BOOL(ctl, + --enable-ctl Enable Thai Complex Script support, + SUNCTL=1, + SUNCTL= ) +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 @@ -14413,18 +12241,10 @@ EOF fi -# Check whether --enable-accessibility or --disable-accessibility was given. -if test "${enable_accessibility+set}" = set; then - enableval="$enable_accessibility" - if test "$enableval" = "no"; then - ACCESSIBILITY= - elif test "$enableval" = "yes"; then - ACCESSIBILITY=1 - else - { echo "configure: error: Option, accessibility, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(accessibility, + --disable-accessibility Disable accessibility support, + ACCESSIBILITY=, + ACCESSIBILITY=1 ) if test "$ACCESSIBILITY"; then cat >> confdefs.h <<\EOF #define ACCESSIBILITY 1 @@ -14432,31 +12252,16 @@ EOF fi -# 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(xpfe-components, + --disable-xpfe-components + Disable xpfe components, + MOZ_XPFE_COMPONENTS=, + MOZ_XPFE_COMPONENTS=1 ) +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 @@ -14464,31 +12269,15 @@ EOF fi -# Check whether --enable-single-profile or --disable-single-profile was given. -if test "${enable_single_profile+set}" = set; then - enableval="$enable_single_profile" - if test "$enableval" = "yes"; then - MOZ_SINGLE_PROFILE=1 - elif test "$enableval" = "no"; then - MOZ_SINGLE_PROFILE= - else - { echo "configure: error: Option, single-profile, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - - -# 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_ENABLE_BOOL(single-profile, + --enable-single-profile Enable single profile support , + MOZ_SINGLE_PROFILE=1, + MOZ_SINGLE_PROFILE= ) +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 @@ -14496,18 +12285,10 @@ EOF fi -# 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 - +MOZ_ARG_DISABLE_BOOL(printing, + --disable-printing Disable printing support, + NS_PRINTING=, + NS_PRINTING=1 ) if test "$NS_PRINTING"; then cat >> confdefs.h <<\EOF @@ -14520,18 +12301,10 @@ EOF fi -# Check whether --enable-native-uconv or --disable-native-uconv was given. -if test "${enable_native_uconv+set}" = set; then - enableval="$enable_native_uconv" - if test "$enableval" = "yes"; then - MOZ_USE_NATIVE_UCONV=1 - elif test "$enableval" = "no"; then - MOZ_USE_NATIVE_UCONV= - else - { echo "configure: error: Option, native-uconv, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(native-uconv, + --enable-native-uconv Enable iconv support, + MOZ_USE_NATIVE_UCONV=1, + MOZ_USE_NATIVE_UCONV= ) if test "$MOZ_USE_NATIVE_UCONV"; then cat >> confdefs.h <<\EOF #define MOZ_USE_NATIVE_UCONV 1 @@ -14543,47 +12316,24 @@ if test "$OS_ARCH" != "WINCE" -a "$MOZ_USE_NATIVE_UCONV" -a "$ac_cv_func_iconv" fi -# Check whether --enable-plaintext-editor-only or --disable-plaintext-editor-only was given. -if test "${enable_plaintext_editor_only+set}" = set; then - enableval="$enable_plaintext_editor_only" - if test "$enableval" = "yes"; then - MOZ_PLAINTEXT_EDITOR_ONLY=1 - elif test "$enableval" = "no"; then - MOZ_PLAINTEXT_EDITOR_ONLY= - else - { echo "configure: error: Option, plaintext-editor-only, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_ENABLE_BOOL(plaintext-editor-only, + --enable-plaintext-editor-only + Allow only plaintext editing, + MOZ_PLAINTEXT_EDITOR_ONLY=1, + MOZ_PLAINTEXT_EDITOR_ONLY= ) + + +MOZ_ARG_DISABLE_BOOL(composer, + --disable-composer Disable building of Composer, + MOZ_COMPOSER=, + MOZ_COMPOSER=1 ) -# Check whether --enable-composer or --disable-composer was given. -if test "${enable_composer+set}" = set; then - enableval="$enable_composer" - if test "$enableval" = "no"; then - MOZ_COMPOSER= - elif test "$enableval" = "yes"; then - MOZ_COMPOSER=1 - else - { echo "configure: error: Option, composer, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - - - - -# Check whether --enable-xpcom-obsolete or --disable-xpcom-obsolete was given. -if test "${enable_xpcom_obsolete+set}" = set; then - enableval="$enable_xpcom_obsolete" - if test "$enableval" = "no"; then - MOZ_NO_XPCOM_OBSOLETE=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 - +MOZ_ARG_DISABLE_BOOL(xpcom-obsolete, + --disable-xpcom-obsolete Disable XPCOM Obsolete Library, + MOZ_NO_XPCOM_OBSOLETE=1, + MOZ_NO_XPCOM_OBSOLETE=) if test -n "$MOZ_NO_XPCOM_OBSOLETE"; then if test -n "$MOZ_XPINSTALL"; then @@ -14598,18 +12348,10 @@ EOF fi -# 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 - +MOZ_ARG_DISABLE_BOOL(xpcom-fastload, + --disable-xpcom-fastload Disable XPCOM fastload support, + MOZ_NO_FAST_LOAD=1, + MOZ_NO_FAST_LOAD=) @@ -14620,31 +12362,15 @@ EOF 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(negotiateauth, + --disable-negotiateauth Disable GSS-API negotiation , + MOZ_AUTH_EXTENSION=, + MOZ_AUTH_EXTENSION=1 ) +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 @@ -14652,70 +12378,34 @@ EOF fi -# 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(xmlextras, + --disable-xmlextras Disable XMLExtras such as XMLHttpRequest , + MOZ_XMLEXTRAS=, + MOZ_XMLEXTRAS=1 ) +MOZ_ARG_DISABLE_BOOL(webservices, + --disable-webservices Disable Webservices/SOAP support , + MOZ_WEBSERVICES=, + MOZ_WEBSERVICES=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 +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-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 @@ -14753,7 +12443,7 @@ if test -n "${MOZ_JAVAXPCOM}"; then # Extract the first word of "javac", so it can be a program name with args. set dummy javac; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14757: checking for $ac_word" >&5 +echo "configure:12447: 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 @@ -14789,7 +12479,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:14793: checking for $ac_word" >&5 +echo "configure:12483: 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 @@ -14828,10 +12518,9 @@ fi fi -# Check whether --enable-extensions or --disable-extensions was given. -if test "${enable_extensions+set}" = set; then - enableval="$enable_extensions" - for option in `echo $enableval | sed 's/,/ /g'`; do +MOZ_ARG_ENABLE_STRING(extensions, + --enable-extensions Enable extensions, + for option in `echo $enableval | sed 's/,/ /g'`; do if test "$option" = "yes" || test "$option" = "all"; then MOZ_EXTENSIONS="$MOZ_EXTENSIONS $MOZ_EXTENSIONS_ALL" elif test "$option" = "no" || test "$option" = "none"; then @@ -14844,11 +12533,8 @@ if test "${enable_extensions+set}" = set; then else MOZ_EXTENSIONS="$MOZ_EXTENSIONS $option" fi -done -else - MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT" -fi - +done, + MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT") if test -z "$MOZ_ENABLE_GTK" && test `echo "$MOZ_EXTENSIONS" | grep -c xmlterm` -ne 0; then echo "configure: warning: Cannot build xmlterm without gtk toolkit. Removing xmlterm from MOZ_EXTENSIONS." 1>&2 @@ -14938,10 +12624,10 @@ windows|os2|mac|cocoa) ;; esac -# Check whether --enable-image-decoders or --disable-image-decoders was given. -if test "${enable_image_decoders+set}" = set; then - enableval="$enable_image_decoders" - for option in `echo $enableval | sed 's/,/ /g'`; do +MOZ_ARG_ENABLE_STRING(image-decoders, + --enable-image-decoders[={mod1,mod2,default,all,none}] + Enable specific image decoders, + for option in `echo $enableval | sed 's/,/ /g'`; do if test "$option" = "yes" || test "$option" = "all"; then MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS $MOZ_IMG_DECODERS_DEFAULT" elif test "$option" = "no" || test "$option" = "none"; then @@ -14954,17 +12640,14 @@ if test "${enable_image_decoders+set}" = set; then else MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS $option" fi -done -else - MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS_DEFAULT" -fi +done, + MOZ_IMG_DECODERS="$MOZ_IMG_DECODERS_DEFAULT") - -# 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 +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 if test "$option" = "yes" || test "$option" = "all"; then addencoder="$MOZ_IMG_ENCODERS_DEFAULT" elif test "$option" = "no" || test "$option" = "none"; then @@ -14979,40 +12662,22 @@ if test "${enable_image_encoders+set}" = set; then addencoder="$option" fi MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS $addencoder" -done -else - MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS_DEFAULT" -fi - +done, + MOZ_IMG_ENCODERS="$MOZ_IMG_ENCODERS_DEFAULT") MOZ_IMG_DECODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_DECODERS}` MOZ_IMG_ENCODERS=`${PERL} ${srcdir}/build/unix/uniq.pl ${MOZ_IMG_ENCODERS}` -# 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_ENABLE_BOOL(ldap-experimental, + --enable-ldap-experimental + Enable LDAP experimental features, + MOZ_LDAP_XPCOM_EXPERIMENTAL=1, + MOZ_LDAP_XPCOM_EXPERIMENTAL=) +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 @@ -15020,18 +12685,10 @@ EOF fi -# Check whether --enable-svg or --disable-svg was given. -if test "${enable_svg+set}" = set; then - enableval="$enable_svg" - if test "$enableval" = "yes"; then - MOZ_SVG=1 - elif test "$enableval" = "no"; then - MOZ_SVG= - else - { echo "configure: error: Option, svg, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(svg, + --enable-svg Enable SVG support, + MOZ_SVG=1, + MOZ_SVG= ) if test -n "$MOZ_SVG"; then cat >> confdefs.h <<\EOF #define MOZ_SVG 1 @@ -15040,20 +12697,16 @@ EOF SVG_DEFAULT_RENDERER=cairo - # Check whether --enable-svg-renderer or --disable-svg-renderer was given. -if test "${enable_svg_renderer+set}" = set; then - enableval="$enable_svg_renderer" - SVG_RENDERER=$enableval -else - SVG_RENDERER=$SVG_DEFAULT_RENDERER -fi - + MOZ_ARG_ENABLE_STRING(svg-renderer, + --enable-svg-renderer={gdiplus,libart,cairo}, + SVG_RENDERER=$enableval , + SVG_RENDERER=$SVG_DEFAULT_RENDERER) case "$SVG_RENDERER" in gdiplus) MOZ_SVG_RENDERER_GDIPLUS=1 echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 -echo "configure:15057: checking for Gdiplus.h" >&5 +echo "configure:12710: checking for Gdiplus.h" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -15063,7 +12716,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < #include @@ -15072,7 +12725,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -15124,18 +12777,10 @@ case "$target_os" in ;; esac -# Check whether --enable-installer or --disable-installer was given. -if test "${enable_installer+set}" = set; then - enableval="$enable_installer" - if test "$enableval" = "no"; then - MOZ_INSTALLER= - elif test "$enableval" = "yes"; then - MOZ_INSTALLER=1 - else - { echo "configure: error: Option, installer, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(installer, + --disable-installer Disable building of installer, + MOZ_INSTALLER=, + MOZ_INSTALLER=1 ) # Automatically disable installer if xpinstall isn't built if test -z "$MOZ_XPINSTALL"; then MOZ_INSTALLER= @@ -15143,31 +12788,23 @@ fi -# 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 - +MOZ_ARG_DISABLE_BOOL(updater, + --disable-updater Disable building of updater, + MOZ_UPDATER=, + MOZ_UPDATER=1 ) # 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:15165: checking for iconv" >&5 +echo "configure:12802: 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:15171: checking for $ac_word" >&5 +echo "configure:12808: 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 @@ -15206,12 +12843,10 @@ esac # app update channel is 'default' when not supplied. -# 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 - +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`) if test -z "$MOZ_UPDATE_CHANNEL"; then MOZ_UPDATE_CHANNEL=default @@ -15222,46 +12857,24 @@ EOF # tools/update-packaging is not checked out by default. -# 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_ENABLE_BOOL(update-packaging, + --enable-update-packaging + Enable tools/update-packaging, + MOZ_UPDATE_PACKAGING=1, + MOZ_UPDATE_PACKAGING= ) - -# Check whether --enable-activex or --disable-activex was given. -if test "${enable_activex+set}" = set; then - enableval="$enable_activex" - if test "$enableval" = "no"; then - MOZ_NO_ACTIVEX_SUPPORT=1 - elif test "$enableval" = "yes"; then - MOZ_NO_ACTIVEX_SUPPORT= - else - { echo "configure: error: Option, activex, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_DISABLE_BOOL(activex, + --disable-activex Disable building of ActiveX control (win32 only), + MOZ_NO_ACTIVEX_SUPPORT=1, + MOZ_NO_ACTIVEX_SUPPORT= ) - -# Check whether --enable-activex-scripting or --disable-activex-scripting was given. -if test "${enable_activex_scripting+set}" = set; then - enableval="$enable_activex_scripting" - if test "$enableval" = "no"; then - MOZ_ACTIVEX_SCRIPTING_SUPPORT= - elif test "$enableval" = "yes"; then - MOZ_ACTIVEX_SCRIPTING_SUPPORT=1 - else - { echo "configure: error: Option, activex-scripting, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(activex-scripting, + --disable-activex-scripting + Disable building of ActiveX scripting support (win32), + MOZ_ACTIVEX_SCRIPTING_SUPPORT=, + MOZ_ACTIVEX_SCRIPTING_SUPPORT=1) if test -n "$MOZ_NO_ACTIVEX_SUPPORT" -a -n "$MOZ_ACTIVEX_SCRIPTING_SUPPORT"; @@ -15269,61 +12882,29 @@ then { echo "configure: error: Cannot enable ActiveX scripting support when ActiveX support is disabled." 1>&2; exit 1; } fi -# Check whether --enable-leaky or --disable-leaky was given. -if test "${enable_leaky+set}" = set; then - enableval="$enable_leaky" - if test "$enableval" = "yes"; then - MOZ_LEAKY=1 - elif test "$enableval" = "no"; then - MOZ_LEAKY= - else - { echo "configure: error: Option, leaky, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_ENABLE_BOOL(leaky, + --enable-leaky Build leaky memory tool, + MOZ_LEAKY=1, + MOZ_LEAKY=) - -# Check whether --enable-xpctools or --disable-xpctools was given. -if test "${enable_xpctools+set}" = set; then - enableval="$enable_xpctools" - if test "$enableval" = "yes"; then - MOZ_XPCTOOLS=1 - elif test "$enableval" = "no"; then - MOZ_XPCTOOLS= - else - { echo "configure: error: Option, xpctools, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_ENABLE_BOOL(xpctools, + --enable-xpctools Build JS profiling tool, + MOZ_XPCTOOLS=1, + MOZ_XPCTOOLS= ) +MOZ_ARG_DISABLE_BOOL(tests, + --disable-tests Do not build test libraries & programs, + ENABLE_TESTS=, + ENABLE_TESTS=1 ) -# Check whether --enable-tests or --disable-tests was given. -if test "${enable_tests+set}" = set; then - enableval="$enable_tests" - if test "$enableval" = "no"; then - ENABLE_TESTS= - elif test "$enableval" = "yes"; then - ENABLE_TESTS=1 - else - { echo "configure: error: Option, tests, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - - -# 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_HEADER(Individual module options) +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 @@ -15331,18 +12912,10 @@ EOF fi -# 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 - +MOZ_ARG_ENABLE_BOOL(places, + --enable-places Enable 'places' bookmark/history implementation, + MOZ_PLACES=1, + MOZ_PLACES= ) if test -n "$MOZ_PLACES"; then cat >> confdefs.h <<\EOF #define MOZ_PLACES 1 @@ -15353,18 +12926,10 @@ fi if test -n "$MOZ_CALENDAR" || test -n "$MOZ_PLACES"; then MOZ_STORAGE=1 fi -# Check whether --enable-storage or --disable-storage was given. -if test "${enable_storage+set}" = set; then - enableval="$enable_storage" - if test "$enableval" = "yes"; then - MOZ_STORAGE=1 - elif test "$enableval" = "no"; then - MOZ_STORAGE= - else - { echo "configure: error: Option, storage, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(storage, + --enable-storage Enable mozStorage module and related components, + MOZ_STORAGE=1, + MOZ_STORAGE= ) if test -n "$MOZ_STORAGE"; then cat >> confdefs.h <<\EOF #define MOZ_STORAGE 1 @@ -15372,18 +12937,10 @@ EOF fi -# Check whether --enable-js-ultrasparc or --disable-js-ultrasparc was given. -if test "${enable_js_ultrasparc+set}" = set; then - enableval="$enable_js_ultrasparc" - if test "$enableval" = "yes"; then - JS_ULTRASPARC_OPTS=1 - elif test "$enableval" = "no"; then - JS_ULTRASPARC_OPTS= - else - { echo "configure: error: Option, js-ultrasparc, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(js-ultrasparc, + --enable-js-ultrasparc Use UltraSPARC optimizations in JS, + JS_ULTRASPARC_OPTS=1, + JS_ULTRASPARC_OPTS= ) if test `echo "$target_os" | grep -c \^solaris 2>/dev/null` = 0 -o \ "$OS_TEST" != "sun4u"; then @@ -15392,7 +12949,7 @@ fi -# Debugging and Optimizations +MOZ_ARG_HEADER(Debugging and Optimizations) if test -z "$MOZ_DEBUG_FLAGS" then @@ -15418,21 +12975,18 @@ then esac fi -# Check whether --enable-debug or --disable-debug was given. -if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - if test "$enableval" != "no"; then +MOZ_ARG_ENABLE_STRING(debug, + --enable-debug[=DBG] Enable building with developer debug info + (Using compiler flags DBG), + 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 -else - MOZ_DEBUG= -fi - + fi , + MOZ_DEBUG=) MOZ_DEBUG_ENABLE_DEFS="-DDEBUG -D_DEBUG" case "${target_os}" in @@ -15452,18 +13006,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:15456: checking for valid debug flags" >&5 +echo "configure:13010: 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:15467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -15484,10 +13038,10 @@ if test -z "$MOZ_OPTIMIZE_FLAGS"; then MOZ_OPTIMIZE_FLAGS="-O" fi -# Check whether --enable-optimize or --disable-optimize was given. -if test "${enable_optimize+set}" = set; then - enableval="$enable_optimize" - if test "$enableval" != "no"; then +MOZ_ARG_ENABLE_STRING(optimize, + --disable-optimize Disable compiler optimization + --enable-optimize=[OPT] Specify compiler optimization flags [OPT=-O], + if test "$enableval" != "no"; then MOZ_OPTIMIZE=1 if test -n "$enableval" && test "$enableval" != "yes"; then MOZ_OPTIMIZE_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` @@ -15495,27 +13049,23 @@ if test "${enable_optimize+set}" = set; then fi else MOZ_OPTIMIZE= -fi -else - MOZ_OPTIMIZE=1 -fi - +fi , MOZ_OPTIMIZE=1) 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:15508: checking for valid optimization flags" >&5 +echo "configure:13058: 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:15519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -15537,40 +13087,30 @@ fi # COMPILE_ENVIRONMENT -# Check whether --enable-debug-modules or --disable-debug-modules was given. -if test "${enable_debug_modules+set}" = set; then - enableval="$enable_debug_modules" - MOZ_DEBUG_MODULES=`echo $enableval| sed 's/,/ /g'` -fi +MOZ_ARG_ENABLE_STRING(debug-modules, + --enable-debug-modules Enable/disable debug info for specific modules, + MOZ_DEBUG_MODULES=`echo $enableval| sed 's/,/ /g'` ) - -# Check whether --enable-debugger-info-modules or --disable-debugger-info-modules was given. -if test "${enable_debugger_info_modules+set}" = set; then - enableval="$enable_debugger_info_modules" - for i in `echo $enableval | sed 's/,/ /g'`; do - if test "$i" = "no"; then +MOZ_ARG_ENABLE_STRING(debugger-info-modules, + --enable-debugger-info-modules + Enable/disable debugger info for specific modules, + for i in `echo $enableval | sed 's/,/ /g'`; do + dnl note that the list of module names is reversed as it is copied + dnl this is important, as it will allow config.mk to interpret stuff like + dnl "^ALL_MODULES xpcom" properly + if test "$i" = "no"; then i="^ALL_MODULES" fi if test "$i" = "yes"; then i="ALL_MODULES" fi MOZ_DBGRINFO_MODULES="$i $MOZ_DBGRINFO_MODULES"; - done -fi - - -# Check whether --enable-boehm or --disable-boehm was given. -if test "${enable_boehm+set}" = set; then - enableval="$enable_boehm" - if test "$enableval" = "yes"; then - GC_LEAK_DETECTOR=1 - elif test "$enableval" = "no"; then - GC_LEAK_DETECTOR= - else - { echo "configure: error: Option, boehm, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi + done ) +MOZ_ARG_ENABLE_BOOL(boehm, + --enable-boehm Enable the Boehm Garbage Collector, + GC_LEAK_DETECTOR=1, + GC_LEAK_DETECTOR= ) if test -n "$GC_LEAK_DETECTOR"; then cat >> confdefs.h <<\EOF #define GC_LEAK_DETECTOR 1 @@ -15578,18 +13118,10 @@ EOF fi -# Check whether --enable-logging or --disable-logging was given. -if test "${enable_logging+set}" = set; then - enableval="$enable_logging" - if test "$enableval" = "no"; then - NS_DISABLE_LOGGING=1 - elif test "$enableval" = "yes"; then - NS_DISABLE_LOGGING= - else - { echo "configure: error: Option, logging, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(logging, + --disable-logging Disable logging facilities, + NS_DISABLE_LOGGING=1, + NS_DISABLE_LOGGING= ) if test "$NS_DISABLE_LOGGING"; then cat >> confdefs.h <<\EOF #define NS_DISABLE_LOGGING 1 @@ -15602,18 +13134,11 @@ EOF fi -# Check whether --enable-crash-on-assert or --disable-crash-on-assert was given. -if test "${enable_crash_on_assert+set}" = set; then - enableval="$enable_crash_on_assert" - if test "$enableval" = "yes"; then - _CRASH_ON_ASSERT=1 - elif test "$enableval" = "no"; then - _CRASH_ON_ASSERT= - else - { echo "configure: error: Option, crash-on-assert, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(crash-on-assert, + --enable-crash-on-assert + Make NS_ASSERTION crash on Unix, + _CRASH_ON_ASSERT=1, + _CRASH_ON_ASSERT= ) if test "$_CRASH_ON_ASSERT"; then cat >> confdefs.h <<\EOF #define UNIX_CRASH_ON_ASSERT 1 @@ -15621,18 +13146,10 @@ EOF fi -# Check whether --enable-reorder or --disable-reorder was given. -if test "${enable_reorder+set}" = set; then - enableval="$enable_reorder" - if test "$enableval" = "yes"; then - _ENABLE_REORDER=1 - elif test "$enableval" = "no"; then - _ENABLE_REORDER= - else - { echo "configure: error: Option, reorder, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(reorder, + --enable-reorder Enable function reordering (requires GNU ld) , + _ENABLE_REORDER=1, + _ENABLE_REORDER= ) if test -n "$_ENABLE_REORDER"; then if test -z "$GNU_LD"; then echo "configure: warning: Reordering only works with GNU ld. Not reordering." 1>&2 @@ -15642,18 +13159,10 @@ if test -n "$_ENABLE_REORDER"; then fi _ENABLE_LOGREFCNT=42 -# Check whether --enable-logrefcnt or --disable-logrefcnt was given. -if test "${enable_logrefcnt+set}" = set; then - enableval="$enable_logrefcnt" - if test "$enableval" = "yes"; then - _ENABLE_LOGREFCNT=1 - elif test "$enableval" = "no"; then - _ENABLE_LOGREFCNT= - else - { echo "configure: error: Option, logrefcnt, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(logrefcnt, + --enable-logrefcnt Enable logging of refcounts (default=debug) , + _ENABLE_LOGREFCNT=1, + _ENABLE_LOGREFCNT= ) if test "$_ENABLE_LOGREFCNT" = "1"; then cat >> confdefs.h <<\EOF #define FORCE_BUILD_REFCNT_LOGGING 1 @@ -15666,22 +13175,15 @@ EOF fi -# Check whether --enable-detect-webshell-leaks or --disable-detect-webshell-leaks was given. -if test "${enable_detect_webshell_leaks+set}" = set; then - enableval="$enable_detect_webshell_leaks" - if test "$enableval" = "yes"; then - _DETECT_WEBSHELL_LEAKS=1 - elif test "$enableval" = "no"; then - _DETECT_WEBSHELL_LEAKS= - else - { echo "configure: error: Option, detect-webshell-leaks, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -else - if test "$MOZ_DEBUG"; then +MOZ_ARG_ENABLE_BOOL(detect-webshell-leaks, + --enable-detect-webshell-leaks + Enable detection of webshell leaks + (default=debug), + _DETECT_WEBSHELL_LEAKS=1, + _DETECT_WEBSHELL_LEAKS=, + if test "$MOZ_DEBUG"; then _DETECT_WEBSHELL_LEAKS=1 - fi -fi - + fi) if test "$_DETECT_WEBSHELL_LEAKS"; then cat >> confdefs.h <<\EOF @@ -15691,18 +13193,10 @@ EOF fi -# Check whether --enable-wrap-malloc or --disable-wrap-malloc was given. -if test "${enable_wrap_malloc+set}" = set; then - enableval="$enable_wrap_malloc" - if test "$enableval" = "yes"; then - _WRAP_MALLOC=1 - elif test "$enableval" = "no"; then - _WRAP_MALLOC= - else - { echo "configure: error: Option, wrap-malloc, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(wrap-malloc, + --enable-wrap-malloc Wrap malloc calls (gnu linker only), + _WRAP_MALLOC=1, + _WRAP_MALLOC= ) if test -n "$_WRAP_MALLOC"; then if test "$GNU_CC"; then @@ -15711,28 +13205,17 @@ if test -n "$_WRAP_MALLOC"; then fi fi -# Check whether --with-wrap-malloc or --without-wrap-malloc was given. -if test "${with_wrap_malloc+set}" = set; then - withval="$with_wrap_malloc" - WRAP_MALLOC_LIB=$withval -fi - - -# Check whether --enable-efence or --disable-efence was given. -if test "${enable_efence+set}" = set; then - enableval="$enable_efence" - if test "$enableval" = "yes"; then - _ENABLE_EFENCE=1 - elif test "$enableval" = "no"; then - _ENABLE_EFENCE= - else - { echo "configure: error: Option, efence, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_WITH_STRING(wrap-malloc, + --with-wrap-malloc=DIR Location of malloc wrapper library, + WRAP_MALLOC_LIB=$withval) +MOZ_ARG_ENABLE_BOOL(efence, + --enable-efence Link with Electric Fence, + _ENABLE_EFENCE=1, + _ENABLE_EFENCE= ) if test -n "$_ENABLE_EFENCE"; then echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 -echo "configure:15736: checking for malloc in -lefence" >&5 +echo "configure:13219: 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 @@ -15740,7 +13223,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:13238: \"$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 @@ -15780,18 +13263,10 @@ fi fi -# Check whether --enable-jprof or --disable-jprof was given. -if test "${enable_jprof+set}" = set; then - enableval="$enable_jprof" - if test "$enableval" = "yes"; then - MOZ_JPROF=1 - elif test "$enableval" = "no"; then - MOZ_JPROF= - else - { echo "configure: error: Option, jprof, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(jprof, + --enable-jprof Enable jprof profiling tool (needs mozilla/tools/jprof), + MOZ_JPROF=1, + MOZ_JPROF= ) if test -n "$MOZ_JPROF"; then cat >> confdefs.h <<\EOF #define MOZ_JPROF 1 @@ -15800,45 +13275,23 @@ EOF fi -# Check whether --enable-strip or --disable-strip was given. -if test "${enable_strip+set}" = set; then - enableval="$enable_strip" - if test "$enableval" = "yes"; then - ENABLE_STRIP=1 - elif test "$enableval" = "no"; then - ENABLE_STRIP= - else - { echo "configure: error: Option, strip, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_ENABLE_BOOL(strip, + --enable-strip Enable stripping of libs & executables , + ENABLE_STRIP=1, + ENABLE_STRIP= ) + +MOZ_ARG_ENABLE_BOOL(elf-dynstr-gc, + --enable-elf-dynstr-gc Enable elf dynstr garbage collector (opt builds only), + USE_ELF_DYNSTR_GC=1, + USE_ELF_DYNSTR_GC= ) -# Check whether --enable-elf-dynstr-gc or --disable-elf-dynstr-gc was given. -if test "${enable_elf_dynstr_gc+set}" = set; then - enableval="$enable_elf_dynstr_gc" - if test "$enableval" = "yes"; then - USE_ELF_DYNSTR_GC=1 - elif test "$enableval" = "no"; then - USE_ELF_DYNSTR_GC= - else - { echo "configure: error: Option, elf-dynstr-gc, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - - - -# Check whether --enable-old-abi-compat-wrappers or --disable-old-abi-compat-wrappers was given. -if test "${enable_old_abi_compat_wrappers+set}" = set; then - enableval="$enable_old_abi_compat_wrappers" - if test "$enableval" = "yes"; then - MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1 - elif test "$enableval" = "no"; then - MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= - else - { echo "configure: error: Option, old-abi-compat-wrappers, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(old-abi-compat-wrappers, + --enable-old-abi-compat-wrappers + Support old GCC ABI symbols to ease the pain + of the linux compiler change, + MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1, + MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= ) if test "$COMPILE_ENVIRONMENT"; then if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then @@ -15852,12 +13305,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:15856: checking for $ac_func" >&5 +echo "configure:13309: 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:13340: \"$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 @@ -15921,33 +13374,17 @@ EOF fi fi # COMPILE_ENVIRONMENT -# Check whether --enable-prebinding or --disable-prebinding was given. -if test "${enable_prebinding+set}" = set; then - enableval="$enable_prebinding" - if test "$enableval" = "yes"; then - USE_PREBINDING=1 - elif test "$enableval" = "no"; then - USE_PREBINDING= - else - { echo "configure: error: Option, prebinding, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_ENABLE_BOOL(prebinding, + --enable-prebinding Enable prebinding (Mac OS X only), + USE_PREBINDING=1, + USE_PREBINDING= ) +MOZ_ARG_HEADER(Profiling and Instrumenting) -# 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 - +MOZ_ARG_ENABLE_BOOL(timeline, + --enable-timeline Enable timeline services , + MOZ_TIMELINE=1, + MOZ_TIMELINE= ) if test -n "$MOZ_TIMELINE"; then cat >> confdefs.h <<\EOF #define MOZ_TIMELINE 1 @@ -15955,18 +13392,10 @@ EOF fi -# Check whether --enable-reflow-perf or --disable-reflow-perf was given. -if test "${enable_reflow_perf+set}" = set; then - enableval="$enable_reflow_perf" - if test "$enableval" = "yes"; then - MOZ_REFLOW_PERF=1 - elif test "$enableval" = "no"; then - MOZ_REFLOW_PERF= - else - { echo "configure: error: Option, reflow-perf, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(reflow-perf, + --enable-reflow-perf Enable reflow performance tracing, + MOZ_REFLOW_PERF=1, + MOZ_REFLOW_PERF= ) if test -n "$MOZ_REFLOW_PREF"; then cat >> confdefs.h <<\EOF #define MOZ_REFLOW_PREF 1 @@ -15975,18 +13404,10 @@ EOF fi -# Check whether --enable-perf-metrics or --disable-perf-metrics was given. -if test "${enable_perf_metrics+set}" = set; then - enableval="$enable_perf_metrics" - if test "$enableval" = "yes"; then - MOZ_PERF_METRICS=1 - elif test "$enableval" = "no"; then - MOZ_PERF_METRICS= - else - { echo "configure: error: Option, perf-metrics, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(perf-metrics, + --enable-perf-metrics Enable performance metrics, + MOZ_PERF_METRICS=1, + MOZ_PERF_METRICS= ) if test -n "$MOZ_PERF_METRICS"; then cat >> confdefs.h <<\EOF #define MOZ_PERF_METRICS 1 @@ -15994,18 +13415,10 @@ EOF fi -# Check whether --enable-codesighs or --disable-codesighs was given. -if test "${enable_codesighs+set}" = set; then - enableval="$enable_codesighs" - if test "$enableval" = "yes"; then - _ENABLE_CODESIGHS=1 - elif test "$enableval" = "no"; then - _ENABLE_CODESIGHS= - else - { echo "configure: error: Option, codesighs, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(codesighs, + --enable-codesighs Enable code size analysis tools, + _ENABLE_CODESIGHS=1, + _ENABLE_CODESIGHS= ) if test -n "$_ENABLE_CODESIGHS"; then if test -d $srcdir/tools/codesighs; then MOZ_MAPINFO=1 @@ -16015,18 +13428,10 @@ if test -n "$_ENABLE_CODESIGHS"; then fi NS_TRACE_MALLOC=${MOZ_TRACE_MALLOC} -# Check whether --enable-trace-malloc or --disable-trace-malloc was given. -if test "${enable_trace_malloc+set}" = set; then - enableval="$enable_trace_malloc" - if test "$enableval" = "yes"; then - NS_TRACE_MALLOC=1 - elif test "$enableval" = "no"; then - NS_TRACE_MALLOC= - else - { echo "configure: error: Option, trace-malloc, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(trace-malloc, + --enable-trace-malloc Enable malloc tracing, + NS_TRACE_MALLOC=1, + NS_TRACE_MALLOC= ) if test "$NS_TRACE_MALLOC"; then # Please, Mr. Linker Man, don't take away our symbol names MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS= @@ -16038,18 +13443,11 @@ EOF fi -# Check whether --enable-eazel-profiler-support or --disable-eazel-profiler-support was given. -if test "${enable_eazel_profiler_support+set}" = set; then - enableval="$enable_eazel_profiler_support" - if test "$enableval" = "yes"; then - ENABLE_EAZEL_PROFILER=1 - elif test "$enableval" = "no"; then - ENABLE_EAZEL_PROFILER= - else - { echo "configure: error: Option, eazel-profiler-support, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(eazel-profiler-support, + --enable-eazel-profiler-support + Enable Corel/Eazel profiler support, + ENABLE_EAZEL_PROFILER=1, + ENABLE_EAZEL_PROFILER= ) if test -n "$ENABLE_EAZEL_PROFILER"; then cat >> confdefs.h <<\EOF #define ENABLE_EAZEL_PROFILER 1 @@ -16061,25 +13459,15 @@ EOF EAZEL_PROFILER_LIBS="-lprofiler -lpthread" fi -# Check whether --enable-profile-modules or --disable-profile-modules was given. -if test "${enable_profile_modules+set}" = set; then - enableval="$enable_profile_modules" - MOZ_PROFILE_MODULES=`echo $enableval| sed 's/,/ /g'` -fi - - -# Check whether --enable-insure or --disable-insure was given. -if test "${enable_insure+set}" = set; then - enableval="$enable_insure" - if test "$enableval" = "yes"; then - _ENABLE_INSURE=1 - elif test "$enableval" = "no"; then - _ENABLE_INSURE= - else - { echo "configure: error: Option, insure, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi +MOZ_ARG_ENABLE_STRING(profile-modules, + --enable-profile-modules + Enable/disable profiling for specific modules, + MOZ_PROFILE_MODULES=`echo $enableval| sed 's/,/ /g'` ) +MOZ_ARG_ENABLE_BOOL(insure, + --enable-insure Enable insure++ instrumentation (linux only), + _ENABLE_INSURE=1, + _ENABLE_INSURE= ) if test -n "$_ENABLE_INSURE"; then MOZ_INSURE="insure" MOZ_INSURIFYING=1 @@ -16087,32 +13475,20 @@ if test -n "$_ENABLE_INSURE"; then MOZ_INSURE_EXCLUDE_DIRS="config" fi -# Check whether --with-insure-dirs or --without-insure-dirs was given. -if test "${with_insure_dirs+set}" = set; then - withval="$with_insure_dirs" - MOZ_INSURE_DIRS=$withval -fi +MOZ_ARG_WITH_STRING(insure-dirs, + --with-insure-dirs=DIRS + Dirs to instrument with insure , + MOZ_INSURE_DIRS=$withval ) +MOZ_ARG_WITH_STRING(insure-exclude-dirs, + --with-insure-exclude-dirs=DIRS + Dirs to not instrument with insure , + MOZ_INSURE_EXCLUDE_DIRS="config $withval" ) -# Check whether --with-insure-exclude-dirs or --without-insure-exclude-dirs was given. -if test "${with_insure_exclude_dirs+set}" = set; then - withval="$with_insure_exclude_dirs" - MOZ_INSURE_EXCLUDE_DIRS="config $withval" -fi - - -# Check whether --enable-quantify or --disable-quantify was given. -if test "${enable_quantify+set}" = set; then - enableval="$enable_quantify" - if test "$enableval" = "yes"; then - MOZ_QUANTIFY=1 - elif test "$enableval" = "no"; then - MOZ_QUANTIFY= - else - { echo "configure: error: Option, quantify, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(quantify, + --enable-quantify Enable Quantify support (Windows only) , + MOZ_QUANTIFY=1, + MOZ_QUANTIFY= ) if test -z "$SKIP_LIBRARY_CHECKS"; then @@ -16126,12 +13502,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:16130: checking for $ac_func" >&5 +echo "configure:13506: 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:13537: \"$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 @@ -16203,27 +13579,17 @@ fi -# Misc. Options +MOZ_ARG_HEADER(Misc. Options) -# Check whether --enable-xterm-updates or --disable-xterm-updates was given. -if test "${enable_xterm_updates+set}" = set; then - enableval="$enable_xterm_updates" - if test "$enableval" = "yes"; then - MOZ_UPDATE_XTERM=1 - elif test "$enableval" = "no"; then - MOZ_UPDATE_XTERM= - else - { echo "configure: error: Option, xterm-updates, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - - -# Check whether --enable-chrome-format or --disable-chrome-format was given. -if test "${enable_chrome_format+set}" = set; then - enableval="$enable_chrome_format" - MOZ_CHROME_FILE_FORMAT=`echo $enableval | tr A-Z a-z` -fi +MOZ_ARG_ENABLE_BOOL(xterm-updates, + --enable-xterm-updates Update XTERM titles with current command., + MOZ_UPDATE_XTERM=1, + MOZ_UPDATE_XTERM= ) +MOZ_ARG_ENABLE_STRING(chrome-format, + --enable-chrome-format=jar|flat|both|symlink + Select FORMAT of chrome files (default=jar), + MOZ_CHROME_FILE_FORMAT=`echo $enableval | tr A-Z a-z`) if test -z "$MOZ_CHROME_FILE_FORMAT"; then MOZ_CHROME_FILE_FORMAT=jar @@ -16236,28 +13602,20 @@ if test "$MOZ_CHROME_FILE_FORMAT" != "jar" && { echo "configure: error: --enable-chrome-format must be set to either jar, flat, both, or symlink" 1>&2; exit 1; } fi -# Check whether --with-default-mozilla-five-home or --without-default-mozilla-five-home was given. -if test "${with_default_mozilla_five_home+set}" = set; then - withval="$with_default_mozilla_five_home" - val=`echo $withval` - cat >> confdefs.h </dev/null; then - { echo "configure: error: "Homedir must be single relative path."" 1>&2; exit 1; } + AC_MSG_ERROR("Homedir must be single relative path.") else MOZ_USER_DIR="$val" -fi -fi - +fi) cat >> confdefs.h <&6 -echo "configure:16299: checking for gcc -pipe support" >&5 +echo "configure:13651: 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 @@ -16310,14 +13662,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:16321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -16342,33 +13694,26 @@ else echo "$ac_t""no" 1>&6 fi -# Check whether --enable-long-long-warning or --disable-long-long-warning was given. -if test "${enable_long_long_warning+set}" = set; then - enableval="$enable_long_long_warning" - if test "$enableval" = "yes"; then - _IGNORE_LONG_LONG_WARNINGS= - elif test "$enableval" = "no"; then - _IGNORE_LONG_LONG_WARNINGS=1 - else - { echo "configure: error: Option, long-long-warning, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(long-long-warning, + --enable-long-long-warning + Warn about use of non-ANSI long long type, + _IGNORE_LONG_LONG_WARNINGS=, + _IGNORE_LONG_LONG_WARNINGS=1) if test "$_IGNORE_LONG_LONG_WARNINGS"; then _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 -echo "configure:16363: checking whether compiler supports -Wno-long-long" >&5 +echo "configure:13708: checking whether compiler supports -Wno-long-long" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13717: \"$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" @@ -16389,16 +13734,16 @@ _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fprofile-generate" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 -echo "configure:16393: checking whether C compiler supports -fprofile-generate" >&5 +echo "configure:13738: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" @@ -16416,16 +13761,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:16420: checking whether C compiler supports -fprofile-arcs" >&5 +echo "configure:13765: checking whether C compiler supports -fprofile-arcs" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-arcs" result="yes" @@ -16455,34 +13800,25 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross -# Check whether --enable-pedantic or --disable-pedantic was given. -if test "${enable_pedantic+set}" = set; then - enableval="$enable_pedantic" - if test "$enableval" = "no"; then - _PEDANTIC= - elif test "$enableval" = "yes"; then - : - else - { echo "configure: error: Option, pedantic, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(pedantic, + --disable-pedantic Issue all warnings demanded by strict ANSI C , +_PEDANTIC= ) if test "$_PEDANTIC"; then _SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 -echo "configure:16475: checking whether C++ compiler has -pedantic long long bug" >&5 +echo "configure:13811: checking whether C++ compiler has -pedantic long long bug" >&5 if test "$cross_compiling" = yes; then result="maybe" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="no" else @@ -16512,12 +13848,12 @@ fi fi echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 -echo "configure:16516: checking for correct temporary object destruction order" >&5 +echo "configure:13852: 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:13877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -16558,12 +13894,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:16562: checking for correct overload resolution with const and templates" >&5 +echo "configure:13898: 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 < @@ -16593,7 +13929,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_nscap_nonconst_opeq_bug="no" else @@ -16616,18 +13952,10 @@ EOF fi fi # SKIP_COMPILER_CHECKS -# Check whether --enable-cpp-rtti or --disable-cpp-rtti was given. -if test "${enable_cpp_rtti+set}" = set; then - enableval="$enable_cpp_rtti" - if test "$enableval" = "yes"; then - _MOZ_USE_RTTI=1 - elif test "$enableval" = "no"; then - _MOZ_USE_RTTI= - else - { echo "configure: error: Option, cpp-rtti, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(cpp-rtti, + --enable-cpp-rtti Enable C++ RTTI , + _MOZ_USE_RTTI=1 , + _MOZ_USE_RTTI= ) if test "$_MOZ_USE_RTTI"; then _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_ON @@ -16635,18 +13963,10 @@ else _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_OFF fi -# Check whether --enable-cpp-exceptions or --disable-cpp-exceptions was given. -if test "${enable_cpp_exceptions+set}" = set; then - enableval="$enable_cpp_exceptions" - if test "$enableval" = "yes"; then - _MOZ_CPP_EXCEPTIONS=1 - elif test "$enableval" = "no"; then - _MOZ_CPP_EXCEPTIONS= - else - { echo "configure: error: Option, cpp-exceptions, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(cpp-exceptions, + --enable-cpp-exceptions Enable C++ exceptions , + _MOZ_CPP_EXCEPTIONS=1 , + _MOZ_CPP_EXCEPTIONS= ) if test "$_MOZ_CPP_EXCEPTIONS"; then _MOZ_EXCEPTIONS_FLAGS=$_MOZ_EXCEPTIONS_FLAGS_ON @@ -16675,40 +13995,24 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross -# Build dependencies +MOZ_ARG_HEADER(Build dependencies) MOZ_AUTO_DEPS=1 -# Check whether --enable-auto-deps or --disable-auto-deps was given. -if test "${enable_auto_deps+set}" = set; then - enableval="$enable_auto_deps" - if test "$enableval" = "no"; then - MOZ_AUTO_DEPS= - elif test "$enableval" = "yes"; then - MOZ_AUTO_DEPS=1 - else - { echo "configure: error: Option, auto-deps, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(auto-deps, + --disable-auto-deps Do not automatically generate dependency info, + MOZ_AUTO_DEPS=, + MOZ_AUTO_DEPS=1) if test -n "$MOZ_AUTO_DEPS"; then _cpp_md_flag= -# Check whether --enable-md or --disable-md was given. -if test "${enable_md+set}" = set; then - enableval="$enable_md" - if test "$enableval" = "no"; then - _cpp_md_flag= - elif test "$enableval" = "yes"; then - _cpp_md_flag=1 - else - { echo "configure: error: Option, md, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -else - if test "$GNU_CC" -a "$GNU_CXX" -a "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "WINCE"; then +MOZ_ARG_DISABLE_BOOL(md, + --disable-md Do not use compiler-based dependencies , + _cpp_md_flag=, + _cpp_md_flag=1, + dnl Default is to turn on -MD if using GNU-compatible compilers + if test "$GNU_CC" -a "$GNU_CXX" -a "$OS_ARCH" != "WINNT" -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 @@ -16729,33 +14033,17 @@ MDDEPDIR='.deps' -# Static build options +MOZ_ARG_HEADER(Static build options) -# 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(static, + --enable-static Enable building of internal static libs, + BUILD_STATIC_LIBS=1, + BUILD_STATIC_LIBS=) +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; } @@ -16775,18 +14063,10 @@ else XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS" fi -# 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 - +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= ) @@ -16802,14 +14082,12 @@ fi fi -# Standalone module options (Not for building Mozilla) - -# Check whether --enable-standalone-modules or --disable-standalone-modules was given. -if test "${enable_standalone_modules+set}" = set; then - enableval="$enable_standalone_modules" - BUILD_MODULES=`echo $enableval | sed 's/,/ /g'` -fi +MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla)) +MOZ_ARG_ENABLE_STRING(standalone-modules, + --enable-standalone-modules=mod1[,mod2] + Enable standalone build of specific modules, + BUILD_MODULES=`echo $enableval | sed 's/,/ /g'` ) if test "$BUILD_MODULES" != "all" && test `echo "$BUILD_MODULES" | grep -c ldap` = 0 && @@ -16830,18 +14108,9 @@ if test -z "$COMPILE_ENVIRONMENT"; then SKIP_IDL_CHECK="yes" fi -# Check whether --with-libIDL or --without-libIDL was given. -if test "${with_libIDL+set}" = set; then - withval="$with_libIDL" - if test "$withval" = "no"; then - SKIP_IDL_CHECK="yes" - elif test "$withval" = "yes"; then - : - else - { echo "configure: error: Option, libIDL, does not take an argument ($withval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_WITHOUT_BOOL(libIDL, + --without-libIDL Skip check for libIDL (standalone modules only), + SKIP_IDL_CHECK="yes") if test "$SKIP_IDL_CHECK" = "no" then @@ -16860,1271 +14129,15 @@ then fi if test "$MOZ_ENABLE_GTK2"; then - 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:16870: 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:16914: 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:16921: 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:16926: 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 - + PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0, _LIBIDL_FOUND=1,_LIBIDL_FOUND=) fi if test "$MOZ_ENABLE_GTK"; then - # 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:17048: 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:17083: 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:17182: \"$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:17226: \"$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:17270: 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:17305: 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:17418: \"$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:17463: \"$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 - + AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1) fi if test -z "$_LIBIDL_FOUND"; then - # 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:17591: 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:17626: 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:17725: \"$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:17769: \"$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:17813: 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:17848: 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:17961: \"$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:18006: \"$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 - + AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1) if test -z "$_LIBIDL_FOUND"; then - 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:18046: 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:18090: 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:18097: 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:18102: 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 - + PKG_CHECK_MODULES(LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1) fi fi if test -z "$_LIBIDL_FOUND" && test -z "$CROSS_COMPILE"; then @@ -18133,7 +14146,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:18137: checking for $ac_word" >&5 +echo "configure:14150: 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 @@ -18170,7 +14183,7 @@ done if test -n "$ORBIT_CONFIG"; then echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 -echo "configure:18174: checking for ORBit libIDL usability" >&5 +echo "configure:14187: 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}` @@ -18187,7 +14200,7 @@ echo "configure:18174: checking for ORBit libIDL usability" >&5 result="maybe" else cat > conftest.$ac_ext < @@ -18202,7 +14215,7 @@ int main() { } EOF -if { (eval echo configure:18206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14219: \"$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" @@ -18252,367 +14265,9 @@ fi if test -z "$SKIP_PATH_CHECKS"; then if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then if test "$MOZ_ENABLE_GTK2"; then - 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:18262: 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:18306: 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:18313: 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:18318: 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 - + PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0) else - # Check whether --with-glib-prefix or --without-glib-prefix was given. -if test "${with_glib_prefix+set}" = set; then - withval="$with_glib_prefix" - glib_config_prefix="$withval" -else - glib_config_prefix="" -fi - -# Check whether --with-glib-exec-prefix or --without-glib-exec-prefix was given. -if test "${with_glib_exec_prefix+set}" = set; then - withval="$with_glib_exec_prefix" - glib_config_exec_prefix="$withval" -else - glib_config_exec_prefix="" -fi - -# Check whether --enable-glibtest or --disable-glibtest was given. -if test "${enable_glibtest+set}" = set; then - enableval="$enable_glibtest" - : -else - enable_glibtest=yes -fi - - - if test x$glib_config_exec_prefix != x ; then - glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config - fi - fi - if test x$glib_config_prefix != x ; then - glib_config_args="$glib_config_args --prefix=$glib_config_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_prefix/bin/glib-config - fi - fi - - for module in . - do - case "$module" in - gmodule) - glib_config_args="$glib_config_args gmodule" - ;; - gthread) - glib_config_args="$glib_config_args gthread" - ;; - esac - done - - unset ac_cv_path_GLIB_CONFIG - - # Extract the first word of "glib-config", so it can be a program name with args. -set dummy glib-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18401: 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:18436: 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:18535: \"$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:18579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" - echo "*** may want to edit the glib-config script: $GLIB_CONFIG" -fi -rm -f conftest* - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - : - fi - - - rm -f conf.glibtest - + AM_PATH_GLIB(${GLIB_VERSION}) fi fi fi @@ -18654,19 +14309,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:18658: checking for working alloca.h" >&5 +echo "configure:14313: 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:18670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14325: \"$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 @@ -18687,12 +14342,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:18691: checking for alloca" >&5 +echo "configure:14346: 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:14379: \"$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 @@ -18752,12 +14407,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:18756: checking whether alloca needs Cray hooks" >&5 +echo "configure:14411: 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:18786: checking for $ac_func" >&5 +echo "configure:14441: 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:14469: \"$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 @@ -18837,7 +14492,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:18841: checking stack direction for C alloca" >&5 +echo "configure:14496: 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 @@ -18845,7 +14500,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:14523: \"$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 @@ -18894,18 +14549,10 @@ if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_ MOZ_CAIRO_CFLAGS='-I$(DIST)/include/cairo' MOZ_TREE_CAIRO=1 - # Check whether --enable-system-cairo or --disable-system-cairo was given. -if test "${enable_system_cairo+set}" = set; then - enableval="$enable_system_cairo" - if test "$enableval" = "yes"; then - MOZ_TREE_CAIRO= - elif test "$enableval" = "no"; then - MOZ_TREE_CAIRO=1 - else - { echo "configure: error: Option, system-cairo, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - + MOZ_ARG_ENABLE_BOOL(system-cairo, + --enable-system-cairo Use system cairo (located with pkgconfig), + MOZ_TREE_CAIRO=, + MOZ_TREE_CAIRO=1 ) if test "$MOZ_TREE_CAIRO"; then # Check for headers defining standard int types. @@ -18913,17 +14560,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18917: checking for $ac_hdr" >&5 +echo "configure:14564: 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:18927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14574: \"$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* @@ -19023,95 +14670,7 @@ EOF fi fi else - 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:19033: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$PKG_CONFIG" in - /*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac -fi -PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -if test -n "$PKG_CONFIG"; then - echo "$ac_t""$PKG_CONFIG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 -echo "configure:19077: checking for cairo >= $CAIRO_VERSION" >&5 - - if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then - echo "$ac_t""yes" 1>&6 - succeeded=yes - - echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 -echo "configure:19084: checking CAIRO_CFLAGS" >&5 - CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` - echo "$ac_t""$CAIRO_CFLAGS" 1>&6 - - echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 -echo "configure:19089: checking CAIRO_LIBS" >&5 - ## Remove evil flags like -Wl,--export-dynamic - CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION\" |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"` - echo $CAIRO_PKG_ERRORS - fi - - - - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - : - else - { echo "configure: error: Library requirements (cairo >= $CAIRO_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } - fi - + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION) MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS MOZ_CAIRO_LIBS=$CAIRO_LIBS fi @@ -19121,18 +14680,9 @@ fi -# Check whether --enable-xul or --disable-xul was given. -if test "${enable_xul+set}" = set; then - enableval="$enable_xul" - if test "$enableval" = "no"; then - MOZ_XUL= - elif test "$enableval" = "yes"; then - : - else - { echo "configure: error: Option, xul, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(xul, + --disable-xul Disable XUL, + MOZ_XUL= ) if test "$MOZ_XUL"; then cat >> confdefs.h <<\EOF #define MOZ_XUL 1 @@ -19149,7 +14699,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c python/xpcom` -ne 0; then # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19153: checking for $ac_word" >&5 +echo "configure:14703: 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 @@ -19226,18 +14776,10 @@ fi -# Check whether --enable-profilesharing or --disable-profilesharing was given. -if test "${enable_profilesharing+set}" = set; then - enableval="$enable_profilesharing" - if test "$enableval" = "no"; then - MOZ_PROFILESHARING= - elif test "$enableval" = "yes"; then - MOZ_PROFILESHARING=1 - else - { echo "configure: error: Option, profilesharing, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(profilesharing, + --disable-profilesharing Disable profile sharing, + MOZ_PROFILESHARING=, + MOZ_PROFILESHARING=1 ) if test "$MOZ_PROFILESHARING"; then MOZ_IPCD=1 cat >> confdefs.h <<\EOF @@ -19246,18 +14788,10 @@ EOF fi -# Check whether --enable-profilelocking or --disable-profilelocking was given. -if test "${enable_profilelocking+set}" = set; then - enableval="$enable_profilelocking" - if test "$enableval" = "no"; then - MOZ_PROFILELOCKING= - elif test "$enableval" = "yes"; then - MOZ_PROFILELOCKING=1 - else - { echo "configure: error: Option, profilelocking, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(profilelocking, + --disable-profilelocking Disable profile locking, + MOZ_PROFILELOCKING=, + MOZ_PROFILELOCKING=1 ) if test "$MOZ_PROFILELOCKING"; then cat >> confdefs.h <<\EOF #define MOZ_PROFILELOCKING 1 @@ -19267,10 +14801,10 @@ fi -# Check whether --enable-necko-protocols or --disable-necko-protocols was given. -if test "${enable_necko_protocols+set}" = set; then - enableval="$enable_necko_protocols" - for option in `echo $enableval | sed 's/,/ /g'`; do +MOZ_ARG_ENABLE_STRING(necko-protocols, + --enable-necko-protocols[={http,ftp,default,all,none}] + Enable/disable specific protocol handlers, + for option in `echo $enableval | sed 's/,/ /g'`; do if test "$option" = "yes" || test "$option" = "all"; then NECKO_PROTOCOLS="$NECKO_PROTOCOLS $NECKO_PROTOCOLS_DEFAULT" elif test "$option" = "no" || test "$option" = "none"; then @@ -19283,11 +14817,8 @@ if test "${enable_necko_protocols+set}" = set; then else NECKO_PROTOCOLS="$NECKO_PROTOCOLS $option" fi -done -else - NECKO_PROTOCOLS="$NECKO_PROTOCOLS_DEFAULT" -fi - +done, + NECKO_PROTOCOLS="$NECKO_PROTOCOLS_DEFAULT") NECKO_PROTOCOLS=`${PERL} ${srcdir}/build/unix/uniq.pl ${NECKO_PROTOCOLS}` for p in $NECKO_PROTOCOLS; do @@ -19297,18 +14828,11 @@ EOF done -# Check whether --enable-necko-disk-cache or --disable-necko-disk-cache was given. -if test "${enable_necko_disk_cache+set}" = set; then - enableval="$enable_necko_disk_cache" - if test "$enableval" = "no"; then - NECKO_DISK_CACHE= - elif test "$enableval" = "yes"; then - NECKO_DISK_CACHE=1 - else - { echo "configure: error: Option, necko-disk-cache, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(necko-disk-cache, + --disable-necko-disk-cache + Disable necko disk cache, + NECKO_DISK_CACHE=, + NECKO_DISK_CACHE=1) if test "$NECKO_DISK_CACHE"; then cat >> confdefs.h <<\EOF @@ -19317,18 +14841,11 @@ EOF fi -# Check whether --enable-necko-small-buffers or --disable-necko-small-buffers was given. -if test "${enable_necko_small_buffers+set}" = set; then - enableval="$enable_necko_small_buffers" - if test "$enableval" = "yes"; then - NECKO_SMALL_BUFFERS=1 - elif test "$enableval" = "no"; then - NECKO_SMALL_BUFFERS= - else - { echo "configure: error: Option, necko-small-buffers, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_ENABLE_BOOL(necko-small-buffers, + --enable-necko-small-buffers + Minimize size of necko's i/o buffers, + NECKO_SMALL_BUFFERS=1, + NECKO_SMALL_BUFFERS=) if test "$NECKO_SMALL_BUFFERS"; then cat >> confdefs.h <<\EOF @@ -19337,18 +14854,10 @@ EOF fi -# Check whether --enable-cookies or --disable-cookies was given. -if test "${enable_cookies+set}" = set; then - enableval="$enable_cookies" - if test "$enableval" = "no"; then - NECKO_COOKIES= - elif test "$enableval" = "yes"; then - NECKO_COOKIES=1 - else - { echo "configure: error: Option, cookies, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(cookies, + --disable-cookies Disable cookie support, + NECKO_COOKIES=, + NECKO_COOKIES=1) if test "$NECKO_COOKIES"; then cat >> confdefs.h <<\EOF @@ -19359,18 +14868,10 @@ fi _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_" -# Check whether --enable-v1-string-abi or --disable-v1-string-abi was given. -if test "${enable_v1_string_abi+set}" = set; then - enableval="$enable_v1_string_abi" - if test "$enableval" = "no"; then - MOZ_V1_STRING_ABI= - elif test "$enableval" = "yes"; then - MOZ_V1_STRING_ABI=1 - else - { echo "configure: error: Option, v1-string-abi, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - +MOZ_ARG_DISABLE_BOOL(v1-string-abi, + --disable-v1-string-abi Disable binary compatibility layer for strings, + MOZ_V1_STRING_ABI=, + MOZ_V1_STRING_ABI=1) if test "$MOZ_V1_STRING_ABI"; then cat >> confdefs.h <<\EOF @@ -19411,14 +14912,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:19422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -19722,7 +15223,7 @@ if test "$MOZ_X11"; then _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $XCFLAGS" cat > conftest.$ac_ext < @@ -19738,7 +15239,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -20194,9 +15695,6 @@ s%@AIX_OBJMODEL@%$AIX_OBJMODEL%g s%@NO_LD_ARCHIVE_FLAGS@%$NO_LD_ARCHIVE_FLAGS%g s%@WRAP_SYSTEM_INCLUDES@%$WRAP_SYSTEM_INCLUDES%g s%@VISIBILITY_FLAGS@%$VISIBILITY_FLAGS%g -s%@FT2_CONFIG@%$FT2_CONFIG%g -s%@FT2_CFLAGS@%$FT2_CFLAGS%g -s%@FT2_LIBS@%$FT2_LIBS%g s%@XCFLAGS@%$XCFLAGS%g s%@XLDFLAGS@%$XLDFLAGS%g s%@XLIBS@%$XLIBS%g @@ -20204,20 +15702,9 @@ s%@XT_LIBS@%$XT_LIBS%g s%@MACOSX_DEPLOYMENT_TARGET@%$MACOSX_DEPLOYMENT_TARGET%g s%@LIBOBJS@%$LIBOBJS%g s%@HAVE_GCC3_ABI@%$HAVE_GCC3_ABI%g -s%@NSPR_CONFIG@%$NSPR_CONFIG%g -s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g -s%@NSPR_LIBS@%$NSPR_LIBS%g -s%@NSS_CONFIG@%$NSS_CONFIG%g -s%@NSS_CFLAGS@%$NSS_CFLAGS%g -s%@NSS_LIBS@%$NSS_LIBS%g -s%@GTK_CONFIG@%$GTK_CONFIG%g -s%@GTK_CFLAGS@%$GTK_CFLAGS%g -s%@GTK_LIBS@%$GTK_LIBS%g -s%@PKG_CONFIG@%$PKG_CONFIG%g -s%@MOZ_GTK2_CFLAGS@%$MOZ_GTK2_CFLAGS%g -s%@MOZ_GTK2_LIBS@%$MOZ_GTK2_LIBS%g s%@HOST_MOC@%$HOST_MOC%g s%@MOZ_DEFAULT_TOOLKIT@%$MOZ_DEFAULT_TOOLKIT%g +s%@GTK_CONFIG@%$GTK_CONFIG%g s%@TK_CFLAGS@%$TK_CFLAGS%g s%@TK_LIBS@%$TK_LIBS%g s%@MOZ_ENABLE_CANVAS@%$MOZ_ENABLE_CANVAS%g @@ -20232,6 +15719,8 @@ 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 @@ -20253,14 +15742,12 @@ 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%@_PANGOCHK_CFLAGS@%$_PANGOCHK_CFLAGS%g -s%@_PANGOCHK_LIBS@%$_PANGOCHK_LIBS%g -s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g +s%@MOZ_ENABLE_PANGO@%$MOZ_ENABLE_PANGO%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 @@ -20269,9 +15756,9 @@ s%@MOZ_GCONF_LIBS@%$MOZ_GCONF_LIBS%g s%@MOZ_LIBGNOME_CFLAGS@%$MOZ_LIBGNOME_CFLAGS%g s%@MOZ_LIBGNOME_LIBS@%$MOZ_LIBGNOME_LIBS%g s%@MOZ_ENABLE_GNOME_COMPONENT@%$MOZ_ENABLE_GNOME_COMPONENT%g +s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g s%@MOZ_GNOMEUI_CFLAGS@%$MOZ_GNOMEUI_CFLAGS%g s%@MOZ_GNOMEUI_LIBS@%$MOZ_GNOMEUI_LIBS%g -s%@MOZ_ENABLE_GNOMEUI@%$MOZ_ENABLE_GNOMEUI%g s%@MOZ_EXTRA_X11CONVERTERS@%$MOZ_EXTRA_X11CONVERTERS%g s%@MOZ_PLAINTEXT_EDITOR_ONLY@%$MOZ_PLAINTEXT_EDITOR_ONLY%g s%@MOZ_COMPOSER@%$MOZ_COMPOSER%g @@ -20301,13 +15788,11 @@ 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%@GLIB_CONFIG@%$GLIB_CONFIG%g s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g s%@GLIB_LIBS@%$GLIB_LIBS%g -s%@LIBIDL_CONFIG@%$LIBIDL_CONFIG%g -s%@ORBIT_CONFIG@%$ORBIT_CONFIG%g s%@GLIB_GMODULE_LIBS@%$GLIB_GMODULE_LIBS%g s%@HOST_LIBIDL_CONFIG@%$HOST_LIBIDL_CONFIG%g s%@HOST_LIBIDL_CFLAGS@%$HOST_LIBIDL_CFLAGS%g @@ -20327,8 +15812,6 @@ 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%@SANITY_CHECKING_FEATURE@%$SANITY_CHECKING_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 @@ -20499,7 +15982,11 @@ 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