[xulrunner] Added switch for system cairo

[Martin Stransky]

commit df71757668a22d9b672bdc7fa92d209a2ea42559
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Apr 24 10:19:29 2012 +0200

    Added switch for system cairo

 xulrunner-mozconfig |    1 -
 xulrunner.spec      |   13 +++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig
index c9f0b8c..bed6ee5 100644
--- a/xulrunner-mozconfig
+++ b/xulrunner-mozconfig
@@ -9,7 +9,6 @@ ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-cairo
 ac_add_options --with-pthreads
 ac_add_options --disable-strip
 ac_add_options --disable-tests
diff --git a/xulrunner.spec b/xulrunner.spec
index 42c7d1a..9419930 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -8,6 +8,9 @@
 %define system_sqlite     1
 %endif
 
+# Use system cairo?
+%define system_cairo      1
+
 # Build as a debug package?
 %define debug_build       0
 
@@ -111,7 +114,9 @@ Patch47:        mozilla-691898.patch
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
 %endif
+%if %{?system_cairo}
 BuildRequires:  cairo-devel >= %{cairo_version}
+%endif
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  zip
@@ -169,7 +174,9 @@ Requires: xulrunner = %{version}-%{release}
 Requires: nspr-devel >= %{nspr_version}
 Requires: nss-devel >= %{nss_version}
 %endif
+%if %{?system_cairo}
 Requires: cairo-devel >= %{cairo_version}
+%endif
 Requires: libjpeg-devel
 Requires: zip
 Requires: bzip2-devel
@@ -261,6 +268,12 @@ echo "ac_add_options --enable-system-sqlite" >> .mozconfig
 echo "ac_add_options --disable-system-sqlite" >> .mozconfig
 %endif
 
+%if %{?system_cairo}
+echo "ac_add_options --enable-system-cairo" >> .mozconfig
+%else
+echo "ac_add_options --disable-system-cairo" >> .mozconfig
+%endif
+
 %if %{?debug_build}
 echo "ac_add_options --enable-debug" >> .mozconfig
 echo "ac_add_options --disable-optimize" >> .mozconfig