This commit is contained in:
leaf%mozilla.org 2000-06-27 04:45:09 +00:00
Родитель 5b352ad4a0
Коммит 9e1406166b
1 изменённых файлов: 34 добавлений и 20 удалений

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

@ -10825,6 +10825,20 @@ EOF
fi
;;
*-solaris*)
# Demangle only for debug builds which are using the Gnu compiler.
if test "$GNU_CC"
then
if test "$MOZ_DEBUG"
then
MOZ_DEMANGLE_SYMBOLS=1
cat >> confdefs.h <<\EOF
#define MOZ_DEMANGLE_SYMBOLS 1
EOF
fi
fi
;;
esac
fi
@ -11057,7 +11071,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:11061: checking for $ac_word" >&5
echo "configure:11075: 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
@ -11193,7 +11207,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:11197: checking for jpeg_destroy_compress in -ljpeg" >&5
echo "configure:11211: 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
@ -11201,7 +11215,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $JPEG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 11205 "configure"
#line 11219 "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 +11226,7 @@ int main() {
jpeg_destroy_compress()
; 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:11230: \"$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
@ -11241,7 +11255,7 @@ if test "$SYSTEM_JPEG" = 1; then
SYSTEM_JPEG=
else
cat > conftest.$ac_ext <<EOF
#line 11245 "configure"
#line 11259 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@ -11255,7 +11269,7 @@ else
}
EOF
if { (eval echo configure:11259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:11273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
SYSTEM_JPEG=1
else
@ -11293,16 +11307,16 @@ if test "$ZLIB_DIR" = no; then
SYSTEM_ZLIB=
else
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
echo "configure:11297: checking "for zlib.h"" >&5
echo "configure:11311: checking "for zlib.h"" >&5
cat > conftest.$ac_ext <<EOF
#line 11299 "configure"
#line 11313 "configure"
#include "confdefs.h"
#include "zlib.h"
int main() {
; return 0; }
EOF
if { (eval echo configure:11306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:11320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="yes" SYSTEM_ZLIB=1
else
@ -11316,7 +11330,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:11320: checking for gzread in -lz" >&5
echo "configure:11334: 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
@ -11324,7 +11338,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $ZLIB_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 11328 "configure"
#line 11342 "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
@ -11335,7 +11349,7 @@ int main() {
gzread()
; return 0; }
EOF
if { (eval echo configure:11339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:11353: \"$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
@ -11381,7 +11395,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:11385: checking for png_get_valid in -lpng" >&5
echo "configure:11399: 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
@ -11389,7 +11403,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng $PNG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 11393 "configure"
#line 11407 "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
@ -11400,7 +11414,7 @@ int main() {
png_get_valid()
; return 0; }
EOF
if { (eval echo configure:11404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:11418: \"$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
@ -11428,7 +11442,7 @@ if test "$SYSTEM_PNG" = 1; then
SYSTEM_PNG=
else
cat > conftest.$ac_ext <<EOF
#line 11432 "configure"
#line 11446 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@ -11442,7 +11456,7 @@ else
}
EOF
if { (eval echo configure:11446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:11460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
SYSTEM_PNG=1
else
@ -11509,9 +11523,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:11513: checking "for FCInitialize in -lfullsoft"" >&5;
echo "configure:11527: checking "for FCInitialize in -lfullsoft"" >&5;
cat > conftest.$ac_ext <<EOF
#line 11515 "configure"
#line 11529 "configure"
#include "confdefs.h"
#include <stdio.h>
#include "fullsoft.h"
@ -11519,7 +11533,7 @@ int main() {
FCInitialize(); exit(0);
; return 0; }
EOF
if { (eval echo configure:11523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:11537: \"$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