From 0fa76acd2cfbd10330a48eaf9d2a7cd0ecba3be3 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 30 Dec 2011 03:22:37 -0500
Subject: Pull in changes from Arch Firefox into our Icecat.

---
 mozilla-testing/icecat/mozconfig.default | 61 ++++++++++++++------------------
 1 file changed, 27 insertions(+), 34 deletions(-)

(limited to 'mozilla-testing/icecat/mozconfig.default')

diff --git a/mozilla-testing/icecat/mozconfig.default b/mozilla-testing/icecat/mozconfig.default
index 21aaa0edd..01e047fc3 100644
--- a/mozilla-testing/icecat/mozconfig.default
+++ b/mozilla-testing/icecat/mozconfig.default
@@ -1,57 +1,35 @@
 # This is a better commented version of the default .mozconfig from 9.0.1
-
-# We are building the browser
 ac_add_options --enable-application=browser
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
 
-# Branding
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=browser/branding/unofficial
-
-# GNUzilla things
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.gnuzilla
-
-# Operating system things
 ac_add_options --prefix=/usr/local
 #ac_add_options --with-default-mozilla-five-home=/usr/local/lib
+
+# System libraries
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+#ac_add_options --with-system-png
+ac_add_options --disable-system-cairo 
 #ac_add_options --with-pthreads
 
+ac_add_options --disable-toolkit-qt
 ac_add_options --enable-toolkit-cairo-gtk2
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-svg-renderer=cairo
 
-ac_add_options --disable-toolkit-qt
-
-ac_add_options --disable-system-cairo 
-ac_add_options --with-system-jpeg
-#ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
+# Features
+ac_add_options --enable-extensions="default spellcheck"
 ac_add_options --enable-freetype2
 ac_add_options --enable-pango
-
-# Enable/Disable web technologies
 ac_add_options --enable-crypto
 #ac_add_options --enable-postscript
 ac_add_options --enable-svg
 ac_add_options --enable-xft
 
-# Enable/Disable "user-y" features
-ac_add_options --enable-extensions="default spellcheck"
-
 ac_add_options --disable-chatzilla
 ac_add_options --disable-accessibility
 ac_add_options --disable-calendar
 ac_add_options --disable-composer
 
-# Enable/Disable "system-y" features
-ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-
 #ac_add_options --disable-jsd
 #ac_add_options --disable-libxul
 ac_add_options --disable-ipc
@@ -62,9 +40,24 @@ ac_add_options --disable-profilesharing
 ac_add_options --disable-xinerama
 ac_add_options --disable-xprint
 
-# Build settings
-ac_add_options --disable-elf-dynstr-gc
-ac_add_options --disable-mochitest 
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
 ac_add_options --disable-tests
+ac_add_options --disable-mochitest 
+ac_add_options --disable-installer
+
+ac_add_options --disable-debug
+
+# Optimization
+ac_add_options --disable-elf-dynstr-gc
 ac_add_options --enable-optimize="-pipe -O3"
 ac_add_options --enable-strip
+
+# IceCat
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --with-distribution-id=org.gnu.gnuzilla
+ac_add_options --with-user-appdir=.gnuzilla
-- 
cgit v1.2.3