r21184 - gnucash/branches/2.4/src - [21108] Bug #655901 - Fix build with guile 2.0

[Geert Janssens]

Author: gjanssens
Date: 2011-08-13 12:09:25 -0400 (Sat, 13 Aug 2011)
New Revision: 21184
Trac: http://svn.gnucash.org/trac/changeset/21184

Modified:
   gnucash/branches/2.4/src/guile-mappings.h
   gnucash/branches/2.4/src/plugins/bi_import/Makefile.am
Log:
[21108] Bug #655901 - Fix build with guile 2.0
Patch by Petr Gajdos

Modified: gnucash/branches/2.4/src/guile-mappings.h
===================================================================
--- gnucash/branches/2.4/src/guile-mappings.h	2011-08-13 16:07:04 UTC (rev 21183)
+++ gnucash/branches/2.4/src/guile-mappings.h	2011-08-13 16:09:25 UTC (rev 21184)
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.        *
 \********************************************************************/
 
-#include <libguile/version.h> /* for SCM_MAJOR_VERSION etc */
+#include <libguile.h> /* for SCM_MAJOR_VERSION etc */
 
 /* Give Guile 1.6 and 1.8 a 2.0-like interface */
 #if (SCM_MAJOR_VERSION == 1) && (SCM_MINOR_VERSION <= 6)

Modified: gnucash/branches/2.4/src/plugins/bi_import/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/plugins/bi_import/Makefile.am	2011-08-13 16:07:04 UTC (rev 21183)
+++ gnucash/branches/2.4/src/plugins/bi_import/Makefile.am	2011-08-13 16:09:25 UTC (rev 21184)
@@ -29,7 +29,8 @@
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
   ${QOF_LIBS} \
-  ${GLIB_LIBS}
+  ${GLIB_LIBS} \
+  ${GUILE_LIBS}
 
 AM_CFLAGS = \
   -I${top_srcdir}/src \
@@ -52,6 +53,7 @@
   ${GNOME_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${QOF_CFLAGS} \
-  ${GLIB_CFLAGS}
+  ${GLIB_CFLAGS} \
+  ${GUILE_INCS}
 
 INCLUDES = -DG_LOG_DOMAIN=\"gnc.plugin.bi_import\"