mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Automated update
This commit is contained in:
leaf%mozilla.org
parent
be4770a8a4
commit
e730eed924
50
configure
vendored
50
configure
vendored
@ -11991,6 +11991,7 @@ esac
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-jpeg or --without-jpeg was given.
|
||||
@ -12009,7 +12010,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:12013: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:12014: 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
|
||||
@ -12017,7 +12018,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12021 "configure"
|
||||
#line 12022 "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
|
||||
@ -12028,7 +12029,7 @@ int main() {
|
||||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12033: \"$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
|
||||
@ -12057,7 +12058,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
||||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12061 "configure"
|
||||
#line 12062 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -12071,7 +12072,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:12075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
@ -12109,16 +12110,16 @@ if test "$ZLIB_DIR" = no; then
|
||||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:12113: checking "for zlib.h"" >&5
|
||||
echo "configure:12114: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12115 "configure"
|
||||
#line 12116 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:12123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
@ -12132,7 +12133,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:12136: checking for gzread in -lz" >&5
|
||||
echo "configure:12137: 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
|
||||
@ -12140,7 +12141,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12144 "configure"
|
||||
#line 12145 "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
|
||||
@ -12151,7 +12152,7 @@ int main() {
|
||||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12156: \"$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
|
||||
@ -12197,7 +12198,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:12201: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:12202: 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
|
||||
@ -12205,7 +12206,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12209 "configure"
|
||||
#line 12210 "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
|
||||
@ -12216,7 +12217,7 @@ int main() {
|
||||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12221: \"$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
|
||||
@ -12244,7 +12245,7 @@ if test "$SYSTEM_PNG" = 1; then
|
||||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12248 "configure"
|
||||
#line 12249 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -12258,7 +12259,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:12262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
@ -12297,7 +12298,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:12301: checking for mng_initialize in -lmng" >&5
|
||||
echo "configure:12302: 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
|
||||
@ -12305,7 +12306,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lmng $MNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12309 "configure"
|
||||
#line 12310 "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
|
||||
@ -12316,7 +12317,7 @@ int main() {
|
||||
mng_initialize()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12321: \"$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
|
||||
@ -12344,7 +12345,7 @@ if test "$SYSTEM_MNG" = 1; then
|
||||
SYSTEM_MNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12348 "configure"
|
||||
#line 12349 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -12358,7 +12359,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:12362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:12363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_MNG=1
|
||||
else
|
||||
@ -12424,9 +12425,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:12428: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
echo "configure:12429: checking "for FCInitialize in -lfullsoft"" >&5;
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12430 "configure"
|
||||
#line 12431 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include "fullsoft.h"
|
||||
@ -12434,7 +12435,7 @@ int main() {
|
||||
FCInitialize(); exit(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:12438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:12439: \"$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
|
||||
@ -13037,6 +13038,7 @@ s%@UNIX_CRASH_ON_ASSERT@%$UNIX_CRASH_ON_ASSERT%g
|
||||
s%@NO_UNIX_ASYNC_DNS@%$NO_UNIX_ASYNC_DNS%g
|
||||
s%@NO_SHARED_LIB@%$NO_SHARED_LIB%g
|
||||
s%@NO_STATIC_LIB@%$NO_STATIC_LIB%g
|
||||
s%@MOZ_STATIC_COMPONENTS@%$MOZ_STATIC_COMPONENTS%g
|
||||
s%@ENABLE_TESTS@%$ENABLE_TESTS%g
|
||||
s%@IBMBIDI@%$IBMBIDI%g
|
||||
s%@MOZ_USER_DIR@%$MOZ_USER_DIR%g
|
||||
|
||||
Loading…
Reference in New Issue
Block a user