[goffice] Compilation: don't include sub-include files for new librsvg.

[Morten Welinder <mortenw src gnome org>]

commit 7517bf10ab3c23a3d966d8ecb21113d247b3f8a4
Author: Morten Welinder <terra gnome org>
Date:   Sat May 11 15:08:29 2013 -0400

    Compilation: don't include sub-include files for new librsvg.

 ChangeLog                        |    5 +++++
 NEWS                             |    3 +++
 goffice/component/go-component.c |    3 +++
 goffice/utils/go-svg.c           |    3 +++
 4 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2499baa..d97cd2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-11  Morten Welinder  <terra gnome org>
+
+       * goffice/component/go-component.c: Fix issue with librsvg includes.
+       * goffice/utils/go-svg.c: Ditto.  Fixes #695167.
+
 2013-05-03  Morten Welinder  <terra gnome org>
 
        * goffice/math/go-regression.c (go_matrix_pseudo_inverse): Improve
diff --git a/NEWS b/NEWS
index 08d97bb..62cc3aa 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ goffice 0.10.3:
 Jean:
        * Implement color scales. [#695829]
 
+Morten:
+       * Fix issue with librsvg includes.  [#695167]
+
 --------------------------------------------------------------------------
 goffice 0.10.2:
 
diff --git a/goffice/component/go-component.c b/goffice/component/go-component.c
index 31ce7c1..b01de87 100644
--- a/goffice/component/go-component.c
+++ b/goffice/component/go-component.c
@@ -29,7 +29,10 @@
 #include <gio/gio.h>
 #include <cairo-svg.h>
 #include <librsvg/rsvg.h>
+#if LIBRSVG_CHECK_VERSION(2,36,2)
+#else
 #include <librsvg/rsvg-cairo.h>
+#endif
 #include <string.h>
 
 struct _GOComponentPrivate {
diff --git a/goffice/utils/go-svg.c b/goffice/utils/go-svg.c
index 5bcfe97..f92b5b3 100644
--- a/goffice/utils/go-svg.c
+++ b/goffice/utils/go-svg.c
@@ -22,7 +22,10 @@
 #include <goffice/goffice-config.h>
 #include "go-svg.h"
 #include <librsvg/rsvg.h>
+#if LIBRSVG_CHECK_VERSION(2,36,2)
+#else
 #include <librsvg/rsvg-cairo.h>
+#endif
 #include <gsf/gsf-utils.h>
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-input-stdio.h>