mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
Automated update
This commit is contained in:
leaf%mozilla.org
parent
3331dd382b
commit
0aefd90e03
154
configure
vendored
154
configure
vendored
@ -10016,14 +10016,48 @@ 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 "(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; }
|
||||
int main() {
|
||||
int i; a(&i);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cant_resolve_const_ambiguity=no
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
ac_cv_cant_resolve_const_ambiguity=yes
|
||||
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
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define CANT_RESOLVE_CPP_CONST_AMBIGUITY 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
|
||||
echo "configure:10022: checking whether the C++ \"using\" keyword can change access" >&5
|
||||
echo "configure:10056: 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 10027 "configure"
|
||||
#line 10061 "configure"
|
||||
#include "confdefs.h"
|
||||
class X { public: int go(const X&) {return 3;} };
|
||||
class Y : public X {
|
||||
@ -10034,7 +10068,7 @@ int main() {
|
||||
X x; Y y;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_access_changing_using=yes
|
||||
else
|
||||
@ -10055,12 +10089,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
|
||||
echo "configure:10059: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
|
||||
echo "configure:10093: 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 10064 "configure"
|
||||
#line 10098 "configure"
|
||||
#include "confdefs.h"
|
||||
class X {
|
||||
public: int go(const X&) {return 3;}
|
||||
@ -10076,7 +10110,7 @@ int main() {
|
||||
X x; Y y; y.jo(x);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_ambiguity_resolving_using=yes
|
||||
else
|
||||
@ -10097,19 +10131,19 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
|
||||
echo "configure:10101: checking for \"std::\" namespace" >&5
|
||||
echo "configure:10135: 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 10106 "configure"
|
||||
#line 10140 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <algorithm>
|
||||
int main() {
|
||||
return std::min(0, 1);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_namespace_std=yes
|
||||
else
|
||||
@ -10130,12 +10164,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
|
||||
echo "configure:10134: checking whether standard template operator!=() is ambiguous" >&5
|
||||
echo "configure:10168: 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 10139 "configure"
|
||||
#line 10173 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <algorithm>
|
||||
struct T1 {};
|
||||
@ -10145,7 +10179,7 @@ int main() {
|
||||
T1 a,b; return a != b;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_unambiguous_std_notequal=unambiguous
|
||||
else
|
||||
@ -10167,12 +10201,12 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
|
||||
echo "configure:10171: checking for C++ reinterpret_cast" >&5
|
||||
echo "configure:10205: 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 10176 "configure"
|
||||
#line 10210 "configure"
|
||||
#include "confdefs.h"
|
||||
struct X { int i; };
|
||||
struct Y { int i; };
|
||||
@ -10180,7 +10214,7 @@ int main() {
|
||||
X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_reinterpret_cast=yes
|
||||
else
|
||||
@ -10201,7 +10235,7 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
|
||||
echo "configure:10205: checking for C++ dynamic_cast to void*" >&5
|
||||
echo "configure:10239: 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
|
||||
@ -10209,7 +10243,7 @@ else
|
||||
ac_cv_cpp_dynamic_cast_void_ptr=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10213 "configure"
|
||||
#line 10247 "configure"
|
||||
#include "confdefs.h"
|
||||
#ifdef __cplusplus
|
||||
extern "C" void exit(int);
|
||||
@ -10228,7 +10262,7 @@ class X { int i; public: virtual ~X() { } };
|
||||
((void*)&mdo == dynamic_cast<void*>(suby))));
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:10232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:10266: \"$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
|
||||
@ -10252,19 +10286,19 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
|
||||
echo "configure:10256: checking whether C++ requires implementation of unused virtual methods" >&5
|
||||
echo "configure:10290: 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 10261 "configure"
|
||||
#line 10295 "configure"
|
||||
#include "confdefs.h"
|
||||
class X {private: virtual void never_called();};
|
||||
int main() {
|
||||
X x;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10302: \"$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
|
||||
@ -10287,12 +10321,12 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
|
||||
echo "configure:10291: checking for trouble comparing to zero near std::operator!=()" >&5
|
||||
echo "configure:10325: 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 10296 "configure"
|
||||
#line 10330 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <algorithm>
|
||||
template <class T> class Foo {};
|
||||
@ -10303,7 +10337,7 @@ int main() {
|
||||
Foo<int> f; return (0 != f);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_trouble_comparing_to_zero=no
|
||||
else
|
||||
@ -10335,19 +10369,19 @@ cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
|
||||
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
|
||||
echo "configure:10339: checking for LC_MESSAGES" >&5
|
||||
echo "configure:10373: 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 10344 "configure"
|
||||
#line 10378 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <locale.h>
|
||||
int main() {
|
||||
int category = LC_MESSAGES;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_i18n_lc_messages=yes
|
||||
else
|
||||
@ -10841,12 +10875,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:10845: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||
echo "configure:10879: 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 10850 "configure"
|
||||
#line 10884 "configure"
|
||||
#include "confdefs.h"
|
||||
#ifdef __cplusplus
|
||||
extern "C" void exit(int);
|
||||
@ -10855,7 +10889,7 @@ extern "C" void exit(int);
|
||||
if (sizeof(long long) != 8) { return 1; }
|
||||
return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:10893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
result="no"
|
||||
else
|
||||
@ -10907,16 +10941,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:10911: checking whether compiler supports -Wno-long-long" >&5
|
||||
echo "configure:10945: checking whether compiler supports -Wno-long-long" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10913 "configure"
|
||||
#line 10947 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10954: \"$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"
|
||||
@ -11131,7 +11165,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking webshell leaks option""... $ac_c" 1>&6
|
||||
echo "configure:11135: checking webshell leaks option" >&5
|
||||
echo "configure:11169: 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"
|
||||
@ -11205,7 +11239,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:11209: checking for malloc in -lefence" >&5
|
||||
echo "configure:11243: 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
|
||||
@ -11213,7 +11247,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lefence $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11217 "configure"
|
||||
#line 11251 "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
|
||||
@ -11224,7 +11258,7 @@ int main() {
|
||||
malloc()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11262: \"$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
|
||||
@ -11260,7 +11294,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
|
||||
echo "configure:11264: checking for cplus_demangle in -liberty" >&5
|
||||
echo "configure:11298: 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
|
||||
@ -11268,7 +11302,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-liberty "-liberty" $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11272 "configure"
|
||||
#line 11306 "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
|
||||
@ -11279,7 +11313,7 @@ int main() {
|
||||
cplus_demangle()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11317: \"$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
|
||||
@ -11569,7 +11603,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:11573: checking for $ac_word" >&5
|
||||
echo "configure:11607: 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
|
||||
@ -11710,7 +11744,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:11714: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:11748: 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
|
||||
@ -11718,7 +11752,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11722 "configure"
|
||||
#line 11756 "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
|
||||
@ -11729,7 +11763,7 @@ int main() {
|
||||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11767: \"$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
|
||||
@ -11758,7 +11792,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
||||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11762 "configure"
|
||||
#line 11796 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -11772,7 +11806,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:11776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:11810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
@ -11810,16 +11844,16 @@ if test "$ZLIB_DIR" = no; then
|
||||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:11814: checking "for zlib.h"" >&5
|
||||
echo "configure:11848: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11816 "configure"
|
||||
#line 11850 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
@ -11833,7 +11867,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:11837: checking for gzread in -lz" >&5
|
||||
echo "configure:11871: 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
|
||||
@ -11841,7 +11875,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11845 "configure"
|
||||
#line 11879 "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
|
||||
@ -11852,7 +11886,7 @@ int main() {
|
||||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11890: \"$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
|
||||
@ -11898,7 +11932,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:11902: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:11936: 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
|
||||
@ -11906,7 +11940,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11910 "configure"
|
||||
#line 11944 "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
|
||||
@ -11917,7 +11951,7 @@ int main() {
|
||||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11955: \"$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
|
||||
@ -11945,7 +11979,7 @@ if test "$SYSTEM_PNG" = 1; then
|
||||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11949 "configure"
|
||||
#line 11983 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -11959,7 +11993,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:11963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:11997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
@ -12026,9 +12060,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:12030: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
echo "configure:12064: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12032 "configure"
|
||||
#line 12066 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include "fullsoft.h"
|
||||
@ -12036,7 +12070,7 @@ int main() {
|
||||
FCInitialize(); exit(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12074: \"$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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user