From c67a8fb82f0f48c2b2cb4e3e6dbcdcc8361882e1 Mon Sep 17 00:00:00 2001
From: Chris Shoemaker <c.shoemaker@cox.net>
Date: Thu, 11 May 2006 22:25:55 +0000
Subject: [PATCH]    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
---
 configure.in | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index 458805fd96..ce2512d954 100644
--- a/configure.in
+++ b/configure.in
@@ -304,19 +304,29 @@ AC_SUBST(G_WRAP_LIB_DIR)
 
 AS_SCRUB_INCLUDE(CFLAGS)
 
-AC_MSG_CHECKING([for (g-wrap runtime) guile module])
-if GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
-        ${GUILE} -c "(use-modules (g-wrap runtime))" > /dev/null 2>&1
+AC_MSG_CHECKING([for (g-wrap gw-standard) guile module])
+if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
+  GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
+        ${GUILE} -c "(use-modules (g-wrap gw-standard))" > /dev/null 2>&1
 then
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
-  AC_MSG_WARN([
+  AC_MSG_CHECKING([for (g-wrap gw standard) guile module])
+  if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
+    GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
+        ${GUILE} -c "(use-modules (g-wrap gw standard))" > /dev/null 2>&1
+  then
+    AC_MSG_RESULT(yes)
+  else
+    AC_MSG_RESULT(no)
+    AC_MSG_WARN([
 
-    Unable to find the g-wrap runtime module, a.k.a. guile-g-wrap. 
+    Unable to find the g-wrap standard module, a.k.a. guile-g-wrap. 
     You won't be able to run GnuCash without it!
 
-  ])
+    ])
+  fi
 fi
 
 ### Check size of long_long - some guile's are broken.