This commit is contained in:
leaf%mozilla.org 2000-05-25 19:45:38 +00:00
Родитель feb9eaa028
Коммит 8f28cce509
1 изменённых файлов: 34 добавлений и 33 удалений

67
configure поставляемый
Просмотреть файл

@ -9915,6 +9915,7 @@ case "$target" in
*-freebsd*) MOZ_MONOLITHIC_TOOLKIT= ;;
*-*-aix*) MOZ_MONOLITHIC_TOOLKIT= ;;
*-*-osf*) MOZ_MONOLITHIC_TOOLKIT= ;;
*-hpux11.*) MOZ_MONOLITHIC_TOOLKIT= ;;
esac
@ -10183,12 +10184,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:10187: checking whether C++ compiler has -pedantic long long bug" >&5
echo "configure:10188: 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 10192 "configure"
#line 10193 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@ -10197,7 +10198,7 @@ extern "C" void exit(int);
if (sizeof(long long) != 8) { return 1; }
return 0; }
EOF
if { (eval echo configure:10201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:10202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
result="no"
else
@ -10249,16 +10250,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:10253: checking whether compiler supports -Wno-long-long" >&5
echo "configure:10254: checking whether compiler supports -Wno-long-long" >&5
cat > conftest.$ac_ext <<EOF
#line 10255 "configure"
#line 10256 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
if { (eval echo configure:10262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:10263: \"$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"
@ -10453,7 +10454,7 @@ fi
echo $ac_n "checking webshell leaks option""... $ac_c" 1>&6
echo "configure:10457: checking webshell leaks option" >&5
echo "configure:10458: 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"
@ -10527,7 +10528,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:10531: checking for malloc in -lefence" >&5
echo "configure:10532: 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
@ -10535,7 +10536,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lefence $LIBS"
cat > conftest.$ac_ext <<EOF
#line 10539 "configure"
#line 10540 "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
@ -10546,7 +10547,7 @@ int main() {
malloc()
; return 0; }
EOF
if { (eval echo configure:10550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:10551: \"$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
@ -10598,7 +10599,7 @@ fi
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
echo "configure:10602: checking for cplus_demangle in -liberty" >&5
echo "configure:10603: 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
@ -10606,7 +10607,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-liberty "-liberty" $LIBS"
cat > conftest.$ac_ext <<EOF
#line 10610 "configure"
#line 10611 "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
@ -10617,7 +10618,7 @@ int main() {
cplus_demangle()
; return 0; }
EOF
if { (eval echo configure:10621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:10622: \"$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
@ -10871,7 +10872,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:10875: checking for $ac_word" >&5
echo "configure:10876: 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
@ -11005,7 +11006,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:11009: checking for jpeg_destroy_compress in -ljpeg" >&5
echo "configure:11010: 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
@ -11013,7 +11014,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $JPEG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 11017 "configure"
#line 11018 "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
@ -11024,7 +11025,7 @@ int main() {
jpeg_destroy_compress()
; return 0; }
EOF
if { (eval echo configure:11028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:11029: \"$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
@ -11053,7 +11054,7 @@ if test "$SYSTEM_JPEG" = 1; then
SYSTEM_JPEG=
else
cat > conftest.$ac_ext <<EOF
#line 11057 "configure"
#line 11058 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@ -11067,7 +11068,7 @@ else
}
EOF
if { (eval echo configure:11071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:11072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
SYSTEM_JPEG=1
else
@ -11105,16 +11106,16 @@ if test "$ZLIB_DIR" = no; then
SYSTEM_ZLIB=
else
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
echo "configure:11109: checking "for zlib.h"" >&5
echo "configure:11110: checking "for zlib.h"" >&5
cat > conftest.$ac_ext <<EOF
#line 11111 "configure"
#line 11112 "configure"
#include "confdefs.h"
#include "zlib.h"
int main() {
; return 0; }
EOF
if { (eval echo configure:11118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:11119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="yes" SYSTEM_ZLIB=1
else
@ -11128,7 +11129,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:11132: checking for gzread in -lz" >&5
echo "configure:11133: 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
@ -11136,7 +11137,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $ZLIB_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 11140 "configure"
#line 11141 "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
@ -11147,7 +11148,7 @@ int main() {
gzread()
; return 0; }
EOF
if { (eval echo configure:11151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:11152: \"$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
@ -11193,7 +11194,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:11197: checking for png_get_valid in -lpng" >&5
echo "configure:11198: 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
@ -11201,7 +11202,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng $PNG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 11205 "configure"
#line 11206 "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
@ -11212,7 +11213,7 @@ int main() {
png_get_valid()
; return 0; }
EOF
if { (eval echo configure:11216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:11217: \"$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
@ -11240,7 +11241,7 @@ if test "$SYSTEM_PNG" = 1; then
SYSTEM_PNG=
else
cat > conftest.$ac_ext <<EOF
#line 11244 "configure"
#line 11245 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@ -11254,7 +11255,7 @@ else
}
EOF
if { (eval echo configure:11258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:11259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
SYSTEM_PNG=1
else
@ -11321,9 +11322,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:11325: checking "for FCInitialize in -lfullsoft"" >&5;
echo "configure:11326: checking "for FCInitialize in -lfullsoft"" >&5;
cat > conftest.$ac_ext <<EOF
#line 11327 "configure"
#line 11328 "configure"
#include "confdefs.h"
#include <stdio.h>
#include "fullsoft.h"
@ -11331,7 +11332,7 @@ int main() {
FCInitialize(); exit(0);
; return 0; }
EOF
if { (eval echo configure:11335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:11336: \"$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