r17371 - gnucash/branches/2.2 - [r17193, r17194] GOffice >= 0.5 requires GtkHTML >= 3.14.

[Andreas Köhler]

Author: andi5
Date: 2008-07-22 18:31:10 -0400 (Tue, 22 Jul 2008)
New Revision: 17371
Trac: http://svn.gnucash.org/trac/changeset/17371

Modified:
   gnucash/branches/2.2/configure.in
Log:
[r17193,r17194] GOffice >= 0.5 requires GtkHTML >= 3.14.

Make sure that happens or the build will fail.

Committed by warlord.


Modified: gnucash/branches/2.2/configure.in
===================================================================
--- gnucash/branches/2.2/configure.in	2008-07-22 22:14:56 UTC (rev 17370)
+++ gnucash/branches/2.2/configure.in	2008-07-22 22:31:10 UTC (rev 17371)
@@ -1115,6 +1115,7 @@
     # 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])
     ])
@@ -1122,6 +1123,7 @@
     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,6 +1165,11 @@
     ], [gtkhtml=0])
     AM_CONDITIONAL(GTKHTML_USES_GTKPRINT,test "x$gtkhtml" = "x1")
 
+    # GOffice >= 0.5 requires GtkHTML >= 3.14
+    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
+
     # fallback to older gtkhtml versions and gnomeprint
     if test x$gtkhtml = x0
     then