Automated update
git-svn-id: svn://10.0.0.236/trunk@32795 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
briano%netscape.com
parent
2c1e117763
commit
fcb08ca6c5
62
mozilla/configure
vendored
62
mozilla/configure
vendored
@ -55,13 +55,13 @@ ac_help="$ac_help
|
||||
ac_help="$ac_help
|
||||
--disable-editor Dont build the editor"
|
||||
ac_help="$ac_help
|
||||
--enable-mailnews Enable Mail & News"
|
||||
--disable-mailnews Dont build Mail & News"
|
||||
ac_help="$ac_help
|
||||
--enable-oji Enable use of Open JVM Interface"
|
||||
ac_help="$ac_help
|
||||
--enable-tests Enable test stubs"
|
||||
--disable-tests Dont build the tests"
|
||||
ac_help="$ac_help
|
||||
--enable-pics Enable PICS code"
|
||||
--enable-pics Enable PICS code"
|
||||
ac_help="$ac_help
|
||||
--enable-brprof Enable browsing profile cookie"
|
||||
ac_help="$ac_help
|
||||
@ -8093,12 +8093,14 @@ fi
|
||||
|
||||
|
||||
|
||||
MOZ_MAIL_NEWS=1
|
||||
|
||||
# Check whether --enable-mailnews or --disable-mailnews was given.
|
||||
if test "${enable_mailnews+set}" = set; then
|
||||
enableval="$enable_mailnews"
|
||||
if test "$enableval" = "yes"; then
|
||||
MOZ_MAIL_NEWS=1
|
||||
elif test "$enableval" = "no"; then
|
||||
if test "$enableval" = "no"; then
|
||||
MOZ_MAIL_NEWS=
|
||||
elif test "$enableval" = "yes"; then
|
||||
:
|
||||
else
|
||||
{ echo "configure: error: Option, mailnews, does not take an argument ($enableval)." 1>&2; exit 1; }
|
||||
@ -8119,12 +8121,14 @@ if test "${enable_oji+set}" = set; then
|
||||
fi
|
||||
|
||||
|
||||
ENABLE_TESTS=1
|
||||
|
||||
# Check whether --enable-tests or --disable-tests was given.
|
||||
if test "${enable_tests+set}" = set; then
|
||||
enableval="$enable_tests"
|
||||
if test "$enableval" = "yes"; then
|
||||
ENABLE_TESTS=1
|
||||
elif test "$enableval" = "no"; then
|
||||
if test "$enableval" = "no"; then
|
||||
ENABLE_TESTS=
|
||||
elif test "$enableval" = "yes"; then
|
||||
:
|
||||
else
|
||||
{ echo "configure: error: Option, tests, does not take an argument ($enableval)." 1>&2; exit 1; }
|
||||
@ -8577,7 +8581,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:8585: 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 +8675,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:8679: 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 +8683,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $JPEG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8683 "configure"
|
||||
#line 8687 "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 +8694,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:8698: \"$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 +8723,7 @@ if test "$SYSTEM_JPEG" = 1; then
|
||||
SYSTEM_JPEG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8723 "configure"
|
||||
#line 8727 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -8733,7 +8737,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:8741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_JPEG=1
|
||||
else
|
||||
@ -8771,16 +8775,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:8779: checking "for zlib.h"" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8777 "configure"
|
||||
#line 8781 "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:8788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
result="yes" SYSTEM_ZLIB=1
|
||||
else
|
||||
@ -8794,7 +8798,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:8802: 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 +8806,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $ZLIB_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8806 "configure"
|
||||
#line 8810 "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 +8817,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:8821: \"$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 +8863,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:8867: 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 +8871,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lpng $PNG_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8871 "configure"
|
||||
#line 8875 "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 +8882,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:8886: \"$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 +8910,7 @@ if test "$SYSTEM_PNG" = 1; then
|
||||
SYSTEM_PNG=
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8910 "configure"
|
||||
#line 8914 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
@ -8920,7 +8924,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:8928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
SYSTEM_PNG=1
|
||||
else
|
||||
@ -8964,10 +8968,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:8972: checking "for FC_Initialize in -ltalkback"" >&5;
|
||||
LIBS="-ltalkback $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8971 "configure"
|
||||
#line 8975 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include "fullcircle.h"
|
||||
@ -8979,7 +8983,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:8987: \"$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…
x
Reference in New Issue
Block a user