From c7939f2babc29899c41dfbad83b967b8f832ee85 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 30 Dec 2011 04:53:17 -0500
Subject: Pull in changes from Arch Firefox to our Iceweasel

---
 mozilla-testing/iceweasel-libre/mozconfig | 67 ++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 24 deletions(-)

(limited to 'mozilla-testing/iceweasel-libre/mozconfig')

diff --git a/mozilla-testing/iceweasel-libre/mozconfig b/mozilla-testing/iceweasel-libre/mozconfig
index 8344f6967..88e5ec422 100644
--- a/mozilla-testing/iceweasel-libre/mozconfig
+++ b/mozilla-testing/iceweasel-libre/mozconfig
@@ -2,38 +2,57 @@
 
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
-#ac_add_options --with-system-nss
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
-ac_add_options --enable-optimize
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-strip
-ac_add_options --enable-pango
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-libxul
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
-ac_add_options --disable-safe-browsing
+ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-xprint
-ac_add_options --disable-installer
-ac_add_options --disable-libnotify
-ac_add_options --disable-pedantic
-ac_add_options --disable-gnomevfs
 ac_add_options --disable-mochitest
-ac_add_options --disable-updater
-ac_add_options --with-default-mozilla-five-home=/usr/lib/iceweasel
+ac_add_options --disable-installer
 
+# Optimization
+ac_add_options --enable-optimize
+
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# Iceweasel
+ac_add_options --disable-official-branding
 ac_add_options --with-branding=debian/branding
-ac_add_options --build=i586-pc-linux-gnu
-ac_add_options --host=i586-pc-linux-gnu
 
+# ConnochaetOS
+#ac_add_options --build=i586-pc-linux-gnu
+#ac_add_options --host=i586-pc-linux-gnu
+#export USE_SHORT_LIBNAME=1
+#mk_add_options USE_SHORT_LIBNAME=1
+
+# Parabola
+ac_add_options --disable-safe-browsing
 export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export USE_SHORT_LIBNAME=1
 mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options USE_SHORT_LIBNAME=1
-- 
cgit v1.2.3-2-g168b