зеркало из https://github.com/mozilla/gecko-dev.git
Automated update from host egg.build.mozilla.org
This commit is contained in:
cltbld
Родитель
4dafcd97d6
Коммит
52d08abac1
|
|
@ -15685,10 +15685,46 @@ if test -n "${MOZ_JAVAXPCOM}"; then
|
|||
JAVA_PATH="$JAVA_HOME/bin:$PATH"
|
||||
fi
|
||||
|
||||
# Extract the first word of "java", so it can be a program name with args.
|
||||
set dummy java; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:15692: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
case "$JAVA" in
|
||||
/*)
|
||||
ac_cv_path_JAVA="$JAVA" # Let the user override the test with a path.
|
||||
;;
|
||||
?:/*)
|
||||
ac_cv_path_JAVA="$JAVA" # Let the user override the test with a dos path.
|
||||
;;
|
||||
*)
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$JAVA_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_JAVA="$ac_dir/$ac_word"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
test -z "$ac_cv_path_JAVA" && ac_cv_path_JAVA=":"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
JAVA="$ac_cv_path_JAVA"
|
||||
if test -n "$JAVA"; then
|
||||
echo "$ac_t""$JAVA" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
# Extract the first word of "javac", so it can be a program name with args.
|
||||
set dummy javac; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:15692: checking for $ac_word" >&5
|
||||
echo "configure:15728: 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
|
||||
|
|
@ -15724,7 +15760,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:15728: checking for $ac_word" >&5
|
||||
echo "configure:15764: 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
|
||||
|
|
@ -15757,8 +15793,8 @@ else
|
|||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
if test -z "$JAVAC" || test "$JAVAC" = ":" || test -z "$JAR" || test "$JAR" = ":"; then
|
||||
{ echo "configure: error: The programs javac and jar were not found. Set \$JAVA_HOME to your java sdk directory, use --with-java-bin-path={java-bin-dir}, or reconfigure with --disable-javaxpcom." 1>&2; exit 1; }
|
||||
if test -z "$JAVA" || test "$JAVA" = ":" || test -z "$JAVAC" || test "$JAVAC" = ":" || test -z "$JAR" || test "$JAR" = ":"; then
|
||||
{ echo "configure: error: The programs java, javac and jar were not found. Set \$JAVA_HOME to your java sdk directory, use --with-java-bin-path={java-bin-dir}, or reconfigure with --disable-javaxpcom." 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -15947,9 +15983,9 @@ fi
|
|||
if test `echo "$MOZ_IMG_DECODERS" | grep -c png` -ne 0; then
|
||||
MOZ_PNG_CFLAGS="$MOZ_PNG_CFLAGS -DMOZ_PNG_READ"
|
||||
echo $ac_n "checking if pnggccrd.c can be compiled without PNG_NO_MMX_CODE""... $ac_c" 1>&6
|
||||
echo "configure:15951: checking if pnggccrd.c can be compiled without PNG_NO_MMX_CODE" >&5
|
||||
echo "configure:15987: checking if pnggccrd.c can be compiled without PNG_NO_MMX_CODE" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15953 "configure"
|
||||
#line 15989 "configure"
|
||||
#include "confdefs.h"
|
||||
#define MOZ_PNG_READ 1
|
||||
#include "$_topsrcdir/modules/libimg/png/pnggccrd.c"
|
||||
|
|
@ -15957,7 +15993,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:15961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:15997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_results=yes
|
||||
else
|
||||
|
|
@ -16134,7 +16170,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:16138: checking for $ac_word" >&5
|
||||
echo "configure:16174: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_MAKENSIS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -16179,7 +16215,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:16183: checking for $ac_word" >&5
|
||||
echo "configure:16219: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_HOST_ICONV'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -16227,13 +16263,13 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for tar archiver""... $ac_c" 1>&6
|
||||
echo "configure:16231: checking for tar archiver" >&5
|
||||
echo "configure:16267: checking for tar archiver" >&5
|
||||
for ac_prog in gnutar gtar tar
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:16237: checking for $ac_word" >&5
|
||||
echo "configure:16273: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -16288,13 +16324,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:16292: checking for iconv" >&5
|
||||
echo "configure:16328: 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:16298: checking for $ac_word" >&5
|
||||
echo "configure:16334: 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
|
||||
|
|
@ -16678,18 +16714,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:16682: checking for valid debug flags" >&5
|
||||
echo "configure:16718: checking for valid debug flags" >&5
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16686 "configure"
|
||||
#line 16722 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf("Hello World\n");
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_results=yes
|
||||
else
|
||||
|
|
@ -16730,18 +16766,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:16734: checking for valid optimization flags" >&5
|
||||
echo "configure:16770: checking for valid optimization flags" >&5
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16738 "configure"
|
||||
#line 16774 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf("Hello World\n");
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_results=yes
|
||||
else
|
||||
|
|
@ -16894,7 +16930,7 @@ fi
|
|||
|
||||
if test -n "$_ENABLE_EFENCE"; then
|
||||
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
|
||||
echo "configure:16898: checking for malloc in -lefence" >&5
|
||||
echo "configure:16934: 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
|
||||
|
|
@ -16902,7 +16938,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lefence $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16906 "configure"
|
||||
#line 16942 "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
|
||||
|
|
@ -16913,7 +16949,7 @@ int main() {
|
|||
malloc()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16953: \"$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
|
||||
|
|
@ -17014,12 +17050,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:17018: checking for $ac_func" >&5
|
||||
echo "configure:17054: 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 17023 "configure"
|
||||
#line 17059 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -17045,7 +17081,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:17085: \"$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
|
||||
|
|
@ -17288,12 +17324,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:17292: checking for $ac_func" >&5
|
||||
echo "configure:17328: 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 17297 "configure"
|
||||
#line 17333 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -17319,7 +17355,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:17359: \"$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
|
||||
|
|
@ -17457,7 +17493,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
|
|||
# Compiler Options
|
||||
|
||||
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
|
||||
echo "configure:17461: checking for gcc -pipe support" >&5
|
||||
echo "configure:17497: 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
|
||||
|
|
@ -17472,14 +17508,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 17476 "configure"
|
||||
#line 17512 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf("Hello World\n");
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:17519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_res_gcc_pipe="yes"
|
||||
else
|
||||
|
|
@ -17521,16 +17557,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:17525: checking whether compiler supports -Wno-long-long" >&5
|
||||
echo "configure:17561: checking whether compiler supports -Wno-long-long" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17527 "configure"
|
||||
#line 17563 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:17570: \"$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"
|
||||
|
|
@ -17551,16 +17587,16 @@ _SAVE_CFLAGS="$CFLAGS"
|
|||
CFLAGS="$CFLAGS -fprofile-generate"
|
||||
|
||||
echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
|
||||
echo "configure:17555: checking whether C compiler supports -fprofile-generate" >&5
|
||||
echo "configure:17591: checking whether C compiler supports -fprofile-generate" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17557 "configure"
|
||||
#line 17593 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:17600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
PROFILE_GEN_CFLAGS="-fprofile-generate"
|
||||
result="yes"
|
||||
|
|
@ -17578,16 +17614,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:17582: checking whether C compiler supports -fprofile-arcs" >&5
|
||||
echo "configure:17618: checking whether C compiler supports -fprofile-arcs" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17584 "configure"
|
||||
#line 17620 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:17627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
PROFILE_GEN_CFLAGS="-fprofile-arcs"
|
||||
result="yes"
|
||||
|
|
@ -17633,18 +17669,18 @@ 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:17637: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||
echo "configure:17673: 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 17642 "configure"
|
||||
#line 17678 "configure"
|
||||
#include "confdefs.h"
|
||||
int main () {
|
||||
if (sizeof(long long) != 8) { return 1; }
|
||||
return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:17684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
result="no"
|
||||
else
|
||||
|
|
@ -17674,12 +17710,12 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
|
||||
echo "configure:17678: checking for correct temporary object destruction order" >&5
|
||||
echo "configure:17714: checking for correct temporary object destruction order" >&5
|
||||
if test "$cross_compiling" = yes; then
|
||||
result="maybe"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17683 "configure"
|
||||
#line 17719 "configure"
|
||||
#include "confdefs.h"
|
||||
class A {
|
||||
public: A(int& x) : mValue(x) {}
|
||||
|
|
@ -17699,7 +17735,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:17703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:17739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
result="yes"
|
||||
else
|
||||
|
|
@ -17720,12 +17756,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:17724: checking for correct overload resolution with const and templates" >&5
|
||||
echo "configure:17760: 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 17729 "configure"
|
||||
#line 17765 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
template <class T>
|
||||
|
|
@ -17755,7 +17791,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:17795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_nscap_nonconst_opeq_bug="no"
|
||||
else
|
||||
|
|
@ -18036,7 +18072,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:18040: checking for $ac_word" >&5
|
||||
echo "configure:18076: 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
|
||||
|
|
@ -18080,19 +18116,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:18084: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5
|
||||
echo "configure:18120: 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:18091: checking LIBIDL_CFLAGS" >&5
|
||||
echo "configure:18127: 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:18096: checking LIBIDL_LIBS" >&5
|
||||
echo "configure:18132: 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
|
||||
|
|
@ -18214,7 +18250,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:18218: checking for $ac_word" >&5
|
||||
echo "configure:18254: 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
|
||||
|
|
@ -18249,7 +18285,7 @@ fi
|
|||
|
||||
min_glib_version=1.2.0
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:18253: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:18289: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
|
|
@ -18272,7 +18308,7 @@ echo "configure:18253: checking for GLIB - version >= $min_glib_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18276 "configure"
|
||||
#line 18312 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -18348,7 +18384,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:18352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:18388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -18382,7 +18418,7 @@ fi
|
|||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18386 "configure"
|
||||
#line 18422 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -18392,7 +18428,7 @@ int main() {
|
|||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:18432: \"$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"
|
||||
|
|
@ -18436,7 +18472,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:18440: checking for $ac_word" >&5
|
||||
echo "configure:18476: 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
|
||||
|
|
@ -18471,7 +18507,7 @@ fi
|
|||
|
||||
min_libIDL_version=$LIBIDL_VERSION
|
||||
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
||||
echo "configure:18475: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
echo "configure:18511: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
no_libIDL=""
|
||||
if test "$LIBIDL_CONFIG" = "no" ; then
|
||||
no_libIDL=yes
|
||||
|
|
@ -18498,7 +18534,7 @@ echo "configure:18475: checking for libIDL - version >= $min_libIDL_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18502 "configure"
|
||||
#line 18538 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -18584,7 +18620,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:18588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:18624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -18618,7 +18654,7 @@ fi
|
|||
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
||||
LIBS="$LIBS $LIBIDL_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18622 "configure"
|
||||
#line 18658 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -18629,7 +18665,7 @@ int main() {
|
|||
return IDL_get_libver_string ? 1 : 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:18669: \"$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"
|
||||
|
|
@ -18757,7 +18793,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:18761: checking for $ac_word" >&5
|
||||
echo "configure:18797: 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
|
||||
|
|
@ -18792,7 +18828,7 @@ fi
|
|||
|
||||
min_glib_version=1.2.0
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:18796: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:18832: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
|
|
@ -18815,7 +18851,7 @@ echo "configure:18796: checking for GLIB - version >= $min_glib_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18819 "configure"
|
||||
#line 18855 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -18891,7 +18927,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:18895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:18931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -18925,7 +18961,7 @@ fi
|
|||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18929 "configure"
|
||||
#line 18965 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -18935,7 +18971,7 @@ int main() {
|
|||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:18975: \"$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"
|
||||
|
|
@ -18979,7 +19015,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:18983: checking for $ac_word" >&5
|
||||
echo "configure:19019: 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
|
||||
|
|
@ -19014,7 +19050,7 @@ fi
|
|||
|
||||
min_libIDL_version=$LIBIDL_VERSION
|
||||
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
||||
echo "configure:19018: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
echo "configure:19054: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
no_libIDL=""
|
||||
if test "$LIBIDL_CONFIG" = "no" ; then
|
||||
no_libIDL=yes
|
||||
|
|
@ -19041,7 +19077,7 @@ echo "configure:19018: checking for libIDL - version >= $min_libIDL_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19045 "configure"
|
||||
#line 19081 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -19127,7 +19163,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:19131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:19167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -19161,7 +19197,7 @@ fi
|
|||
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
||||
LIBS="$LIBS $LIBIDL_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19165 "configure"
|
||||
#line 19201 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -19172,7 +19208,7 @@ int main() {
|
|||
return IDL_get_libver_string ? 1 : 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19212: \"$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"
|
||||
|
|
@ -19212,7 +19248,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:19216: checking for $ac_word" >&5
|
||||
echo "configure:19252: 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
|
||||
|
|
@ -19256,19 +19292,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:19260: checking for libIDL-2.0 >= 0.8.0" >&5
|
||||
echo "configure:19296: 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:19267: checking LIBIDL_CFLAGS" >&5
|
||||
echo "configure:19303: 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:19272: checking LIBIDL_LIBS" >&5
|
||||
echo "configure:19308: 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
|
||||
|
|
@ -19303,7 +19339,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:19307: checking for $ac_word" >&5
|
||||
echo "configure:19343: 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
|
||||
|
|
@ -19340,7 +19376,7 @@ done
|
|||
|
||||
if test -n "$ORBIT_CONFIG"; then
|
||||
echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
|
||||
echo "configure:19344: checking for ORBit libIDL usability" >&5
|
||||
echo "configure:19380: 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}`
|
||||
|
|
@ -19357,7 +19393,7 @@ echo "configure:19344: checking for ORBit libIDL usability" >&5
|
|||
result="maybe"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19361 "configure"
|
||||
#line 19397 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
|
@ -19372,7 +19408,7 @@ int main() {
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:19376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:19412: \"$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"
|
||||
|
|
@ -19428,7 +19464,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:19432: checking for $ac_word" >&5
|
||||
echo "configure:19468: 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
|
||||
|
|
@ -19472,19 +19508,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:19476: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5
|
||||
echo "configure:19512: 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:19483: checking GLIB_CFLAGS" >&5
|
||||
echo "configure:19519: 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:19488: checking GLIB_LIBS" >&5
|
||||
echo "configure:19524: 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
|
||||
|
|
@ -19567,7 +19603,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:19571: checking for $ac_word" >&5
|
||||
echo "configure:19607: 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
|
||||
|
|
@ -19602,7 +19638,7 @@ fi
|
|||
|
||||
min_glib_version=${GLIB_VERSION}
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:19606: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:19642: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
|
|
@ -19625,7 +19661,7 @@ echo "configure:19606: checking for GLIB - version >= $min_glib_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19629 "configure"
|
||||
#line 19665 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -19701,7 +19737,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:19705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:19741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -19735,7 +19771,7 @@ fi
|
|||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19739 "configure"
|
||||
#line 19775 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -19745,7 +19781,7 @@ int main() {
|
|||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19785: \"$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"
|
||||
|
|
@ -19825,19 +19861,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:19829: checking for working alloca.h" >&5
|
||||
echo "configure:19865: 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 19834 "configure"
|
||||
#line 19870 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <alloca.h>
|
||||
int main() {
|
||||
char *p = alloca(2 * sizeof(int));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19877: \"$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
|
||||
|
|
@ -19858,12 +19894,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for alloca""... $ac_c" 1>&6
|
||||
echo "configure:19862: checking for alloca" >&5
|
||||
echo "configure:19898: 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 19867 "configure"
|
||||
#line 19903 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
|
@ -19891,7 +19927,7 @@ int main() {
|
|||
char *p = (char *) alloca(1);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19931: \"$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
|
||||
|
|
@ -19923,12 +19959,12 @@ EOF
|
|||
|
||||
|
||||
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
|
||||
echo "configure:19927: checking whether alloca needs Cray hooks" >&5
|
||||
echo "configure:19963: 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 19932 "configure"
|
||||
#line 19968 "configure"
|
||||
#include "confdefs.h"
|
||||
#if defined(CRAY) && ! defined(CRAY2)
|
||||
webecray
|
||||
|
|
@ -19953,12 +19989,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:19957: checking for $ac_func" >&5
|
||||
echo "configure:19993: 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 19962 "configure"
|
||||
#line 19998 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -19981,7 +20017,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:20021: \"$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
|
||||
|
|
@ -20008,7 +20044,7 @@ done
|
|||
fi
|
||||
|
||||
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
|
||||
echo "configure:20012: checking stack direction for C alloca" >&5
|
||||
echo "configure:20048: 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
|
||||
|
|
@ -20016,7 +20052,7 @@ else
|
|||
ac_cv_c_stack_direction=0
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 20020 "configure"
|
||||
#line 20056 "configure"
|
||||
#include "confdefs.h"
|
||||
find_stack_direction ()
|
||||
{
|
||||
|
|
@ -20035,7 +20071,7 @@ main ()
|
|||
exit (find_stack_direction() < 0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:20039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:20075: \"$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
|
||||
|
|
@ -20084,17 +20120,17 @@ fi
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:20088: checking for $ac_hdr" >&5
|
||||
echo "configure:20124: 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 20093 "configure"
|
||||
#line 20129 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:20098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:20134: \"$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*
|
||||
|
|
@ -20164,7 +20200,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:20168: checking for $ac_word" >&5
|
||||
echo "configure:20204: 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
|
||||
|
|
@ -20208,19 +20244,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 fontconfig freetype2""... $ac_c" 1>&6
|
||||
echo "configure:20212: checking for fontconfig freetype2" >&5
|
||||
echo "configure:20248: checking for fontconfig freetype2" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "fontconfig freetype2" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking CAIRO_FT_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:20219: checking CAIRO_FT_CFLAGS" >&5
|
||||
echo "configure:20255: checking CAIRO_FT_CFLAGS" >&5
|
||||
CAIRO_FT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig freetype2"`
|
||||
echo "$ac_t""$CAIRO_FT_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking CAIRO_FT_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:20224: checking CAIRO_FT_LIBS" >&5
|
||||
echo "configure:20260: checking CAIRO_FT_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
CAIRO_FT_LIBS="`$PKG_CONFIG --libs \"fontconfig freetype2\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$CAIRO_FT_LIBS" 1>&6
|
||||
|
|
@ -20308,7 +20344,7 @@ echo "configure:20224: checking CAIRO_FT_LIBS" >&5
|
|||
# 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:20312: checking for $ac_word" >&5
|
||||
echo "configure:20348: 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
|
||||
|
|
@ -20352,19 +20388,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 freetype2 fontconfig""... $ac_c" 1>&6
|
||||
echo "configure:20356: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5
|
||||
echo "configure:20392: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5
|
||||
|
||||
if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION freetype2 fontconfig" ; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
succeeded=yes
|
||||
|
||||
echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
|
||||
echo "configure:20363: checking CAIRO_CFLAGS" >&5
|
||||
echo "configure:20399: checking CAIRO_CFLAGS" >&5
|
||||
CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION freetype2 fontconfig"`
|
||||
echo "$ac_t""$CAIRO_CFLAGS" 1>&6
|
||||
|
||||
echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
|
||||
echo "configure:20368: checking CAIRO_LIBS" >&5
|
||||
echo "configure:20404: checking CAIRO_LIBS" >&5
|
||||
## Remove evil flags like -Wl,--export-dynamic
|
||||
CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION freetype2 fontconfig\" |sed s/-Wl,--export-dynamic//g`"
|
||||
echo "$ac_t""$CAIRO_LIBS" 1>&6
|
||||
|
|
@ -20428,7 +20464,7 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c python` -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:20432: checking for $ac_word" >&5
|
||||
echo "configure:20468: 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
|
||||
|
|
@ -20755,14 +20791,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 20759 "configure"
|
||||
#line 20795 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <gmodule.h>
|
||||
int main() {
|
||||
int x = 1; x++;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:20766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:20802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
|
|
@ -20947,6 +20983,7 @@ fi # COMPILE_ENVIRONMENT
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
CFLAGS=`echo \
|
||||
|
|
@ -21073,7 +21110,7 @@ if test "$MOZ_X11"; then
|
|||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $XCFLAGS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 21077 "configure"
|
||||
#line 21114 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -21090,7 +21127,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:21094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:21131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
|
|
@ -21655,6 +21692,7 @@ s%@MOZ_EXTRA_X11CONVERTERS@%$MOZ_EXTRA_X11CONVERTERS%g
|
|||
s%@MOZ_PLAINTEXT_EDITOR_ONLY@%$MOZ_PLAINTEXT_EDITOR_ONLY%g
|
||||
s%@MOZ_COMPOSER@%$MOZ_COMPOSER%g
|
||||
s%@MOZ_NO_FAST_LOAD@%$MOZ_NO_FAST_LOAD%g
|
||||
s%@JAVA@%$JAVA%g
|
||||
s%@JAVAC@%$JAVAC%g
|
||||
s%@JAR@%$JAR%g
|
||||
s%@MOZ_ENABLE_CANVAS@%$MOZ_ENABLE_CANVAS%g
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче