зеркало из https://github.com/mozilla/gecko-dev.git
Automated update
This commit is contained in:
leaf%mozilla.org
Родитель
3e284363cf
Коммит
06c0794672
|
|
@ -149,13 +149,13 @@ ac_help="$ac_help
|
|||
ac_help="$ac_help
|
||||
--enable-elf-dynstr-gc Enable elf dynstr garbage collector (opt builds only)"
|
||||
ac_help="$ac_help
|
||||
--enable-timeline Enable timeline services "
|
||||
--enable-timeline Enable timeline services (default=debug)"
|
||||
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-trace-malloc Enable malloc tracing"
|
||||
--enable-trace-malloc Enable malloc tracing (default=debug)"
|
||||
ac_help="$ac_help
|
||||
--enable-eazel-profiler-support
|
||||
Enable Corel/Eazel profiler support"
|
||||
|
|
@ -10910,19 +10910,27 @@ MOZ_TIMELINE=
|
|||
if test "${enable_timeline+set}" = set; then
|
||||
enableval="$enable_timeline"
|
||||
if test "$enableval" = "yes"; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define MOZ_TIMELINE 1
|
||||
EOF
|
||||
|
||||
MOZ_TIMELINE=1
|
||||
_MOZ_TIMELINE=1
|
||||
elif test "$enableval" = "no"; then
|
||||
:
|
||||
else
|
||||
{ echo "configure: error: Option, timeline, does not take an argument ($enableval)." 1>&2; exit 1; }
|
||||
fi
|
||||
else
|
||||
if test "$MOZ_DEBUG"; then
|
||||
_MOZ_TIMELINE=1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if test "$_MOZ_TIMELINE"; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define MOZ_TIMELINE 1
|
||||
EOF
|
||||
|
||||
MOZ_TIMELINE=1
|
||||
fi
|
||||
|
||||
MOZ_REFLOW_PERF=
|
||||
# Check whether --enable-reflow-perf or --disable-reflow-perf was given.
|
||||
if test "${enable_reflow_perf+set}" = set; then
|
||||
|
|
@ -10964,15 +10972,21 @@ NS_TRACE_MALLOC=
|
|||
if test "${enable_trace_malloc+set}" = set; then
|
||||
enableval="$enable_trace_malloc"
|
||||
if test "$enableval" = "yes"; then
|
||||
NS_TRACE_MALLOC=1
|
||||
_NS_TRACE_MALLOC=1
|
||||
elif test "$enableval" = "no"; then
|
||||
:
|
||||
else
|
||||
{ echo "configure: error: Option, trace-malloc, does not take an argument ($enableval)." 1>&2; exit 1; }
|
||||
fi
|
||||
else
|
||||
if test "$MOZ_DEBUG"; then
|
||||
_NS_TRACE_MALLOC=1
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$NS_TRACE_MALLOC"; then
|
||||
|
||||
if test "$_NS_TRACE_MALLOC"; then
|
||||
NS_TRACE_MALLOC=1
|
||||
# Please, Mr. Linker Man, don't take away our symbol names
|
||||
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=
|
||||
USE_ELF_DYNSTR_GC=
|
||||
|
|
@ -11046,7 +11060,7 @@ fi
|
|||
|
||||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
|
||||
echo "configure:11050: checking for cplus_demangle in -liberty" >&5
|
||||
echo "configure:11064: checking for cplus_demangle in -liberty" >&5
|
||||
ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -11054,7 +11068,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-liberty "-liberty" $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11058 "configure"
|
||||
#line 11072 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -11065,7 +11079,7 @@ int main() {
|
|||
cplus_demangle()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11083: \"$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
|
||||
|
|
@ -11211,7 +11225,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
|
|||
# Compiler Options
|
||||
|
||||
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
|
||||
echo "configure:11215: checking for gcc -pipe support" >&5
|
||||
echo "configure:11229: checking for gcc -pipe support" >&5
|
||||
if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
|
||||
echo '#include <stdio.h>' > dummy-hello.c
|
||||
echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
|
||||
|
|
@ -11226,14 +11240,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 <<EOF
|
||||
#line 11230 "configure"
|
||||
#line 11244 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf("Hello World\n");
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_res_gcc_pipe="yes"
|
||||
else
|
||||
|
|
@ -11282,12 +11296,12 @@ if test "$_PEDANTIC"; then
|
|||
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
|
||||
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
|
||||
echo "configure:11286: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||
echo "configure:11300: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||
if test "$cross_compiling" = yes; then
|
||||
result="maybe"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11291 "configure"
|
||||
#line 11305 "configure"
|
||||
#include "confdefs.h"
|
||||
#ifdef __cplusplus
|
||||
extern "C" void exit(int);
|
||||
|
|
@ -11296,7 +11310,7 @@ extern "C" void exit(int);
|
|||
if (sizeof(long long) != 8) { return 1; }
|
||||
return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:11314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
result="no"
|
||||
else
|
||||
|
|
@ -11328,12 +11342,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:11332: checking for correct overload resolution with const and templates" >&5
|
||||
echo "configure:11346: 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 <<EOF
|
||||
#line 11337 "configure"
|
||||
#line 11351 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
template <class T>
|
||||
|
|
@ -11363,7 +11377,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_nscap_nonconst_opeq_bug="no"
|
||||
else
|
||||
|
|
@ -11403,16 +11417,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
|
|||
_SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
|
||||
echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
|
||||
echo "configure:11407: checking whether compiler supports -Wno-long-long" >&5
|
||||
echo "configure:11421: checking whether compiler supports -Wno-long-long" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11409 "configure"
|
||||
#line 11423 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11430: \"$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"
|
||||
|
|
@ -11618,7 +11632,7 @@ case "$target" in
|
|||
# Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
|
||||
set dummy makeC++SharedLib_r; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:11622: checking for $ac_word" >&5
|
||||
echo "configure:11636: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -11819,7 +11833,7 @@ fi
|
|||
# Extract the first word of "glib-config", so it can be a program name with args.
|
||||
set dummy glib-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:11823: checking for $ac_word" >&5
|
||||
echo "configure:11837: 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
|
||||
|
|
@ -11854,7 +11868,7 @@ fi
|
|||
|
||||
min_glib_version=1.2.0
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:11858: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:11872: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
|
|
@ -11877,7 +11891,7 @@ echo "configure:11858: checking for GLIB - version >= $min_glib_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11881 "configure"
|
||||
#line 11895 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -11953,7 +11967,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:11957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:11971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -11987,7 +12001,7 @@ fi
|
|||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11991 "configure"
|
||||
#line 12005 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -11997,7 +12011,7 @@ int main() {
|
|||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12015: \"$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"
|
||||
|
|
@ -12041,7 +12055,7 @@ rm -f conftest*
|
|||
# Extract the first word of "libIDL-config", so it can be a program name with args.
|
||||
set dummy libIDL-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:12045: checking for $ac_word" >&5
|
||||
echo "configure:12059: 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
|
||||
|
|
@ -12076,7 +12090,7 @@ fi
|
|||
|
||||
min_libIDL_version=$LIBIDL_VERSION
|
||||
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
||||
echo "configure:12080: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
echo "configure:12094: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
no_libIDL=""
|
||||
if test "$LIBIDL_CONFIG" = "no" ; then
|
||||
no_libIDL=yes
|
||||
|
|
@ -12103,7 +12117,7 @@ echo "configure:12080: checking for libIDL - version >= $min_libIDL_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12107 "configure"
|
||||
#line 12121 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -12189,7 +12203,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:12193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -12223,7 +12237,7 @@ fi
|
|||
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
||||
LIBS="$LIBS $LIBIDL_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12227 "configure"
|
||||
#line 12241 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -12234,7 +12248,7 @@ int main() {
|
|||
return IDL_get_libver_string ? 1 : 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12252: \"$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"
|
||||
|
|
@ -12273,7 +12287,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:12277: checking for $ac_word" >&5
|
||||
echo "configure:12291: 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
|
||||
|
|
@ -12399,7 +12413,7 @@ fi
|
|||
# Extract the first word of "glib-config", so it can be a program name with args.
|
||||
set dummy glib-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:12403: checking for $ac_word" >&5
|
||||
echo "configure:12417: 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
|
||||
|
|
@ -12434,7 +12448,7 @@ fi
|
|||
|
||||
min_glib_version=${GLIB_VERSION}
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:12438: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:12452: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
|
|
@ -12457,7 +12471,7 @@ echo "configure:12438: checking for GLIB - version >= $min_glib_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12461 "configure"
|
||||
#line 12475 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -12533,7 +12547,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:12537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -12567,7 +12581,7 @@ fi
|
|||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12571 "configure"
|
||||
#line 12585 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -12577,7 +12591,7 @@ int main() {
|
|||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12595: \"$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"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче