packages: icedove/icedove.spec - xulrunner vs static conflict each other

[glen]

Author: glen                         Date: Fri Apr  9 13:26:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- xulrunner vs static conflict each other

---- Files affected:
packages/icedove:
   icedove.spec (1.74 -> 1.75) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.74 packages/icedove/icedove.spec:1.75
--- packages/icedove/icedove.spec:1.74	Fri Apr  9 13:30:41 2010
+++ packages/icedove/icedove.spec	Fri Apr  9 15:26:03 2010
@@ -179,9 +179,8 @@
 
 install -d libxul-sdk
 ln -snf %{_libdir}/xulrunner-sdk libxul-sdk/sdk
-SDKDIR=$(cd libxul-sdk; pwd)
 
-cat << 'EOF' > .mozconfig
+cat << EOF > .mozconfig
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
 
 # Options for 'configure' (same as command-line options).
@@ -252,9 +251,6 @@
 ac_add_options --enable-mathml
 ac_add_options --enable-pango
 ac_add_options --enable-reorder
-%if %{without xulrunner}
-ac_add_options --enable-static
-%endif
 ac_add_options --enable-startup-notification
 ac_add_options --enable-svg
 ac_add_options --enable-system-cairo
@@ -267,9 +263,10 @@
 ac_add_options --with-distribution-id=org.pld-linux
 ac_add_options --with-branding=icedove/branding
 %if %{with xulrunner}
-#ac_add_options --with-libxul-sdk=%{_libdir}/xulrunner-sdk
-#ac_add_options --with-libxul-sdk=$(pwd)/libxul-sdk
-ac_add_options --with-libxul-sdk=$SDKDIR
+ac_add_options --with-libxul-sdk=$(pwd)/libxul-sdk
+ac_add_options --enable-shared
+%else
+ac_add_options --enable-static
 %endif
 ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
@@ -443,6 +440,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.75  2010/04/09 13:26:03  glen
+- xulrunner vs static conflict each other
+
 Revision 1.74  2010/04/09 11:30:41  glen
 - with xulrunner hacks
 - system mozldap hacks
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.74&r2=1.75&f=u