summaryrefslogtreecommitdiff
blob: 35638a76430b4440ed8b1f6dcde0a36789b0b286 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
Index: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in (revision 16816)
+++ gnucash/trunk/configure.in (revision 16834)
@@ -1115,13 +1115,13 @@
     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], [goffice=0])
+    ])
+    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], [