[thunderbird-lightning] Sync thunderbird-mozoptions from thunderbird package

[Orion Poplawski]

commit 70077bcdc25816ddbce2e697e488a32bbec61327
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sat Dec 14 11:48:17 2013 -0700

    Sync thunderbird-mozoptions from thunderbird package

 thunderbird-lightning.spec |    5 ++++-
 thunderbird-mozconfig      |   17 ++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 80fd09a..bec3663 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -32,7 +32,7 @@
 Name:           thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Version:        %{lightning_version}
-Release:        6%{?dist}
+Release:        7%{?dist}
 URL:            http://www.mozilla.org/projects/calendar/lightning/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Productivity
@@ -229,6 +229,9 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* Sat Dec 14 2013 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-7
+- Sync thunderbird-mozoptions from thunderbird package
+
 * Wed Dec 11 2013 Orion Poplawski <orion at cora.nwra.com> - 2.6.4-6
 - Update to 2.6.4
 - Drop caldav patch
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index 1196497..5f1d56d 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -1,40 +1,39 @@
 mk_add_options MOZ_CO_PROJECT=mail
 ac_add_options --enable-application=mail
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options AUTOCONF=autoconf-2.13
 
 #ac_add_options --with-system-png
 
 ac_add_options --prefix="$PREFIX"
 ac_add_options --libdir="$LIBDIR"
-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-libvpx
 ac_add_options --with-pthreads
-ac_add_options --enable-calendar
 ac_add_options --disable-tests
-ac_add_options --disable-debug
 ac_add_options --disable-installer
-ac_add_options --enable-optimize
 ac_add_options --enable-xinerama
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --disable-xprint
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
 ac_add_options --enable-pango
-# disable cairo, intree cairo has some patches which system cairo miss and this lead to compilation fail
+# temporary disable system cairo, because compilation fails
 #ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --enable-system-hunspell
-ac_add_options --disable-crashreporter
 ac_add_options --disable-necko-wifi
 ac_add_options --disable-updater
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-gstreamer
+
+# lightning related
+ac_add_options --enable-calendar
 ac_add_options --with-l10n-base=../../l10n
-ac_add_options --disable-gstreamer
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1