From 4a7ec55544f1d6ca7ce493d59a021bae9c8d0eb2 Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Tue, 20 May 2003 23:48:48 +0000 Subject: [PATCH] * acinclude.m4: modify the AC_GWRAP_CHECK_GUILE() macro to take an argument, the g-wrap module directory. Then actually test that the g-wrap module loads. This should detect systems without slib installed. * configure.in: all the new gwrap check macro Fixes #113218 git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/1.8@8352 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 9 +++++++++ acinclude.m4 | 8 ++++++++ configure.in | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f616c9f306..b81d02919a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-05-20 Derek Atkins + + * acinclude.m4: modify the AC_GWRAP_CHECK_GUILE() macro to + take an argument, the g-wrap module directory. Then actually + test that the g-wrap module loads. This should detect systems + without slib installed. + * configure.in: all the new gwrap check macro + Fixes #113218 + 2003-05-19 Derek Atkins * src/engine/QueryNew.[ch]: add gncQueryGetBooks() API to return diff --git a/acinclude.m4 b/acinclude.m4 index c221b7394d..458635c51f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3935,6 +3935,14 @@ AC_DEFUN(AC_GWRAP_CHECK_GUILE, if test "${GUILE}" = "no" ; then AC_MSG_ERROR(g-wrap couldn't find guile.) fi + AC_MSG_CHECKING(if g-wrap works) + $GUILE -c "(set! %load-path (cons \"$1\" %load-path)) (use-modules (g-wrap))" + status=$? + if test $status != 0 ; then + AC_MSG_ERROR([g-wrap could not run. Perhaps missing slib?]) + else + AC_MSG_RESULT(yes) + fi ]) dnl AM_PATH_GWRAP ([MINIMUM-VERSION, MAXIMUM-VERSION, [ACTION-IF-FOUND. diff --git a/configure.in b/configure.in index 67d47f937e..8aadf385d1 100644 --- a/configure.in +++ b/configure.in @@ -183,7 +183,7 @@ G_WRAP_MODULE_DIR=`${G_WRAP_CONFIG} --guile-module-directory` G_WRAP_LIB_DIR=`echo $G_WRAP_MODULE_DIR | sed -e 's|share/guile|lib|'` AC_MSG_RESULT($G_WRAP_MODULE_DIR) -AC_GWRAP_CHECK_GUILE +AC_GWRAP_CHECK_GUILE($G_WRAP_MODULE_DIR) AC_SUBST(G_WRAP_CONFIG) AC_SUBST(G_WRAP_COMPILE_ARGS)