From 1f5ee72fbcc364c0861319da761d6176c768b4f5 Mon Sep 17 00:00:00 2001
From: Derek Atkins <derek@ihtfp.com>
Date: Sat, 7 Jun 2008 18:54:19 +0000
Subject: [PATCH] Better patch for goffice-0.5/gtkhtml-3.14 checking

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17194 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 configure.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index dcc5994886..b447f02e70 100644
--- a/configure.in
+++ b/configure.in
@@ -1114,6 +1114,7 @@ then
     # checks for goffice
     goffice=0
     goffice_with_cairo=0
+    have_goffice_0_5=0
     PKG_CHECK_MODULES(GOFFICE, libgoffice-0.6 >= 0.6.0, [goffice=1], [
       PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [goffice=1], [goffice=0])
     ])
@@ -1121,6 +1122,7 @@ then
     then
       AC_DEFINE(HAVE_GOFFICE_0_5,1,[System has goffice 0.5.1 or better])
       AC_DEFINE(GOFFICE_WITH_CAIRO,1,[GOffice has been built with cairo support])
+      have_goffice_0_5=1
       goffice_with_cairo=1
     else
       PKG_CHECK_MODULES(GOFFICE, libgoffice-0.4 >= 0.4.0, [goffice=1], [
@@ -1163,7 +1165,7 @@ then
     AM_CONDITIONAL(GTKHTML_USES_GTKPRINT,test "x$gtkhtml" = "x1")
 
     # GOffice >= 0.5 requires GtkHTML >= 3.14
-    if test x$goffice_with_cairo = x1 -a x$gtkhtml = x0 ; then
+    if test x$have_goffice_0_5 = x1 -a x$gtkhtml = x0 ; then
       AC_MSG_ERROR([Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support])
     fi