зеркало из https://github.com/mozilla/pjs.git
Automated update
This commit is contained in:
Родитель
0403b76ff2
Коммит
518ac19c4e
|
@ -11700,7 +11700,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
MOZ_ACTIVEX_SCRIPTING_SUPPORT=
|
MOZ_ACTIVEX_SCRIPTING_SUPPORT=
|
||||||
# Check whether --enable-activex-scripting or --disable-activex-scripting was given.
|
|
||||||
|
if test -n "$_WIN32_MSVC"; then
|
||||||
|
# Check whether --enable-activex-scripting or --disable-activex-scripting was given.
|
||||||
if test "${enable_activex_scripting+set}" = set; then
|
if test "${enable_activex_scripting+set}" = set; then
|
||||||
enableval="$enable_activex_scripting"
|
enableval="$enable_activex_scripting"
|
||||||
if test "$enableval" = "yes"; then
|
if test "$enableval" = "yes"; then
|
||||||
|
@ -11712,7 +11714,7 @@ if test "${enable_activex_scripting+set}" = set; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
if test -n "$MOZ_NO_ACTIVEX_SUPPORT" -a -n "$MOZ_ACTIVEX_SCRIPTING_SUPPORT";
|
if test -n "$MOZ_NO_ACTIVEX_SUPPORT" -a -n "$MOZ_ACTIVEX_SCRIPTING_SUPPORT";
|
||||||
|
@ -12089,7 +12091,7 @@ if test "${enable_efence+set}" = set; then
|
||||||
enableval="$enable_efence"
|
enableval="$enable_efence"
|
||||||
if test "$enableval" = "yes"; then
|
if test "$enableval" = "yes"; then
|
||||||
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
|
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
|
||||||
echo "configure:12093: checking for malloc in -lefence" >&5
|
echo "configure:12095: checking for malloc in -lefence" >&5
|
||||||
ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
|
ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
|
||||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
|
@ -12097,7 +12099,7 @@ else
|
||||||
ac_save_LIBS="$LIBS"
|
ac_save_LIBS="$LIBS"
|
||||||
LIBS="-lefence $LIBS"
|
LIBS="-lefence $LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 12101 "configure"
|
#line 12103 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* Override any gcc2 internal prototype to avoid an error. */
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
/* We use char because int might match the return type of a gcc2
|
/* We use char because int might match the return type of a gcc2
|
||||||
|
@ -12108,7 +12110,7 @@ int main() {
|
||||||
malloc()
|
malloc()
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:12112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
if { (eval echo configure:12114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||||
else
|
else
|
||||||
|
@ -12194,12 +12196,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
||||||
for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual
|
for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual
|
||||||
do
|
do
|
||||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||||
echo "configure:12198: checking for $ac_func" >&5
|
echo "configure:12200: checking for $ac_func" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 12203 "configure"
|
#line 12205 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* System header to define __stub macros and hopefully few prototypes,
|
/* System header to define __stub macros and hopefully few prototypes,
|
||||||
which can conflict with char $ac_func(); below. */
|
which can conflict with char $ac_func(); below. */
|
||||||
|
@ -12225,7 +12227,7 @@ $ac_func();
|
||||||
|
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:12229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
if { (eval echo configure:12231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_func_$ac_func=yes"
|
eval "ac_cv_func_$ac_func=yes"
|
||||||
else
|
else
|
||||||
|
@ -12429,7 +12431,7 @@ fi
|
||||||
|
|
||||||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||||
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
|
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
|
||||||
echo "configure:12433: checking for cplus_demangle in -liberty" >&5
|
echo "configure:12435: checking for cplus_demangle in -liberty" >&5
|
||||||
ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
|
ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
|
||||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
|
@ -12437,7 +12439,7 @@ else
|
||||||
ac_save_LIBS="$LIBS"
|
ac_save_LIBS="$LIBS"
|
||||||
LIBS="-liberty "-liberty" $LIBS"
|
LIBS="-liberty "-liberty" $LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 12441 "configure"
|
#line 12443 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* Override any gcc2 internal prototype to avoid an error. */
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
/* We use char because int might match the return type of a gcc2
|
/* We use char because int might match the return type of a gcc2
|
||||||
|
@ -12448,7 +12450,7 @@ int main() {
|
||||||
cplus_demangle()
|
cplus_demangle()
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:12452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
if { (eval echo configure:12454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||||
else
|
else
|
||||||
|
@ -12601,7 +12603,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
|
||||||
# Compiler Options
|
# Compiler Options
|
||||||
|
|
||||||
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
|
echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6
|
||||||
echo "configure:12605: checking for gcc -pipe support" >&5
|
echo "configure:12607: checking for gcc -pipe support" >&5
|
||||||
if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
|
if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
|
||||||
echo '#include <stdio.h>' > dummy-hello.c
|
echo '#include <stdio.h>' > dummy-hello.c
|
||||||
echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
|
echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c
|
||||||
|
@ -12616,14 +12618,14 @@ if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then
|
||||||
_SAVE_CFLAGS=$CFLAGS
|
_SAVE_CFLAGS=$CFLAGS
|
||||||
CFLAGS="$CFLAGS -pipe"
|
CFLAGS="$CFLAGS -pipe"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 12620 "configure"
|
#line 12622 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
int main() {
|
int main() {
|
||||||
printf("Hello World\n");
|
printf("Hello World\n");
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:12627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
if { (eval echo configure:12629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
_res_gcc_pipe="yes"
|
_res_gcc_pipe="yes"
|
||||||
else
|
else
|
||||||
|
@ -12672,12 +12674,12 @@ if test "$_PEDANTIC"; then
|
||||||
_SAVE_CXXFLAGS=$CXXFLAGS
|
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||||
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
|
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
|
||||||
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
|
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
|
||||||
echo "configure:12676: checking whether C++ compiler has -pedantic long long bug" >&5
|
echo "configure:12678: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||||
if test "$cross_compiling" = yes; then
|
if test "$cross_compiling" = yes; then
|
||||||
result="maybe"
|
result="maybe"
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 12681 "configure"
|
#line 12683 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" void exit(int);
|
extern "C" void exit(int);
|
||||||
|
@ -12686,7 +12688,7 @@ extern "C" void exit(int);
|
||||||
if (sizeof(long long) != 8) { return 1; }
|
if (sizeof(long long) != 8) { return 1; }
|
||||||
return 0; }
|
return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:12690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
if { (eval echo configure:12692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||||
then
|
then
|
||||||
result="no"
|
result="no"
|
||||||
else
|
else
|
||||||
|
@ -12718,12 +12720,12 @@ fi
|
||||||
_SAVE_CXXFLAGS=$CXXFLAGS
|
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||||
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
|
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
|
||||||
echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
|
echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
|
||||||
echo "configure:12722: checking for correct overload resolution with const and templates" >&5
|
echo "configure:12724: checking for correct overload resolution with const and templates" >&5
|
||||||
if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 12727 "configure"
|
#line 12729 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
|
@ -12753,7 +12755,7 @@ int main() {
|
||||||
|
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:12757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
if { (eval echo configure:12759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
ac_nscap_nonconst_opeq_bug="no"
|
ac_nscap_nonconst_opeq_bug="no"
|
||||||
else
|
else
|
||||||
|
@ -12793,16 +12795,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
|
||||||
_SAVE_CFLAGS="$CFLAGS"
|
_SAVE_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
|
CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
|
||||||
echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
|
echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
|
||||||
echo "configure:12797: checking whether compiler supports -Wno-long-long" >&5
|
echo "configure:12799: checking whether compiler supports -Wno-long-long" >&5
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 12799 "configure"
|
#line 12801 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
return(0);
|
return(0);
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:12806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
if { (eval echo configure:12808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
|
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
|
||||||
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
|
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
|
||||||
|
@ -13027,7 +13029,7 @@ case "$target" in
|
||||||
# Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
|
# Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
|
||||||
set dummy makeC++SharedLib_r; ac_word=$2
|
set dummy makeC++SharedLib_r; ac_word=$2
|
||||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||||
echo "configure:13031: checking for $ac_word" >&5
|
echo "configure:13033: checking for $ac_word" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
|
@ -13129,7 +13131,7 @@ then
|
||||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||||
set dummy pkg-config; ac_word=$2
|
set dummy pkg-config; ac_word=$2
|
||||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||||
echo "configure:13133: checking for $ac_word" >&5
|
echo "configure:13135: checking for $ac_word" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
|
@ -13173,19 +13175,19 @@ fi
|
||||||
PKG_CONFIG_MIN_VERSION=0.9.0
|
PKG_CONFIG_MIN_VERSION=0.9.0
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
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 $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6
|
||||||
echo "configure:13177: checking for libIDL-2.0 >= 0.8.0" >&5
|
echo "configure:13179: checking for libIDL-2.0 >= 0.8.0" >&5
|
||||||
|
|
||||||
if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
|
if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then
|
||||||
echo "$ac_t""yes" 1>&6
|
echo "$ac_t""yes" 1>&6
|
||||||
succeeded=yes
|
succeeded=yes
|
||||||
|
|
||||||
echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
|
echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6
|
||||||
echo "configure:13184: checking LIBIDL_CFLAGS" >&5
|
echo "configure:13186: checking LIBIDL_CFLAGS" >&5
|
||||||
LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
|
LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"`
|
||||||
echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
|
echo "$ac_t""$LIBIDL_CFLAGS" 1>&6
|
||||||
|
|
||||||
echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
|
echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6
|
||||||
echo "configure:13189: checking LIBIDL_LIBS" >&5
|
echo "configure:13191: checking LIBIDL_LIBS" >&5
|
||||||
LIBIDL_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"`
|
LIBIDL_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"`
|
||||||
echo "$ac_t""$LIBIDL_LIBS" 1>&6
|
echo "$ac_t""$LIBIDL_LIBS" 1>&6
|
||||||
else
|
else
|
||||||
|
@ -13305,7 +13307,7 @@ fi
|
||||||
# Extract the first word of "glib-config", so it can be a program name with args.
|
# Extract the first word of "glib-config", so it can be a program name with args.
|
||||||
set dummy glib-config; ac_word=$2
|
set dummy glib-config; ac_word=$2
|
||||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||||
echo "configure:13309: checking for $ac_word" >&5
|
echo "configure:13311: checking for $ac_word" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
|
@ -13340,7 +13342,7 @@ fi
|
||||||
|
|
||||||
min_glib_version=1.2.0
|
min_glib_version=1.2.0
|
||||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||||
echo "configure:13344: checking for GLIB - version >= $min_glib_version" >&5
|
echo "configure:13346: checking for GLIB - version >= $min_glib_version" >&5
|
||||||
no_glib=""
|
no_glib=""
|
||||||
if test "$GLIB_CONFIG" = "no" ; then
|
if test "$GLIB_CONFIG" = "no" ; then
|
||||||
no_glib=yes
|
no_glib=yes
|
||||||
|
@ -13363,7 +13365,7 @@ echo "configure:13344: checking for GLIB - version >= $min_glib_version" >&5
|
||||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 13367 "configure"
|
#line 13369 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
@ -13439,7 +13441,7 @@ main ()
|
||||||
}
|
}
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:13443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
if { (eval echo configure:13445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||||
then
|
then
|
||||||
:
|
:
|
||||||
else
|
else
|
||||||
|
@ -13473,7 +13475,7 @@ fi
|
||||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||||
LIBS="$LIBS $GLIB_LIBS"
|
LIBS="$LIBS $GLIB_LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 13477 "configure"
|
#line 13479 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
@ -13483,7 +13485,7 @@ int main() {
|
||||||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:13487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
if { (eval echo configure:13489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
echo "*** The test program compiled, but did not run. This usually means"
|
echo "*** The test program compiled, but did not run. This usually means"
|
||||||
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
|
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
|
||||||
|
@ -13527,7 +13529,7 @@ rm -f conftest*
|
||||||
# Extract the first word of "libIDL-config", so it can be a program name with args.
|
# Extract the first word of "libIDL-config", so it can be a program name with args.
|
||||||
set dummy libIDL-config; ac_word=$2
|
set dummy libIDL-config; ac_word=$2
|
||||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||||
echo "configure:13531: checking for $ac_word" >&5
|
echo "configure:13533: checking for $ac_word" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
|
@ -13562,7 +13564,7 @@ fi
|
||||||
|
|
||||||
min_libIDL_version=$LIBIDL_VERSION
|
min_libIDL_version=$LIBIDL_VERSION
|
||||||
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6
|
||||||
echo "configure:13566: checking for libIDL - version >= $min_libIDL_version" >&5
|
echo "configure:13568: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||||
no_libIDL=""
|
no_libIDL=""
|
||||||
if test "$LIBIDL_CONFIG" = "no" ; then
|
if test "$LIBIDL_CONFIG" = "no" ; then
|
||||||
no_libIDL=yes
|
no_libIDL=yes
|
||||||
|
@ -13589,7 +13591,7 @@ echo "configure:13566: checking for libIDL - version >= $min_libIDL_version" >&5
|
||||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 13593 "configure"
|
#line 13595 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -13675,7 +13677,7 @@ main ()
|
||||||
}
|
}
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:13679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
if { (eval echo configure:13681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||||
then
|
then
|
||||||
:
|
:
|
||||||
else
|
else
|
||||||
|
@ -13709,7 +13711,7 @@ fi
|
||||||
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
|
||||||
LIBS="$LIBS $LIBIDL_LIBS"
|
LIBS="$LIBS $LIBIDL_LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 13713 "configure"
|
#line 13715 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -13720,7 +13722,7 @@ int main() {
|
||||||
return IDL_get_libver_string ? 1 : 0;
|
return IDL_get_libver_string ? 1 : 0;
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:13724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
if { (eval echo configure:13726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
echo "*** The test program compiled, but did not run. This usually means"
|
echo "*** The test program compiled, but did not run. This usually means"
|
||||||
echo "*** that the run-time linker is not finding libIDL or finding the wrong"
|
echo "*** that the run-time linker is not finding libIDL or finding the wrong"
|
||||||
|
@ -13760,7 +13762,7 @@ do
|
||||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||||
set dummy $ac_prog; ac_word=$2
|
set dummy $ac_prog; ac_word=$2
|
||||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||||
echo "configure:13764: checking for $ac_word" >&5
|
echo "configure:13766: checking for $ac_word" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
|
@ -13882,7 +13884,7 @@ fi
|
||||||
# Extract the first word of "glib-config", so it can be a program name with args.
|
# Extract the first word of "glib-config", so it can be a program name with args.
|
||||||
set dummy glib-config; ac_word=$2
|
set dummy glib-config; ac_word=$2
|
||||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||||
echo "configure:13886: checking for $ac_word" >&5
|
echo "configure:13888: checking for $ac_word" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
|
@ -13917,7 +13919,7 @@ fi
|
||||||
|
|
||||||
min_glib_version=${GLIB_VERSION}
|
min_glib_version=${GLIB_VERSION}
|
||||||
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
|
||||||
echo "configure:13921: checking for GLIB - version >= $min_glib_version" >&5
|
echo "configure:13923: checking for GLIB - version >= $min_glib_version" >&5
|
||||||
no_glib=""
|
no_glib=""
|
||||||
if test "$GLIB_CONFIG" = "no" ; then
|
if test "$GLIB_CONFIG" = "no" ; then
|
||||||
no_glib=yes
|
no_glib=yes
|
||||||
|
@ -13940,7 +13942,7 @@ echo "configure:13921: checking for GLIB - version >= $min_glib_version" >&5
|
||||||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 13944 "configure"
|
#line 13946 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
@ -14016,7 +14018,7 @@ main ()
|
||||||
}
|
}
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:14020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
if { (eval echo configure:14022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||||
then
|
then
|
||||||
:
|
:
|
||||||
else
|
else
|
||||||
|
@ -14050,7 +14052,7 @@ fi
|
||||||
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
CFLAGS="$CFLAGS $GLIB_CFLAGS"
|
||||||
LIBS="$LIBS $GLIB_LIBS"
|
LIBS="$LIBS $GLIB_LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 14054 "configure"
|
#line 14056 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
@ -14060,7 +14062,7 @@ int main() {
|
||||||
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:14064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
if { (eval echo configure:14066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
echo "*** The test program compiled, but did not run. This usually means"
|
echo "*** The test program compiled, but did not run. This usually means"
|
||||||
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
|
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
|
||||||
|
@ -14204,14 +14206,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
|
||||||
cross_compiling=$ac_cv_prog_cc_cross
|
cross_compiling=$ac_cv_prog_cc_cross
|
||||||
|
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 14208 "configure"
|
#line 14210 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <gmodule.h>
|
#include <gmodule.h>
|
||||||
int main() {
|
int main() {
|
||||||
int x = 1; x++;
|
int x = 1; x++;
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:14215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
if { (eval echo configure:14217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||||
:
|
:
|
||||||
else
|
else
|
||||||
echo "configure: failed program was:" >&5
|
echo "configure: failed program was:" >&5
|
||||||
|
|
Загрузка…
Ссылка в новой задаче