This commit is contained in:
leaf%mozilla.org 2001-09-10 05:28:42 +00:00
Родитель f87d1c4b56
Коммит a0ae1a1810
1 изменённых файлов: 37 добавлений и 29 удалений

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

@ -11917,6 +11917,10 @@ if test "${enable_ldap+set}" = set; then
fi fi
fi fi
if test "$MOZ_LDAP_XPCOM"; then
LDAP_CFLAGS='-I${DIST}/include/ldap'
LDAP_LIBS='-L${DIST}/bin -L${DIST}/lib -lldap40 -llber40'
fi
# Check whether --enable-ldap-experimental or --disable-ldap-experimental was given. # Check whether --enable-ldap-experimental or --disable-ldap-experimental was given.
if test "${enable_ldap_experimental+set}" = set; then if test "${enable_ldap_experimental+set}" = set; then
@ -11998,14 +12002,14 @@ if test "$TX_EXE"; then
EOF EOF
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
echo "configure:12002: checking whether byte ordering is bigendian" >&5 echo "configure:12006: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
ac_cv_c_bigendian=unknown ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro. # See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12009 "configure" #line 12013 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -12016,11 +12020,11 @@ int main() {
#endif #endif
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:12024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not. # It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12024 "configure" #line 12028 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -12031,7 +12035,7 @@ int main() {
#endif #endif
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:12039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_c_bigendian=yes ac_cv_c_bigendian=yes
else else
@ -12051,7 +12055,7 @@ if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12055 "configure" #line 12059 "configure"
#include "confdefs.h" #include "confdefs.h"
main () { main () {
/* Are we little or big endian? From Harbison&Steele. */ /* Are we little or big endian? From Harbison&Steele. */
@ -12064,7 +12068,7 @@ main () {
exit (u.c[sizeof (long) - 1] == 1); exit (u.c[sizeof (long) - 1] == 1);
} }
EOF EOF
if { (eval echo configure:12068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:12072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_c_bigendian=no ac_cv_c_bigendian=no
else else
@ -12223,7 +12227,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:12227: checking for $ac_word" >&5 echo "configure:12231: 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
@ -12376,6 +12380,8 @@ esac
@ -12397,7 +12403,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:12401: checking for jpeg_destroy_compress in -ljpeg" >&5 echo "configure:12407: 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
@ -12405,7 +12411,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 12409 "configure" #line 12415 "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
@ -12416,7 +12422,7 @@ int main() {
jpeg_destroy_compress() jpeg_destroy_compress()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:12426: \"$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
@ -12445,7 +12451,7 @@ if test "$SYSTEM_JPEG" = 1; then
SYSTEM_JPEG= SYSTEM_JPEG=
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12449 "configure" #line 12455 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
@ -12459,7 +12465,7 @@ else
} }
EOF EOF
if { (eval echo configure:12463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:12469: \"$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
@ -12499,16 +12505,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:12503: checking "for zlib.h"" >&5 echo "configure:12509: checking "for zlib.h"" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12505 "configure" #line 12511 "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:12512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:12518: \"$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
@ -12522,7 +12528,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:12526: checking for gzread in -lz" >&5 echo "configure:12532: 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
@ -12530,7 +12536,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 12534 "configure" #line 12540 "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
@ -12541,7 +12547,7 @@ int main() {
gzread() gzread()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:12551: \"$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
@ -12591,7 +12597,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:12595: checking for png_get_valid in -lpng" >&5 echo "configure:12601: 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
@ -12599,7 +12605,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 12603 "configure" #line 12609 "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
@ -12610,7 +12616,7 @@ int main() {
png_get_valid() png_get_valid()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:12620: \"$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
@ -12638,7 +12644,7 @@ if test "$SYSTEM_PNG" = 1; then
SYSTEM_PNG= SYSTEM_PNG=
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12642 "configure" #line 12648 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
@ -12652,7 +12658,7 @@ else
} }
EOF EOF
if { (eval echo configure:12656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:12662: \"$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
@ -12695,7 +12701,7 @@ if test "$MNG_DIR" = no; then
SYSTEM_MNG= SYSTEM_MNG=
else else
echo $ac_n "checking for mng_initialize in -lmng""... $ac_c" 1>&6 echo $ac_n "checking for mng_initialize in -lmng""... $ac_c" 1>&6
echo "configure:12699: checking for mng_initialize in -lmng" >&5 echo "configure:12705: checking for mng_initialize in -lmng" >&5
ac_lib_var=`echo mng'_'mng_initialize | sed 'y%./+-%__p_%'` ac_lib_var=`echo mng'_'mng_initialize | 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
@ -12703,7 +12709,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lmng $MNG_LIBS $LIBS" LIBS="-lmng $MNG_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12707 "configure" #line 12713 "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
@ -12714,7 +12720,7 @@ int main() {
mng_initialize() mng_initialize()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:12718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:12724: \"$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
@ -12742,7 +12748,7 @@ if test "$SYSTEM_MNG" = 1; then
SYSTEM_MNG= SYSTEM_MNG=
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 12746 "configure" #line 12752 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
@ -12756,7 +12762,7 @@ else
} }
EOF EOF
if { (eval echo configure:12760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:12766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
SYSTEM_MNG=1 SYSTEM_MNG=1
else else
@ -13357,6 +13363,8 @@ s%@MOZ_INSURIFYING@%$MOZ_INSURIFYING%g
s%@MOZ_BUILD_XPFE@%$MOZ_BUILD_XPFE%g s%@MOZ_BUILD_XPFE@%$MOZ_BUILD_XPFE%g
s%@MOZ_LDAP_XPCOM@%$MOZ_LDAP_XPCOM%g s%@MOZ_LDAP_XPCOM@%$MOZ_LDAP_XPCOM%g
s%@MOZ_LDAP_XPCOM_EXPERIMENTAL@%$MOZ_LDAP_XPCOM_EXPERIMENTAL%g s%@MOZ_LDAP_XPCOM_EXPERIMENTAL@%$MOZ_LDAP_XPCOM_EXPERIMENTAL%g
s%@LDAP_CFLAGS@%$LDAP_CFLAGS%g
s%@LDAP_LIBS@%$LDAP_LIBS%g
s%@XPCOM_USE_LEA@%$XPCOM_USE_LEA%g s%@XPCOM_USE_LEA@%$XPCOM_USE_LEA%g
s%@UNIX_CRASH_ON_ASSERT@%$UNIX_CRASH_ON_ASSERT%g s%@UNIX_CRASH_ON_ASSERT@%$UNIX_CRASH_ON_ASSERT%g
s%@NO_UNIX_ASYNC_DNS@%$NO_UNIX_ASYNC_DNS%g s%@NO_UNIX_ASYNC_DNS@%$NO_UNIX_ASYNC_DNS%g