bug 383112 - make MOZ_XUL_APP=1 the default in configure, r=bsmedberg
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -32,17 +32,16 @@
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
MOZ_APP_NAME=firefox
-MOZ_XUL_APP=1
MOZ_UPDATER=1
MOZ_PHOENIX=1
MOZ_PLACES=1
MOZ_PLACES_BOOKMARKS=1
# always enabled for form history
MOZ_MORKREADER=1
MOZ_SAFE_BROWSING=1
MOZ_APP_VERSION=$FIREFOX_VERSION
--- a/configure.in
+++ b/configure.in
@@ -4115,16 +4115,17 @@ MOZ_V1_STRING_ABI=
MOZ_VIEW_SOURCE=1
MOZ_WEBSERVICES=1
MOZ_XMLEXTRAS=1
MOZ_XPFE_COMPONENTS=1
MOZ_XPINSTALL=1
MOZ_XSLT_STANDALONE=
MOZ_XTF=1
MOZ_XUL=1
+MOZ_XUL_APP=1
NS_PRINTING=1
NECKO_COOKIES=1
NECKO_DISK_CACHE=1
NECKO_PROTOCOLS_DEFAULT="about data file ftp gopher http res viewsource"
NECKO_SMALL_BUFFERS=
SUNCTL=
JS_STATIC_BUILD=
XPC_IDISPATCH_SUPPORT=
@@ -4233,17 +4234,16 @@ basic)
MOZ_SVG=
MOZ_UNIVERSALCHARDET=
MOZ_UPDATER=
MOZ_USE_NATIVE_UCONV=1
MOZ_VIEW_SOURCE=
MOZ_XPFE_COMPONENTS=
MOZ_XPINSTALL=
MOZ_XTF=
- MOZ_XUL_APP=1
NECKO_DISK_CACHE=
NECKO_PROTOCOLS_DEFAULT="about data http file res"
NECKO_SMALL_BUFFERS=1
NS_DISABLE_LOGGING=1
NS_PRINTING=
JS_STATIC_BUILD=1
;;
@@ -4285,17 +4285,16 @@ minimal)
MOZ_UPDATER=
MOZ_USE_NATIVE_UCONV=1
MOZ_VIEW_SOURCE=
MOZ_XPFE_COMPONENTS=
MOZ_XPINSTALL=
MOZ_XTF=
MOZ_XUL=
MOZ_RDF=
- MOZ_XUL_APP=1
NECKO_DISK_CACHE=
NECKO_PROTOCOLS_DEFAULT="about data http file res"
NECKO_SMALL_BUFFERS=1
NS_DISABLE_LOGGING=1
NS_PRINTING=
JS_STATIC_BUILD=1
;;
--- a/xulrunner/confvars.sh
+++ b/xulrunner/confvars.sh
@@ -33,17 +33,16 @@
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
MOZ_APP_NAME=xulrunner
MOZ_APP_DISPLAYNAME=XULRunner
-MOZ_XUL_APP=1
MOZ_UPDATER=1
MOZ_XULRUNNER=1
MOZ_ENABLE_LIBXUL=1
MOZ_APP_VERSION=$MOZILLA_VERSION
MOZ_JAVAXPCOM=1
if test "$MOZ_STORAGE"; then
MOZ_PLACES=1
fi