1 files changed, 22 insertions, 62 deletions

diff --git a/meta/packages/mozilla/minimo/mozconfig b/meta/packages/mozilla/minimo/mozconfig
index 5a84bcf87e..393981e9fa 100644
--- a/meta/packages/mozilla/minimo/mozconfig
+++ b/meta/packages/mozilla/minimo/mozconfig
@@ -1,76 +1,36 @@
-# build minimo
-MINIMO=1
-mk_add_options MINIMO=1
+# mozilla/configure: Features and packages:
 
-# enable building the browser
-ac_add_options --enable-application=browser
-
-# use GTK+-2 widget set with XFT font rendering
-
-MOZ_ENABLE_COREXFONTS=0
-mk_add_options MOZ_ENABLE_COREXFONTS=0
+ac_add_options --enable-application=minimo
 ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --enable-xft
 ac_add_options --disable-freetype2
-
-# disable XUL support to reduce codesize
-ac_add_options --disable-xul
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-# disable features and skip various build steps
-ac_add_options --disable-extensions
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-ac_add_options --disable-extensions
-ac_add_options --disable-installer
-ac_add_options --disable-jsd
-ac_add_options --disable-jsloader
-ac_add_options --disable-ldap
-ac_add_options --disable-mailnews
-ac_add_options --disable-mathml
-ac_add_options --disable-necko-disk-cache
+ac_add_options --enable-xft
 ac_add_options --disable-postscript
+ac_add_options --disable-xprint
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-gnomeui
+ac_add_options --disable-jsd
+ac_add_options --disable-plugins
 ac_add_options --disable-view-source
-ac_add_options --disable-xpfe-components
+ac_add_options --disable-accessibility
 ac_add_options --disable-xpinstall
-ac_add_options --disable-xprint
+ac_add_options --enable-single-profile
+ac_add_options --disable-jsloader
+ac_add_options --disable-printing
 ac_add_options --enable-native-uconv
 ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-v1-string-abi
-ac_add_options --disable-plugins
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-tests
-
-# build crypto module (PSM + NSS)
-ac_add_options --enable-crypto
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=http,file,res,jar
-
-# build minimal set of image decoders
+ac_add_options --disable-xpcom-obsolete
+ac_add_options --disable-pref-extensions
+ac_add_options --disable-extensions
 ac_add_options --enable-image-decoders=png,gif,jpeg
-
-# code generation options (optimize for size)
+ac_add_options --disable-mathml
+ac_add_options --disable-installer
+ac_add_options --disable-updater
+ac_add_options --disable-tests
 ac_add_options --enable-optimize=-Os
+ac_add_options --disable-logging
 ac_add_options --enable-strip
-ac_add_options --disable-debug
-ac_add_options --enable-reorder
 ac_add_options --enable-elf-dynstr-gc
-
-# enable static build
 ac_add_options --disable-shared
 ac_add_options --enable-static
-
-# remove link dependency on libstdc++.so
-LIBS=-lsupc++
-
+ac_add_options --disable-profilesharing
+ac_add_options --disable-profilelocking