Use the builtin AC_LANG_ functions rather than overriding CC & CFLAGS when testing for non-C language feature. Partial fix for bug #20254
git-svn-id: svn://10.0.0.236/trunk@55171 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org
parent
119acf2584
commit
f23f7ad15d
149
mozilla/configure
vendored
149
mozilla/configure
vendored
@ -8284,7 +8284,7 @@ echo "configure:8281: checking for C++ exceptions flag" >&5
|
||||
else
|
||||
echo "int main() { return 0; }" | cat > conftest.C
|
||||
|
||||
${CXX-g++} -c -fno-handle-exceptions conftest.C > conftest.out 2>&1
|
||||
${CXX-g++} ${CXXFLAGS} -c -fno-handle-exceptions conftest.C > conftest.out 2>&1
|
||||
|
||||
if egrep "warning.*renamed" conftest.out >/dev/null; then
|
||||
ac_cv_cxx_exceptions_flags=${_COMPILER_PREFIX}-fno-exceptions
|
||||
@ -8300,16 +8300,21 @@ fi
|
||||
_MOZ_EXCEPTIONS_FLAGS=$ac_cv_cxx_exceptions_flags
|
||||
fi
|
||||
|
||||
_SAVE_CC=$CC
|
||||
CC=$CXX
|
||||
ac_ext=C
|
||||
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
|
||||
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||
cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
|
||||
echo $ac_n "checking for ios::binary""... $ac_c" 1>&6
|
||||
echo "configure:8308: checking for ios::binary" >&5
|
||||
echo "configure:8313: 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 8313 "configure"
|
||||
#line 8318 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <iostream.h>
|
||||
#include <fstream.h>
|
||||
@ -8318,7 +8323,7 @@ char *buffer = "config.log";
|
||||
fstream *mFileStream=new fstream(buffer, ios::binary);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:8327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_ios_binary=true
|
||||
else
|
||||
@ -8342,12 +8347,12 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for ios::bin""... $ac_c" 1>&6
|
||||
echo "configure:8346: checking for ios::bin" >&5
|
||||
echo "configure:8351: 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 8351 "configure"
|
||||
#line 8356 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <iostream.h>
|
||||
#include <fstream.h>
|
||||
@ -8356,7 +8361,7 @@ char *buffer = "config.log";
|
||||
fstream *mFileStream=new fstream(buffer, ios::bin);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:8365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_ios_bin=true
|
||||
else
|
||||
@ -8379,19 +8384,19 @@ else
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for ostreams""... $ac_c" 1>&6
|
||||
echo "configure:8383: checking for ostreams" >&5
|
||||
echo "configure:8388: 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 8388 "configure"
|
||||
#line 8393 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <iostream.h>
|
||||
int main() {
|
||||
streambuf *xxx; ostream *foo=new ostream(xxx);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:8400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_ostream=true
|
||||
else
|
||||
@ -8414,19 +8419,19 @@ else
|
||||
_SAVE_LIBS=$LIBS
|
||||
LIBS="$LIBS -lstdc++"
|
||||
echo $ac_n "checking for ostreams in -lstdc++""... $ac_c" 1>&6
|
||||
echo "configure:8418: checking for ostreams in -lstdc++" >&5
|
||||
echo "configure:8423: 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 8423 "configure"
|
||||
#line 8428 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <iostream.h>
|
||||
int main() {
|
||||
ostream *foo=new ostream();
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:8435: \"$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
|
||||
@ -8451,19 +8456,19 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for C++ \"bool\" keyword""... $ac_c" 1>&6
|
||||
echo "configure:8455: checking for C++ \"bool\" keyword" >&5
|
||||
echo "configure:8460: 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 8460 "configure"
|
||||
#line 8465 "configure"
|
||||
#include "confdefs.h"
|
||||
bool b;
|
||||
int main() {
|
||||
b = true;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:8472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_bool=yes
|
||||
else
|
||||
@ -8485,12 +8490,12 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6
|
||||
echo "configure:8489: checking for C++ \"explicit\" keyword" >&5
|
||||
echo "configure:8494: 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 8494 "configure"
|
||||
#line 8499 "configure"
|
||||
#include "confdefs.h"
|
||||
class X {
|
||||
public: explicit X(int i) : i_(i) {}
|
||||
@ -8500,7 +8505,7 @@ int main() {
|
||||
X x(3);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:8509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_explicit=yes
|
||||
else
|
||||
@ -8521,12 +8526,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for C++ template specialization support""... $ac_c" 1>&6
|
||||
echo "configure:8525: checking for C++ template specialization support" >&5
|
||||
echo "configure:8530: 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 8530 "configure"
|
||||
#line 8535 "configure"
|
||||
#include "confdefs.h"
|
||||
template <class T> struct X { int a; };
|
||||
class Y {};
|
||||
@ -8536,7 +8541,7 @@ X<int> int_x;
|
||||
X<Y> y_x;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:8545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_template_specialization=yes
|
||||
else
|
||||
@ -8568,12 +8573,12 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for C++ \"using\" keyword""... $ac_c" 1>&6
|
||||
echo "configure:8572: checking for C++ \"using\" keyword" >&5
|
||||
echo "configure:8577: checking for C++ \"using\" keyword" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cpp_using'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8577 "configure"
|
||||
#line 8582 "configure"
|
||||
#include "confdefs.h"
|
||||
class X { public: int go() {return 3;} };
|
||||
class Y : public X {
|
||||
@ -8583,7 +8588,7 @@ int main() {
|
||||
X x; Y y;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:8592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_using=yes
|
||||
else
|
||||
@ -8604,12 +8609,12 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6
|
||||
echo "configure:8608: checking for C++ reinterpret_cast" >&5
|
||||
echo "configure:8613: 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 8613 "configure"
|
||||
#line 8618 "configure"
|
||||
#include "confdefs.h"
|
||||
struct X { int i; };
|
||||
struct Y { int i; };
|
||||
@ -8617,7 +8622,7 @@ int main() {
|
||||
X x; X*const z = &x;Y*y = reinterpret_cast<Y*>(z);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:8626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cpp_reinterpret_cast=yes
|
||||
else
|
||||
@ -8638,19 +8643,19 @@ EOF
|
||||
fi
|
||||
|
||||
echo $ac_n "checking whether C++ requires implementation of unused methods""... $ac_c" 1>&6
|
||||
echo "configure:8642: checking whether C++ requires implementation of unused methods" >&5
|
||||
echo "configure:8647: checking whether C++ requires implementation of unused 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 8647 "configure"
|
||||
#line 8652 "configure"
|
||||
#include "confdefs.h"
|
||||
class X {private: void never_called();};
|
||||
int main() {
|
||||
X x;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:8659: \"$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
|
||||
@ -8670,25 +8675,29 @@ EOF
|
||||
|
||||
fi
|
||||
|
||||
CC=$_SAVE_CC
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
|
||||
ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
|
||||
|
||||
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
|
||||
echo "configure:8680: checking for LC_MESSAGES" >&5
|
||||
echo "configure:8689: 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 8685 "configure"
|
||||
#line 8694 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <locale.h>
|
||||
int main() {
|
||||
int catagory = LC_MESSAGES;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:8701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_i18n_lc_messages=yes
|
||||
else
|
||||
@ -9096,16 +9105,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:9100: checking whether compiler supports -Wno-long-long" >&5
|
||||
echo "configure:9109: checking whether compiler supports -Wno-long-long" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9102 "configure"
|
||||
#line 9111 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:9118: \"$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"
|
||||
@ -9342,7 +9351,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:9346: checking for malloc in -lefence" >&5
|
||||
echo "configure:9355: 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
|
||||
@ -9350,7 +9359,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lefence $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9354 "configure"
|
||||
#line 9363 "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
|
||||
@ -9361,7 +9370,7 @@ int main() {
|
||||
malloc()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9374: \"$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
|
||||
@ -9397,7 +9406,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
|
||||
echo "configure:9401: checking for cplus_demangle in -liberty" >&5
|
||||
echo "configure:9410: 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
|
||||
@ -9405,7 +9414,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-liberty "-liberty" $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9409 "configure"
|
||||
#line 9418 "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
|
||||
@ -9416,7 +9425,7 @@ int main() {
|
||||
cplus_demangle()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9429: \"$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
|
||||
@ -9626,7 +9635,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:9630: checking for $ac_word" >&5
|
||||
echo "configure:9639: 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
|
||||
@ -9749,7 +9758,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:9753: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:9762: 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
|
||||
@ -9757,7 +9766,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9761 "configure"
|
||||
#line 9770 "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
|
||||
@ -9768,7 +9777,7 @@ int main() {
|
||||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9781: \"$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
|
||||
@ -9797,7 +9806,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
||||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9801 "configure"
|
||||
#line 9810 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -9811,7 +9820,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:9815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:9824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
@ -9849,16 +9858,16 @@ if test "$ZLIB_DIR" = no; then
|
||||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:9853: checking "for zlib.h"" >&5
|
||||
echo "configure:9862: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9855 "configure"
|
||||
#line 9864 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:9871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
@ -9872,7 +9881,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:9876: checking for gzread in -lz" >&5
|
||||
echo "configure:9885: 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
|
||||
@ -9880,7 +9889,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9884 "configure"
|
||||
#line 9893 "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
|
||||
@ -9891,7 +9900,7 @@ int main() {
|
||||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9904: \"$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
|
||||
@ -9937,7 +9946,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:9941: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:9950: 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
|
||||
@ -9945,7 +9954,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9949 "configure"
|
||||
#line 9958 "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
|
||||
@ -9956,7 +9965,7 @@ int main() {
|
||||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:9969: \"$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
|
||||
@ -9984,7 +9993,7 @@ if test "$SYSTEM_PNG" = 1; then
|
||||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9988 "configure"
|
||||
#line 9997 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -9998,7 +10007,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:10002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:10011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
@ -10057,9 +10066,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:10061: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
echo "configure:10070: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10063 "configure"
|
||||
#line 10072 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include "fullsoft.h"
|
||||
@ -10067,7 +10076,7 @@ int main() {
|
||||
FCInitialize(); exit(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:10071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:10080: \"$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
|
||||
@ -10224,14 +10233,6 @@ EOF
|
||||
else
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define XP_UNIX 1
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define UNIX_EMBED 1
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define X_PLUGINS 1
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user