Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge trunk changes.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/ZAP_20050610_BRANCH@184454 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alex%croczilla.com
2005-11-11 11:50:11 +00:00
parent 08896183cd
commit 713897dff6
4 changed files with 153 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

261
mozilla/configure vendored
View File

@@ -14433,8 +14433,16 @@ JAR=
if test `echo "$MOZ_EXTENSIONS" | grep -c java` -ne 0; then
MOZ_ENABLE_JAVAXPCOM=1
case "$host_os" in
mingw*|cygwin*|msvc*|mks*)
if test -n "$JAVA_HOME"; then
JAVA_HOME=`cygpath -u \`cygpath -m -s "$JAVA_HOME"\``
fi
;;
esac
if test -n "${JAVA_INCLUDE_PATH}"; then
if test ! -f $JAVA_INCLUDE_PATH/jni.h; then
if test ! -f "$JAVA_INCLUDE_PATH/jni.h"; then
{ echo "configure: error: jni.h was not found in given include path $JAVA_INCLUDE_PATH." 1>&2; exit 1; }
fi
else
@@ -14443,31 +14451,24 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c java` -ne 0; then
JAVA_INCLUDE_PATH=/System/Library/Frameworks/JavaVM.framework/Headers
;;
*)
JAVA_INCLUDE_PATH=$JAVA_HOME/include
JAVA_INCLUDE_PATH="$JAVA_HOME/include"
;;
esac
if test ! -f $JAVA_INCLUDE_PATH/jni.h; then
if test ! -f "$JAVA_INCLUDE_PATH/jni.h"; then
{ echo "configure: error: The header jni.h was not found. Set \$JAVA_HOME or use --with-java-include-path={java-include-dir}." 1>&2; exit 1; }
fi
fi
if test -n "${JAVA_BIN_PATH}"; then
_JAVA_PATH=$JAVA_BIN_PATH
JAVA_PATH="$JAVA_BIN_PATH"
else
_JAVA_PATH=$JAVA_HOME/bin:$PATH
JAVA_PATH="$JAVA_HOME/bin:$PATH"
fi
case "$host_os" in
mingw*|cygwin*|msvc*|mks*)
JAVA_PATH=`cygpath -u $_JAVA_PATH`
;;
*)
JAVA_PATH=$_JAVA_PATH
;;
esac
# 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:14471: checking for $ac_word" >&5
echo "configure:14472: 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
@@ -14503,7 +14504,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:14507: checking for $ac_word" >&5
echo "configure:14508: 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
@@ -14675,7 +14676,7 @@ fi
gdiplus)
MOZ_SVG_RENDERER_GDIPLUS=1
echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6
echo "configure:14679: checking for Gdiplus.h" >&5
echo "configure:14680: checking for Gdiplus.h" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -14685,7 +14686,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
#line 14689 "configure"
#line 14690 "configure"
#include "confdefs.h"
#include <windows.h>
#include <unknwn.h>
@@ -14694,7 +14695,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:14698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:14699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@@ -14783,13 +14784,13 @@ 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:14787: checking for iconv" >&5
echo "configure:14788: 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:14793: checking for $ac_word" >&5
echo "configure:14794: 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
@@ -15074,18 +15075,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:15078: checking for valid debug flags" >&5
echo "configure:15079: checking for valid debug flags" >&5
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
cat > conftest.$ac_ext <<EOF
#line 15082 "configure"
#line 15083 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
if { (eval echo configure:15089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:15090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_results=yes
else
@@ -15126,18 +15127,18 @@ fi
if test "$COMPILE_ENVIRONMENT"; then
if test -n "$MOZ_OPTIMIZE"; then
echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6
echo "configure:15130: checking for valid optimization flags" >&5
echo "configure:15131: checking for valid optimization flags" >&5
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
cat > conftest.$ac_ext <<EOF
#line 15134 "configure"
#line 15135 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
if { (eval echo configure:15141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:15142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_results=yes
else
@@ -15354,7 +15355,7 @@ fi
if test -n "$_ENABLE_EFENCE"; then
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
echo "configure:15358: checking for malloc in -lefence" >&5
echo "configure:15359: 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
@@ -15362,7 +15363,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lefence $LIBS"
cat > conftest.$ac_ext <<EOF
#line 15366 "configure"
#line 15367 "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
@@ -15373,7 +15374,7 @@ int main() {
malloc()
; return 0; }
EOF
if { (eval echo configure:15377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:15378: \"$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
@@ -15474,12 +15475,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:15478: checking for $ac_func" >&5
echo "configure:15479: 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 <<EOF
#line 15483 "configure"
#line 15484 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -15505,7 +15506,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:15509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:15510: \"$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
@@ -15748,12 +15749,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:15752: checking for $ac_func" >&5
echo "configure:15753: 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 <<EOF
#line 15757 "configure"
#line 15758 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -15779,7 +15780,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:15783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:15784: \"$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
@@ -15917,7 +15918,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
# Compiler Options
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
echo "configure:15921: checking for gcc -pipe support" >&5
echo "configure:15922: 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
@@ -15932,14 +15933,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 15936 "configure"
#line 15937 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
printf("Hello World\n");
; return 0; }
EOF
if { (eval echo configure:15943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:15944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_res_gcc_pipe="yes"
else
@@ -15981,16 +15982,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:15985: checking whether compiler supports -Wno-long-long" >&5
echo "configure:15986: checking whether compiler supports -Wno-long-long" >&5
cat > conftest.$ac_ext <<EOF
#line 15987 "configure"
#line 15988 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
if { (eval echo configure:15994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:15995: \"$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"
@@ -16011,16 +16012,16 @@ _SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fprofile-generate"
echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
echo "configure:16015: checking whether C compiler supports -fprofile-generate" >&5
echo "configure:16016: checking whether C compiler supports -fprofile-generate" >&5
cat > conftest.$ac_ext <<EOF
#line 16017 "configure"
#line 16018 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
if { (eval echo configure:16024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:16025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
PROFILE_GEN_CFLAGS="-fprofile-generate"
result="yes"
@@ -16038,16 +16039,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:16042: checking whether C compiler supports -fprofile-arcs" >&5
echo "configure:16043: checking whether C compiler supports -fprofile-arcs" >&5
cat > conftest.$ac_ext <<EOF
#line 16044 "configure"
#line 16045 "configure"
#include "confdefs.h"
int main() {
return 0;
; return 0; }
EOF
if { (eval echo configure:16051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:16052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
PROFILE_GEN_CFLAGS="-fprofile-arcs"
result="yes"
@@ -16093,12 +16094,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:16097: checking whether C++ compiler has -pedantic long long bug" >&5
echo "configure:16098: 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 16102 "configure"
#line 16103 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@@ -16107,7 +16108,7 @@ extern "C" void exit(int);
if (sizeof(long long) != 8) { return 1; }
return 0; }
EOF
if { (eval echo configure:16111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:16112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
result="no"
else
@@ -16137,12 +16138,12 @@ fi
fi
echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
echo "configure:16141: checking for correct temporary object destruction order" >&5
echo "configure:16142: checking for correct temporary object destruction order" >&5
if test "$cross_compiling" = yes; then
result="maybe"
else
cat > conftest.$ac_ext <<EOF
#line 16146 "configure"
#line 16147 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@@ -16165,7 +16166,7 @@ extern "C" void exit(int);
}
EOF
if { (eval echo configure:16169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:16170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
result="yes"
else
@@ -16186,12 +16187,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:16190: checking for correct overload resolution with const and templates" >&5
echo "configure:16191: 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 16195 "configure"
#line 16196 "configure"
#include "confdefs.h"
template <class T>
@@ -16221,7 +16222,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:16225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:16226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_nscap_nonconst_opeq_bug="no"
else
@@ -16467,7 +16468,7 @@ then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:16471: checking for $ac_word" >&5
echo "configure:16472: 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
@@ -16511,19 +16512,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0""... $ac_c" 1>&6
echo "configure:16515: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5
echo "configure:16516: 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:16522: checking LIBIDL_CFLAGS" >&5
echo "configure:16523: 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:16527: checking LIBIDL_LIBS" >&5
echo "configure:16528: 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
@@ -16645,7 +16646,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:16649: checking for $ac_word" >&5
echo "configure:16650: 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
@@ -16680,7 +16681,7 @@ fi
min_glib_version=1.2.0
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
echo "configure:16684: checking for GLIB - version >= $min_glib_version" >&5
echo "configure:16685: checking for GLIB - version >= $min_glib_version" >&5
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
@@ -16703,7 +16704,7 @@ echo "configure:16684: checking for GLIB - version >= $min_glib_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 16707 "configure"
#line 16708 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -16779,7 +16780,7 @@ main ()
}
EOF
if { (eval echo configure:16783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:16784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -16813,7 +16814,7 @@ fi
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <<EOF
#line 16817 "configure"
#line 16818 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -16823,7 +16824,7 @@ int main() {
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
if { (eval echo configure:16827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:16828: \"$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"
@@ -16867,7 +16868,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:16871: checking for $ac_word" >&5
echo "configure:16872: 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
@@ -16902,7 +16903,7 @@ fi
min_libIDL_version=$LIBIDL_VERSION
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
echo "configure:16906: checking for libIDL - version >= $min_libIDL_version" >&5
echo "configure:16907: checking for libIDL - version >= $min_libIDL_version" >&5
no_libIDL=""
if test "$LIBIDL_CONFIG" = "no" ; then
no_libIDL=yes
@@ -16929,7 +16930,7 @@ echo "configure:16906: checking for libIDL - version >= $min_libIDL_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 16933 "configure"
#line 16934 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -17015,7 +17016,7 @@ main ()
}
EOF
if { (eval echo configure:17019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:17020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -17049,7 +17050,7 @@ fi
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
LIBS="$LIBS $LIBIDL_LIBS"
cat > conftest.$ac_ext <<EOF
#line 17053 "configure"
#line 17054 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -17060,7 +17061,7 @@ int main() {
return IDL_get_libver_string ? 1 : 0;
; return 0; }
EOF
if { (eval echo configure:17064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17065: \"$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"
@@ -17188,7 +17189,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:17192: checking for $ac_word" >&5
echo "configure:17193: 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
@@ -17223,7 +17224,7 @@ fi
min_glib_version=1.2.0
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
echo "configure:17227: checking for GLIB - version >= $min_glib_version" >&5
echo "configure:17228: checking for GLIB - version >= $min_glib_version" >&5
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
@@ -17246,7 +17247,7 @@ echo "configure:17227: checking for GLIB - version >= $min_glib_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 17250 "configure"
#line 17251 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -17322,7 +17323,7 @@ main ()
}
EOF
if { (eval echo configure:17326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:17327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -17356,7 +17357,7 @@ fi
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <<EOF
#line 17360 "configure"
#line 17361 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -17366,7 +17367,7 @@ int main() {
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
if { (eval echo configure:17370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17371: \"$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"
@@ -17410,7 +17411,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:17414: checking for $ac_word" >&5
echo "configure:17415: 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
@@ -17445,7 +17446,7 @@ fi
min_libIDL_version=$LIBIDL_VERSION
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
echo "configure:17449: checking for libIDL - version >= $min_libIDL_version" >&5
echo "configure:17450: checking for libIDL - version >= $min_libIDL_version" >&5
no_libIDL=""
if test "$LIBIDL_CONFIG" = "no" ; then
no_libIDL=yes
@@ -17472,7 +17473,7 @@ echo "configure:17449: checking for libIDL - version >= $min_libIDL_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 17476 "configure"
#line 17477 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -17558,7 +17559,7 @@ main ()
}
EOF
if { (eval echo configure:17562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:17563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -17592,7 +17593,7 @@ fi
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
LIBS="$LIBS $LIBIDL_LIBS"
cat > conftest.$ac_ext <<EOF
#line 17596 "configure"
#line 17597 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -17603,7 +17604,7 @@ int main() {
return IDL_get_libver_string ? 1 : 0;
; return 0; }
EOF
if { (eval echo configure:17607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:17608: \"$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"
@@ -17643,7 +17644,7 @@ rm -f conftest*
# 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:17647: checking for $ac_word" >&5
echo "configure:17648: 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
@@ -17687,19 +17688,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
echo "configure:17691: checking for libIDL-2.0 >= 0.8.0" >&5
echo "configure:17692: 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:17698: checking LIBIDL_CFLAGS" >&5
echo "configure:17699: 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:17703: checking LIBIDL_LIBS" >&5
echo "configure:17704: 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
@@ -17734,7 +17735,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:17738: checking for $ac_word" >&5
echo "configure:17739: 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
@@ -17771,7 +17772,7 @@ done
if test -n "$ORBIT_CONFIG"; then
echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
echo "configure:17775: checking for ORBit libIDL usability" >&5
echo "configure:17776: 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}`
@@ -17788,7 +17789,7 @@ echo "configure:17775: checking for ORBit libIDL usability" >&5
result="maybe"
else
cat > conftest.$ac_ext <<EOF
#line 17792 "configure"
#line 17793 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -17803,7 +17804,7 @@ int main() {
}
EOF
if { (eval echo configure:17807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:17808: \"$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"
@@ -17859,7 +17860,7 @@ if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:17863: checking for $ac_word" >&5
echo "configure:17864: 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
@@ -17903,19 +17904,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for glib-2.0 >= 1.3.7 gobject-2.0""... $ac_c" 1>&6
echo "configure:17907: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5
echo "configure:17908: 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:17914: checking GLIB_CFLAGS" >&5
echo "configure:17915: 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:17919: checking GLIB_LIBS" >&5
echo "configure:17920: 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
@@ -17998,7 +17999,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:18002: checking for $ac_word" >&5
echo "configure:18003: 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
@@ -18033,7 +18034,7 @@ fi
min_glib_version=${GLIB_VERSION}
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
echo "configure:18037: checking for GLIB - version >= $min_glib_version" >&5
echo "configure:18038: checking for GLIB - version >= $min_glib_version" >&5
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
@@ -18056,7 +18057,7 @@ echo "configure:18037: checking for GLIB - version >= $min_glib_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 18060 "configure"
#line 18061 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -18132,7 +18133,7 @@ main ()
}
EOF
if { (eval echo configure:18136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:18137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -18166,7 +18167,7 @@ fi
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
cat > conftest.$ac_ext <<EOF
#line 18170 "configure"
#line 18171 "configure"
#include "confdefs.h"
#include <glib.h>
@@ -18176,7 +18177,7 @@ int main() {
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
; return 0; }
EOF
if { (eval echo configure:18180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:18181: \"$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"
@@ -18255,19 +18256,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:18259: checking for working alloca.h" >&5
echo "configure:18260: 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 <<EOF
#line 18264 "configure"
#line 18265 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
if { (eval echo configure:18271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:18272: \"$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
@@ -18288,12 +18289,12 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
echo "configure:18292: checking for alloca" >&5
echo "configure:18293: 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 <<EOF
#line 18297 "configure"
#line 18298 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -18321,7 +18322,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
if { (eval echo configure:18325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:18326: \"$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
@@ -18353,12 +18354,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
echo "configure:18357: checking whether alloca needs Cray hooks" >&5
echo "configure:18358: 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 <<EOF
#line 18362 "configure"
#line 18363 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -18383,12 +18384,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&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:18387: checking for $ac_func" >&5
echo "configure:18388: 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 <<EOF
#line 18392 "configure"
#line 18393 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -18411,7 +18412,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:18415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:18416: \"$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
@@ -18438,7 +18439,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
echo "configure:18442: checking stack direction for C alloca" >&5
echo "configure:18443: 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
@@ -18446,7 +18447,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
#line 18450 "configure"
#line 18451 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -18465,7 +18466,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
if { (eval echo configure:18469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:18470: \"$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
@@ -18514,17 +18515,17 @@ fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:18518: checking for $ac_hdr" >&5
echo "configure:18519: 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
#line 18523 "configure"
#line 18524 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:18528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:18529: \"$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*
@@ -18628,7 +18629,7 @@ EOF
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:18632: checking for $ac_word" >&5
echo "configure:18633: 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
@@ -18672,19 +18673,19 @@ fi
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
echo "configure:18676: checking for cairo >= $CAIRO_VERSION" >&5
echo "configure:18677: 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:18683: checking CAIRO_CFLAGS" >&5
echo "configure:18684: 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:18688: checking CAIRO_LIBS" >&5
echo "configure:18689: 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
@@ -18748,7 +18749,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:18752: checking for $ac_word" >&5
echo "configure:18753: 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
@@ -19010,14 +19011,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 <<EOF
#line 19014 "configure"
#line 19015 "configure"
#include "confdefs.h"
#include <gmodule.h>
int main() {
int x = 1; x++;
; return 0; }
EOF
if { (eval echo configure:19021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:19022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -19312,7 +19313,7 @@ if test "$MOZ_X11"; then
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $XCFLAGS"
cat > conftest.$ac_ext <<EOF
#line 19316 "configure"
#line 19317 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -19328,7 +19329,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:19332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:19333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -19387,6 +19388,10 @@ cat >> confdefs.h <<\EOF
#define JS_THREADSAFE 1
EOF
cat >> confdefs.h <<\EOF
#define JS_STRINGS_ARE_UTF8 1
EOF
if test "$MOZ_DEBUG"; then
cat >> confdefs.h <<\EOF

28
mozilla/configure.in
View File

@@ -4946,9 +4946,17 @@ JAR=
if test `echo "$MOZ_EXTENSIONS" | grep -c java` -ne 0; then
MOZ_ENABLE_JAVAXPCOM=1
case "$host_os" in
mingw*|cygwin*|msvc*|mks*)
if test -n "$JAVA_HOME"; then
JAVA_HOME=`cygpath -u \`cygpath -m -s "$JAVA_HOME"\``
fi
;;
esac
if test -n "${JAVA_INCLUDE_PATH}"; then
dnl Make sure jni.h exists in the given include path.
if test ! -f $JAVA_INCLUDE_PATH/jni.h; then
if test ! -f "$JAVA_INCLUDE_PATH/jni.h"; then
AC_MSG_ERROR([jni.h was not found in given include path $JAVA_INCLUDE_PATH.])
fi
else
@@ -4959,29 +4967,22 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c java` -ne 0; then
;;
*)
dnl Try $JAVA_HOME
JAVA_INCLUDE_PATH=$JAVA_HOME/include
JAVA_INCLUDE_PATH="$JAVA_HOME/include"
;;
esac
if test ! -f $JAVA_INCLUDE_PATH/jni.h; then
if test ! -f "$JAVA_INCLUDE_PATH/jni.h"; then
AC_MSG_ERROR([The header jni.h was not found. Set \$JAVA_HOME or use --with-java-include-path={java-include-dir}.])
fi
fi
if test -n "${JAVA_BIN_PATH}"; then
dnl Look for javac and jar in the specified path.
_JAVA_PATH=$JAVA_BIN_PATH
JAVA_PATH="$JAVA_BIN_PATH"
else
dnl No path specified, so look for javac and jar are in $JAVA_HOME & $PATH.
_JAVA_PATH=$JAVA_HOME/bin:$PATH
JAVA_PATH="$JAVA_HOME/bin:$PATH"
fi
case "$host_os" in
mingw*|cygwin*|msvc*|mks*)
JAVA_PATH=`cygpath -u $_JAVA_PATH`
;;
*)
JAVA_PATH=$_JAVA_PATH
;;
esac
AC_PATH_PROG(JAVAC, javac, :, $JAVA_PATH)
AC_PATH_PROG(JAR, jar, :, $JAVA_PATH)
if test -z "$JAVAC" || test "$JAVAC" = ":" || test -z "$JAR" || test "$JAR" = ":"; then
@@ -7041,6 +7042,7 @@ fi
AC_SUBST(MOZ_MOVEMAIL)
AC_DEFINE(JS_THREADSAFE)
AC_DEFINE(JS_STRINGS_ARE_UTF8)
if test "$MOZ_DEBUG"; then
AC_DEFINE(MOZ_REFLOW_PERF)

8
mozilla/js/src/xpconnect/src/xpccomponents.cpp
View File

@@ -103,9 +103,9 @@ char * xpc_CheckAccessList(const PRUnichar* wideName, const char* list[])
/***************************************************************************/
nsXPCComponents_Interfaces::nsXPCComponents_Interfaces()
nsXPCComponents_Interfaces::nsXPCComponents_Interfaces() :
mManager(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID))
{
mManager = dont_AddRef(XPTI_GetInterfaceInfoManager());
}
nsXPCComponents_Interfaces::~nsXPCComponents_Interfaces()
@@ -347,9 +347,9 @@ private:
};
nsXPCComponents_InterfacesByID::nsXPCComponents_InterfacesByID()
nsXPCComponents_InterfacesByID::nsXPCComponents_InterfacesByID() :
mManager(do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID))
{
mManager = dont_AddRef(XPTI_GetInterfaceInfoManager());
}
nsXPCComponents_InterfacesByID::~nsXPCComponents_InterfacesByID()

2
mozilla/js/src/xpconnect/src/xpcprivate.h
View File

@@ -470,7 +470,7 @@ private:
static PRThread* gMainThread;
XPCJSRuntime* mRuntime;
nsIInterfaceInfoSuperManager* mInterfaceInfoManager;
nsCOMPtr<nsIInterfaceInfoSuperManager> mInterfaceInfoManager;
nsIThreadJSContextStack* mContextStack;
nsIXPCSecurityManager* mDefaultSecurityManager;
PRUint16 mDefaultSecurityManagerFlags;