Navigation Menu

Skip to content

Commit

Permalink
Do not check for fastthread as required dependency when running in Ru…
Browse files Browse the repository at this point in the history
…by 1.9.
  • Loading branch information
FooBarWidget committed Feb 18, 2009
1 parent 796b98b commit 29f1592
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 4 additions & 2 deletions bin/passenger-install-apache2-module
Expand Up @@ -46,9 +46,11 @@ class Installer
Dependencies::RubyGems,
Dependencies::Rake,
Dependencies::Apache2,
Dependencies::Apache2_DevHeaders,
Dependencies::FastThread
Dependencies::Apache2_DevHeaders
]
if Dependencies.fastthread_required?
REQUIRED_DEPENDENCIES << Dependencies::FastThread
end
# Some broken servers don't have apr-config or apu-config installed.
# Nevertheless, it is possible to compile Apache modules if Apache
# was configured with --included-apr. So here we check whether
Expand Down
6 changes: 6 additions & 0 deletions lib/phusion_passenger/dependencies.rb
Expand Up @@ -90,6 +90,12 @@ def call_init_block
# Namespace which contains the different dependencies that Passenger may require.
# See Dependency for more information.
module Dependencies # :nodoc: all
# Returns whether fastthread is a required dependency for the current
# Ruby interpreter.
def self.fastthread_required?
return (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7"
end

GCC = Dependency.new do |dep|
dep.name = "GNU C++ compiler"
dep.define_checker do |result|
Expand Down

0 comments on commit 29f1592

Please sign in to comment.