r17194 - gnucash/trunk - Better patch for goffice-0.5/gtkhtml-3.14 checking

Derek Atkins warlord at cvs.gnucash.org
Sat Jun 7 14:54:19 EDT 2008


Author: warlord
Date: 2008-06-07 14:54:19 -0400 (Sat, 07 Jun 2008)
New Revision: 17194
Trac: http://svn.gnucash.org/trac/changeset/17194

Modified:
   gnucash/trunk/configure.in
Log:
Better patch for goffice-0.5/gtkhtml-3.14 checking

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2008-06-07 18:38:15 UTC (rev 17193)
+++ gnucash/trunk/configure.in	2008-06-07 18:54:19 UTC (rev 17194)
@@ -1114,6 +1114,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])
     ])
@@ -1121,6 +1122,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,7 +1165,7 @@
     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
 



More information about the gnucash-changes mailing list