1 files changed, 10 insertions, 3 deletions
diff --git a/scripts/context/ruby/base/kpse.rb b/scripts/context/ruby/base/kpse.rb
index 7a7964127..adeaacbe1 100644
--- a/scripts/context/ruby/base/kpse.rb
+++ b/scripts/context/ruby/base/kpse.rb
@@ -38,9 +38,12 @@ module Kpse
         @@distribution = 'miktex' unless $1 =~ /(texmf\-mswin[\/\\]bin|bin[\/\\]win32)/i
     end
 
-    @@usekpserunner = false || ENV['KPSEFAST'] == 'yes'
-
-    require 'base/tool' if @@usekpserunner
+    if ENV['KPSEFAST'] == 'no' then
+        @@usekpserunner = false
+    else
+        @@usekpserunner = true
+        require 'base/kpsefast'
+    end
 
     if @@crossover then
         ENV.keys.each do |k|
@@ -287,6 +290,10 @@ module Kpse
         `#{cmd}`
     end
 
+    def Kpse.searchmethod
+        if @@usekpserunner then 'kpsefast' else 'kpsewhich' end
+    end
+
     private
 
     def Kpse.setvariable(key,value)