summaryrefslogtreecommitdiff
path: root/libre/iceweasel-libre/mozconfig
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-01-12 16:01:34 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-01-12 16:01:34 -0500
commitb453854f5cbc46a46f1a35fb853e252e18951885 (patch)
tree1386ffd34eac9453301d008b19a733756110e8ad /libre/iceweasel-libre/mozconfig
parent07d1af1bca9525df579a3805d46d6819d23cb242 (diff)
downloadabslibre-b453854f5cbc46a46f1a35fb853e252e18951885.tar.gz
abslibre-b453854f5cbc46a46f1a35fb853e252e18951885.tar.bz2
abslibre-b453854f5cbc46a46f1a35fb853e252e18951885.zip
libre/{icecat,iceweasel-libre}: run through moz-normalize-*
Diffstat (limited to 'libre/iceweasel-libre/mozconfig')
-rw-r--r--libre/iceweasel-libre/mozconfig62
1 files changed, 30 insertions, 32 deletions
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index e79896323..619398aae 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -1,55 +1,53 @@
. $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 --enable-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-mochitest
+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-startup-notification
+# Vendor settings
# Optimization
ac_add_options --enable-optimize
-
+ac_add_options --libdir=/usr/lib
+ac_add_options --prefix=/usr
+export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-# Iceweasel
-ac_add_options --disable-official-branding
-ac_add_options --with-branding=debian/branding
-
-# ConnochaetOS
+# Platform settings
#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
+# Application settings
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=debian/branding
+
+# Other
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
# Build-generated