r23559 - gnucash/trunk - Guile 1.8 fixes for r23556 and r23557

Geert Janssens gjanssens at code.gnucash.org
Sat Dec 14 11:40:43 EST 2013


Author: gjanssens
Date: 2013-12-14 11:40:42 -0500 (Sat, 14 Dec 2013)
New Revision: 23559
Trac: http://svn.gnucash.org/trac/changeset/23559

Modified:
   gnucash/trunk/configure.ac
   gnucash/trunk/src/app-utils/Makefile.am
   gnucash/trunk/src/app-utils/app-utils.i
   gnucash/trunk/src/core-utils/Makefile.am
   gnucash/trunk/src/core-utils/core-utils.i
   gnucash/trunk/src/engine/Makefile.am
   gnucash/trunk/src/engine/engine.i
   gnucash/trunk/src/gnc-module/Makefile.am
   gnucash/trunk/src/gnc-module/gnc-module.i
   gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
   gnucash/trunk/src/gnc-module/test/mod-bar/bar.i
   gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
   gnucash/trunk/src/gnc-module/test/mod-baz/baz.i
   gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
   gnucash/trunk/src/gnc-module/test/mod-foo/foo.i
   gnucash/trunk/src/gnome-utils/Makefile.am
   gnucash/trunk/src/gnome-utils/gnome-utils.i
   gnucash/trunk/src/gnome/Makefile.am
   gnucash/trunk/src/gnome/gnome.i
   gnucash/trunk/src/html/Makefile.am
   gnucash/trunk/src/html/gnc-html.i
   gnucash/trunk/src/report/report-gnome/Makefile.am
   gnucash/trunk/src/report/report-gnome/report-gnome.i
   gnucash/trunk/src/report/report-system/Makefile.am
   gnucash/trunk/src/report/report-system/report-system.i
   gnucash/trunk/src/test-core/Makefile.am
   gnucash/trunk/src/test-core/unittest-support.i
Log:
Guile 1.8 fixes for r23556 and r23557

- guile 1.8 doesn't need the swig patch
- make sure all swig interface files include guile-mappings.h
  for the *utf8_string to *locale_string mappings
  but only load it when building guile modules

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/configure.ac	2013-12-14 16:40:42 UTC (rev 23559)
@@ -448,6 +448,7 @@
 #       So the tests below will check for known macro names in the order
 #       that we assume will always result in the proper macros being called
 #       for the guile version that has been detected.
+gnc_have_guile_2=no
 gnc_have_guile_www=no
 PKG_CHECK_MODULES(GUILE,
                   [guile-1.8 >= 1.8.5],
@@ -461,6 +462,7 @@
                   [guile-2.0 >= 2.0.0],
                   [m4_ifdef([GUILE_PROGS],
                             [ GUILE_PROGS
+                              gnc_have_guile_2=yes
                               GUILE_MODULE_AVAILABLE(gnc_have_guile_www,[(www main)]) ],
                             [ AC_MSG_ERROR([ guile 2 is found on your system, but appears
     to export different autoconf macros than what we expected. Please report this as a bug
@@ -473,6 +475,7 @@
   ])])
 ])
 
+AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "${gnc_have_guile_2}" = yes)
 AM_CONDITIONAL(GNC_HAVE_GUILE_WWW, test "${gnc_have_guile_www}" = yes)
 
 ### --------------------------------------------------------------------------

Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/app-utils/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -108,10 +108,12 @@
 if BUILDING_FROM_SCM
 swig-app-utils-guile.c: app-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<; \
+	-I${top_srcdir}/src -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
+endif
 swig-app-utils-python.c: app-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -python -Wall -Werror $(SWIG_ARGS) \
 	-I${top_srcdir}/src -o $@ $<

Modified: gnucash/trunk/src/app-utils/app-utils.i
===================================================================
--- gnucash/trunk/src/app-utils/app-utils.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/app-utils/app-utils.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -3,7 +3,6 @@
 /* Includes the header in the wrapper code */
 #include <config.h>
 #include <option-util.h>
-#include <guile-mappings.h>
 #include <gnc-euro.h>
 #include <gnc-exp-parser.h>
 #include <gnc-ui-util.h>
@@ -21,6 +20,8 @@
 
 #if defined(SWIGGUILE)
 %{
+#include "guile-mappings.h"
+
 SCM scm_init_sw_app_utils_module (void);
 %}
 #endif

Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/core-utils/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -45,10 +45,12 @@
 if BUILDING_FROM_SCM
 swig-core-utils-guile.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<; \
+	-I${top_srcdir}/src -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
+endif
 swig-core-utils-python.c: core-utils.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -python -Wall -Werror $(SWIG_ARGS) \
 	-I${top_srcdir}/src -o $@ $<

Modified: gnucash/trunk/src/core-utils/core-utils.i
===================================================================
--- gnucash/trunk/src/core-utils/core-utils.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/core-utils/core-utils.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -12,7 +12,8 @@
 %}
 #if defined(SWIGGUILE)
 %{
-#include <guile-mappings.h>
+#include "guile-mappings.h"
+
 SCM scm_init_sw_core_utils_module (void);
 %}
 #endif

Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/engine/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -204,11 +204,13 @@
                $(QOFHEADERS) \
                $(gncinclude_HEADERS) $(noinst_HEADERS)
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src/libqof/qof -I${top_srcdir}/src -o $@ $<; \
+	-I${top_srcdir}/src/libqof/qof -I${top_srcdir}/src -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
 endif
+endif
 
 iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
 	-chmod u+x ./iso-currencies-to-c

Modified: gnucash/trunk/src/engine/engine.i
===================================================================
--- gnucash/trunk/src/engine/engine.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/engine/engine.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -5,7 +5,6 @@
 #include <glib.h>
 #include "qof.h"
 #include "Query.h"
-#include "guile-mappings.h"
 #include "gnc-budget.h"
 #include "gnc-commodity.h"
 #include "gnc-engine.h"
@@ -31,9 +30,14 @@
 #include "gncTaxTable.h"
 #include "gncVendor.h"
 #include "gncBusGuile.h"
+%}
+#if defined(SWIGGUILE)
+%{
+#include "guile-mappings.h"
 
 SCM scm_init_sw_engine_module (void);
 %}
+#endif
 
 %import "base-typemaps.i"
 

Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnc-module/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -32,11 +32,13 @@
 if BUILDING_FROM_SCM
 swig-gnc-module.c: gnc-module.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<; \
+	-I${top_srcdir}/src -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
 endif
+endif
 
 EXTRA_DIST = \
   ${gncmod_DATA} \

Modified: gnucash/trunk/src/gnc-module/gnc-module.i
===================================================================
--- gnucash/trunk/src/gnc-module/gnc-module.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnc-module/gnc-module.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -1,9 +1,14 @@
 %module sw_gnc_module
 %{
 #include <gnc-module.h>
+%}
+#if defined(SWIGGUILE)
+%{
+#include "guile-mappings.h"
 
 SCM scm_init_sw_gnc_module_module (void);
 %}
+#endif
 
 %import "base-typemaps.i"
 

Modified: gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -24,11 +24,13 @@
 
 if BUILDING_FROM_SCM
 swig-bar.c: bar.i
-	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<; \
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
 endif
+endif
 
 EXTRA_DIST = \
   bar.i \

Modified: gnucash/trunk/src/gnc-module/test/mod-bar/bar.i
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-bar/bar.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnc-module/test/mod-bar/bar.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -1,8 +1,13 @@
 %module sw_bar
 %{
 #include <bar.h>
+%}
+#if defined(SWIGGUILE)
+%{
+#include "guile-mappings.h"
 
 SCM scm_init_sw_bar_module (void);
 %}
+#endif
 
 int bar_hello(void);

Modified: gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -28,11 +28,13 @@
 
 if BUILDING_FROM_SCM
 swig-baz.c: baz.i
-	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<; \
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
 endif
+endif
 
 EXTRA_DIST = \
   baz.i \

Modified: gnucash/trunk/src/gnc-module/test/mod-baz/baz.i
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-baz/baz.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnc-module/test/mod-baz/baz.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -1,8 +1,13 @@
 %module sw_baz
 %{
 #include <baz.h>
+%}
+#if defined(SWIGGUILE)
+%{
+#include "guile-mappings.h"
 
 SCM scm_init_sw_baz_module (void);
 %}
+#endif
 
 int baz_hello(void);

Modified: gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -29,11 +29,13 @@
 
 if BUILDING_FROM_SCM
 swig-foo.c: foo.i
-	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<; \
+	$(SWIG) -guile $(SWIG_ARGS) -Linkage module -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
 endif
+endif
 
 BUILT_SOURCES = swig-foo.c
 MAINTAINERCLEANFILES = swig-foo.c

Modified: gnucash/trunk/src/gnc-module/test/mod-foo/foo.i
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-foo/foo.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnc-module/test/mod-foo/foo.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -1,8 +1,13 @@
 %module sw_foo
 %{
 #include <foo.h>
+%}
+#if defined(SWIGGUILE)
+%{
+#include "guile-mappings.h"
 
 SCM scm_init_sw_foo_module (void);
 %}
+#endif
 
 int foo_hello(void);

Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnome/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -114,11 +114,13 @@
 if BUILDING_FROM_SCM
 swig-gnome.c: gnome.i dialog-progress.h ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<; \
+	-I${top_srcdir}/src -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
 endif
+endif
 
 EXTRA_DIST = \
   gnome.i \

Modified: gnucash/trunk/src/gnome/gnome.i
===================================================================
--- gnucash/trunk/src/gnome/gnome.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnome/gnome.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -4,10 +4,14 @@
 #include <config.h>
 #include <gtk/gtk.h>
 #include <dialog-progress.h>
+%}
+#if defined(SWIGGUILE)
+%{
 #include "guile-mappings.h"
 
 SCM scm_init_sw_gnome_module (void);
 %}
+#endif
 
 %import "base-typemaps.i"
 

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -227,11 +227,13 @@
 swig-gnome-utils.c: gnome-utils.i \
                     ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<; \
+	-I${top_srcdir}/src -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
 endif
+endif
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = gnome-utils.scm 

Modified: gnucash/trunk/src/gnome-utils/gnome-utils.i
===================================================================
--- gnucash/trunk/src/gnome-utils/gnome-utils.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/gnome-utils/gnome-utils.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -18,9 +18,14 @@
 #include <gnc-ui.h>
 #include <gnc-splash.h>
 #include <dialog-tax-table.h>
+%}
+#if defined(SWIGGUILE)
+%{
+#include "guile-mappings.h"
 
 SCM scm_init_sw_gnome_utils_module (void);
 %}
+#endif
 
 %import "base-typemaps.i"
 

Modified: gnucash/trunk/src/html/Makefile.am
===================================================================
--- gnucash/trunk/src/html/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/html/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -58,11 +58,13 @@
 swig-gnc-html.c: gnc-html.i gnc-html.h \
                     ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<; \
+	-I${top_srcdir}/src -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
 endif
+endif
 
 EXTRA_DIST = \
   gnc-html.i

Modified: gnucash/trunk/src/html/gnc-html.i
===================================================================
--- gnucash/trunk/src/html/gnc-html.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/html/gnc-html.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -12,9 +12,14 @@
 #include <gnc-gnome-utils.h>
 #include <gnc-gui-query.h>
 #include <gnc-html.h>
+%}
+#if defined(SWIGGUILE)
+%{
+#include "guile-mappings.h"
 
 SCM scm_init_sw_gnc_html_module(void);
 %}
+#endif
 
 %import "base-typemaps.i"
 

Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -52,11 +52,13 @@
 if BUILDING_FROM_SCM
 swig-report-gnome.c: report-gnome.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<; \
+	-I${top_srcdir}/src -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
 endif
+endif
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
 gncmod_DATA = report-gnome.scm

Modified: gnucash/trunk/src/report/report-gnome/report-gnome.i
===================================================================
--- gnucash/trunk/src/report/report-gnome/report-gnome.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/report/report-gnome/report-gnome.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -7,9 +7,14 @@
 #include <gnc-plugin-page-report.h>
 #include <window-report.h>
 #include <dialog-custom-report.h>
+%}
+#if defined(SWIGGUILE)
+%{
+#include "guile-mappings.h"
 
 SCM scm_init_sw_report_gnome_module (void);
 %}
+#endif
 
 %import "base-typemaps.i"
 

Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/report/report-system/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -24,11 +24,13 @@
 if BUILDING_FROM_SCM
 swig-report-system.c: report-system.i ${top_srcdir}/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
-	-I${top_srcdir}/src -o $@ $<; \
+	-I${top_srcdir}/src -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
 endif
+endif
 
 AM_CPPFLAGS = \
   -I${top_srcdir}/src \

Modified: gnucash/trunk/src/report/report-system/report-system.i
===================================================================
--- gnucash/trunk/src/report/report-system/report-system.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/report/report-system/report-system.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -3,10 +3,14 @@
 /* Includes the header in the wrapper code */
 #include <config.h>
 #include <gnc-report.h>
-#include <guile-mappings.h>
+%}
+#if defined(SWIGGUILE)
+%{
+#include "guile-mappings.h"
 
 SCM scm_init_sw_report_system_module (void);
 %}
+#endif
 
 %import "base-typemaps.i"
 

Modified: gnucash/trunk/src/test-core/Makefile.am
===================================================================
--- gnucash/trunk/src/test-core/Makefile.am	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/test-core/Makefile.am	2013-12-14 16:40:42 UTC (rev 23559)
@@ -27,10 +27,12 @@
 swig-unittest-support-guile.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i
 	$(SWIG) -guile $(SWIG_ARGS) -Linkage module \
 	-I${top_srcdir}/src \
-	${AM_CPPFLAGS} -o $@ $<; \
+	${AM_CPPFLAGS} -o $@ $<
+if GNC_HAVE_GUILE_2
 	if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
 	  patch $@ $(top_srcdir)/src/swig-utf8.patch; \
 	fi
+endif
 
 swig-unittest-support-python.c: unittest-support.i $(top_srcdir)/src/base-typemaps.i
 	$(SWIG) -python  -Wall -Werror $(SWIG_ARGS) \

Modified: gnucash/trunk/src/test-core/unittest-support.i
===================================================================
--- gnucash/trunk/src/test-core/unittest-support.i	2013-12-13 21:46:17 UTC (rev 23558)
+++ gnucash/trunk/src/test-core/unittest-support.i	2013-12-14 16:40:42 UTC (rev 23559)
@@ -6,6 +6,8 @@
 
 #if defined(SWIGGUILE)
 %{
+#include "guile-mappings.h"
+
 SCM scm_init_unittest_support_module (void);
 %}
 #endif



More information about the gnucash-changes mailing list