--- a/gub/specs/guile.py	Thu Feb 03 08:37:35 2011 +0100
+++ b/gub/specs/guile.py	Thu Feb 03 12:58:34 2011 +0100
@@ -12,7 +12,7 @@
 class Guile (target.AutoBuild):
     # source = 'git://git.sv.gnu.org/guile.git&branch=branch_release-1-8&revision=bba579611b3671c7e4c1515b100f01c048a07935'
     source = 'http://ftp.gnu.org/pub/gnu/guile/guile-1.8.7.tar.gz'
-    source = 'http://alpha.gnu.org/gnu/guile/guile-1.9.14.tar.gz'
+    source = 'http://alpha.gnu.org/gnu/guile/guile-1.9.15.tar.gz'
     patches = [
         #'guile-reloc-1.8.6.patch',
         'guile-1.9.14-reloc.patch',
@@ -34,6 +34,7 @@
         'libgc',
         'tools::guile',
         'tools::gnulib',
+        'tools::pkg-config',
         ]
     guile_configure_flags = misc.join_lines ('''
 --without-threads

--- a/gub/tools.py	Thu Feb 03 08:37:35 2011 +0100
+++ b/gub/tools.py	Thu Feb 03 12:58:34 2011 +0100
@@ -15,14 +15,25 @@
 
 # tools packages, such as guile 2.0, that can only compile
 # to equivalent binary platforms: endianness and word length
-tools_archmatch = [] #'guile', 'tools::guile']
-libs_archmatch = [] #'gettext', 'gmp', 'guile', 'libtool', 'libunistring', 'libgc']
-
+tools_archmatch = [
+    'guile',
+    'tools::guile'
+    ]
+libs_archmatch = [
+    'gettext',
+    'gmp',
+    'guile',
+    'libffi',
+    'libtool',
+    'libunistring',
+    'libgc',
+    'pkg-config'
+    ]
 
 def package_auto_dependency_dict (package):
     '''Generate get_build_dependencies () and get_dependency_dict ({'':})
     from _get_build_dependencies ().
-    
+
     For most packages, this either removes the need of having both,
     or adds the dict where it was missing.
     '''
@@ -248,7 +259,7 @@
         self.system ('tar -C %(srcdir)s -cf- . | tar -C %(install_root)s%(_v)s -p -xf-', env=locals ())
         self.libtool_installed_la_fixups ()
     subpackage_names = ['']
-        
+
 class CpanBuild (AutoBuild):
     def stages (self):
         return [s for s in AutoBuild.stages (self) if s not in ['autoupdate']]