зеркало из https://github.com/mozilla/gecko-dev.git
Automated update
This commit is contained in:
briano%netscape.com
Родитель
4ba3847d7f
Коммит
8f1099d94c
|
|
@ -63,7 +63,7 @@ ac_help="$ac_help
|
|||
ac_help="$ac_help
|
||||
--enable-pics Enable PICS code"
|
||||
ac_help="$ac_help
|
||||
--disable-brprof Disable browsing profile cookie"
|
||||
--enable-brprof Enable browsing profile cookie"
|
||||
ac_help="$ac_help
|
||||
--enable-crash-on-assert Make NS_ASSERTION crash on Unix"
|
||||
ac_help="$ac_help
|
||||
|
|
@ -8148,13 +8148,16 @@ cat >> confdefs.h <<\EOF
|
|||
EOF
|
||||
|
||||
|
||||
MOZ_BRPROF=1
|
||||
# Check whether --enable-brprof or --disable-brprof was given.
|
||||
if test "${enable_brprof+set}" = set; then
|
||||
enableval="$enable_brprof"
|
||||
if test "$enableval" = "no"; then
|
||||
MOZ_BRPROF=
|
||||
elif test "$enableval" = "yes"; then
|
||||
if test "$enableval" = "yes"; then
|
||||
MOZ_BRPROF=1
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define MOZ_BRPROF 1
|
||||
EOF
|
||||
|
||||
elif test "$enableval" = "no"; then
|
||||
:
|
||||
else
|
||||
{ echo "configure: error: Option, brprof, does not take an argument ($enableval)." 1>&2; exit 1; }
|
||||
|
|
@ -8162,11 +8165,6 @@ if test "${enable_brprof+set}" = set; then
|
|||
fi
|
||||
|
||||
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define MOZ_BRPROF 1
|
||||
EOF
|
||||
|
||||
|
||||
# Compiler Options
|
||||
|
||||
UNIX_CRASH_ON_ASSERT=
|
||||
|
|
@ -8577,7 +8575,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:8581: checking for $ac_word" >&5
|
||||
echo "configure:8579: 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
|
||||
|
|
@ -8671,7 +8669,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:8675: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:8673: 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
|
||||
|
|
@ -8679,7 +8677,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8683 "configure"
|
||||
#line 8681 "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
|
||||
|
|
@ -8690,7 +8688,7 @@ int main() {
|
|||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8692: \"$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
|
||||
|
|
@ -8719,7 +8717,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
|||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8723 "configure"
|
||||
#line 8721 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -8733,7 +8731,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:8737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
|
|
@ -8771,16 +8769,16 @@ if test "$ZLIB_DIR" = no; then
|
|||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:8775: checking "for zlib.h"" >&5
|
||||
echo "configure:8773: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8777 "configure"
|
||||
#line 8775 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:8782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
|
|
@ -8794,7 +8792,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:8798: checking for gzread in -lz" >&5
|
||||
echo "configure:8796: 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
|
||||
|
|
@ -8802,7 +8800,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8806 "configure"
|
||||
#line 8804 "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
|
||||
|
|
@ -8813,7 +8811,7 @@ int main() {
|
|||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8815: \"$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
|
||||
|
|
@ -8859,7 +8857,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:8863: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:8861: 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
|
||||
|
|
@ -8867,7 +8865,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8871 "configure"
|
||||
#line 8869 "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
|
||||
|
|
@ -8878,7 +8876,7 @@ int main() {
|
|||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8880: \"$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
|
||||
|
|
@ -8906,7 +8904,7 @@ if test "$SYSTEM_PNG" = 1; then
|
|||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8910 "configure"
|
||||
#line 8908 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -8920,7 +8918,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:8924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:8922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
|
|
@ -8964,10 +8962,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:8968: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
echo "configure:8966: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
LIBS="-ltalkback $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8971 "configure"
|
||||
#line 8969 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include "fullcircle.h"
|
||||
|
|
@ -8979,7 +8977,7 @@ FC_Initialize();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:8983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:8981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
FULLCIRCLE_LIB="-ltalkback $FULLCIRCLE_LIB" result="yes"
|
||||
else
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче