Skip to content

Commit b909b67

Browse files
committed
Drop prereq checking
It's safe to assume openssl and cgi are present.
1 parent 34cc30f commit b909b67

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

install.rb

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838

3939
IS_WINDOWS = RUBY_PLATFORM.match?(/(mswin|mingw)/)
4040

41-
PREREQS = %w{openssl cgi}
42-
4341
InstallOptions = OpenStruct.new
4442

4543
def glob(list)
@@ -98,24 +96,11 @@ def do_locales(locale, strip = 'locales/')
9896
end
9997
end
10098

101-
# Verify that all of the prereqs are installed
102-
def check_prereqs
103-
PREREQS.each { |pre|
104-
begin
105-
require pre
106-
rescue LoadError
107-
puts "Could not load #{pre}; cannot install"
108-
exit(-1)
109-
end
110-
}
111-
end
112-
11399
##
114100
# Prepare the file installation.
115101
#
116102
def prepare_installation
117103
InstallOptions.configs = true
118-
InstallOptions.check_prereqs = true
119104
InstallOptions.batch_files = true
120105

121106
ARGV.options do |opts|
@@ -160,9 +145,6 @@ def prepare_installation
160145
opts.on('--mandir[=OPTIONAL]', 'Installation directory for man pages', 'overrides RbConfig::CONFIG["mandir"]') do |mandir|
161146
InstallOptions.mandir = mandir
162147
end
163-
opts.on('--[no-]check-prereqs', 'Prevents validation of prerequisite libraries', 'Default on') do |prereq|
164-
InstallOptions.check_prereqs = prereq
165-
end
166148
opts.on('--no-batch-files', 'Prevents installation of batch files for windows', 'Default off') do |batch_files|
167149
InstallOptions.batch_files = false
168150
end

0 commit comments

Comments
 (0)