IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Better patch for goffice-0.5/gtkhtml-3.14 checking

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17194 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins 2008-06-07 18:54:19 +00:00
parent f3407d3283
commit 1f5ee72fbc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -1114,6 +1114,7 @@ then
# checks for goffice # checks for goffice
goffice=0 goffice=0
goffice_with_cairo=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.6 >= 0.6.0, [goffice=1], [
PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [goffice=1], [goffice=0]) PKG_CHECK_MODULES(GOFFICE, libgoffice-0.5 >= 0.5.1, [goffice=1], [goffice=0])
]) ])
@ -1121,6 +1122,7 @@ then
then then
AC_DEFINE(HAVE_GOFFICE_0_5,1,[System has goffice 0.5.1 or better]) 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]) AC_DEFINE(GOFFICE_WITH_CAIRO,1,[GOffice has been built with cairo support])
have_goffice_0_5=1
goffice_with_cairo=1 goffice_with_cairo=1
else else
PKG_CHECK_MODULES(GOFFICE, libgoffice-0.4 >= 0.4.0, [goffice=1], [ 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") AM_CONDITIONAL(GTKHTML_USES_GTKPRINT,test "x$gtkhtml" = "x1")
# GOffice >= 0.5 requires GtkHTML >= 3.14 # 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]) AC_MSG_ERROR([Goffice uses Cairo/GtkPrint but didn't find GtkHTML with GtkPrint support])
fi fi