Guile 2.0.6

[Dale Smith]

Howdy g-wrappers,

G-wrap doesn't like the new Guile 2.0.6 as scm_sym2var and
scm_module_lookup_closure are now deprecated.  And since the default
is to compile with -Werror, that ends in a failed build.  Configuring
with --disable-Werror seems to work fine.

Here is an attempt to use a the newer non-deprecated replacements.

diff --git a/guile/g-wrap/guile-compatibility.c
b/guile/g-wrap/guile-compatibility.c
index 8be423e..cc1fc2f 100644
--- a/guile/g-wrap/guile-compatibility.c
+++ b/guile/g-wrap/guile-compatibility.c
@@ -92,4 +92,10 @@ scm_without_guile (void*(*func)(void*), void *data)
     return func(data);
 }

+SCM scm_module_variable (SCM module, SCM sym)
+{
+  return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F);
+}
+
+
 #endif
diff --git a/guile/g-wrap/guile-compatibility.h
b/guile/g-wrap/guile-compatibility.h
index c875e98..5ccacdf 100644
--- a/guile/g-wrap/guile-compatibility.h
+++ b/guile/g-wrap/guile-compatibility.h
@@ -127,6 +127,9 @@ size_t  scm_to_locale_stringbuf (SCM str, char
*buf, size_t buf_size);
 /* Threads. */
 void *scm_without_guile (void*(*func)(void*), void *data);

+/* Modules. */
+SCM scm_module_variable (SCM module, SCM sym);
+
 ^L
 #else /* SCM_VERSION_17X */

diff --git a/guile/g-wrap/guile-runtime.c b/guile/g-wrap/guile-runtime.c
index a1a4f79..d04e17e 100644
--- a/guile/g-wrap/guile-runtime.c
+++ b/guile/g-wrap/guile-runtime.c
@@ -343,7 +343,7 @@ allocate_generic_variable (SCM module, SCM sym)

   for (uses=SCM_MODULE_USES(module); !scm_is_null (uses); uses=scm_cdr(uses)) {
     used = scm_car (uses);
-    var = scm_sym2var (sym, scm_module_lookup_closure (used), SCM_BOOL_F);
+    var = scm_module_variable (used, sym);
     if (!scm_is_false (var))
       break;
   }