reverting checkin to configure

This commit is contained in:
rginda%netscape.com 2001-05-15 06:13:22 +00:00
Родитель eb8d25597d
Коммит b5e848599d
1 изменённых файлов: 43 добавлений и 49 удалений

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

@ -4157,7 +4157,7 @@ MOZ_PNG_LIBS='-L$(DIST)/lib -lmozpng'
MOZ_MNG_CFLAGS=
MOZ_MNG_LIBS='-L$(DIST)/lib -lmozmng'
MOZ_JS_LIBS='-L$(DIST)/bin -lmozjs'
MOZ_JS_LIBS='-lmozjs'
XPCOM_LIBS='-L$(DIST)/bin -lxpcom'
MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)'
@ -11420,7 +11420,7 @@ fi
MOZ_EXTENSIONS_DEFAULT="cookie wallet xml-rpc xmlextras help transformiix"
MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm inspector access-builtin venkman"
MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm inspector access-builtin"
# Check whether --with-extensions or --without-extensions was given.
if test "${with_extensions+set}" = set; then
@ -11447,10 +11447,6 @@ if test -z "$MOZ_ENABLE_GTK" && test `echo "$MOZ_EXTENSIONS" | grep -c xmlterm`;
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|xmlterm||'`
fi
if test `echo "$MOZ_EXTENSIONS" | grep -c venkman`; then
MOZ_JSDEBUGGER=1
fi
# Check whether --enable-jar-packaging or --disable-jar-packaging was given.
if test "${enable_jar_packaging+set}" = set; then
enableval="$enable_jar_packaging"
@ -11535,12 +11531,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
_SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6
echo "configure:11539: checking whether C++ compiler has -pedantic long long bug" >&5
echo "configure:11535: checking whether C++ compiler has -pedantic long long bug" >&5
if test "$cross_compiling" = yes; then
result="maybe"
else
cat > conftest.$ac_ext <<EOF
#line 11544 "configure"
#line 11540 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
@ -11549,7 +11545,7 @@ extern "C" void exit(int);
if (sizeof(long long) != 8) { return 1; }
return 0; }
EOF
if { (eval echo configure:11553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:11549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
result="no"
else
@ -11597,12 +11593,12 @@ _SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}"
echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6
echo "configure:11601: checking for correct overload resolution with const and templates" >&5
echo "configure:11597: checking for correct overload resolution with const and templates" >&5
if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 11606 "configure"
#line 11602 "configure"
#include "confdefs.h"
template <class T>
@ -11632,7 +11628,7 @@ int main() {
; return 0; }
EOF
if { (eval echo configure:11636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:11632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_nscap_nonconst_opeq_bug="no"
else
@ -11678,16 +11674,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6
echo "configure:11682: checking whether compiler supports -Wno-long-long" >&5
echo "configure:11678: checking whether compiler supports -Wno-long-long" >&5
cat > conftest.$ac_ext <<EOF
#line 11684 "configure"
#line 11680 "configure"
#include "confdefs.h"
int main() {
return(0);
; return 0; }
EOF
if { (eval echo configure:11691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:11687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
_WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
@ -11935,7 +11931,7 @@ fi
echo $ac_n "checking webshell leaks option""... $ac_c" 1>&6
echo "configure:11939: checking webshell leaks option" >&5
echo "configure:11935: checking webshell leaks option" >&5
# Check whether --enable-detect-webshell-leaks or --disable-detect-webshell-leaks was given.
if test "${enable_detect_webshell_leaks+set}" = set; then
enableval="$enable_detect_webshell_leaks"
@ -12009,7 +12005,7 @@ if test "${enable_efence+set}" = set; then
enableval="$enable_efence"
if test "$enableval" = "yes"; then
echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
echo "configure:12013: checking for malloc in -lefence" >&5
echo "configure:12009: checking for malloc in -lefence" >&5
ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -12017,7 +12013,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lefence $LIBS"
cat > conftest.$ac_ext <<EOF
#line 12021 "configure"
#line 12017 "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
@ -12028,7 +12024,7 @@ int main() {
malloc()
; return 0; }
EOF
if { (eval echo configure:12032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -12064,7 +12060,7 @@ fi
echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
echo "configure:12068: checking for cplus_demangle in -liberty" >&5
echo "configure:12064: checking for cplus_demangle in -liberty" >&5
ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -12072,7 +12068,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-liberty "-liberty" $LIBS"
cat > conftest.$ac_ext <<EOF
#line 12076 "configure"
#line 12072 "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
@ -12083,7 +12079,7 @@ int main() {
cplus_demangle()
; return 0; }
EOF
if { (eval echo configure:12087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -12418,7 +12414,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:12422: checking for $ac_word" >&5
echo "configure:12418: 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
@ -12545,7 +12541,6 @@ esac
# Check whether --with-jpeg or --without-jpeg was given.
@ -12564,7 +12559,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:12568: checking for jpeg_destroy_compress in -ljpeg" >&5
echo "configure:12563: 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
@ -12572,7 +12567,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $JPEG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 12576 "configure"
#line 12571 "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
@ -12583,7 +12578,7 @@ int main() {
jpeg_destroy_compress()
; return 0; }
EOF
if { (eval echo configure:12587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -12612,7 +12607,7 @@ if test "$SYSTEM_JPEG" = 1; then
SYSTEM_JPEG=
else
cat > conftest.$ac_ext <<EOF
#line 12616 "configure"
#line 12611 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@ -12626,7 +12621,7 @@ else
}
EOF
if { (eval echo configure:12630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:12625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
SYSTEM_JPEG=1
else
@ -12664,16 +12659,16 @@ if test "$ZLIB_DIR" = no; then
SYSTEM_ZLIB=
else
echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
echo "configure:12668: checking "for zlib.h"" >&5
echo "configure:12663: checking "for zlib.h"" >&5
cat > conftest.$ac_ext <<EOF
#line 12670 "configure"
#line 12665 "configure"
#include "confdefs.h"
#include "zlib.h"
int main() {
; return 0; }
EOF
if { (eval echo configure:12677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:12672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
result="yes" SYSTEM_ZLIB=1
else
@ -12687,7 +12682,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:12691: checking for gzread in -lz" >&5
echo "configure:12686: 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
@ -12695,7 +12690,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lz $ZLIB_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 12699 "configure"
#line 12694 "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
@ -12706,7 +12701,7 @@ int main() {
gzread()
; return 0; }
EOF
if { (eval echo configure:12710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -12752,7 +12747,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:12756: checking for png_get_valid in -lpng" >&5
echo "configure:12751: 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
@ -12760,7 +12755,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpng $PNG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 12764 "configure"
#line 12759 "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
@ -12771,7 +12766,7 @@ int main() {
png_get_valid()
; return 0; }
EOF
if { (eval echo configure:12775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -12799,7 +12794,7 @@ if test "$SYSTEM_PNG" = 1; then
SYSTEM_PNG=
else
cat > conftest.$ac_ext <<EOF
#line 12803 "configure"
#line 12798 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@ -12813,7 +12808,7 @@ else
}
EOF
if { (eval echo configure:12817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:12812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
SYSTEM_PNG=1
else
@ -12852,7 +12847,7 @@ if test "$MNG_DIR" = no; then
SYSTEM_MNG=
else
echo $ac_n "checking for mng_initialize in -lmng""... $ac_c" 1>&6
echo "configure:12856: checking for mng_initialize in -lmng" >&5
echo "configure:12851: checking for mng_initialize in -lmng" >&5
ac_lib_var=`echo mng'_'mng_initialize | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -12860,7 +12855,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmng $MNG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 12864 "configure"
#line 12859 "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
@ -12871,7 +12866,7 @@ int main() {
mng_initialize()
; return 0; }
EOF
if { (eval echo configure:12875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -12899,7 +12894,7 @@ if test "$SYSTEM_MNG" = 1; then
SYSTEM_MNG=
else
cat > conftest.$ac_ext <<EOF
#line 12903 "configure"
#line 12898 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@ -12913,7 +12908,7 @@ else
}
EOF
if { (eval echo configure:12917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:12912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
SYSTEM_MNG=1
else
@ -12979,9 +12974,9 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
LIBS="-lfullsoft $LIBS"
echo $ac_n "checking "for FCInitialize in -lfullsoft"""... $ac_c" 1>&6
echo "configure:12983: checking "for FCInitialize in -lfullsoft"" >&5;
echo "configure:12978: checking "for FCInitialize in -lfullsoft"" >&5;
cat > conftest.$ac_ext <<EOF
#line 12985 "configure"
#line 12980 "configure"
#include "confdefs.h"
#include <stdio.h>
#include "fullsoft.h"
@ -12989,7 +12984,7 @@ int main() {
FCInitialize(); exit(0);
; return 0; }
EOF
if { (eval echo configure:12993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:12988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
FULLCIRCLE_LIBS="-I${FULLCIRCLE_DIR} -L${FULLCIRCLE_DIR} -lfullsoft" result="yes"
else
@ -13582,7 +13577,6 @@ s%@MOZ_DEBUG_DISABLE_DEFS@%$MOZ_DEBUG_DISABLE_DEFS%g
s%@MOZ_DEBUG_FLAGS@%$MOZ_DEBUG_FLAGS%g
s%@MOZ_DBGRINFO_MODULES@%$MOZ_DBGRINFO_MODULES%g
s%@MOZ_EXTENSIONS@%$MOZ_EXTENSIONS%g
s%@MOZ_JSDEBUGGER@%$MOZ_JSDEBUGGER%g
s%@ENABLE_EAZEL_PROFILER@%$ENABLE_EAZEL_PROFILER%g
s%@EAZEL_PROFILER_CFLAGS@%$EAZEL_PROFILER_CFLAGS%g
s%@EAZEL_PROFILER_LIBS@%$EAZEL_PROFILER_LIBS%g