Updated build system for recent Esmart pkg-config changes.

diff --git a/Rakefile b/Rakefile
index 4dd7571d9d0d9f2eaf5a6769adbf09d428f51441..cc2f2f778cc91d322193900ece7226d144eedce9 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -25,8 +25,9 @@ module_tasks = modules.map { |mod| "ext_#{mod}".to_sym }
 task :default => module_tasks
 
 config = Rake::ConfigureTask.new do |t|
-       t.tests << Rake::ConfigureTask::
-                  PkgConfigTest.new("esmart", :is_critical => true)
+       modules[1..-1].each do |mod|
+               t.tests << Rake::ConfigureTask::PkgConfigTest.new(mod.to_s)
+       end
 end
 
 module_tasks.each do |mt|
@@ -45,12 +46,14 @@ modules.each_with_index do |mod, i|
 end
 
 task :pre_ext => [:configure] do
-       exts.values.each do |e|
-               e.link_libs << config.esmart.libs
+       exts.each do |(key, e)|
+               next if key == :esmart
+
+               e.link_libs << config[key.to_s].libs
 
                cflags = [
                        e.env[:cflags],
-                       config.esmart.cflags
+                       config[key.to_s].cflags
                ]
 
                e.env.update(:cflags => cflags)