r16829 - gnucash/branches/2.2 - [r16825] Allow building against goffice-0.6.

[Andreas Köhler]

Author: andi5
Date: 2008-01-06 11:17:20 -0500 (Sun, 06 Jan 2008)
New Revision: 16829
Trac: http://svn.gnucash.org/trac/changeset/16829

Modified:
   gnucash/branches/2.2/configure.in
Log:
[r16825] Allow building against goffice-0.6.

Approved by jsled.


Modified: gnucash/branches/2.2/configure.in
===================================================================
--- gnucash/branches/2.2/configure.in	2008-01-06 16:02:14 UTC (rev 16828)
+++ gnucash/branches/2.2/configure.in	2008-01-06 16:17:20 UTC (rev 16829)
@@ -1115,15 +1115,15 @@
     # checks for goffice
     goffice=0
     goffice_with_cairo=0
-    PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [
+    PKG_CHECK_MODULES(GOFFICE, libgoffice-0.6 >= 0.6.0, [goffice=1], [
+      PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [goffice=1], [])
+    ])
+    if test x$goffice = x1
+    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])
-      goffice=1
       goffice_with_cairo=1
-    ], [goffice=0])
-
-    if test x$goffice = x0
-    then
+    else
       PKG_CHECK_MODULES(GOFFICE, libgoffice-0.4 >= 0.4.0, [goffice=1], [
         PKG_CHECK_MODULES(GOFFICE, libgoffice-0.3 >= 0.3.0, [goffice=1], [
           PKG_CHECK_MODULES(GOFFICE, libgoffice-1 >= 0.0.4, [goffice=1], [