зеркало из https://github.com/mozilla/gecko-dev.git
Automated update
This commit is contained in:
briano%netscape.com
Родитель
a0839afb8e
Коммит
e782ee72fd
|
|
@ -65,7 +65,7 @@ ac_help="$ac_help
|
|||
ac_help="$ac_help
|
||||
--disable-brprof Disable browsing profile cookie"
|
||||
ac_help="$ac_help
|
||||
--disable-asserts Disable asserts during debugging"
|
||||
--enable-crash-on-assert Make NS_ASSERTION crash on Unix"
|
||||
ac_help="$ac_help
|
||||
--enable-optimize Enable code optimizations "
|
||||
ac_help="$ac_help
|
||||
|
|
@ -8117,15 +8117,16 @@ EOF
|
|||
|
||||
# Compiler Options
|
||||
|
||||
# Check whether --enable-asserts or --disable-asserts was given.
|
||||
if test "${enable_asserts+set}" = set; then
|
||||
enableval="$enable_asserts"
|
||||
if test "$enableval" = "no"; then
|
||||
UNIX_SKIP_ASSERTS=1
|
||||
elif test "$enableval" = "yes"; then
|
||||
UNIX_CRASH_ON_ASSERT=
|
||||
# Check whether --enable-crash-on-assert or --disable-crash-on-assert was given.
|
||||
if test "${enable_crash_on_assert+set}" = set; then
|
||||
enableval="$enable_crash_on_assert"
|
||||
if test "$enableval" = "yes"; then
|
||||
UNIX_CRASH_ON_ASSERT=1
|
||||
elif test "$enableval" = "no"; then
|
||||
:
|
||||
else
|
||||
{ echo "configure: error: Option, asserts, does not take an argument ($enableval)." 1>&2; exit 1; }
|
||||
{ echo "configure: error: Option, crash-on-assert, does not take an argument ($enableval)." 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -8524,7 +8525,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:8528: checking for $ac_word" >&5
|
||||
echo "configure:8529: 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
|
||||
|
|
@ -8618,7 +8619,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:8622: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:8623: 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
|
||||
|
|
@ -8626,7 +8627,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8630 "configure"
|
||||
#line 8631 "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
|
||||
|
|
@ -8637,7 +8638,7 @@ int main() {
|
|||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -8666,7 +8667,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
|||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8670 "configure"
|
||||
#line 8671 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -8680,7 +8681,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:8684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
|
|
@ -8718,16 +8719,16 @@ if test "$ZLIB_DIR" = no; then
|
|||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:8722: checking "for zlib.h"" >&5
|
||||
echo "configure:8723: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8724 "configure"
|
||||
#line 8725 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:8732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
|
|
@ -8741,7 +8742,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:8745: checking for gzread in -lz" >&5
|
||||
echo "configure:8746: 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
|
||||
|
|
@ -8749,7 +8750,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8753 "configure"
|
||||
#line 8754 "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
|
||||
|
|
@ -8760,7 +8761,7 @@ int main() {
|
|||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -8806,7 +8807,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:8810: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:8811: 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
|
||||
|
|
@ -8814,7 +8815,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8818 "configure"
|
||||
#line 8819 "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
|
||||
|
|
@ -8825,7 +8826,7 @@ int main() {
|
|||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -8853,7 +8854,7 @@ if test "$SYSTEM_PNG" = 1; then
|
|||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8857 "configure"
|
||||
#line 8858 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -8867,7 +8868,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:8871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
|
|
@ -8911,10 +8912,10 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
|
|||
LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
|
||||
|
||||
echo $ac_n "checking "for FC_Initialize in -ltalkback"""... $ac_c" 1>&6
|
||||
echo "configure:8915: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
echo "configure:8916: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
LIBS="-ltalkback $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8918 "configure"
|
||||
#line 8919 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include "fullcircle.h"
|
||||
|
|
@ -8926,7 +8927,7 @@ FC_Initialize();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
FULLCIRCLE_LIB="-ltalkback $FULLCIRCLE_LIB" result="yes"
|
||||
else
|
||||
|
|
@ -9441,7 +9442,7 @@ s%@MOZ_MAIL_NEWS@%$MOZ_MAIL_NEWS%g
|
|||
s%@MOZ_BUILD_XPFE@%$MOZ_BUILD_XPFE%g
|
||||
s%@MOZ_EDITOR@%$MOZ_EDITOR%g
|
||||
s%@MOZ_BRPROF@%$MOZ_BRPROF%g
|
||||
s%@UNIX_SKIP_ASSERTS@%$UNIX_SKIP_ASSERTS%g
|
||||
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
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче