Rooted LastPM integration

3 files changed, 14 insertions, 2 deletions

diff --git a/Rakefile b/Rakefile
index 70139f4..e92dbb2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,12 +13,23 @@ namespace "fminer" do
 		puts `git pull`
 		puts `./configure`
         if $? == 0
-            puts `echo "Fminer successfully configured."`
+            puts `echo "Fminer/LibBbrc successfully configured."`
         else
-            puts `echo "Fminer configuration failed!"`
+            puts `echo "Fminer/LibBbrc configuration failed!"`
             exit
         end
         puts `make ruby`
+        Dir.chdir('../liblast')
+        puts `git checkout master`
+        puts `git pull`
+        puts `./configure`
+        if $? == 0
+          puts `echo "Fminer/LibLast successfully configured."`
+        else
+          puts `echo "Fminer/LibLast configuration failed!"`
+          exit
+        end
+        puts `make ruby`
 	    end
 
 	desc "Update gems and fminer"
diff --git a/application.rb b/application.rb
index c0363d5..6eb65e5 100644
--- a/application.rb
+++ b/application.rb
@@ -1,5 +1,6 @@
 require 'rubygems'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'libfminer/libbbrc/bbrc') # has to be included before openbabel, otherwise we have strange SWIG overloading problems
+require File.join(File.expand_path(File.dirname(__FILE__)), 'libfminer/liblast/last') # has to be included before openbabel, otherwise we have strange SWIG overloading problems
 gem "opentox-ruby-api-wrapper", "= 1.6.5"
 require 'opentox-ruby-api-wrapper'
 
diff --git a/libfminer b/libfminer
-Subproject 2c2b5177a8764d155fab2e12ce63457776f45d5
+Subproject e955cc6b24d577d7187e5660716ee69d12174a8