This commit is contained in:
leaf%mozilla.org 2000-03-17 00:30:09 +00:00
Родитель 0575ec9367
Коммит 658229044b
1 изменённых файлов: 46 добавлений и 39 удалений

85
configure поставляемый
Просмотреть файл

@ -9270,18 +9270,25 @@ fi
MOZ_EXTENSIONS="cookie wallet psm-glue" MOZ_EXTENSIONS_DEFAULT="cookie wallet psm-glue"
# Check whether --with-extensions or --without-extensions was given. # Check whether --with-extensions or --without-extensions was given.
if test "${with_extensions+set}" = set; then if test "${with_extensions+set}" = set; then
withval="$with_extensions" withval="$with_extensions"
if test "$withval" = "yes" || test "$withval" = "all"; then MOZ_EXTENSIONS=""
MOZ_EXTENSIONS="cookie irc wallet psm-glue" for option in `echo $withval | sed 's/,/ /g'`; do
elif test "$withval" = "no" || test "$withval" = "none"; then if test "$option" = "yes" || test "$option" = "all"; then
MOZ_EXTENSIONS="$MOZ_EXTENSIONS cookie irc wallet xmlterm psm-glue"
elif test "$option" = "no" || test "$option" = "none"; then
MOZ_EXTENSIONS="" MOZ_EXTENSIONS=""
elif test "$withval" != ""; then elif test "$option" = "default"; then
MOZ_EXTENSIONS=`echo $withval | sed 's/,/ /g'` MOZ_EXTENSIONS="$MOZ_EXTENSIONS $MOZ_EXTENSIONS_DEFAULT"
fi else
MOZ_EXTENSIONS="$MOZ_EXTENSIONS $option"
fi
done
else
MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT"
fi fi
@ -9333,12 +9340,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS=$CXXFLAGS _SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS ${_WARNING_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" CXXFLAGS="$CXXFLAGS ${_WARNING_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
echo "configure:9337: checking whether C++ compiler has -pedantic long long bug" >&5 echo "configure:9344: checking whether C++ compiler has -pedantic long long bug" >&5
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
result="maybe" result="maybe"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 9342 "configure" #line 9349 "configure"
#include "confdefs.h" #include "confdefs.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" void exit(int); extern "C" void exit(int);
@ -9347,7 +9354,7 @@ extern "C" void exit(int);
if (sizeof(long long) != 8) { return 1; } if (sizeof(long long) != 8) { return 1; }
return 0; } return 0; }
EOF EOF
if { (eval echo configure:9351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:9358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
result="no" result="no"
else else
@ -9399,16 +9406,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
_SAVE_CFLAGS="$CFLAGS" _SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
echo "configure:9403: checking whether compiler supports -Wno-long-long" >&5 echo "configure:9410: checking whether compiler supports -Wno-long-long" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 9405 "configure" #line 9412 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
return(0); return(0);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:9412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:9419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
@ -9675,7 +9682,7 @@ if test "${enable_efence+set}" = set; then
enableval="$enable_efence" enableval="$enable_efence"
if test "$enableval" = "yes"; then if test "$enableval" = "yes"; then
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
echo "configure:9679: checking for malloc in -lefence" >&5 echo "configure:9686: checking for malloc in -lefence" >&5
ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -9683,7 +9690,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lefence $LIBS" LIBS="-lefence $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 9687 "configure" #line 9694 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -9694,7 +9701,7 @@ int main() {
malloc() malloc()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:9698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:9705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -9730,7 +9737,7 @@ fi
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6 echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
echo "configure:9734: checking for cplus_demangle in -liberty" >&5 echo "configure:9741: checking for cplus_demangle in -liberty" >&5
ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'` ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -9738,7 +9745,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-liberty "-liberty" $LIBS" LIBS="-liberty "-liberty" $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 9742 "configure" #line 9749 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -9749,7 +9756,7 @@ int main() {
cplus_demangle() cplus_demangle()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:9753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:9760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -9960,7 +9967,7 @@ case "$target" in
# Extract the first word of "makeC++SharedLib_r", so it can be a program name with args. # 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 set dummy makeC++SharedLib_r; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:9964: checking for $ac_word" >&5 echo "configure:9971: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -10081,7 +10088,7 @@ if test "$JPEG_DIR" = no; then
SYSTEM_JPEG= SYSTEM_JPEG=
else else
echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
echo "configure:10085: checking for jpeg_destroy_compress in -ljpeg" >&5 echo "configure:10092: checking for jpeg_destroy_compress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -10089,7 +10096,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ljpeg $JPEG_LIBS $LIBS" LIBS="-ljpeg $JPEG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10093 "configure" #line 10100 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -10100,7 +10107,7 @@ int main() {
jpeg_destroy_compress() jpeg_destroy_compress()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:10111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -10129,7 +10136,7 @@ if test "$SYSTEM_JPEG" = 1; then
SYSTEM_JPEG= SYSTEM_JPEG=
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10133 "configure" #line 10140 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
@ -10143,7 +10150,7 @@ else
} }
EOF EOF
if { (eval echo configure:10147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:10154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
SYSTEM_JPEG=1 SYSTEM_JPEG=1
else else
@ -10181,16 +10188,16 @@ if test "$ZLIB_DIR" = no; then
SYSTEM_ZLIB= SYSTEM_ZLIB=
else else
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6 echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
echo "configure:10185: checking "for zlib.h"" >&5 echo "configure:10192: checking "for zlib.h"" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10187 "configure" #line 10194 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "zlib.h" #include "zlib.h"
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:10201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
result="yes" SYSTEM_ZLIB=1 result="yes" SYSTEM_ZLIB=1
else else
@ -10204,7 +10211,7 @@ rm -f conftest*
fi fi
if test "$SYSTEM_ZLIB" = 1; then if test "$SYSTEM_ZLIB" = 1; then
echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
echo "configure:10208: checking for gzread in -lz" >&5 echo "configure:10215: checking for gzread in -lz" >&5
ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -10212,7 +10219,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lz $ZLIB_LIBS $LIBS" LIBS="-lz $ZLIB_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10216 "configure" #line 10223 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -10223,7 +10230,7 @@ int main() {
gzread() gzread()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:10234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -10269,7 +10276,7 @@ if test "$PNG_DIR" = no; then
SYSTEM_PNG= SYSTEM_PNG=
else else
echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
echo "configure:10273: checking for png_get_valid in -lpng" >&5 echo "configure:10280: checking for png_get_valid in -lpng" >&5
ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@ -10277,7 +10284,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lpng $PNG_LIBS $LIBS" LIBS="-lpng $PNG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10281 "configure" #line 10288 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
@ -10288,7 +10295,7 @@ int main() {
png_get_valid() png_get_valid()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:10299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
@ -10316,7 +10323,7 @@ if test "$SYSTEM_PNG" = 1; then
SYSTEM_PNG= SYSTEM_PNG=
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10320 "configure" #line 10327 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
@ -10330,7 +10337,7 @@ else
} }
EOF EOF
if { (eval echo configure:10334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:10341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
SYSTEM_PNG=1 SYSTEM_PNG=1
else else
@ -10397,9 +10404,9 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}" LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
LIBS="-lfullsoft $LIBS" LIBS="-lfullsoft $LIBS"
echo $ac_n "checking "for FCInitialize in -lfullsoft"""... $ac_c" 1>&6 echo $ac_n "checking "for FCInitialize in -lfullsoft"""... $ac_c" 1>&6
echo "configure:10401: checking "for FCInitialize in -lfullsoft"" >&5; echo "configure:10408: checking "for FCInitialize in -lfullsoft"" >&5;
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10403 "configure" #line 10410 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include "fullsoft.h" #include "fullsoft.h"
@ -10407,7 +10414,7 @@ int main() {
FCInitialize(); exit(0); FCInitialize(); exit(0);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:10411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:10418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
FULLCIRCLE_LIBS="-I${FULLCIRCLE_DIR} -L${FULLCIRCLE_DIR} -lfullsoft" result="yes" FULLCIRCLE_LIBS="-I${FULLCIRCLE_DIR} -L${FULLCIRCLE_DIR} -lfullsoft" result="yes"
else else