mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-30 00:01:50 +00:00
Automated update
This commit is contained in:
briano%netscape.com
parent
427c48b4fd
commit
4fe196c8c6
49
configure
vendored
49
configure
vendored
@ -143,7 +143,7 @@ ac_help="$ac_help
|
||||
ac_help="$ac_help
|
||||
--enable-java Enable use of java applets (untested)"
|
||||
ac_help="$ac_help
|
||||
--disable-static Disable building of internal static libs"
|
||||
--enable-static Enable building of internal static libs"
|
||||
ac_help="$ac_help
|
||||
--with-jpeg=\$dir use system libjpeg in \$dir if more recent"
|
||||
ac_help="$ac_help
|
||||
@ -9365,13 +9365,14 @@ then
|
||||
fi
|
||||
|
||||
|
||||
NO_STATIC_LIB=1
|
||||
|
||||
# Check whether --enable-static or --disable-static was given.
|
||||
if test "${enable_static+set}" = set; then
|
||||
enableval="$enable_static"
|
||||
if test "$enableval" = "no"; then
|
||||
NO_STATIC_LIB=1
|
||||
elif test "$enableval" = "yes"; then
|
||||
if test "$enableval" = "yes"; then
|
||||
NO_STATIC_LIB=
|
||||
elif test "$enableval" = "no"; then
|
||||
:
|
||||
else
|
||||
{ echo "configure: error: Option, static, does not take an argument ($enableval)." 1>&2; exit 1; }
|
||||
@ -9390,7 +9391,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:9394: checking for $ac_word" >&5
|
||||
echo "configure:9395: 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
|
||||
@ -9496,7 +9497,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:9500: checking for jpeg_destroy_compress in -ljpeg" >&5
|
||||
echo "configure:9501: 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
|
||||
@ -9504,7 +9505,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9508 "configure"
|
||||
#line 9509 "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
|
||||
@ -9515,7 +9516,7 @@ int main() {
|
||||
jpeg_destroy_compress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:9520: \"$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
|
||||
@ -9544,7 +9545,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
||||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9548 "configure"
|
||||
#line 9549 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -9558,7 +9559,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:9562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:9563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
@ -9596,16 +9597,16 @@ if test "$ZLIB_DIR" = no; then
|
||||
SYSTEM_ZLIB=
|
||||
else
|
||||
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
|
||||
echo "configure:9600: checking "for zlib.h"" >&5
|
||||
echo "configure:9601: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9602 "configure"
|
||||
#line 9603 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "zlib.h"
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:9610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
@ -9619,7 +9620,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:9623: checking for gzread in -lz" >&5
|
||||
echo "configure:9624: 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
|
||||
@ -9627,7 +9628,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9631 "configure"
|
||||
#line 9632 "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
|
||||
@ -9638,7 +9639,7 @@ int main() {
|
||||
gzread()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:9643: \"$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
|
||||
@ -9684,7 +9685,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:9688: checking for png_get_valid in -lpng" >&5
|
||||
echo "configure:9689: 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
|
||||
@ -9692,7 +9693,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9696 "configure"
|
||||
#line 9697 "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
|
||||
@ -9703,7 +9704,7 @@ int main() {
|
||||
png_get_valid()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:9708: \"$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
|
||||
@ -9731,7 +9732,7 @@ if test "$SYSTEM_PNG" = 1; then
|
||||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9735 "configure"
|
||||
#line 9736 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -9745,7 +9746,7 @@ else
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:9749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:9750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
@ -9789,9 +9790,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:9793: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
echo "configure:9794: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9795 "configure"
|
||||
#line 9796 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include "fullcircle.h"
|
||||
@ -9799,7 +9800,7 @@ int main() {
|
||||
FC_Initialize(); exit(0);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:9803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:9804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
FULLCIRCLE_LIB="-ltalkback $FULLCIRCLE_LIB" result="yes"
|
||||
else
|
||||
|
||||
Loading…
Reference in New Issue
Block a user