summaryrefslogtreecommitdiff
path: root/ext/tk/extconf.rb
diff options
context:
space:
mode:
Diffstat (limited to 'ext/tk/extconf.rb')
-rw-r--r--ext/tk/extconf.rb82
1 files changed, 41 insertions, 41 deletions
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 388d6fc1aa..c7bc45f150 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -5,7 +5,7 @@
require 'mkmf'
TkLib_Config = {}
-TkLib_Config['search_versions'] =
+TkLib_Config['search_versions'] =
# %w[8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6 4.2]
# %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0]
%w[8.7 8.6 8.5 8.4 8.0] # to shorten search steps
@@ -26,7 +26,7 @@ end
$cleanfiles << 'config_list'
config_list_file = 'config_list'
config_list_file_source = File.join(File.dirname(__FILE__),'config_list.in')
-if !File.exist?(config_list_file) ||
+if !File.exist?(config_list_file) ||
File.ctime(config_list_file_source) > File.ctime(config_list_file)
old_config_list_file = config_list_file_source
else
@@ -92,7 +92,7 @@ if update_flag
else
makefile = 'Makefile'
- if File.exist?(makefile) &&
+ if File.exist?(makefile) &&
File.ctime(config_list_file) > File.ctime(makefile)
# no need to update Makefile
exit
@@ -197,7 +197,7 @@ def get_shlib_path_head
else
[
- '/opt', '/pkg', '/share',
+ '/opt', '/pkg', '/share',
'/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local',
'/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr'
].each{|dir|
@@ -268,7 +268,7 @@ def find_macosx_framework
end
# framework is disabled?
- if with_config("tcltk-framework") == false ||
+ if with_config("tcltk-framework") == false ||
enable_config("tcltk-framework") == false
return false
end
@@ -276,7 +276,7 @@ def find_macosx_framework
use_framework ||= (framework_dir = with_config("tcltk-framework"))
if framework_dir.kind_of? String
TkLib_Config["tcltk-framework"] = framework_dir.strip.chomp('/')
- return [File.join(TkLib_Config["tcltk-framework"], 'Tcl.framework'),
+ return [File.join(TkLib_Config["tcltk-framework"], 'Tcl.framework'),
File.join(TkLib_Config["tcltk-framework"], 'Tk.framework')]
end
@@ -287,7 +287,7 @@ def find_macosx_framework
end
paths = [
- #"~/Library/Frameworks",
+ #"~/Library/Frameworks",
"/Library/Frameworks",
"/Network/Library/Frameworks", "/System/Library/Frameworks"
]
@@ -305,7 +305,7 @@ end
def collect_tcltk_defs(tcl_defs_str, tk_defs_str)
conflicts = [
- 'PACKAGE_NAME', 'PACKAGE_TARNAME', 'PACKAGE_VERSION',
+ 'PACKAGE_NAME', 'PACKAGE_TARNAME', 'PACKAGE_VERSION',
'PACKAGE_STRING', 'PACKAGE_BUGREPORT'
]
@@ -347,7 +347,7 @@ def collect_tcltk_defs(tcl_defs_str, tk_defs_str)
defs.delete_if{|name,value|
conflicts.include?(name) ||
- ( (vtcl = tcl_defs.assoc(name)) && (vtk = tk_defs.assoc(name)) &&
+ ( (vtcl = tcl_defs.assoc(name)) && (vtk = tk_defs.assoc(name)) &&
vtcl != vtk )
}
@@ -433,7 +433,7 @@ def get_tclConfig_dirs
File.join(base, 'Tk.framework', 'Versions', 'Current')
]
- Dir.glob(File.join(base, 'Tcl.framework',
+ Dir.glob(File.join(base, 'Tcl.framework',
'Versions', '*')).sort.reverse.each{|dir|
next if dir =~ /Current/
config_dir << [dir, dir.gsub(/Tcl/, 'Tk')]
@@ -446,14 +446,14 @@ def get_tclConfig_dirs
config_dir.concat [
RbConfig::CONFIG['libdir'],
File.join(RbConfig::CONFIG['exec_prefix'], 'lib'),
- File.join(RbConfig::CONFIG['prefix'], 'lib'),
- "/usr/local/opt/lib", "/usr/local/pkg/lib", "/usr/local/share/lib",
- "/usr/local/lib", "/usr/opt/lib", "/usr/pkg/lib",
+ File.join(RbConfig::CONFIG['prefix'], 'lib'),
+ "/usr/local/opt/lib", "/usr/local/pkg/lib", "/usr/local/share/lib",
+ "/usr/local/lib", "/usr/opt/lib", "/usr/pkg/lib",
"/usr/share/lib", "/usr/contrib/lib", "/usr/lib"
]
config_dir.concat [
- '/opt', '/pkg', '/share',
+ '/opt', '/pkg', '/share',
'/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local',
'/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr'
].map{|dir|
@@ -483,7 +483,7 @@ def get_tclConfig_dirs
}
paths = [
- #"~/Library/Frameworks",
+ #"~/Library/Frameworks",
"/Library/Frameworks",
"/Network/Library/Frameworks", "/System/Library/Frameworks"
]
@@ -500,7 +500,7 @@ def get_tclConfig_dirs
File.join(base, 'Tk.framework', 'Versions', 'Current')
]
- Dir.glob(File.join(base, 'Tcl.framework',
+ Dir.glob(File.join(base, 'Tcl.framework',
'Versions', '*')).sort.reverse.each{|dir|
next if dir =~ /Current/
config_dir << [dir, dir.gsub(/Tcl/, 'Tk')]
@@ -702,7 +702,7 @@ def search_tclConfig(*paths) # libdir list or [tcl-libdir|file, tk-libdir|file]
end
def get_tclConfig(tclConfig_file, tkConfig_file, tclConfig_dir, tkConfig_dir)
- use_tclConfig = (tclConfig_file != false) && (tkConfig_file != false) &&
+ use_tclConfig = (tclConfig_file != false) && (tkConfig_file != false) &&
(tclConfig_dir != false) && (tkConfig_dir != false)
unless use_tclConfig
@@ -736,11 +736,11 @@ def get_tclConfig(tclConfig_file, tkConfig_file, tclConfig_dir, tkConfig_dir)
TkLib_Config["tclConfig-dir"] = tclConfig_dir
TkLib_Config["tkConfig-dir"] = tkConfig_dir
- print("Search tclConfig.sh", (tclConfig_dir)? " (in #{tclConfig_dir})": "",
+ print("Search tclConfig.sh", (tclConfig_dir)? " (in #{tclConfig_dir})": "",
" and tkConfig.sh", (tkConfig_dir)? " (in #{tkConfig_dir})": "", ".")
if tclConfig_dir
- tclConfig, tkConfig =
- search_tclConfig([ ((tclConfig_file)? tclConfig_file: tclConfig_dir),
+ tclConfig, tkConfig =
+ search_tclConfig([ ((tclConfig_file)? tclConfig_file: tclConfig_dir),
((tkConfig_file)? tkConfig_file: tkConfig_dir) ])
else
tclConfig, tkConfig = search_tclConfig()
@@ -1057,7 +1057,7 @@ def find_tk(tklib, stubs, version, *opt_paths)
ret
end
-def find_tcltk_library(tcllib, tklib, stubs, tclversion, tkversion,
+def find_tcltk_library(tcllib, tklib, stubs, tclversion, tkversion,
tcl_opt_paths, tk_opt_paths)
ret = find_tcl(tcllib, stubs, tclversion, *tcl_opt_paths)
unless ret && ret.find{|path, val| val}
@@ -1094,7 +1094,7 @@ def find_tcltk_header(tclver, tkver)
base_dir.delete_if{|path| path =~ / /}
end
- if TclConfig_Info['TCL_INCLUDE_SPEC'] &&
+ if TclConfig_Info['TCL_INCLUDE_SPEC'] &&
have_tcl_h = try_cpp('#include <tcl.h>', TclConfig_Info['TCL_INCLUDE_SPEC'])
$INCFLAGS << " " << TclConfig_Info['TCL_INCLUDE_SPEC']
elsif have_tcl_h = have_header('tcl.h')
@@ -1106,7 +1106,7 @@ def find_tcltk_header(tclver, tkver)
versions = TkLib_Config['search_versions']
end
paths = base_dir.dup
- versions.each{|ver|
+ versions.each{|ver|
paths.concat(base_dir.map{|dir|
[dir + '/tcl' + ver, dir + '/tcl' + ver.delete('.')]
}.flatten)
@@ -1114,7 +1114,7 @@ def find_tcltk_header(tclver, tkver)
have_tcl_h = find_header('tcl.h', *paths)
end
- if TkConfig_Info['TK_INCLUDE_SPEC'] &&
+ if TkConfig_Info['TK_INCLUDE_SPEC'] &&
have_tk_h = try_cpp('#include <tk.h>', TkConfig_Info['TK_INCLUDE_SPEC'])
$INCFLAGS << " " << TkConfig_Info['TK_INCLUDE_SPEC']
elsif have_tk_h = have_header('tk.h')
@@ -1126,7 +1126,7 @@ def find_tcltk_header(tclver, tkver)
versions = TkLib_Config['search_versions']
end
paths = base_dir.dup
- versions.each{|ver|
+ versions.each{|ver|
paths.concat(base_dir.map{|dir|
[dir + '/tk' + ver, dir + '/tk' + ver.delete('.')]
}.flatten)
@@ -1158,14 +1158,14 @@ def setup_for_macosx_framework(tclver, tkver)
TclConfig_Info['TCL_INCLUDE_SPEC'] << File.join(tcl_base, 'Headers')
unless tclver
- dir = Dir.glob(File.join(tcl_base, 'Versions', '*', 'Headers'),
+ dir = Dir.glob(File.join(tcl_base, 'Versions', '*', 'Headers'),
File::FNM_CASEFOLD).sort.reverse[0]
TclConfig_Info['TCL_INCLUDE_SPEC'] << "-I#{dir.quote} " if dir
end
end
if TkLib_Config["tk-framework-header"]
- TkConfig_Info['TK_INCLUDE_SPEC'] =
+ TkConfig_Info['TK_INCLUDE_SPEC'] =
"-I#{TkLib_Config["tk-framework-header"].quote} "
else
TkConfig_Info['TK_INCLUDE_SPEC'] = ""
@@ -1179,7 +1179,7 @@ def setup_for_macosx_framework(tclver, tkver)
TkConfig_Info['TK_INCLUDE_SPEC'] << File.join(tk_base, 'Headers')
unless tkver
- dir = Dir.glob(File.join(tk_base, 'Versions', '*', 'Headers'),
+ dir = Dir.glob(File.join(tk_base, 'Versions', '*', 'Headers'),
File::FNM_CASEFOLD).sort.reverse[0]
TkConfig_Info['TK_INCLUDE_SPEC'] << "-I#{dir.quote} " if dir
end
@@ -1288,9 +1288,9 @@ def pthread_check()
**
** NATIVETHREAD SUPPORT CHECK WARNING:
**
-** We cannot check the consistency of nativethread support between
+** We cannot check the consistency of nativethread support between
** Ruby and the Tcl/Tk library in your environment (are you perhaps
-** cross-compiling?). If nativethread support for these 2 packages
+** cross-compiling?). If nativethread support for these 2 packages
** is inconsistent you may find you get errors when running Ruby/Tk
** (e.g. hangs or segmentation faults). We strongly recommend
** you to check the consistency manually.
@@ -1333,17 +1333,17 @@ EOF
**
** NATIVETHREAD SUPPORT MODE WARNING:
**
-** Ruby is compiled with --enable-pthread, but your Tcl/Tk library
-** seems to be compiled without nativethread support. Although you can
-** create the tcltklib library, this combination may cause errors (e.g.
-** hangs or segmentation faults). If you have no reason to keep the
-** current nativethread support status, we recommend you reconfigure and
+** Ruby is compiled with --enable-pthread, but your Tcl/Tk library
+** seems to be compiled without nativethread support. Although you can
+** create the tcltklib library, this combination may cause errors (e.g.
+** hangs or segmentation faults). If you have no reason to keep the
+** current nativethread support status, we recommend you reconfigure and
** recompile the libraries so that both or neither support nativethreads.
**
** If you want change the status of nativethread support, please recompile
** Ruby without "--enable-pthread" configure option (If you use Ruby 1.9.x
** or later, you cannot remove this option, because it requires native-
-** thread support.) or recompile Tcl/Tk with "--enable-threads" configure
+** thread support.) or recompile Tcl/Tk with "--enable-threads" configure
** option (if your Tcl/Tk is later than or equal to Tcl/Tk 8.1).
**
*****************************************************************************
@@ -1434,14 +1434,14 @@ end
$CPPFLAGS += ' -D_WIN32' if /cygwin/ =~ RUBY_PLATFORM
# Does ruby have nativethread ?
-TkLib_Config["ruby_with_thread"] =
+TkLib_Config["ruby_with_thread"] =
macro_defined?('HAVE_NATIVETHREAD', '#include "ruby.h"')
#---------------------------------------------------
# check requirement of Tcl/tk version
tcltk_version = with_config("tcltkversion")
-tclver, tkver =
+tclver, tkver =
TkLib_Config["tcltkversion"] = check_tcltk_version(tcltk_version)
puts("Specified Tcl/Tk version is #{[tclver, tkver].inspect}") if tclver&&tkver
@@ -1464,12 +1464,12 @@ end
TkLib_Config["ActiveTcl"] = activeTcl
# allow space chars on a libpath
-TkLib_Config["space-on-tk-libpath"] =
+TkLib_Config["space-on-tk-libpath"] =
enable_config("space-on-tk-libpath", ! is_win32?)
# enable Tcl/Tk stubs?
=begin
-if TclConfig_Info['TCL_STUB_LIB_SPEC'] && TkConfig_Info['TK_STUB_LIB_SPEC'] &&
+if TclConfig_Info['TCL_STUB_LIB_SPEC'] && TkConfig_Info['TK_STUB_LIB_SPEC'] &&
!TclConfig_Info['TCL_STUB_LIB_SPEC'].strip.empty? &&
!TkConfig_Info['TK_STUB_LIB_SPEC'].strip.empty?
stubs = true
@@ -1562,7 +1562,7 @@ use_X = search_X_libraries
if (TkLib_Config["tcltk-framework"] ||
( find_tcltk_header(tclver, tkver) &&
- find_tcltk_library(tcllib, tklib, stubs, tclver, tkver,
+ find_tcltk_library(tcllib, tklib, stubs, tclver, tkver,
tcl_ldir_list, tk_ldir_list) ) ) &&
(stubs || pthread_check())
# create Makefile
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 08:01:11 +0000