diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:06:34 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:06:34 -0500 |
commit | 330c0a9ff2e05b86f69f0209b3265cb003e0c98d (patch) | |
tree | 34cccc67370ca8d178c21556bc6c6a894bef1f84 /libre/iceweasel-libre/mozconfig | |
parent | 3a5380856fae97f3358dc00522656c9f1fc26187 (diff) | |
parent | dc26483bfd644bb2ad6dd25e3bb5ca9e2bbe1099 (diff) |
Merge branch 'wip-merge'
Conflicts:
libre/dpkg/PKGBUILD
libre/iceweasel-i18n/PKGBUILD
libre/iceweasel-libre/PKGBUILD
Diffstat (limited to 'libre/iceweasel-libre/mozconfig')
-rw-r--r-- | libre/iceweasel-libre/mozconfig | 60 |
1 files changed, 22 insertions, 38 deletions
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index e79896323..121d31aea 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -1,55 +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 --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-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 - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 -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 |