summaryrefslogtreecommitdiff
path: root/libre/icecat/mozconfig
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-04-07 00:46:34 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-04-07 00:46:34 -0400
commit619b8d955269f2fe74386e98fac07675c8b55352 (patch)
treef3e2610a39c99a7e43bc2b345280b04e398b986a /libre/icecat/mozconfig
parent2b04539ac9310541a4e563460aed0cb7715770d2 (diff)
parent7d4e98b2d6f2fd4d42ebb55105bab8a05e34ab94 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/icecat/mozconfig')
-rw-r--r--libre/icecat/mozconfig67
1 files changed, 30 insertions, 37 deletions
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index c5cea7185..7b27e3c6a 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -1,51 +1,44 @@
. $topsrcdir/browser/config/mozconfig
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# 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
+
# System libraries
-ac_add_options --disable-system-cairo
-ac_add_options --enable-system-ffi
-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-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
# Features
-ac_add_options --disable-crashreporter
-ac_add_options --disable-gnomevfs
-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-gio
-#ac_add_options --enable-gstreamer
ac_add_options --enable-startup-notification
+#ac_add_options --enable-gstreamer
-# Vendor settings
-ac_add_options --enable-optimize="-pipe -O3"
-ac_add_options --libdir=/usr/lib
-ac_add_options --prefix=/usr
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-installer
-# Application settings
-ac_add_options --disable-official-branding
-# since with-user-appdir with .gnuzilla doesn't do the trick,
-# use app-basename instead
-ac_add_options --with-app-basename=icecat
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.mozilla
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
+# Parabola features
+ac_add_options --disable-safe-browsing
# Other
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# Build-generated