зеркало из https://github.com/mozilla/gecko-dev.git
Automated update
This commit is contained in:
leaf%mozilla.org
Родитель
875808ff50
Коммит
4d9b7b5127
|
|
@ -10016,34 +10016,47 @@ EOF
|
|||
|
||||
fi
|
||||
|
||||
echo $ac_n "checking whether the compiler cannot resolve const ambiguities correctly""... $ac_c" 1>&6
|
||||
echo "configure:10021: checking whether the compiler cannot resolve const ambiguities correctly" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cant_resolve_const_ambiguity'+set}'`\" = set"; then
|
||||
echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
|
||||
echo "configure:10021: checking whether the compiler can resolve const ambiguities for templates" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10026 "configure"
|
||||
#include "confdefs.h"
|
||||
int a(int *i) { return *i; }
|
||||
const int a(const int *i) { return *i; }
|
||||
|
||||
template <class T> class ptrClass {
|
||||
public: T* ptr;
|
||||
};
|
||||
|
||||
template <class T> T* a(ptrClass<T> *arg) {
|
||||
return arg->ptr;
|
||||
}
|
||||
|
||||
template <class T>
|
||||
const T* a(const ptrClass<T> *arg) {
|
||||
return arg->ptr;
|
||||
}
|
||||
|
||||
int main() {
|
||||
int i; a(&i);
|
||||
ptrClass<int> i;
|
||||
a(&i);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cant_resolve_const_ambiguity=no
|
||||
ac_cv_can_resolve_const_ambiguity=yes
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
ac_cv_cant_resolve_const_ambiguity=yes
|
||||
ac_cv_can_resolve_const_ambiguity=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
|
||||
echo "$ac_t""$ac_cv_cant_resolve_const_ambiguity" 1>&6
|
||||
if test "$ac_cv_cant_resolve_const_ambiguity" = yes ; then
|
||||
echo "$ac_t""$ac_cv_can_resolve_const_ambiguity" 1>&6
|
||||
if test "$ac_cv_can_resolve_const_ambiguity" = no ; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define CANT_RESOLVE_CPP_CONST_AMBIGUITY 1
|
||||
EOF
|
||||
|
|
@ -10052,12 +10065,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
|
||||
echo "configure:10056: checking whether the C++ \"using\" keyword can change access" >&5
|
||||
echo "configure:10069: checking whether the C++ \"using\" keyword can change access" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10061 "configure"
|
||||
#line 10074 "configure"
|
||||
#include "confdefs.h"
|
||||
class X { public: int go(const X&) {return 3;} };
|
||||
class Y : public X {
|
||||
|
|
@ -10068,7 +10081,7 @@ int main() {
|
|||
X x; Y y;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_access_changing_using=yes
|
||||
else
|
||||
|
|
@ -10089,12 +10102,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
|
||||
echo "configure:10093: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
|
||||
echo "configure:10106: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10098 "configure"
|
||||
#line 10111 "configure"
|
||||
#include "confdefs.h"
|
||||
class X {
|
||||
public: int go(const X&) {return 3;}
|
||||
|
|
@ -10110,7 +10123,7 @@ int main() {
|
|||
X x; Y y; y.jo(x);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_ambiguity_resolving_using=yes
|
||||
else
|
||||
|
|
@ -10131,19 +10144,19 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
|
||||
echo "configure:10135: checking for \"std::\" namespace" >&5
|
||||
echo "configure:10148: checking for \"std::\" namespace" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10140 "configure"
|
||||
#line 10153 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <algorithm>
|
||||
int main() {
|
||||
return std::min(0, 1);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_namespace_std=yes
|
||||
else
|
||||
|
|
@ -10164,12 +10177,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
|
||||
echo "configure:10168: checking whether standard template operator!=() is ambiguous" >&5
|
||||
echo "configure:10181: checking whether standard template operator!=() is ambiguous" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10173 "configure"
|
||||
#line 10186 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <algorithm>
|
||||
struct T1 {};
|
||||
|
|
@ -10179,7 +10192,7 @@ int main() {
|
|||
T1 a,b; return a != b;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_unambiguous_std_notequal=unambiguous
|
||||
else
|
||||
|
|
@ -10201,12 +10214,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
|
||||
echo "configure:10205: checking for C++ reinterpret_cast" >&5
|
||||
echo "configure:10218: checking for C++ reinterpret_cast" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10210 "configure"
|
||||
#line 10223 "configure"
|
||||
#include "confdefs.h"
|
||||
struct X { int i; };
|
||||
struct Y { int i; };
|
||||
|
|
@ -10214,7 +10227,7 @@ int main() {
|
|||
X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_reinterpret_cast=yes
|
||||
else
|
||||
|
|
@ -10235,7 +10248,7 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
|
||||
echo "configure:10239: checking for C++ dynamic_cast to void*" >&5
|
||||
echo "configure:10252: checking for C++ dynamic_cast to void*" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -10243,7 +10256,7 @@ else
|
|||
ac_cv_cpp_dynamic_cast_void_ptr=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10247 "configure"
|
||||
#line 10260 "configure"
|
||||
#include "confdefs.h"
|
||||
#ifdef __cplusplus
|
||||
extern "C" void exit(int);
|
||||
|
|
@ -10262,7 +10275,7 @@ class X { int i; public: virtual ~X() { } };
|
|||
((void*)&mdo == dynamic_cast<void*>(suby))));
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:10266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:10279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_cpp_dynamic_cast_void_ptr=yes
|
||||
else
|
||||
|
|
@ -10286,19 +10299,19 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
|
||||
echo "configure:10290: checking whether C++ requires implementation of unused virtual methods" >&5
|
||||
echo "configure:10303: checking whether C++ requires implementation of unused virtual methods" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10295 "configure"
|
||||
#line 10308 "configure"
|
||||
#include "confdefs.h"
|
||||
class X {private: virtual void never_called();};
|
||||
int main() {
|
||||
X x;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_unused_required=no
|
||||
else
|
||||
|
|
@ -10321,12 +10334,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
|
||||
echo "configure:10325: checking for trouble comparing to zero near std::operator!=()" >&5
|
||||
echo "configure:10338: checking for trouble comparing to zero near std::operator!=()" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10330 "configure"
|
||||
#line 10343 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <algorithm>
|
||||
template <class T> class Foo {};
|
||||
|
|
@ -10337,7 +10350,7 @@ int main() {
|
|||
Foo<int> f; return (0 != f);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_trouble_comparing_to_zero=no
|
||||
else
|
||||
|
|
@ -10369,19 +10382,19 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||
|
||||
|
||||
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
|
||||
echo "configure:10373: checking for LC_MESSAGES" >&5
|
||||
echo "configure:10386: checking for LC_MESSAGES" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10378 "configure"
|
||||
#line 10391 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <locale.h>
|
||||
int main() {
|
||||
int category = LC_MESSAGES;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_i18n_lc_messages=yes
|
||||
else
|
||||
|
|
@ -10875,12 +10888,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
|||
_SAVE_CXXFLAGS=$CXXFLAGS
|
||||
CXXFLAGS="$CXXFLAGS ${_WARNING_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
|
||||
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
|
||||
echo "configure:10879: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||
echo "configure:10892: 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 10884 "configure"
|
||||
#line 10897 "configure"
|
||||
#include "confdefs.h"
|
||||
#ifdef __cplusplus
|
||||
extern "C" void exit(int);
|
||||
|
|
@ -10889,7 +10902,7 @@ extern "C" void exit(int);
|
|||
if (sizeof(long long) != 8) { return 1; }
|
||||
return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:10906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
result="no"
|
||||
else
|
||||
|
|
@ -10941,16 +10954,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:10945: checking whether compiler supports -Wno-long-long" >&5
|
||||
echo "configure:10958: checking whether compiler supports -Wno-long-long" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10947 "configure"
|
||||
#line 10960 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10967: \"$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"
|
||||
|
|
@ -11165,7 +11178,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking webshell leaks option""... $ac_c" 1>&6
|
||||
echo "configure:11169: checking webshell leaks option" >&5
|
||||
echo "configure:11182: checking webshell leaks option" >&5
|
||||
# Check whether --enable-detect-webshell-leaks or --disable-detect-webshell-leaks was given.
|
||||
if test "${enable_detect_webshell_leaks+set}" = set; then
|
||||
enableval="$enable_detect_webshell_leaks"
|
||||
|
|
@ -11239,7 +11252,7 @@ if test "${enable_efence+set}" = set; then
|
|||
enableval="$enable_efence"
|
||||
if test "$enableval" = "yes"; then
|
||||
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
|
||||
echo "configure:11243: checking for malloc in -lefence" >&5
|
||||
echo "configure:11256: 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
|
||||
|
|
@ -11247,7 +11260,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lefence $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11251 "configure"
|
||||
#line 11264 "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
|
||||
|
|
@ -11258,7 +11271,7 @@ int main() {
|
|||
malloc()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11275: \"$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
|
||||
|
|
@ -11294,7 +11307,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
|
||||
echo "configure:11298: checking for cplus_demangle in -liberty" >&5
|
||||
echo "configure:11311: checking for cplus_demangle in -liberty" >&5
|
||||
ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -11302,7 +11315,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-liberty "-liberty" $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11306 "configure"
|
||||
#line 11319 "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
|
||||
|
|
@ -11313,7 +11326,7 @@ int main() {
|
|||
cplus_demangle()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11330: \"$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
|
||||
|
|
@ -11603,7 +11616,7 @@ case "$target" in
|
|||
# Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
|
||||
set dummy makeC++SharedLib_r; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:11607: checking for $ac_word" >&5
|
||||
echo "configure:11620: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -11744,7 +11757,7 @@ if test "$JPEG_DIR" = no; then
|
|||
SYSTEM_JPEG=
|
||||
else
|
||||
echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:11748: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:11761: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -11752,7 +11765,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11756 "configure"
|
||||
#line 11769 "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
|
||||
|
|
@ -11763,7 +11776,7 @@ int main() {
|
|||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11780: \"$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
|
||||
|
|
@ -11792,7 +11805,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
|||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11796 "configure"
|
||||
#line 11809 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -11806,7 +11819,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:11810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:11823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
|
|
@ -11844,16 +11857,16 @@ if test "$ZLIB_DIR" = no; then
|
|||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:11848: checking "for zlib.h"" >&5
|
||||
echo "configure:11861: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11850 "configure"
|
||||
#line 11863 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
|
|
@ -11867,7 +11880,7 @@ rm -f conftest*
|
|||
fi
|
||||
if test "$SYSTEM_ZLIB" = 1; then
|
||||
echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
|
||||
echo "configure:11871: checking for gzread in -lz" >&5
|
||||
echo "configure:11884: checking for gzread in -lz" >&5
|
||||
ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -11875,7 +11888,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11879 "configure"
|
||||
#line 11892 "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
|
||||
|
|
@ -11886,7 +11899,7 @@ int main() {
|
|||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11903: \"$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
|
||||
|
|
@ -11932,7 +11945,7 @@ if test "$PNG_DIR" = no; then
|
|||
SYSTEM_PNG=
|
||||
else
|
||||
echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
|
||||
echo "configure:11936: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:11949: checking for png_get_valid in -lpng" >&5
|
||||
ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -11940,7 +11953,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11944 "configure"
|
||||
#line 11957 "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
|
||||
|
|
@ -11951,7 +11964,7 @@ int main() {
|
|||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11968: \"$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
|
||||
|
|
@ -11979,7 +11992,7 @@ if test "$SYSTEM_PNG" = 1; then
|
|||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11983 "configure"
|
||||
#line 11996 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -11993,7 +12006,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:11997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
|
|
@ -12060,9 +12073,9 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
|
|||
LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
|
||||
LIBS="-lfullsoft $LIBS"
|
||||
echo $ac_n "checking "for FCInitialize in -lfullsoft"""... $ac_c" 1>&6
|
||||
echo "configure:12064: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
echo "configure:12077: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12066 "configure"
|
||||
#line 12079 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include "fullsoft.h"
|
||||
|
|
@ -12070,7 +12083,7 @@ int main() {
|
|||
FCInitialize(); exit(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
FULLCIRCLE_LIBS="-I${FULLCIRCLE_DIR} -L${FULLCIRCLE_DIR} -lfullsoft" result="yes"
|
||||
else
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче