[goffice] Compilation: retry librsvg fix.

[Morten Welinder <mortenw src gnome org>]

commit fecc479348a2a6e6b4d5c4b3a08f338251d85d78
Author: Morten Welinder <terra gnome org>
Date:   Mon May 13 11:35:03 2013 -0400

    Compilation: retry librsvg fix.

 ChangeLog                        |    4 ++++
 goffice/component/go-component.c |    9 +++++++--
 goffice/utils/go-svg.c           |    8 +++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 62ffc5e..9bc4f75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-13  Morten Welinder  <terra gnome org>
+
+       * goffice/utils/go-svg.c: Try another variant of previous fix.
+
 2013-05-12  Morten Welinder  <terra gnome org>
 
        * goffice/math/go-regression.c (general_linear_regression): Take
diff --git a/goffice/component/go-component.c b/goffice/component/go-component.c
index b01de87..43e11c5 100644
--- a/goffice/component/go-component.c
+++ b/goffice/component/go-component.c
@@ -28,12 +28,17 @@
 #include <gsf/gsf-output-memory.h>
 #include <gio/gio.h>
 #include <cairo-svg.h>
+#include <string.h>
+
 #include <librsvg/rsvg.h>
-#if LIBRSVG_CHECK_VERSION(2,36,2)
+#ifdef LIBRSVG_CHECK_VERSION
+#define NEEDS_LIBRSVG_CAIRO_H LIBRSVG_CHECK_VERSION(2,36,2)
 #else
+#define NEEDS_LIBRSVG_CAIRO_H 1
+#endif
+#if NEEDS_LIBRSVG_CAIRO_H
 #include <librsvg/rsvg-cairo.h>
 #endif
-#include <string.h>
 
 struct _GOComponentPrivate {
        gboolean is_inline; /* if set, the object will be displayed in compact mode
diff --git a/goffice/utils/go-svg.c b/goffice/utils/go-svg.c
index f92b5b3..56bf972 100644
--- a/goffice/utils/go-svg.c
+++ b/goffice/utils/go-svg.c
@@ -21,11 +21,17 @@
 
 #include <goffice/goffice-config.h>
 #include "go-svg.h"
+
 #include <librsvg/rsvg.h>
-#if LIBRSVG_CHECK_VERSION(2,36,2)
+#ifdef LIBRSVG_CHECK_VERSION
+#define NEEDS_LIBRSVG_CAIRO_H LIBRSVG_CHECK_VERSION(2,36,2)
 #else
+#define NEEDS_LIBRSVG_CAIRO_H 1
+#endif
+#if NEEDS_LIBRSVG_CAIRO_H
 #include <librsvg/rsvg-cairo.h>
 #endif
+
 #include <gsf/gsf-utils.h>
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-input-stdio.h>