[PATCH] Assorted guile-related build fixes

2011-05-13 Thread Bill Nottingham 
I was doing some testing with guile-2.0 and GnuCash, and encountered
the need for the following fixes to make it build.

(Note: it still doesn't *work*, but it at least builds for further
testing.)

Total changes:
 configure.ac|   14 --
 src/import-export/aqbanking/Makefile.am |1 +
 src/plugins/bi_import/Makefile.am   |1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

___
gnucash-devel mailing list
gnucash-devel@gnucash.org
https://lists.gnucash.org/mailman/listinfo/gnucash-devel

[PATCH 1/3] Set GUILE_INCS as an output variable.

2011-05-13 Thread Bill Nottingham 
---
 configure.ac |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8a0f501..25a5dbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -388,6 +388,7 @@ if test x$saved_GUILE_INCS != x; then
 fi
 
 AS_SCRUB_INCLUDE(GUILE_INCS)
+AC_SUBST(GUILE_INCS)
 AC_SUBST(GUILE_LIBS)
 AC_SUBST(GUILE)
 
-- 
1.7.5.1

___
gnucash-devel mailing list
gnucash-devel@gnucash.org
https://lists.gnucash.org/mailman/listinfo/gnucash-devel

[PATCH 2/3] Add GUILE_INCS to CFLAGS where necessary.

2011-05-13 Thread Bill Nottingham 
---
 src/import-export/aqbanking/Makefile.am |1 +
 src/plugins/bi_import/Makefile.am   |1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/import-export/aqbanking/Makefile.am 
b/src/import-export/aqbanking/Makefile.am
index 82a0403..36764f9 100644
--- a/src/import-export/aqbanking/Makefile.am
+++ b/src/import-export/aqbanking/Makefile.am
@@ -64,6 +64,7 @@ AM_CFLAGS = \
   ${GNOME_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GLIB_CFLAGS} \
+  ${GUILE_CFLAGS} \
   ${AQBANKING_CFLAGS}
 
 uidir = $(GNC_UI_DIR)
diff --git a/src/plugins/bi_import/Makefile.am 
b/src/plugins/bi_import/Makefile.am
index 9d02a6d..09411f1 100644
--- a/src/plugins/bi_import/Makefile.am
+++ b/src/plugins/bi_import/Makefile.am
@@ -51,6 +51,7 @@ AM_CFLAGS = \
   -I${top_srcdir}/lib/libc \
   ${GNOME_CFLAGS} \
   ${GLADE_CFLAGS} \
+  ${GUILE_CFLAGS} \
   ${QOF_CFLAGS} \
   ${GLIB_CFLAGS}
 
-- 
1.7.5.1

___
gnucash-devel mailing list
gnucash-devel@gnucash.org
https://lists.gnucash.org/mailman/listinfo/gnucash-devel

[PATCH 3/3] Check for guile-2.0 as well as guile-1.8.

2011-05-13 Thread Bill Nottingham 
---
 configure.ac |   13 +++--
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 25a5dbf..6d569e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,12 +370,13 @@ fi
 GUILE_LIBS=
 
 # Look up GUILE_CFLAGS and GUILE_LIBS, and version check
-PKG_CHECK_MODULES(GUILE, [guile-1.8 = 1.8.5], , [AC_MSG_ERROR([
-
-  guile does not appear to be installed correctly, or is not in the
-  correct version range.  Perhaps you have not installed the guile
-  development packages?  Gnucash requires at least version 1.8.5 to build.
-])])
+PKG_CHECK_MODULES(GUILE, [guile-1.8 = 1.8.5], , [
+  PKG_CHECK_MODULES(GUILE, [guile-2.0 = 2.0.0], , [AC_MSG_ERROR([
+guile does not appear to be installed correctly, or is not in the
+correct version range.  Perhaps you have not installed the guile
+development packages?  Gnucash requires at least version 1.8.5 to build.
+  ])])
+])
 # Look up GUILE executable
 AC_PATH_PROG(GUILE, guile)
 
-- 
1.7.5.1

___
gnucash-devel mailing list
gnucash-devel@gnucash.org
https://lists.gnucash.org/mailman/listinfo/gnucash-devel

Re: [PATCH 2/3] Add GUILE_INCS to CFLAGS where necessary.

2011-05-13 Thread Bill Nottingham 
Bill Nottingham (nott...@redhat.com) said: 
 ---
  src/import-export/aqbanking/Makefile.am |1 +
  src/plugins/bi_import/Makefile.am   |1 +
  2 files changed, 2 insertions(+), 0 deletions(-)
 
 diff --git a/src/import-export/aqbanking/Makefile.am 
 b/src/import-export/aqbanking/Makefile.am
 index 82a0403..36764f9 100644
 --- a/src/import-export/aqbanking/Makefile.am
 +++ b/src/import-export/aqbanking/Makefile.am
 @@ -64,6 +64,7 @@ AM_CFLAGS = \
${GNOME_CFLAGS} \
${GLADE_CFLAGS} \
${GLIB_CFLAGS} \
 +  ${GUILE_CFLAGS} \
${AQBANKING_CFLAGS}

So, reading this I see my commit message refers to GUILE_INCS, and
the patch refers to GUILE_CFLAGS. 

These appear to be used somewhat interchangeably throughout the buildsystem;
they evaluate the same in any case.

Bill
___
gnucash-devel mailing list
gnucash-devel@gnucash.org
https://lists.gnucash.org/mailman/listinfo/gnucash-devel