From 7bbe9277ba81f0328d9a14b9754fd1d32af07475 Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Thu, 19 Jan 2006 17:15:46 +0000 Subject: [PATCH] Get the code to compile against glib-2.4 again. * src/business/business-gnome/dialog-invoice.c: need to #include gkeyfile.h for glib24 systems * src/business/business-gnome/Makefile.am: link against glib26 compatibility library. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12896 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 7 +++++++ src/business/business-gnome/Makefile.am | 4 +++- src/business/business-gnome/dialog-invoice.c | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 71f33f6d82..9cdb03ff9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-01-19 Derek Atkins + + * src/business/business-gnome/dialog-invoice.c: + need to #include gkeyfile.h for glib24 systems + * src/business/business-gnome/Makefile.am: + link against glib26 compatibility library. + 2006-01-19 David Hampton * src/business/business-gnome/dialog-invoice.c: Delete the invoice diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am index e85e5c5e7b..42a453de12 100644 --- a/src/business/business-gnome/Makefile.am +++ b/src/business/business-gnome/Makefile.am @@ -27,7 +27,8 @@ AM_CFLAGS = \ ${QOF_CFLAGS} \ -I${top_srcdir}/src/register/register-core \ -I${top_srcdir}/src/register/register-gnome \ - -I${top_srcdir}/src/register/ledger-core + -I${top_srcdir}/src/register/ledger-core \ + -I${top_srcdir}/lib/glib26 libgncmod_business_gnome_la_SOURCES = \ businessmod-gnome.c \ @@ -75,6 +76,7 @@ libgncmod_business_gnome_la_LIBADD = \ ${G_WRAP_LINK_ARGS} \ ${GLIB_LIBS} \ ${QOF_LIBS} \ + ${top_builddir}/lib/glib26/libgncglib.la \ ${EFENCE_LIBS} diff --git a/src/business/business-gnome/dialog-invoice.c b/src/business/business-gnome/dialog-invoice.c index 3dfaf3ae24..f42d1b3135 100644 --- a/src/business/business-gnome/dialog-invoice.c +++ b/src/business/business-gnome/dialog-invoice.c @@ -51,6 +51,10 @@ #include "gncEntryLedger.h" +#ifndef HAVE_GLIB26 +#include "gkeyfile.h" +#endif + #include "gnc-plugin-page.h" #include "gnc-general-search.h" #include "dialog-date-close.h"