summaryrefslogtreecommitdiff
path: root/libre/iceweasel-libre/mozconfig
diff options
context:
space:
mode:
Diffstat (limited to 'libre/iceweasel-libre/mozconfig')
-rw-r--r--libre/iceweasel-libre/mozconfig54
1 files changed, 22 insertions, 32 deletions
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index 8b5e52d9e..121d31aea 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -1,49 +1,39 @@
. $topsrcdir/browser/config/mozconfig
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
# 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-cairo
ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
+ac_add_options --enable-system-hunspell
ac_add_options --enable-system-pixman
+ac_add_options --enable-system-sqlite
ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
# Features
-ac_add_options --enable-startup-notification
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-safe-browsing
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+#ac_add_options --enable-gstreamer
+ac_add_options --enable-startup-notification
-# Optimization
-ac_add_options --enable-optimize
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
+# Vendor settings
+ac_add_options --libdir=/usr/lib
+ac_add_options --prefix=/usr
-# Iceweasel
+# Application settings
ac_add_options --disable-official-branding
ac_add_options --with-branding=debian/branding
-# 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
-mk_add_options BUILD_OFFICIAL=1
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
# Build-generated