summaryrefslogtreecommitdiff
path: root/libre/icecat/mozconfig
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-01-12 18:06:34 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-01-12 18:06:34 -0500
commit330c0a9ff2e05b86f69f0209b3265cb003e0c98d (patch)
tree34cccc67370ca8d178c21556bc6c6a894bef1f84 /libre/icecat/mozconfig
parent3a5380856fae97f3358dc00522656c9f1fc26187 (diff)
parentdc26483bfd644bb2ad6dd25e3bb5ca9e2bbe1099 (diff)
downloadabslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.tar.gz
abslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.tar.bz2
abslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.zip
Merge branch 'wip-merge'
Conflicts: libre/dpkg/PKGBUILD libre/iceweasel-i18n/PKGBUILD libre/iceweasel-libre/PKGBUILD
Diffstat (limited to 'libre/icecat/mozconfig')
-rw-r--r--libre/icecat/mozconfig73
1 files changed, 32 insertions, 41 deletions
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index 5df8547f7..c5cea7185 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -1,60 +1,51 @@
. $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-ffi
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-zlib
# 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-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
+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
-# Optimization
-ac_add_options --enable-optimize
-
+# 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
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# Icecat
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
+# 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=.gnuzilla
-
-# 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
+ac_add_options --with-user-appdir=.mozilla
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=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