Skip to content

Commit c67a8fb

Browse files
committed
Look for g-wrap's (g-wrap gw standard) or (g-wrap gw-standard) since
g-wrap 1.9.6 doesn't have (g-wrap runtime). git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14024 57a11ea4-9604-0410-9ed3-97b8803252fd
1 parent d4bd374 commit c67a8fb

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

configure.in

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -304,19 +304,29 @@ AC_SUBST(G_WRAP_LIB_DIR)
304304

305305
AS_SCRUB_INCLUDE(CFLAGS)
306306

307-
AC_MSG_CHECKING([for (g-wrap runtime) guile module])
308-
if GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
309-
${GUILE} -c "(use-modules (g-wrap runtime))" > /dev/null 2>&1
307+
AC_MSG_CHECKING([for (g-wrap gw-standard) guile module])
308+
if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
309+
GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
310+
${GUILE} -c "(use-modules (g-wrap gw-standard))" > /dev/null 2>&1
310311
then
311312
AC_MSG_RESULT(yes)
312313
else
313314
AC_MSG_RESULT(no)
314-
AC_MSG_WARN([
315+
AC_MSG_CHECKING([for (g-wrap gw standard) guile module])
316+
if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
317+
GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
318+
${GUILE} -c "(use-modules (g-wrap gw standard))" > /dev/null 2>&1
319+
then
320+
AC_MSG_RESULT(yes)
321+
else
322+
AC_MSG_RESULT(no)
323+
AC_MSG_WARN([
315324
316-
Unable to find the g-wrap runtime module, a.k.a. guile-g-wrap.
325+
Unable to find the g-wrap standard module, a.k.a. guile-g-wrap.
317326
You won't be able to run GnuCash without it!
318327
319-
])
328+
])
329+
fi
320330
fi
321331

322332
### Check size of long_long - some guile's are broken.

0 commit comments

Comments
 (0)