зеркало из https://github.com/mozilla/gecko-dev.git
Move AC_DEFINE outside of AC_CACHE check to fix problem of config-defs.h always being regenerated.
This commit is contained in:
cls%seawood.org
Родитель
e09e75b7d7
Коммит
567226c35e
|
|
@ -9782,11 +9782,7 @@ const char *glibc_version = gnu_get_libc_version();
|
|||
EOF
|
||||
if { (eval echo configure:9784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_func_gnu_get_libc_version=yes
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_GNU_GET_LIBC_VERSION 1
|
||||
EOF
|
||||
|
||||
ac_cv_func_gnu_get_libc_version=yes
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
|
|
@ -9800,13 +9796,20 @@ fi
|
|||
|
||||
echo "$ac_t""$ac_cv_func_gnu_get_libc_version" 1>&6
|
||||
|
||||
if test "$ac_cv_func_gnu_get_libc_version" = "yes"; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_GNU_GET_LIBC_VERSION 1
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
echo $ac_n "checking how to call gettimeofday""... $ac_c" 1>&6
|
||||
echo "configure:9805: checking how to call gettimeofday" >&5
|
||||
echo "configure:9808: checking how to call gettimeofday" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_gettimeofday_args'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9810 "configure"
|
||||
#line 9813 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
#include <sys/time.h>
|
||||
|
|
@ -9815,7 +9818,7 @@ struct timeval tv; struct timezone tzp;
|
|||
gettimeofday(&tv, &tzp);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:9822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_gettimeofday_args=2
|
||||
else
|
||||
|
|
@ -9823,7 +9826,7 @@ else
|
|||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9827 "configure"
|
||||
#line 9830 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
#include <sys/time.h>
|
||||
|
|
@ -9831,7 +9834,7 @@ int main() {
|
|||
struct timeval tv; gettimeofday(&tv);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:9838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_gettimeofday_args=1
|
||||
else
|
||||
|
|
@ -9867,7 +9870,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for /dev/zero""... $ac_c" 1>&6
|
||||
echo "configure:9871: checking for /dev/zero" >&5
|
||||
echo "configure:9874: checking for /dev/zero" >&5
|
||||
if test "$HAVE_DEV_ZERO"; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_DEV_ZERO 1
|
||||
|
|
@ -9884,19 +9887,19 @@ EOF
|
|||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for valloc""... $ac_c" 1>&6
|
||||
echo "configure:9888: checking for valloc" >&5
|
||||
echo "configure:9891: checking for valloc" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_valloc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9893 "configure"
|
||||
#line 9896 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
int main() {
|
||||
void *ptr = valloc(1);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:9903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_valloc=true
|
||||
else
|
||||
|
|
@ -9922,7 +9925,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether va_list assignments need array notation""... $ac_c" 1>&6
|
||||
echo "configure:9926: checking whether va_list assignments need array notation" >&5
|
||||
echo "configure:9929: checking whether va_list assignments need array notation" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_valistisarray'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -9930,7 +9933,7 @@ else
|
|||
ac_cv_valistisarray=false
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9934 "configure"
|
||||
#line 9937 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
|
|
@ -9943,7 +9946,7 @@ else
|
|||
}
|
||||
int main() { foo(0, 123); return(0); }
|
||||
EOF
|
||||
if { (eval echo configure:9947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:9950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_valistisarray=false
|
||||
else
|
||||
|
|
@ -10019,12 +10022,12 @@ EOF
|
|||
esac
|
||||
|
||||
echo $ac_n "checking for sys_errlist/sys_nerr""... $ac_c" 1>&6
|
||||
echo "configure:10023: checking for sys_errlist/sys_nerr" >&5
|
||||
echo "configure:10026: checking for sys_errlist/sys_nerr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_syserrlist'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10028 "configure"
|
||||
#line 10031 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
|
@ -10032,7 +10035,7 @@ int main() {
|
|||
char *foo = sys_errlist[sys_nerr-1];
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_syserrlist=true
|
||||
else
|
||||
|
|
@ -10059,7 +10062,7 @@ if test "$GNU_CXX"; then
|
|||
_MOZ_RTTI_FLAGS=${_COMPILER_PREFIX}-fno-rtti
|
||||
|
||||
echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6
|
||||
echo "configure:10063: checking for C++ exceptions flag" >&5
|
||||
echo "configure:10066: checking for C++ exceptions flag" >&5
|
||||
|
||||
if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -10091,12 +10094,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
|||
|
||||
|
||||
echo $ac_n "checking for ios::binary""... $ac_c" 1>&6
|
||||
echo "configure:10095: checking for ios::binary" >&5
|
||||
echo "configure:10098: checking for ios::binary" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_ios_binary'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10100 "configure"
|
||||
#line 10103 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <iostream.h>
|
||||
#include <fstream.h>
|
||||
|
|
@ -10105,7 +10108,7 @@ char *buffer = "config.log";
|
|||
fstream *mFileStream=new fstream(buffer, ios::binary);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_ios_binary=true
|
||||
else
|
||||
|
|
@ -10129,12 +10132,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for ios::bin""... $ac_c" 1>&6
|
||||
echo "configure:10133: checking for ios::bin" >&5
|
||||
echo "configure:10136: checking for ios::bin" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_ios_bin'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10138 "configure"
|
||||
#line 10141 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <iostream.h>
|
||||
#include <fstream.h>
|
||||
|
|
@ -10143,7 +10146,7 @@ char *buffer = "config.log";
|
|||
fstream *mFileStream=new fstream(buffer, ios::bin);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_ios_bin=true
|
||||
else
|
||||
|
|
@ -10166,19 +10169,19 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for ostreams""... $ac_c" 1>&6
|
||||
echo "configure:10170: checking for ostreams" >&5
|
||||
echo "configure:10173: checking for ostreams" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_ostream'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10175 "configure"
|
||||
#line 10178 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <iostream.h>
|
||||
int main() {
|
||||
streambuf *xxx; ostream *foo=new ostream(xxx);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_ostream=true
|
||||
else
|
||||
|
|
@ -10204,19 +10207,19 @@ else
|
|||
LIBS='-lemxio -lsocket -lstdcpp'
|
||||
fi
|
||||
echo $ac_n "checking for ostreams in -lstdc++""... $ac_c" 1>&6
|
||||
echo "configure:10208: checking for ostreams in -lstdc++" >&5
|
||||
echo "configure:10211: checking for ostreams in -lstdc++" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_stdcpp_ostream'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10213 "configure"
|
||||
#line 10216 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <iostream.h>
|
||||
int main() {
|
||||
ostream *foo=new ostream();
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_lib_stdcpp_ostream=true
|
||||
else
|
||||
|
|
@ -10241,19 +10244,19 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for C++ \"bool\" keyword""... $ac_c" 1>&6
|
||||
echo "configure:10245: checking for C++ \"bool\" keyword" >&5
|
||||
echo "configure:10248: checking for C++ \"bool\" keyword" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_bool'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10250 "configure"
|
||||
#line 10253 "configure"
|
||||
#include "confdefs.h"
|
||||
bool b;
|
||||
int main() {
|
||||
b = true;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_bool=yes
|
||||
else
|
||||
|
|
@ -10275,12 +10278,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
|
||||
echo "configure:10279: checking for C++ \"explicit\" keyword" >&5
|
||||
echo "configure:10282: checking for C++ \"explicit\" keyword" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10284 "configure"
|
||||
#line 10287 "configure"
|
||||
#include "confdefs.h"
|
||||
class X {
|
||||
public: explicit X(int i) : i_(i) {}
|
||||
|
|
@ -10290,7 +10293,7 @@ int main() {
|
|||
X x(3);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_explicit=yes
|
||||
else
|
||||
|
|
@ -10311,12 +10314,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for C++ template specialization support""... $ac_c" 1>&6
|
||||
echo "configure:10315: checking for C++ template specialization support" >&5
|
||||
echo "configure:10318: checking for C++ template specialization support" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_template_specialization'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10320 "configure"
|
||||
#line 10323 "configure"
|
||||
#include "confdefs.h"
|
||||
template <class T> struct X { int a; };
|
||||
class Y {};
|
||||
|
|
@ -10326,7 +10329,7 @@ X<int> int_x;
|
|||
X<Y> y_x;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_template_specialization=yes
|
||||
else
|
||||
|
|
@ -10356,12 +10359,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6
|
||||
echo "configure:10360: checking for modern C++ template specialization syntax support" >&5
|
||||
echo "configure:10363: checking for modern C++ template specialization syntax support" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10365 "configure"
|
||||
#line 10368 "configure"
|
||||
#include "confdefs.h"
|
||||
template <class T> struct X { int a; };
|
||||
class Y {};
|
||||
|
|
@ -10371,7 +10374,7 @@ X<int> int_x;
|
|||
X<Y> y_x;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_modern_specialize_template_syntax=yes
|
||||
else
|
||||
|
|
@ -10393,12 +10396,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6
|
||||
echo "configure:10397: checking whether partial template specialization works" >&5
|
||||
echo "configure:10400: checking whether partial template specialization works" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10402 "configure"
|
||||
#line 10405 "configure"
|
||||
#include "confdefs.h"
|
||||
template <class T> class Foo {};
|
||||
template <class T> class Foo<T*> {};
|
||||
|
|
@ -10406,7 +10409,7 @@ int main() {
|
|||
return 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_partial_specialization=yes
|
||||
else
|
||||
|
|
@ -10428,12 +10431,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6
|
||||
echo "configure:10432: checking whether operators must be re-defined for templates derived from templates" >&5
|
||||
echo "configure:10435: checking whether operators must be re-defined for templates derived from templates" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10437 "configure"
|
||||
#line 10440 "configure"
|
||||
#include "confdefs.h"
|
||||
template <class T> class Base { };
|
||||
template <class T>
|
||||
|
|
@ -10445,7 +10448,7 @@ Derived<char> a, b;
|
|||
return 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_need_derived_template_operators=no
|
||||
else
|
||||
|
|
@ -10467,12 +10470,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6
|
||||
echo "configure:10471: checking whether we need to cast a derived template to pass as its base class" >&5
|
||||
echo "configure:10474: checking whether we need to cast a derived template to pass as its base class" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10476 "configure"
|
||||
#line 10479 "configure"
|
||||
#include "confdefs.h"
|
||||
template <class T> class Base { };
|
||||
template <class T> class Derived : public Base<T> { };
|
||||
|
|
@ -10481,7 +10484,7 @@ int main() {
|
|||
Derived<char> bar; return foo(bar);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_need_cpp_template_cast_to_base=no
|
||||
else
|
||||
|
|
@ -10502,12 +10505,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6
|
||||
echo "configure:10506: checking whether the compiler can resolve const ambiguities for templates" >&5
|
||||
echo "configure:10509: 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 10511 "configure"
|
||||
#line 10514 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
template <class T> class ptrClass {
|
||||
|
|
@ -10528,7 +10531,7 @@ int main() {
|
|||
a(&i);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_can_resolve_const_ambiguity=yes
|
||||
else
|
||||
|
|
@ -10550,12 +10553,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6
|
||||
echo "configure:10554: checking whether the C++ \"using\" keyword can change access" >&5
|
||||
echo "configure:10557: 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 10559 "configure"
|
||||
#line 10562 "configure"
|
||||
#include "confdefs.h"
|
||||
class X { public: int go(const X&) {return 3;} };
|
||||
class Y : public X {
|
||||
|
|
@ -10566,7 +10569,7 @@ int main() {
|
|||
X x; Y y;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_access_changing_using=yes
|
||||
else
|
||||
|
|
@ -10587,12 +10590,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6
|
||||
echo "configure:10591: checking whether the C++ \"using\" keyword resolves ambiguity" >&5
|
||||
echo "configure:10594: 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 10596 "configure"
|
||||
#line 10599 "configure"
|
||||
#include "confdefs.h"
|
||||
class X {
|
||||
public: int go(const X&) {return 3;}
|
||||
|
|
@ -10608,7 +10611,7 @@ int main() {
|
|||
X x; Y y; y.jo(x);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_ambiguity_resolving_using=yes
|
||||
else
|
||||
|
|
@ -10629,19 +10632,19 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6
|
||||
echo "configure:10633: checking for \"std::\" namespace" >&5
|
||||
echo "configure:10636: 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 10638 "configure"
|
||||
#line 10641 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <algorithm>
|
||||
int main() {
|
||||
return std::min(0, 1);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_namespace_std=yes
|
||||
else
|
||||
|
|
@ -10662,12 +10665,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6
|
||||
echo "configure:10666: checking whether standard template operator!=() is ambiguous" >&5
|
||||
echo "configure:10669: 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 10671 "configure"
|
||||
#line 10674 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <algorithm>
|
||||
struct T1 {};
|
||||
|
|
@ -10677,7 +10680,7 @@ int main() {
|
|||
T1 a,b; return a != b;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_unambiguous_std_notequal=unambiguous
|
||||
else
|
||||
|
|
@ -10699,12 +10702,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
|
||||
echo "configure:10703: checking for C++ reinterpret_cast" >&5
|
||||
echo "configure:10706: 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 10708 "configure"
|
||||
#line 10711 "configure"
|
||||
#include "confdefs.h"
|
||||
struct X { int i; };
|
||||
struct Y { int i; };
|
||||
|
|
@ -10712,7 +10715,7 @@ int main() {
|
|||
X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_reinterpret_cast=yes
|
||||
else
|
||||
|
|
@ -10733,7 +10736,7 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6
|
||||
echo "configure:10737: checking for C++ dynamic_cast to void*" >&5
|
||||
echo "configure:10740: 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
|
||||
|
|
@ -10741,7 +10744,7 @@ else
|
|||
ac_cv_cpp_dynamic_cast_void_ptr=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10745 "configure"
|
||||
#line 10748 "configure"
|
||||
#include "confdefs.h"
|
||||
#ifdef __cplusplus
|
||||
extern "C" void exit(int);
|
||||
|
|
@ -10760,7 +10763,7 @@ class X { int i; public: virtual ~X() { } };
|
|||
((void*)&mdo == dynamic_cast<void*>(suby))));
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:10764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:10767: \"$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
|
||||
|
|
@ -10784,19 +10787,19 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6
|
||||
echo "configure:10788: checking whether C++ requires implementation of unused virtual methods" >&5
|
||||
echo "configure:10791: 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 10793 "configure"
|
||||
#line 10796 "configure"
|
||||
#include "confdefs.h"
|
||||
class X {private: virtual void never_called();};
|
||||
int main() {
|
||||
X x;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10803: \"$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
|
||||
|
|
@ -10819,12 +10822,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6
|
||||
echo "configure:10823: checking for trouble comparing to zero near std::operator!=()" >&5
|
||||
echo "configure:10826: 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 10828 "configure"
|
||||
#line 10831 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <algorithm>
|
||||
template <class T> class Foo {};
|
||||
|
|
@ -10835,7 +10838,7 @@ int main() {
|
|||
Foo<int> f; return (0 != f);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_trouble_comparing_to_zero=no
|
||||
else
|
||||
|
|
@ -10867,19 +10870,19 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||
|
||||
|
||||
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
|
||||
echo "configure:10871: checking for LC_MESSAGES" >&5
|
||||
echo "configure:10874: 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 10876 "configure"
|
||||
#line 10879 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <locale.h>
|
||||
int main() {
|
||||
int category = LC_MESSAGES;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:10886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_i18n_lc_messages=yes
|
||||
else
|
||||
|
|
@ -11490,12 +11493,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
|||
_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:11494: checking whether C++ compiler has -pedantic long long bug" >&5
|
||||
echo "configure:11497: 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 11499 "configure"
|
||||
#line 11502 "configure"
|
||||
#include "confdefs.h"
|
||||
#ifdef __cplusplus
|
||||
extern "C" void exit(int);
|
||||
|
|
@ -11504,7 +11507,7 @@ extern "C" void exit(int);
|
|||
if (sizeof(long long) != 8) { return 1; }
|
||||
return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:11511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
result="no"
|
||||
else
|
||||
|
|
@ -11552,12 +11555,12 @@ _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:11556: checking for correct overload resolution with const and templates" >&5
|
||||
echo "configure:11559: 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 11561 "configure"
|
||||
#line 11564 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
template <class T>
|
||||
|
|
@ -11587,7 +11590,7 @@ int main() {
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_nscap_nonconst_opeq_bug="no"
|
||||
else
|
||||
|
|
@ -11633,16 +11636,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:11637: checking whether compiler supports -Wno-long-long" >&5
|
||||
echo "configure:11640: checking whether compiler supports -Wno-long-long" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11639 "configure"
|
||||
#line 11642 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:11649: \"$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"
|
||||
|
|
@ -11891,7 +11894,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking webshell leaks option""... $ac_c" 1>&6
|
||||
echo "configure:11895: checking webshell leaks option" >&5
|
||||
echo "configure:11898: 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"
|
||||
|
|
@ -11965,7 +11968,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:11969: checking for malloc in -lefence" >&5
|
||||
echo "configure:11972: 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
|
||||
|
|
@ -11973,7 +11976,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lefence $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11977 "configure"
|
||||
#line 11980 "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
|
||||
|
|
@ -11984,7 +11987,7 @@ int main() {
|
|||
malloc()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:11988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:11991: \"$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
|
||||
|
|
@ -12020,7 +12023,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
|
||||
echo "configure:12024: checking for cplus_demangle in -liberty" >&5
|
||||
echo "configure:12027: 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
|
||||
|
|
@ -12028,7 +12031,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-liberty "-liberty" $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12032 "configure"
|
||||
#line 12035 "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
|
||||
|
|
@ -12039,7 +12042,7 @@ int main() {
|
|||
cplus_demangle()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12046: \"$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
|
||||
|
|
@ -12385,7 +12388,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:12389: checking for $ac_word" >&5
|
||||
echo "configure:12392: 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
|
||||
|
|
@ -12530,7 +12533,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:12534: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:12537: 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
|
||||
|
|
@ -12538,7 +12541,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12542 "configure"
|
||||
#line 12545 "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
|
||||
|
|
@ -12549,7 +12552,7 @@ int main() {
|
|||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12556: \"$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
|
||||
|
|
@ -12578,7 +12581,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
|||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12582 "configure"
|
||||
#line 12585 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -12592,7 +12595,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:12596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
|
|
@ -12630,16 +12633,16 @@ if test "$ZLIB_DIR" = no; then
|
|||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:12634: checking "for zlib.h"" >&5
|
||||
echo "configure:12637: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12636 "configure"
|
||||
#line 12639 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:12646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
|
|
@ -12653,7 +12656,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:12657: checking for gzread in -lz" >&5
|
||||
echo "configure:12660: 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
|
||||
|
|
@ -12661,7 +12664,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12665 "configure"
|
||||
#line 12668 "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
|
||||
|
|
@ -12672,7 +12675,7 @@ int main() {
|
|||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12679: \"$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
|
||||
|
|
@ -12718,7 +12721,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:12722: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:12725: 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
|
||||
|
|
@ -12726,7 +12729,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12730 "configure"
|
||||
#line 12733 "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
|
||||
|
|
@ -12737,7 +12740,7 @@ int main() {
|
|||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12744: \"$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
|
||||
|
|
@ -12765,7 +12768,7 @@ if test "$SYSTEM_PNG" = 1; then
|
|||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12769 "configure"
|
||||
#line 12772 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -12779,7 +12782,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:12783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
|
|
@ -12818,7 +12821,7 @@ if test "$MNG_DIR" = no; then
|
|||
SYSTEM_MNG=
|
||||
else
|
||||
echo $ac_n "checking for mng_initialize in -lmng""... $ac_c" 1>&6
|
||||
echo "configure:12822: checking for mng_initialize in -lmng" >&5
|
||||
echo "configure:12825: checking for mng_initialize in -lmng" >&5
|
||||
ac_lib_var=`echo mng'_'mng_initialize | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -12826,7 +12829,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lmng $MNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12830 "configure"
|
||||
#line 12833 "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
|
||||
|
|
@ -12837,7 +12840,7 @@ int main() {
|
|||
mng_initialize()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12844: \"$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
|
||||
|
|
@ -12865,7 +12868,7 @@ if test "$SYSTEM_MNG" = 1; then
|
|||
SYSTEM_MNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12869 "configure"
|
||||
#line 12872 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -12879,7 +12882,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:12883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_MNG=1
|
||||
else
|
||||
|
|
@ -12945,9 +12948,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:12949: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
echo "configure:12952: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12951 "configure"
|
||||
#line 12954 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include "fullsoft.h"
|
||||
|
|
@ -12955,7 +12958,7 @@ int main() {
|
|||
FCInitialize(); exit(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12962: \"$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
|
||||
|
|
|
|||
|
|
@ -2368,12 +2368,15 @@ AC_CACHE_CHECK(
|
|||
#endif
|
||||
],
|
||||
[const char *glibc_version = gnu_get_libc_version();],
|
||||
[ac_cv_func_gnu_get_libc_version=yes
|
||||
AC_DEFINE(HAVE_GNU_GET_LIBC_VERSION)],
|
||||
[ac_cv_func_gnu_get_libc_version=yes],
|
||||
[ac_cv_func_gnu_get_libc_version=no]
|
||||
)]
|
||||
)
|
||||
|
||||
if test "$ac_cv_func_gnu_get_libc_version" = "yes"; then
|
||||
AC_DEFINE(HAVE_GNU_GET_LIBC_VERSION)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(how to call gettimeofday)
|
||||
AC_CACHE_VAL(ac_cv_gettimeofday_args,
|
||||
[AC_TRY_COMPILE([#include <stdlib.h>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче