зеркало из https://github.com/mozilla/pjs.git
Automated update from host egg.office.mozilla.org
This commit is contained in:
cltbld
Родитель
e7a53e5ec6
Коммит
9494b150fe
|
|
@ -15656,6 +15656,100 @@ if test "${enable_installer+set}" = set; then
|
|||
fi
|
||||
fi
|
||||
|
||||
if test -n "$MOZ_INSTALLER" -a -n "$MOZ_XUL_APP" -a "$OS_ARCH" = "WINNT"; then
|
||||
# Disable installer for Windows builds that use the new toolkit if NSIS
|
||||
# isn't in the path.
|
||||
for ac_prog in makensis
|
||||
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:15668: 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
|
||||
case "$MAKENSIS" in
|
||||
/*)
|
||||
ac_cv_path_MAKENSIS="$MAKENSIS" # Let the user override the test with a path.
|
||||
;;
|
||||
?:/*)
|
||||
ac_cv_path_MAKENSIS="$MAKENSIS" # Let the user override the test with a dos path.
|
||||
;;
|
||||
*)
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_path_MAKENSIS="$ac_dir/$ac_word"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
MAKENSIS="$ac_cv_path_MAKENSIS"
|
||||
if test -n "$MAKENSIS"; then
|
||||
echo "$ac_t""$MAKENSIS" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
test -n "$MAKENSIS" && break
|
||||
done
|
||||
|
||||
if test -z "$MAKENSIS" || test "$MAKENSIS" = ":"; then
|
||||
{ echo "configure: error: To build the installer makensis is required in your path. To build without the installer reconfigure using --disable-installer." 1>&2; exit 1; }
|
||||
fi
|
||||
# The Windows build for NSIS requires the iconv command line utility to
|
||||
# convert the charset of the locale files.
|
||||
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:15713: 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
|
||||
case "$HOST_ICONV" in
|
||||
/*)
|
||||
ac_cv_path_HOST_ICONV="$HOST_ICONV" # Let the user override the test with a path.
|
||||
;;
|
||||
?:/*)
|
||||
ac_cv_path_HOST_ICONV="$HOST_ICONV" # Let the user override the test with a dos path.
|
||||
;;
|
||||
*)
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_path_HOST_ICONV="$ac_dir/$ac_word"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
HOST_ICONV="$ac_cv_path_HOST_ICONV"
|
||||
if test -n "$HOST_ICONV"; then
|
||||
echo "$ac_t""$HOST_ICONV" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
test -n "$HOST_ICONV" && break
|
||||
done
|
||||
test -n "$HOST_ICONV" || HOST_ICONV=""""
|
||||
|
||||
if test -z "$HOST_ICONV"; then
|
||||
{ echo "configure: error: To build the installer iconv is required in your path. To build without the installer reconfigure using --disable-installer." 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
|
||||
# Automatically disable installer if xpinstall isn't built
|
||||
if test -z "$MOZ_XPINSTALL"; then
|
||||
MOZ_INSTALLER=
|
||||
|
|
@ -15663,13 +15757,13 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for tar archiver""... $ac_c" 1>&6
|
||||
echo "configure:15667: checking for tar archiver" >&5
|
||||
echo "configure:15761: 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:15673: checking for $ac_word" >&5
|
||||
echo "configure:15767: 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
|
||||
|
|
@ -15724,13 +15818,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:15728: checking for iconv" >&5
|
||||
echo "configure:15822: 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:15734: checking for $ac_word" >&5
|
||||
echo "configure:15828: 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
|
||||
|
|
@ -16092,18 +16186,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:16096: checking for valid debug flags" >&5
|
||||
echo "configure:16190: checking for valid debug flags" >&5
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16100 "configure"
|
||||
#line 16194 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf("Hello World\n");
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_results=yes
|
||||
else
|
||||
|
|
@ -16144,18 +16238,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:16148: checking for valid optimization flags" >&5
|
||||
echo "configure:16242: checking for valid optimization flags" >&5
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16152 "configure"
|
||||
#line 16246 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf("Hello World\n");
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_results=yes
|
||||
else
|
||||
|
|
@ -16308,7 +16402,7 @@ fi
|
|||
|
||||
if test -n "$_ENABLE_EFENCE"; then
|
||||
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
|
||||
echo "configure:16312: checking for malloc in -lefence" >&5
|
||||
echo "configure:16406: 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
|
||||
|
|
@ -16316,7 +16410,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lefence $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16320 "configure"
|
||||
#line 16414 "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
|
||||
|
|
@ -16327,7 +16421,7 @@ int main() {
|
|||
malloc()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16425: \"$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
|
||||
|
|
@ -16428,12 +16522,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:16432: checking for $ac_func" >&5
|
||||
echo "configure:16526: 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 16437 "configure"
|
||||
#line 16531 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -16459,7 +16553,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16557: \"$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
|
||||
|
|
@ -16702,12 +16796,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:16706: checking for $ac_func" >&5
|
||||
echo "configure:16800: 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 16711 "configure"
|
||||
#line 16805 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -16733,7 +16827,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:16831: \"$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
|
||||
|
|
@ -16871,7 +16965,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
|
|||
# Compiler Options
|
||||
|
||||
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
|
||||
echo "configure:16875: checking for gcc -pipe support" >&5
|
||||
echo "configure:16969: 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
|
||||
|
|
@ -16886,14 +16980,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 16890 "configure"
|
||||
#line 16984 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
int main() {
|
||||
printf("Hello World\n");
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:16991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
_res_gcc_pipe="yes"
|
||||
else
|
||||
|
|
@ -16935,16 +17029,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:16939: checking whether compiler supports -Wno-long-long" >&5
|
||||
echo "configure:17033: checking whether compiler supports -Wno-long-long" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16941 "configure"
|
||||
#line 17035 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:17042: \"$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"
|
||||
|
|
@ -16965,16 +17059,16 @@ _SAVE_CFLAGS="$CFLAGS"
|
|||
CFLAGS="$CFLAGS -fprofile-generate"
|
||||
|
||||
echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6
|
||||
echo "configure:16969: checking whether C compiler supports -fprofile-generate" >&5
|
||||
echo "configure:17063: checking whether C compiler supports -fprofile-generate" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16971 "configure"
|
||||
#line 17065 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:16978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:17072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
PROFILE_GEN_CFLAGS="-fprofile-generate"
|
||||
result="yes"
|
||||
|
|
@ -16992,16 +17086,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:16996: checking whether C compiler supports -fprofile-arcs" >&5
|
||||
echo "configure:17090: checking whether C compiler supports -fprofile-arcs" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 16998 "configure"
|
||||
#line 17092 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:17099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
PROFILE_GEN_CFLAGS="-fprofile-arcs"
|
||||
result="yes"
|
||||
|
|
@ -17047,18 +17141,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:17051: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||
echo "configure:17145: 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 17056 "configure"
|
||||
#line 17150 "configure"
|
||||
#include "confdefs.h"
|
||||
int main () {
|
||||
if (sizeof(long long) != 8) { return 1; }
|
||||
return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:17156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
result="no"
|
||||
else
|
||||
|
|
@ -17088,12 +17182,12 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6
|
||||
echo "configure:17092: checking for correct temporary object destruction order" >&5
|
||||
echo "configure:17186: checking for correct temporary object destruction order" >&5
|
||||
if test "$cross_compiling" = yes; then
|
||||
result="maybe"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17097 "configure"
|
||||
#line 17191 "configure"
|
||||
#include "confdefs.h"
|
||||
class A {
|
||||
public: A(int& x) : mValue(x) {}
|
||||
|
|
@ -17113,7 +17207,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:17117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:17211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
result="yes"
|
||||
else
|
||||
|
|
@ -17134,12 +17228,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:17138: checking for correct overload resolution with const and templates" >&5
|
||||
echo "configure:17232: 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 17143 "configure"
|
||||
#line 17237 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
template <class T>
|
||||
|
|
@ -17169,7 +17263,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:17267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_nscap_nonconst_opeq_bug="no"
|
||||
else
|
||||
|
|
@ -17444,7 +17538,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:17448: checking for $ac_word" >&5
|
||||
echo "configure:17542: 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
|
||||
|
|
@ -17488,19 +17582,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:17492: checking for libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0" >&5
|
||||
echo "configure:17586: 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:17499: checking LIBIDL_CFLAGS" >&5
|
||||
echo "configure:17593: 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:17504: checking LIBIDL_LIBS" >&5
|
||||
echo "configure:17598: 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
|
||||
|
|
@ -17622,7 +17716,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:17626: checking for $ac_word" >&5
|
||||
echo "configure:17720: 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
|
||||
|
|
@ -17657,7 +17751,7 @@ fi
|
|||
|
||||
min_glib_version=1.2.0
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:17661: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:17755: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
|
|
@ -17680,7 +17774,7 @@ echo "configure:17661: checking for GLIB - version >= $min_glib_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17684 "configure"
|
||||
#line 17778 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -17756,7 +17850,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:17760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:17854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -17790,7 +17884,7 @@ fi
|
|||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17794 "configure"
|
||||
#line 17888 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -17800,7 +17894,7 @@ int main() {
|
|||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:17804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:17898: \"$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"
|
||||
|
|
@ -17844,7 +17938,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:17848: checking for $ac_word" >&5
|
||||
echo "configure:17942: 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
|
||||
|
|
@ -17879,7 +17973,7 @@ fi
|
|||
|
||||
min_libIDL_version=$LIBIDL_VERSION
|
||||
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
||||
echo "configure:17883: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
echo "configure:17977: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
no_libIDL=""
|
||||
if test "$LIBIDL_CONFIG" = "no" ; then
|
||||
no_libIDL=yes
|
||||
|
|
@ -17906,7 +18000,7 @@ echo "configure:17883: checking for libIDL - version >= $min_libIDL_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17910 "configure"
|
||||
#line 18004 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -17992,7 +18086,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:17996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:18090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -18026,7 +18120,7 @@ fi
|
|||
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
||||
LIBS="$LIBS $LIBIDL_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18030 "configure"
|
||||
#line 18124 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -18037,7 +18131,7 @@ int main() {
|
|||
return IDL_get_libver_string ? 1 : 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:18135: \"$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"
|
||||
|
|
@ -18165,7 +18259,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:18169: checking for $ac_word" >&5
|
||||
echo "configure:18263: 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
|
||||
|
|
@ -18200,7 +18294,7 @@ fi
|
|||
|
||||
min_glib_version=1.2.0
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:18204: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:18298: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
|
|
@ -18223,7 +18317,7 @@ echo "configure:18204: checking for GLIB - version >= $min_glib_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18227 "configure"
|
||||
#line 18321 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -18299,7 +18393,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:18303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:18397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -18333,7 +18427,7 @@ fi
|
|||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18337 "configure"
|
||||
#line 18431 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -18343,7 +18437,7 @@ int main() {
|
|||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:18441: \"$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"
|
||||
|
|
@ -18387,7 +18481,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:18391: checking for $ac_word" >&5
|
||||
echo "configure:18485: 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
|
||||
|
|
@ -18422,7 +18516,7 @@ fi
|
|||
|
||||
min_libIDL_version=$LIBIDL_VERSION
|
||||
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
||||
echo "configure:18426: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
echo "configure:18520: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||
no_libIDL=""
|
||||
if test "$LIBIDL_CONFIG" = "no" ; then
|
||||
no_libIDL=yes
|
||||
|
|
@ -18449,7 +18543,7 @@ echo "configure:18426: checking for libIDL - version >= $min_libIDL_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18453 "configure"
|
||||
#line 18547 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -18535,7 +18629,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:18539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:18633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -18569,7 +18663,7 @@ fi
|
|||
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
||||
LIBS="$LIBS $LIBIDL_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18573 "configure"
|
||||
#line 18667 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -18580,7 +18674,7 @@ int main() {
|
|||
return IDL_get_libver_string ? 1 : 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:18584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:18678: \"$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"
|
||||
|
|
@ -18620,7 +18714,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:18624: checking for $ac_word" >&5
|
||||
echo "configure:18718: 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
|
||||
|
|
@ -18664,19 +18758,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:18668: checking for libIDL-2.0 >= 0.8.0" >&5
|
||||
echo "configure:18762: 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:18675: checking LIBIDL_CFLAGS" >&5
|
||||
echo "configure:18769: 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:18680: checking LIBIDL_LIBS" >&5
|
||||
echo "configure:18774: 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
|
||||
|
|
@ -18711,7 +18805,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:18715: checking for $ac_word" >&5
|
||||
echo "configure:18809: 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
|
||||
|
|
@ -18748,7 +18842,7 @@ done
|
|||
|
||||
if test -n "$ORBIT_CONFIG"; then
|
||||
echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6
|
||||
echo "configure:18752: checking for ORBit libIDL usability" >&5
|
||||
echo "configure:18846: 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}`
|
||||
|
|
@ -18765,7 +18859,7 @@ echo "configure:18752: checking for ORBit libIDL usability" >&5
|
|||
result="maybe"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 18769 "configure"
|
||||
#line 18863 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
|
@ -18780,7 +18874,7 @@ int main() {
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:18784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:18878: \"$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"
|
||||
|
|
@ -18836,7 +18930,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:18840: checking for $ac_word" >&5
|
||||
echo "configure:18934: 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
|
||||
|
|
@ -18880,19 +18974,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:18884: checking for glib-2.0 >= 1.3.7 gobject-2.0" >&5
|
||||
echo "configure:18978: 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:18891: checking GLIB_CFLAGS" >&5
|
||||
echo "configure:18985: 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:18896: checking GLIB_LIBS" >&5
|
||||
echo "configure:18990: 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
|
||||
|
|
@ -18975,7 +19069,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:18979: checking for $ac_word" >&5
|
||||
echo "configure:19073: 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
|
||||
|
|
@ -19010,7 +19104,7 @@ fi
|
|||
|
||||
min_glib_version=${GLIB_VERSION}
|
||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||
echo "configure:19014: checking for GLIB - version >= $min_glib_version" >&5
|
||||
echo "configure:19108: checking for GLIB - version >= $min_glib_version" >&5
|
||||
no_glib=""
|
||||
if test "$GLIB_CONFIG" = "no" ; then
|
||||
no_glib=yes
|
||||
|
|
@ -19033,7 +19127,7 @@ echo "configure:19014: checking for GLIB - version >= $min_glib_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19037 "configure"
|
||||
#line 19131 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -19109,7 +19203,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:19113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:19207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -19143,7 +19237,7 @@ fi
|
|||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||
LIBS="$LIBS $GLIB_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19147 "configure"
|
||||
#line 19241 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
|
@ -19153,7 +19247,7 @@ int main() {
|
|||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19251: \"$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"
|
||||
|
|
@ -19233,19 +19327,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:19237: checking for working alloca.h" >&5
|
||||
echo "configure:19331: 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 19242 "configure"
|
||||
#line 19336 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <alloca.h>
|
||||
int main() {
|
||||
char *p = alloca(2 * sizeof(int));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19343: \"$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
|
||||
|
|
@ -19266,12 +19360,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for alloca""... $ac_c" 1>&6
|
||||
echo "configure:19270: checking for alloca" >&5
|
||||
echo "configure:19364: 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 19275 "configure"
|
||||
#line 19369 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
|
@ -19299,7 +19393,7 @@ int main() {
|
|||
char *p = (char *) alloca(1);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19397: \"$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
|
||||
|
|
@ -19331,12 +19425,12 @@ EOF
|
|||
|
||||
|
||||
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
|
||||
echo "configure:19335: checking whether alloca needs Cray hooks" >&5
|
||||
echo "configure:19429: 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 19340 "configure"
|
||||
#line 19434 "configure"
|
||||
#include "confdefs.h"
|
||||
#if defined(CRAY) && ! defined(CRAY2)
|
||||
webecray
|
||||
|
|
@ -19361,12 +19455,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:19365: checking for $ac_func" >&5
|
||||
echo "configure:19459: 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 19370 "configure"
|
||||
#line 19464 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -19389,7 +19483,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:19393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:19487: \"$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
|
||||
|
|
@ -19416,7 +19510,7 @@ done
|
|||
fi
|
||||
|
||||
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
|
||||
echo "configure:19420: checking stack direction for C alloca" >&5
|
||||
echo "configure:19514: 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
|
||||
|
|
@ -19424,7 +19518,7 @@ else
|
|||
ac_cv_c_stack_direction=0
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19428 "configure"
|
||||
#line 19522 "configure"
|
||||
#include "confdefs.h"
|
||||
find_stack_direction ()
|
||||
{
|
||||
|
|
@ -19443,7 +19537,7 @@ main ()
|
|||
exit (find_stack_direction() < 0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:19447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:19541: \"$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
|
||||
|
|
@ -19492,17 +19586,17 @@ fi
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:19496: checking for $ac_hdr" >&5
|
||||
echo "configure:19590: 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 19501 "configure"
|
||||
#line 19595 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:19506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:19600: \"$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*
|
||||
|
|
@ -19571,7 +19665,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:19575: checking for $ac_word" >&5
|
||||
echo "configure:19669: 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
|
||||
|
|
@ -19615,19 +19709,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:19619: checking for fontconfig freetype2" >&5
|
||||
echo "configure:19713: 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:19626: checking CAIRO_FT_CFLAGS" >&5
|
||||
echo "configure:19720: 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:19631: checking CAIRO_FT_LIBS" >&5
|
||||
echo "configure:19725: 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
|
||||
|
|
@ -19715,7 +19809,7 @@ echo "configure:19631: 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:19719: checking for $ac_word" >&5
|
||||
echo "configure:19813: 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
|
||||
|
|
@ -19759,19 +19853,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:19763: checking for cairo >= $CAIRO_VERSION freetype2 fontconfig" >&5
|
||||
echo "configure:19857: 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:19770: checking CAIRO_CFLAGS" >&5
|
||||
echo "configure:19864: 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:19775: checking CAIRO_LIBS" >&5
|
||||
echo "configure:19869: 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
|
||||
|
|
@ -19835,7 +19929,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:19839: checking for $ac_word" >&5
|
||||
echo "configure:19933: 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
|
||||
|
|
@ -20162,14 +20256,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 20166 "configure"
|
||||
#line 20260 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <gmodule.h>
|
||||
int main() {
|
||||
int x = 1; x++;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:20173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:20267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
|
|
@ -20478,7 +20572,7 @@ if test "$MOZ_X11"; then
|
|||
_SAVE_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS $XCFLAGS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 20482 "configure"
|
||||
#line 20576 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -20495,7 +20589,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:20499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:20593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
|
|
@ -21056,9 +21150,10 @@ s%@MOZ_NO_FAST_LOAD@%$MOZ_NO_FAST_LOAD%g
|
|||
s%@JAVAC@%$JAVAC%g
|
||||
s%@JAR@%$JAR%g
|
||||
s%@MOZ_ENABLE_CANVAS@%$MOZ_ENABLE_CANVAS%g
|
||||
s%@MAKENSIS@%$MAKENSIS%g
|
||||
s%@HOST_ICONV@%$HOST_ICONV%g
|
||||
s%@MOZ_INSTALLER@%$MOZ_INSTALLER%g
|
||||
s%@TAR@%$TAR%g
|
||||
s%@HOST_ICONV@%$HOST_ICONV%g
|
||||
s%@MOZ_UPDATER@%$MOZ_UPDATER%g
|
||||
s%@MOZ_UPDATE_PACKAGING@%$MOZ_UPDATE_PACKAGING%g
|
||||
s%@XPC_IDISPATCH_SUPPORT@%$XPC_IDISPATCH_SUPPORT%g
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче