[Gnucash-changes] r12896 - gnucash/trunk - Get the code to compile against glib-2.4 again.

[Derek Atkins]

Author: warlord
Date: 2006-01-19 12:15:46 -0500 (Thu, 19 Jan 2006)
New Revision: 12896
Trac: http://svn.gnucash.org/trac/changeset/12896

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/business/business-gnome/Makefile.am
   gnucash/trunk/src/business/business-gnome/dialog-invoice.c
Log:
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.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-19 17:12:24 UTC (rev 12895)
+++ gnucash/trunk/ChangeLog	2006-01-19 17:15:46 UTC (rev 12896)
@@ -1,3 +1,10 @@
+2006-01-19  Derek Atkins  <derek at ihtfp.com>
+
+	* 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  <hampton at employees.org>
 
 	* src/business/business-gnome/dialog-invoice.c: Delete the invoice

Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am	2006-01-19 17:12:24 UTC (rev 12895)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am	2006-01-19 17:15:46 UTC (rev 12896)
@@ -27,7 +27,8 @@
   ${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 @@
   ${G_WRAP_LINK_ARGS} \
   ${GLIB_LIBS} \
   ${QOF_LIBS} \
+  ${top_builddir}/lib/glib26/libgncglib.la \
   ${EFENCE_LIBS}
 
 

Modified: gnucash/trunk/src/business/business-gnome/dialog-invoice.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-invoice.c	2006-01-19 17:12:24 UTC (rev 12895)
+++ gnucash/trunk/src/business/business-gnome/dialog-invoice.c	2006-01-19 17:15:46 UTC (rev 12896)
@@ -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"