From f17500b326ae06fc673e55a45d43868cf53577b4 Mon Sep 17 00:00:00 2001
From: "bryner%brianryner.com"
 <bryner%brianryner.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 29 Nov 2004 01:39:15 +0000
Subject: [PATCH] Add xforms to MOZ_EXTENSIONS_ALL (bug 271002). r+sr=dbaron.

git-svn-id: svn://10.0.0.236/trunk@165870 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/configure.in | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/mozilla/configure.in b/mozilla/configure.in
index b46376c59b3..ad1f717b83f 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -4046,13 +4046,25 @@ MOZ_ARG_DISABLE_BOOL(composer,
     MOZ_COMPOSER=1 )
 AC_SUBST(MOZ_COMPOSER)
 
+dnl ========================================================
+dnl XTF
+dnl ========================================================
+MOZ_XTF=1
+MOZ_ARG_DISABLE_BOOL(xtf,
+[  --disable-xtf           Disable XTF (pluggable xml tags) support],
+    MOZ_XTF=,
+    MOZ_XTF=1 )
+if test "$MOZ_XTF"; then
+  AC_DEFINE(MOZ_XTF)
+fi
+
 dnl ========================================================
 dnl = Enable compilation of specific extension modules
 dnl ========================================================
 
 MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs negotiateauth sroaming"
 
-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks sql"
+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm datetime finger cview layout-debug tasks sql xforms"
 
 MOZ_ARG_ENABLE_STRING(extensions,
 [  --enable-extensions     Enable extensions],
@@ -4106,6 +4118,16 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c tridentprofile` -ne 0; then
   fi
 fi
 
+dnl xforms requires xtf and webservices
+if test -z "$MOZ_XTF" && test `echo "$MOZ_EXTENSIONS" | grep -c xforms` -ne 0; then
+    AC_MSG_WARN([Cannot build XForms without XTF support.  Removing XForms from MOZ_EXTENSIONS.])
+    MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|xforms||g'`
+fi
+if test `echo "$MOZ_EXTENSIONS" | grep -c xforms` -ne 0 && test `echo "$MOZ_EXTENSIONS" | grep -c webservices` -eq 0; then
+    AC_MSG_WARN([Cannot build XForms without webservices.  Removing XForms from MOZ_EXTENSIONS.])
+    MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|xforms||g'`
+fi
+
 dnl ========================================================
 dnl Check for GSSAPI libraries and headers needed for
 dnl integrated windows authentication support (disable
@@ -4303,18 +4325,6 @@ if test "$MOZ_MATHML"; then
   AC_DEFINE(MOZ_MATHML)
 fi
 
-dnl ========================================================
-dnl XTF
-dnl ========================================================
-MOZ_XTF=1
-MOZ_ARG_DISABLE_BOOL(xtf,
-[  --disable-xtf           Disable XTF (pluggable xml tags) support],
-    MOZ_XTF=,
-    MOZ_XTF=1 )
-if test "$MOZ_XTF"; then
-  AC_DEFINE(MOZ_XTF)
-fi
-
 dnl ========================================================
 dnl SVG
 dnl ========================================================