зеркало из https://github.com/mozilla/gecko-dev.git
Automated update
This commit is contained in:
briano%netscape.com
Родитель
71d39ae5fb
Коммит
d8bed1ef04
|
|
@ -8539,6 +8539,18 @@ if test "${enable_gtk_mozilla+set}" = set; then
|
|||
fi
|
||||
|
||||
|
||||
if test ! "$MOZ_TOOLKIT" = "gtk" -a "$MOZ_ENABLE_GTK_MOZILLA"
|
||||
then
|
||||
echo
|
||||
echo "*** You can only build GtkMozilla (A GTK+ widget to embed gecko)"
|
||||
echo "*** into any GTK+ app) if the main toolkit is \"gtk\"."
|
||||
echo "*** You have currently chosen \"$MOZ_TOOLKIT\" as your main toolkit."
|
||||
echo "*** GtkMozilla will not be built."
|
||||
echo
|
||||
MOZ_ENABLE_GTK_MOZILLA= MOZ_BUILD_ROOT=
|
||||
sleep 3
|
||||
fi
|
||||
|
||||
|
||||
# Compiler Options
|
||||
|
||||
|
|
@ -8955,7 +8967,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:8959: checking for $ac_word" >&5
|
||||
echo "configure:8971: 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
|
||||
|
|
@ -9058,7 +9070,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:9062: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:9074: 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
|
||||
|
|
@ -9066,7 +9078,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9070 "configure"
|
||||
#line 9082 "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
|
||||
|
|
@ -9077,7 +9089,7 @@ int main() {
|
|||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:9093: \"$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
|
||||
|
|
@ -9106,7 +9118,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
|||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9110 "configure"
|
||||
#line 9122 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -9120,7 +9132,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:9124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:9136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
|
|
@ -9158,16 +9170,16 @@ if test "$ZLIB_DIR" = no; then
|
|||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:9162: checking "for zlib.h"" >&5
|
||||
echo "configure:9174: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9164 "configure"
|
||||
#line 9176 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:9183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
|
|
@ -9181,7 +9193,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:9185: checking for gzread in -lz" >&5
|
||||
echo "configure:9197: 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
|
||||
|
|
@ -9189,7 +9201,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9193 "configure"
|
||||
#line 9205 "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
|
||||
|
|
@ -9200,7 +9212,7 @@ int main() {
|
|||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:9216: \"$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
|
||||
|
|
@ -9246,7 +9258,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:9250: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:9262: 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
|
||||
|
|
@ -9254,7 +9266,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9258 "configure"
|
||||
#line 9270 "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
|
||||
|
|
@ -9265,7 +9277,7 @@ int main() {
|
|||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:9281: \"$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
|
||||
|
|
@ -9293,7 +9305,7 @@ if test "$SYSTEM_PNG" = 1; then
|
|||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9297 "configure"
|
||||
#line 9309 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
@ -9307,7 +9319,7 @@ else
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:9311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:9323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
|
|
@ -9351,9 +9363,9 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
|
|||
LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
|
||||
LIBS="-ltalkback $LIBS"
|
||||
echo $ac_n "checking "for FC_Initialize in -ltalkback"""... $ac_c" 1>&6
|
||||
echo "configure:9355: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
echo "configure:9367: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9357 "configure"
|
||||
#line 9369 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include "fullcircle.h"
|
||||
|
|
@ -9361,7 +9373,7 @@ int main() {
|
|||
FC_Initialize(); exit(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:9377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
FULLCIRCLE_LIB="-ltalkback $FULLCIRCLE_LIB" result="yes"
|
||||
else
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче