Bug 601570 - Don't require schema-validation for xforms; r=ted.mielczarek,a=jst

This commit is contained in:
Philipp Wagner 2010-10-15 00:33:53 +02:00
parent 45a0779de1
commit de3eaaf3c0

View File

@ -6403,15 +6403,11 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0; then
MOZ_EXTENSIONS="$MOZ_EXTENSIONS tridentprofile" MOZ_EXTENSIONS="$MOZ_EXTENSIONS tridentprofile"
fi fi
dnl xforms requires xtf and schema-validation dnl xforms requires xtf
if test -z "$MOZ_XTF" -a `echo "$MOZ_EXTENSIONS" | grep -c xforms` -ne 0; then if test -z "$MOZ_XTF" -a `echo "$MOZ_EXTENSIONS" | grep -c xforms` -ne 0; then
AC_MSG_WARN([Cannot build XForms without XTF support. Removing XForms from MOZ_EXTENSIONS.]) AC_MSG_WARN([Cannot build XForms without XTF support. Removing XForms from MOZ_EXTENSIONS.])
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|xforms||g'` MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|xforms||g'`
fi fi
if test `echo "$MOZ_EXTENSIONS" | grep -c xforms` -ne 0 && test `echo "$MOZ_EXTENSIONS" | grep -c schema-validation` -eq 0; then
AC_MSG_WARN([Cannot build XForms without schema validation. Removing XForms from MOZ_EXTENSIONS.])
MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|xforms||g'`
fi
if test `echo "$MOZ_EXTENSIONS" | grep -c auth` -ne 0; then if test `echo "$MOZ_EXTENSIONS" | grep -c auth` -ne 0; then
AC_MSG_WARN([auth is no longer an extension, use --disable-negotiateauth to disable.]) AC_MSG_WARN([auth is no longer an extension, use --disable-negotiateauth to disable.])